John C Barstow <jbowtie@amathaine.com> * mi.po: Updated Maori translation

2 files changed, 467 insertions, 565 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 9835de964..0191303ad 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-11  John C Barstow  <jbowtie@amathaine.com>
+
+	* mi.po: Updated Māori translation.
+
 2004-04-09  Adam Weinberger  <adamw@gnome.org>
 
 	* en_CA.po: Updated Canadian English translation.
diff --git a/po/mi.po b/po/mi.po
index 58014ec10..bbe489bb8 100644
--- a/po/mi.po
+++ b/po/mi.po
@@ -7,13 +7,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-15 15:19+0100\n"
-"PO-Revision-Date: 2004-02-06 22:30+0000\n"
+"POT-Creation-Date: 2004-04-10 00:02+1200\n"
+"PO-Revision-Date: 2004-04-11 14:33+1200\n"
 "Last-Translator: John C Barstow <jbowtie@amathaine.com>\n"
 "Language-Team: GNOME Māori Team <maori@nzlinux.org.nz>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bit"
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:1
 msgid "Factory for Nautilus component adapter factories"
@@ -38,7 +38,7 @@ msgid "bonobo_ui_init() failed."
 msgstr ""
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2400
+#: src/file-manager/fm-properties-window.c:2451
 msgid "Emblems"
 msgstr ""
 
@@ -89,9 +89,8 @@ msgid "Enter a new name for the displayed emblem:"
 msgstr ""
 
 #: components/emblem/nautilus-emblem-view.c:333
-#, fuzzy
 msgid "Rename"
-msgstr "Whakakapia"
+msgstr "Whakaingoa hou"
 
 #: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
@@ -155,9 +154,8 @@ msgstr ""
 
 #: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
 #: src/nautilus-property-browser.c:1741
-#, fuzzy
 msgid "Erase"
-msgstr "Whakapiri"
+msgstr "Muku"
 
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
@@ -173,7 +171,7 @@ msgstr ""
 
 #: components/image_properties/Nautilus_View_image_properties.server.in.in.h:1
 msgid "Image"
-msgstr ""
+msgstr "Whakaahua"
 
 #: components/image_properties/Nautilus_View_image_properties.server.in.in.h:2
 msgid "Image Properties content view component"
@@ -230,18 +228,16 @@ msgstr ""
 #: components/image_properties/nautilus-image-properties-view.c:203
 #: data/static_bookmarks.xml.h:36
 msgid "Software"
-msgstr ""
+msgstr "Pūmanawa"
 
 #: components/image_properties/nautilus-image-properties-view.c:222
 #, c-format
 msgid ""
 "<b>Image Type:</b> %s (%s)\n"
 "<b>Resolution:</b> %dx%d pixels\n"
-msgid_plural ""
 "<b>Image Type:</b> %s (%s)\n"
 "<b>Resolution:</b> %dx%d pixels\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: components/image_properties/nautilus-image-properties-view.c:237
 msgid "Failed to load image information"
@@ -298,9 +294,8 @@ msgstr ""
 
 #: components/text/nautilus-text-view-ui.xml.h:2
 #: libnautilus/nautilus-clipboard-ui.xml.h:10 src/nautilus-shell-ui.xml.h:35
-#, fuzzy
 msgid "_Copy Text"
-msgstr "_Tārua"
+msgstr "_Tārua ngā Kupu"
 
 #: components/throbber/Nautilus_Control_throbber.server.in.in.h:1
 msgid "animation to indicate on-going activity"
@@ -325,7 +320,7 @@ msgstr ""
 
 #: data/applications.desktop.in.h:1
 msgid "Applications"
-msgstr ""
+msgstr "Ngā pūmanawa tautono"
 
 #: data/applications.desktop.in.h:2
 msgid "Browse available software"
@@ -344,9 +339,8 @@ msgid "Azul"
 msgstr ""
 
 #: data/browser.xml.h:4
-#, fuzzy
 msgid "Black"
-msgstr "Whakamuri"
+msgstr "Pango"
 
 #: data/browser.xml.h:5
 msgid "Blue Ridge"
@@ -373,9 +367,8 @@ msgid "Burlap"
 msgstr ""
 
 #: data/browser.xml.h:11
-#, fuzzy
 msgid "C_olors"
-msgstr "_Kano"
+msgstr "Ngā _Kano"
 
 #: data/browser.xml.h:12
 msgid "Camera"
@@ -442,9 +435,8 @@ msgid "Distinguished"
 msgstr ""
 
 #: data/browser.xml.h:27
-#, fuzzy
 msgid "Documents"
-msgstr "_Tuhinga"
+msgstr "Ngā Tuhinga"
 
 #: data/browser.xml.h:28
 msgid "Dots"
@@ -521,7 +513,7 @@ msgstr ""
 
 #: data/browser.xml.h:47
 msgid "Important"
-msgstr ""
+msgstr "Whakahirahira"
 
 #: data/browser.xml.h:48
 #, fuzzy
@@ -529,9 +521,8 @@ msgid "Indigo"
 msgstr "Whakakore"
 
 #: data/browser.xml.h:49
-#, fuzzy
 msgid "Leaf"
-msgstr "_Mauī"
+msgstr "Rau"
 
 #: data/browser.xml.h:50
 msgid "Lemon"
@@ -539,7 +530,7 @@ msgstr ""
 
 #: data/browser.xml.h:51
 msgid "Mail"
-msgstr ""
+msgstr "Mēra-hiko"
 
 #: data/browser.xml.h:52
 msgid "Mango"
@@ -559,7 +550,7 @@ msgstr ""
 
 #: data/browser.xml.h:56
 msgid "Multimedia"
-msgstr ""
+msgstr "Rongorau"
 
 #: data/browser.xml.h:57
 msgid "New"
@@ -567,12 +558,11 @@ msgstr "Hou"
 
 #: data/browser.xml.h:58
 msgid "Numbers"
-msgstr ""
+msgstr "Ngā Tokomaha"
 
 #: data/browser.xml.h:59
-#, fuzzy
 msgid "OK"
-msgstr "_Kapai"
+msgstr "Ka pai"
 
 #: data/browser.xml.h:60
 msgid "Ocean Strips"
@@ -633,9 +623,8 @@ msgid "Shale"
 msgstr "Pupuri"
 
 #: data/browser.xml.h:74
-#, fuzzy
 msgid "Silver"
-msgstr "Pupuri"
+msgstr "Hiriwa"
 
 #: data/browser.xml.h:75
 msgid "Sky"
@@ -651,7 +640,7 @@ msgstr ""
 
 #: data/browser.xml.h:78
 msgid "Sound"
-msgstr ""
+msgstr "Oro"
 
 #: data/browser.xml.h:79
 msgid "Special"
@@ -662,9 +651,8 @@ msgid "Stucco"
 msgstr ""
 
 #: data/browser.xml.h:81
-#, fuzzy
 msgid "Tangerine"
-msgstr "Rūritia"
+msgstr ""
 
 #: data/browser.xml.h:82
 msgid "Terracotta"
@@ -672,7 +660,7 @@ msgstr ""
 
 #: data/browser.xml.h:83
 msgid "Urgent"
-msgstr ""
+msgstr "Whāwhai"
 
 #: data/browser.xml.h:84
 #, fuzzy
@@ -685,12 +673,11 @@ msgstr ""
 
 #: data/browser.xml.h:86
 msgid "Web"
-msgstr ""
+msgstr "Tukutuku-ao-whānui"
 
 #: data/browser.xml.h:87
-#, fuzzy
 msgid "White"
-msgstr "Porohita"
+msgstr "Mā"
 
 #: data/browser.xml.h:88
 msgid "White Ribs"
@@ -718,9 +705,8 @@ msgid "Adjust your user environment"
 msgstr ""
 
 #: data/preferences.desktop.in.h:2
-#, fuzzy
 msgid "Desktop Preferences"
-msgstr "Ngā tina hiahia"
+msgstr "Ngā tina hiahia a te Papa Mahi"
 
 #: data/serverconfig.desktop.in.h:1
 msgid "Configure network services (web server, DNS server, etc.)"
@@ -741,16 +727,15 @@ msgstr ""
 
 #: data/static_bookmarks.xml.h:1
 msgid "Allaire"
-msgstr ""
+msgstr "Allaire"
 
 #: data/static_bookmarks.xml.h:2
 msgid "Binary Freedom"
 msgstr ""
 
 #: data/static_bookmarks.xml.h:3
-#, fuzzy
 msgid "Borland"
-msgstr "_Miramira"
+msgstr "Borland"
 
 #: data/static_bookmarks.xml.h:4
 msgid "CNET Computers.com"
@@ -765,27 +750,24 @@ msgid "CollabNet"
 msgstr ""
 
 #: data/static_bookmarks.xml.h:7
-#, fuzzy
 msgid "Compaq"
-msgstr "Tārua"
+msgstr "Compaq"
 
 #: data/static_bookmarks.xml.h:8
 msgid "Conectiva"
 msgstr ""
 
 #: data/static_bookmarks.xml.h:9
-#, fuzzy
 msgid "Covalent"
-msgstr "_Huri"
+msgstr "Covalent"
 
 #: data/static_bookmarks.xml.h:10
 msgid "Debian.org"
 msgstr ""
 
 #: data/static_bookmarks.xml.h:11
-#, fuzzy
 msgid "Dell"
-msgstr "Porowhiu"
+msgstr "Dell"
 
 #: data/static_bookmarks.xml.h:12
 msgid "Freshmeat.net"
@@ -804,9 +786,8 @@ msgid "Hardware"
 msgstr ""
 
 #: data/static_bookmarks.xml.h:16
-#, fuzzy
 msgid "International"
-msgstr "Rongo"
+msgstr "Ā taiao"
 
 #: data/static_bookmarks.xml.h:17
 msgid "Linux Documentation Project"
