Index: lams_admin/conf/language/ApplicationResources.properties
===================================================================
diff -u -re6e660d237c8345b89a3a34867fedd4c528a84fb -rde618580f0badb85fa5b4c0b69a7a74a30c3869a
--- lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e6e660d237c8345b89a3a34867fedd4c528a84fb)
+++ lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision de618580f0badb85fa5b4c0b69a7a74a30c3869a)
@@ -9,6 +9,12 @@
 audit.user.disable = Disabled userId: {0}
 audit.user.delete = Deleted userId: {0}
 
+#========================General Labels=================================#
+label.yes = Yes
+label.no = No
+label.or = Or
+
+
 #=========================List jobs in Quartz===========================#
 title.job.list = Jobs
 lable.job.name= Job name
@@ -39,6 +45,8 @@
 error.lastname.required = Last Name is required.
 error.email.required = Email address is required.
 error.valid.email.required = Valid email address is required.
+error.required = {0} is required.
+error.not.unique = {0} is not unique. 
 
 #======================= 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.
@@ -95,8 +103,6 @@
 #==================== Organisation Management Screen ======================#
 admin.organisation.management = Group/Subgroup Management
 admin.organisation.entry = Group/Subgroup Entry
-admin.job.list = Job List
-admin.list.job = List scheduled jobs in Quartz queue
 admin.organisation.name = Name
 admin.organisation.code = Code
 admin.organisation.description = Description
@@ -121,14 +127,30 @@
 admin.create = Create
 admin.edit = Edit
 admin.reset = Reset
-admin.remove = Delete
+admin.delete = Delete
 admin.cancel = Cancel
 admin.search = Search
 admin.enable = Enable
+admin.disable = Disable
 
 #===================== Main Sysadmin Screen ======================#
 sysadmin.maintain = Maintain LAMS
 sysadmin.maintain.loginpage = Maintain login page
+sysadmin.maintain.external.servers = Maintain integrated servers
+sysadmin.maintain.server.edit = Edit integrated server
+sysadmin.serverid = Id
+sysadmin.serverkey = Key
+sysadmin.servername = Name
+sysadmin.serverdesc = Description
+sysadmin.prefix = Prefix
+sysadmin.disabled = Disabled
+sysadmin.organisation = Organisation
+sysadmin.userinfoUrl = User Information URL
+sysadmin.timeoutUrl = Timeout URL
+sysadmin.integrated.servers = integrated server(s) totally
+sysadmin.server.add = Add New Server
+sysadmin.organisation.create = Create new one
+sysadmin.organisation.select = Please select...
 sysadmin.login.logo = Upload new LAMS logo (height 90 and width 186 for best effect):
 sysadmin.login.text = Update the text under the logo on the login page:
 sysadmin.headline = System Administration
@@ -137,6 +159,8 @@
 sysadmin.batch.description=These need to be converted to batch jobs, able to be run from cron.
 sysadmin.batch.temp.file.delete=Delete old temporary files
 sysadmin.batch.preview.delete=Delete old Preview lessons
+sysadmin.job.list = Job List
+sysadmin.list.job = List scheduled jobs in Quartz queue
 
 #===================== Cache Screen ==============================#
 cache.maintain = Maintain LAMS Cache