Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re3e3144e95dcad1428633c3fce9304bd2e856d85 -r5835d5dd250ed2c1e670627ff0a6a20339e7236f
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e3e3144e95dcad1428633c3fce9304bd2e856d85)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5835d5dd250ed2c1e670627ff0a6a20339e7236f)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Oct 31 12:53:19 CST 2012 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Dec 06 14:49:27 CST 2012 
  
 #=================== labels for LAMS Administration =================# 
 
@@ -213,7 +213,20 @@
 sysadmin.library.activity.description  =Description
 sysadmin.library.createtim  =Create time
 sysadmin.function  =Function
+admin.importv1.title  =Import LAMS 1 Users
+msg.importv1.1  =Download
+msg.importv1.2  =On the command line of your LAMS 1 database server, run the following command
+msg.importv1.3a  =Submit
+msg.importv1.3b  =using the form below.
+msg.importv1.4  =You will be presented with a list of organisations and session classes to import.
+label.importv1.integrated  =Include integration users and organisations
 label.continue  =Continue
+msg.importv1.found.users  =Found {0} LAMS 1 users.
+heading.importv1.users  =Users
+heading.importv1.account.organisations  =Account Organisations
+heading.importv1.session.classes  =Session Classes
+msg.importv1.created  =Created {0} users and {1} groups.
+msg.importv1.already.exist  =The following logins already exist
 msg.cleanup.files.deleted  ={0} files were deleted.
 msg.cleanup.warning  =Warning: calculating the size of LAMS' temporary files may incur a performance hit on your server if it hasn't been cleaned out for a while.
 label.exported.learning.designs  =exported learning designs
@@ -222,9 +235,12 @@
 msg.cleanup.actual.space  =Depending on your server's file system, the actual space occupied may differ from the above.
 msg.cleanup.recommended  =It's recommended to leave at least 1 day of temporary files in order not to remove anything that's currently in use.
 label.cleanup.delete  =Delete temporary files older than this number of days
+msg.importv1.5  =Note that the passwords of the imported users will be reset, since LAMS 2 does not accept md5 passwords.  They will be reset to the user's login.
 label.can.join.joint.lessons  =Can join joint lessons
 label.can.offer.joint.lessons  =Can offer joint lessons
 error.cant.write.login.jsp  =Couldn''t write value of {0} to {1}, please check your {2} configuration.
+msg.importv1.please.wait  =Please wait while creating new users and groups...
+msg.importv1.only.members  =Only import users that are members of organisations/session classes to be imported
 label.login.as  =Login as
 sysadmin.import.groups.title  =Import Groups
 heading.import.results  =Import Results
@@ -483,6 +499,7 @@
 error.course.keys.unequal  =Course keys did not match
 error.context.exists  =This URL context is taken
 config.learner.collapsible.progress.panel  =Set collapsible panel for progress bar in Learner
+config.authoring.suffix  =Add unique suffix when importing Learning Designs
 
 
-#======= End labels: Exported 493 labels for en AU =====
+#======= End labels: Exported 494 labels for en AU =====