@@ -850,20 +831,19 @@ msgstr ""
 
 #: data/static_bookmarks.xml.h:27
 msgid "O'Reilly"
-msgstr ""
+msgstr "O'Reilly"
 
 #: data/static_bookmarks.xml.h:28
 msgid "OSDN"
-msgstr ""
+msgstr "OSDN"
 
 #: data/static_bookmarks.xml.h:29
 msgid "Open Source Asia"
 msgstr ""
 
 #: data/static_bookmarks.xml.h:30
-#, fuzzy
 msgid "OpenOffice"
-msgstr "Huaki he kōnae"
+msgstr "OpenOffice"
 
 #: data/static_bookmarks.xml.h:31
 msgid "Penguin Computing"
@@ -876,28 +856,27 @@ msgstr "Whakakapia"
 
 #: data/static_bookmarks.xml.h:33
 msgid "Red Hat"
-msgstr ""
+msgstr "Red·Hat"
 
 #: data/static_bookmarks.xml.h:34
-#, fuzzy
 msgid "Red Hat Network"
-msgstr "_Kōtuitui"
+msgstr "Kōtuitui Red Hat"
 
 #: data/static_bookmarks.xml.h:35
 msgid "RedFlag Linux"
-msgstr ""
+msgstr "RedFlag·Linux"
 
 #: data/static_bookmarks.xml.h:37
 msgid "SourceForge"
-msgstr ""
+msgstr "SourceForge"
 
 #: data/static_bookmarks.xml.h:38
 msgid "SuSE"
-msgstr ""
+msgstr "SuSE"
 
 #: data/static_bookmarks.xml.h:39
 msgid "Sun StarOffice"
-msgstr ""
+msgstr "Sun·StarOffice"
 
 #: data/static_bookmarks.xml.h:40
 msgid "Sun Wah Linux"
@@ -909,7 +888,7 @@ msgstr ""
 
 #: data/static_bookmarks.xml.h:42
 msgid "Ximian"
-msgstr ""
+msgstr "Ximian"
 
 #: data/static_bookmarks.xml.h:43
 msgid "ZDNet Linux Hardware Database"
@@ -980,9 +959,9 @@ msgstr ""
 #: libnautilus-extension/nautilus-property-page.c:176
 #: libnautilus-private/nautilus-column-utilities.c:43
 #: libnautilus-private/nautilus-program-chooser.c:1241
-#: src/file-manager/fm-list-view.c:1054
+#: src/file-manager/fm-list-view.c:1059
 msgid "Name"
-msgstr ""
+msgstr "Ingoa"
 
 #: libnautilus-extension/nautilus-column.c:176
 msgid "Name of the column"
@@ -1007,9 +986,8 @@ msgid "Label to display in the column"
 msgstr ""
 
 #: libnautilus-extension/nautilus-column.c:196
-#, fuzzy
 msgid "Description"
-msgstr "Pātai"
+msgstr "Whakaaturanga"
 
 #: libnautilus-extension/nautilus-column.c:197
 msgid "A user-visible description of the column"
@@ -1041,7 +1019,7 @@ msgstr ""
 
 #: libnautilus-extension/nautilus-menu-item.c:227
 msgid "Icon"
-msgstr ""
+msgstr "Whakaahua iti"
 
 #: libnautilus-extension/nautilus-menu-item.c:228
 msgid "Name of the icon to display in the menu item"
@@ -1056,9 +1034,8 @@ msgid "Whether the menu item is sensitive"
 msgstr ""
 
 #: libnautilus-extension/nautilus-menu-item.c:242
-#, fuzzy
 msgid "Priority"
-msgstr "Tā"
+msgstr "Mea tuatahi"
 
 #: libnautilus-extension/nautilus-menu-item.c:243
 msgid "Show priority text in toolbars"
@@ -1073,9 +1050,8 @@ msgid "Label widget to display in the notebook tab"
 msgstr ""
 
 #: libnautilus-extension/nautilus-property-page.c:190
-#, fuzzy
 msgid "Page"
-msgstr "Whārangi %u"
+msgstr "Whārangi"
 
 #: libnautilus-extension/nautilus-property-page.c:191
 msgid "Widget for the property page"
@@ -1184,7 +1160,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Desktop font"
-msgstr ""
+msgstr "To momotuhi o te papa mahi"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid "Desktop home icon name"
@@ -1605,14 +1581,12 @@ msgid "Move _Down"
 msgstr ""
 
 #: libnautilus-private/nautilus-column-chooser.c:383
-#, fuzzy
 msgid "_Show"
-msgstr "Whaka_mutua"
+msgstr "_Whāki"
 
 #: libnautilus-private/nautilus-column-chooser.c:393
-#, fuzzy
 msgid "_Hide"
-msgstr "_Āwhina"
+msgstr "Whaka_peke"
 
 #: libnautilus-private/nautilus-column-chooser.c:406
 msgid "_Use Default"
@@ -1656,7 +1630,7 @@ msgstr ""
 
 #: libnautilus-private/nautilus-column-utilities.c:81
 msgid "Owner"
-msgstr ""
+msgstr "Rangatira"
 
 #: libnautilus-private/nautilus-column-utilities.c:82
 msgid "The owner of the file."
@@ -1671,7 +1645,7 @@ msgid "The group of the file."
 msgstr ""
 
 #: libnautilus-private/nautilus-column-utilities.c:97
-#: src/file-manager/fm-properties-window.c:2865
+#: src/file-manager/fm-properties-window.c:2922
 msgid "Permissions"
 msgstr ""
 
@@ -1689,7 +1663,7 @@ msgstr ""
 
 #: libnautilus-private/nautilus-column-utilities.c:113
 msgid "MIME Type"
-msgstr ""
+msgstr "Kawa Mēra Maha"
 
 #: libnautilus-private/nautilus-column-utilities.c:114
 msgid "The mime type of the file."
@@ -1724,9 +1698,8 @@ msgid "_Move here"
 msgstr ""
 
 #: libnautilus-private/nautilus-dnd.c:620
-#, fuzzy
 msgid "_Copy here"
-msgstr "_Tārua"
+msgstr "_Tārua ki konei"
 
 #: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
@@ -1738,9 +1711,8 @@ msgstr ""
 
 #: libnautilus-private/nautilus-dnd.c:639
 #: libnautilus-private/nautilus-dnd.c:694
-#, fuzzy
 msgid "Cancel"
-msgstr "_Whakakore"
+msgstr "Whakakore"
 
 #: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
@@ -1993,9 +1965,8 @@ msgstr ""
 #: libnautilus-private/nautilus-file-operations.c:961
 #: libnautilus-private/nautilus-file-operations.c:1071
 #: libnautilus-private/nautilus-file-operations.c:1090
-#, fuzzy
 msgid "_Skip"
-msgstr "Whaka_mutua"
+msgstr "_Tīpokatia"
 
 #: libnautilus-private/nautilus-file-operations.c:961
 #, fuzzy
@@ -2054,11 +2025,15 @@ msgid "Replace _All"
 msgstr "Whakakapia"
 
 #. appended to new link file
+#. Note to localizers: convert file type string for file
+#. * (e.g. "folder", "plain text") to file type for symbolic link
+#. * to that kind of file (e.g. "link to folder").
+#.
 #: libnautilus-private/nautilus-file-operations.c:1148
-#: libnautilus-private/nautilus-file.c:4724
+#: libnautilus-private/nautilus-file.c:4735
 #, c-format
 msgid "link to %s"
-msgstr ""
+msgstr "honoga a %s"
 
 #. appended to new link file
 #: libnautilus-private/nautilus-file-operations.c:1152
@@ -2108,6 +2083,9 @@ msgid " (another copy)"
 msgstr ""
 
 #. localizers: tag used to detect the x11th copy of a file
+#. localizers: tag used to detect the x12th copy of a file
+#. localizers: tag used to detect the x13th copy of a file
+#. localizers: tag used to detect the xxth copy of a file
 #: libnautilus-private/nautilus-file-operations.c:1206
 #: libnautilus-private/nautilus-file-operations.c:1208
 #: libnautilus-private/nautilus-file-operations.c:1210
@@ -2143,6 +2121,9 @@ msgid "%s (another copy)%s"
 msgstr ""
 
 #. localizers: appended to x11th file copy
+#. localizers: appended to x12th file copy
+#. localizers: appended to x13th file copy
+#. localizers: appended to xxth file copy
 #: libnautilus-private/nautilus-file-operations.c:1239
 #: libnautilus-private/nautilus-file-operations.c:1241
 #: libnautilus-private/nautilus-file-operations.c:1243
@@ -2172,7 +2153,7 @@ msgstr ""
 #. localizers: opening parentheses to match the "th copy)" string
 #: libnautilus-private/nautilus-file-operations.c:1350
 msgid " ("
-msgstr ""
+msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
 #: libnautilus-private/nautilus-file-operations.c:1358
@@ -2260,7 +2241,6 @@ msgstr ""
 
 #. localizers: label prepended to the name of the current file copied
 #: libnautilus-private/nautilus-file-operations.c:1911
-#, fuzzy
 msgid "Copying"
 msgstr "Tārua"
 
@@ -2374,15 +2354,13 @@ msgid "Error Creating New Document"
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:2353
-#, fuzzy
 msgid "new file"
-msgstr "Huaki he kōnae"
+msgstr "he kōnae hou"
 
 #. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2425
-#, fuzzy
 msgid "Deleting files"
-msgstr "Porowhiu"
+msgstr "Porowhiu ngā Kōnae"
 
 #. localizers: label prepended to the progress count
 #: libnautilus-private/nautilus-file-operations.c:2427
@@ -2393,7 +2371,6 @@ msgstr ""
 #. localizers: label prepended to the name of the current file deleted
 #: libnautilus-private/nautilus-file-operations.c:2429
 #: libnautilus-private/nautilus-file-operations.c:2464
