Index: lams_learning/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_learning/conf/language/lams/ApplicationResources.properties,v diff -u -r1.56 -r1.57 --- lams_learning/conf/language/lams/ApplicationResources.properties 12 Sep 2013 18:11:46 -0000 1.56 +++ lams_learning/conf/language/lams/ApplicationResources.properties 12 Mar 2014 08:24:10 -0000 1.57 @@ -74,7 +74,7 @@ mynotes.journals.title =Journals mynotes.entry.no.title.label =No Title message.progress.broken =An error has occurred and you cannot continue without LAMS recalculating your current activity. A staff member may be editing the lesson. -message.progress.broken.try.resume =Please select "Resume" or close and reopen this window to continue. If this error re-occurs, wait a few minutes and then try again. +message.progress.broken.try.resume =Close and reopen this window to continue. If this error re-occurs, wait a few minutes and then try again. label.branching.wait.message =You have stopped at a branching point. You cannot continue until your branch is allocated in Monitoring. label.branching.refresh.message =Click Next if you are told that the branch has been selected. This page will refresh automatically in 1 minute. label.branching.preview.message =You have reached a branching activity. As you are in preview you can select which branch to preview then click Choose. Click Finish to skip the branching and continue with the next activity after the branching. Index: lams_learning/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_learning/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.49 -r1.50 --- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties 12 Sep 2013 18:11:46 -0000 1.49 +++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties 12 Mar 2014 08:24:10 -0000 1.50 @@ -74,7 +74,7 @@ mynotes.journals.title =Journals mynotes.entry.no.title.label =No Title message.progress.broken =An error has occurred and you cannot continue without LAMS recalculating your current activity. A staff member may be editing the lesson. -message.progress.broken.try.resume =Please select "Resume" or close and reopen this window to continue. If this error re-occurs, wait a few minutes and then try again. +message.progress.broken.try.resume =Close and reopen this window to continue. If this error re-occurs, wait a few minutes and then try again. label.branching.wait.message =You have stopped at a branching point. You cannot continue until your branch is allocated in Monitoring. label.branching.refresh.message =Click Next if you are told that the branch has been selected. This page will refresh automatically in 1 minute. label.branching.preview.message =You have reached a branching activity. As you are in preview you can select which branch to preview then click Choose. Click Finish to skip the branching and continue with the next activity after the branching. Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_learning/web/progressBroken.jsp'. Fisheye: No comparison available. Pass `N' to diff?