Index: lams_central/conf/language/lams/ApplicationResources_mi_NZ.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_mi_NZ.properties,v
diff -u -r1.7 -r1.8
--- lams_central/conf/language/lams/ApplicationResources_mi_NZ.properties	11 Jan 2008 01:13:02 -0000	1.7
+++ lams_central/conf/language/lams/ApplicationResources_mi_NZ.properties	3 Jun 2008 07:16:10 -0000	1.8
@@ -2,11 +2,35 @@
 #language code: mi 
 #locale code: NZ 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Jan 11 01:18:17 GMT 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 03 08:16:00 BST 2008 
  
 #=================== labels for LAMS Central =================# 
 
 audit.user.password.change  =Kua hurihia te kupuhuna m\u014d: {0}
+label.ok  =Whakaae
+title.forgot.password  =LAMS :: Wareware Kupuhuna
+label.forgot.password  =Kua wareware t\u014d Kupuhuna
+button.select.importfile  =K\u014dwhiri kawe k\u014dnae mai
+label.enable.flash  =Whakarite Mata Flash m\u014d te \u0100konga
+label.yes  =\u0100e
+label.no  =Kao
+label.forgot.password.confirm  =Tono Kupuhuna
+forgot.password.email.subject  =T\u016bmau LAMS - K\u014drero wareware kupuhuna
+forgot.password.email.body  =P\u0101whirihia te hononga ki raro ka tae ki wharangi whakarereketia t\u014du kupuhuna.
+forgot.password.email.sent  =Kua tuku p\u0101nui em\u0113r\u0101 ki t\u014d tunga em\u0113r\u0101
+error.user.not.found  =K\u0101ore e taea te kimi kaimahi i LAMS. Tirohia an\u014d ki te ingoa takiuru katahi ka mahi an\u014d.
+error.support.email.not.set  =Kaore e taea te tuku em\u0113r\u0101. K\u0101ore i whakarite t\u0113nei t\u016bmau a LAMS ki te tuku em\u0113r\u0101. P\u0101 atu ki te Kaiwhakahaere P\u016bnaha.
+error.password.request.expired  =Kua pau w\u0101 m\u014d te tono kupuhuna h\u014du. P\u0101whirihia te hononga "Kua wareware t\u014d Kupuhuna" ki te tuku tono h\u014du.
+label.forgot.password.instructions.1  =Tuhi ingoa tunga em\u0113r\u0101 mai. Ka tuku p\u0101nui em\u0113r\u0101 me te hononga kia whakarerek\u0113tia e koe t\u014d kupuhuna.
+label.forgot.password.email  =Tirohia em\u0113r\u0101
+label.forgot.password.username  =Tirohia Ingoa Takiuru
+error.forgot.password.fields  =Whakakiia ng\u0101 tapanga e rua. Mahi an\u014d.
+error.email.not.sent  =Kaore te t\u016bmau i tuku em\u0113r\u0101 ki te kaitono. P\u0101 atu ki t\u014du Kaiwhakahaere P\u016bnaha.
+error.email.not.found  =K\u0101ore e taea te kaimahi i hono ki t\u0113nei t\u016bnga em\u0113r\u0101. Tirohia ki te t\u016bnga em\u0113r\u0101 an\u014d.
+error.forgot.password.email  =Tuhi t\u016bnga em\u0113r\u0101 mai.
+error.forgot.password.username  =Tuhi ingoa takiuru mai.
+button.select.another.importfile  =K\u014dwhiri K\u014dnae atu hei Kawe atu
+label.forgot.password.instructions.2  =Ki te kore e m\u014dhiotia t\u014du t\u016bnga em\u0113r\u0101 i LAMS, p\u0101 atu ki te Kaiwhakahaere P\u016bnaha.
 msg.import.file.not.found  =K\u0101ore i tukuna atu te k\u014dnae i k\u014dwhiria e t\u014d p\u016btirotiro. Whakam\u0101tauria an\u014d.
 label.archived  =Kua whakap\u016brangatia
 label.disabled  =I Monokia
@@ -191,4 +215,4 @@
 label.lesson.sorting.enabled  =kua \u0101heitia te whakaraupapa
 
 