-#, fuzzy
 msgid "Deleting"
 msgstr "Porowhiu"
 
@@ -2419,25 +2396,22 @@ msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:2560
-#, fuzzy
 msgid "_Empty"
-msgstr "Tuhera kau"
+msgstr "_Tuhera kau"
 
 #: libnautilus-private/nautilus-file-utilities.c:369
 #: libnautilus-private/nautilus-global-preferences.c:527
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:10
 msgid "Computer"
-msgstr ""
+msgstr "Te Rorohiko"
 
 #: libnautilus-private/nautilus-file-utilities.c:371
-#, fuzzy
 msgid "Network"
-msgstr "_Kōtuitui"
+msgstr "Kōtuitui"
 
 #: libnautilus-private/nautilus-file-utilities.c:373
-#, fuzzy
 msgid "Fonts"
-msgstr "Momotuhi"
+msgstr "Ngā Momotuhi"
 
 #: libnautilus-private/nautilus-file-utilities.c:375
 msgid "Themes"
@@ -2448,9 +2422,8 @@ msgid "CD Creator"
 msgstr ""
 
 #: libnautilus-private/nautilus-file-utilities.c:379
-#, fuzzy
 msgid "Windows Network"
-msgstr "_Kōtuitui"
+msgstr "Kōtuitui Microsoft"
 
 #. Today, use special word.
 #. * strftime patterns preceeded with the widest
@@ -2469,40 +2442,39 @@ msgstr "_Kōtuitui"
 #.
 #: libnautilus-private/nautilus-file.c:2932
 msgid "today at 00:00:00 PM"
-msgstr ""
+msgstr "ākuni hai 00:00:00 PM"
 
 #: libnautilus-private/nautilus-file.c:2933
 msgid "today at %-I:%M:%S %p"
-msgstr ""
+msgstr "ākuni hai %-I:%M:%S %p"
 
 #: libnautilus-private/nautilus-file.c:2935
 msgid "today at 00:00 PM"
-msgstr ""
+msgstr "ākuni hai 00:00 PM"
 
 #: libnautilus-private/nautilus-file.c:2936
 msgid "today at %-I:%M %p"
-msgstr ""
+msgstr "ākuni hai %-I:%M %p"
 
 #: libnautilus-private/nautilus-file.c:2938
 msgid "today, 00:00 PM"
-msgstr ""
+msgstr "ākuni, 00:00 PM"
 
 #: libnautilus-private/nautilus-file.c:2939
 msgid "today, %-I:%M %p"
-msgstr ""
+msgstr "ākuni, %-I:%M %p"
 
 #: libnautilus-private/nautilus-file.c:2941
 #: libnautilus-private/nautilus-file.c:2942
-#, fuzzy
 msgid "today"
-msgstr "Ākuni"
+msgstr "ākuni"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
 #: libnautilus-private/nautilus-file.c:2951
 msgid "yesterday at 00:00:00 PM"
-msgstr ""
+msgstr "nanahi hai 00:00:00 PM"
 
 #: libnautilus-private/nautilus-file.c:2952
 msgid "yesterday at %-I:%M:%S %p"
@@ -2510,15 +2482,15 @@ msgstr ""
 
 #: libnautilus-private/nautilus-file.c:2954
 msgid "yesterday at 00:00 PM"
-msgstr ""
+msgstr "nanahi hai 00:00 PM"
 
 #: libnautilus-private/nautilus-file.c:2955
 msgid "yesterday at %-I:%M %p"
-msgstr ""
+msgstr "nanahi hai %-I:%M %p"
 
 #: libnautilus-private/nautilus-file.c:2957
 msgid "yesterday, 00:00 PM"
-msgstr ""
+msgstr "nanahi, 00:00 PM"
 
 #: libnautilus-private/nautilus-file.c:2958
 msgid "yesterday, %-I:%M %p"
@@ -2526,9 +2498,8 @@ msgstr ""
 
 #: libnautilus-private/nautilus-file.c:2960
 #: libnautilus-private/nautilus-file.c:2961
-#, fuzzy
 msgid "yesterday"
-msgstr "Nanahi"
+msgstr "nanahi"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
@@ -2541,7 +2512,7 @@ msgstr ""
 
 #: libnautilus-private/nautilus-file.c:2973
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
-msgstr ""
+msgstr "%A,·%B·%-d·%Y·hai·%-I:%M:%S·%p"
 
 #: libnautilus-private/nautilus-file.c:2975
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
@@ -2549,7 +2520,7 @@ msgstr ""
 
 #: libnautilus-private/nautilus-file.c:2976
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
-msgstr ""
+msgstr "%a,·%b·%-d·%Y·hai·%-I:%M:%S·%p"
 
 #: libnautilus-private/nautilus-file.c:2978
 msgid "Mon, Oct 00 0000 at 00:00 PM"
@@ -2557,7 +2528,7 @@ msgstr ""
 
 #: libnautilus-private/nautilus-file.c:2979
 msgid "%a, %b %-d %Y at %-I:%M %p"
-msgstr ""
+msgstr "%a,·%b·%-d·%Y·hai·%-I:%M·%p"
 
 #: libnautilus-private/nautilus-file.c:2981
 msgid "Oct 00 0000 at 00:00 PM"
@@ -2577,7 +2548,7 @@ msgstr ""
 
 #: libnautilus-private/nautilus-file.c:2987
 msgid "00/00/00, 00:00 PM"
-msgstr ""
+msgstr "00/00/00,·00:00·PM"
 
 #: libnautilus-private/nautilus-file.c:2988
 msgid "%m/%-d/%y, %-I:%M %p"
@@ -2585,7 +2556,7 @@ msgstr ""
 
 #: libnautilus-private/nautilus-file.c:2990
 msgid "00/00/00"
-msgstr ""
+msgstr "00/00/00"
 
 #: libnautilus-private/nautilus-file.c:2991
 msgid "%m/%d/%y"
@@ -2595,23 +2566,17 @@ msgstr ""
 #: src/file-manager/fm-directory-view.c:1818
 #, c-format
 msgid "%u item"
-msgid_plural "%u items"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: libnautilus-private/nautilus-file.c:4300
-#, fuzzy, c-format
+#, c-format
 msgid "%u folder"
-msgid_plural "%u folders"
-msgstr[0] "Kōpaki"
-msgstr[1] "Kōpaki"
+msgstr "kōpaki %u"
 
 #: libnautilus-private/nautilus-file.c:4301
 #, c-format
 msgid "%u file"
-msgid_plural "%u files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr "kōnae %u"
 
 #. This means no contents at all were readable
 #: libnautilus-private/nautilus-file.c:4626
@@ -2636,7 +2601,7 @@ msgstr ""
 #. * for which we have no more appropriate default.
 #.
 #: libnautilus-private/nautilus-file.c:4656
-#: src/file-manager/fm-properties-window.c:1147
+#: src/file-manager/fm-properties-window.c:1198
 msgid "unknown"
 msgstr ""
 
@@ -2651,82 +2616,80 @@ msgid ""
 "some other reason."
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4704
+#: libnautilus-private/nautilus-file.c:4712
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
 "gnome-vfs mailing list."
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4718
+#: libnautilus-private/nautilus-file.c:4729
 msgid "link"
-msgstr ""
+msgstr "he hononga"
 
-#: libnautilus-private/nautilus-file.c:4738
+#: libnautilus-private/nautilus-file.c:4749
 msgid "link (broken)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:6165
+#: libnautilus-private/nautilus-file.c:6176
 #: libnautilus-private/nautilus-global-preferences.c:533
 #: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
-msgstr ""
+msgstr "Te Para"
 
 #: libnautilus-private/nautilus-global-preferences.c:102
-#, fuzzy
 msgid "_Always"
-msgstr "_Whakatinana"
+msgstr "_Pūmau"
 
 #: libnautilus-private/nautilus-global-preferences.c:103
 msgid "_Local File Only"
 msgstr ""
 
 #: libnautilus-private/nautilus-global-preferences.c:104
-#, fuzzy
 msgid "_Never"
-msgstr "_Whakakāhoretia"
+msgstr "_Kore·rawa"
 
 #: libnautilus-private/nautilus-global-preferences.c:110
 #: src/nautilus-file-management-properties.glade.h:14
 #, no-c-format
 msgid "25%"
-msgstr ""
+msgstr "25%"
 
 #: libnautilus-private/nautilus-global-preferences.c:112
 #: src/nautilus-file-management-properties.glade.h:20
 #, no-c-format
 msgid "50%"
-msgstr ""
+msgstr "50%"
 
 #: libnautilus-private/nautilus-global-preferences.c:114
 #: src/nautilus-file-management-properties.glade.h:23
 #, no-c-format
 msgid "75%"
-msgstr ""
+msgstr "75%"
 
 #: libnautilus-private/nautilus-global-preferences.c:116
 #: src/nautilus-file-management-properties.glade.h:8
 #, no-c-format
 msgid "100%"
-msgstr ""
+msgstr "100%"
 
 #: libnautilus-private/nautilus-global-preferences.c:118
 #: src/nautilus-file-management-properties.glade.h:10
 #, no-c-format
 msgid "150%"
-msgstr ""
+msgstr "150%"
 
 #: libnautilus-private/nautilus-global-preferences.c:120
 #: src/nautilus-file-management-properties.glade.h:12
 #, no-c-format
 msgid "200%"
-msgstr ""
+msgstr "200%"
 
 #: libnautilus-private/nautilus-global-preferences.c:122
 #: src/nautilus-file-management-properties.glade.h:17
 #, no-c-format
 msgid "400%"
-msgstr ""
+msgstr "400%"
 
 #: libnautilus-private/nautilus-global-preferences.c:127
 msgid "100 K"
@@ -2793,16 +2756,14 @@ msgstr ""
 #: libnautilus-private/nautilus-global-preferences.c:178
 #: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:52
-#, fuzzy
 msgid "Icon View"
