Added Maori translations

4 files changed, 3145 insertions, 4 deletions

diff --git a/rpms/sugar-toolkit/0035-au-2406-maori-translation.patch b/rpms/sugar-toolkit/0035-au-2406-maori-translation.patch
new file mode 100644
index 0000000..6326645
--- /dev/null
+++ b/rpms/sugar-toolkit/0035-au-2406-maori-translation.patch
@@ -0,0 +1,320 @@
+diff --git a/po/mi.po b/po/mi.po
+index 6179aa0..7685ef6 100644
+--- a/po/mi.po
++++ b/po/mi.po
+@@ -2,185 +2,211 @@
+ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+ # This file is distributed under the same license as the PACKAGE package.
+ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+-#, fuzzy
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-01-20 00:31-0500\n"
+-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
++"POT-Creation-Date: 2011-09-23 11:57-0400\n"
++"PO-Revision-Date: 2012-09-21 09:48+0200\n"
++"Last-Translator: hariru <hariruroa@gmail.com>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
++"Language: mi\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"X-Generator: Translate Toolkit 1.1.1rc4\n"
++"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++"X-Generator: Pootle 2.0.5\n"
+ 
+-#: ../src/sugar/activity/activity.py:123
+-msgid "Share with:"
+-msgstr ""
+-
+-#: ../src/sugar/activity/activity.py:125
+-msgid "Private"
+-msgstr ""
+-
+-#: ../src/sugar/activity/activity.py:126
+-msgid "My Neighborhood"
+-msgstr ""
+-
+-#: ../src/sugar/activity/activity.py:133
+-#: ../src/sugar/activity/namingalert.py:65
+-msgid "Keep"
+-msgstr ""
+-
+-#: ../src/sugar/activity/activity.py:144
+-msgid "Stop"
+-msgstr ""
+-
+-#: ../src/sugar/activity/activity.py:258
+-msgid "Undo"
+-msgstr ""
+-
+-#: ../src/sugar/activity/activity.py:263
+-msgid "Redo"
+-msgstr ""
+-
+-#: ../src/sugar/activity/activity.py:273
+-msgid "Copy"
+-msgstr ""
+-
+-#: ../src/sugar/activity/activity.py:278
+-msgid "Paste"
+-msgstr ""
+-
+-#: ../src/sugar/activity/activity.py:304
+-msgid "Activity"
+-msgstr ""
+-
+-#: ../src/sugar/activity/activity.py:542
++#: ../src/sugar/activity/activity.py:352
+ #, python-format
+ msgid "%s Activity"
+-msgstr ""
++msgstr "%s Hohe"
+ 
+-#: ../src/sugar/activity/activity.py:910
++#: ../src/sugar/activity/activity.py:813
+ msgid "Keep error"
+-msgstr ""
++msgstr "Penapena hapa"
+ 
+-#: ../src/sugar/activity/activity.py:911
++#: ../src/sugar/activity/activity.py:814
+ msgid "Keep error: all changes will be lost"
+-msgstr ""
++msgstr "Penapena hapa: ka ngaro ngā huringa katoa"
+ 
+-#: ../src/sugar/activity/activity.py:914
++#: ../src/sugar/activity/activity.py:817
+ msgid "Don't stop"
+-msgstr ""
++msgstr "Kaua e tū"
+ 
+-#: ../src/sugar/activity/activity.py:917
++#: ../src/sugar/activity/activity.py:820
+ msgid "Stop anyway"
+-msgstr ""
++msgstr "Tū tonu"
+ 
+-#: ../src/sugar/activity/namingalert.py:60
++#: ../src/sugar/activity/namingalert.py:82
+ msgid "Name this entry"
+-msgstr ""
++msgstr "Whakaingoatia tēnei tāurunga"
+ 
+-#: ../src/sugar/activity/namingalert.py:248
++#: ../src/sugar/activity/namingalert.py:87
++#: ../src/sugar/activity/widgets.py:172
++msgid "Keep"
++msgstr "Pupuri"
++
++#: ../src/sugar/activity/namingalert.py:282
+ msgid "Untitled"
+-msgstr ""
++msgstr "Kore Ingoa"
+ 
+-#: ../src/sugar/activity/namingalert.py:255
++#: ../src/sugar/activity/namingalert.py:289
+ msgid "Description:"
+-msgstr ""
++msgstr "Whakaaturanga:"
+ 
+-#: ../src/sugar/activity/namingalert.py:279
++#: ../src/sugar/activity/namingalert.py:313
+ msgid "Tags:"
+-msgstr ""
++msgstr "Ngā Tūtohu:"
+ 
+-#: ../src/sugar/graphics/alert.py:288 ../src/sugar/graphics/alert.py:367
++#: ../src/sugar/activity/widgets.py:83
++msgid "Stop"
++msgstr "Tū"
++
++#: ../src/sugar/activity/widgets.py:95
++msgid "Undo"
++msgstr "Wete"
++
++#: ../src/sugar/activity/widgets.py:103
++msgid "Redo"
++msgstr "Mahi Anō"
++
++#: ../src/sugar/activity/widgets.py:110
++msgid "Copy"
++msgstr "Tārua"
++
++#: ../src/sugar/activity/widgets.py:118
++msgid "Paste"
++msgstr "Whakapiri"
++
++#: ../src/sugar/activity/widgets.py:129
++msgid "Private"
++msgstr "Tūmataiti"
++
++#: ../src/sugar/activity/widgets.py:136
++msgid "My Neighborhood"
++msgstr "Taku Takiwā"
++
++#: ../src/sugar/activity/widgets.py:358
++msgid "Activity"
++msgstr "Hohenga"
++
++#: ../src/sugar/graphics/alert.py:287 ../src/sugar/graphics/alert.py:428
+ msgid "Cancel"
+-msgstr ""
++msgstr "Whakakore"
+ 
+-#: ../src/sugar/graphics/alert.py:292 ../src/sugar/graphics/alert.py:426
++#: ../src/sugar/graphics/alert.py:291 ../src/sugar/graphics/alert.py:337
++#: ../src/sugar/graphics/alert.py:478
+ msgid "Ok"
+-msgstr ""
++msgstr "Āe"
+ 
+-#: ../src/sugar/graphics/alert.py:377
++#: ../src/sugar/graphics/alert.py:433
+ msgid "Continue"
+-msgstr ""
++msgstr "Haere Tonu"
+ 
+-#: ../src/sugar/graphics/colorbutton.py:49
++#: ../src/sugar/graphics/colorbutton.py:52
+ msgid "Choose a color"
+-msgstr ""
++msgstr "Kōwhiri tae"
+ 
+-#: ../src/sugar/graphics/colorbutton.py:262
++#: ../src/sugar/graphics/colorbutton.py:272
+ msgid "Red"
+-msgstr ""
++msgstr "Whero"
+ 
+-#: ../src/sugar/graphics/colorbutton.py:264
++#: ../src/sugar/graphics/colorbutton.py:274
+ msgid "Green"
+-msgstr ""
++msgstr "Kākāriki"
+ 
+-#: ../src/sugar/graphics/colorbutton.py:266
++#: ../src/sugar/graphics/colorbutton.py:276
+ msgid "Blue"
+-msgstr ""
++msgstr "Kikorangi"
+ 
+-#: ../src/sugar/util.py:194
++#: ../src/sugar/util.py:217
+ msgid " and "
+-msgstr ""
++msgstr " me "
+ 
+-#: ../src/sugar/util.py:195
++#: ../src/sugar/util.py:218
+ msgid ", "
+-msgstr ""
++msgstr ", "
+ 
+ #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
+-#: ../src/sugar/util.py:198
++#: ../src/sugar/util.py:221
+ msgid "Seconds ago"
+-msgstr ""
++msgstr "Ngā hēkona ki mua"
+ 
+ #. TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago",
+ #. "[2 minutes] in the past", or "[3 years, 1 month] earlier"
+-#: ../src/sugar/util.py:202
++#: ../src/sugar/util.py:225
+ #, python-format
+ msgid "%s ago"
+-msgstr ""
++msgstr "%s ki mua"
+ 
+ #. TRANS: Relative dates (eg. 1 month and 5 days).
+-#: ../src/sugar/util.py:215
++#: ../src/sugar/util.py:240
+ #, python-format
+ msgid "%d year"
+ msgid_plural "%d years"
+-msgstr[0] ""
+-msgstr[1] ""
++msgstr[0] "%d tau"
++msgstr[1] "%d ngā tau"
+ 
+-#: ../src/sugar/util.py:216
++#: ../src/sugar/util.py:241
+ #, python-format
+ msgid "%d month"
+ msgid_plural "%d months"
+-msgstr[0] ""
+-msgstr[1] ""
++msgstr[0] "%d marama"
++msgstr[1] "%d ngā marama"
+ 
+-#: ../src/sugar/util.py:217
++#: ../src/sugar/util.py:242
+ #, python-format
+ msgid "%d week"
+ msgid_plural "%d weeks"
+-msgstr[0] ""
+-msgstr[1] ""
++msgstr[0] "%d wiki"
++msgstr[1] "%d ngā wiki"
+ 
+-#: ../src/sugar/util.py:218
++#: ../src/sugar/util.py:243
+ #, python-format
+ msgid "%d day"
+ msgid_plural "%d days"
+-msgstr[0] ""
+-msgstr[1] ""
++msgstr[0] "%d rā"
++msgstr[1] "%d ngā rā"
+ 
+-#: ../src/sugar/util.py:219
++#: ../src/sugar/util.py:244
+ #, python-format
+ msgid "%d hour"
+ msgid_plural "%d hours"
+-msgstr[0] ""
+-msgstr[1] ""
++msgstr[0] "%d haora"
++msgstr[1] "%d ngā haora"
+ 
+-#: ../src/sugar/util.py:220
++#: ../src/sugar/util.py:245
+ #, python-format
+ msgid "%d minute"
+ msgid_plural "%d minutes"
+-msgstr[0] ""
+-msgstr[1] ""
++msgstr[0] "%d meneti"
++msgstr[1] "%d ngā meneti"
++
++#: ../src/sugar/util.py:346
++msgid "Empty"
++msgstr "Putua"
++
++#: ../src/sugar/util.py:348
++#, python-format
++#, python-format,
++msgid "%d B"
++msgstr "%d B"
++
++#: ../src/sugar/util.py:350
++#, python-format
++#, python-format,
++msgid "%d KB"
++msgstr "%d KB"
++
++#: ../src/sugar/util.py:352
++#, python-format
++#, python-format,
++msgid "%d MB"
++msgstr "%d MB"
++
++#: ../src/sugar/util.py:354
++#, python-format
++#, python-format,
++msgid "%d GB"
++msgstr "%d GB"
diff --git a/rpms/sugar-toolkit/sugar-toolkit.spec b/rpms/sugar-toolkit/sugar-toolkit.spec
index c0ad427..7aabadf 100644
--- a/rpms/sugar-toolkit/sugar-toolkit.spec
+++ b/rpms/sugar-toolkit/sugar-toolkit.spec
@@ -2,9 +2,9 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Epoch: 20120206
+Epoch: 20121006
 Version: 0.94.1
-Release: 1.dx3
+Release: 2.dx3
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 Source1: macros.sugar
@@ -69,6 +69,10 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Sat Oct 6 2012 Ruben Rodriguez <ruben@activitycentral.com> - 20121006:0.94.1-2.dx3
+- Added Maori translation sdxo#2406
+- Further disables 1-to-N
+
 * Mon Feb 06 2012 Anish Mangal <anish@activitycentral.com> - 1:0.94.0-20120206.dx3
 - update to Dextrose 3 patch set 20120206
 
