Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6452b7bb53f1f0eb5a340fd488a733a9a6bd1415 -r06d72a98c64de60670851d69f545e2e28190cc45
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6452b7bb53f1f0eb5a340fd488a733a9a6bd1415)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 06d72a98c64de60670851d69f545e2e28190cc45)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Fiona Malikoff on Mon Dec 03 08:09:22 GMT 2007 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Dec 11 20:28:23 GMT 2007 
  
 #=================== labels for LAMS Administration =================# 
 
@@ -11,10 +11,12 @@
 msg.import.intro  =Use this screen to bulk import users using an Excel spreadsheet.
 msg.import.conclusion  =Click the help icon above for more information.
 sysadmin.batch.temp.file.delete  =Delete Old Temporary Files
+config.server.page.direction  =Locale Page Direction
 label.global.roles  =Global roles
 msg.remove.from.subgroups  =Removed users will also be removed from subgroups.
 msg.group.organisation_id  =The organisation_id of this group is
 msg.subgroup.organisation_id  =The organisation_id of this subgroup is
+config.ldap.monitor.map  =Monitor Role Map
 label.login.as  =Login as
 sysadmin.userinfoUrl  =User Information URL
 sysadmin.timeoutUrl  =Timeout URL
@@ -67,11 +69,9 @@
 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
 admin.user.actions  =Actions
 admin.user.import  =Import Users
-admin.list.disabled.users  =List Disabled Users
 label.spreadsheet  =spreadsheet
 label.download.template  =Download the template
 role.AUTHOR  =Author
@@ -127,7 +127,6 @@
 sysadmin.organisation  =Organisation
 audit.organisation.change  =Changed {0} for organisation: {1} from: {2} to: {3}
 audit.organisation.create  =Created organisation: {0} of type: {1}
-audit.user.disable  =Disabled userId: {0}
 audit.user.delete  =Deleted userId: {0}
 label.yes  =Yes
 label.no  =No
@@ -171,7 +170,6 @@
 msg.add.to.org  =User will be added to {0}.
 msg.results.none  =No results matched your query.
 msg.disable.user.1  =This user has lesson and/or sequence data associated with it and cannot be deleted.
-msg.disable.user.2  =User will be disabled instead, maintaining their data, but the account will be treated as deleted.
 msg.disable.user.3  =It will not appear in group/subgroup lists, nor will the user be able to login.
 msg.disable.user.4  =You can enable the user account again by editing the user's profile.
 msg.delete.user.1  =User has no associated data and can be safely removed.
@@ -262,9 +260,13 @@
 Please wait while syncronisation completes...
 msg.ldap.synchronise.errors  =The following errors were encountered:
 msg.num.search.results.users  =LDAP server returned {0} users.
-msg.num.created.users  ={0} users were created in LAMS.
-msg.num.updated.users  ={0} users already existed in LAMS and were updated.
-msg.num.disabled.users  ={0} users were disabled in LAMS.
+config.ldap.author.map  =Author Role Map
+config.ldap.update.on.login  =Update on Login
+config.ldap.org.field  =Group Field Map
+config.ldap.only.one.org  =Only One Group
+config.ldap.learner.map  =Learner Role Map
+config.ldap.group.admin.map  =Group Admin Role Map
+config.ldap.group.manager.map  =Group Manager Role Map
 config.header.system  =System Configuration
 config.header.email  =Email
 config.header.uploads  =Uploaded Files
@@ -296,7 +298,6 @@
 config.learner.client.version  =Learner Client Version
 config.server.version.number  =Server Version Number
 config.server.language  =Locale
-config.server.page.direction  =Locale Page Directory
 config.dictionary.date.created  =Language Pack Install Date
 config.help.url  =Help URL
 config.xmpp.domain  =Chat Server Domain
@@ -316,24 +317,17 @@
 config.ldap.security.protocol  =Security Protocol
 config.ldap.truststore.path  =SSL Certificate Path
 config.ldap.truststore.password  =SSL Certificate Password
-config.ldap.monitor.map  =Monitor Role Map
-config.ldap.author.map  =Author Role Map
-config.ldap.update.on.login  =Update on Login
-config.ldap.org.field  =Group Field Map
-config.ldap.only.one.org  =Only One Group
-config.ldap.learner.map  =Learner Role Map
-config.ldap.group.admin.map  =Group Admin Role Map
-config.ldap.group.manager.map  =Group Manager Role Map
 config.ldap.encrypt.password.from.browser  =Encrypt Password From Browser
 config.ldap.search.results.page.size  =Search Results Page Size
 error.numeric  ={0} only accepts numeric characters
-heading.users = Users
-label.number.of.users = users.
-heading.potential.users = Potential Users
-label.number.of.potential.users = potential users.
-msg.click.remove.user = Click a user to remove them.
-msg.click.add.user = Click a user to add them.
-msg.show.all.potential.users = Show all potential users.
-label.next = Next
+config.learner.progress.batch.size  =Number of learners to be displayed on the learner progress screen in monitoring
+admin.user.disable  =Disable User Account
+admin.list.disabled.users  =List Disabled Accounts
+audit.user.disable  =Disabled account userId: {0}
+msg.disable.user.2  =User account will be disabled instead, maintaining their data, but the account will be treated as deleted.
+msg.num.disabled.users  ={0} user accounts were disabled in LAMS.
+msg.num.created.users  ={0} user accounts were created in LAMS.
+msg.num.updated.users  ={0} user accounts already existed in LAMS and were updated.
 