-msgstr "Titiro"
+msgstr "Tiro Whakaahua iti"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
-#: src/file-manager/fm-list-view.c:1107
+#: src/file-manager/fm-list-view.c:1112
 #: src/nautilus-file-management-properties.glade.h:54
-#, fuzzy
 msgid "List View"
-msgstr "Titiro"
+msgstr "Tiro Rārangi"
 
 #: libnautilus-private/nautilus-global-preferences.c:184
 msgid "Manually"
@@ -2835,41 +2796,39 @@ msgstr ""
 
 #: libnautilus-private/nautilus-global-preferences.c:195
 msgid "8"
-msgstr ""
+msgstr "8"
 
 #: libnautilus-private/nautilus-global-preferences.c:196
-#, fuzzy
 msgid "10"
-msgstr "0"
+msgstr "10"
 
 #: libnautilus-private/nautilus-global-preferences.c:197
 msgid "12"
-msgstr ""
+msgstr "12"
 
 #: libnautilus-private/nautilus-global-preferences.c:198
 msgid "14"
-msgstr ""
+msgstr "14"
 
 #: libnautilus-private/nautilus-global-preferences.c:199
 msgid "16"
-msgstr ""
+msgstr "16"
 
 #: libnautilus-private/nautilus-global-preferences.c:200
 msgid "18"
-msgstr ""
+msgstr "18"
 
 #: libnautilus-private/nautilus-global-preferences.c:201
-#, fuzzy
 msgid "20"
-msgstr "0"
+msgstr "20"
 
 #: libnautilus-private/nautilus-global-preferences.c:202
 msgid "22"
-msgstr ""
+msgstr "22"
 
 #: libnautilus-private/nautilus-global-preferences.c:203
 msgid "24"
-msgstr ""
+msgstr "24"
 
 #. Note to translators: If it's hard to compose a good home
 #. * icon name from the user name, you can use a string without
@@ -2929,53 +2888,53 @@ msgstr ""
 msgid "The selection rectangle"
 msgstr "Kotia te whiringa"
 
-#: libnautilus-private/nautilus-icon-container.c:4175
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Frame Text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4176
+#: libnautilus-private/nautilus-icon-container.c:4180
 msgid "Draw a frame around unselected text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4182
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Selection Box Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4183
+#: libnautilus-private/nautilus-icon-container.c:4187
 #, fuzzy
 msgid "Color of the selection box"
 msgstr "Tārua te whiringa"
 
-#: libnautilus-private/nautilus-icon-container.c:4188
+#: libnautilus-private/nautilus-icon-container.c:4192
 msgid "Selection Box Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4189
+#: libnautilus-private/nautilus-icon-container.c:4193
 #, fuzzy
 msgid "Opacity of the selection box"
 msgstr "Tārua te whiringa"
 
-#: libnautilus-private/nautilus-icon-container.c:4196
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Highlight Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4197
+#: libnautilus-private/nautilus-icon-container.c:4201
 msgid "Opacity of the highlight for selected icons"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4203
+#: libnautilus-private/nautilus-icon-container.c:4207
 msgid "Light Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4204
+#: libnautilus-private/nautilus-icon-container.c:4208
 msgid "Color used for information text against a dark background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4209
+#: libnautilus-private/nautilus-icon-container.c:4213
 msgid "Dark Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4210
+#: libnautilus-private/nautilus-icon-container.c:4214
 msgid "Color used for information text against a light background"
 msgstr ""
 
@@ -3122,9 +3081,8 @@ msgid "Status"
 msgstr ""
 
 #: libnautilus-private/nautilus-program-chooser.c:1344
-#, fuzzy
 msgid "Done"
-msgstr "kaore tētahi"
+msgstr "Oti"
 
 #: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
@@ -3242,117 +3200,183 @@ msgstr ""
 msgid "_Associate Action"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:568
+#: libnautilus-private/nautilus-program-choosing.c:576
 msgid "Open Failed, would you like to choose another application?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:569
+#: libnautilus-private/nautilus-program-choosing.c:577
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
 "locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:574
+#: libnautilus-private/nautilus-program-choosing.c:582
 msgid "Open Failed, would you like to choose another action?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:575
+#: libnautilus-private/nautilus-program-choosing.c:583
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
 "locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:582
-#: libnautilus-private/nautilus-program-choosing.c:615
+#: libnautilus-private/nautilus-program-choosing.c:590
+#: libnautilus-private/nautilus-program-choosing.c:623
 msgid "Can't Open Location"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:601
+#: libnautilus-private/nautilus-program-choosing.c:609
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
 "locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:604
+#: libnautilus-private/nautilus-program-choosing.c:612
 msgid ""
 "No other applications are available to view this file.  If you copy this "
 "file onto your computer, you may be able to open it."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:608
+#: libnautilus-private/nautilus-program-choosing.c:616
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\"."
 "locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:610
+#: libnautilus-private/nautilus-program-choosing.c:618
 msgid ""
 "No other actions are available to view this file.  If you copy this file "
 "onto your computer, you may be able to open it."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:869
-#: libnautilus-private/nautilus-program-choosing.c:1086
+#: libnautilus-private/nautilus-program-choosing.c:881
+#: libnautilus-private/nautilus-program-choosing.c:1166
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1230
+#. TODO: These strings suck pretty badly, but we're in string-freeze,
+#. * and I found these in other places to reuse. We should make them
+#. * better later.
+#. Shouldn't have gotten this error unless there's a : separator.
+#: libnautilus-private/nautilus-program-choosing.c:969
+#: libnautilus-private/nautilus-program-choosing.c:977
+#: libnautilus-private/nautilus-program-choosing.c:982
+#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1338
+#: src/nautilus-window-manage-views.c:1352
+#: src/nautilus-window-manage-views.c:1360
+#: src/nautilus-window-manage-views.c:1366
+#: src/nautilus-window-manage-views.c:1386
+#, c-format
+msgid "Couldn't display \"%s\"."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:971
+#: libnautilus-private/nautilus-program-choosing.c:1325
+#: libnautilus-private/nautilus-program-choosing.c:1391
+msgid "There was an error launching the application."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:979
+#: src/nautilus-window-manage-views.c:1362
+msgid "The attempt to log in failed."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:984
+#: src/nautilus-window-manage-views.c:1368
+msgid "Access was denied."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:989
+#: src/nautilus-window-manage-views.c:1378
+#, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:992
+#: src/nautilus-window-manage-views.c:1381
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:997
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1312
+#, c-format
+msgid "\"%s\" is not a valid location."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1000
+#: libnautilus-private/nautilus-program-choosing.c:1007
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1106
+#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
+msgid "Please check the spelling and try again."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1004
+#: src/nautilus-window-manage-views.c:1304
+#, c-format
+msgid "Couldn't find \"%s\"."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1019
+#: src/nautilus-window-manage-views.c:1422
+msgid "Can't Display Location"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1310
 msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1232
+#: libnautilus-private/nautilus-program-choosing.c:1312
 msgid "This is disabled due to security considerations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1233
+#: libnautilus-private/nautilus-program-choosing.c:1313
 msgid "Can't Execute Remote Links"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1243
-#: libnautilus-private/nautilus-program-choosing.c:1309
+#: libnautilus-private/nautilus-program-choosing.c:1323
+#: libnautilus-private/nautilus-program-choosing.c:1389
 msgid "Details: "
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1245
-#: libnautilus-private/nautilus-program-choosing.c:1311
-msgid "There was an error launching the application."
-msgstr ""
-
-#: libnautilus-private/nautilus-program-choosing.c:1247
-#: libnautilus-private/nautilus-program-choosing.c:1313
+#: libnautilus-private/nautilus-program-choosing.c:1327
+#: libnautilus-private/nautilus-program-choosing.c:1393
 msgid "Error Launching Application"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1275
-#: libnautilus-private/nautilus-program-choosing.c:1287
+#: libnautilus-private/nautilus-program-choosing.c:1355
+#: libnautilus-private/nautilus-program-choosing.c:1367
 msgid "This drop target only supports local files."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1276
+#: libnautilus-private/nautilus-program-choosing.c:1356
 msgid ""
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1278
-#: libnautilus-private/nautilus-program-choosing.c:1290
+#: libnautilus-private/nautilus-program-choosing.c:1358
+#: libnautilus-private/nautilus-program-choosing.c:1370
 msgid "Drop Target Only Supports Local Files"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1288
+#: libnautilus-private/nautilus-program-choosing.c:1368
 msgid ""
 "To open non-local files copy them to a local folder and then drop them "
 "again. The local files you dropped have already been opened."
 msgstr ""
 
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
-#, fuzzy
 msgid "Edit"
-msgstr "_Whakatika"
+msgstr "Whakatika"
 
 #: libnautilus-private/nautilus-undo-signal-handlers.c:175
 #, fuzzy
@@ -3379,9 +3403,9 @@ msgid "View as %s"
 msgstr ""
 
 #: libnautilus-private/nautilus-view-identifier.c:68
-#, fuzzy, c-format
+#, c-format
 msgid "%s Viewer"
-msgstr "Titiro"
+msgstr "Pūmanawa Whakaatu %s"
 
 #: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:1
 msgid "C_lear Text"
@@ -3392,9 +3416,8 @@ msgid "Cut Text"
 msgstr ""
 
 #: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:4
-#, fuzzy
 msgid "Cut _Text"
-msgstr "K_otia"
+msgstr "Kotia ngā K_upu"
 
 #: libnautilus/nautilus-clipboard-ui.xml.h:5
 msgid "Cut the selected text to the clipboard"
@@ -3417,9 +3440,8 @@ msgid "Select all the text in a text field"
 msgstr ""
 
 #: libnautilus/nautilus-clipboard-ui.xml.h:11 src/nautilus-shell-ui.xml.h:39
-#, fuzzy
 msgid "_Paste Text"
