Index: lams_admin/conf/language/ApplicationResources.properties
===================================================================
diff -u -r36dec686075045d22059eaecf6e8d310ea3b6a50 -reccb98befd65e5e9b33bfe30517db82817d16f08
--- lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 36dec686075045d22059eaecf6e8d310ea3b6a50)
+++ lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision eccb98befd65e5e9b33bfe30517db82817d16f08)
@@ -30,14 +30,16 @@
 error.authorisation=You are not authorised to do this. 
 error.newpassword.mismatch=Your new password does not match.
 error.oldpassword.mismatch=Your old password is not correct.
-error.results.none=No results matched your query.
 error.img.format = The file you uploaded looks not an image. An image file usually has .jpg, .gif, .png or .bmp extension.
 error.img.size = The file size exceeds the maximum 4096k limit.
-error.not.member = User is not a member of this organisation.
 error.need.sysadmin = You need to have the sys admin role to do this.
+error.roles.empty = You need to assign at least one role.
+error.userid.invalid = Invalid User Id.
 
 #======================= Warning Messages ==========================# 
 msg.user.add.to.parent.group = User/s marked with a '*' will be automatically added to the parent group with the same roles.
+msg.add.to.org = User will be added to {0}.
+msg.results.none = No results matched your query.
 
 #======================= Organisation State =======================#
 organisation.state.ACTIVE=Active
@@ -52,6 +54,7 @@
 admin.user.login = Login
 admin.user.password = Password
 admin.user.password.confirm = Confirm Password
+admin.user.name = Name
 admin.user.title = Title
 admin.user.first_name = First Name
 admin.user.last_name = Last Name
@@ -78,6 +81,10 @@
 admin.user.LEARNER = Learner
 admin.user.STAFF = Staff
 admin.user.assign.roles = Assign Roles
+admin.user.find = Find Users
+admin.user.edit = Edit User Details
+admin.user.disable = Disable User
+admin.user.delete = Delete User
 
 #==================== Organisation Management Screen ======================#
 admin.organisation.management = Group/Subgroup Management