Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r1e14304ff8caba5d2c4da4245450bd6f470f1c0e -rea2d5b224a225815c056c78f30b7f7f6d9b70dc0
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ea2d5b224a225815c056c78f30b7f7f6d9b70dc0)
@@ -6,8 +6,8 @@
  
 #=================== labels for LAMS Administration =================# 
 
-audit.organisation.change  =Changed {0} for organisation: {1} from: {2} to: {3}
-audit.organisation.create  =Created organisation: {0} of type: {1}
+audit.organisation.change  =Changed {0} for course: {1} from: {2} to: {3}
+audit.organisation.create  =Created course: {0} of type: {1}
 audit.user.disable  =Disabled account userId: {0}
 audit.user.delete  =Deleted userId: {0}
 label.yes  =Yes
@@ -18,8 +18,8 @@
 lable.job.start.date  =Job start date
 lable.job.description  =Job description
 error.system  =Oops! An unexpected exception thrown by the system. Contact your system administrator.
-error.org.invalid  =Invalid organisation Id. {0}
-error.orgtype.invalid  =Invalid operation for this type of organisation.
+error.org.invalid  =Invalid course Id. {0}
+error.orgtype.invalid  =Invalid operation for this type of course.
 error.name.required  =Name is required.
 error.login.required  =Login is required.
 error.login.unique  =Login is already taken. {0}
@@ -113,9 +113,11 @@
 admin.organisation.description  =Description
 admin.organisation.locale  =Locale
 admin.organisation.status  =Status
-admin.can.add.user  =Course managers can add new users
-admin.can.browse.user  =Course managers can browse all users in the system
-admin.can.change.status  =Course managers can change status of course
+admin.course.settings =Course settings
+admin.course.managers.can = Course managers can
+admin.can.add.user  =add new users
+admin.can.browse.user  =browse all users in the system
+admin.can.change.status  =change status of course
 admin.organisation  =Course/Subcourse
 admin.course  =Course
 admin.class  =Subcourse
@@ -146,7 +148,7 @@
 sysadmin.serverdesc  =Description
 sysadmin.prefix  =Prefix
 sysadmin.disabled  =Disabled
-sysadmin.organisation  =Organisation
+sysadmin.organisation  =Course
 sysadmin.userinfoUrl  =User information URL
 sysadmin.timeoutUrl  =Timeout URL
 sysadmin.integrated.servers  =integrated server(s) in total
@@ -170,8 +172,8 @@
 admin.config.key  =Key
 admin.config.value  =Value
 label.show.all.users  =Show all users
-msg.group.organisation_id  =The organisation_id of this course is
-msg.subgroup.organisation_id  =The organisation_id of this subcourse is
+msg.group.organisation_id  =The course_id of this course is
+msg.subgroup.organisation_id  =The course_id of this subcourse is
 msg.remove.from.subgroups  =Removed users will also be removed from subcourse.
 label.global.roles  =Global roles
 label.import  =Import
@@ -202,7 +204,7 @@
 label.login.as  =Login as
 sysadmin.import.groups.title  =Import courses
 heading.import.results  =Import results
-table.heading.organisation.id  =Organisation ID
+table.heading.organisation.id  =Course ID
 import.groups.intro  =Use this screen to bulk import courses and subcourses using an Excel spreadsheet.
 import.groups.instructions  =When creating a course, make sure the row above it is empty.  When creating a subcourse, place it directly under it's parent course.
 import.groups.download  =Download the courses template to create courses and subcourse.
@@ -302,7 +304,7 @@
 audit.spreadsheet.error  =Error processing spreadsheet row {0}: {1}
 audit.successful.user.import  =Successfully imported {0} users.
 audit.successful.role.import  =Successfully imported {0} role memberships.
-audit.successful.organisation.import  =Successfully imported {0} organisations.
+audit.successful.organisation.import  =Successfully imported {0} courses.
 config.forgot.password.allow.email  =Allow forgot password email link in front page?
 config.forgot.password.email  =Email address from which the forgotten password emails will be sent
 config.custom.tab.link  =Custom tab URL
@@ -399,7 +401,7 @@
 config.profile.edit.enable  =Enable profile editing
 config.profile.partial.edit.enable  =Enable partial profile editing (only email and contact number can be changed)
 config.server2server.registration.enable  =Enable remote server user registration
-admin.enable.course.notifications  =Enable organisation notifications
+admin.enable.course.notifications  =Enable notifications
 cache.entries.title2  =Cacheable entities
 cache.explanation4  =Listed below are cacheable classes and collections. 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.
 cache.button.remove.all  =Clear all cached objects
@@ -676,4 +678,5 @@
 config.wa.sync.time =Container auto sync time (HH:mm)
 
 
+
 #======= End labels: Exported 627 labels for en AU =====