-msgstr "_Whakapiri"
+msgstr "_Whakapiri ngā Kupu"
 
 #: nautilus-computer.desktop.in.h:2
 msgid "View your computer storage"
@@ -3434,9 +3456,8 @@ msgid "File Management"
 msgstr ""
 
 #: nautilus-home.desktop.in.h:1 src/file-manager/fm-tree-view.c:1086
-#, fuzzy
 msgid "Home Folder"
-msgstr "Kōpaki Hou"
+msgstr "Kōpaki Kāinga"
 
 #: nautilus-home.desktop.in.h:2
 msgid "View your home folder in the Nautilus file manager"
@@ -3456,7 +3477,7 @@ msgstr ""
 
 #: src/Nautilus_shell.server.in.h:2
 msgid "Icons"
-msgstr ""
+msgstr "Ngā whakaahua iti"
 
 #: src/Nautilus_shell.server.in.h:3
 msgid "Icons Viewer"
@@ -3464,7 +3485,7 @@ msgstr ""
 
 #: src/Nautilus_shell.server.in.h:4
 msgid "List"
-msgstr ""
+msgstr "Rārangi"
 
 #: src/Nautilus_shell.server.in.h:5
 msgid "List Viewer"
@@ -3539,9 +3560,8 @@ msgid "Search List"
 msgstr ""
 
 #: src/Nautilus_shell.server.in.h:22
-#, fuzzy
 msgid "Tree"
-msgstr "Mata"
+msgstr "Rākau"
 
 #: src/Nautilus_shell.server.in.h:23
 msgid "View as Icons"
@@ -3574,16 +3594,13 @@ msgstr ""
 
 #: src/file-manager/fm-desktop-icon-view.c:654
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:5
-#, fuzzy
 msgid "Empty Trash"
-msgstr "Tuhera kau"
+msgstr "Whakangita te para"
 
 #: src/file-manager/fm-directory-view.c:544
 #, c-format
 msgid "Open %d Window?"
-msgid_plural "Open %d Windows?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: src/file-manager/fm-directory-view.c:545
 msgid "Are you sure you want to open all files?"
@@ -3592,9 +3609,7 @@ msgstr ""
 #: src/file-manager/fm-directory-view.c:546 src/nautilus-location-bar.c:158
 #, c-format
 msgid "This will open %d separate window."
-msgid_plural "This will open %d separate windows."
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: src/file-manager/fm-directory-view.c:893
 #, c-format
@@ -3604,19 +3619,16 @@ msgstr ""
 #: src/file-manager/fm-directory-view.c:897
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected item?"
-msgid_plural ""
 "Are you sure you want to permanently delete the %d selected items?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: src/file-manager/fm-directory-view.c:905
 msgid "If you delete an item, it is permanently lost."
 msgstr ""
 
 #: src/file-manager/fm-directory-view.c:906
-#, fuzzy
 msgid "Delete?"
-msgstr "Porowhiu"
+msgstr "Porowhiu?"
 
 #: src/file-manager/fm-directory-view.c:1045
 msgid "Select Pattern"
@@ -3635,24 +3647,18 @@ msgstr ""
 #: src/file-manager/fm-directory-view.c:1752
 #, c-format
 msgid "%d folder selected"
-msgid_plural "%d folders selected"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d item)"
-msgid_plural " (containing %d items)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #. translators: this is preceded with a string of form 'N folders' (N more than 1)
 #: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d item)"
-msgid_plural " (containing a total of %d items)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: src/file-manager/fm-directory-view.c:1789
 #, c-format
@@ -3662,17 +3668,13 @@ msgstr ""
 #: src/file-manager/fm-directory-view.c:1793
 #, c-format
 msgid "%d item selected (%s)"
-msgid_plural "%d items selected (%s)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #. Folders selected also, use "other" terminology
 #: src/file-manager/fm-directory-view.c:1801
 #, c-format
 msgid "%d other item selected (%s)"
-msgid_plural "%d other items selected (%s)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: src/file-manager/fm-directory-view.c:1822
 #, c-format
@@ -3740,11 +3742,9 @@ msgstr ""
 msgid ""
 "Are you sure you want to permanently delete the %d selected item from the "
 "trash?"
-msgid_plural ""
 "Are you sure you want to permanently delete the %d selected items from the "
 "trash?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: src/file-manager/fm-directory-view.c:3307
 msgid "If you delete an item, it will be permanently lost."
@@ -3766,7 +3766,7 @@ msgstr ""
 
 #: src/file-manager/fm-directory-view.c:3735
 msgid "An _Application..."
-msgstr ""
+msgstr "He tautono..."
 
 #: src/file-manager/fm-directory-view.c:3919
 #, c-format
@@ -3808,7 +3808,7 @@ msgstr ""
 
 #: src/file-manager/fm-directory-view.c:4715
 msgid "About Scripts"
-msgstr ""
+msgstr "Mō ngā Tohotohu Rorohiko"
 
 #: src/file-manager/fm-directory-view.c:4716
 msgid ""
@@ -3848,19 +3848,15 @@ msgstr ""
 #, c-format
 msgid ""
 "The %d selected item will be moved if you select the Paste Files command"
-msgid_plural ""
 "The %d selected items will be moved if you select the Paste Files command"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: src/file-manager/fm-directory-view.c:4865
 #, c-format
 msgid ""
 "The %d selected item will be copied if you select the Paste Files command"
-msgid_plural ""
 "The %d selected items will be copied if you select the Paste Files command"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: src/file-manager/fm-directory-view.c:4947
 #: src/file-manager/fm-tree-view.c:868
@@ -3868,23 +3864,23 @@ msgid "There is nothing on the clipboard to paste."
 msgstr ""
 
 #: src/file-manager/fm-directory-view.c:5050
-#: src/file-manager/fm-directory-view.c:6102
+#: src/file-manager/fm-directory-view.c:6123
 #, fuzzy
 msgid "Mount Error"
 msgstr "Pōhēhē"
 
 #: src/file-manager/fm-directory-view.c:5112
-msgid "Unmount Error"
-msgstr ""
-
-#: src/file-manager/fm-directory-view.c:5115
 #, fuzzy
 msgid "Eject Error"
 msgstr "Pōhēhē"
 
+#: src/file-manager/fm-directory-view.c:5115
+msgid "Unmount Error"
+msgstr ""
+
 #: src/file-manager/fm-directory-view.c:5378
 msgid "E_ject"
-msgstr ""
+msgstr "_Tuwha"
 
 #: src/file-manager/fm-directory-view.c:5378
 #: src/file-manager/nautilus-directory-view-ui.xml.h:62
@@ -3896,19 +3892,15 @@ msgstr ""
 #: src/file-manager/fm-tree-view.c:960
 #, c-format
 msgid "Open in New Window"
-msgid_plural "Open in %d New Windows"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: src/file-manager/fm-directory-view.c:5515
-#, fuzzy
 msgid "Browse Folder"
-msgstr "Kōpaki Hou"
+msgstr "Whakaraparapa te Kōpaki"
 
 #: src/file-manager/fm-directory-view.c:5517
-#, fuzzy
 msgid "Browse Folders"
-msgstr "Kōpaki Hou"
+msgstr "Whakaraparapa ngā Kōpaki"
 
 #: src/file-manager/fm-directory-view.c:5540
 msgid "_Delete from Trash"
@@ -3949,26 +3941,22 @@ msgid "_Empty Trash"
 msgstr ""
 
 #: src/file-manager/fm-directory-view.c:5621
-#, fuzzy
 msgid "Cu_t File"
-msgstr "_Kōnae"
+msgstr "K_otia te Kōnae"
 
 #: src/file-manager/fm-directory-view.c:5622
 #: src/file-manager/nautilus-directory-view-ui.xml.h:10
-#, fuzzy
 msgid "Cu_t Files"
-msgstr "Ngā _Kōnae"
+msgstr "Kotia ngā _Kōnae"
 
 #: src/file-manager/fm-directory-view.c:5631
-#, fuzzy
 msgid "_Copy File"
-msgstr "_Kōnae"
+msgstr "Tārua te _Kōnae"
 
 #: src/file-manager/fm-directory-view.c:5632
 #: src/file-manager/nautilus-directory-view-ui.xml.h:49
-#, fuzzy
 msgid "_Copy Files"
-msgstr "Ngā _Kōnae"
+msgstr "Tārua ngā _Kōnae"
 
 #: src/file-manager/fm-directory-view.c:5874
 msgid "The link is broken, do you want to move it to the Trash?"
@@ -4013,12 +4001,12 @@ msgstr ""
 msgid "_Run"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:6236
+#: src/file-manager/fm-directory-view.c:6259
 #, c-format
 msgid "Opening \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:6243
+#: src/file-manager/fm-directory-view.c:6266
 #, fuzzy
 msgid "Cancel Open?"
 msgstr "_Whakakore"
@@ -4239,98 +4227,95 @@ msgstr ""
 msgid "An invalid drag type was used."
 msgstr ""
 
-#: src/file-manager/fm-list-view.c:1514
+#: src/file-manager/fm-list-view.c:1519
 #, c-format
 msgid "%s Visible Columns"
 msgstr ""
 
-#: src/file-manager/fm-list-view.c:1533
+#: src/file-manager/fm-list-view.c:1538
 msgid "Choose the order of information to appear in this folder."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:477
+#: src/file-manager/fm-properties-window.c:481
 msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:478
+#: src/file-manager/fm-properties-window.c:482
 #: src/nautilus-information-panel.c:507
 msgid "Please drag just one image to set a custom icon."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:479
+#: src/file-manager/fm-properties-window.c:483
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:488
+#: src/file-manager/fm-properties-window.c:492
 #: src/nautilus-information-panel.c:527
 msgid "The file that you dropped is not local."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:489