-#======= End labels: Exported 183 labels for mi NZ =====
+#======= End labels: Exported 207 labels for mi NZ =====
Index: lams_common/conf/language/lams/ApplicationResources_mi_NZ.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/language/lams/ApplicationResources_mi_NZ.properties,v
diff -u -r1.4 -r1.5
--- lams_common/conf/language/lams/ApplicationResources_mi_NZ.properties	7 Mar 2008 07:12:28 -0000	1.4
+++ lams_common/conf/language/lams/ApplicationResources_mi_NZ.properties	3 Jun 2008 07:17:12 -0000	1.5
@@ -2,7 +2,7 @@
 #language code: mi 
 #locale code: NZ 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Mar 07 07:29:48 GMT 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 03 08:17:00 BST 2008 
  
 #=================== labels for LAMS Common =================# 
 
@@ -47,6 +47,7 @@
 validation.error.toolBranchingConditionInvalid  =He uara whakaorite i te he i te ngaro r\u0101nei kei te herenga.
 validation.error.toolBranchingMustHaveAnInputToolActivity  =Me noho te Taputapu T\u0101uru ki te Ngohe Pekanga Huaputa Utauta.
 error.possibly.incompatible.version  =K\u0101ore e taea te whakat\u016bturutia te k\u014dnae .zip i te whaka\u0101heitanga ki t\u0113nei momo \u0101huatanga \u0101 LAMS. T\u0113r\u0101 pea n\u014d t\u0113tehi momo \u0101huatanga h\u014du k\u0113. Ko t\u0113nei momo \u0101huatanga .zip ko {0}, ko te momo \u0101huatanga \u0101 LAMS ko {1}. T\u0113n\u0101 pea k\u0101ore i te tuku t\u014dtika mai.
+validation.error.group.count.mismatch  =He nui rawa te tau r\u014dp\u016b ki ng\u0101 r\u014dp\u016b t\u016bturu.
 
 
-#======= End labels: Exported 41 labels for mi NZ =====
+#======= End labels: Exported 42 labels for mi NZ =====
Index: lams_monitoring/conf/language/lams/ApplicationResources_mi_NZ.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/lams/ApplicationResources_mi_NZ.properties,v
diff -u -r1.2 -r1.3
--- lams_monitoring/conf/language/lams/ApplicationResources_mi_NZ.properties	1 Nov 2007 05:37:50 -0000	1.2
+++ lams_monitoring/conf/language/lams/ApplicationResources_mi_NZ.properties	3 Jun 2008 07:16:34 -0000	1.3
@@ -2,7 +2,7 @@
 #language code: mi 
 #locale code: NZ 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Nov 01 05:31:33 GMT 2007 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 03 08:16:34 BST 2008 
  
 #=================== labels for Monitor (Java) =================# 
 
@@ -33,7 +33,6 @@
 force.complete.stop.message.completed.to.activity  =Ka tika te uruhi whakaoti.
 export.portfolio.window.title  =Kawe K\u014dpaki
 export.portfolio.generating.message  =Kei te waihangatia te k\u014dpaki - tatari koa.
-export.portfolio.generation.complete.message  =Kua waihangatia te k\u014dpaki. Kei te tiki ake t\u014d p\u016btirotiro i te k\u014dnae in\u0101ianei. Ina oti te k\u014dnae te tiaki, katia koa t\u0113nei matapihi.
 error.title  =He Hapa
 label.synch.gate.title  =Tomokanga Tukutahi
 label.permission.gate.title  =Tomokanga Whakaae
@@ -54,9 +53,10 @@
 label.grouping.group.heading  =R\u014dp\u016b
 monitor.title  =Aroturuki :: LAMS
 button.grouping.add.group  =T\u0101piri r\u014dp\u016b
