Index: lams_learning/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rabe4e90d0e3fc3969affc444132d20d99b45d3f4 -rc3cc819ade1f0545299bb448e6235b8dffe0eb3a --- lams_learning/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision abe4e90d0e3fc3969affc444132d20d99b45d3f4) +++ lams_learning/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision c3cc819ade1f0545299bb448e6235b8dffe0eb3a) @@ -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 =================================================================== diff -u -rabe4e90d0e3fc3969affc444132d20d99b45d3f4 -rc3cc819ade1f0545299bb448e6235b8dffe0eb3a --- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision abe4e90d0e3fc3969affc444132d20d99b45d3f4) +++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision c3cc819ade1f0545299bb448e6235b8dffe0eb3a) @@ -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 606581007abbdaee5483777096f32ffac1c3e3eb refers to a dead (removed) revision in file `lams_learning/web/progressBroken.jsp'. Fisheye: No comparison available. Pass `N' to diff?