-#: src/file-manager/fm-properties-window.c:496
+#: src/file-manager/fm-properties-window.c:493
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:528
 msgid "You can only use local images as custom icons."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:494
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:495
+#: src/file-manager/fm-properties-window.c:499
 #: src/nautilus-information-panel.c:534
 msgid "The file that you dropped is not an image."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:501
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:914
+#: src/file-manager/fm-properties-window.c:918
 #: src/file-manager/fm-tree-view.c:1053
-#, fuzzy
 msgid "Properties"
-msgstr "Ngā _Āhuatanga"
+msgstr "Ngā Āhuatanga"
 
-#: src/file-manager/fm-properties-window.c:917
-#, fuzzy, c-format
+#: src/file-manager/fm-properties-window.c:921
+#, c-format
 msgid "%s Properties"
-msgstr "Ngā _Āhuatanga"
+msgstr "Ngā āhuatanga %s"
 
-#: src/file-manager/fm-properties-window.c:1378
+#: src/file-manager/fm-properties-window.c:1429
 msgid "Cancel Group Change?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1379
+#: src/file-manager/fm-properties-window.c:1430
 msgid "Changing group."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1540
+#: src/file-manager/fm-properties-window.c:1591
 msgid "Cancel Owner Change?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1541
+#: src/file-manager/fm-properties-window.c:1592
 msgid "Changing owner."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1747
+#: src/file-manager/fm-properties-window.c:1798
 msgid "nothing"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1749
+#: src/file-manager/fm-properties-window.c:1800
 msgid "unreadable"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1759
+#: src/file-manager/fm-properties-window.c:1810
 #, c-format
 msgid "%d item, with size %s"
-msgid_plural "%d items, totalling %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1768
+#: src/file-manager/fm-properties-window.c:1819
 msgid "(some contents unreadable)"
 msgstr ""
 
@@ -4340,194 +4325,188 @@ msgstr ""
 #. * 2-line value. Maybe there's a better way to do this, but I
 #. * couldn't think of one.
 #.
-#: src/file-manager/fm-properties-window.c:1785
+#: src/file-manager/fm-properties-window.c:1836
 msgid "Contents:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2176
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2227
 msgid "Basic"
-msgstr "Whakamuri"
+msgstr "Waiwai"
 
-#: src/file-manager/fm-properties-window.c:2204
+#: src/file-manager/fm-properties-window.c:2255
 msgid "_Names:"
-msgstr ""
+msgstr "Ngā _Ingoa:"
 
-#: src/file-manager/fm-properties-window.c:2206
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2257
 msgid "_Name:"
-msgstr "_Hou"
+msgstr "_Ingoa:"
 
-#: src/file-manager/fm-properties-window.c:2255
+#: src/file-manager/fm-properties-window.c:2306
 msgid "Type:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2257
-#: src/file-manager/fm-properties-window.c:2267
-#: src/file-manager/fm-properties-window.c:2273
-#: src/file-manager/fm-properties-window.c:2280
-#: src/file-manager/fm-properties-window.c:2284
-#: src/file-manager/fm-properties-window.c:2292
-#: src/file-manager/fm-properties-window.c:2298
-#: src/file-manager/fm-properties-window.c:2307
-#: src/file-manager/fm-properties-window.c:2313
-#: src/file-manager/fm-properties-window.c:2900
-#: src/file-manager/fm-properties-window.c:2921
-#: src/file-manager/fm-properties-window.c:3012
-#: src/file-manager/fm-properties-window.c:3016
-#: src/file-manager/fm-properties-window.c:3020
+#: src/file-manager/fm-properties-window.c:2308
+#: src/file-manager/fm-properties-window.c:2318
+#: src/file-manager/fm-properties-window.c:2324
+#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
+#: src/file-manager/fm-properties-window.c:2343
+#: src/file-manager/fm-properties-window.c:2349
+#: src/file-manager/fm-properties-window.c:2358
+#: src/file-manager/fm-properties-window.c:2364
+#: src/file-manager/fm-properties-window.c:2957
+#: src/file-manager/fm-properties-window.c:2978
+#: src/file-manager/fm-properties-window.c:3069
+#: src/file-manager/fm-properties-window.c:3073
+#: src/file-manager/fm-properties-window.c:3077
 msgid "--"
-msgstr ""
+msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2316
 msgid "Size:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2271 src/nautilus-location-bar.c:60
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2322 src/nautilus-location-bar.c:60
 msgid "Location:"
-msgstr "Rongo"
+msgstr "Wāhi:"
 
-#: src/file-manager/fm-properties-window.c:2278
+#: src/file-manager/fm-properties-window.c:2329
 msgid "Volume:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2333
 msgid "Free space:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2290
+#: src/file-manager/fm-properties-window.c:2341
 msgid "Link target:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2296
+#: src/file-manager/fm-properties-window.c:2347
 msgid "MIME type:"
-msgstr ""
+msgstr "Kawa·mēra·maha:"
 
-#: src/file-manager/fm-properties-window.c:2305
+#: src/file-manager/fm-properties-window.c:2356
 msgid "Modified:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2311
+#: src/file-manager/fm-properties-window.c:2362
 msgid "Accessed:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2327
+#: src/file-manager/fm-properties-window.c:2378
 msgid "_Select Custom Icon..."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2333
+#: src/file-manager/fm-properties-window.c:2384
 msgid "_Remove Custom Icon"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2679
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2736
 msgid "_Read"
-msgstr "_Mahi Anō"
+msgstr "_Pānuitia"
 
-#: src/file-manager/fm-properties-window.c:2681
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2738
 msgid "_Write"
-msgstr "_Tā"
+msgstr "_Tuhia"
 
-#: src/file-manager/fm-properties-window.c:2683
+#: src/file-manager/fm-properties-window.c:2740
 #, fuzzy
 msgid "E_xecute"
 msgstr "Whaka_haerea"
 
-#: src/file-manager/fm-properties-window.c:2766
+#: src/file-manager/fm-properties-window.c:2823
 msgid "Set _user ID"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2771
+#: src/file-manager/fm-properties-window.c:2828
 msgid "Special flags:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2774
+#: src/file-manager/fm-properties-window.c:2831
 msgid "Set gro_up ID"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2776
+#: src/file-manager/fm-properties-window.c:2833
 msgid "_Sticky"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2875
+#: src/file-manager/fm-properties-window.c:2932
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2889
+#: src/file-manager/fm-properties-window.c:2946
 msgid "File _owner:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2895
+#: src/file-manager/fm-properties-window.c:2952
 msgid "File owner:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2906
+#: src/file-manager/fm-properties-window.c:2963
 msgid "_File group:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2972
 msgid "File group:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2927
+#: src/file-manager/fm-properties-window.c:2984
 msgid "Owner:"
-msgstr ""
+msgstr "Rangatira:"
 
-#: src/file-manager/fm-properties-window.c:2928
+#: src/file-manager/fm-properties-window.c:2985
 msgid "Group:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2929
+#: src/file-manager/fm-properties-window.c:2986
 msgid "Others:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3011
+#: src/file-manager/fm-properties-window.c:3068
 msgid "Text view:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3015
+#: src/file-manager/fm-properties-window.c:3072
 msgid "Number view:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3019
+#: src/file-manager/fm-properties-window.c:3076
 msgid "Last changed:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3025
+#: src/file-manager/fm-properties-window.c:3082
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3028
+#: src/file-manager/fm-properties-window.c:3085
 msgid "The permissions of the selected file could not be determined."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3186
+#: src/file-manager/fm-properties-window.c:3243
 msgid "There was an error displaying help."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3186
+#: src/file-manager/fm-properties-window.c:3243
 msgid "Couldn't Show Help"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3523
+#: src/file-manager/fm-properties-window.c:3593
 msgid "Cancel Showing Properties Window?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3524
+#: src/file-manager/fm-properties-window.c:3594
 msgid "Creating Properties window."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3650
+#: src/file-manager/fm-properties-window.c:3729
 msgid "Select an icon"
 msgstr ""
 
 #: src/file-manager/fm-tree-model.c:1199
-#, fuzzy
 msgid "(Empty)"
-msgstr "Tuhera kau"
+msgstr "(Tuhera kau)"
 
 #: src/file-manager/fm-tree-model.c:1199
 msgid "Loading..."
@@ -4544,14 +4523,12 @@ msgid "Create Folder"
 msgstr "Kōpaki Hou"
 
 #: src/file-manager/fm-tree-view.c:989
-#, fuzzy
 msgid "Cut Folder"
-msgstr "Kōpaki"
+msgstr "Kotia te Kōpaki"
 
 #: src/file-manager/fm-tree-view.c:1003
-#, fuzzy
 msgid "Copy Folder"
-msgstr "Kōpaki"
+msgstr "Tārua te Kōpaki"
 
 #: src/file-manager/fm-tree-view.c:1017
 msgid "Paste Files into Folder"
@@ -4562,9 +4539,8 @@ msgid "Move to Trash"
 msgstr ""
 
 #: src/file-manager/fm-tree-view.c:1088
-#, fuzzy
 msgid "Filesystem"
-msgstr "Ngā Kōnae"
+msgstr "Whakakōnae"
 
 #: src/file-manager/fm-tree-view.c:1090
 msgid "Network Neighbourhood"
@@ -4664,9 +4640,8 @@ msgid "Edit the launcher information"
 msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:17
-#, fuzzy
 msgid "Format the selected volume"
-msgstr "Kotia te whiringa"
+msgstr "Whakatakoto te ngākau kōpae kōwhiritia"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:19
 #, fuzzy
@@ -4779,14 +4754,12 @@ msgid "View or modify the properties of each selected item"
 msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:51
-#, fuzzy
 msgid "_Empty File"
-msgstr "_Kōnae"
+msgstr "_Kōnae tuhera kau"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:53
-#, fuzzy
 msgid "_Format"
-msgstr "_Momotuhi"
+msgstr "_Whakatakoto"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Mount Volume"
@@ -4801,9 +4774,8 @@ msgid "_Open Scripts Folder"
 msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:57
