Index: lams_admin/conf/language/ApplicationResources.properties
===================================================================
diff -u -rc1b9588b6c79f0db952171e37dbf3bd6201752f2 -r8b8933473ac4e3b139e4578684c7be41f6f17070
--- lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision c1b9588b6c79f0db952171e37dbf3bd6201752f2)
+++ lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8b8933473ac4e3b139e4578684c7be41f6f17070)
@@ -8,6 +8,12 @@
 lable.job.description=Job description
 
 #======================= Error Messages ==========================#
+errors.header=<font color=red>Please correct the following errors before proceeding:</font><ul>
+errors.footer=</ul>
+errors.prefix=<li><font color=red>
+errors.suffix=</font></li>
+error.system = Oops! An unexpected exception thrown by the system. Ask the LAMS developers to investigate it! 
+error.org.invalid = Invalid Organiation Id
 error.name.required = Name is required
 error.authorisation=You are not authorised to do this. 
 error.newpassword.mismatch=Your new passwords don't match each other.
@@ -29,6 +35,11 @@
 locale.country.CN=China
 
 #==================== Organisation Management Screen ======================#
+admin.error = Oops!
+admin.organisation.management = Organisation Management
+admin.organisation.entry = Organisation Entry
+admin.job.list = Job List
+admin.list.job = List scheduled jobs in Quartz queue
 admin.in = In
 admin.organisation.name = Name
 admin.organisation.code = Code
@@ -39,19 +50,20 @@
 admin.organisation = Organisation 
 admin.course = Course
 admin.class = Class
-admin.course.manage = Course Management
-admin.class.manage = Class Management
+admin.course.manage = Manage Courses
+admin.user.manage = Manage Users
+admin.class.manage = Manage Classes
 admin.class.add = Create New Class
 admin.course.add = Create New Course
 admin.save = Save
 admin.create = Create
 admin.edit = Edit
-admin.remove = Remove
+admin.reset = Reset
+admin.remove = Delete
 admin.cancel = Cancel
-admin.user.manage = Manage Users
-admin.class.manage = Manage Classes
 
 #===================== Main Sysadmin Screen ======================#
+sysadmin.maintain = Maintain LAMS
 sysadmin.headline = System Administration
 sysadmin.manage.config.file=Manage Configuration File
 sysadmin.batch.heading=Batch Tasks
@@ -60,6 +72,7 @@
 sysadmin.batch.preview.delete=Delete old Preview lessons
 
 #===================== Cache Screen ==============================#
+cache.maintain = Maintain LAMS Cache
 cache.title=Cache Management
 cache.entries.title=Cache Nodes
 cache.explanation1=Listed below are the current nodes in the cache. This keeps certain common objects in memory to speed up LAMS. It is managed automatically and should not require any intervention. However, if the system appears to be keeping "old values" e.g. an old first name, try clearing all the nodes in the cache. Once cleared, LAMS will reload the objects from the database.