Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re43552eb705a10ca8c983ebb83e48527e1f0a61c -rbfc50df4f757d914777bf5647c20d89d817ab83a
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e43552eb705a10ca8c983ebb83e48527e1f0a61c)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision bfc50df4f757d914777bf5647c20d89d817ab83a)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 11 02:34:35 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 18 07:10:50 BST 2008 
  
 #=================== labels for Monitor (Java) =================# 
 
@@ -25,9 +25,7 @@
 label.grouping.max.num.in.group.heading  =Maximum number of groups:
 label.grouping.general.instructions.heading  =General Instructions:
 label.grouping.general.instructions.line1  =Place the lesson participants in their groups. Initially you can add and remove users, but once the grouping is used (that is, a participant starts an activity that uses the grouping) you will not be able to remove users from groups. If you try to remove someone from a group and they will not remove check their progress - if they start using the group while you are on this screen you will not get any errors but you will not be able to remove them from their group. You will still be able to add users to groups.
-label.grouping.general.instructions.line2  =To create a group, type a group name and click <strong>Add Group</strong>. Repeat as required. Select a group, then select students from Column 2 and click <strong>Add selected to group</strong>. Select students in Column 3 and click <strong>Remove selected members</strong> from group to remove them from the group membership. The changes are saved when you click any of the buttons.
 label.grouping.group.heading  =Groups
-label.grouping.non.grouped.users.heading  =Students without a Group
 label.grouping.grouped.users.heading  =Members of selected Group
 label.grouping.no.groups.created  =No groups have been created.
 label.grouping.loading  =( Loading... )
@@ -62,14 +60,16 @@
 monitor.title  =Monitor :: LAMS
 label.branching.general.instructions  =Place the lesson participants in their branches. Initially you can add and remove users, but once a participant starts one of the branches then you will not be able to remove users from any branches. If you try to remove someone from a branch and they will not remove then check their progress - if they start using the branch while you are on this screen you will not get any errors but you will not be able to remove them from the branch. You will still be able to add users to branches.
 label.branching.branch.heading  =Branch
-label.branching.non.allocated.users.heading  =Students without a Branch
 label.branching.allocated.users.heading  =Members of selected Branch
 button.branching.add.user.to.branch  =Add selected to Branch
 button.branching.remove.user.from.branch  =Remove selected from Branch
 label.branching.general.group.instructions  =Place the groups in their branches. Initially you can add and remove groups, but once a participant starts one of the branches then you will not be able to remove groups from any branches. You will still be able to add groups to branches.
 label.branching.non.allocated.groups.heading  =Groups without a Branch
 label.branching.allocated.groups.heading  =Groups of the selected Branch
 label.completed  =Completed
+label.grouping.non.grouped.users.heading  =Students without a Group
+label.branching.non.allocated.users.heading  =Students without a Branch
+label.grouping.general.instructions.line2  =To create a group, type a group name and click <strong>Add Group</strong>. Repeat as required. Select a group, then select students from Column 2 and click <strong>Add selected to group</strong>. Select students in Column 3 and click <strong>Remove selected members</strong> from group to remove them from the group membership. The changes are saved when you click any of the buttons.
 
 
 #======= End labels: Exported 64 labels for en AU =====
Index: lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -re43552eb705a10ca8c983ebb83e48527e1f0a61c -rbfc50df4f757d914777bf5647c20d89d817ab83a
--- lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision e43552eb705a10ca8c983ebb83e48527e1f0a61c)
+++ lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision bfc50df4f757d914777bf5647c20d89d817ab83a)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 11 02:34:35 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 18 07:10:50 BST 2008 
  
 #=================== labels for Monitor (Java) =================# 
 
@@ -25,9 +25,7 @@
 label.grouping.max.num.in.group.heading  =Maximum number of groups:
 label.grouping.general.instructions.heading  =General Instructions:
 label.grouping.general.instructions.line1  =Place the lesson participants in their groups. Initially you can add and remove users, but once the grouping is used (that is, a participant starts an activity that uses the grouping) you will not be able to remove users from groups. If you try to remove someone from a group and they will not remove check their progress - if they start using the group while you are on this screen you will not get any errors but you will not be able to remove them from their group. You will still be able to add users to groups.
-label.grouping.general.instructions.line2  =To create a group, type a group name and click <strong>Add Group</strong>. Repeat as required. Select a group, then select students from Column 2 and click <strong>Add selected to group</strong>. Select students in Column 3 and click <strong>Remove selected members</strong> from group to remove them from the group membership. The changes are saved when you click any of the buttons.
 label.grouping.group.heading  =Groups
-label.grouping.non.grouped.users.heading  =Students without a Group
 label.grouping.grouped.users.heading  =Members of selected Group
 label.grouping.no.groups.created  =No groups have been created.
 label.grouping.loading  =( Loading... )
@@ -62,14 +60,16 @@
 monitor.title  =Monitor :: LAMS
 label.branching.general.instructions  =Place the lesson participants in their branches. Initially you can add and remove users, but once a participant starts one of the branches then you will not be able to remove users from any branches. If you try to remove someone from a branch and they will not remove then check their progress - if they start using the branch while you are on this screen you will not get any errors but you will not be able to remove them from the branch. You will still be able to add users to branches.
 label.branching.branch.heading  =Branch
-label.branching.non.allocated.users.heading  =Students without a Branch
 label.branching.allocated.users.heading  =Members of selected Branch
 button.branching.add.user.to.branch  =Add selected to Branch
 button.branching.remove.user.from.branch  =Remove selected from Branch
 label.branching.general.group.instructions  =Place the groups in their branches. Initially you can add and remove groups, but once a participant starts one of the branches then you will not be able to remove groups from any branches. You will still be able to add groups to branches.
 label.branching.non.allocated.groups.heading  =Groups without a Branch
 label.branching.allocated.groups.heading  =Groups of the selected Branch
 label.completed  =Completed
+label.grouping.non.grouped.users.heading  =Students without a Group
+label.branching.non.allocated.users.heading  =Students without a Branch
+label.grouping.general.instructions.line2  =To create a group, type a group name and click <strong>Add Group</strong>. Repeat as required. Select a group, then select students from Column 2 and click <strong>Add selected to group</strong>. Select students in Column 3 and click <strong>Remove selected members</strong> from group to remove them from the group membership. The changes are saved when you click any of the buttons.
 
 
 #======= End labels: Exported 64 labels for en AU =====