Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r5fc48d9fd1d3e25e10c046eaa1ae0281356d4b90 -rdb3b153522421c748da5d7a67df4fcdf0652cbc7 --- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 5fc48d9fd1d3e25e10c046eaa1ae0281356d4b90) +++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision db3b153522421c748da5d7a67df4fcdf0652cbc7) @@ -2,7 +2,7 @@ #language code: en #locale code: AU - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Jun 06 08:58:30 BST 2008 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 10 03:20:26 BST 2008 #=================== labels for LAMS Central =================# @@ -213,6 +213,7 @@ error.forgot.password.email =Please enter an email address. error.forgot.password.username =Please enter a username. button.select.another.importfile =Select Another File To Import +error.forgot.password.incorrect.key =The request key is incorrect or has already been used. Please click the "Forgot your Password" link again to make a new request. -#======= End labels: Exported 207 labels for en AU ===== +#======= End labels: Exported 208 labels for en AU ===== Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r5fc48d9fd1d3e25e10c046eaa1ae0281356d4b90 -rdb3b153522421c748da5d7a67df4fcdf0652cbc7 --- lams_central/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 5fc48d9fd1d3e25e10c046eaa1ae0281356d4b90) +++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision db3b153522421c748da5d7a67df4fcdf0652cbc7) @@ -2,7 +2,7 @@ #language code: en #locale code: AU - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Jun 06 08:58:30 BST 2008 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 10 03:20:26 BST 2008 #=================== labels for LAMS Central =================# @@ -213,6 +213,7 @@ error.forgot.password.email =Please enter an email address. error.forgot.password.username =Please enter a username. button.select.another.importfile =Select Another File To Import +error.forgot.password.incorrect.key =The request key is incorrect or has already been used. Please click the "Forgot your Password" link again to make a new request. -#======= End labels: Exported 207 labels for en AU ===== +#======= End labels: Exported 208 labels for en AU ===== Index: lams_central/conf/language/lams/ApplicationResources_es_ES.properties =================================================================== diff -u -r786ef1286ad15b4ef2c676b148814fe5da11163d -rdb3b153522421c748da5d7a67df4fcdf0652cbc7 --- lams_central/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision 786ef1286ad15b4ef2c676b148814fe5da11163d) +++ lams_central/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision db3b153522421c748da5d7a67df4fcdf0652cbc7) @@ -2,7 +2,7 @@ #language code: es #locale code: ES - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Apr 30 04:29:48 BST 2008 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 10 03:20:34 BST 2008 #=================== labels for LAMS Central =================# @@ -203,6 +203,7 @@ msg.browser.compat =Su navegador puede que no sea compatible con LAMS. Recomendamos que use Mozilla Firefox 1.5 o mayor forgot.password.email.body =Copie el enlace a su navegador de internet para poder cambiar su contrase\u00f1a. error.newpassword.mismatch =Sus nuevas contrase\u00f1as no son iguales. +button.select.another.importfile =Seleccione otro archivo a importar label.forgot.password.instructions.1 =Por favor ingrese su nombre de usuario O su email. Un correo le ser\u00e1 enviado brevemente con un enlace para que cambie su contrase\u00f1a. Solo necesita uno de los siguientes datos. label.forgot.password.instructions.2 =Si usted no tiene email, comuniquese con el administrador de sistema. label.forgot.password.email =Ingrese email @@ -212,7 +213,7 @@ error.email.not.found =No se ha encontrado un usuario que tenga el email mencionado. Verifique su email e intente nuevamente. error.forgot.password.email =Ingrese email error.forgot.password.username =Ingrese nombre de usuario -button.select.another.importfile =Seleccione otro archivo a importar +error.forgot.password.incorrect.key =La clave es incorrecta o ya ha sido utilizada. Vuelva a la p\u00e1gina inicial y solicite nuevamente que se le envie una nueva contrase\u00f1a. -#======= End labels: Exported 207 labels for es ES ===== +#======= End labels: Exported 208 labels for es ES ===== Index: lams_central/conf/language/lams/ApplicationResources_no_NO.properties =================================================================== diff -u -r5fc48d9fd1d3e25e10c046eaa1ae0281356d4b90 -rdb3b153522421c748da5d7a67df4fcdf0652cbc7 --- lams_central/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision 5fc48d9fd1d3e25e10c046eaa1ae0281356d4b90) +++ lams_central/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision db3b153522421c748da5d7a67df4fcdf0652cbc7) @@ -2,7 +2,7 @@ #language code: no #locale code: NO - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Jun 06 08:58:35 BST 2008 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 10 03:20:30 BST 2008 #=================== labels for LAMS Central =================# @@ -213,6 +213,7 @@ label.forgot.password.instructions.1 =Vennligst skriv inn brukernavnet eller e-postadressen din. Det vil bli sent en e-post til deg med en lenke til den siden hvor du kan endre passordet ditt. msg.export.loading =Nedlasting av l\u00e6resekvensen starter automatisk om noen sekunder, vennligst vent.... authoring.msg.save.success =Gratulerer, ditt innhold er lagret ! +error.forgot.password.incorrect.key =Foresp\u00f8rselen er ikke riktig eller benyttet tidligere. Klikk p\u00e5 "Glemt passordet" for \u00e5 sende en ny foresp\u00f8rsel. -#======= End labels: Exported 207 labels for no NO ===== +#======= End labels: Exported 208 labels for no NO ===== Index: lams_common/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rdff974ef2462e40cacf7f8c737fc6ec4bb501806 -rdb3b153522421c748da5d7a67df4fcdf0652cbc7 --- lams_common/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision dff974ef2462e40cacf7f8c737fc6ec4bb501806) +++ lams_common/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision db3b153522421c748da5d7a67df4fcdf0652cbc7) @@ -2,7 +2,7 @@ #language code: en #locale code: AU - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri May 02 07:05:44 BST 2008 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 10 03:21:28 BST 2008 #=================== labels for LAMS Common =================# @@ -40,15 +40,15 @@ audit.user.create =Created user: {0}, Full Name: {1} validation.error.sequenceActivityMustHaveFirstActivity =A Branch must have a first Activity. validation.error.branching.must.have.a.branch =A Branching Activity must have at least one Branch. -validation.error.toolBranchingMustHaveDefaultBranch =A Learner's Output Branching Activity must have a Default Branch. validation.error.groupedBranchingMustHaveAGrouping =A Group Based Branching Activity must have a Grouping Activity. Unless Define Later is turned on, it must have at least one group. validation.error.groupedBranchingMustHaveBranchForGroup =A Group Based Branching Activity must have all Groups assigned to Branches. validation.error.toolBranchingConditionInvalid =A condition has a bad or missing comparison value. -validation.error.toolBranchingMustHaveAnInputToolActivity =A Learner's Output Branching Activity must have an Input Tool. error.possibly.incompatible.version =Cannot confirm that the .zip file is compatible with the current version of LAMS. It may be from a newer version of LAMS. Version from .zip file is {0}, current LAMS version is {1}. Import may fail. validation.error.group.count.mismatch =More groups exist than the number of groups that should exist. msg.import.file.format =The import file must be a LAMS format .zip file exported from LAMS 2 or above, or a .las file exported from LAMS 1.0.2. You cannot import a design exported using the IMS Learning Design format. +validation.error.toolBranchingMustHaveACondition = Learner's Output Branching Activity must have at least one condition. +validation.error.toolBranchingMustHaveDefaultBranch =A Learner's Output Branching Activity must have a Default Branch. +validation.error.toolBranchingMustHaveAnInputToolActivity =A Learner's Output Branching Activity must have an Input Tool. -#======= End labels: Exported 42 labels for en AU ===== -validation.error.toolBranchingMustHaveACondition=A Learner's Output Branching Activity must have at least one condition. \ No newline at end of file +#======= End labels: Exported 43 labels for en AU ===== Index: lams_common/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rbb1a7ea8577e8a7fabc9d2f468a45d491f8450c6 -rdb3b153522421c748da5d7a67df4fcdf0652cbc7 --- lams_common/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision bb1a7ea8577e8a7fabc9d2f468a45d491f8450c6) +++ lams_common/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision db3b153522421c748da5d7a67df4fcdf0652cbc7) @@ -2,7 +2,7 @@ #language code: en #locale code: AU - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri May 02 07:05:44 BST 2008 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 10 03:21:28 BST 2008 #=================== labels for LAMS Common =================# @@ -40,14 +40,15 @@ audit.user.create =Created user: {0}, Full Name: {1} validation.error.sequenceActivityMustHaveFirstActivity =A Branch must have a first Activity. validation.error.branching.must.have.a.branch =A Branching Activity must have at least one Branch. -validation.error.toolBranchingMustHaveDefaultBranch =A Tool Output Based Branching Activity must have a Default Branch. validation.error.groupedBranchingMustHaveAGrouping =A Group Based Branching Activity must have a Grouping Activity. Unless Define Later is turned on, it must have at least one group. validation.error.groupedBranchingMustHaveBranchForGroup =A Group Based Branching Activity must have all Groups assigned to Branches. validation.error.toolBranchingConditionInvalid =A condition has a bad or missing comparison value. -validation.error.toolBranchingMustHaveAnInputToolActivity =A Tool Output Based Branching Activity must have an Input Tool. error.possibly.incompatible.version =Cannot confirm that the .zip file is compatible with the current version of LAMS. It may be from a newer version of LAMS. Version from .zip file is {0}, current LAMS version is {1}. Import may fail. validation.error.group.count.mismatch =More groups exist than the number of groups that should exist. msg.import.file.format =The import file must be a LAMS format .zip file exported from LAMS 2 or above, or a .las file exported from LAMS 1.0.2. You cannot import a design exported using the IMS Learning Design format. +validation.error.toolBranchingMustHaveACondition = Learner's Output Branching Activity must have at least one condition. +validation.error.toolBranchingMustHaveDefaultBranch =A Learner's Output Branching Activity must have a Default Branch. +validation.error.toolBranchingMustHaveAnInputToolActivity =A Learner's Output Branching Activity must have an Input Tool. -#======= End labels: Exported 42 labels for en AU ===== +#======= End labels: Exported 43 labels for en AU ===== Index: lams_common/conf/language/lams/ApplicationResources_es_ES.properties =================================================================== diff -u -re978ae9cb40427ac4a4875f1c7c5f9fd2b6e6f18 -rdb3b153522421c748da5d7a67df4fcdf0652cbc7 --- lams_common/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision e978ae9cb40427ac4a4875f1c7c5f9fd2b6e6f18) +++ lams_common/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision db3b153522421c748da5d7a67df4fcdf0652cbc7) @@ -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:12:24 BST 2008 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 10 03:21:21 BST 2008 #=================== labels for LAMS Common =================# @@ -48,6 +48,7 @@ validation.error.groupedBranchingMustHaveAGrouping =Una actividad de grupo basada en ramificaciones debe tener una actividad de grupo. A menos que la definici\u00f3n posterior est\u00e9 activada, deber\u00eda tener al menos un grupo. 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. -#======= End labels: Exported 42 labels for es ES ===== +#======= End labels: Exported 43 labels for es ES ===== Index: lams_common/conf/language/lams/ApplicationResources_no_NO.properties =================================================================== diff -u -r54d8b6bb0a3171a6e811f3bd9948997fdc6492a2 -rdb3b153522421c748da5d7a67df4fcdf0652cbc7 --- lams_common/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision 54d8b6bb0a3171a6e811f3bd9948997fdc6492a2) +++ lams_common/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision db3b153522421c748da5d7a67df4fcdf0652cbc7) @@ -2,7 +2,7 @@ #language code: no #locale code: NO - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Jun 06 09:00:36 BST 2008 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 10 03:21:25 BST 2008 #=================== labels for LAMS Common =================# @@ -48,6 +48,7 @@ validation.error.toolBranchingConditionInvalid =En forutsettning har en ugyldig eller mangler en sammenlignings verdi validation.error.toolBranchingMustHaveAnInputToolActivity =En gren basert p\u00e5 forskjellige verkt\u00f8y m\u00e5 minimum ha et verkt\u00f8y for inngangsdata validation.error.group.count.mismatch =Merk. Det finnes flere grupper enn det som skal v\u00e6re definert +validation.error.toolBranchingMustHaveACondition =Studentens utg\u00e5ende grenaktivitet m\u00e5 minimum ha en betingelse. -#======= End labels: Exported 42 labels for no NO ===== +#======= End labels: Exported 43 labels for no NO =====