diff --git a/rpms/sugar/0156-au-2406-maori-translation.patch b/rpms/sugar/0156-au-2406-maori-translation.patch
new file mode 100644
index 0000000..90d1af9
--- /dev/null
+++ b/rpms/sugar/0156-au-2406-maori-translation.patch
@@ -0,0 +1,2811 @@
+diff --git a/po/mi.po b/po/mi.po
+index a45bff2..0028e4b 100644
+--- a/po/mi.po
++++ b/po/mi.po
+@@ -2,492 +2,928 @@
+ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+ # This file is distributed under the same license as the PACKAGE package.
+ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+-#, fuzzy
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-01-27 13:34-0500\n"
+-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
++"POT-Creation-Date: 2012-04-24 00:33-0400\n"
++"PO-Revision-Date: 2012-09-21 10:20+0200\n"
++"Last-Translator: Chris <cjl@laptop.org>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
++"Language: mi\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"X-Generator: Translate Toolkit 1.1.1rc4\n"
++"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++"X-Generator: Pootle 2.0.5\n"
+ 
+ #: ../extensions/cpsection/aboutme/__init__.py:24
+ msgid "About Me"
+-msgstr ""
++msgstr "Mōku Ake"
+ 
+-#: ../extensions/cpsection/aboutme/model.py:43
++#: ../extensions/cpsection/aboutme/model.py:48
+ msgid "You must enter a name."
+-msgstr ""
++msgstr "Me tāuru ingoa."
+ 
+-#: ../extensions/cpsection/aboutme/model.py:68
++#: ../extensions/cpsection/aboutme/model.py:75
+ #, python-format
+ msgid "stroke:   color=%s hue=%s"
+-msgstr ""
++msgstr "miringa:   tae= ngā %s hākano= ngā %s"
+ 
+-#: ../extensions/cpsection/aboutme/model.py:71
++#: ../extensions/cpsection/aboutme/model.py:78
+ #, python-format
+ msgid "stroke:   %s"
+-msgstr ""
++msgstr "miringa:  ngā %s"
+ 
+-#: ../extensions/cpsection/aboutme/model.py:73
++#: ../extensions/cpsection/aboutme/model.py:80
+ #, python-format
+ msgid "fill:     color=%s hue=%s"
+-msgstr ""
++msgstr "whakakī:     tae=ngā %s hākano=ngā %s"
+ 
+-#: ../extensions/cpsection/aboutme/model.py:75
++#: ../extensions/cpsection/aboutme/model.py:82
+ #, python-format
++#, python-format,
+ msgid "fill:     %s"
+-msgstr ""
++msgstr "whakakī:     ngā %s"
+ 
+-#: ../extensions/cpsection/aboutme/model.py:86
++#: ../extensions/cpsection/aboutme/model.py:94
+ msgid "Error in specified color modifiers."
+-msgstr ""
++msgstr "He hapa kei ngā pātohu tae kua tohua."
+ 
+-#: ../extensions/cpsection/aboutme/model.py:89
++#: ../extensions/cpsection/aboutme/model.py:97
+ msgid "Error in specified colors."
+-msgstr ""
+-
+-#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
+-msgid "Name:"
+-msgstr ""
++msgstr "He hapa kei ngā tae kua tohua."
+ 
+-#: ../extensions/cpsection/aboutme/view.py:128
++#: ../extensions/cpsection/aboutme/view.py:235
+ msgid "Click to change your color:"
+-msgstr ""
++msgstr "Pāwhiri kia whakawhiti i tō tae:"
+ 
+ #: ../extensions/cpsection/aboutcomputer/__init__.py:21
+ msgid "About my Computer"
+-msgstr ""
++msgstr "Mō taku Rorohiko"
+ 
+-#: ../extensions/cpsection/aboutcomputer/model.py:26
++#: ../extensions/cpsection/aboutcomputer/model.py:43
+ msgid "Not available"
+-msgstr ""
++msgstr "Koretaea"
++
++#: ../extensions/cpsection/aboutcomputer/model.py:183
++#, python-format
++msgid "%(interface)s: %(version)s"
++msgstr "%(interface)s: %(version)s"
+ 
+ #: ../extensions/cpsection/aboutcomputer/view.py:59
+ msgid "Identity"
+-msgstr ""
++msgstr "Tuakiri"
+ 
+ #: ../extensions/cpsection/aboutcomputer/view.py:68
+ msgid "Serial Number:"
+-msgstr ""
++msgstr "Tau Rangatū:"
+ 
+ #: ../extensions/cpsection/aboutcomputer/view.py:90
+ msgid "Software"
+-msgstr ""
++msgstr "Pūmanawa"
+ 
+ #: ../extensions/cpsection/aboutcomputer/view.py:99
+ msgid "Build:"
+-msgstr ""
++msgstr "Hanga:"
+ 
+ #: ../extensions/cpsection/aboutcomputer/view.py:114
+ msgid "Sugar:"
+-msgstr ""
++msgstr "Sugar:"
+ 
+-#: ../extensions/cpsection/aboutcomputer/view.py:130
++#: ../extensions/cpsection/aboutcomputer/view.py:129
+ msgid "Firmware:"
+-msgstr ""
++msgstr "Pūmanawa Mārō:"
+ 
+-#: ../extensions/cpsection/aboutcomputer/view.py:145
++#: ../extensions/cpsection/aboutcomputer/view.py:144
+ msgid "Wireless Firmware:"
+-msgstr ""
++msgstr "Pūmanawa Mārō Ahokore:"
+ 
+-#: ../extensions/cpsection/aboutcomputer/view.py:168
++#: ../extensions/cpsection/aboutcomputer/view.py:167
+ msgid "Copyright and License"
+-msgstr ""
+-
+-#: ../extensions/cpsection/aboutcomputer/view.py:176
+-msgid ""
+-"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
+-msgstr ""
++msgstr "Manatārua me te Raihana"
+ 
+-#: ../extensions/cpsection/aboutcomputer/view.py:183
++#: ../extensions/cpsection/aboutcomputer/view.py:185
+ msgid ""
+ "Sugar is the graphical user interface that you are looking at. Sugar is free "
+ "software, covered by the GNU General Public License, and you are welcome to "
+ "change it and/or distribute copies of it under certain conditions described "
+ "therein."
+ msgstr ""
++"Ko Sugar te atanga kaiwhakamahi whakairoiro e tiro nei koe. He pūmanawa utu "
++"kore a Sugar, kei raro i te Raihana Tūmatanui Ahuwhānui GNU, ā, e taea ana e "
++"koe te huri, te toha i ngā tārua i runga tonu i ngā ture kua whakatakotoria "
++"ki roto."
+ 
+-#: ../extensions/cpsection/aboutcomputer/view.py:195
++#: ../extensions/cpsection/aboutcomputer/view.py:197
+ msgid "Full license:"
+-msgstr ""
++msgstr "Raihana whānui:"
+ 
+ #: ../extensions/cpsection/datetime/__init__.py:21
+ msgid "Date & Time"
+-msgstr ""
++msgstr "Rā me te Wā"
+ 
+-#: ../extensions/cpsection/datetime/model.py:87
++#: ../extensions/cpsection/datetime/model.py:92
+ msgid "Error timezone does not exist."
+-msgstr ""
++msgstr "Hapa kāore kau he rohewā."
+ 
+-#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:19
++#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
+ msgid "Timezone"
+-msgstr ""
++msgstr "Rohewā"
+ 
+ #: ../extensions/cpsection/frame/__init__.py:21
+ msgid "Frame"
+-msgstr ""
++msgstr "Tāpare"
+ 
+-#: ../extensions/cpsection/frame/model.py:38
+-#: ../extensions/cpsection/frame/model.py:60
++#: ../extensions/cpsection/frame/model.py:41
++#: ../extensions/cpsection/frame/model.py:66
+ msgid "Value must be an integer."
+-msgstr ""
++msgstr "Me whai tau tōpū te uara."
+ 
+-#: ../extensions/cpsection/frame/view.py:26
++#: ../extensions/cpsection/frame/view.py:27
+ msgid "never"
+-msgstr ""
++msgstr "kaua rawa"
+ 
+-#: ../extensions/cpsection/frame/view.py:27
++#: ../extensions/cpsection/frame/view.py:28
+ msgid "instantaneous"
+-msgstr ""
++msgstr "īnāianei"
+ 
+-#: ../extensions/cpsection/frame/view.py:28
++#: ../extensions/cpsection/frame/view.py:29
+ #, python-format
++#, python-format,
+ msgid "%s seconds"
+-msgstr ""
++msgstr "%s ngā hēkona"
+ 
+-#: ../extensions/cpsection/frame/view.py:52
++#: ../extensions/cpsection/frame/view.py:54
+ msgid "Activation Delay"
+-msgstr ""
++msgstr "Whakahohenga Takaware"
+ 
+-#: ../extensions/cpsection/frame/view.py:76
++#: ../extensions/cpsection/frame/view.py:78
+ msgid "Corner"
+-msgstr ""
++msgstr "Koko"
+ 
+-#: ../extensions/cpsection/frame/view.py:111
++#: ../extensions/cpsection/frame/view.py:113
+ msgid "Edge"
+-msgstr ""
++msgstr "Tapa"
++
++#: ../extensions/cpsection/keyboard/__init__.py:21
++#: ../extensions/cpsection/keyboard/view.py:32
++msgid "Keyboard"
++msgstr "Papapātuhi"
++
++#: ../extensions/cpsection/keyboard/view.py:190
++msgid "Keyboard Model"
++msgstr "Papapātuhi"
++
++#: ../extensions/cpsection/keyboard/view.py:250
++msgid "Key(s) to change layout"
++msgstr "Pātuhi hei huri i te tahora"
++
++#: ../extensions/cpsection/keyboard/view.py:319
++msgid "Keyboard Layout(s)"
++msgstr "Tahora Papapātuhi"
+ 
+ #: ../extensions/cpsection/language/__init__.py:21
+-#: ../extensions/cpsection/language/view.py:32
++#: ../extensions/cpsection/language/view.py:33
+ msgid "Language"
+-msgstr ""
++msgstr "Reo"
+ 
+-#: ../extensions/cpsection/language/model.py:28
++#: ../extensions/cpsection/language/model.py:30
+ msgid "Could not access ~/.i18n. Create standard settings."
+-msgstr ""
++msgstr "Kāore i āhei ~/.i18n. Waihanga tautuhinga paerewa."
+ 
+-#: ../extensions/cpsection/language/model.py:124
++#: ../extensions/cpsection/language/model.py:129
+ #, python-format
+ msgid "Language for code=%s could not be determined."
+-msgstr ""
++msgstr "Reo mō te waehere=%s kāore e taea te whakarite."
+ 
+-#: ../extensions/cpsection/language/model.py:144
++#: ../extensions/cpsection/language/model.py:152
+ #, python-format
+ msgid "Sorry I do not speak '%s'."
++msgstr "Taku hē, kāore au i te kōrero i te '%s'."
++
++#: ../extensions/cpsection/language/view.py:57
++msgid ""
++"Add languages in the order you prefer. If a translation is not available, "
++"the next in the list will be used."
++msgstr ""
++"Tāpiri reo e ai ki te raupapa e hiahiatia ana. Ki te kore e te whakamāori, "
++"ka whakamahia te reo panuku kei te rārangi."
++
++#: ../extensions/cpsection/modemconfiguration/__init__.py:21
++msgid "Modem Configuration"
++msgstr "Whirihoranga Pouwhanga"
++
++#: ../extensions/cpsection/modemconfiguration/view.py:94
++msgid "Username:"
++msgstr "Ingoakaiwhakamahi:"
++
++#: ../extensions/cpsection/modemconfiguration/view.py:106
++msgid "Password:"
++msgstr "Kupuhipa:"
++
++#: ../extensions/cpsection/modemconfiguration/view.py:118
++msgid "Number:"
++msgstr "Tau:"
++
++#: ../extensions/cpsection/modemconfiguration/view.py:130
++msgid "Access Point Name (APN):"
++msgstr "Ingoa Pito Uru (APN):"
++
++#: ../extensions/cpsection/modemconfiguration/view.py:142
++msgid "Personal Identity Number (PIN):"
++msgstr "Tau Tuakiri Whaiaronga (PIN):"
++
++#: ../extensions/cpsection/modemconfiguration/view.py:154
++msgid "Personal Unblocking Key (PUK):"
++msgstr "Kī Whakawātea Whaiaro (PUK):"
++
++#: ../extensions/cpsection/modemconfiguration/view.py:175
++msgid ""
++"You will need to provide the following information to set up a mobile "
++"broadband connection to a cellular (3G) network."
+ msgstr ""
++"Me tuku ngā mōhiohio e whai ake hei tautuhi i tētahi hononga aunui pūkoro ki "
++"te whatunga pūtautanga (3G)."
+ 
+ #: ../extensions/cpsection/network/__init__.py:21
+-#: ../extensions/cpsection/network/view.py:28
++#: ../extensions/cpsection/network/view.py:29
+ msgid "Network"
+-msgstr ""
++msgstr "Whatunga"
+ 
+-#: ../extensions/cpsection/network/model.py:79
++#: ../extensions/cpsection/network/model.py:71
+ msgid "State is unknown."
+-msgstr ""
++msgstr "Tūnga kāore i te mōhiotia."
+ 
+-#: ../extensions/cpsection/network/model.py:105
++#: ../extensions/cpsection/network/model.py:99
+ msgid "Error in specified radio argument use on/off."
+-msgstr ""
++msgstr "Hapa ki te whakamahi tohenga irirangi, kā/weto."
+ 
+-#: ../extensions/cpsection/network/model.py:137
++#: ../extensions/cpsection/network/model.py:140
+ msgid "Error in specified argument use 0/1."
+-msgstr ""
++msgstr "Hapa ki te whakamahi tohenga, 0/1."
+ 
+-#: ../extensions/cpsection/network/view.py:56
++#: ../extensions/cpsection/network/view.py:61
+ msgid "Wireless"
+-msgstr ""
++msgstr "Ahokore"
+ 
+-#: ../extensions/cpsection/network/view.py:64
++#: ../extensions/cpsection/network/view.py:69
+ msgid "Turn off the wireless radio to save battery life"
+-msgstr ""
++msgstr "Whakawetongia te irirangi ahokore kia tiakina te ora pūhiko"
+ 
+-#: ../extensions/cpsection/network/view.py:77
++#: ../extensions/cpsection/network/view.py:82
+ msgid "Radio"
+-msgstr ""
++msgstr "Irirangi"
+ 
+-#: ../extensions/cpsection/network/view.py:93
++#: ../extensions/cpsection/network/view.py:98
+ msgid "Discard network history if you have trouble connecting to the network"
+-msgstr ""
++msgstr "Turakina te hītori whatunga mēnā ka raru ki te hono ki te whatunga"
+ 
+-#: ../extensions/cpsection/network/view.py:102
++#: ../extensions/cpsection/network/view.py:107
+ msgid "Discard network history"
+-msgstr ""
++msgstr "Turakina te hītori whatunga"
+ 
+-#: ../extensions/cpsection/network/view.py:115
++#: ../extensions/cpsection/network/view.py:122
+ msgid "Collaboration"
+-msgstr ""
++msgstr "Ngātahitanga"
+ 
+-#: ../extensions/cpsection/network/view.py:123
++#: ../extensions/cpsection/network/view.py:130
+ msgid ""
+ "The server is the equivalent of what room you are in; people on the same "
+ "server will be able to see each other, even when they aren't on the same "
+ "network."
+ msgstr ""
++"He pērā te tūmau ki te rūma e noho nei koe; ka taea e ngā tāngata o te tūmau "
++"kotahi te kite i a rātou anō, ka pērā tonu mēnā kei ngā tūmau rerekē."
+ 
+-#: ../extensions/cpsection/network/view.py:133
++#: ../extensions/cpsection/network/view.py:140
+ msgid "Server:"
+-msgstr ""
++msgstr "Tūmau:"
+ 
+ #: ../extensions/cpsection/power/__init__.py:21
+ msgid "Power"
+-msgstr ""
++msgstr "Hiko"
+ 
+-#: ../extensions/cpsection/power/model.py:54
++#: ../extensions/cpsection/power/model.py:90
+ msgid "Error in automatic pm argument, use on/off."
+-msgstr ""
++msgstr "He hapa ki te tohenga pm aunoa, whakamahia te kā/weto."
+ 
+-#: ../extensions/cpsection/power/model.py:81
++#: ../extensions/cpsection/power/model.py:120
+ msgid "Error in extreme pm argument, use on/off."
+-msgstr ""
++msgstr "He hapa ki te tohenga pm taikaha, whakamahia te kā/weto."
+ 
+-#: ../extensions/cpsection/power/view.py:47
++#: ../extensions/cpsection/power/view.py:48
+ msgid "Power management"
+-msgstr ""
++msgstr "Whakahaerenga hiko"
+ 
+-#: ../extensions/cpsection/power/view.py:57
++#: ../extensions/cpsection/power/view.py:58
+ msgid "Automatic power management (increases battery life)"
++msgstr "Whakahaerenga hiko aunoa (ka whakapiki i te ora pūhiko)"
++
++#: ../extensions/cpsection/power/view.py:86
++msgid ""
++"Extreme power management (disables wireless radio, increases battery life)"
+ msgstr ""
++"Whakahaerenga hiko taikaha (ka monokia te irirangi ahokore, ka whakapiki i "
++"te ora pūhiko)"
++
++#: ../extensions/cpsection/updater/__init__.py:21
++msgid "Software update"
++msgstr "Whakahōu pūmanawa"
+ 
+-#: ../extensions/cpsection/power/view.py:85
++#: ../extensions/cpsection/updater/view.py:63
+ msgid ""
+-"Extreme power management (disableswireless radio, increases battery life)"
++"Software updates correct errors, eliminate security vulnerabilities, and "
++"provide new features."
+ msgstr ""
++"Ka whakatika ngā whakahōunga pūmanawa i ngā hapa, ka whakamōtī i ngā "
++"pānekeneke haumaru, ka tuku āhuatanga hōu hoki."
++
++#: ../extensions/cpsection/updater/view.py:125
++#, python-format
++msgid "Checking %s..."
++msgstr "Takitaki ana i ngā %s..."
++
++#: ../extensions/cpsection/updater/view.py:127
++#, python-format
++#, python-format,
++msgid "Downloading %s..."
++msgstr "Tikiake ana i ngā %s..."
++
++#: ../extensions/cpsection/updater/view.py:129
++#, python-format
++#, python-format,
++msgid "Updating %s..."
++msgstr "Whakahōu ana i ngā %s..."
++
++#: ../extensions/cpsection/updater/view.py:139
++msgid "Your software is up-to-date"
++msgstr "Kua whakahōungia tō pūmanawa"
++
++#: ../extensions/cpsection/updater/view.py:141
++#, python-format
++msgid "You can install %s update"
++msgid_plural "You can install %s updates"
++msgstr[0] "E taea tonu ana te tāuta i te whakahōunga %s"
++msgstr[1] "E taea tonu ana te tāuta i ngā whakahōunga %s"
++
++#: ../extensions/cpsection/updater/view.py:159
++msgid "Checking for updates..."
++msgstr "Takitaki ana mō ngā whakahōunga..."
++
++#: ../extensions/cpsection/updater/view.py:164
++msgid "Installing updates..."
++msgstr "Tāuta ana i ngā whakahōu..."
++
++#: ../extensions/cpsection/updater/view.py:173
++#, python-format
++msgid "%s update was installed"
++msgid_plural "%s updates were installed"
++msgstr[0] "%s te whakahōunga i tāutatia"
++msgstr[1] "%s ngā whakahōunga i tāutatia"
++
++#: ../extensions/cpsection/updater/view.py:255
++msgid "Install selected"
++msgstr "Tāuta i ngā mea kua tohua"
+ 
+-#: ../extensions/deviceicon/battery.py:56
++#: ../extensions/cpsection/updater/view.py:276
++#, python-format
++msgid "Download size: %s"
++msgstr "Tikiake i te rahi: %s"
++
++#: ../extensions/cpsection/updater/view.py:364
++#, python-format
++msgid "From version %(current)s to %(new)s (Size: %(size)s)"
++msgstr "Mai i te putanga %(current)s ki %(new)s (Size: %(size)s)"
++
++#. TRANS: download size is 0
++#: ../extensions/cpsection/updater/view.py:382
++msgid "None"
++msgstr "Kore"
++
++#. TRANS: download size of very small updates
++#: ../extensions/cpsection/updater/view.py:385
++msgid "1 KB"
++msgstr "1 KB"
++
++#. TRANS: download size of small updates, e.g. '250 KB'
++#: ../extensions/cpsection/updater/view.py:388
++#, python-format
++msgid "%.0f KB"
++msgstr "%.0f KB"
++
++#. TRANS: download size of updates, e.g. '2.3 MB'
++#: ../extensions/cpsection/updater/view.py:391
++#, python-format
++msgid "%.1f MB"
++msgstr "%.1f MB"
++
++#: ../extensions/deviceicon/battery.py:71
+ msgid "My Battery"
+-msgstr ""
++msgstr "Taku Pūhiko"
+ 
+-#: ../extensions/deviceicon/battery.py:137
++#: ../extensions/deviceicon/battery.py:147
+ msgid "Removed"
+-msgstr ""
++msgstr "Kua Tangohia"
+ 
+-#: ../extensions/deviceicon/battery.py:140
++#: ../extensions/deviceicon/battery.py:150
+ msgid "Charging"
+-msgstr ""
++msgstr "Whakahiko Ana"
+ 
+-#: ../extensions/deviceicon/battery.py:143
++#: ../extensions/deviceicon/battery.py:153
+ msgid "Very little power remaining"
+-msgstr ""
++msgstr "Kua tata pau te pūhiko"
+ 
+-#: ../extensions/deviceicon/battery.py:149
++#: ../extensions/deviceicon/battery.py:158
+ #, python-format
+ msgid "%(hour)d:%(min).2d remaining"
+-msgstr ""
++msgstr "%(hour)d:%(min).2d kei te toe"
+ 
+-#: ../extensions/deviceicon/battery.py:153
++#: ../extensions/deviceicon/battery.py:161
+ msgid "Charged"
+-msgstr ""
++msgstr "Kua Whakakaha"
+ 
+-#: ../extensions/deviceicon/network.py:40
++#: ../extensions/deviceicon/network.py:49
+ #, python-format
+ msgid "IP address: %s"
+-msgstr ""
++msgstr "Wāhitau IP: %s"
+ 
+ #: ../extensions/deviceicon/network.py:104
+-msgid "Disconnect..."
+-msgstr ""
++#: ../extensions/deviceicon/network.py:303
++#: ../src/jarabe/desktop/networkviews.py:141
++#: ../src/jarabe/desktop/networkviews.py:510
++msgid "Disconnect"
++msgstr "Momotuhia"
+ 
+-#: ../extensions/deviceicon/network.py:109
+-#: ../src/jarabe/desktop/meshbox.py:246
++#: ../extensions/deviceicon/network.py:112
++#: ../extensions/deviceicon/network.py:295
++#: ../src/jarabe/desktop/networkviews.py:245
++#: ../src/jarabe/desktop/networkviews.py:549
++#: ../src/jarabe/desktop/networkviews.py:683
+ msgid "Connecting..."
+-msgstr ""
++msgstr "E Tūhono Ana..."
+ 
+-#: ../extensions/deviceicon/network.py:113
+-#: ../extensions/deviceicon/network.py:166
+-#: ../src/jarabe/desktop/meshbox.py:252
++#: ../extensions/deviceicon/network.py:117
++#: ../extensions/deviceicon/network.py:185
++#: ../src/jarabe/desktop/networkviews.py:255
++#: ../src/jarabe/desktop/networkviews.py:555
++#: ../src/jarabe/desktop/networkviews.py:689
+ msgid "Connected"
+-msgstr ""
++msgstr "Kua Tūhono"
++
++#: ../extensions/deviceicon/network.py:130
++msgid "No wireless connection"
++msgstr "Kāore he hononga ahokore"
+ 
+-#: ../extensions/deviceicon/network.py:126
++#: ../extensions/deviceicon/network.py:144
+ msgid "Channel"
+-msgstr ""
++msgstr "Hongere"
+ 
+-#: ../extensions/deviceicon/network.py:141
++#: ../extensions/deviceicon/network.py:159
+ msgid "Wired Network"
+-msgstr ""
++msgstr "Whatunga Whaiaho"
+ 
+-#: ../extensions/deviceicon/network.py:169
++#: ../extensions/deviceicon/network.py:188
+ msgid "Speed"
+-msgstr ""
++msgstr "Tere"
++
++#: ../extensions/deviceicon/network.py:213
++msgid "Wireless modem"
++msgstr "Pouwhanga ahokore"
++
++#: ../extensions/deviceicon/network.py:281
++msgid "Please wait..."
++msgstr "Taihoa koa..."
++
++#: ../extensions/deviceicon/network.py:286
++#: ../src/jarabe/desktop/networkviews.py:137
++#: ../src/jarabe/desktop/networkviews.py:506
++#: ../src/jarabe/desktop/networkviews.py:639
++msgid "Connect"
++msgstr "Tūhono"
++
++#: ../extensions/deviceicon/network.py:287
++msgid "Disconnected"
++msgstr "Kua Momotu"
++
++#: ../extensions/deviceicon/network.py:294
++#: ../src/jarabe/controlpanel/toolbar.py:119
++#: ../src/jarabe/desktop/homebox.py:71
++#: ../src/jarabe/frame/activitiestray.py:602
++#: ../src/jarabe/frame/activitiestray.py:704
++#: ../src/jarabe/frame/activitiestray.py:732
++msgid "Cancel"
++msgstr "Whakakore"
+ 
+-#: ../extensions/deviceicon/speaker.py:46
++#: ../extensions/deviceicon/network.py:333
++msgid "Try connection again"
++msgstr "Ngana ki te tūhono anō"
++
++#: ../extensions/deviceicon/network.py:336
++#, python-format
++#, python-format,
++msgid "Error: %s"
++msgstr "Hapa: ngā %s"
++
++#: ../extensions/deviceicon/network.py:340
++#, python-format
++msgid "Suggestion: %s"
++msgstr "Huatau: ngā %s"
++
++#: ../extensions/deviceicon/network.py:349
++#, python-format
++msgid "Connected for %s"
++msgstr "Kua tūhono mō ngā %s"
++
++#: ../extensions/deviceicon/network.py:355
++#: ../extensions/deviceicon/network.py:356
++#, python-format
++#, python-format,
++msgid "%d KB"
++msgstr "%d KB"
++
++#: ../extensions/deviceicon/network.py:361
++msgid "Check your Pin/Puk configuration."
++msgstr "Takina tō whirihoranga PIN/PUK."
++
++#: ../extensions/deviceicon/network.py:364
++msgid "Check your Access Point Name (APN) configuration"
++msgstr "Takina tō whirihoranga Ingoa Pito Ur (APN)"
++
++#: ../extensions/deviceicon/network.py:368
++msgid "Check the Number configuration."
++msgstr "Takina te whirihoranga Tau."
++
++#: ../extensions/deviceicon/network.py:370
++msgid "Check your configuration."
++msgstr "Takina tō whirihoranga."
++
++#: ../extensions/deviceicon/network.py:615
++msgid "Mesh Network"
++msgstr "Whatunga Tākekenga"
++
++#: ../extensions/deviceicon/network.py:659
++#, python-format
++msgid "Mesh Network %s"
++msgstr "Whatunga Tākekenga %s"
++
++#: ../extensions/deviceicon/network.py:782
++msgid "No GSM connection available."
++msgstr "Kāore i āhei te hononga GSM."
++
++#: ../extensions/deviceicon/network.py:783
++msgid "Create a connection in the control panel."
++msgstr "Waihangatia tētahi hononga ki te paepae mana."
++
++#: ../extensions/deviceicon/speaker.py:61
+ msgid "My Speakers"
+-msgstr ""
++msgstr "Aku Tukuoro"
+ 
+-#: ../extensions/deviceicon/speaker.py:128
++#: ../extensions/deviceicon/speaker.py:138
+ msgid "Unmute"
+-msgstr ""
++msgstr "Whakakore whakangū"
+ 
+-#: ../extensions/deviceicon/speaker.py:131
++#: ../extensions/deviceicon/speaker.py:141
+ msgid "Mute"
+-msgstr ""
++msgstr "Whakangū"
+ 
+-#: ../extensions/globalkey/screenshot.py:50
+-msgid "Screenshot"
+-msgstr ""
++#: ../extensions/deviceicon/touchpad.py:38
++msgid "finger"
++msgstr "matimati"
+ 
+-#: ../extensions/globalkey/viewsource.py:196
+-#, python-format
+-msgid "View source: %r"
+-msgstr ""
++#: ../extensions/deviceicon/touchpad.py:39
++msgid "stylus"
++msgstr "pene pā"
++
++#: ../extensions/deviceicon/touchpad.py:68
++msgid "My touchpad"
++msgstr "Taku papapā"
++
++#: ../extensions/globalkey/screenshot.py:59
++msgid "Mesh"
++msgstr "Tākekenga"
++
++#: ../extensions/globalkey/screenshot.py:61
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "Group"
++msgstr "Rōpū"
++
++#: ../extensions/globalkey/screenshot.py:63
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "Home"
++msgstr "Kāinga"
+ 
+-#: ../extensions/globalkey/viewsource.py:205
+-#: ../src/jarabe/frame/zoomtoolbar.py:42
++#: ../extensions/globalkey/screenshot.py:69
++#: ../src/jarabe/frame/zoomtoolbar.py:45
+ msgid "Activity"
+-msgstr ""
++msgstr "Hohenga"
+ 
+-#: ../extensions/globalkey/viewsource.py:212
+-msgid "Document"
+-msgstr ""
++#: ../extensions/globalkey/screenshot.py:72
++msgid "Screenshot"
++msgstr "Whakaahuamata"
+ 
+-#: ../extensions/globalkey/viewsource.py:226
+-#: ../src/jarabe/journal/objectchooser.py:141
+-msgid "Close"
+-msgstr ""
++#: ../extensions/globalkey/screenshot.py:74
++#, python-format
++msgid "Screenshot of \"%s\""
++msgstr "Whakaahuamata o \"%s\""
+ 
+ #: ../data/sugar.schemas.in.h:1
+-msgid "Backup URL"
++msgid ""
++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
++"long name."
+ msgstr ""
++"\"mono\" kia pātai nick mō te arawhitinga; \"pūnaha\" kia whakamahi anō i te "
++"ingoa roa pūkete UNIX."
+ 
+ #: ../data/sugar.schemas.in.h:2
+-msgid ""
+-"Color for the XO icon that is used throughout the desktop. The string is "
+-"composed of the stroke color and fill color, format is that of rbg colors. "
+-"Example: #AC32FF,#9A5200"
++msgid "Additional directories which can contain updated translations."
+ msgstr ""
++"Whaiaronga kua tāpirihia kei roto pea ngā whakamāoritanga kua whakahōungia."
+ 
+ #: ../data/sugar.schemas.in.h:3
+-msgid "Corner Delay"
+-msgstr ""
++msgid "Backup URL"
++msgstr "Tārua URL"
+ 
+ #: ../data/sugar.schemas.in.h:4
+-msgid "Delay for the activation of the frame using the corners."
+-msgstr ""
++msgid "Bundle IDs of protected activities"
++msgstr "Pū IDs o ngā hohe pare"
+ 
+ #: ../data/sugar.schemas.in.h:5
+-msgid "Delay for the activation of the frame using the edges."
++msgid ""
++"Color for the XO icon that is used throughout the desktop. The string is "
++"composed of the stroke color and fill color, format is that of rgb colors. "
++"Example: #AC32FF,#9A5200"
+ msgstr ""
++"Te tae mō te ata XO ka whakamahia puta noa i te papamahi. Kei te rārangi te "
++"tae miringa me te tae whakakī, ko te hōputu ko tērā o ngā tae rgb. Tauira: "
++"#AC32FF,#9A5200"
+ 
+ #: ../data/sugar.schemas.in.h:6
+-msgid "Edge Delay"
+-msgstr ""
++msgid "Corner Delay"
++msgstr "Takaware Koko"
+ 
+ #: ../data/sugar.schemas.in.h:7
+-msgid "Favorites Layout"
+-msgstr ""
++msgid "Default font face"
++msgstr "Mata momotuhi taunoa"
+ 
+ #: ../data/sugar.schemas.in.h:8
+-msgid "Favorites resume mode"
+-msgstr ""
++msgid "Default font size"
++msgstr "Rahinga momotuhi taunoa"
+ 
+ #: ../data/sugar.schemas.in.h:9
+-msgid ""
+-"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+-"server."
+-msgstr ""
++msgid "Default nick"
++msgstr "Nick taunoa"
+ 
+ #: ../data/sugar.schemas.in.h:10
+-msgid "Jabber Server"
+-msgstr ""
++msgid "Delay for the activation of the frame using the corners."
++msgstr "Takaware mō te hohenga o te tāpare e whakamahi ana i ngā koko."
+ 
+ #: ../data/sugar.schemas.in.h:11
+-msgid "Layout of the favorites view."
+-msgstr ""
++msgid "Delay for the activation of the frame using the edges."
++msgstr "Takaware mō te whakahohenga o te tāpare e whakamahi ana i ngā tapa."
+ 
+ #: ../data/sugar.schemas.in.h:12
+-msgid "Power Automatic"
+-msgstr ""
++msgid "Directory to search for translations"
++msgstr "Whaiaronga hei rapu i ngā whakamāoritanga"
+ 
+ #: ../data/sugar.schemas.in.h:13
+-msgid "Power Automatic."
+-msgstr ""
++msgid "Edge Delay"
++msgstr "Takaware Tapa"
+ 
+ #: ../data/sugar.schemas.in.h:14
+-msgid "Power Extreme"
+-msgstr ""
++msgid "Favorites Layout"
++msgstr "Tahoranga Makau"
+ 
+ #: ../data/sugar.schemas.in.h:15
+-msgid "Power Extreme."
+-msgstr ""
++msgid "Favorites resume mode"
++msgstr "Aratau haere anō o ngā Makau"
+ 
+ #: ../data/sugar.schemas.in.h:16
+-msgid "Publish to Gadget"
+-msgstr ""
++msgid "Font face that is used throughout the desktop."
++msgstr "Mata momotuhi ka whakamahia puta noa i te papamahi."
+ 
+ #: ../data/sugar.schemas.in.h:17
+-msgid "Setting for muting the sound device."
+-msgstr ""
++msgid "Font size that is used throughout the desktop."
++msgstr "Rahinga momotuhi ka whakamahia puta noa i te papamahi."
+ 
+ #: ../data/sugar.schemas.in.h:18
+-msgid "Sound Muted"
+-msgstr ""
++msgid "GSM network APN"
++msgstr "Whatunga GSM APN"
++
++#: ../data/sugar.schemas.in.h:19
++msgid "GSM network PIN"
++msgstr "Whatunga GSM PIN"
+ 
+ #: ../data/sugar.schemas.in.h:20
+-msgid "Timezone setting for the system."
+-msgstr ""
++msgid "GSM network PUK"
++msgstr "Whatunga GSM PUK"
+ 
+ #: ../data/sugar.schemas.in.h:21
+-msgid "Url of the jabber server to use."
+-msgstr ""
++msgid "GSM network access point name configuration"
++msgstr "Whirihoranga, ingoa pito uru whatunga GSM"
+ 
+ #: ../data/sugar.schemas.in.h:22
+-msgid "Url where the backup is saved to."
+-msgstr ""
++msgid "GSM network number"
++msgstr "Tau whatunga GSM"
+ 
+ #: ../data/sugar.schemas.in.h:23
+-msgid "User Color"
+-msgstr ""
++msgid "GSM network password"
++msgstr "Kupuhipa whatunga GSM"
+ 
+ #: ../data/sugar.schemas.in.h:24
+-msgid "User Name"
+-msgstr ""
++msgid "GSM network password configuration"
++msgstr "Whirihoranga, kupuhipa whatunga GSM"
+ 
+ #: ../data/sugar.schemas.in.h:25
+-msgid "User name that is used throughout the desktop."
+-msgstr ""
++msgid "GSM network personal identification number configuration"
++msgstr "Whirihoranga, tau tāututanga whaiaro whatunga GSM"
+ 
+ #: ../data/sugar.schemas.in.h:26
+-msgid "Volume Level"
+-msgstr ""
++msgid "GSM network personal unlock key configuration"
++msgstr "Whirihoranga, kī whakatūwhera whaiaro whatunga GSM"
+ 
+ #: ../data/sugar.schemas.in.h:27
+-msgid "Volume level for the sound device."
+-msgstr ""
++msgid "GSM network telephone number configuration"
++msgstr "Whirihoranga, tau waea whatunga GSM"
+ 
+ #: ../data/sugar.schemas.in.h:28
++msgid "GSM network username"
++msgstr "Ingoakaiwhakamahi whatunga GSM"
++
++#: ../data/sugar.schemas.in.h:29
++msgid "GSM network username configuration"
++msgstr "Whirihoranga, ingoakaiwhakamahi whatunga GSM"
++
++#: ../data/sugar.schemas.in.h:30
+ msgid ""
+-"When in resume mode, clicking on a favorite icon will cause the last entry "
+-"for that activity to be resumed."
++"If TRUE, Sugar will make us searchable for the other users of the Jabber "
++"server."
+ msgstr ""
++"Ki te Tika, ka whakarite a Sugar kia taea e ērā atu kaiwhakamahi o te tūmau "
++"Jabber te rapu i a mātou."
+ 
+-#: ../src/jarabe/controlpanel/cmd.py:28
+-#, python-format
++#: ../data/sugar.schemas.in.h:31
++msgid "If TRUE, Sugar will show a \"Log out\" option."
++msgstr "Ki te Tika, ka whakaaturia e Sugar te kōwhiringa \"Takiputa\"."
++
++#: ../data/sugar.schemas.in.h:32
++msgid "If TRUE, Sugar will show a \"Restart\" option."
++msgstr "Ki te TIKA, ka whakaaturia e Sugar te kōwhiringa \"Tīmata Anō\"."
++
++#: ../data/sugar.schemas.in.h:33
+ msgid ""
+-"sugar-control-panel: WARNING, found more than one option with the same name: "
+-"%s module: %r"
++"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
++"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
++"hoc network."
+ msgstr ""
++"Ki te TIKA, ka whakaaturia e Sugar ngā whatunga Hanga noa taunoa mō ngā "
++"hongere 1,6 me te 11. Ki te kore e kitea e Sugar te whatunga \"e mōhiotia "
++"ana\" i tāna tīmatatanga, ka kore e honoaunoa ki te whatunga Hanga noa."
+ 
+-#: ../src/jarabe/controlpanel/cmd.py:30
+-#, python-format
+-msgid "sugar-control-panel: key=%s not an available option"
+-msgstr ""
++#: ../data/sugar.schemas.in.h:34
++msgid "Jabber Server"
++msgstr "Tūmau Jabber"
+ 
+-#: ../src/jarabe/controlpanel/cmd.py:31
+-#, python-format
+-msgid "sugar-control-panel: %s"
+-msgstr ""
++#: ../data/sugar.schemas.in.h:35
++msgid "Keyboard layouts"
++msgstr "Ngā tahora papapātuhi"
+ 
+-#. TRANS: Translators, there's a empty line at the end of this string,
+-#. which must appear in the translated string (msgstr) as well.
+-#: ../src/jarabe/controlpanel/cmd.py:37
+-msgid ""
+-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
++#: ../data/sugar.schemas.in.h:36
++msgid "Keyboard model"
++msgstr "Tauira papapātuhi"
++
++#: ../data/sugar.schemas.in.h:37
++msgid "Keyboard options"
++msgstr "Ngā kōwhiringa papapātuhi"
++
++#: ../data/sugar.schemas.in.h:38
++msgid "Layout of the favorites view."
++msgstr "Tahora o te tirohanga ngā makau."
++
++#: ../data/sugar.schemas.in.h:39
++msgid ""
++"List of keyboard layouts. Each entry should be in the form layout(variant)"
++msgstr ""
++"Rārangi o ngā tahora papapātuhi. Me pēnei ia tāurunga, tahora puka(variant)"
++
++#: ../data/sugar.schemas.in.h:40
++msgid "List of keyboard options."
++msgstr "Rārangi o ngā kōwhiringa papapātuhi."
++
++#: ../data/sugar.schemas.in.h:41
++msgid "Power Automatic"
++msgstr "Aunoa Hiko"
++
++#: ../data/sugar.schemas.in.h:42
++msgid "Power Automatic."
++msgstr "Aunoa Hiko."
++
++#: ../data/sugar.schemas.in.h:43
++msgid "Power Extreme"
++msgstr "Taikaha Hiko"
++
++#: ../data/sugar.schemas.in.h:44
++msgid "Power Extreme."
++msgstr "Taikaha Hiko."
++
++#: ../data/sugar.schemas.in.h:45
++msgid "Publish to Gadget"
++msgstr "Whakaputa ki Taputapu"
++
++#: ../data/sugar.schemas.in.h:46
++msgid "Setting for muting the sound device."
++msgstr "Tautuhinga hei whakangū i te pūrere oro."
++
++#: ../data/sugar.schemas.in.h:47
++msgid "Show Log out"
++msgstr "Whakaatu Takiputa"
++
++#: ../data/sugar.schemas.in.h:48
++msgid "Show Restart"
++msgstr "Whakaatu Tīmata Anō"
++
++#: ../data/sugar.schemas.in.h:49
++msgid "Show Sugar Ad-hoc networks"
++msgstr "Whakaatu i ngā whatunga Hanga noa a Sugar"
++
++#: ../data/sugar.schemas.in.h:50
++msgid "Sound Muted"
++msgstr "Kua Whakangū Oro"
++
++#: ../data/sugar.schemas.in.h:51
++msgid "The keyboard model to be used"
++msgstr "Te tauira papapātuhi hei whakamahi"
++
++#: ../data/sugar.schemas.in.h:53
++msgid "Timezone setting for the system."
++msgstr "Tautuhinga rohewā mō te pūnaha."
++
++#: ../data/sugar.schemas.in.h:54
++msgid "Url of the jabber server to use."
++msgstr "URL o te tūmau jabber hei whakamahi."
++
++#: ../data/sugar.schemas.in.h:55
++msgid "Url where the backup is saved to."
++msgstr "URL ki reira kua tiakina te tārua."
++
++#: ../data/sugar.schemas.in.h:56
++msgid "User Color"
++msgstr "Tae Kaiwhakamahi"
++
++#: ../data/sugar.schemas.in.h:57
++msgid "User Name"
++msgstr "Ingoa Kaiwhakamahi"
++
++#: ../data/sugar.schemas.in.h:58
++msgid "User name that is used throughout the desktop."
++msgstr "Ingoa kaiwhakamahi kua whakamahia puta noa i te papamahi."
++
++#: ../data/sugar.schemas.in.h:59
++msgid ""
++"Users will not be allowed to erase these activities through the list view."
++msgstr ""
++"Kāore e āhei e ngā kaiwhakamahi te muku ngā hohe mā te tirohanga rārangi."
++
++#: ../data/sugar.schemas.in.h:60
++msgid "Volume Level"
++msgstr "Taumata Rōrahi"
++
++#: ../data/sugar.schemas.in.h:61
++msgid "Volume level for the sound device."
++msgstr "Taumata rōrahi mō te pūrere oro."
++
++#: ../data/sugar.schemas.in.h:62
++msgid ""
++"When in resume mode, clicking on a favorite icon will cause the last entry "
++"for that activity to be resumed."
++msgstr ""
++"I te wā kei te aratau haere anō, ki te pāwhiri i tētahi ata makau, ka haere "
++"tonu te tāurunga whakamutunga nō tērā hohe."
++
++#: ../src/jarabe/controlpanel/cmd.py:28
++#, python-format
++msgid ""
++"sugar-control-panel: WARNING, found more than one option with the same name: "
++"%s module: %r"
++msgstr ""
++"paewhiri-mana-sugar: WHAKATŪPATO, i kitea nui ake i te kōwhiringa kotahi me "
++"te ingoa ōrite: %s kōwae: %r"
++
++#: ../src/jarabe/controlpanel/cmd.py:30
++#, python-format
++msgid "sugar-control-panel: key=%s not an available option"
++msgstr "paewhiri-mana-sugar: kāore e taea te kōwhiringa kī=%s"
++
++#: ../src/jarabe/controlpanel/cmd.py:31
++#, python-format
++msgid "sugar-control-panel: %s"
++msgstr "paewhiri-mana-sugar: %s"
++
++#. TRANS: Translators, there's a empty line at the end of this string,
++#. which must appear in the translated string (msgstr) as well.
++#: ../src/jarabe/controlpanel/cmd.py:38
++msgid ""
++"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+ "    Control for the sugar environment. \n"
+ "    Options: \n"
+ "    -h           show this help message and exit \n"
+@@ -498,482 +934,1380 @@ msgid ""
+ "    -c key       clear the current value for the key \n"
+ "    "
+ msgstr ""
++"Whakamahinga: paewhiri-mana-sugar [ kōwhiringa ] kī [ args ... ] \n"
++"    Mana mō te taiao sugar. \n"
++"    Ngā Kōwhiringa: \n"
++"    -h           whakaaturia tēnei karere āwhina ka putaatu \n"
++"    -l           whakarārangitia ngā kōwhiringa āhei katoa \n"
++"    kī -h       whakaaturia mōhiohio mō tēnei kī \n"
++"    kī - g tīkina te uara o nāianei o te kī \n"
++"    kī -s tautuhia te uara o nāianei mō te kī \n"
++"    kī - c ūkuia te uara o nāianei mō te kī \n"
++"    "
+ 
+-#: ../src/jarabe/controlpanel/cmd.py:50
++#: ../src/jarabe/controlpanel/cmd.py:52
+ msgid "To apply your changes you have to restart sugar.\n"
+-msgstr ""
++msgstr "Hei hoatu i ō huringa me tīmata anō i a Sugar.\n"
+ 
+-#: ../src/jarabe/controlpanel/gui.py:272
++#: ../src/jarabe/controlpanel/gui.py:297 ../src/jarabe/journal/palettes.py:161
++#: ../src/jarabe/journal/palettes.py:246 ../src/jarabe/journal/palettes.py:279
++#: ../src/jarabe/journal/volumestoolbar.py:307
+ msgid "Warning"
+-msgstr ""
++msgstr "Whakatūpato"
+ 
+-#: ../src/jarabe/controlpanel/gui.py:273
+-#: ../src/jarabe/controlpanel/sectionview.py:42
++#: ../src/jarabe/controlpanel/gui.py:298
++#: ../src/jarabe/controlpanel/sectionview.py:41
+ msgid "Changes require restart"
+-msgstr ""
++msgstr "Me tīmata anō mō ngā huringa"
+ 
+-#: ../src/jarabe/controlpanel/gui.py:276
++#: ../src/jarabe/controlpanel/gui.py:301
+ msgid "Cancel changes"
+-msgstr ""
++msgstr "Whakakorengia ngā huringa"
+ 
+-#: ../src/jarabe/controlpanel/gui.py:281 ../src/jarabe/desktop/homebox.py:113
++#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:73
+ msgid "Later"
+-msgstr ""
++msgstr "Ā kō ake nei"
+ 
+-#: ../src/jarabe/controlpanel/gui.py:285
++#: ../src/jarabe/controlpanel/gui.py:310
+ msgid "Restart now"
+-msgstr ""
++msgstr "Tīmata anō ināianei"
+ 
+-#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
++#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
+ msgid "Done"
+-msgstr ""
+-
+-#: ../src/jarabe/controlpanel/toolbar.py:115
+-#: ../src/jarabe/desktop/homebox.py:111
+-#: ../src/jarabe/frame/activitiestray.py:683
+-#: ../src/jarabe/frame/activitiestray.py:762
+-#: ../src/jarabe/frame/activitiestray.py:790
+-msgid "Cancel"
+-msgstr ""
++msgstr "Kua Mutu"
+ 
+-#: ../src/jarabe/controlpanel/toolbar.py:121
+-#: ../src/jarabe/desktop/favoritesview.py:334
++#: ../src/jarabe/controlpanel/toolbar.py:125
++#: ../src/jarabe/desktop/favoritesview.py:347
+ msgid "Ok"
+-msgstr ""
++msgstr "Āe"
++
++#: ../src/jarabe/desktop/activitieslist.py:230
++#, python-format
++#, python-format,
++msgid "Version %s"
++msgstr "Putanga %s"
++
++#: ../src/jarabe/desktop/activitieslist.py:356
++msgid "Confirm erase"
++msgstr "Whakaū muku"
++
++#: ../src/jarabe/desktop/activitieslist.py:358
++#, python-format
++msgid "Confirm erase: Do you want to permanently erase %s?"
++msgstr "Whakaū muku: E hiahia ana kia muku i te %s mō ake tonu atu?"
++
++#: ../src/jarabe/desktop/activitieslist.py:362
++#: ../src/jarabe/frame/clipboardmenu.py:67
++#: ../src/jarabe/view/viewsource.py:280
++msgid "Keep"
++msgstr "Pupuri"
++
++#: ../src/jarabe/desktop/activitieslist.py:365
++#: ../src/jarabe/desktop/activitieslist.py:419
++#: ../src/jarabe/journal/journaltoolbox.py:413
++#: ../src/jarabe/journal/palettes.py:126
++msgid "Erase"
++msgstr "Muku"
++
++#: ../src/jarabe/desktop/activitieslist.py:435
++msgid "Remove favorite"
++msgstr "Tango makau"
++
++#: ../src/jarabe/desktop/activitieslist.py:439
++msgid "Make favorite"
++msgstr "Waihanga makau"
+ 
+ #. TRANS: label for the freeform layout in the favorites view
+-#: ../src/jarabe/desktop/favoriteslayout.py:114
++#: ../src/jarabe/desktop/favoriteslayout.py:127
+ msgid "Freeform"
+-msgstr ""
++msgstr "Tuhitene"
+ 
+ #. TRANS: label for the ring layout in the favorites view
+-#: ../src/jarabe/desktop/favoriteslayout.py:196
++#: ../src/jarabe/desktop/favoriteslayout.py:215
+ msgid "Ring"
+-msgstr ""
++msgstr "Porohita"
+ 
+ #. TRANS: label for the spiral layout in the favorites view
+-#: ../src/jarabe/desktop/favoriteslayout.py:341
++#: ../src/jarabe/desktop/favoriteslayout.py:402
+ msgid "Spiral"
+-msgstr ""
++msgstr "Koru"
+ 
+ #. TRANS: label for the box layout in the favorites view
+-#: ../src/jarabe/desktop/favoriteslayout.py:408
++#: ../src/jarabe/desktop/favoriteslayout.py:472
+ msgid "Box"
+-msgstr ""
++msgstr "Pouaka"
+ 
+ #. TRANS: label for the box layout in the favorites view
+-#: ../src/jarabe/desktop/favoriteslayout.py:449
++#: ../src/jarabe/desktop/favoriteslayout.py:515
+ msgid "Triangle"
+-msgstr ""
++msgstr "Tapatoru"
+ 
+-#: ../src/jarabe/desktop/favoritesview.py:325
++#: ../src/jarabe/desktop/favoritesview.py:338
+ msgid "Registration Failed"
+-msgstr ""
++msgstr "I Rahua te Rēhitatanga"
+ 
+-#: ../src/jarabe/desktop/favoritesview.py:326
++#: ../src/jarabe/desktop/favoritesview.py:339
+ #, python-format
+ msgid "%s"
+-msgstr ""
++msgstr "%s"
+ 
+-#: ../src/jarabe/desktop/favoritesview.py:328
++#: ../src/jarabe/desktop/favoritesview.py:341
+ msgid "Registration Successful"
+-msgstr ""
++msgstr "I Tika te Rēhitatanga"
+ 
+-#: ../src/jarabe/desktop/favoritesview.py:329
++#: ../src/jarabe/desktop/favoritesview.py:342
+ msgid "You are now registered with your school server."
+-msgstr ""
++msgstr "Kua rēhitatia koe me te tūmau o tō kura."
+ 
+-#: ../src/jarabe/desktop/favoritesview.py:666
++#: ../src/jarabe/desktop/favoritesview.py:641
+ msgid "Register"
+-msgstr ""
+-
+-#: ../src/jarabe/desktop/homebox.py:67
+-msgid "Confirm erase"
+-msgstr ""
++msgstr "Rēhita"
+ 
+-#: ../src/jarabe/desktop/homebox.py:69
+-#, python-format
+-msgid "Confirm erase: Do you want to permanently erase %s?"
+-msgstr ""
++#: ../src/jarabe/desktop/favoritesview.py:643
++#: ../src/jarabe/desktop/favoritesview.py:660
++msgid "Register again"
++msgstr "Rēhita anō"
+ 
+-#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
+-msgid "Keep"
+-msgstr ""
+-
+-#: ../src/jarabe/desktop/homebox.py:76
+-#: ../src/jarabe/journal/journaltoolbox.py:357
+-#: ../src/jarabe/journal/palettes.py:97 ../src/jarabe/view/palettes.py:127
+-msgid "Erase"
+-msgstr ""
+-
+-#: ../src/jarabe/desktop/homebox.py:106
++#: ../src/jarabe/desktop/homebox.py:66
+ msgid "Software Update"
+-msgstr ""
++msgstr "Whakahōu Pūmanawa"
+ 
+-#: ../src/jarabe/desktop/homebox.py:107
++#: ../src/jarabe/desktop/homebox.py:67
+ msgid "Update your activities to ensure compatibility with your new software"
+-msgstr ""
++msgstr "Whakahōungia ō hohe kia hototahi me tō pūmanawa hōu"
+ 
+-#: ../src/jarabe/desktop/homebox.py:116
++#: ../src/jarabe/desktop/homebox.py:76
+ msgid "Check now"
+-msgstr ""
++msgstr "Takina ināianei"
+ 
+-#: ../src/jarabe/desktop/homebox.py:233
++#: ../src/jarabe/desktop/homebox.py:197
+ msgid "List view"
+-msgstr ""
++msgstr "Tiro rārangi"
+ 
+-#: ../src/jarabe/desktop/homebox.py:234
++#: ../src/jarabe/desktop/homebox.py:198
+ msgid "<Ctrl>2"
+-msgstr ""
++msgstr "<Ctrl>2"
+ 
+-#: ../src/jarabe/desktop/homebox.py:296
++#: ../src/jarabe/desktop/homebox.py:253
+ msgid "Favorites view"
+-msgstr ""
++msgstr "Tiro makau"
+ 
+-#: ../src/jarabe/desktop/homebox.py:297
++#: ../src/jarabe/desktop/homebox.py:254
+ msgid "<Ctrl>1"
+-msgstr ""
++msgstr "<Ctrl>1"
+ 
+-#: ../src/jarabe/desktop/homebox.py:304
+-msgid "Resume by default"
++#: ../src/jarabe/desktop/keydialog.py:94
++#, python-format
++msgid ""
++"A wireless encryption key is required for\n"
++" the wireless network '%s'."
+ msgstr ""
++"Me whai kī whakamunatanga ahokore mō\n"
++"te whatunga ahokore '%s'."
+ 
+-#: ../src/jarabe/desktop/keydialog.py:131
++#: ../src/jarabe/desktop/keydialog.py:144
+ msgid "Key Type:"
+-msgstr ""
++msgstr "Momo Kī:"
+ 
+-#: ../src/jarabe/desktop/keydialog.py:151
++#: ../src/jarabe/desktop/keydialog.py:164
+ msgid "Authentication Type:"
+-msgstr ""
++msgstr "Momo Motuhēhēnga:"
+ 
+-#: ../src/jarabe/desktop/keydialog.py:215
++#: ../src/jarabe/desktop/keydialog.py:230
+ msgid "WPA & WPA2 Personal"
+-msgstr ""
++msgstr "WPA & WPA2 Whaiaro"
+ 
+-#: ../src/jarabe/desktop/keydialog.py:224
++#: ../src/jarabe/desktop/keydialog.py:239
+ msgid "Wireless Security:"
+-msgstr ""
+-
+-#: ../src/jarabe/desktop/meshbox.py:130
+-msgid "Connect"
+-msgstr ""
+-
+-#: ../src/jarabe/desktop/meshbox.py:134
+-msgid "Disconnect"
+-msgstr ""
++msgstr "Haumarutanga Ahokore:"
+ 
+ #. TRANS: Action label for resuming an activity.
+-#: ../src/jarabe/desktop/meshbox.py:440
+-#: ../src/jarabe/frame/activitiestray.py:707
+-#: ../src/jarabe/journal/journaltoolbox.py:425
+-#: ../src/jarabe/journal/palettes.py:63 ../src/jarabe/view/palettes.py:62
++#: ../src/jarabe/desktop/meshbox.py:91
++#: ../src/jarabe/journal/journaltoolbox.py:509
++#: ../src/jarabe/journal/palettes.py:71 ../src/jarabe/view/palettes.py:84
+ msgid "Resume"
+-msgstr ""
++msgstr "Haere Anō"
+ 
+-#: ../src/jarabe/desktop/meshbox.py:445
+-#: ../src/jarabe/frame/activitiestray.py:221
++#: ../src/jarabe/desktop/meshbox.py:96
++#: ../src/jarabe/frame/activitiestray.py:182
+ msgid "Join"
+-msgstr ""
++msgstr "Hono"
+ 
+-#: ../src/jarabe/desktop/schoolserver.py:18
+-msgid "Cannot obtain data needed for registration."
+-msgstr ""
++#: ../src/jarabe/desktop/networkviews.py:502
++#, python-format
++msgid "Ad-hoc Network %d"
++msgstr "Whatunga Hanga Noa %d"
++
++#: ../src/jarabe/desktop/networkviews.py:636
++#, python-format
++msgid "Mesh Network %d"
++msgstr "Whatunga Tākekenga %d"
+ 
+-#: ../src/jarabe/desktop/schoolserver.py:35
++#: ../src/jarabe/desktop/schoolserver.py:143
+ msgid "Cannot connect to the server."
+-msgstr ""
++msgstr "Kāore e taea te tūhono ki te tūmau."
+ 
+-#: ../src/jarabe/desktop/schoolserver.py:40
++#: ../src/jarabe/desktop/schoolserver.py:150
+ msgid "The server could not complete the request."
+-msgstr ""
++msgstr "Kāore i taea e te tūmau te inoi te whakaoti."
+ 
+-#: ../src/jarabe/frame/activitiestray.py:226
+-#: ../src/jarabe/frame/activitiestray.py:655
++#: ../src/jarabe/frame/activitiestray.py:187
++#: ../src/jarabe/frame/activitiestray.py:574
+ msgid "Decline"
+-msgstr ""
++msgstr "Whakapeka"
+ 
+-#: ../src/jarabe/frame/activitiestray.py:608
++#: ../src/jarabe/frame/activitiestray.py:523
+ #, python-format
++#, python-format,
+ msgid "%dB"
+-msgstr ""
++msgstr "%dB"
+ 
+-#: ../src/jarabe/frame/activitiestray.py:610
++#: ../src/jarabe/frame/activitiestray.py:525
+ #, python-format
++#, python-format,
+ msgid "%dKB"
+-msgstr ""
++msgstr "%dKB"
+ 
+-#: ../src/jarabe/frame/activitiestray.py:612
++#: ../src/jarabe/frame/activitiestray.py:527
+ #, python-format
++#, python-format,
+ msgid "%dMB"
+-msgstr ""
++msgstr "%dMB"
+ 
+-#: ../src/jarabe/frame/activitiestray.py:629
++#: ../src/jarabe/frame/activitiestray.py:544
+ #, python-format
+ msgid "%s of %s"
+-msgstr ""
++msgstr "%s o %s"
+ 
+-#: ../src/jarabe/frame/activitiestray.py:640
++#: ../src/jarabe/frame/activitiestray.py:558
+ #, python-format
+-msgid "Transfer from %r"
+-msgstr ""
++msgid "Transfer from %s"
++msgstr "Whakawhiti mai %s"
+ 
+-#: ../src/jarabe/frame/activitiestray.py:650
++#: ../src/jarabe/frame/activitiestray.py:569
+ msgid "Accept"
+-msgstr ""
++msgstr "Whakaae"
+ 
+-#: ../src/jarabe/frame/activitiestray.py:673
+-#: ../src/jarabe/frame/activitiestray.py:780
++#: ../src/jarabe/frame/activitiestray.py:592
++#: ../src/jarabe/frame/activitiestray.py:722
+ #, python-format
+ msgid "%s (%s)"
+-msgstr ""
++msgstr "%s (%s)"
+ 
+-#: ../src/jarabe/frame/activitiestray.py:751
++#: ../src/jarabe/frame/activitiestray.py:626
++#: ../src/jarabe/frame/activitiestray.py:639
++#: ../src/jarabe/frame/activitiestray.py:757
++msgid "Dismiss"
++msgstr "Ākiri"
++
++#: ../src/jarabe/frame/activitiestray.py:643
++msgid "The other participant canceled the file transfer"
++msgstr "I whakakore tērā atu kaiwhakamahi i te whakawhitinga kōnae"
++
++#: ../src/jarabe/frame/activitiestray.py:691
+ #, python-format
+-msgid "Transfer to %r"
+-msgstr ""
++msgid "Transfer to %s"
++msgstr "Whakawhiti ki %s"
+ 
+-#: ../src/jarabe/frame/clipboardmenu.py:52
++#: ../src/jarabe/frame/clipboardmenu.py:56
++msgctxt "Clipboard"
+ msgid "Remove"
+-msgstr ""
++msgstr "Tango"
+ 
+-#: ../src/jarabe/frame/clipboardmenu.py:57
+-#: ../src/jarabe/frame/clipboardmenu.py:80
++#: ../src/jarabe/frame/clipboardmenu.py:62
++#: ../src/jarabe/frame/clipboardmenu.py:85
+ msgid "Open"
+-msgstr ""
++msgstr "Whakatuwhera"
+ 
+-#: ../src/jarabe/frame/clipboardmenu.py:85
++#: ../src/jarabe/frame/clipboardmenu.py:90
+ msgid "Open with"
+-msgstr ""
++msgstr "Whakatūwhera ki"
+ 
+-#: ../src/jarabe/frame/clipboardobject.py:47
++#: ../src/jarabe/frame/clipboardobject.py:50
+ #, python-format
+ msgid "%s clipping"
+-msgstr ""
++msgstr "%s topetopenga"
+ 
+-#: ../src/jarabe/frame/zoomtoolbar.py:36
++#: ../src/jarabe/frame/zoomtoolbar.py:39
+ msgid "Neighborhood"
+-msgstr ""
++msgstr "Takiwā"
+ 
+-#: ../src/jarabe/frame/zoomtoolbar.py:38
+-msgid "Group"
+-msgstr ""
++#: ../src/jarabe/frame/zoomtoolbar.py:39
++msgid "F1"
++msgstr "F1"
+ 
+-#: ../src/jarabe/frame/zoomtoolbar.py:40
+-msgid "Home"
+-msgstr ""
++#: ../src/jarabe/frame/zoomtoolbar.py:41
++msgid "F2"
++msgstr "F2"
+ 
+-#: ../src/jarabe/intro/window.py:124
++#: ../src/jarabe/frame/zoomtoolbar.py:43
++msgid "F3"
++msgstr "F3"
++
++#: ../src/jarabe/frame/zoomtoolbar.py:45
++msgid "F4"
++msgstr "F4"
++
++#: ../src/jarabe/intro/window.py:90
++msgid "Name:"
++msgstr "Ingoa:"
++
++#: ../src/jarabe/intro/window.py:126
+ msgid "Click to change color:"
+-msgstr ""
++msgstr "Pāwhiri kia huri i te tae:"
+ 
+-#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
++#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
+ msgid "Back"
+-msgstr ""
++msgstr "Hoki"
+ 
+-#: ../src/jarabe/intro/window.py:191
++#: ../src/jarabe/intro/window.py:204
+ msgid "Next"
+-msgstr ""
++msgstr "Panuku"
+ 
+-#: ../src/jarabe/journal/collapsedentry.py:243
+-#: ../src/jarabe/journal/expandedentry.py:159
+-#: ../src/jarabe/journal/palettes.py:57
++#: ../src/jarabe/journal/expandedentry.py:156
++#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:64
++#: ../src/jarabe/journal/volumestoolbar.py:130
+ msgid "Untitled"
+-msgstr ""
++msgstr "Kore Ingoa"
+ 
+-#: ../src/jarabe/journal/expandedentry.py:205
++#: ../src/jarabe/journal/expandedentry.py:245
+ msgid "No preview"
+-msgstr ""
++msgstr "Arokite kore"
++
++#: ../src/jarabe/journal/expandedentry.py:264
++#, python-format
++msgid "Kind: %s"
++msgstr "Tūmomo: %s"
++
++#: ../src/jarabe/journal/expandedentry.py:264
++#: ../src/jarabe/journal/listmodel.py:150
++#: ../src/jarabe/journal/listmodel.py:158
++msgid "Unknown"
++msgstr "Tē Mōhiotia"
++
++#: ../src/jarabe/journal/expandedentry.py:265
++#, python-format
++#, python-format,
++msgid "Date: %s"
++msgstr "Rā: %s"
+ 
+-#: ../src/jarabe/journal/expandedentry.py:224
++#: ../src/jarabe/journal/expandedentry.py:266
++#, python-format
++#, python-format,
++msgid "Size: %s"
++msgstr "Rahi: %s"
++
++#: ../src/jarabe/journal/expandedentry.py:294
++#: ../src/jarabe/journal/misc.py:108
++msgid "No date"
++msgstr "Kāore he rā"
++
++#: ../src/jarabe/journal/expandedentry.py:301
+ msgid "Participants:"
+-msgstr ""
++msgstr "Ngā Kaiwhakauru:"
+ 
+-#: ../src/jarabe/journal/expandedentry.py:247
++#: ../src/jarabe/journal/expandedentry.py:323
+ msgid "Description:"
+-msgstr ""
++msgstr "Whakaaturanga:"
+ 
+-#: ../src/jarabe/journal/expandedentry.py:273
++#: ../src/jarabe/journal/expandedentry.py:348
+ msgid "Tags:"
+-msgstr ""
++msgstr "Ngā Tūtohu:"
+ 
+-#: ../src/jarabe/journal/journalactivity.py:108
+-#: ../src/jarabe/journal/volumestoolbar.py:47
++#: ../src/jarabe/journal/journalactivity.py:115
++#: ../src/jarabe/journal/journaltoolbox.py:468
++#: ../src/jarabe/journal/palettes.py:198
++#: ../src/jarabe/journal/volumestoolbar.py:368
+ msgid "Journal"
+-msgstr ""
++msgstr "Tuhitaka"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:65
++#: ../src/jarabe/journal/journaltoolbox.py:72
+ msgid "Search"
+-msgstr ""
++msgstr "Rapu"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:124
++#: ../src/jarabe/journal/journaltoolbox.py:139
+ msgid "Anytime"
+-msgstr ""
++msgstr "Ahakoa te wāAhakoa te wā"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:126
++#: ../src/jarabe/journal/journaltoolbox.py:141
+ msgid "Today"
+-msgstr ""
++msgstr "Ākuanei"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:128
++#: ../src/jarabe/journal/journaltoolbox.py:143
+ msgid "Since yesterday"
+-msgstr ""
++msgstr "Nō nanahi"
+ 
+ #. TRANS: Filter entries modified during the last 7 days.
+-#: ../src/jarabe/journal/journaltoolbox.py:130
++#: ../src/jarabe/journal/journaltoolbox.py:145
+ msgid "Past week"
+-msgstr ""
++msgstr "Wiki kua hipa"
+ 
+ #. TRANS: Filter entries modified during the last 30 days.
+-#: ../src/jarabe/journal/journaltoolbox.py:132
++#: ../src/jarabe/journal/journaltoolbox.py:147
+ msgid "Past month"
+-msgstr ""
++msgstr "Marama kua hipa"
+ 
+ #. TRANS: Filter entries modified during the last 356 days.
+-#: ../src/jarabe/journal/journaltoolbox.py:134
++#: ../src/jarabe/journal/journaltoolbox.py:149
+ msgid "Past year"
+-msgstr ""
++msgstr "Tau kua hipa"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:141
++#: ../src/jarabe/journal/journaltoolbox.py:156
+ msgid "Anyone"
+-msgstr ""
++msgstr "A wai noa"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:143
++#: ../src/jarabe/journal/journaltoolbox.py:158
+ msgid "My friends"
+-msgstr ""
++msgstr "Aku hoa"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:144
++#: ../src/jarabe/journal/journaltoolbox.py:159
+ msgid "My class"
+-msgstr ""
++msgstr "Taku akomanga"
+ 
+-#. TRANS: Item in a combo box that filters by entry type.
+-#: ../src/jarabe/journal/journaltoolbox.py:271
++#: ../src/jarabe/journal/journaltoolbox.py:301
+ msgid "Anything"
+-msgstr ""
++msgstr "Aha noa"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:347
+-#: ../src/jarabe/journal/palettes.py:81
+-msgid "Copy"
+-msgstr ""
++#: ../src/jarabe/journal/journaltoolbox.py:396
++#: ../src/jarabe/journal/palettes.py:93
++msgid "Copy to"
++msgstr "Tārua ki"
++
++#: ../src/jarabe/journal/journaltoolbox.py:404
++#: ../src/jarabe/journal/palettes.py:104 ../src/jarabe/view/viewsource.py:274
++msgid "Duplicate"
++msgstr "Tārite"
++
++#: ../src/jarabe/journal/journaltoolbox.py:437
++#: ../src/jarabe/journal/palettes.py:141 ../src/jarabe/journal/palettes.py:254
++#: ../src/jarabe/journal/volumestoolbar.py:315
++#, python-format
++msgid "Error while copying the entry. %s"
++msgstr "Hapa i te tāruatanga o te tāurunga. %s"
++
++#: ../src/jarabe/journal/journaltoolbox.py:438
++#: ../src/jarabe/journal/palettes.py:142 ../src/jarabe/journal/palettes.py:255
++#: ../src/jarabe/journal/volumestoolbar.py:316
++msgid "Error"
++msgstr "Hapa"
+ 
+ #. TRANS: Action label for starting an entry.
+-#: ../src/jarabe/journal/journaltoolbox.py:428
+-#: ../src/jarabe/journal/palettes.py:66 ../src/jarabe/view/palettes.py:111
++#: ../src/jarabe/journal/journaltoolbox.py:512
++#: ../src/jarabe/journal/palettes.py:74
+ msgid "Start"
+-msgstr ""
++msgstr "Tīmata"
++
++#: ../src/jarabe/journal/journaltoolbox.py:540
++msgid "Sort by date modified"
++msgstr "Kōmaka ā-rā whakakē"
++
++#: ../src/jarabe/journal/journaltoolbox.py:541
++msgid "Sort by date created"
++msgstr "Kōmaka ā-rā hanga"
+ 
+-#: ../src/jarabe/journal/listview.py:40
++#: ../src/jarabe/journal/journaltoolbox.py:542
++msgid "Sort by size"
++msgstr "Kōmaka ā-rahinga"
++
++#: ../src/jarabe/journal/journaltoolbox.py:551
++msgid "Sort view"
++msgstr "Kōmaka tirohanga"
++
++#: ../src/jarabe/journal/listview.py:316
+ msgid "Your Journal is empty"
+-msgstr ""
++msgstr "Kei te putu tō TuhitakaKei te putu tō Tuhitaka"
+ 
+-#: ../src/jarabe/journal/listview.py:41
+-msgid "No matching entries "
+-msgstr ""
++#: ../src/jarabe/journal/listview.py:319
++msgid "Your documents folder is empty"
++msgstr "Kei te putu tō kōpaki tuhinga"
++
++#: ../src/jarabe/journal/listview.py:321
++msgid "The device is empty"
++msgstr "Kei te putu te pūrere"
+ 
+-#: ../src/jarabe/journal/listview.py:369
++#: ../src/jarabe/journal/listview.py:323
++msgid "No matching entries"
++msgstr "Kāore he tāurunga ōrite"
++
++#: ../src/jarabe/journal/listview.py:397
+ msgid "Clear search"
+-msgstr ""
++msgstr "Wātea i te rapu"
+ 
+-#: ../src/jarabe/journal/misc.py:92
+-msgid "No date"
+-msgstr ""
++#: ../src/jarabe/journal/misc.py:273
++#, python-format
++msgid "Older Version Of %s Activity"
++msgstr "Putanga Tawhito O Te Hohe %s"
+ 
+-#: ../src/jarabe/journal/modalalert.py:63
++#: ../src/jarabe/journal/misc.py:274
++#, python-format
++msgid "Do you want to downgrade to version %s"
++msgstr "E hiahia ana koe kia whakaheke ki te putanga %s"
++
++#: ../src/jarabe/journal/modalalert.py:64
+ msgid "Your Journal is full"
+-msgstr ""
++msgstr "Kua kī tō Tuhitaka"
+ 
+-#: ../src/jarabe/journal/modalalert.py:67
++#: ../src/jarabe/journal/modalalert.py:68
+ msgid "Please delete some old Journal entries to make space for new ones."
+-msgstr ""
++msgstr "Mukua ētahi tāuru Tuhitaka tawhito kia whai wāhi ngā mea hōu."
+ 
+-#: ../src/jarabe/journal/modalalert.py:79
++#: ../src/jarabe/journal/modalalert.py:80
+ msgid "Show Journal"
+-msgstr ""
++msgstr "Whakaatu Tuhitaka"
+ 
+-#: ../src/jarabe/journal/objectchooser.py:136
++#: ../src/jarabe/journal/objectchooser.py:146
+ msgid "Choose an object"
+-msgstr ""
++msgstr "Kōwhiria tētahi ahanoa"
++
++#: ../src/jarabe/journal/objectchooser.py:151
++#: ../src/jarabe/view/viewsource.py:410
++msgid "Close"
++msgstr "Kati"
+ 
+-#: ../src/jarabe/journal/palettes.py:64
++#: ../src/jarabe/journal/palettes.py:72
+ msgid "Resume with"
+-msgstr ""
++msgstr "Haere anō me"
+ 
+-#: ../src/jarabe/journal/palettes.py:67
++#: ../src/jarabe/journal/palettes.py:75
+ msgid "Start with"
+-msgstr ""
++msgstr "Tīmata ki"
++
++#: ../src/jarabe/journal/palettes.py:88 ../src/jarabe/journal/palettes.py:357
++msgid "No activity to start entry"
++msgstr "Kāore he hohe kia tīmata i te tāurunga"
+ 
+-#: ../src/jarabe/journal/palettes.py:89
++#: ../src/jarabe/journal/palettes.py:112
+ msgid "Send to"
+-msgstr ""
++msgstr "Tuku ki"
++
++#: ../src/jarabe/journal/palettes.py:121
++msgid "View Details"
++msgstr "Tiro Ngā Taipitopito"
++
++#: ../src/jarabe/journal/palettes.py:160
++msgid "Entries without a file cannot be sent."
++msgstr "Kāore e taea te tuku tāurunga kore kōnae."
+ 
+-#: ../src/jarabe/journal/palettes.py:167
++#: ../src/jarabe/journal/palettes.py:245 ../src/jarabe/journal/palettes.py:278
++#: ../src/jarabe/journal/volumestoolbar.py:306
++msgid "Entries without a file cannot be copied."
++msgstr "Kāore e taea te tārua tāurunga kore kōnae."
++
++#: ../src/jarabe/journal/palettes.py:267
++msgid "Clipboard"
++msgstr "Papatopenga"
++
++#: ../src/jarabe/journal/palettes.py:322
+ msgid "No friends present"
+-msgstr ""
++msgstr "Kāore he hoa i konei"
+ 
+-#: ../src/jarabe/journal/palettes.py:172
++#: ../src/jarabe/journal/palettes.py:327
+ msgid "No valid connection found"
+-msgstr ""
++msgstr "Kāore he hononga whaimana"
+ 
+-#: ../src/jarabe/journal/palettes.py:200
++#: ../src/jarabe/journal/palettes.py:355
+ msgid "No activity to resume entry"
+-msgstr ""
++msgstr "Kāore he hohe kia haere anō te tāurunga"
+ 
+-#: ../src/jarabe/journal/palettes.py:202
+-msgid "No activity to start entry"
++#: ../src/jarabe/journal/volumestoolbar.py:209
++msgid "Documents"
++msgstr "Ngā Tuhinga"
++
++#: ../src/jarabe/journal/volumestoolbar.py:391
++#: ../src/jarabe/view/palettes.py:202 ../src/jarabe/view/palettes.py:254
++#, python-format
++msgid "%(free_space)d MB Free"
++msgstr "%(free_space)d MB Wātea"
++
++#: ../src/jarabe/model/network.py:163
++msgid "The reason for the device state change is unknown."
++msgstr "Kāore e mōhiotia ana te take mō te huringa tūnga o te pūrere."
++
++#: ../src/jarabe/model/network.py:165
++msgid "The state change is normal."
++msgstr "He pūnoa te huringa tūnga."
++
++#: ../src/jarabe/model/network.py:167
++msgid "The device is now managed."
++msgstr "Īnāianei kua whakahaeretia te pūrere."
++
++#: ../src/jarabe/model/network.py:169
++msgid "The device is no longer managed."
++msgstr "Īnāianei kāore te pūrere i te whakahaeretia."
++
++#: ../src/jarabe/model/network.py:171
++msgid "The device could not be readied for configuration."
++msgstr "Kāore i taea te whakarite pūrere hei whirihoranga."
++
++#: ../src/jarabe/model/network.py:173
++msgid ""
++"IP configuration could not be reserved (no available address, timeout, etc)."
+ msgstr ""
++"Kāore i taea te rāhui i te whirihoranga IP (kāore he wāhitau wātea, wāhiki, "
++"etc)."
++
++#: ../src/jarabe/model/network.py:176
++msgid "The IP configuration is no longer valid."
++msgstr "Kua muhu te whirihoranga IP."
++
++#: ../src/jarabe/model/network.py:178
++msgid "Secrets were required, but not provided."
++msgstr "I te hiahiatia ngā kōrero muna, engari kāore i tukuna."
++
++#: ../src/jarabe/model/network.py:180
++msgid ""
++"The 802.1X supplicant disconnected from the access point or authentication "
++"server."
++msgstr "I momotu te pūtono 802.1X i te pito uru, te tūmau whakamotuhēhē rānei."
++
++#: ../src/jarabe/model/network.py:183
++msgid "Configuration of the 802.1X supplicant failed."
++msgstr "I rahu te whirihoranga o te pūtono 802.1X."
++
++#: ../src/jarabe/model/network.py:185
++msgid "The 802.1X supplicant quit or failed unexpectedly."
++msgstr "I waiho, i rahu noa rānei te pūtono 802.1X."
++
++#: ../src/jarabe/model/network.py:187
++msgid "The 802.1X supplicant took too long to authenticate."
++msgstr "I roa rawa te whakamotuhēhētanga o te pūtono 802.1X."
++
++#: ../src/jarabe/model/network.py:189
++msgid "The PPP service failed to start within the allowed time."
++msgstr "Kāore te ratonga PPP i tīmata i te wā tuku."
++
++#: ../src/jarabe/model/network.py:191
++msgid "The PPP service disconnected unexpectedly."
++msgstr "I momotu noa te ratonga PPP."
++
++#: ../src/jarabe/model/network.py:193
++msgid "The PPP service quit or failed unexpectedly."
++msgstr "I waiho, i rahu noa rānei te ratonga PPP."
++
++#: ../src/jarabe/model/network.py:195
++msgid "The DHCP service failed to start within the allowed time."
++msgstr "Kāore te ratonga DHCP i tīmata i te wā tuku."
++
++#: ../src/jarabe/model/network.py:197
++msgid "The DHCP service reported an unexpected error."
++msgstr "I paorotia e te ratonga DHCP tētahi hapa noa."
++
++#: ../src/jarabe/model/network.py:199
++msgid "The DHCP service quit or failed unexpectedly."
++msgstr "I waiho, i rahu noa rānei te ratonga DHCP."
++
++#: ../src/jarabe/model/network.py:201
++msgid "The shared connection service failed to start."
++msgstr "Kāore te ratonga hononga tiri i tīmata."
++
++#: ../src/jarabe/model/network.py:203
++msgid "The shared connection service quit or failed unexpectedly."
++msgstr "I waiho, i rahu noa rānei te ratonga hononga tiri."
++
++#: ../src/jarabe/model/network.py:206
++msgid "The AutoIP service failed to start."
++msgstr "Kāore te IPAunoa i tīmata."
++
++#: ../src/jarabe/model/network.py:208
++msgid "The AutoIP service reported an unexpected error."
++msgstr "I paorotia e te ratonga IPAunoa tētahi hapa noa."
++
++#: ../src/jarabe/model/network.py:210
++msgid "The AutoIP service quit or failed unexpectedly."
++msgstr "I waiho, i rahu noa rānei te ratonga IPAunoa."
++
++#: ../src/jarabe/model/network.py:212
++msgid "Dialing failed because the line was busy."
++msgstr "I rahu te waea nā te korewātea."
++
++#: ../src/jarabe/model/network.py:214
++msgid "Dialing failed because there was no dial tone."
++msgstr "I rahu te waea nā te kore oro waea."
++
++#: ../src/jarabe/model/network.py:216
++msgid "Dialing failed because there was no carrier."
++msgstr "I rahu te waea nā te kore kawenga."
++
++#: ../src/jarabe/model/network.py:218
++msgid "Dialing timed out."
++msgstr "I wāhiki te waea."
++
++#: ../src/jarabe/model/network.py:220
++msgid "Dialing failed."
++msgstr "I rahu te waea."
++
++#: ../src/jarabe/model/network.py:222
++msgid "Modem initialization failed."
++msgstr "I rahu te arawhiti pouwhanga."
++
++#: ../src/jarabe/model/network.py:224
++msgid "Failed to select the specified GSM APN"
++msgstr "I rahu te tīpako GSM APN whakapūtā"
+ 
+-#: ../src/jarabe/view/buddymenu.py:61
++#: ../src/jarabe/model/network.py:226
++msgid "Not searching for networks."
++msgstr "Kāore i te rapu whatunga."
++
++#: ../src/jarabe/model/network.py:228
++msgid "Network registration was denied."
++msgstr "I whakakorengia te rēhita whatunga."
++
++#: ../src/jarabe/model/network.py:230
++msgid "Network registration timed out."
++msgstr "I wāhiki te rēhita whatunga."
++
++#: ../src/jarabe/model/network.py:232
++msgid "Failed to register with the requested GSM network."
++msgstr "I rahu te rēhita me te whatunga GSM e hiahiatia ana."
++
++#: ../src/jarabe/model/network.py:234
++msgid "PIN check failed."
++msgstr "I rahu te takinga PIN."
++
++#: ../src/jarabe/model/network.py:236
++msgid "Necessary firmware for the device may be missing."
++msgstr "Kei te ngaro pea te pūmanawa mārō e hiahiatia ana mō te pūrere."
++
++#: ../src/jarabe/model/network.py:238
++msgid "The device was removed."
++msgstr "I tangohia te pūrere."
++
++#: ../src/jarabe/model/network.py:240
++msgid "NetworkManager went to sleep."
++msgstr "I moe te KaiwhakahaereWhatunga."
++
++#: ../src/jarabe/model/network.py:242
++msgid "The device's active connection was removed or disappeared."
++msgstr "I tango, i ngaro rānei te hononga hohe o te pūrere."
++
++#: ../src/jarabe/model/network.py:245
++msgid "A user or client requested the disconnection."
++msgstr "I hiahiatia te hononga e te kaiwhakamahi, kiritaki rānei."
++
++#: ../src/jarabe/model/network.py:247
++msgid "The device's carrier/link changed."
++msgstr "I huri te kawenga/hono o te pūrere."
++
++#: ../src/jarabe/view/buddymenu.py:67
+ msgid "Remove friend"
+-msgstr ""
++msgstr "Tango hoa"
+ 
+-#: ../src/jarabe/view/buddymenu.py:64
++#: ../src/jarabe/view/buddymenu.py:70
+ msgid "Make friend"
+-msgstr ""
++msgstr "Whai hoa"
+ 
+-#: ../src/jarabe/view/buddymenu.py:81
+-msgid "My Settings"
+-msgstr ""
++#: ../src/jarabe/view/buddymenu.py:87
++msgid "Shutdown"
++msgstr "Whakaweto"
++
++#: ../src/jarabe/view/buddymenu.py:95
++msgid "Restart"
++msgstr "Tīmata Anō"
+ 
+-#: ../src/jarabe/view/buddymenu.py:86
++#: ../src/jarabe/view/buddymenu.py:101
+ msgid "Logout"
++msgstr "Takiputa"
++
++#: ../src/jarabe/view/buddymenu.py:106
++msgid "My Settings"
++msgstr "Aku Tautuhinga"
++
++#: ../src/jarabe/view/buddymenu.py:142
++#, python-format
++msgid "Invite to %s"
++msgstr "Pōwhiri ki ngā %s"
++
++#: ../src/jarabe/view/launcher.py:145
++#, python-format
++msgid "<b>%s</b> failed to start."
++msgstr "<b>%s</b> kāore i tīmata."
++
++#: ../src/jarabe/view/palettes.py:48
++msgid "Starting..."
++msgstr "Tīmata Ana..."
++
++#: ../src/jarabe/view/palettes.py:58
++msgid "Activity failed to start"
++msgstr "Kāore te hohe i tīmata"
++
++#. TODO: share-with, keep
++#: ../src/jarabe/view/palettes.py:91
++msgid "View Source"
++msgstr "Tiro Pūtake"
++
++#: ../src/jarabe/view/palettes.py:102
++msgid "Stop"
++msgstr "Tū"
++
++#: ../src/jarabe/view/palettes.py:139
++msgid "Start new"
++msgstr "Tīmata mea hōu"
++
++#: ../src/jarabe/view/palettes.py:180
++msgid "Show contents"
++msgstr "Whakaatu ihirangi"
++
++#: ../src/jarabe/view/palettes.py:229
++msgctxt "Volume"
++msgid "Remove"
++msgstr "Tango"
++
++#: ../src/jarabe/view/viewsource.py:263
++msgid "Instance Source"
++msgstr "Pūtake Tauira"
++
++#: ../src/jarabe/view/viewsource.py:312
++msgid "Source"
++msgstr "Pūtake"
++
++#: ../src/jarabe/view/viewsource.py:374
++msgid "Activity Bundle Source"
++msgstr "Pūtake Pūkai Hohe"
++
++#: ../src/jarabe/view/viewsource.py:393
++msgid "Sugar Toolkit Source"
++msgstr "Pūtake o Sugar Toolkit"
++
++#: ../src/jarabe/view/viewsource.py:400 ../src/jarabe/view/viewsource.py:401
++#, python-format
++#, python-format,
++msgid "View source: %r"
++msgstr "Tiro pūtake: %r"
++
++#: ../src/jarabe/util/emulator.py:40
++msgid "Sugar in a window"
++msgstr "Sugar ki rō matapihi"
++
++#: ../extensions/cpsection/aboutcomputer/model.py:277
++#: ../extensions/cpsection/aboutcomputer/model.py:305
++#: ../extensions/cpsection/aboutcomputer/model.py:310
++msgid "Information not available."
++msgstr "Kāore e wātea ana te mōhiohio."
++
++#: ../extensions/cpsection/aboutcomputer/model.py:284
++msgid "No update yet!"
++msgstr "Kāore anō kia whakahōu!"
++
++#: ../extensions/cpsection/aboutcomputer/view.py:83
++msgid "Lease: "
++msgstr "Rīhi:"
++
++#: ../extensions/cpsection/aboutcomputer/view.py:181
++msgid "Last Updated On:"
++msgstr "I Whakahōutia i:"
++
++#: ../extensions/cpsection/datetime/view.py:249
++msgid "NTP Servers Configuration"
++msgstr "Whirihoranga Tūmau NTP"
++
++#: ../extensions/cpsection/modemconfiguration/view.py:202
++msgid "Country:"
++msgstr "Whenua:"
++
++#: ../extensions/cpsection/modemconfiguration/view.py:220
++msgid "Provider:"
++msgstr "Kaituku:"
++
++#: ../extensions/cpsection/modemconfiguration/view.py:237
++msgid "Plan:"
++msgstr "Whakaritenga:"
++
++#: ../extensions/cpsection/network/view.py:39
++msgid "Please restart your computer for changes to take effect."
++msgstr "Tīmata anō koa i tō rorohiko, kia ū ngā hurihanga."
++
++#: ../extensions/cpsection/network/view.py:637
++msgid ""
++"Discard network history if you have trouble connecting to the network."
++msgstr "Turakina te hītori whatunga ki te raru koe ki te hono ki te whatunga."
++
++#: ../extensions/cpsection/network/view.py:722
++msgid "Hidden Networks"
++msgstr "Ngā Whatunga Huna"
++
++#: ../extensions/cpsection/network/view.py:730
++msgid "Enter the SSIDs of the hidden networks."
++msgstr " Tāurungia ngā SSID o ngā whatunga huna."
++
++#: ../extensions/cpsection/network/view.py:757
++msgid "Advanced Network Settings"
++msgstr "Ngā Tautuhinga Whatunga Ara Atu Anō"
++
++#: ../extensions/cpsection/network/view.py:766
++msgid ""
++"For more specific network settings, use the NetworkManager Connection "
++"Editor."
+ msgstr ""
++"Mō ngā tautuhinga whatunga tūmataiti anō, whakamahia te Etita Hononga "
++"KaiwhakahaereWhatunga."
+ 
+-#: ../src/jarabe/view/buddymenu.py:91
+-msgid "Restart"
++#: ../extensions/cpsection/network/view.py:782
++msgid "Launch"
++msgstr "Whakarewa"
++
++#: ../extensions/cpsection/network/view.py:803
++msgid "Proxy"
++msgstr "Takawaenga"
++
++#: ../extensions/cpsection/network/view.py:813
++msgid "Configure proxies to access the Internet."
++msgstr "Whirihorangia ngā proxie hei whakaahei i te Ipurangi."
++
++#: ../extensions/cpsection/network/view.py:825
++msgid "Configuration URL:"
++msgstr "URL Whirihoranga"
++
++#: ../extensions/cpsection/network/view.py:832
++msgid ""
++"Web Proxy Autodiscovery (WPAD) is used when a Configuration URL is not "
++"provided. This is not recommended for untrusted public networks."
+ msgstr ""
++"Ka whakamahia te KitengaAunoa Takawaenga Tukutuku (Web Proxy Autodiscovery "
++"(WPAD) mēnā kāore i tukuna te URL Whirihoranga. Kāore tēnei i te tūtohua mō "
++"ngā whatunga."
+ 
+-#: ../src/jarabe/view/buddymenu.py:96
+-msgid "Shutdown"
++#: ../extensions/cpsection/network/view.py:843
++msgid "HTTP Proxy:"
++msgstr "Takawanga HTTP:"
++
++#: ../extensions/cpsection/network/view.py:861
++msgid "Use authentication"
++msgstr "Whakamahi Mōtūhēhēnga"
++
++#: ../extensions/cpsection/network/view.py:868
++msgid "HTTPS Proxy:"
++msgstr "Takawaenga HTTPS:"
++
++#: ../extensions/cpsection/network/view.py:876
++msgid "FTP Proxy:"
++msgstr "Takawaenga FTP:"
++
++#: ../extensions/cpsection/network/view.py:884
++msgid "SOCKS Proxy:"
++msgstr "Takawaenga SOCKS:"
++
++#: ../extensions/cpsection/network/view.py:895
++msgid "Method:"
++msgstr "Aratuka:"
++
++#: ../extensions/cpsection/network/view.py:902
++msgid "Ignored Hosts"
++msgstr "Kaihautū Kua Waihō"
++
++#: ../extensions/cpsection/accessibility/__init__.py:24
++msgid "Accessibility"
++msgstr "Āheitanga"
++
++#: ../extensions/cpsection/accessibility/view.py:90
++msgid "Screen"
++msgstr "Mata"
++
++#: ../extensions/cpsection/accessibility/view.py:110
++msgid "Mouse"
++msgstr "Kiore"
++
++#: ../extensions/cpsection/accessibility/view.py:195
++msgid "Mouse Keys"
++msgstr "Ngā Pātuhi Kiore"
++
++#: ../extensions/cpsection/accessibility/view.py:202
++msgid "Move the mouse pointer with keyboard number."
++msgstr "Nekehia te tohu kiore me ngā tau papapātuhi."
++
++#: ../extensions/cpsection/accessibility/view.py:208
++msgid "Sticky Keys"
++msgstr "Pātuhi Piripiri"
++
++#: ../extensions/cpsection/accessibility/view.py:215
++msgid ""
++"Instead of having to press two keys at once (such as CTRL + Q), you can "
++"press one key at a time."
+ msgstr ""
++"Atu i te pāwhiri i ngā pātuhi e rua i te wā kotahi (pērā ki te CTRL + Q), ka "
++"taea te pāwhiri i te pātuhi kotahi, i te wā kotahi."
++
++#: ../extensions/cpsection/accessibility/view.py:222
++msgid "Bounce Keys"
++msgstr "Ngā Pātuhi Peke"
++
++#: ../extensions/cpsection/accessibility/view.py:229
++msgid "Ignore rapid, repeated keypresses of the same key."
++msgstr "Waihō ngā pāwhiritanga pātuhi tere, auau o te pātauhi kotahi."
++
++#: ../extensions/cpsection/accessibility/view.py:235
++msgid "Virtual keyboard"
++msgstr "Papapātuhi mariko"
++
++#: ../extensions/cpsection/accessibility/view.py:247
++msgid "Show virtual keyboard on frame."
++msgstr "Whakaaturia te papapātuhi mariko ki te tapa."
+ 
+-#: ../src/jarabe/view/buddymenu.py:131
++#: ../extensions/cpsection/accessibility/view.py:253
++msgid "Contrast"
++msgstr "Pūrata"
++
++#: ../extensions/cpsection/accessibility/view.py:265
++msgid "Enables the color contrast of the graphic interface."
++msgstr "Ka whakaahei i te pūrata tae o te atanga whakairoiro."
++
++#: ../extensions/cpsection/accessibility/view.py:271
++msgid "Capital letters"
++msgstr "Ngā Pū Matua"
++
++#: ../extensions/cpsection/accessibility/view.py:283
++msgid "Shows capital letters in the user interface."
++msgstr "Ka whakaatu i ngā pūmatua ki te atanga kaiwhakamahi."
++
++#: ../extensions/cpsection/accessibility/view.py:289
++msgid "White Mouse"
++msgstr "Kiore Mā"
++
++#: ../extensions/cpsection/accessibility/view.py:301
++msgid "Show the mouse cursor white."
++msgstr "Whakaatu i te tohu kiore hei mā."
++
++#: ../extensions/cpsection/accessibility/view.py:309
++msgid "Acceleration: "
++msgstr "Whakaterenga:"
++
++#: ../extensions/cpsection/accessibility/view.py:325
++msgid "Controller acceleration mouse."
++msgstr "Kiore whakaterenga pūwhakahaere."
++
++#: ../extensions/deviceicon/network.py:400
++msgid "Private (Click to share)"
++msgstr "Tūmataiti (Pāwhiri kia tiri)"
++
++#: ../extensions/deviceicon/network.py:408
++msgid "Neighborhood (Click to unshare)"
++msgstr "Takiwā (Pāwhiri kia tiri kore)"
++
++#: ../extensions/deviceicon/network.py:841
++msgid "Create a connection in My Settings."
++msgstr "Waihanga i tētahi hononga ki Aku Tautuhinga."
++
++#: ../extensions/deviceicon/resources.py:48
++msgid "System resources"
++msgstr "Rauemi Pūnaha"
++
++#: ../extensions/deviceicon/resources.py:170
+ #, python-format
+-msgid "Invite to %s"
+-msgstr ""
++msgid "CPU in use: %d%%"
++msgstr "Kei te whakamahi i te CPU: %d%%"
+ 
+-#: ../src/jarabe/view/palettes.py:43
+-msgid "Starting..."
++#: ../extensions/deviceicon/resources.py:172
++#, python-format
++msgid "Memory in use: %d%%"
++msgstr "Pūmahara e whakamahi ana: %d%%"
++
++#: ../extensions/deviceicon/resources.py:202
++msgid "Cannot compute CPU and memory usage statistics!"
++msgstr "Kāore e taea te tatau CPU me ngā tatauranga whakamahi pūmahara!"
++
++#: ../data/sugar.schemas.in.h:1
++msgid "Enable personalized submit"
++msgstr "Whakahohe tuku whaiaro"
++
++#: ../data/sugar.schemas.in.h:2
++msgid ""
++"Show device icon to let people submit text messages with all collected "
++"data including detailed information about submitter."
+ msgstr ""
++"Whakaatu i te ata pūrere kia taea e ngā tāngata te tuku karere kupu me ngā "
++"raraunga kua kohia, ngā taipitipiti mōhiohio mō te kaituku hoki."
+ 
+-#: ../src/jarabe/view/palettes.py:73
+-msgid "Stop"
++#: ../data/sugar.schemas.in.h:3
++msgid "Delay in seconds to send anonymous reports automatically"
++msgstr "Takaware ā hēkona kia tuku aunoa i ngā pūrongo ingoamuna"
++
++#: ../data/sugar.schemas.in.h:4
++msgid ""
++"Submit will not contain any information about submitter, only anonymous "
++"data (but see anonymous_with_sn). Setting value to 0 will disable automatic "
++"submitting."
+ msgstr ""
++"Ka kore te Tuku e whai mōhiohio mō te kaituku, ka whai raraunga ingoamuna "
++"noa iho (heoi tirohia te anonymous_with_sn). Tautuhia te uara ki te 0 kia "
++"mono i te tukunga aunoa."
+ 
+-#: ../src/jarabe/view/palettes.py:145
+-msgid "Remove favorite"
++#: ../data/sugar.schemas.in.h:5
++msgid "Add XO serial numbers to anonymous submits"
++msgstr "Tāpiri tau rangatū ki ngā tukunga aunoa"
++
++#: ../data/sugar.schemas.in.h:6
++msgid ""
++"Actually, setting this value to true will make anonymous submits not "
++"anonymous for XO laptops. Might be useful for Sugar deployments"
+ msgstr ""
++"Taihoa, ki te tautuhi i tēnei uara ki te tika, ka kore ngā ngā tukunga aunoa "
++"e noho ingoamuna mō ngā rorohiko pona XO.Ka whai uara pea mō ngā horanga "
++"Sugar"
+ 
+-#: ../src/jarabe/view/palettes.py:149
+-msgid "Make favorite"
++#: ../data/sugar.schemas.in.h:7
++msgid "Server host to send reports to"
++msgstr "Kaihautū tūmau hei tuku pūrongo ki"
++
++#: ../data/sugar.schemas.in.h:8
++msgid "Server that will handle reports sent via HTTPS POST requests."
++msgstr "Tūmau ka whakahaere pūrongo kua tukua mā ngā tono HTTPS POST."
++
++#: ../data/sugar.schemas.in.h:9
++msgid "Server port to send reports to"
++msgstr "Tauranga tūmau kia tuku pūrongo"
++
++#: ../data/sugar.schemas.in.h:10
++msgid "TCP port that will used to send HTTPS POST requests."
++msgstr "Tauranga TCP ka whakamahia hei tuku tono HTTPS POST."
++
++#: ../data/sugar.schemas.in.h:21
++msgid "Activity updater URL."
++msgstr "URL Whakahōu Hohenga."
++
++#: ../data/sugar.schemas.in.h:22
++msgid ""
++"This key contains the URL which the microformat compatible activity "
++"updater will search for activity updates."
+ msgstr ""
++"Kei tēnei pātuhi te URL, ka rapuhia e te hohenga hototahi whakahōputuiti mō "
++"ngā whakahōunga hohe."
+ 
+-#: ../src/jarabe/view/palettes.py:201
+-msgid "Show contents"
++#: ../data/sugar.schemas.in.h:47
++msgid "Show Register"
++msgstr "Whakaatu Rēhita"
++
++#: ../data/sugar.schemas.in.h:48
++msgid "If TRUE, Sugar will show a \"Register\" option."
++msgstr "Mēnā he TIKA, ka whakaatu a Sugar i tētahi kōwhiringa \"Rēhita\"."
++
++#: ../data/sugar.schemas.in.h:59
++msgid "Default font dpi"
++msgstr "dpi momotuhi taunoa"
++
++#: ../data/sugar.schemas.in.h:60
++msgid "Font dpi that is used throughout the desktop."
++msgstr "Te momotuhi dpi ka whakamahia puta noa i te papamahi."
++
++#: ../data/sugar.schemas.in.h:79
++msgid "Show NamingAlert"
++msgstr "Whakaatu MatohiWhaiIngoa"
++
++#: ../data/sugar.schemas.in.h:80
++msgid "If TRUE, NamingAlert will popup when the activity closes."
++msgstr "Ki te TIKA, ka pahū ake te MatohiWhaiIngoa kia kati te hohe."
++
++#: ../src/jarabe/desktop/favoritesview.py:346
++msgid "No School Server found on the network"
++msgstr "Kāore i kitea he Tūmau Kura ki te whatunga"
++
++#: ../src/jarabe/desktop/keydialog.py:165
++msgid "Choose.."
++msgstr "Kōwhiri.."
++
++#: ../src/jarabe/desktop/keydialog.py:254
++msgid "Wireless Parameters required"
++msgstr "E hiahiatia ana ngā Tawhā Ahokore"
++
++#: ../src/jarabe/desktop/keydialog.py:262
++msgid ""
++"Please enter parameters\n"
++""
++msgstr "Tāuru koe i ngā tawhā\n"
++
++#: ../src/jarabe/desktop/keydialog.py:279
++msgid "Authentication"
++msgstr "Whakamōtūhēhēnga"
++
++#: ../src/jarabe/desktop/schoolserver.py:143
++msgid ""
++"Please ensure that you are connected to the correct network and that the "
++"server is available."
+ msgstr ""
++"Ka tika, takina mēnā kei te hono koe ki te whatunga tika, ā, kei te wātea te "
++"tūmau."
++
++#: ../src/jarabe/journal/journaltoolbox.py:542
++#: ../src/jarabe/journal/journaltoolbox.py:548
++msgid "Select none"
++msgstr "Kōwhiri kore"
+ 
+-#: ../src/jarabe/view/palettes.py:223 ../src/jarabe/view/palettes.py:272
++#: ../src/jarabe/journal/journaltoolbox.py:551
++msgid "Deselecting"
++msgstr "Whakawātea ana"
++
++#: ../src/jarabe/journal/journaltoolbox.py:557
+ #, python-format
+-msgid "%(free_space)d MB Free"
+-msgstr ""
++msgid "You have deselected %d entry."
++msgid_plural "You have deselected %d entries."
++msgstr[0] "Kua whakawātea koe i te tāurunga %d"
++msgstr[1] "Kua whakawātea koe i ngā tāurunga %d"
++
++#: ../src/jarabe/journal/journaltoolbox.py:582
++#: ../src/jarabe/journal/journaltoolbox.py:588
++msgid "Select all"
++msgstr "Tīpako katoa"
++
++#: ../src/jarabe/journal/journaltoolbox.py:591
++msgid "Selecting"
++msgstr "Tīpako ana"
++
++#: ../src/jarabe/journal/journaltoolbox.py:600
++#, python-format
++msgid "You have selected %d entry."
++msgid_plural "You have selected %d entries."
++msgstr[0] "Kua tīpakohia e koe te tāurunga %d."
++msgstr[1] "Kua tīpakohia e koe ngā tāurunga %d."
++
++#: ../src/jarabe/journal/journaltoolbox.py:641
++#, python-format
++msgid "Do you want to erase %d entry?"
++msgid_plural "Do you want to erase %d entries?"
++msgstr[0] "E hiahia ana koe ki te muku i te tāurunga %d?"
++msgstr[1] "E hiahia ana koe ki te muku i ngā tāurunga %d"
++
++#: ../src/jarabe/journal/journaltoolbox.py:649
++msgid "Erasing"
++msgstr "Muku ana"
+ 
+-#: ../src/jarabe/view/palettes.py:248
++#: ../src/jarabe/journal/journaltoolbox.py:671
++#: ../src/jarabe/journal/palettes.py:674 ../src/jarabe/journal/palettes.py:682
++msgid "Copy"
++msgstr "Tārua"
++
++#. TRANS: Do not translate the two %d, and the %s.
++#: ../src/jarabe/journal/palettes.py:429
++#, python-format
++msgid "( %d / %d ) %s"
++msgstr "( %d / %d ) %s"
++
++#. TRANS: Do not translate the two %d, and the three %s.
++#: ../src/jarabe/journal/palettes.py:545
++#, python-format
++msgid "( %d / %d ) Error while %s %s : %s"
++msgstr "( %d / %d ) Hapa i te wā %s %s: %s"
++
++#: ../src/jarabe/journal/palettes.py:631
++#, python-format
++msgid "Error occurred while %s : %s."
++msgstr "I puta he hapa i te wā %s: %s"
++
++#: ../src/jarabe/journal/palettes.py:677
++#, python-format
++msgid "Do you want to copy %d entry to %s?"
++msgid_plural "Do you want to copy %d entries to %s?"
++msgstr[0] "E hiahia ana koe ki te tārua i te tāurunga %d ki %s?"
++msgstr[1] "E hiahia ana koe ki te tārua i ngā tāurunga %d ki %s?"
++
++#: ../src/jarabe/journal/palettes.py:685
++msgid "Copying"
++msgstr "Tārua ana"
++
++#: ../src/jarabe/journal/palettes.py:763
++#: ../src/jarabe/journal/volumestoolbar.py:249
++msgid "Shares"
++msgstr "Ka Tiri"
++
++#: ../src/jarabe/journal/volumestoolbar.py:254
++#, python-format
++msgid "%s's share"
++msgstr "Tiri %s's"
++
++# Context? The above is appropriate if it's the running of a programme
++#: ../src/jarabe/journal/processdialog.py:48
++msgid "Running"
++msgstr "Whakahaere ana"
++
++#: ../src/jarabe/journal/processdialog.py:49
++msgid "Failed"
++msgstr "I Rahua"
++
++#: ../src/jarabe/journal/processdialog.py:50
++msgid "Finished"
++msgstr "Kua Oti"
++
++#: ../src/jarabe/journal/processdialog.py:229
++#: ../src/jarabe/journal/processdialog.py:269
++msgid "Please wait, saving Journal content to"
++msgstr "Taihoa koa, e tiaki ana i ngā ihirangi Tuhitaka ki"
++
++#: ../src/jarabe/journal/processdialog.py:230
++#: ../src/jarabe/journal/processdialog.py:248
++msgid "Do not remove the storage device!"
++msgstr "Kaua e tango i te pūrere rokiroki!"
++
++#: ../src/jarabe/journal/processdialog.py:232
++msgid "The Journal content has been saved."
++msgstr "Kua tiakina ngā ihirangi Tuhitaka."
++
++#: ../src/jarabe/journal/processdialog.py:234
++#: ../src/jarabe/journal/processdialog.py:273
++msgid "Backup"
++msgstr "Tārua"
++
++#: ../src/jarabe/journal/processdialog.py:236
++#: ../src/jarabe/journal/processdialog.py:275
++msgid "Journal content will be saved to"
++msgstr "Ka tiakina ngā ihirangi Tuhitaka ki"
++
++#: ../src/jarabe/journal/processdialog.py:247
++msgid "Please wait, restoring Journal content from"
++msgstr "Taihoa koa. e whakaora ana i ngā ihirangi Tuhitaka mai i"
++
++#: ../src/jarabe/journal/processdialog.py:250
++msgid "The Journal content has been restored."
++msgstr "Kua whakaorangi ngā ihirangi Tuhitaka."
++
++#: ../src/jarabe/journal/processdialog.py:252
++#: ../src/jarabe/journal/processdialog.py:288
++msgid "Restore"
++msgstr "Whakaora"
++
++#: ../src/jarabe/journal/processdialog.py:254
++#: ../src/jarabe/journal/processdialog.py:290
++msgid "Journal content will be restored from"
++msgstr "Ka whakaorangia ngā ihirangi Tuhitaka mai i"
++
++#: ../src/jarabe/journal/processdialog.py:255
++msgid "Warning:"
++msgstr "Whakatūpato:"
++
++#: ../src/jarabe/journal/processdialog.py:255
++msgid "Current Journal content will be deleted!"
++msgstr "Ka mukua ngā ihirangi Tuhitaka ō nāianei!"
++
++#: ../src/jarabe/journal/processdialog.py:257
++#: ../src/jarabe/journal/processdialog.py:292
++msgid ", please close all the running activities."
++msgstr ", katia koa ngā hohe katoa e whakahaere ana."
++
++#: ../src/jarabe/journal/processdialog.py:271
++msgid "The journal content has been saved."
++msgstr "Kua tiakina ngā ihirangi tuhitaka."
++
++#: ../src/jarabe/journal/processdialog.py:284
++msgid "Please wait, restoring journal content from"
++msgstr "Taihoa koa, e whakaora ana i ngā ihirangi tuhitaka mai i"
++
++#: ../src/jarabe/journal/processdialog.py:286
++msgid "The journal content has been restored."
++msgstr "Kua whakaorangia ngā ihirangi tuhitaka."
++
++#: ../src/jarabe/view/buddymenu.py:76
++msgid "Access Share"
++msgstr "Tiri Āheitanga"
++
++#: ../src/jarabe/view/palettes.py:276 ../src/jarabe/view/palettes.py:325
++msgid "Restore Journal"
++msgstr "Whakaora Tuhitaka"
++
++#: ../src/jarabe/view/palettes.py:286 ../src/jarabe/view/palettes.py:315
++msgid "Backup Journal"
++msgstr "Tārua Tuhitaka"
++
++#: ../src/jarabe/view/palettes.py:304
++msgid "School Server"
++msgstr "Tūmau Kura"
++
++#: ../src/jarabe/view/palettes.py:355
++msgctxt "Share"
+ msgid "Unmount"
+-msgstr ""
++msgstr "Heke"
diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec
index 1c8a8b0..77b9b37 100644
--- a/rpms/sugar/sugar.spec
+++ b/rpms/sugar/sugar.spec
@@ -2,9 +2,9 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Epoch: 20120927
+Epoch: 20121006
 Version: 0.94.1
-Release: 34.dx3
+Release: 36.dx3
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 License: GPLv2+
@@ -193,6 +193,12 @@ rm -rf %{buildroot}
 %{_datadir}/sugar/extensions/cpsection/keyboard/*
 
 %changelog
+* Sat Oct 6 2012 Ruben Rodriguez <ruben@activitycentral.com> - 20121006:0.94.1-36.dx3
+- Added Maori translation sdxo#2406
+
+* Thu Oct 2 2012 Ruben Rodriguez <ruben@activitycentral.com> - 20121002:0.94.1-35.dx3
+- Merged patches 0130 to 0155, fixes multiselect issues, further disables 1-to-N
+
 * Thu Sep 27 2012 Ruben Rodriguez <ruben@activitycentral.com> - 20120927:0.94.1-34.dx3
 - Minor String change in "Age"-Page-at-boot-up
 - sdxo#1592: Incorporating "Age"-Page-at-boot-up.