Index: lams_common/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re94547d813235d10af142050e5c0f0a486dc327c -rd5ff2e0121d67650eea6d972b04954a023cc3d4d
--- lams_common/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e94547d813235d10af142050e5c0f0a486dc327c)
+++ lams_common/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision d5ff2e0121d67650eea6d972b04954a023cc3d4d)
@@ -2,7 +2,7 @@
#language code: en
#locale code: AU
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Oct 01 02:11:53 BST 2008
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Oct 03 00:40:12 BST 2008
#=================== labels for LAMS Common =================#
@@ -52,6 +52,8 @@
mail.resend.abandon.subject =LAMS: Message delivery failed
mail.resend.abandon.body1 =LAMS was resending a message to users, but eventually it gave up. The message was:\n
mail.resend.abandon.body2 =\nUsers' login names:\n
+validation.error.conditionGateMustHaveACondition =A Condition Gate must have at least one condition.
+validation.error.conditionGateMustHaveAnInputToolActivity =A Condition Gate must have an Input Tool.
-#======= End labels: Exported 46 labels for en AU =====
+#======= End labels: Exported 48 labels for en AU =====
Index: lams_common/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -re94547d813235d10af142050e5c0f0a486dc327c -rd5ff2e0121d67650eea6d972b04954a023cc3d4d
--- lams_common/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision e94547d813235d10af142050e5c0f0a486dc327c)
+++ lams_common/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision d5ff2e0121d67650eea6d972b04954a023cc3d4d)
@@ -2,7 +2,7 @@
#language code: en
#locale code: AU
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Oct 01 02:11:53 BST 2008
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Oct 03 00:40:12 BST 2008
#=================== labels for LAMS Common =================#
@@ -52,6 +52,8 @@
mail.resend.abandon.subject =LAMS: Message delivery failed
mail.resend.abandon.body1 =LAMS was resending a message to users, but eventually it gave up. The message was:\n
mail.resend.abandon.body2 =\nUsers' login names:\n
+validation.error.conditionGateMustHaveACondition =A Condition Gate must have at least one condition.
+validation.error.conditionGateMustHaveAnInputToolActivity =A Condition Gate must have an Input Tool.
-#======= End labels: Exported 46 labels for en AU =====
+#======= End labels: Exported 48 labels for en AU =====
Index: lams_common/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -rdb3b153522421c748da5d7a67df4fcdf0652cbc7 -rd5ff2e0121d67650eea6d972b04954a023cc3d4d
--- lams_common/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision db3b153522421c748da5d7a67df4fcdf0652cbc7)
+++ lams_common/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision d5ff2e0121d67650eea6d972b04954a023cc3d4d)
@@ -2,7 +2,7 @@
#language code: es
#locale code: ES
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 10 03:21:21 BST 2008
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Oct 03 00:40:16 BST 2008
#=================== labels for LAMS Common =================#
@@ -49,6 +49,11 @@
validation.error.toolBranchingMustHaveAnInputToolActivity =Una herramienta de rendimiento basada en una actividad de ramificaci\u00f3n debe tener una herramienta de entrada.
validation.error.group.count.mismatch =El n\u00famero de grupos en la lista excede el n\u00famero de grupos seleccionado.
validation.error.toolBranchingMustHaveACondition =El tipo de ramificaci\u00f3n "Resultados de Actividades Previas" necesita por lo menos una condici\u00f3n activa.
+mail.resend.abandon.subject =LAMS: el mensaje no ha podido ser enviado
+mail.resend.abandon.body1 =LAMS intent\u00f3 reenviar el mensaje a los usuarios pero eventualmente ha desistido. El mensaje es: \n
+mail.resend.abandon.body2 =\nNombres de usuarios:\n
+validation.error.conditionGateMustHaveACondition =Una condici\u00f3n de puerta debe tener por lo menos una condici\u00f3n.
+validation.error.conditionGateMustHaveAnInputToolActivity =Una condici\u00f3n de puerta debe tener por lo menos una herramienta como entrada.
-#======= End labels: Exported 43 labels for es ES =====
+#======= End labels: Exported 48 labels for es ES =====
Index: lams_common/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -re94547d813235d10af142050e5c0f0a486dc327c -rd5ff2e0121d67650eea6d972b04954a023cc3d4d
--- lams_common/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision e94547d813235d10af142050e5c0f0a486dc327c)
+++ lams_common/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision d5ff2e0121d67650eea6d972b04954a023cc3d4d)
@@ -2,7 +2,7 @@
#language code: no
#locale code: NO
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Oct 01 02:12:02 BST 2008
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Oct 03 00:40:08 BST 2008
#=================== labels for LAMS Common =================#
@@ -52,6 +52,8 @@
mail.resend.abandon.subject =LAMS: Fikk ikke levert melding
mail.resend.abandon.body1 =LAMS pr\u00f8vde \u00e5 sende melding til brukerne p\u00e5 nytt, men har oppgitt dette. Meldingen var: \n
mail.resend.abandon.body2 =\n Brukernes log-inn navn.\n
+validation.error.conditionGateMustHaveACondition =En port med forutsettninger m\u00e5 inneholde minst en forutsettning.
+validation.error.conditionGateMustHaveAnInputToolActivity =En port med forutsettninger m\u00e5 ha et verkt\u00f8y for inngangsdata.
-#======= End labels: Exported 46 labels for no NO =====
+#======= End labels: Exported 48 labels for no NO =====
Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r9af281f1b1c101117548b77b373acc1d796aa5a9 -rd5ff2e0121d67650eea6d972b04954a023cc3d4d
--- lams_learning/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 9af281f1b1c101117548b77b373acc1d796aa5a9)
+++ lams_learning/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision d5ff2e0121d67650eea6d972b04954a023cc3d4d)
@@ -2,7 +2,7 @@
#language code: en
#locale code: AU
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Oct 01 02:18:34 BST 2008
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Oct 03 00:37:20 BST 2008
#=================== labels for Learner (Java) =================#
@@ -92,6 +92,8 @@
label.learner.choice.group.full =Group full
label.learner.choice.group.message =Please select a group. Some groups may not be available if they reached the maximum number of members.
label.choose.group.button =Choose
+label.condition.gate.title =Condition Gate
+label.condition.gate.close.message =You have reached a condition gate. You have not satisfied the required conditions and you may not pass. Please return to previous activities.
-#======= End labels: Exported 86 labels for en AU =====
+#======= End labels: Exported 88 labels for en AU =====
Index: lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r9af281f1b1c101117548b77b373acc1d796aa5a9 -rd5ff2e0121d67650eea6d972b04954a023cc3d4d
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 9af281f1b1c101117548b77b373acc1d796aa5a9)
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision d5ff2e0121d67650eea6d972b04954a023cc3d4d)
@@ -2,7 +2,7 @@
#language code: en
#locale code: AU
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Oct 01 02:18:34 BST 2008
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Oct 03 00:37:20 BST 2008
#=================== labels for Learner (Java) =================#
@@ -92,6 +92,8 @@
label.learner.choice.group.full =Group full
label.learner.choice.group.message =Please select a group. Some groups may not be available if they reached the maximum number of members.
label.choose.group.button =Choose
+label.condition.gate.title =Condition Gate
+label.condition.gate.close.message =You have reached a condition gate. You have not satisfied the required conditions and you may not pass. Please return to previous activities.
-#======= End labels: Exported 86 labels for en AU =====
+#======= End labels: Exported 88 labels for en AU =====
Index: lams_learning/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -re05b81029b4cc80200194dd099736ee8af7e456e -rd5ff2e0121d67650eea6d972b04954a023cc3d4d
--- lams_learning/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision e05b81029b4cc80200194dd099736ee8af7e456e)
+++ lams_learning/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision d5ff2e0121d67650eea6d972b04954a023cc3d4d)
@@ -2,7 +2,7 @@
#language code: es
#locale code: ES
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 10 03:19:40 BST 2008
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Oct 03 00:37:25 BST 2008
#=================== labels for Learner (Java) =================#
@@ -89,6 +89,11 @@
message.activity.set.options.note =Atenci\u00f3n: Una vez finalizada las secuencias se pueden volver a revisitar usando la barra de progreso.
message.activity.set.options.note.maximum =Atenci\u00f3n: el n\u00famero m\u00e1ximo de actividades que usted debe realizar es {0}. Se puede revisitar las secuencias usando la barra de progreso.
label.preview.definelater.branching.message =La pr\u00f3xima actividad ({0}) ha sido definida en Seguimiento. Normalmente, el tutor configurar\u00eda las ramas en la interfaz de Seguimiento. Para el proposito de Vista Previa, usted podr\u00e1 seleccionar que ramas desea revisar.
+label.learner.choice.group.full =Este grupo se encuentra lleno.
+label.learner.choice.group.message =Por favor seleccione un grupo. Note que algunos grupos no estar\u00e1n disponibles si estos han alcanzado el n\u00famero m\u00e1ximo de miembros.
+label.choose.group.button =Seleccione
+label.condition.gate.title =Puerta condicional
+label.condition.gate.close.message =Usted se ha llegado a una puerta condicional. Usted no ha cumplido con alguna condici\u00f3n en las actividades que ha finalizado. Por favor, regrese revea las actividades anteriores.
-#======= End labels: Exported 83 labels for es ES =====
+#======= End labels: Exported 88 labels for es ES =====
Index: lams_learning/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -r9af281f1b1c101117548b77b373acc1d796aa5a9 -rd5ff2e0121d67650eea6d972b04954a023cc3d4d
--- lams_learning/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision 9af281f1b1c101117548b77b373acc1d796aa5a9)
+++ lams_learning/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision d5ff2e0121d67650eea6d972b04954a023cc3d4d)
@@ -2,7 +2,7 @@
#language code: no
#locale code: NO
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Oct 01 02:18:31 BST 2008
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Oct 03 00:37:29 BST 2008
#=================== labels for Learner (Java) =================#
@@ -92,6 +92,8 @@
label.learner.choice.group.full =Gruppen er full
label.learner.choice.group.message =Vennligst velg en gruppe. Noen grupper er kansje ikke tilgjengelige fordi de er fyllt opp med maksimalt antall deltagere for gruppen.
label.choose.group.button =Velg
+label.condition.gate.title =Port med forutsettninger
+label.condition.gate.close.message =Du har n\u00e5dd en port som har forutsettninger. Du har ikke m\u00f8tt disse forutsettningene og kan ikke fortsette. Vennligst g\u00e5 tilbake til foreg\u00e5ende aktivitet.
-#======= End labels: Exported 86 labels for no NO =====
+#======= End labels: Exported 88 labels for no NO =====
Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7066e2da251b1b0113f1a4f10995561202508d71 -rd5ff2e0121d67650eea6d972b04954a023cc3d4d
--- lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 7066e2da251b1b0113f1a4f10995561202508d71)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision d5ff2e0121d67650eea6d972b04954a023cc3d4d)
@@ -2,7 +2,7 @@
#language code: en
#locale code: AU
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:47:05 BST 2008
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Oct 03 00:39:37 BST 2008
#=================== labels for Monitor (Java) =================#
@@ -15,19 +15,13 @@
label.synch.gate.title =Synch Gate
label.permission.gate.title =Permission Gate
label.schedule.gate.title =Schedule Gate
-label.condtion.gate.title =Condition Gate
label.schedule.gate.open.message =Schedule Gate will be opened at:
label.schedule.gate.close.message =Schedule Gate will be closed at:
-label.gate.you.open.message =You may open the gate for the whole class
+label.gate.you.open.message =Class cannot continue until the gate is opened by you
label.gate.gate.open =Gate has been opened
label.gate.open =Open
label.gate.closed =Closed
-label.gate.allow=Allow to pass
label.gate.waiting.learners ={0} out of {1} are waiting in front of the gate.
-label.gate.open.single.learner =You may allow a single learner to pass the gate
-label.gate.list.all.learners=Forbidden to pass
-label.gate.list.waiting.learners=Waiting in front of the gate
-label.gate.list.allowed.learners=Allowed to pass
label.grouping.max.num.in.group.heading =Maximum number of groups:
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.group.heading =Groups
@@ -72,11 +66,11 @@
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.general.instructions.heading =General Instructions:
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 Add Group. Repeat as required. Select a group, then select students from Column 2 and click Add selected to group. Select students in Column 3 and click Remove selected members from group to remove them from the group membership. The changes are saved when you click any of the buttons.
-label.grouping.general.instructions.heading =General Instructions:
+label.condtion.gate.title =Condition Gate
-label.grouping.general.instructions.branching=You cannot add or remove groups for this grouping as it is used for Branching and adding and removing groups would affect the group to branch setup. You can only add/remove users to the existing groups.
-#======= End labels: Exported 64 labels for en AU =====
+#======= End labels: Exported 65 labels for en AU =====
Index: lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r7066e2da251b1b0113f1a4f10995561202508d71 -rd5ff2e0121d67650eea6d972b04954a023cc3d4d
--- lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 7066e2da251b1b0113f1a4f10995561202508d71)
+++ lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision d5ff2e0121d67650eea6d972b04954a023cc3d4d)
@@ -2,7 +2,7 @@
#language code: en
#locale code: AU
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed May 21 09:47:05 BST 2008
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Oct 03 00:39:37 BST 2008
#=================== labels for Monitor (Java) =================#
@@ -15,19 +15,13 @@
label.synch.gate.title =Synch Gate
label.permission.gate.title =Permission Gate
label.schedule.gate.title =Schedule Gate
-label.condtion.gate.title =Condition Gate
label.schedule.gate.open.message =Schedule Gate will be opened at:
label.schedule.gate.close.message =Schedule Gate will be closed at:
-label.gate.you.open.message =You may open the gate for the whole class
+label.gate.you.open.message =Class cannot continue until the gate is opened by you
label.gate.gate.open =Gate has been opened
label.gate.open =Open
label.gate.closed =Closed
-label.gate.allow=Allow to pass
label.gate.waiting.learners ={0} out of {1} are waiting in front of the gate.
-label.gate.open.single.learner =You may allow a single learner to pass the gate
-label.gate.list.all.learners=Forbidden to pass
-label.gate.list.waiting.learners=Waiting in front of the gate
-label.gate.list.allowed.learners=Allowed to pass
label.grouping.max.num.in.group.heading =Maximum number of groups:
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.group.heading =Groups
@@ -72,11 +66,11 @@
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.general.instructions.heading =General Instructions:
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 Add Group. Repeat as required. Select a group, then select students from Column 2 and click Add selected to group. Select students in Column 3 and click Remove selected members from group to remove them from the group membership. The changes are saved when you click any of the buttons.
-label.grouping.general.instructions.heading =General Instructions:
+label.condtion.gate.title =Condition Gate
-#======= End labels: Exported 64 labels for en AU =====
-label.grouping.general.instructions.branching=You cannot add or remove groups for this grouping as it is used for Branching and adding and removing groups would affect the group to branch setup. You can only add/remove users to the existing groups.
+#======= End labels: Exported 65 labels for en AU =====
Index: lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -re978ae9cb40427ac4a4875f1c7c5f9fd2b6e6f18 -rd5ff2e0121d67650eea6d972b04954a023cc3d4d
--- lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision e978ae9cb40427ac4a4875f1c7c5f9fd2b6e6f18)
+++ lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision d5ff2e0121d67650eea6d972b04954a023cc3d4d)
@@ -2,7 +2,7 @@
#language code: es
#locale code: ES
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 11 02:11:28 BST 2008
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Oct 03 00:39:33 BST 2008
#=================== labels for Monitor (Java) =================#
@@ -70,6 +70,7 @@
button.grouping.remove.selected.group =Eliminar Grupo Seleccionado
button.grouping.remove.user.from.group =Eliminar Estudiantes Seleccionados
label.completed =Terminado
+label.condtion.gate.title =Puerta Condicional
-#======= End labels: Exported 64 labels for es ES =====
+#======= End labels: Exported 65 labels for es ES =====
Index: lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -r562c05bd95679b9d6e1c50ca76db00e92a34cfe7 -rd5ff2e0121d67650eea6d972b04954a023cc3d4d
--- lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision 562c05bd95679b9d6e1c50ca76db00e92a34cfe7)
+++ lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision d5ff2e0121d67650eea6d972b04954a023cc3d4d)
@@ -2,7 +2,7 @@
#language code: no
#locale code: NO
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Jul 25 02:04:39 BST 2008
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Oct 03 00:39:28 BST 2008
#=================== labels for Monitor (Java) =================#
@@ -70,6 +70,7 @@
preview.deleted.message =Forh\u00e5ndsvis data for {0} leksjon(er) har blitt fjernet.
force.complete.stop.message.gate =Tvunget ferdigstilling stoppet ved porten"{0}" som ikke kan \u00e5pnes.
label.branching.general.instructions =Legg deltagerne i leksjonen til forgreningene. Du kan legge til og fjerne brukere, men s\u00e5 snart en student begynner i en forgrening s\u00e5 kan du ikke fjerne studenter fra forgreningene. Hvis du fors\u00f8ker \u00e5 fjerne noen fra en forgrening, s\u00e5 kontroller fremdriften deres i leksjonen--- hvis de har p\u00e5begynt en forgrening mens du arbeider med dette skjermbildet, s\u00e5 vil du ikke f\u00e5 noen filmelding og du f\u00e5r ikke fjernet dem fra forgreningen. Du kan fremdeles tilf\u00f8ye til studenter til en forgrening.
+label.condtion.gate.title =Port med forutsettninger
-#======= End labels: Exported 64 labels for no NO =====
+#======= End labels: Exported 65 labels for no NO =====