Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v diff -u -r1.71.2.6 -r1.71.2.7 --- lams_central/conf/language/lams/ApplicationResources.properties 23 Apr 2009 06:26:57 -0000 1.71.2.6 +++ lams_central/conf/language/lams/ApplicationResources.properties 27 Apr 2009 22:24:00 -0000 1.71.2.7 @@ -2,7 +2,7 @@ #language code: en #locale code: AU - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Apr 22 17:46:43 CST 2009 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Apr 27 16:22:43 CST 2009 #=================== labels for LAMS Central =================# @@ -210,6 +210,7 @@ error.user.not.found =Unable to find the username in LAMS. Please check your username and try again. error.support.email.not.set =Email could not be sent. The LAMS server has not been configured to handle emails. Please contact your System Administrator. error.password.request.expired =This request for a new password has expired. Please click the "Forgot your Password" link again to make a new request. +label.required =Required label.forgot.password.instructions.1 =Please enter your user name or email below. An email will be sent to you shortly with a link that will allow you to change your password. You only need to enter one value. label.forgot.password.instructions.2 =If you do not know your email address in LAMS, please contact your System Administrator. label.forgot.password.email =Check Email @@ -235,93 +236,38 @@ index.coursegradebook.tooltip =Open course-wide Gradebook monitoring page index.coursegradebook.learner =My Grades index.coursegradebookmonitor =Mark +label.timezone.title =Time Zone +label.timezone.0 =(GMT -12:00) Eniwetok, Kwajalein +label.timezone.1 =(GMT -11:00) Midway Island, Samoa +label.timezone.2 =(GMT -10:00) Hawaii +label.timezone.3 =(GMT -9:00) Alaska +label.timezone.4 =(GMT -8:00) Pacific Time (US & Canada) +label.timezone.5 =(GMT -7:00) Mountain Time (US & Canada) +label.timezone.6 =(GMT -6:00) Central Time (US & Canada), Mexico City +label.timezone.7 =(GMT -5:00) Eastern Time (US & Canada), Bogota, Lima +label.timezone.8 =(GMT -4:00) Atlantic Time (Canada), Caracas, La Paz +label.timezone.9 =(GMT -3:30) Newfoundland +label.timezone.10 =(GMT -3:00) Brazil, Buenos Aires, Georgetown +label.timezone.11 =(GMT -2:00) Mid-Atlantic +label.timezone.12 =(GMT -1:00 hour) Azores, Cape Verde Islands +label.timezone.13 =(GMT) Western Europe Time, London, Lisbon, Casablanca +label.timezone.14 =(GMT +1:00 hour) Brussels, Copenhagen, Madrid, Paris +label.timezone.15 =(GMT +2:00) Kaliningrad, South Africa +label.timezone.16 =(GMT +3:00) Baghdad, Riyadh, Moscow, St. Petersburg +label.timezone.17 =(GMT +3:30) Tehran +label.timezone.18 =(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi +label.timezone.19 =(GMT +4:30) Kabul +label.timezone.20 =(GMT +5:00) Ekaterinburg, Islamabad, Karachi, Tashkent +label.timezone.21 =(GMT +5:30) Bombay, Calcutta, Madras, New Delhi +label.timezone.22 =(GMT +5:45) Kathmandu +label.timezone.23 =(GMT +6:00) Almaty, Dhaka, Colombo +label.timezone.24 =(GMT +7:00) Bangkok, Hanoi, Jakarta +label.timezone.25 =(GMT +8:00) Beijing, Perth, Singapore, Hong Kong +label.timezone.26 =(GMT +9:00) Tokyo, Seoul, Osaka, Sapporo, Yakutsk +label.timezone.27 =(GMT +9:30) Adelaide, Darwin +label.timezone.28 =(GMT +10:00) Eastern Australia, Guam, Vladivostok +label.timezone.29 =(GMT +11:00) Magadan, Solomon Islands, New Caledonia +label.timezone.30 =(GMT +12:00) Auckland, Wellington, Fiji, Kamchatka - -index.planner =Planner -planner.title =Pedagogical Planner -label.description =Description -planner.saved =All activities were saved successfully. -planner.not.saved =There were errors in activities. Not all activities were saved. -error.planner.title.blank =Sequence title must not be blank. -label.planner.not.supported =This activity does not support the planner. -button.planner.save =Save As Sequence -label.planner.preview =Preview -button.planner.view.full.author =View in Full Author - -label.planner.grouping.type=Group type -label.planner.grouping.type.random=Random grouping -label.planner.grouping.type.chosen=Choose in Monitor -label.planner.grouping.type.learner.choice=Learner's choice -label.planner.grouping.number.of.groups=Number of groups -label.planner.grouping.number.of.learners=Number of learners -error.planner.grouping.number.integer=Provided value must be a positive integer number. -label.planner.grouping.equal.group.size=Equal group sizes -msg.planner.not.saved =Are you sure you want to close? If you have not saved the design, changes you have made will be lost. -label.planner.editing.advice=Editing advice -label.planner.branch.empty =This branch is empty. -label.planner.branch=Branch -label.planner.branch.default=(default) -label.planner.option=Option - -button.planner.editor.open=Open editor -msg.planner.node.locked=This node is locked. You can not edit it. -button.planner.save.node=Save node -label.planner.create.subnode=Create subnode -label.planner.edit.node=Edit node -label.planner.root.node=Planner -msg.planner.remove.node=Remove node -label.planner.empty.subnode=There are no subnodes defined. -label.planner.description.brief=Brief description (for parent node) -label.planner.description.full=Full description (for self) -label.planner.root.choose=Choose a planner from one of the following activity categories: -msg.planner.remove.warning=Are you sure you want to remove this node and all of its subnodes? - -label.planner.node.type=This node: -label.planner.node.type.subnodes=has subnodes -label.planner.node.type.template=opens a template -label.planner.remove.file=Remove file -label.planner.change.file=Change file: -label.planner.uploaded.template=Uploaded template file: -msg.planner.move.node.up=Move node up -msg.planner.move.node.down=Move node down -label.planner.choose.file=Choose a template file: -error.planner.node.title.blank=Node title must not be blank. -error.planner.repository=There was a file respository error. Template file was not saved. -error.planner.file.empty=You must upload a file. -error.planner.file.bad.extension=Template file must have a ZIP or LAS extension. - -error.planner.tools=There were tool errors. Learning design could not be retrieved. -error.planner.learning.design.retrieve=Learning design could not be retrieved. -error.planner.file.open=There was an error while opening the template file. -error.planner.editor=There was an error while opening the editor. -error.planner.export=There was an error while exporting the node. -error.planner.import=There was an error while importing the node. -label.planner.export=Export node -label.planner.import=Import node - -label.planner.import.instruction=Please select Pedagogical Planner node to import. The import file must be a .zip file exported from LAMS 2 or above. -label.planner.grouping.view.students=View students before selection - -error.planner.filter.parse=There was an error when parsing the filter query. -label.planner.filter.clear=Clear search results -label.planner.filter=Search -label.planner.filter.results.beginning=Search results for " -label.planner.filter.results.ending=" in -label.planner.locked=(locked) -label.planner.filter.find.location=Found in: - -button.planner.template.close=Close editor -msg.planner.editor.not.saved=Are you sure you want to close? If you have not saved the design, changes you have made will be lost and you will return to the previous node. - -label.planner.editor=Editor -msg.planner.preview=Open the template in lesson preview. -msg.planner.template.open=Open the template for editing. - -label.planner.export.sequence=Export sequence -error.planner.export.template=There was an error while exporting the template. -label.required =Required - - - -#======= End labels: Exported 229 labels for en AU ===== +#======= End labels: Exported 262 labels for en AU ===== Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.67.2.6 -r1.67.2.7 --- lams_central/conf/language/lams/ApplicationResources_en_AU.properties 23 Apr 2009 06:26:57 -0000 1.67.2.6 +++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties 27 Apr 2009 22:24:00 -0000 1.67.2.7 @@ -2,7 +2,7 @@ #language code: en #locale code: AU - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Apr 22 17:46:43 CST 2009 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Apr 27 16:22:43 CST 2009 #=================== labels for LAMS Central =================# @@ -210,6 +210,7 @@ error.user.not.found =Unable to find the username in LAMS. Please check your username and try again. error.support.email.not.set =Email could not be sent. The LAMS server has not been configured to handle emails. Please contact your System Administrator. error.password.request.expired =This request for a new password has expired. Please click the "Forgot your Password" link again to make a new request. +label.required =Required label.forgot.password.instructions.1 =Please enter your user name or email below. An email will be sent to you shortly with a link that will allow you to change your password. You only need to enter one value. label.forgot.password.instructions.2 =If you do not know your email address in LAMS, please contact your System Administrator. label.forgot.password.email =Check Email @@ -235,92 +236,38 @@ index.coursegradebook.tooltip =Open course-wide Gradebook monitoring page index.coursegradebook.learner =My Grades index.coursegradebookmonitor =Mark +label.timezone.title =Time Zone +label.timezone.0 =(GMT -12:00) Eniwetok, Kwajalein +label.timezone.1 =(GMT -11:00) Midway Island, Samoa +label.timezone.2 =(GMT -10:00) Hawaii +label.timezone.3 =(GMT -9:00) Alaska +label.timezone.4 =(GMT -8:00) Pacific Time (US & Canada) +label.timezone.5 =(GMT -7:00) Mountain Time (US & Canada) +label.timezone.6 =(GMT -6:00) Central Time (US & Canada), Mexico City +label.timezone.7 =(GMT -5:00) Eastern Time (US & Canada), Bogota, Lima +label.timezone.8 =(GMT -4:00) Atlantic Time (Canada), Caracas, La Paz +label.timezone.9 =(GMT -3:30) Newfoundland +label.timezone.10 =(GMT -3:00) Brazil, Buenos Aires, Georgetown +label.timezone.11 =(GMT -2:00) Mid-Atlantic +label.timezone.12 =(GMT -1:00 hour) Azores, Cape Verde Islands +label.timezone.13 =(GMT) Western Europe Time, London, Lisbon, Casablanca +label.timezone.14 =(GMT +1:00 hour) Brussels, Copenhagen, Madrid, Paris +label.timezone.15 =(GMT +2:00) Kaliningrad, South Africa +label.timezone.16 =(GMT +3:00) Baghdad, Riyadh, Moscow, St. Petersburg +label.timezone.17 =(GMT +3:30) Tehran +label.timezone.18 =(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi +label.timezone.19 =(GMT +4:30) Kabul +label.timezone.20 =(GMT +5:00) Ekaterinburg, Islamabad, Karachi, Tashkent +label.timezone.21 =(GMT +5:30) Bombay, Calcutta, Madras, New Delhi +label.timezone.22 =(GMT +5:45) Kathmandu +label.timezone.23 =(GMT +6:00) Almaty, Dhaka, Colombo +label.timezone.24 =(GMT +7:00) Bangkok, Hanoi, Jakarta +label.timezone.25 =(GMT +8:00) Beijing, Perth, Singapore, Hong Kong +label.timezone.26 =(GMT +9:00) Tokyo, Seoul, Osaka, Sapporo, Yakutsk +label.timezone.27 =(GMT +9:30) Adelaide, Darwin +label.timezone.28 =(GMT +10:00) Eastern Australia, Guam, Vladivostok +label.timezone.29 =(GMT +11:00) Magadan, Solomon Islands, New Caledonia +label.timezone.30 =(GMT +12:00) Auckland, Wellington, Fiji, Kamchatka - -index.planner =Planner -planner.title =Pedagogical Planner -label.description =Description -planner.saved =All activities were saved successfully. -planner.not.saved =There were errors in activities. Not all activities were saved. -error.planner.title.blank =Sequence title must not be blank. -label.planner.not.supported =This activity does not support the planner. -button.planner.save =Save As Sequence -label.planner.preview =Preview -button.planner.view.full.author =View in Full Author - -label.planner.grouping.type=Group type -label.planner.grouping.type.random=Random grouping -label.planner.grouping.type.chosen=Choose in Monitor -label.planner.grouping.type.learner.choice=Learner's choice -label.planner.grouping.number.of.groups=Number of groups -label.planner.grouping.number.of.learners=Number of learners -error.planner.grouping.number.integer=Provided value must be a positive integer number. -label.planner.grouping.equal.group.size=Equal group sizes -msg.planner.not.saved =Are you sure you want to close? If you have not saved the design, changes you have made will be lost. -label.planner.editing.advice=Editing advice -label.planner.branch.empty =This branch is empty. -label.planner.branch=Branch -label.planner.branch.default=(default) -label.planner.option=Option - -button.planner.editor.open=Open editor -msg.planner.node.locked=This node is locked. You can not edit it. -button.planner.save.node=Save node -label.planner.create.subnode=Create subnode -label.planner.edit.node=Edit node -label.planner.root.node=Planner -msg.planner.remove.node=Remove node -label.planner.empty.subnode=There are no subnodes defined. -label.planner.description.brief=Brief description (for parent node) -label.planner.description.full=Full description (for self) -label.planner.root.choose=Choose a planner from one of the following activity categories: -msg.planner.remove.warning=Are you sure you want to remove this node and all of its subnodes? - -label.planner.node.type=This node: -label.planner.node.type.subnodes=has subnodes -label.planner.node.type.template=opens a template -label.planner.remove.file=Remove file -label.planner.change.file=Change file: -label.planner.uploaded.template=Uploaded template file: -msg.planner.move.node.up=Move node up -msg.planner.move.node.down=Move node down -label.planner.choose.file=Choose a template file: -error.planner.node.title.blank=Node title must not be blank. -error.planner.repository=There was a file respository error. Template file was not saved. -error.planner.file.empty=You must upload a file. -error.planner.file.bad.extension=Template file must have a ZIP or LAS extension. - -error.planner.tools=There were tool errors. Learning design could not be retrieved. -error.planner.learning.design.retrieve=Learning design could not be retrieved. -error.planner.file.open=There was an error while opening the template file. -error.planner.editor=There was an error while opening the editor. -error.planner.export=There was an error while exporting the node. -error.planner.import=There was an error while importing the node. -label.planner.export=Export node -label.planner.import=Import node - -label.planner.import.instruction=Please select Pedagogical Planner node to import. The import file must be a .zip file exported from LAMS 2 or above. -label.planner.grouping.view.students=View students before selection - -error.planner.filter.parse=There was an error when parsing the filter query. -label.planner.filter.clear=Clear search results -label.planner.filter=Search -label.planner.filter.results.beginning=Search results for " -label.planner.filter.results.ending=" in -label.planner.locked=(locked) -label.planner.filter.find.location=Found in: - -button.planner.template.close=Close editor -msg.planner.editor.not.saved=Are you sure you want to close? If you have not saved the design, changes you have made will be lost and you will return to the previous node. - -label.planner.editor=Editor -msg.planner.preview=Open the template in lesson preview. -msg.planner.template.open=Open the template for editing. - -label.planner.export.sequence=Export sequence -error.planner.export.template=There was an error while exporting the template. -label.required =Required - - -#======= End labels: Exported 229 labels for en AU ===== +#======= End labels: Exported 262 labels for en AU ===== Index: lams_central/conf/xdoclet/struts-forms.xml =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/struts-forms.xml,v diff -u -r1.8 -r1.8.4.1 --- lams_central/conf/xdoclet/struts-forms.xml 13 Feb 2009 17:45:44 -0000 1.8 +++ lams_central/conf/xdoclet/struts-forms.xml 27 Apr 2009 22:24:00 -0000 1.8.4.1 @@ -32,6 +32,7 @@ + Index: lams_central/web/editprofile.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/editprofile.jsp,v diff -u -r1.14 -r1.14.4.1 --- lams_central/web/editprofile.jsp 28 Jan 2009 00:11:26 -0000 1.14 +++ lams_central/web/editprofile.jsp 27 Apr 2009 22:24:00 -0000 1.14.4.1 @@ -127,6 +127,18 @@ + + : + + + + + + + + + + @@ -249,7 +261,14 @@ - + + + : + + + + +