-#, fuzzy
 msgid "_Paste Files"
-msgstr "Ngā _Kōnae"
+msgstr "Whakapiri ngā _Kōnae"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Paste Files Into Folder"
@@ -4814,9 +4786,8 @@ msgid "_Properties"
 msgstr "Ngā _Āhuatanga"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:60
-#, fuzzy
 msgid "_Rename..."
-msgstr "_Whakakapia..."
+msgstr "_Whakaingoa·hou..."
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Scripts"
@@ -4906,51 +4877,51 @@ msgstr ""
 msgid "Visible _Columns..."
 msgstr ""
 
-#: src/nautilus-application.c:266
+#: src/nautilus-application.c:267
 msgid "Couldn't Create Required Folder"
 msgstr ""
 
-#: src/nautilus-application.c:267
+#: src/nautilus-application.c:268
 #, c-format
 msgid "Nautilus could not create the required folder \"%s\"."
 msgstr ""
 
-#: src/nautilus-application.c:269
+#: src/nautilus-application.c:270
 msgid ""
 "Before running Nautilus, please create the following folder, or set "
 "permissions such that Nautilus can create it."
 msgstr ""
 
-#: src/nautilus-application.c:272
+#: src/nautilus-application.c:273
 msgid "Couldn't Create Required Folders"
 msgstr ""
 
-#: src/nautilus-application.c:273
+#: src/nautilus-application.c:274
 #, c-format
 msgid "Nautilus could not create the following required folders: %s."
 msgstr ""
 
-#: src/nautilus-application.c:275
+#: src/nautilus-application.c:276
 msgid ""
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
 
-#: src/nautilus-application.c:343
+#: src/nautilus-application.c:344
 msgid "Link To Old Desktop"
 msgstr ""
 
-#: src/nautilus-application.c:359
+#: src/nautilus-application.c:360
 msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
 msgstr ""
 
-#: src/nautilus-application.c:360
+#: src/nautilus-application.c:361
 msgid ""
 "The location of the desktop directory has changed in GNOME 2.4. You can open "
 "the link and move over the files you want, then delete the link."
 msgstr ""
 
-#: src/nautilus-application.c:362
+#: src/nautilus-application.c:363
 msgid "Migrated Old Desktop"
 msgstr ""
 
@@ -4964,7 +4935,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:536
+#: src/nautilus-application.c:537
 msgid ""
 "Nautilus can't be used now. Running the command \"bonobo-slay\" from the "
 "console may fix the problem. If not, you can try rebooting the computer or "
@@ -4972,7 +4943,7 @@ msgid ""
 msgstr ""
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:542
+#: src/nautilus-application.c:543
 msgid ""
 "Nautilus can't be used now. Running the command \"bonobo-slay\" from the "
 "console may fix the problem. If not, you can try rebooting the computer or "
@@ -5001,32 +4972,33 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:572 src/nautilus-application.c:590
-#: src/nautilus-application.c:597
+#. FIXME bugzilla.gnome.org 42538: When can this happen?
+#: src/nautilus-application.c:573 src/nautilus-application.c:591
+#: src/nautilus-application.c:598
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 
-#: src/nautilus-application.c:573
+#: src/nautilus-application.c:574
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
 msgstr ""
 
-#: src/nautilus-application.c:591
+#: src/nautilus-application.c:592
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to locate the factory.Killing bonobo-activation-server and "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
-#: src/nautilus-application.c:598
+#: src/nautilus-application.c:599
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to locate the shell object. Killing bonobo-activation-server and "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
-#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-bookmarks-window.c:150
 #: src/nautilus-file-management-properties.c:219
 #: src/nautilus-property-browser.c:1456 src/nautilus-window-menus.c:647
 #, c-format
@@ -5035,7 +5007,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/nautilus-bookmarks-window.c:180
+#: src/nautilus-bookmarks-window.c:184
 msgid "No bookmarks defined"
 msgstr ""
 
@@ -5068,26 +5040,13 @@ msgstr ""
 msgid "Can't Connect to Server"
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:101
-#: src/nautilus-window-manage-views.c:1310
-#, c-format
-msgid "\"%s\" is not a valid location."
-msgstr ""
-
-#: src/nautilus-connect-server-dialog.c:103
-#: src/nautilus-property-browser.c:1106
-#: src/nautilus-window-manage-views.c:1305
-#: src/nautilus-window-manage-views.c:1313
-msgid "Please check the spelling and try again."
-msgstr ""
-
 #: src/nautilus-connect-server-dialog.c:177
 msgid "Connect to Server"
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:191
 msgid "Link _name:"
-msgstr ""
+msgstr "Ingoa a te hononga:"
 
 #: src/nautilus-connect-server-dialog.c:210
 msgid "_Location (URL):"
@@ -5098,22 +5057,20 @@ msgid "Example:"
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:248
-#, fuzzy
 msgid "C_onnect"
-msgstr "_Huri"
+msgstr "_Hono-ā-rorohiko"
 
 #: src/nautilus-desktop-window.c:356
 msgid "Desktop"
-msgstr ""
+msgstr "Te papa mahi"
 
 #: src/nautilus-file-management-properties.c:295
-#, fuzzy
 msgid "None"
-msgstr "kaore tētahi"
+msgstr "Kaore tētahi"
 
 #: src/nautilus-file-management-properties.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: src/nautilus-file-management-properties.glade.h:2
 msgid "1 GB"
@@ -5181,7 +5138,7 @@ msgstr ""
 
 #: src/nautilus-file-management-properties.glade.h:37
 msgid "Always"
-msgstr ""
+msgstr "Pūmau"
 
 #: src/nautilus-file-management-properties.glade.h:38
 msgid "Ask before _emptying the Trash or deleting files"
@@ -5231,17 +5188,15 @@ msgstr ""
 
 #: src/nautilus-file-management-properties.glade.h:56
 msgid "MIME type"
-msgstr ""
+msgstr "Kawa mēra maha"
 
 #: src/nautilus-file-management-properties.glade.h:57
-#, fuzzy
 msgid "Never"
-msgstr "_Whakakāhoretia"
+msgstr "Kore rawa"
 
 #: src/nautilus-file-management-properties.glade.h:58
-#, fuzzy
 msgid "Preview"
-msgstr "Tiro Tānga"
+msgstr "Kite wawe"
 
 #: src/nautilus-file-management-properties.glade.h:59
 msgid "Preview _sound files:"
@@ -5272,9 +5227,8 @@ msgid "View _new folders using:"
 msgstr ""
 
 #: src/nautilus-file-management-properties.glade.h:66
-#, fuzzy
 msgid "Views"
-msgstr "Titiro"
+msgstr "Ngā Tiro"
 
 #: src/nautilus-file-management-properties.glade.h:67
 msgid "_Arrange items:"
@@ -5333,9 +5287,8 @@ msgid "octal permissions"
 msgstr ""
 
 #: src/nautilus-file-management-properties.glade.h:82
-#, fuzzy
 msgid "owner"
-msgstr "kaore tētahi"
+msgstr "rangatira"
 
 #: src/nautilus-file-management-properties.glade.h:83
 msgid "permissions"
@@ -5401,9 +5354,7 @@ msgstr ""
 #: src/nautilus-location-bar.c:154
 #, c-format
 msgid "Do you want to view %d location?"
-msgid_plural "Do you want to view %d locations?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
 #: src/nautilus-location-bar.c:170
 msgid "View in Multiple Windows?"
@@ -5456,28 +5407,33 @@ msgid "File Manager"
 msgstr ""
 
 #. Set initial window title
-#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:306
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:307
 #: src/nautilus-window-menus.c:601 src/nautilus-window.c:173
 msgid "Nautilus"
-msgstr ""
+msgstr "Paua"
 
 #: src/nautilus-main.c:259
+#, c-format
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr ""
 
 #: src/nautilus-main.c:263
+#, c-format
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 
 #: src/nautilus-main.c:267
+#, c-format
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr ""
 
 #: src/nautilus-main.c:271
+#, c-format
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr ""
 
 #: src/nautilus-main.c:275
+#, c-format
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 
@@ -5520,16 +5476,14 @@ msgid "Bookmark for Nonexistent Location"
 msgstr ""
 
 #: src/nautilus-navigation-window-menus.c:432
-#, fuzzy
 msgid "Remove"
-msgstr "_Tangohia"
+msgstr "Tangohia"
 
 #: src/nautilus-navigation-window-ui.xml.h:1
 msgid "Add a bookmark for the current location to this menu"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:2
-#, fuzzy
 msgid "Back"
 msgstr "Whakamuri"
 
@@ -5576,9 +5530,8 @@ msgid "Find"
 msgstr "Kitea"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
-#, fuzzy
 msgid "Forward"
-msgstr "_Whakamua"
+msgstr "Whakamua"
 
 #: src/nautilus-navigation-window-ui.xml.h:15
 #: src/nautilus-spatial-window-ui.xml.h:6
@@ -5604,9 +5557,8 @@ msgid "Go to the trash folder"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:20
-#, fuzzy
 msgid "Home"
-msgstr "_Kāinga"
+msgstr "Kāinga"
 
 #: src/nautilus-navigation-window-ui.xml.h:21
 msgid "Location _Bar"
@@ -5623,17 +5575,15 @@ msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:24
 msgid "St_atusbar"
-msgstr ""
+msgstr "Pae Pānui"
 
 #: src/nautilus-navigation-window-ui.xml.h:25
-#, fuzzy
 msgid "Stop"
-msgstr "Whaka_mutua"
+msgstr "Whakamutua"
 
 #: src/nautilus-navigation-window-ui.xml.h:26
-#, fuzzy
 msgid "Up"
-msgstr "_Runga"
+msgstr "Runga"
 
 #: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Add Bookmark"