-#======= End labels: Exported 320 labels for en AU =====
+
+#======= End labels: Exported 321 labels for en AU =====
Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r6452b7bb53f1f0eb5a340fd488a733a9a6bd1415 -r06d72a98c64de60670851d69f545e2e28190cc45
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 6452b7bb53f1f0eb5a340fd488a733a9a6bd1415)
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 06d72a98c64de60670851d69f545e2e28190cc45)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Fiona Malikoff on Mon Dec 03 08:09:22 GMT 2007 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Dec 11 20:28:23 GMT 2007 
  
 #=================== labels for LAMS Administration =================# 
 
@@ -11,10 +11,12 @@
 msg.import.intro  =Use this screen to bulk import users using an Excel spreadsheet.
 msg.import.conclusion  =Click the help icon above for more information.
 sysadmin.batch.temp.file.delete  =Delete Old Temporary Files
+config.server.page.direction  =Locale Page Direction
 label.global.roles  =Global roles
 msg.remove.from.subgroups  =Removed users will also be removed from subgroups.
 msg.group.organisation_id  =The organisation_id of this group is
 msg.subgroup.organisation_id  =The organisation_id of this subgroup is
+config.ldap.monitor.map  =Monitor Role Map
 label.login.as  =Login as
 sysadmin.userinfoUrl  =User Information URL
 sysadmin.timeoutUrl  =Timeout URL
@@ -67,11 +69,9 @@
 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
 admin.user.actions  =Actions
 admin.user.import  =Import Users
-admin.list.disabled.users  =List Disabled Users
 label.spreadsheet  =spreadsheet
 label.download.template  =Download the template
 role.AUTHOR  =Author
@@ -127,7 +127,6 @@
 sysadmin.organisation  =Organisation
 audit.organisation.change  =Changed {0} for organisation: {1} from: {2} to: {3}
 audit.organisation.create  =Created organisation: {0} of type: {1}
-audit.user.disable  =Disabled userId: {0}
 audit.user.delete  =Deleted userId: {0}
 label.yes  =Yes
 label.no  =No
@@ -171,7 +170,6 @@
 msg.add.to.org  =User will be added to {0}.
 msg.results.none  =No results matched your query.
 msg.disable.user.1  =This user has lesson and/or sequence data associated with it and cannot be deleted.
-msg.disable.user.2  =User will be disabled instead, maintaining their data, but the account will be treated as deleted.
 msg.disable.user.3  =It will not appear in group/subgroup lists, nor will the user be able to login.
 msg.disable.user.4  =You can enable the user account again by editing the user's profile.
 msg.delete.user.1  =User has no associated data and can be safely removed.
@@ -262,9 +260,13 @@
 Please wait while syncronisation completes...
 msg.ldap.synchronise.errors  =The following errors were encountered:
 msg.num.search.results.users  =LDAP server returned {0} users.
-msg.num.created.users  ={0} users were created in LAMS.
-msg.num.updated.users  ={0} users already existed in LAMS and were updated.
-msg.num.disabled.users  ={0} users were disabled in LAMS.
+config.ldap.author.map  =Author Role Map
+config.ldap.update.on.login  =Update on Login
+config.ldap.org.field  =Group Field Map
+config.ldap.only.one.org  =Only One Group
+config.ldap.learner.map  =Learner Role Map
+config.ldap.group.admin.map  =Group Admin Role Map
+config.ldap.group.manager.map  =Group Manager Role Map
 config.header.system  =System Configuration
 config.header.email  =Email
 config.header.uploads  =Uploaded Files
@@ -296,7 +298,6 @@
 config.learner.client.version  =Learner Client Version
 config.server.version.number  =Server Version Number
 config.server.language  =Locale
-config.server.page.direction  =Locale Page Directory
 config.dictionary.date.created  =Language Pack Install Date
 config.help.url  =Help URL
 config.xmpp.domain  =Chat Server Domain
@@ -316,24 +317,17 @@
 config.ldap.security.protocol  =Security Protocol
 config.ldap.truststore.path  =SSL Certificate Path
 config.ldap.truststore.password  =SSL Certificate Password
-config.ldap.monitor.map  =Monitor Role Map
-config.ldap.author.map  =Author Role Map
-config.ldap.update.on.login  =Update on Login
-config.ldap.org.field  =Group Field Map
-config.ldap.only.one.org  =Only One Group
-config.ldap.learner.map  =Learner Role Map
-config.ldap.group.admin.map  =Group Admin Role Map
-config.ldap.group.manager.map  =Group Manager Role Map
 config.ldap.encrypt.password.from.browser  =Encrypt Password From Browser
 config.ldap.search.results.page.size  =Search Results Page Size
 error.numeric  ={0} only accepts numeric characters
-heading.users = Users
-label.number.of.users = users.
-heading.potential.users = Potential Users
-label.number.of.potential.users = potential users.
-msg.click.remove.user = Click a user to remove them.
-msg.click.add.user = Click a user to add them.
-msg.show.all.potential.users = Show all potential users.
-label.next = Next
+config.learner.progress.batch.size  =Number of learners to be displayed on the learner progress screen in monitoring
+admin.user.disable  =Disable User Account
+admin.list.disabled.users  =List Disabled Accounts
+audit.user.disable  =Disabled account userId: {0}
+msg.disable.user.2  =User account will be disabled instead, maintaining their data, but the account will be treated as deleted.
+msg.num.disabled.users  ={0} user accounts were disabled in LAMS.
+msg.num.created.users  ={0} user accounts were created in LAMS.
+msg.num.updated.users  ={0} user accounts already existed in LAMS and were updated.
 
-#======= End labels: Exported 320 labels for en AU =====
+
+#======= End labels: Exported 321 labels for en AU =====