-error.message.login  =Whakauru mai <a href='/lams/index.jsp'>here</a>
-audit.lesson.created  =Kua hangaia '{0}' me te hoahoa akoranga '{1}', kua whakaritea te kawe k\u014dpaki ki {2}.
-audit.learner.portfolio.set  =Kua whakaritea e te akoranga '{0}' te kawe k\u014dpaki m\u014d te \u0101konga ki {1}.
+error.message.login  =Whakauru mai <a href="/lams/index.jsp">here</a>
+export.portfolio.generation.complete.message  =Kua waihangatia te k\u014dpaki. Kei te tiki ake t\u014d p\u016btirotiro h\u014dtaka ipurangi i te k\u014dnae in\u0101ianei. Ina oti te k\u014dnae te tiaki, katia koa t\u0113nei matapihi.
+audit.lesson.created  =Kua hangaia "{0}" me te hoahoa akoranga "{1}", kua whakaritea te kawe k\u014dpaki ki {2}.
+audit.learner.portfolio.set  =Kua whakaritea e te akoranga "{0}" te kawe k\u014dpaki m\u014d te \u0101konga ki {1}.
 label.branching.general.instructions  =Whakaurua ng\u0101 \u0101konga ki \u014d r\u0101tou pekanga. I te t\u012bmatanga ka taea te t\u0101piri me te tango kaiwhakamahi engari hei te t\u012bmatanga a te \u0101konga i t\u0113tehi pekanga e kore rawa e taea te tango kaiwhakamahi i ng\u0101 pekanga katoa. M\u0113n\u0101 ka whai koe te tango i t\u0113tahi \u0101konga i t\u0113tehi pekanga, \u0101, k\u0101ore e taea te tango, tirohia ki t\u0101na k\u0101neketanga - m\u0113n\u0101 ka t\u012bmata ia ki te whakamahi i te pekanga i a koe e noho ana i t\u0113nei mata, k\u0101ore he hapa e puta, engari e kore rawa e taea te tango i taua \u0101konga i te pekanga. Ka taea tonutia te t\u0101piri kaiwhakamahi ki ng\u0101 pekanga.
 label.branching.branch.heading  =Pekanga
 label.branching.non.allocated.users.heading  =Ng\u0101 \u0101konga k\u0101ore he Pekanga
@@ -66,6 +66,10 @@
 label.branching.general.group.instructions  =Whakaurua ng\u0101 r\u014dp\u016b ki ng\u0101 pekanga. I te t\u012bmatanga ka taea te t\u0101piri me te tango i ng\u0101 r\u014dp\u016b, \u0113ngari hei te t\u012bmatanga a te \u0101konga i t\u0113tehi pekanga e kore rawa e taea te tango r\u014dp\u016b i ng\u0101 pekanga katoa. Ka taea tonutia te t\u0101piri r\u014dp\u016b ki ng\u0101 pekanga.
 label.branching.non.allocated.groups.heading  =Ng\u0101 r\u014dp\u016b k\u0101ore he Pekanga
 label.branching.allocated.groups.heading  =Ng\u0101 r\u014dp\u016b o te Pekanga i k\u014dwhirihia
+label.started  =Kua Timata
+label.not.started  =Kaore i Timata
+label.completed  =Kua Oti
+message.activity.parallel.noFrames  =Kaore i t\u014d p\u016btirotiro h\u014dtaka ipurangi e whakaatu tapanga.
 
 
-#======= End labels: Exported 60 labels for mi NZ =====
+#======= End labels: Exported 64 labels for mi NZ =====
Index: lams_tool_chat/conf/language/lams/ApplicationResources_mi_NZ.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/conf/language/lams/ApplicationResources_mi_NZ.properties,v
diff -u -r1.8 -r1.9
--- lams_tool_chat/conf/language/lams/ApplicationResources_mi_NZ.properties	11 Apr 2008 00:53:23 -0000	1.8
+++ lams_tool_chat/conf/language/lams/ApplicationResources_mi_NZ.properties	3 Jun 2008 07:17:48 -0000	1.9
@@ -2,7 +2,7 @@
 #language code: mi 
 #locale code: NZ 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 11 02:14:05 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 03 08:17:45 BST 2008 
  
 #=================== labels for Chat =================# 
 
@@ -94,6 +94,8 @@
 message.no.reflection.available  =K\u0101ore he pukatuhi
 message.alertContentEdit  =Kia Mataara: Kua whakauru mai t\u0113tehi \u0101konga ki t\u0113nei ngohe. Ka whakarerek\u0113tia ng\u0101 ihirangi ka puta ng\u0101 m\u014dhiotanga rerek\u0113 ki te \u0101konga.
 button.upload  =Tuku Atu
+message.warnLockOnFinish  =Ka p\u0101whirihia e koe "Ngohe Whai Ake" a ka hoki mai ki t\u0113nei K\u014drerorero, k\u0101ore e taea te k\u014drerorero tonu.
+message.activityLocked  =Kua whakaritea kore whakaae i te k\u014drerorero t\u0113nei ngohe ina oti koe t\u0113nei ngohe. In\u0101 ka hoki mai ki t\u0113nei K\u014drerorero an\u014d, ka taea te p\u0101nui i ng\u0101 korero i tuku \u0113ngari k\u0101ore e taea te tuku k\u014drero mai an\u014d.
 
 
-#======= End labels: Exported 88 labels for mi NZ =====
+#======= End labels: Exported 90 labels for mi NZ =====
Index: lams_tool_notebook/conf/language/lams/ApplicationResources_mi_NZ.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/conf/language/lams/ApplicationResources_mi_NZ.properties,v
diff -u -r1.5 -r1.6
--- lams_tool_notebook/conf/language/lams/ApplicationResources_mi_NZ.properties	11 Apr 2008 01:03:45 -0000	1.5
+++ lams_tool_notebook/conf/language/lams/ApplicationResources_mi_NZ.properties	3 Jun 2008 07:18:58 -0000	1.6
@@ -2,7 +2,7 @@
 #language code: mi 
 #locale code: NZ 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 11 02:26:41 BST 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 03 08:18:57 BST 2008 
  
 #=================== labels for Notebook =================# 
 
