Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r06bac0a18bf688357aa64c5776c14f89d7c163b6 -r4f954d243ef6d277b9f5ae59f56536b90f62b156
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 06bac0a18bf688357aa64c5776c14f89d7c163b6)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4f954d243ef6d277b9f5ae59f56536b90f62b156)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Mar 30 04:09:18 GMT 2007 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue May 08 02:32:33 GMT 2007 
  
 #=================== labels for LAMS Administration =================# 
 
@@ -237,6 +237,10 @@
 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.
 
 
-#======= End labels: Exported 231 labels for en AU =====
+#======= End labels: Exported 235 labels for en AU =====