@@ -5641,11 +5591,11 @@ msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Back"
-msgstr "Whakamuri"
+msgstr "_Whakamuri"
 
 #: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Bookmarks"
-msgstr ""
+msgstr "Ngā Tohuwāhi"
 
 #: src/nautilus-navigation-window-ui.xml.h:30
 #, fuzzy
@@ -5654,9 +5604,8 @@ msgstr "_Whakawātea"
 
 #: src/nautilus-navigation-window-ui.xml.h:31
 #: src/nautilus-spatial-window-ui.xml.h:12
-#, fuzzy
 msgid "_Computer"
-msgstr "_Pū"
+msgstr "_Rorohiko"
 
 #: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Edit Bookmarks"
@@ -5667,9 +5616,8 @@ msgid "_Forward"
 msgstr "_Whakamua"
 
 #: src/nautilus-navigation-window-ui.xml.h:34
-#, fuzzy
 msgid "_Go"
-msgstr "_Kāo"
+msgstr "_Haere"
 
 #: src/nautilus-navigation-window-ui.xml.h:35
 #: src/nautilus-spatial-window-ui.xml.h:13
@@ -5677,9 +5625,8 @@ msgid "_Home"
 msgstr "_Kāinga"
 
 #: src/nautilus-navigation-window-ui.xml.h:36
-#, fuzzy
 msgid "_Location..."
-msgstr "_Kitea..."
+msgstr "_Wāhi..."
 
 #: src/nautilus-navigation-window-ui.xml.h:37
 msgid "_Side Pane"
@@ -5687,14 +5634,13 @@ msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:38
 #: src/nautilus-spatial-window-ui.xml.h:15
-#, fuzzy
 msgid "_Templates"
-msgstr "_Whakakapia"
+msgstr "Ngā _Papa Tauira"
 
 #: src/nautilus-navigation-window-ui.xml.h:39
 #: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
-msgstr ""
+msgstr "Te _Para"
 
 #: src/nautilus-navigation-window-ui.xml.h:40
 msgid "_Up"
@@ -5765,9 +5711,8 @@ msgid "Backgrounds and Emblems"
 msgstr ""
 
 #: src/nautilus-property-browser.c:386
-#, fuzzy
 msgid "_Remove..."
-msgstr "_Tangohia"
+msgstr "_Tangohia..."
 
 #: src/nautilus-property-browser.c:407
 msgid "_Add new..."
@@ -5811,7 +5756,7 @@ msgstr ""
 #. set up a gnome icon entry to pick the image file
 #: src/nautilus-property-browser.c:1015
 msgid "_Image:"
-msgstr ""
+msgstr "Whaka_ahua:"
 
 #: src/nautilus-property-browser.c:1019
 msgid "Select an image file for the new emblem:"
@@ -5932,9 +5877,8 @@ msgid "Patterns:"
 msgstr ""
 
 #: src/nautilus-property-browser.c:2113
-#, fuzzy
 msgid "Colors:"
-msgstr "_Kano"
+msgstr "Ngā Kano:"
 
 #: src/nautilus-property-browser.c:2116
 msgid "Emblems:"
@@ -5987,9 +5931,8 @@ msgid "Go to Empty CD folder"
 msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:12
-#, fuzzy
 msgid "Go to the home location"
-msgstr "Kotia te whiringa"
+msgstr "Haere te kāinga"
 
 #: src/nautilus-shell-ui.xml.h:13
 msgid "Go up one level"
@@ -6000,9 +5943,8 @@ msgid "Normal Si_ze"
 msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:15
-#, fuzzy
 msgid "Prefere_nces"
-msgstr "Ngā tina hiahia"
+msgstr "Ngā _tina hiahia"
 
 #: src/nautilus-shell-ui.xml.h:16
 msgid "Report Profiling"
@@ -6066,9 +6008,8 @@ msgid "_Close"
 msgstr "_Kati"
 
 #: src/nautilus-shell-ui.xml.h:34
-#, fuzzy
 msgid "_Contents"
-msgstr "_Huri"
+msgstr "_Ngā kai"
 
 #: src/nautilus-shell-ui.xml.h:36
 msgid "_Edit"
@@ -6157,13 +6098,12 @@ msgid "Open the parent folder"
 msgstr "Huaki he kōnae"
 
 #: src/nautilus-spatial-window-ui.xml.h:14
-#, fuzzy
 msgid "_Places"
-msgstr "_Whakakapia"
+msgstr "Ngā Wāhi"
 
 #: src/nautilus-view-frame.c:595
 msgid "a title"
-msgstr ""
+msgstr "he taitara"
 
 #: src/nautilus-view-frame.c:604
 msgid "the browse history"
@@ -6178,127 +6118,89 @@ msgstr "Kotia te whiringa"
 msgid "the type of window the view is embedded in"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:836
+#: src/nautilus-window-manage-views.c:838
 msgid "View Failed"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:847
+#: src/nautilus-window-manage-views.c:849
 #, c-format
 msgid "The %s view encountered an error and can't continue."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:848
+#: src/nautilus-window-manage-views.c:850
 msgid "You can choose another view or go to a different location."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:858
+#: src/nautilus-window-manage-views.c:860
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:859
+#: src/nautilus-window-manage-views.c:861
 msgid "The location cannot be displayed with this viewer."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1006
+#: src/nautilus-window-manage-views.c:1008
 msgid "Content View"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1007
+#: src/nautilus-window-manage-views.c:1009
 msgid "View of the current file or folder"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1302
-#, c-format
-msgid "Couldn't find \"%s\"."
-msgstr ""
-
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1326
-#: src/nautilus-window-manage-views.c:1336
-#: src/nautilus-window-manage-views.c:1350
-#: src/nautilus-window-manage-views.c:1358
-#: src/nautilus-window-manage-views.c:1364
-#: src/nautilus-window-manage-views.c:1384
-#, c-format
-msgid "Couldn't display \"%s\"."
-msgstr ""
-
-#: src/nautilus-window-manage-views.c:1329
+#: src/nautilus-window-manage-views.c:1331
 msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1339
+#: src/nautilus-window-manage-views.c:1341
 msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1352
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1360
-msgid "The attempt to log in failed."
-msgstr ""
-
-#: src/nautilus-window-manage-views.c:1366
-msgid "Access was denied."
-msgstr ""
-
-#: src/nautilus-window-manage-views.c:1376
-#, c-format
-msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
-msgstr ""
-
-#: src/nautilus-window-manage-views.c:1379
-msgid ""
-"Check that the spelling is correct and that your proxy settings are correct."
-msgstr ""
-
-#: src/nautilus-window-manage-views.c:1386
+#: src/nautilus-window-manage-views.c:1388
 msgid "Check that your proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1391
+#: src/nautilus-window-manage-views.c:1393
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot contact the SMB master "
 "browser."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1394
+#: src/nautilus-window-manage-views.c:1396
 msgid "Check that an SMB server is running in the local network."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1404
+#: src/nautilus-window-manage-views.c:1406
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1407
+#: src/nautilus-window-manage-views.c:1409
 msgid ""
 "Be sure that you have started the Medusa search service, and if you don't "
 "have an index, that the Medusa indexer is running."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1409
+#: src/nautilus-window-manage-views.c:1411
 msgid "Searching Unavailable"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1414
+#: src/nautilus-window-manage-views.c:1416
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1416
+#: src/nautilus-window-manage-views.c:1418
 msgid "Please select another viewer and try again."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1420
-msgid "Can't Display Location"
-msgstr ""
-
 #: src/nautilus-window-menus.c:220
 msgid "Go to the location specified by this bookmark"
 msgstr ""
@@ -6317,7 +6219,7 @@ msgstr ""
 #.
 #: src/nautilus-window-menus.c:598 src/nautilus-window-menus.c:599
 msgid "Translator Credits"
-msgstr ""
+msgstr "Kaiwhakamori"
 
 #: src/nautilus-window-menus.c:604
 msgid ""
@@ -6333,36 +6235,34 @@ msgstr ""
 msgid "Go forward a number of pages"
 msgstr ""
 
-#: src/nautilus-window.c:874
+#: src/nautilus-window.c:882
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr ""
 
-#: src/nautilus-window.c:1578
+#: src/nautilus-window.c:1581
 msgid "Application ID"
-msgstr ""
+msgstr "Whakaaturanga Ahurei a Tautoto"
 
-#: src/nautilus-window.c:1579
+#: src/nautilus-window.c:1582
 msgid "The application ID of the window."
 msgstr ""
 
-#: src/nautilus-window.c:1585
+#: src/nautilus-window.c:1588
 msgid "Application"
-msgstr ""
+msgstr "Tautono"
 
-#: src/nautilus-window.c:1586
+#: src/nautilus-window.c:1589
 msgid "The NautilusApplication associated with this window."
 msgstr ""
 
 #: src/nautilus-zoom-control.c:83
-#, fuzzy
 msgid "Zoom In"
-msgstr "Tere _Roto"
+msgstr "Tere Roto"
 
 #: src/nautilus-zoom-control.c:84
-#, fuzzy
 msgid "Zoom Out"
-msgstr "Tere _Waho"
+msgstr "Tere Waho"
 
 #: src/nautilus-zoom-control.c:85
 #, fuzzy
@@ -6374,18 +6274,16 @@ msgid "Try to fit in window"
 msgstr ""
 
 #: src/nautilus-zoom-control.c:796
-#, fuzzy
 msgid "Zoom"
-msgstr "Tere _Roto"
+msgstr "Tere"
 
 #: src/nautilus-zoom-control.c:802
 msgid "Set the zoom level of the current view"
 msgstr ""
 
 #: src/network-scheme.desktop.in.h:1
-#, fuzzy
 msgid "Network Servers"
-msgstr "_Kōtuitui"
+msgstr "Ngā rorohiko tuku"
 
 #: src/network-scheme.desktop.in.h:2
 msgid "View your network servers in the Nautilus file manager"