@@ -82,6 +82,8 @@
 button.editActivity  =Whakatikatika
 message.alertContentEdit  =Kia Mataara: Kua whakauru mai t\u0113tehi \u0101konga ki t\u0113nei ngohe. Ka whakarerek\u0113tia ng\u0101 ihirangi ka puta ng\u0101 m\u014dhiotanga rerek\u0113 ki te \u0101konga.
 message.learner.blank.input  =K\u0101hore an\u014d kia tuhituhi. N\u0113, ka tika t\u0113n\u0101?
+message.activityLocked  =Kua whakaritea kore whakarereke i t\u0113nei ngohe tuhi a muri i te mutunga. In\u0101 ka hoki mai ki t\u0113nei Pukatuhi an\u014d, ka taea te p\u0101nui i ng\u0101 korero i tuku \u0113ngari k\u0101ore e taea te tuku k\u014drero mai an\u014d.
+message.warnLockOnFinish  =Ka p\u0101whirihia "Ngohe Whai Ake" ka tae ki t\u0113nei pukatuhi, k\u0101ore e taea te t\u0101piri tuhinga an\u014d.
 
 
-#======= End labels: Exported 76 labels for mi NZ =====
+#======= End labels: Exported 78 labels for mi NZ =====
Index: lams_tool_vote/conf/language/lams/ApplicationResources_mi_NZ.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/conf/language/lams/ApplicationResources_mi_NZ.properties,v
diff -u -r1.4 -r1.5
--- lams_tool_vote/conf/language/lams/ApplicationResources_mi_NZ.properties	5 Feb 2008 00:09:58 -0000	1.4
+++ lams_tool_vote/conf/language/lams/ApplicationResources_mi_NZ.properties	3 Jun 2008 07:18:35 -0000	1.5
@@ -2,7 +2,7 @@
 #language code: mi 
 #locale code: NZ 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Feb 05 00:22:34 GMT 2008 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 03 08:18:36 BST 2008 
  
 #=================== labels for Voting =================# 
 
@@ -121,7 +121,6 @@
 count.finished.session  =Kaute o ng\u0101 W\u0101t\u016b Oti:
 maxNomination.invalid  =Whakatikaina t\u0113nei: he muhu te P\u014dtitanga M\u014drahi [Tapanga Ar\u0101 Atu An\u014d].
 nominations.duplicate  =Whakatikaina t\u0113nei: Neke atu i te kotahi ng\u0101 t\u0101urunga k\u014dharitanga.
-label.notebook.entries  =T\u0101uru Whakaaroaro
 label.learner  =\u0100konga
 label.view.reflection  =Tirohia te Whakaaroaro
 label.close  =Katia
@@ -147,6 +146,15 @@
 label.onlineFiles  =K\u014dnae Tohutohu Tuihono
 label.offlineFiles  =K\u014dnae Tohutohu Tuimotu
 label.offlineInstructions.col  =Tohutohu Tuimotu
+error.empty.selection  =K\u014dwhirihia ki t\u0113tehi k\u014dharitanga
+output.desc.learner.selection  =K\u014dhari \u0100konga
+label.show.results  =Whakaatu Putanga Katoa
+message.warnLockOnFinish  =Ka p\u0101whirihia "Putanga Katoa" k\u0101ore e taea te whakarerek\u0113.
+message.activityLocked  =Kua whakaritea kore whakarereke i t\u0113nei ngohe k\u014dharitanga a muri i te mutunga.
+label.attachments  =\u0100pitihanga
+label.nominations.available  =I a koe e {0} ng\u0101 k\u014dhari, tipakohia \u014du k\u014dwhiringa
+label.open.votes  =Tuhinga atu:
+label.notebook.entries  =Tuhinga Pukatuhi
 
 
-#======= End labels: Exported 141 labels for mi NZ =====
+#======= End labels: Exported 149 labels for mi NZ =====