Release 1.3.0Release130

1 files changed, 559 insertions, 629 deletions

diff --git a/po/mi.po b/po/mi.po
index 70f5a8f9e..f18862958 100644
--- a/po/mi.po
+++ b/po/mi.po
@@ -8,38 +8,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: epiphany 1.0.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-14 19:30+1300\n"
+"POT-Creation-Date: 2004-05-31 12:02+0200\n"
 "PO-Revision-Date: 2004-03-14 20:14+1300\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"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: data/GNOME_Epiphany_Automation.server.in.h:1
 msgid "Epiphany automation"
 msgstr ""
 
-#: data/GNOME_Epiphany_NautilusView.server.in.h:1
-msgid "Epiphany Nautilus view"
-msgstr ""
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:2
-msgid "Epiphany content view component"
-msgstr ""
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:3
-msgid "View as Web Page"
-msgstr ""
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:4
-msgid "Web Page"
-msgstr ""
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:5
-msgid "Web Page Viewer"
-msgstr ""
-
 #: data/bme.desktop.in.h:1
 msgid "Browse and organize your bookmarks"
 msgstr ""
@@ -545,7 +525,7 @@ msgid "MD5 Fingerprint:"
 msgstr ""
 
 #: data/glade/certificate-dialogs.glade.h:16
-#: embed/mozilla/GtkNSSDialogs.cpp:964
+#: embed/mozilla/GtkNSSDialogs.cpp:969
 msgid "Organization:"
 msgstr ""
 
@@ -590,8 +570,7 @@ msgstr ""
 msgid "Download Manager"
 msgstr ""
 
-#: data/glade/epiphany.glade.h:8 data/ui/nautilus-epiphany-view.xml.h:11
-#: src/ephy-window.c:951
+#: data/glade/epiphany.glade.h:8 src/ephy-window.c:1023
 msgid "Find"
 msgstr "Kitea"
 
@@ -607,7 +586,7 @@ msgstr ""
 msgid "Text Encoding"
 msgstr ""
 
-#: data/glade/epiphany.glade.h:12 src/ephy-encoding-menu.c:388
+#: data/glade/epiphany.glade.h:12 src/ephy-encoding-menu.c:368
 msgid "Use the encoding specified by the document"
 msgstr ""
 
@@ -621,7 +600,7 @@ msgstr "_Kitea"
 msgid "_Next"
 msgstr "_Hou"
 
-#: data/glade/epiphany.glade.h:15 embed/downloader-view.c:280
+#: data/glade/epiphany.glade.h:15 embed/downloader-view.c:279
 #, fuzzy
 msgid "_Pause"
 msgstr "_Whakapiri"
@@ -721,8 +700,9 @@ msgid "Fonts and Colors"
 msgstr ""
 
 #: data/glade/prefs-dialog.glade.h:24
-msgid "For _Language:"
-msgstr ""
+#, fuzzy
+msgid "For l_anguage:"
+msgstr "Reo"
 
 #: data/glade/prefs-dialog.glade.h:26
 msgid "Language"
@@ -757,7 +737,7 @@ msgid "_Add..."
 msgstr "Tāpiri..."
 
 #: data/glade/prefs-dialog.glade.h:34
-#: src/bookmarks/ephy-bookmark-properties.c:367
+#: src/bookmarks/ephy-bookmark-properties.c:371
 msgid "_Address:"
 msgstr "_Te Wāhi Noho:"
 
@@ -794,7 +774,7 @@ msgstr "_Whakakāhoretia"
 msgid "_Remove"
 msgstr "_Tangohia"
 
-#: data/glade/prefs-dialog.glade.h:43 src/ephy-window.c:191
+#: data/glade/prefs-dialog.glade.h:43 src/ephy-window.c:201
 msgid "_Up"
 msgstr "_Runga"
 
@@ -881,8 +861,7 @@ msgstr "Whārangi %u"
 msgid "Paper"
 msgstr "Whakapiri"
 
-#: data/glade/print.glade.h:23 data/ui/nautilus-epiphany-view.xml.h:23
-#: src/ephy-window.c:947
+#: data/glade/print.glade.h:23 src/ephy-window.c:1019
 msgid "Print"
 msgstr "Tā"
 
@@ -954,219 +933,62 @@ msgstr ""
 msgid "lpr"
 msgstr ""
 
-#: data/ui/nautilus-epiphany-view.xml.h:1
-msgid "Add Bookmark for Frame"
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:2
-msgid "Copy"
-msgstr "Tārua"
-
-#: data/ui/nautilus-epiphany-view.xml.h:3
-msgid "Copy Email Address"
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:4
-msgid "Copy Image Address"
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:5
-msgid "Copy Link Address"
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:6
-msgid "Copy Page Address"
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:7
-#, fuzzy
-msgid "Copy the Selection"
-msgstr "Tārua te whiringa"
-
-#: data/ui/nautilus-epiphany-view.xml.h:8
-msgid "Cut"
-msgstr "Kotia"
-
-#: data/ui/nautilus-epiphany-view.xml.h:9
-#, fuzzy
-msgid "Cut the Selection"
-msgstr "Kotia te whiringa"
-
-#: data/ui/nautilus-epiphany-view.xml.h:10
-#: embed/ephy-embed-popup-control.c:551
-msgid "Download Link"
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:12 src/ppview-toolbar.c:92
-#, fuzzy
-msgid "First"
-msgstr "Ngā Kōnae"
-
-#: data/ui/nautilus-epiphany-view.xml.h:13 src/ppview-toolbar.c:96
-#, fuzzy
-msgid "Last"
-msgstr "Whakapiri"
-
-#: data/ui/nautilus-epiphany-view.xml.h:14 src/ppview-toolbar.c:104
-msgid "Next"
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:15
-#, fuzzy
-msgid "Open Frame"
-msgstr "Huaki he kōnae"
-
-#: data/ui/nautilus-epiphany-view.xml.h:16
-msgid "Open Frame in New Window"
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:17
-#, fuzzy
-msgid "Open Image"
-msgstr "Huaki he kōnae"
-
-#: data/ui/nautilus-epiphany-view.xml.h:18
-msgid "Open Image in New Window"
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:19
-msgid "Open in New Window"
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:20
-msgid "Paste"
-msgstr "Whakapiri"
-
-#: data/ui/nautilus-epiphany-view.xml.h:21
-msgid "Paste the Clipboard"
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:22 src/ppview-toolbar.c:100
-msgid "Previous"
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:24
-msgid "Print the Current File"
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:25
-#, fuzzy
-msgid "Save Background As..."
-msgstr "P_urihia Pēneitia..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:26
-#, fuzzy
-msgid "Save Image As..."
-msgstr "P_urihia Pēneitia..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:27
-#, fuzzy
-msgid "Save Page As..."
-msgstr "P_urihia Pēneitia..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:28
-msgid "Search for a String"
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:29
-msgid "Select All"
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:30
-msgid "Select the Entire Document"
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:31
-msgid "Text _Encoding..."
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:32
-msgid "Use Image As Background"
-msgstr ""
-
-#: data/ui/nautilus-epiphany-view.xml.h:33
-#: src/bookmarks/ephy-bookmarks-editor.c:162 src/ephy-history-window.c:152
-#: src/ephy-window.c:77
-msgid "_Edit"
-msgstr "_Whakatika"
-
-#. Toplevel
-#: data/ui/nautilus-epiphany-view.xml.h:34
-#: src/bookmarks/ephy-bookmarks-editor.c:161 src/ephy-history-window.c:151
-#: src/ephy-window.c:76
-msgid "_File"
-msgstr "_Kōnae"
-
-#: data/ui/nautilus-epiphany-view.xml.h:35 src/ephy-window.c:134
-msgid "_Find..."
-msgstr "_Kitea..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:36 src/ephy-window.c:105
-msgid "_Print..."
-msgstr "_Tā..."
-
-#: embed/downloader-view.c:225
+#: embed/downloader-view.c:224
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr ""
 
-#: embed/downloader-view.c:229
+#: embed/downloader-view.c:228
 #, c-format
 msgid "%02u.%02u"
 msgstr ""
 
-#: embed/downloader-view.c:280
+#: embed/downloader-view.c:279
 #, fuzzy
 msgid "_Resume"
 msgstr "_Tangohia"
 
-#: embed/downloader-view.c:343 lib/widgets/ephy-cell-renderer-progress.c:35
-#: src/ephy-window.c:1132
+#. Translator hint: this is a label on progress bars inside a tree view.
+#.
+#: embed/downloader-view.c:342 lib/widgets/ephy-cell-renderer-progress.c:246
+#: lib/widgets/ephy-cell-renderer-progress.c:306 src/ephy-window.c:1204
 msgid "Unknown"
 msgstr ""
 
-#: embed/downloader-view.c:394
+#: embed/downloader-view.c:393
 #, c-format
 msgid "About %d second left"
-msgstr ""
+msgid_plural "About %d seconds left"
+msgstr[0] ""
+msgstr[1] ""
 
-#: embed/downloader-view.c:402
+#: embed/downloader-view.c:401
 #, c-format
 msgid "About %d minute left"
-msgstr ""
+msgid_plural "About %d minutes left"
+msgstr[0] ""
+msgstr[1] ""
 
-#: embed/downloader-view.c:409
+#: embed/downloader-view.c:408
 #, c-format
 msgid "%d download"
-msgstr ""
+msgid_plural "%d downloads"
+msgstr[0] ""
+msgstr[1] ""
 
-#: embed/downloader-view.c:515
+#: embed/downloader-view.c:514
 msgid "%"
 msgstr "%"
 
-#: embed/downloader-view.c:526
+#: embed/downloader-view.c:525 src/bookmarks/ephy-bookmarks-editor.c:668
 msgid "File"
 msgstr "Te Kōnae"
 
-#: embed/downloader-view.c:540
+#: embed/downloader-view.c:539
 #, fuzzy
 msgid "Remaining"
 msgstr "Kupu tūpato"
 
-#: embed/ephy-embed-popup-control.c:561 src/popup-commands.c:344
-#, fuzzy
-msgid "Save Image As"
-msgstr "P_urihia Pēneitia"
-
-#: embed/ephy-embed-popup-control.c:647
-#, fuzzy
-msgid "Save Page As"
-msgstr "P_urihia Pēneitia"
-
-#: embed/ephy-embed-popup-control.c:656 src/popup-commands.c:434
-msgid "Save Background As"
-msgstr ""
-
 #: embed/ephy-encodings.c:63
 msgid "Arabic (_IBM-864)"
 msgstr ""
@@ -1387,281 +1209,261 @@ msgstr ""
 msgid "Thai (TIS-_620)"
 msgstr ""
 
-#: embed/ephy-encodings.c:119
+#: embed/ephy-encodings.c:118
 msgid "Thai (IS_O-8859-11)"
 msgstr ""
 
-#: embed/ephy-encodings.c:120
+#: embed/ephy-encodings.c:119
 msgid "_Thai (Windows-874)"
 msgstr ""
 
-#: embed/ephy-encodings.c:122
+#: embed/ephy-encodings.c:120
 msgid "Turkish (_IBM-857)"
 msgstr ""
 
-#: embed/ephy-encodings.c:123
+#: embed/ephy-encodings.c:121
 msgid "Turkish (I_SO-8859-9)"
 msgstr ""
 
-#: embed/ephy-encodings.c:124
+#: embed/ephy-encodings.c:122
 msgid "Turkish (_MacTurkish)"
 msgstr ""
 
-#: embed/ephy-encodings.c:125
+#: embed/ephy-encodings.c:123
 msgid "Turkish (_Windows-1254)"
 msgstr ""
 
-#: embed/ephy-encodings.c:126
+#: embed/ephy-encodings.c:124
 #, fuzzy
 msgid "Unicode (UTF-_8)"
 msgstr "UTF-8 koremana"
 
-#: embed/ephy-encodings.c:127
+#: embed/ephy-encodings.c:125
 msgid "Cyrillic/Ukrainian (_KOI8-U)"
 msgstr ""
 
-#: embed/ephy-encodings.c:128
+#: embed/ephy-encodings.c:126
 msgid "Cyrillic/Ukrainian (Mac_Ukrainian)"
 msgstr ""
 
-#: embed/ephy-encodings.c:129
+#: embed/ephy-encodings.c:127
 msgid "Vietnamese (_TCVN)"
 msgstr ""
 
-#: embed/ephy-encodings.c:130
+#: embed/ephy-encodings.c:128
 msgid "Vietnamese (_VISCII)"
 msgstr ""
 
-#: embed/ephy-encodings.c:131
+#: embed/ephy-encodings.c:129
 msgid "Vietnamese (V_PS)"
 msgstr ""
 
-#: embed/ephy-encodings.c:132
+#: embed/ephy-encodings.c:130
 msgid "Vietnamese (_Windows-1258)"
 msgstr ""
 
-#: embed/ephy-encodings.c:133
+#: embed/ephy-encodings.c:131
 msgid "Western (_IBM-850)"
 msgstr ""
 
-#: embed/ephy-encodings.c:134
+#: embed/ephy-encodings.c:132
 msgid "Western (_ISO-8859-1)"
 msgstr ""
 
-#: embed/ephy-encodings.c:135
+#: embed/ephy-encodings.c:133
 msgid "Western (IS_O-8859-15)"
 msgstr ""
 
-#: embed/ephy-encodings.c:136
+#: embed/ephy-encodings.c:134
 msgid "Western (_MacRoman)"
 msgstr ""
 
-#: embed/ephy-encodings.c:137
+#: embed/ephy-encodings.c:135
 msgid "Western (_Windows-1252)"
 msgstr ""
 
 #. the following encodings are so rarely used that we don't want to pollute the "related"
 #. * part of the encodings menu with them, so we set the language group to 0 here
 #.
-#: embed/ephy-encodings.c:142
+#: embed/ephy-encodings.c:140
 msgid "English (_US-ASCII)"
 msgstr ""
 
-#: embed/ephy-encodings.c:143
+#: embed/ephy-encodings.c:141
 msgid "Unicode (UTF-_16 BE)"
 msgstr ""
 
-#: embed/ephy-encodings.c:144
+#: embed/ephy-encodings.c:142
 msgid "Unicode (UTF-1_6 LE)"
 msgstr ""
 
-#: embed/ephy-encodings.c:145
+#: embed/ephy-encodings.c:143
 msgid "Unicode (UTF-_32 BE)"
 msgstr ""
 
-#: embed/ephy-encodings.c:146
+#: embed/ephy-encodings.c:144
 msgid "Unicode (UTF-3_2 LE)"
 msgstr ""
 
-#: embed/ephy-encodings.c:148
+#: embed/ephy-encodings.c:146
 msgid "Off"
 msgstr ""
 
-#: embed/ephy-encodings.c:149 src/prefs-dialog.c:117
+#: embed/ephy-encodings.c:147 src/prefs-dialog.c:117
 msgid "Chinese"
 msgstr ""
 
-#: embed/ephy-encodings.c:150
+#: embed/ephy-encodings.c:148
 msgid "Chinese Simplified"
 msgstr ""
 
-#: embed/ephy-encodings.c:151
+#: embed/ephy-encodings.c:149
 msgid "Chinese Traditional"
 msgstr ""
 
-#: embed/ephy-encodings.c:152
+#: embed/ephy-encodings.c:150
 msgid "East Asian"
 msgstr ""
 
-#: embed/ephy-encodings.c:153 lib/ephy-langs.c:38 src/prefs-dialog.c:137
+#: embed/ephy-encodings.c:151 lib/ephy-langs.c:38 src/prefs-dialog.c:137
 msgid "Japanese"
 msgstr "Te reo Nipono"
 
-#: embed/ephy-encodings.c:154 lib/ephy-langs.c:39 src/prefs-dialog.c:138
+#: embed/ephy-encodings.c:152 lib/ephy-langs.c:39 src/prefs-dialog.c:138
 msgid "Korean"
 msgstr "Te reo Kōrea"
 
-#: embed/ephy-encodings.c:155 src/prefs-dialog.c:150
+#: embed/ephy-encodings.c:153 src/prefs-dialog.c:150
 msgid "Russian"
 msgstr ""
 
-#: embed/ephy-encodings.c:156
+#: embed/ephy-encodings.c:154
 msgid "Universal"
 msgstr ""
 
-#: embed/ephy-encodings.c:157 src/prefs-dialog.c:159
+#: embed/ephy-encodings.c:155 src/prefs-dialog.c:159
 msgid "Ukrainian"
 msgstr ""
 
 #. translators: this is the title that an unknown encoding will
 #. * be displayed as.
 #.
-#: embed/ephy-encodings.c:320
+#: embed/ephy-encodings.c:318
 #, c-format
 msgid "Unknown (%s)"
 msgstr ""
 
-#: embed/ephy-history.c:487 src/bookmarks/ephy-bookmarks.c:645
+#: embed/ephy-history.c:486 src/bookmarks/ephy-bookmarks.c:644
 msgid "All"
 msgstr ""
 
-#: embed/ephy-history.c:662
+#: embed/ephy-history.c:660
 msgid "Others"
 msgstr ""
 
-#: embed/ephy-history.c:668
+#: embed/ephy-history.c:666
 msgid "Local files"
 msgstr ""
 
-#: embed/mozilla/ContentHandler.cpp:134
-#: embed/mozilla/EphyHeaderSniffer.cpp:362
+#: embed/mozilla/ContentHandler.cpp:141
+#: embed/mozilla/EphyHeaderSniffer.cpp:348
 msgid "Save"
 msgstr "Pupuri"
 
-#: embed/mozilla/ContentHandler.cpp:265
-msgid "_Open"
-msgstr "_Huaki"
-
-#: embed/mozilla/ContentHandler.cpp:265
-#, fuzzy
-msgid "_Download"
-msgstr "Whakararo"
-
-#: embed/mozilla/ContentHandler.cpp:269
+#: embed/mozilla/ContentHandler.cpp:264
 #, fuzzy
 msgid "_Save As..."
 msgstr "P_urihia Pēneitia..."
 
-#: embed/mozilla/ContentHandler.cpp:286
+#: embed/mozilla/ContentHandler.cpp:281
 msgid "Download the unsafe file?"
 msgstr ""
 
-#: embed/mozilla/ContentHandler.cpp:287
+#: embed/mozilla/ContentHandler.cpp:282
 msgid ""
 "This type of file could potentially damage your documents or invade your "
 "privacy. It's not safe to open it directly. You can save it instead."
 msgstr ""
 
-#: embed/mozilla/ContentHandler.cpp:295
+#: embed/mozilla/ContentHandler.cpp:290
 msgid "Open the file in another application?"
 msgstr ""
 
-#: embed/mozilla/ContentHandler.cpp:296
+#: embed/mozilla/ContentHandler.cpp:291
 msgid ""
 "It's not possible to view this file type directly in the browser. You can "
 "open it with another application or save it."
 msgstr ""
 
-#: embed/mozilla/ContentHandler.cpp:303
+#: embed/mozilla/ContentHandler.cpp:298
 msgid "Download the file?"
 msgstr ""
 
-#: embed/mozilla/ContentHandler.cpp:304
+#: embed/mozilla/ContentHandler.cpp:299
 msgid ""
 "It's not possible to view this file because there is no application "
 "installed that can open it. You can save it instead."
 msgstr ""
 
-#: embed/mozilla/EphyHeaderSniffer.cpp:331
-#: src/bookmarks/ephy-bookmarks-import.c:252 src/ephy-toolbars-model.c:201
-#: src/window-commands.c:342
+#: embed/mozilla/EphyHeaderSniffer.cpp:315
+#: src/bookmarks/ephy-bookmarks-import.c:253 src/ephy-toolbars-model.c:205
+#: src/window-commands.c:343
 msgid "Untitled"
 msgstr "Ingoa kore"
 
-#: embed/mozilla/ExternalProtocolService.cpp:121
-msgid ""
-"Epiphany cannot handle this protocol,\n"
-"and no GNOME default handler is set"
-msgstr ""
-
-#: embed/mozilla/ExternalProtocolService.cpp:135
-msgid ""
-"The protocol specified is not recognised.\n"
-"\n"
-"Would you like to try the GNOME default?"
-msgstr ""
-
-#: embed/mozilla/FilePicker.cpp:163
+#: embed/mozilla/FilePicker.cpp:164 embed/print-dialog.c:302
+#: lib/ephy-file-chooser.c:376 src/bookmarks/ephy-bookmarks-editor.c:578
 msgid "All files"
 msgstr ""
 
-#: embed/mozilla/FilePicker.cpp:168
-msgid "HTML files"
+#: embed/mozilla/FilePicker.cpp:169 lib/ephy-file-chooser.c:360
+msgid "Web pages"
 msgstr ""
 
-#: embed/mozilla/FilePicker.cpp:173
+#: embed/mozilla/FilePicker.cpp:177
 msgid "Text files"
 msgstr ""
 
-#: embed/mozilla/FilePicker.cpp:178
-msgid "Image files"
-msgstr ""
+#: embed/mozilla/FilePicker.cpp:182 lib/ephy-file-chooser.c:368
+#, fuzzy
+msgid "Images"
+msgstr "Ngā whārangi"
 
-#: embed/mozilla/FilePicker.cpp:183
+#: embed/mozilla/FilePicker.cpp:190
 msgid "XML files"
 msgstr "Ngā kōnae XML"
 
-#: embed/mozilla/FilePicker.cpp:188
+#: embed/mozilla/FilePicker.cpp:195
 msgid "XUL files"
 msgstr "Ngā kōnae XUL"
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:185
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:156
 msgid "_Select Certificate"
 msgstr ""
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:224
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:195
 #, c-format
 msgid "Choose a certificate to present as identification to %s."
 msgstr ""
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:227
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:198
 msgid "Select a certificate to identify yourself."
 msgstr ""
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:277
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:230
 msgid "Certificate _Details"
 msgstr ""
 
 #. Add the buttons
-#: embed/mozilla/GtkNSSDialogs.cpp:222 embed/mozilla/GtkNSSDialogs.cpp:533
+#: embed/mozilla/GtkNSSDialogs.cpp:227 embed/mozilla/GtkNSSDialogs.cpp:538
 msgid "_View Certificate"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:230
+#: embed/mozilla/GtkNSSDialogs.cpp:235
 msgid "_Accept"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:294
+#: embed/mozilla/GtkNSSDialogs.cpp:299
 #, c-format
 msgid ""
 "The site %s returned security information for %s. It is possible that "
@@ -1669,56 +1471,56 @@ msgid ""
 "information."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:300
+#: embed/mozilla/GtkNSSDialogs.cpp:305
 #, c-format
 msgid "You should only accept the security information if you trust %s and %s."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:305
+#: embed/mozilla/GtkNSSDialogs.cpp:310
 msgid "Accept incorrect security information?"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:337
+#: embed/mozilla/GtkNSSDialogs.cpp:342
 #, c-format
 msgid ""
 "Your browser was unable to trust %s. It is possible that someone is "
 "intercepting your communication to obtain your confidential information."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:343
+#: embed/mozilla/GtkNSSDialogs.cpp:348
 #, c-format
 msgid ""
 "You should only connect to the site if you are certain you are connected to %"
 "s."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:348
+#: embed/mozilla/GtkNSSDialogs.cpp:353
 msgid "Connect to untrusted site?"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:352
+#: embed/mozilla/GtkNSSDialogs.cpp:357
 msgid "_Don't show this message again for this site"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:353
+#: embed/mozilla/GtkNSSDialogs.cpp:358
 #, fuzzy
 msgid "Co_nnect"
 msgstr "_Huri"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:414
+#: embed/mozilla/GtkNSSDialogs.cpp:419
 msgid "Accept expired security information?"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:415
+#: embed/mozilla/GtkNSSDialogs.cpp:420
 #, c-format
 msgid "The security information for %s expired on %s."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:421
+#: embed/mozilla/GtkNSSDialogs.cpp:426
 msgid "Accept not yet valid security information?"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:422
+#: embed/mozilla/GtkNSSDialogs.cpp:427
 #, c-format
 msgid "The security information for %s isn't valid until %s."
 msgstr ""
@@ -1726,169 +1528,174 @@ msgstr ""
 #. To translators: this a time format that is used while displaying the
 #. * expiry or start date of an SSL certificate, for the format see
 #. * strftime(3)
-#: embed/mozilla/GtkNSSDialogs.cpp:433
+#: embed/mozilla/GtkNSSDialogs.cpp:438
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:444
+#: embed/mozilla/GtkNSSDialogs.cpp:449
 msgid "You should ensure that your computer's time is correct."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:489
+#: embed/mozilla/GtkNSSDialogs.cpp:494
 #, c-format
 msgid "Cannot establish connection to %s."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:492
+#: embed/mozilla/GtkNSSDialogs.cpp:497
 #, c-format
 msgid "The certificate revocation list (CRL) from %s needs to be updated."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:497
+#: embed/mozilla/GtkNSSDialogs.cpp:502
 msgid "Please ask your system administrator for assistance."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:536
+#: embed/mozilla/GtkNSSDialogs.cpp:541
 msgid "_Trust CA"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:548
+#: embed/mozilla/GtkNSSDialogs.cpp:553
 #, c-format
 msgid "Trust %s to identify:"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:552
+#: embed/mozilla/GtkNSSDialogs.cpp:557
 msgid "Trust new Certificate Authority?"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:553
+#: embed/mozilla/GtkNSSDialogs.cpp:558
 msgid ""
 "Before trusting a Certificate Authority (CA) you should verify the "
 "certificate is authentic."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:563
+#: embed/mozilla/GtkNSSDialogs.cpp:568
 msgid "_Web sites"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:568
+#: embed/mozilla/GtkNSSDialogs.cpp:573
 msgid "_Software developers"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:634
+#: embed/mozilla/GtkNSSDialogs.cpp:639
 msgid "Certificate already exists."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:635
+#: embed/mozilla/GtkNSSDialogs.cpp:640
 msgid "The certificate has already been imported."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:754
+#: embed/mozilla/GtkNSSDialogs.cpp:759
 msgid "_Backup Certificate"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:761
+#: embed/mozilla/GtkNSSDialogs.cpp:766
 msgid "Select password."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:762
+#: embed/mozilla/GtkNSSDialogs.cpp:767
 msgid "Select a password to protect this certificate."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:774 embed/mozilla/GtkNSSDialogs.cpp:876
+#: embed/mozilla/GtkNSSDialogs.cpp:779 embed/mozilla/GtkNSSDialogs.cpp:881
 msgid "_Password:"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:788
+#: embed/mozilla/GtkNSSDialogs.cpp:793
 msgid "Con_firm password:"
 msgstr ""
 
 #. TODO: We need a better password quality meter
-#: embed/mozilla/GtkNSSDialogs.cpp:800
+#: embed/mozilla/GtkNSSDialogs.cpp:805
 msgid "Password quality:"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:857
+#: embed/mozilla/GtkNSSDialogs.cpp:862
 msgid "I_mport Certificate"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:865
+#: embed/mozilla/GtkNSSDialogs.cpp:870
 msgid "Password required."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:866
+#: embed/mozilla/GtkNSSDialogs.cpp:871
 msgid "Enter the password for this certificate."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:944
+#: embed/mozilla/GtkNSSDialogs.cpp:949
 msgid "Certificate Revocation list successfully imported."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:945
+#: embed/mozilla/GtkNSSDialogs.cpp:950
 msgid "Certificate Revocation list (CRL) imported:"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:967
+#: embed/mozilla/GtkNSSDialogs.cpp:972
 msgid "Unit:"
 msgstr "Te waeine:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:970
+#: embed/mozilla/GtkNSSDialogs.cpp:975
 msgid "Next Update:"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:997
+#: embed/mozilla/GtkNSSDialogs.cpp:1002
 msgid "Not part of certificate"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1265
+#: embed/mozilla/GtkNSSDialogs.cpp:1270
 #, fuzzy
 msgid "Certificate Properties"
 msgstr "Ngā _Āhuatanga"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1287
+#: embed/mozilla/GtkNSSDialogs.cpp:1292
 msgid "This certificate has been verified for the following uses:"
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1290
+#: embed/mozilla/GtkNSSDialogs.cpp:1295
 msgid "Could not verify this certificate because it has been revoked."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1293
+#: embed/mozilla/GtkNSSDialogs.cpp:1298
 msgid "Could not verify this certificate because it has expired."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1296
+#: embed/mozilla/GtkNSSDialogs.cpp:1301
 msgid "Could not verify this certificate because it is not trusted."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1299
+#: embed/mozilla/GtkNSSDialogs.cpp:1304
 msgid "Could not verify this certificate because the issuer is not trusted."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1302
+#: embed/mozilla/GtkNSSDialogs.cpp:1307
 msgid "Could not verify this certificate because the issuer is unknown."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1305
+#: embed/mozilla/GtkNSSDialogs.cpp:1310
 msgid ""
 "Could not verify this certificate because the CA certificate is invalid."
 msgstr ""
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1310
+#: embed/mozilla/GtkNSSDialogs.cpp:1315
 msgid "Could not verify this certificate for unknown reasons."
 msgstr ""
 
-#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:183
+#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:195
 msgid "Generating Private Key."
 msgstr ""
 
-#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:184
+#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:196
 msgid ""
 "Please wait while a new private key is generated. This process could take a "
 "few minutes."
 msgstr ""
 
-#: embed/mozilla/mozilla-embed-single.cpp:501
+#: embed/mozilla/MozDownload.cpp:591
+#, fuzzy
+msgid "Files"
+msgstr "Te Kōnae"
+
+#: embed/mozilla/mozilla-embed-single.cpp:491
 msgid ""
 "Epiphany can't be used now. Mozilla initialization failed. Check your "
 "MOZILLA_FIVE_HOME environmental variable."
@@ -1905,80 +1712,83 @@ msgstr ""
 #. * "zh_CN" translation: "zh-cn,zh"
 #. * "zh_HK" translation: "zh-hk,zh" or maybe "zh-hk,zh-tw,zh"
 #.
-#: embed/mozilla/mozilla-notifiers.cpp:737
+#: embed/mozilla/mozilla-notifiers.cpp:736
 msgid "system-language"
 msgstr "mi-nz,mi"
 
-#: embed/print-dialog.c:289
+#: embed/print-dialog.c:294
 #, fuzzy
 msgid "Print to"
 msgstr "Tā"
 
-#: lib/eel-gconf-extensions.c:82
-#, c-format
-msgid ""
-"GConf error:\n"
-"  %s"
+#: embed/print-dialog.c:299
+msgid "Postscript files"
 msgstr ""
 
-#: lib/eel-gconf-extensions.c:86
+#: lib/eel-gconf-extensions.c:81
 #, c-format
 msgid ""
 "GConf error:\n"
-"  %s\n"
-"All further errors shown only on terminal"
+"  %s"
 msgstr ""
 
-#: lib/eel-gconf-extensions.c:90
-#, fuzzy
-msgid "GConf Error"
-msgstr "Pōhēhē"
-
 #: lib/egg/egg-editable-toolbar.c:512
 #, fuzzy
 msgid "_Remove Toolbar"
 msgstr "_Tangohia"
 
-#: lib/egg/egg-toolbar-editor.c:559
+#: lib/egg/egg-toolbar-editor.c:563
 msgid "Separator"
 msgstr ""
 
-#: lib/egg/egg-toolbar-editor.c:589
+#: lib/egg/egg-toolbar-editor.c:593
 msgid ""
 "Drag an item onto the toolbars above to add it, from the toolbars in the "
 "items table to remove it."
 msgstr ""
 
+#: lib/ephy-file-chooser.c:349
+msgid "All supported types"
+msgstr ""
+
 #. The name of the default downloads folder
-#: lib/ephy-file-helpers.c:75 src/prefs-dialog.c:1107
+#: lib/ephy-file-helpers.c:79 src/prefs-dialog.c:1108
 msgid "Downloads"
 msgstr ""
 
-#: lib/ephy-file-helpers.c:164
+#: lib/ephy-file-helpers.c:168
 #, c-format
 msgid "Failed to find %s"
 msgstr ""
 
-#: lib/ephy-file-helpers.c:229
+#: lib/ephy-file-helpers.c:233
 #, c-format
 msgid "%s exists, please move it out of the way."
 msgstr ""
 
-#: lib/ephy-file-helpers.c:232
+#: lib/ephy-file-helpers.c:236
 #, c-format
 msgid "Failed to create directory %s."
 msgstr ""
 
-#: lib/ephy-gui.c:90
+#: lib/ephy-gui.c:96
 #, c-format
-msgid ""
-"File %s will be overwritten.\n"
-"If you choose yes, the contents will be lost.\n"
-"\n"
-"Do you want to continue?"
+msgid "A file %s already exists."
+msgstr ""
+
+#: lib/ephy-gui.c:100
+msgid "If you choose to overwrite this file, the contents will be lost."
+msgstr ""
+
+#: lib/ephy-gui.c:103
+msgid "Overwrite File"
+msgstr ""
+
+#: lib/ephy-gui.c:108
+msgid "_Overwrite"
 msgstr ""
 
-#: lib/ephy-gui.c:121
+#: lib/ephy-gui.c:153
 #, c-format
 msgid "Could not display help: %s"
 msgstr ""
@@ -2028,23 +1838,51 @@ msgstr ""
 msgid "Traditional Chinese"
 msgstr ""
 
-#: lib/ephy-langs.c:45
+#: lib/ephy-langs.c:44
 msgid "Traditional Chinese (Hong Kong)"
 msgstr ""
 
-#: lib/ephy-langs.c:47 src/prefs-dialog.c:158
+#: lib/ephy-langs.c:45 src/prefs-dialog.c:158
 msgid "Turkish"
 msgstr ""
 
-#: lib/ephy-langs.c:48
+#: lib/ephy-langs.c:46
 msgid "Unicode"
 msgstr ""
 
-#: lib/ephy-langs.c:49
+#: lib/ephy-langs.c:47
 #, fuzzy
 msgid "Western"
 msgstr "Nanahi"
 
+#: lib/ephy-stock-icons.c:54
+#, fuzzy
+msgid "Secure"
+msgstr "Mata"
+
+#: lib/ephy-stock-icons.c:55 src/ephy-window.c:1207
+#, fuzzy
+msgid "Insecure"
+msgstr "_Kuhu"
+
+#: lib/ephy-stock-icons.c:56 src/ephy-history-window.c:1192
+msgid "History"
+msgstr ""
+
+#: lib/ephy-stock-icons.c:57 src/bookmarks/ephy-bookmarks-editor.c:1394
+#: src/bookmarks/ephy-topic-action.c:597 src/ephy-window.c:1025
+msgid "Bookmarks"
+msgstr ""
+
+#: lib/ephy-stock-icons.c:58 src/toolbar.c:411
+msgid "Address Entry"
+msgstr ""
+
+#: lib/ephy-stock-icons.c:59
+#, fuzzy
+msgid "_Download"
+msgstr "Whakararo"
+
 #: lib/ephy-zoom.h:41
 msgid "50%"
 msgstr "50%"
@@ -2081,43 +1919,64 @@ msgstr "300%"
 msgid "400%"
 msgstr "400%"
 
-#: lib/widgets/ephy-cell-renderer-progress.c:98
+#. Translator hint: this is a label on progress bars inside a tree view.
+#.
+#: lib/widgets/ephy-cell-renderer-progress.c:242
 #, fuzzy
 msgid "Failed"
 msgstr "_Kōnae"
 
+#. Translator hint: this is the default label on progress bars
+#. * inside a tree view. %d will be replaced by the percentage
+#.
+#: lib/widgets/ephy-cell-renderer-progress.c:251
+#, c-format
+msgid "%d %%"
+msgstr ""
+
 #: src/bookmarks/ephy-bookmark-action.c:248
 #, c-format
 msgid "%s:"
 msgstr ""
 
-#: src/bookmarks/ephy-bookmark-properties.c:229
+#: src/bookmarks/ephy-bookmark-properties.c:230
 #, c-format
 msgid "%s Properties"
 msgstr "Ngā Āhuatanga %s"
 
-#: src/bookmarks/ephy-bookmark-properties.c:348
-#: src/bookmarks/ephy-new-bookmark.c:215
+#: src/bookmarks/ephy-bookmark-properties.c:352
+#: src/bookmarks/ephy-new-bookmark.c:216
 #, fuzzy
 msgid "_Title:"
 msgstr "_Kōnae"
 
-#: src/bookmarks/ephy-bookmark-properties.c:390
-#: src/bookmarks/ephy-new-bookmark.c:238
+#: src/bookmarks/ephy-bookmark-properties.c:394
+#: src/bookmarks/ephy-new-bookmark.c:239
 msgid "To_pics:"
 msgstr "Ngā _Kaupapa:"
 
-#: src/bookmarks/ephy-bookmark-properties.c:399
+#: src/bookmarks/ephy-bookmark-properties.c:403
 msgid "_Show in bookmarks bar"
 msgstr ""
 
+#. Toplevel
+#: src/bookmarks/ephy-bookmarks-editor.c:161 src/ephy-history-window.c:151
+#: src/ephy-window.c:83
+msgid "_File"
+msgstr "_Kōnae"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:162 src/ephy-history-window.c:152
+#: src/ephy-window.c:84
+msgid "_Edit"
+msgstr "_Whakatika"
+
 #: src/bookmarks/ephy-bookmarks-editor.c:163 src/ephy-history-window.c:153
-#: src/ephy-window.c:78
+#: src/ephy-window.c:85
 msgid "_View"
 msgstr "_Titiro"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:164 src/ephy-history-window.c:154
-#: src/ephy-window.c:83
+#: src/ephy-window.c:90
 msgid "_Help"
 msgstr "_Āwhina"
 
@@ -2132,7 +1991,7 @@ msgstr ""
 
 #. File Menu
 #: src/bookmarks/ephy-bookmarks-editor.c:171
-#: src/bookmarks/ephy-bookmarks-editor.c:977 src/ephy-history-window.c:158
+#: src/bookmarks/ephy-bookmarks-editor.c:1017 src/ephy-history-window.c:158
 #: src/ephy-history-window.c:738
 msgid "_Open in New Window"
 msgstr ""
@@ -2142,7 +2001,7 @@ msgid "Open the selected bookmark in a new window"
 msgstr ""
 
 #: src/bookmarks/ephy-bookmarks-editor.c:174
-#: src/bookmarks/ephy-bookmarks-editor.c:978 src/ephy-history-window.c:161
+#: src/bookmarks/ephy-bookmarks-editor.c:1018 src/ephy-history-window.c:161
 #: src/ephy-history-window.c:739
 msgid "Open in New _Tab"
 msgstr ""
@@ -2185,7 +2044,7 @@ msgid "Import bookmarks from another browser or a bookmarks file"
 msgstr ""
 
 #: src/bookmarks/ephy-bookmarks-editor.c:188 src/ephy-history-window.c:170
-#: src/ephy-window.c:111
+#: src/ephy-window.c:121
 msgid "_Close"
 msgstr "_Kati"
 
@@ -2195,28 +2054,28 @@ msgstr ""
 
 #. Edit Menu
 #: src/bookmarks/ephy-bookmarks-editor.c:193 src/ephy-history-window.c:175
-#: src/ephy-window.c:122
+#: src/ephy-window.c:132
 msgid "Cu_t"
 msgstr "K_otia"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:194 src/ephy-history-window.c:176
-#: src/ephy-window.c:123
+#: src/ephy-window.c:133
 msgid "Cut the selection"
 msgstr "Kotia te whiringa"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:196
-#: src/bookmarks/ephy-bookmarks-editor.c:987 src/ephy-history-window.c:178
-#: src/ephy-history-window.c:748 src/ephy-window.c:125
+#: src/bookmarks/ephy-bookmarks-editor.c:1027 src/ephy-history-window.c:178
+#: src/ephy-history-window.c:748 src/ephy-window.c:135
 msgid "_Copy"
 msgstr "_Tārua"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:197 src/ephy-history-window.c:179
-#: src/ephy-window.c:126
+#: src/ephy-window.c:136
 msgid "Copy the selection"
 msgstr "Tārua te whiringa"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:199 src/ephy-history-window.c:181
-#: src/ephy-window.c:128
+#: src/ephy-window.c:138
 msgid "_Paste"
 msgstr "_Whakapiri"
 
@@ -2225,7 +2084,7 @@ msgid "Paste the clipboard"
 msgstr ""
 
 #: src/bookmarks/ephy-bookmarks-editor.c:202 src/ephy-history-window.c:184
-#: src/ephy-window.c:131
+#: src/ephy-window.c:141
 msgid "Select _All"
 msgstr ""
 
@@ -2234,9 +2093,8 @@ msgid "Select all bookmarks or text"
 msgstr ""
 
 #. Help Menu
-#. Help menu
 #: src/bookmarks/ephy-bookmarks-editor.c:207 src/ephy-history-window.c:192
-#: src/ephy-window.c:222
+#: src/ephy-window.c:232
 #, fuzzy
 msgid "_Contents"
 msgstr "_Huri"
@@ -2246,12 +2104,12 @@ msgid "Display bookmarks help"
 msgstr ""
 
 #: src/bookmarks/ephy-bookmarks-editor.c:210 src/ephy-history-window.c:195
-#: src/ephy-window.c:225
+#: src/ephy-window.c:235
 msgid "_About"
 msgstr "_Mo"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:211 src/ephy-history-window.c:196
-#: src/ephy-window.c:226
+#: src/ephy-window.c:236
 msgid "Display credits for the web browser creators"
 msgstr ""
 
@@ -2286,70 +2144,81 @@ msgstr ""
 msgid "Type a topic"
 msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:547
+#: src/bookmarks/ephy-bookmarks-editor.c:559
 msgid "Import bookmarks from file"
 msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:580
+#: src/bookmarks/ephy-bookmarks-editor.c:566
+msgid "Firefox/Firebird/Mozilla bookmarks"
+msgstr ""
+
+#: src/bookmarks/ephy-bookmarks-editor.c:570
+msgid "Galeon/Konqueror bookmarks"
+msgstr ""
+
+#: src/bookmarks/ephy-bookmarks-editor.c:574
+msgid "Epiphany bookmarks"
+msgstr ""
+
+#: src/bookmarks/ephy-bookmarks-editor.c:613
 msgid "Import Bookmarks"
 msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:600
-msgid "Choose the bookmarks source:"
+#: src/bookmarks/ephy-bookmarks-editor.c:619
+msgid "I_mport"
 msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:618
-msgid "Mozilla bookmarks"
+#: src/bookmarks/ephy-bookmarks-editor.c:633
+msgid "Import bookmarks from:"
 msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:620
-msgid "Firebird bookmarks"
+#: src/bookmarks/ephy-bookmarks-editor.c:656
+msgid "Firebird"
 msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:622
-msgid "Galeon bookmarks"
+#: src/bookmarks/ephy-bookmarks-editor.c:658
+msgid "Firefox"
 msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:624
-msgid "Konqueror bookmarks"
+#: src/bookmarks/ephy-bookmarks-editor.c:660
+msgid "Galeon"
 msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:628
-msgid "Import from a file"
+#: src/bookmarks/ephy-bookmarks-editor.c:662
+msgid "Konqueror"
 msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:972 src/ephy-history-window.c:733
+#: src/bookmarks/ephy-bookmarks-editor.c:664
+msgid "Mozilla"
+msgstr ""
+
+#: src/bookmarks/ephy-bookmarks-editor.c:1012 src/ephy-history-window.c:733
 msgid "_Open in New Windows"
 msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:973 src/ephy-history-window.c:734
+#: src/bookmarks/ephy-bookmarks-editor.c:1013 src/ephy-history-window.c:734
 msgid "Open in New _Tabs"
 msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:983 src/ephy-history-window.c:744
+#: src/bookmarks/ephy-bookmarks-editor.c:1023 src/ephy-history-window.c:744
 msgid "_Copy Address"
 msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1224 src/ephy-history-window.c:1038
+#: src/bookmarks/ephy-bookmarks-editor.c:1264 src/ephy-history-window.c:1038
 msgid "_Search:"
 msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1354
-#: src/bookmarks/ephy-topic-action.c:597 src/ephy-window.c:953
-msgid "Bookmarks"
-msgstr ""
-
-#: src/bookmarks/ephy-bookmarks-editor.c:1437
+#: src/bookmarks/ephy-bookmarks-editor.c:1477
 #, fuzzy
 msgid "Topics"
 msgstr "_Tihi"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1499 src/ephy-history-window.c:1318
+#: src/bookmarks/ephy-bookmarks-editor.c:1539 src/ephy-history-window.c:1318
 #, fuzzy
 msgid "Title"
 msgstr "Ngā Kōnae"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1506 src/ephy-history-window.c:1324
+#: src/bookmarks/ephy-bookmarks-editor.c:1546 src/ephy-history-window.c:1324
 msgid "Address"
 msgstr ""
 
@@ -2392,15 +2261,15 @@ msgstr "Pupuri"
 msgid "Work"
 msgstr ""
 
-#: src/bookmarks/ephy-bookmarks.c:680
+#: src/bookmarks/ephy-bookmarks.c:677
 msgid "Most Visited"
 msgstr ""
 
-#: src/bookmarks/ephy-bookmarks.c:697
+#: src/bookmarks/ephy-bookmarks.c:693
 msgid "Not Categorized"
 msgstr ""
 
-#: src/bookmarks/ephy-new-bookmark.c:261
+#: src/bookmarks/ephy-new-bookmark.c:262
 msgid "Add Bookmark"
 msgstr ""
 
@@ -2408,11 +2277,11 @@ msgstr ""
 #. * but it doesn't support markup of text yet
 #. * so we build our own. See bug 65501.
 #.
-#: src/bookmarks/ephy-new-bookmark.c:306
+#: src/bookmarks/ephy-new-bookmark.c:307
 msgid "Duplicated Bookmark"
 msgstr ""
 
-#: src/bookmarks/ephy-new-bookmark.c:336
+#: src/bookmarks/ephy-new-bookmark.c:337
 #, c-format
 msgid "A bookmark titled %s already exists for this page."
 msgstr ""
@@ -2422,24 +2291,24 @@ msgstr ""
 msgid "Empty"
 msgstr "Tuhera kau"
 
-#: src/ephy-encoding-dialog.c:330
+#: src/ephy-encoding-dialog.c:315
 msgid "Encodings"
 msgstr ""
 
-#: src/ephy-encoding-menu.c:379
+#: src/ephy-encoding-menu.c:359
 #, fuzzy
 msgid "_Other..."
 msgstr "_Huaki..."
 
-#: src/ephy-encoding-menu.c:380
+#: src/ephy-encoding-menu.c:360
 msgid "Other encodings"
 msgstr ""
 
-#: src/ephy-encoding-menu.c:387
+#: src/ephy-encoding-menu.c:367
 msgid "_Automatic"
 msgstr ""
 
-#: src/ephy-go-action.c:73 src/toolbar.c:409
+#: src/ephy-go-action.c:73 src/toolbar.c:445
 msgid "Go"
 msgstr ""
 
@@ -2496,16 +2365,16 @@ msgstr ""
 msgid "Clear History"
 msgstr ""
 
-#: src/ephy-history-window.c:278
+#: src/ephy-history-window.c:276
 #, fuzzy
 msgid "C_lear"
 msgstr "_Whakawātea"
 
-#: src/ephy-history-window.c:301
+#: src/ephy-history-window.c:300
 msgid "Clear browsing history?"
 msgstr ""
 
-#: src/ephy-history-window.c:308
+#: src/ephy-history-window.c:307
 msgid ""
 "Clearing the browsing history will cause all history links to be permanently "
 "deleted."
@@ -2520,11 +2389,9 @@ msgstr "Ākuni"
 #: src/ephy-history-window.c:1055
 #, c-format
 msgid "Last %d day"
-msgstr ""
-
-#: src/ephy-history-window.c:1192
-msgid "History"
-msgstr ""
+msgid_plural "Last %d days"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/ephy-history-window.c:1264
 #, fuzzy
@@ -2576,578 +2443,565 @@ msgstr ""
 msgid "Ephy"
 msgstr "Tuhera kau"
 
-#: src/ephy-session.c:301
+#: src/ephy-session.c:367
 msgid "Crash Recovery"
 msgstr ""
 
-#: src/ephy-session.c:303
+#: src/ephy-session.c:369
 msgid "_Don't Recover"
 msgstr ""
 
-#: src/ephy-session.c:304
+#: src/ephy-session.c:370
 #, fuzzy
 msgid "_Recover"
 msgstr "_Tangohia"
 
-#: src/ephy-session.c:335
+#: src/ephy-session.c:401
 msgid ""
 "Epiphany appears to have crashed or been killed the last time it was run."
 msgstr ""
 
-#: src/ephy-session.c:341
+#: src/ephy-session.c:407
 msgid "You can recover the opened tabs and windows."
 msgstr ""
 
-#: src/ephy-shell.c:357
+#: src/ephy-shell.c:345
 msgid ""
 "Bonobo couldn't locate the GNOME_Epiphany_Automation.server file. You can "
 "use bonobo-activation-sysconf to configure the search path for bonobo server "
 "files."
 msgstr ""
 
-#: src/ephy-shell.c:364
+#: src/ephy-shell.c:352
 msgid ""
 "Epiphany can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the automation server"
 msgstr ""
 
-#: src/ephy-shell.c:387
+#: src/ephy-shell.c:375
 msgid ""
 "Epiphany can't be used now, due to an unexpected error from Bonobo when "
 "attempting to locate the automation object."
 msgstr ""
 
-#: src/ephy-tab.c:367 src/ephy-tab.c:1200 src/ephy-tab.c:1370
+#: src/ephy-tab.c:358 src/ephy-tab.c:1243 src/ephy-tab.c:1452
 msgid "Blank page"
 msgstr ""
 
-#: src/ephy-tab.c:772
+#: src/ephy-tab.c:798
 #, fuzzy
 msgid "site"
 msgstr "Whakapiri"
 
-#: src/ephy-tab.c:796
+#: src/ephy-tab.c:822
 #, c-format
 msgid "Redirecting to %s..."
 msgstr ""
 
-#: src/ephy-tab.c:800
+#: src/ephy-tab.c:826
 #, c-format
 msgid "Transferring data from %s..."
 msgstr ""
 
-#: src/ephy-tab.c:804
+#: src/ephy-tab.c:830
 #, c-format
 msgid "Waiting for authorization from %s..."
 msgstr ""
 
-#: src/ephy-tab.c:812
+#: src/ephy-tab.c:838
 #, c-format
 msgid "Loading %s..."
 msgstr ""
 
-#: src/ephy-window.c:79
+#: src/ephy-window.c:86
 msgid "_Bookmarks"
 msgstr ""
 
-#: src/ephy-window.c:80
+#: src/ephy-window.c:87
 #, fuzzy
 msgid "_Go"
 msgstr "_Kāo"
 
-#: src/ephy-window.c:81
+#: src/ephy-window.c:88
 msgid "T_ools"
 msgstr "Ngā _Pāraha"
 
-#: src/ephy-window.c:82
+#: src/ephy-window.c:89
 msgid "_Tabs"
 msgstr ""
 
 #. File menu
-#: src/ephy-window.c:87
+#: src/ephy-window.c:94
 #, fuzzy
 msgid "_New Window"
 msgstr "Matapihi"
 
-#: src/ephy-window.c:88
+#: src/ephy-window.c:95
 msgid "Open a new window"
 msgstr ""
 
-#: src/ephy-window.c:90
+#: src/ephy-window.c:97
 msgid "New _Tab"
 msgstr ""
 
-#: src/ephy-window.c:91
+#: src/ephy-window.c:98
 #, fuzzy
 msgid "Open a new tab"
 msgstr "Huaki he kōnae"
 
-#: src/ephy-window.c:93
+#: src/ephy-window.c:100
 msgid "_Open..."
 msgstr "_Huaki..."
 
-#: src/ephy-window.c:94
+#: src/ephy-window.c:101
 msgid "Open a file"
 msgstr "Huaki he kōnae"
 
-#: src/ephy-window.c:96
+#: src/ephy-window.c:103 src/ephy-window.c:106
 msgid "Save _As..."
 msgstr "P_urihia Pēneitia..."
 
-#: src/ephy-window.c:97
+#: src/ephy-window.c:104 src/ephy-window.c:107
 msgid "Save the current page"
 msgstr ""
 
-#: src/ephy-window.c:99
+#: src/ephy-window.c:109
 #, fuzzy
 msgid "Print Set_up..."
 msgstr "T_iro Tānga..."
 
-#: src/ephy-window.c:100
+#: src/ephy-window.c:110
 msgid "Setup the page settings for printing"
 msgstr ""
 
-#: src/ephy-window.c:102
+#: src/ephy-window.c:112
 msgid "Print Pre_view"
 msgstr "T_iro Tānga"
 
-#: src/ephy-window.c:103
+#: src/ephy-window.c:113
 msgid "Print preview"
 msgstr "Tiro tānga"
 
-#: src/ephy-window.c:106
+#: src/ephy-window.c:115
+msgid "_Print..."
+msgstr "_Tā..."
+
+#: src/ephy-window.c:116
 msgid "Print the current page"
 msgstr ""
 
-#: src/ephy-window.c:108
+#: src/ephy-window.c:118
 #, fuzzy
 msgid "S_end To..."
 msgstr "_Huaki..."
 
-#: src/ephy-window.c:109
+#: src/ephy-window.c:119
 msgid "Send a link of the current page"
 msgstr ""
 
-#: src/ephy-window.c:112
+#: src/ephy-window.c:122
 msgid "Close this window"
 msgstr ""
 
 #. Edit menu
-#: src/ephy-window.c:116
+#: src/ephy-window.c:126
 msgid "_Undo"
 msgstr "_Whakakore"
 
-#: src/ephy-window.c:117
+#: src/ephy-window.c:127
 msgid "Undo the last action"
 msgstr "Whakakore te mahi toenga"
 
-#: src/ephy-window.c:119
+#: src/ephy-window.c:129
 msgid "Re_do"
 msgstr "_Mahi Anō"
 
-#: src/ephy-window.c:120
+#: src/ephy-window.c:130
 #, fuzzy
 msgid "Redo the last undone action"
 msgstr "Whakakore te mahi toenga"
 
-#: src/ephy-window.c:129
+#: src/ephy-window.c:139
 msgid "Paste clipboard"
 msgstr ""
 
-#: src/ephy-window.c:132
+#: src/ephy-window.c:142
 msgid "Select the entire page"
 msgstr ""
 
-#: src/ephy-window.c:135
+#: src/ephy-window.c:144
+msgid "_Find..."
+msgstr "_Kitea..."
+
+#: src/ephy-window.c:145
 msgid "Find a word or phrase in the page"
 msgstr ""
 
-#: src/ephy-window.c:137
+#: src/ephy-window.c:147
 msgid "Find Ne_xt"
 msgstr ""
 
-#: src/ephy-window.c:138
+#: src/ephy-window.c:148
 msgid "Find next occurrence of the word or phrase"
 msgstr ""
 
-#: src/ephy-window.c:140
+#: src/ephy-window.c:150
 #, fuzzy
 msgid "Find Pre_vious"
 msgstr "T_iro Tānga"
 
-#: src/ephy-window.c:141
+#: src/ephy-window.c:151
 msgid "Find previous occurrence of the word or phrase"
 msgstr ""
 
-#: src/ephy-window.c:143
+#: src/ephy-window.c:153
 msgid "P_ersonal Data"
 msgstr ""
 
-#: src/ephy-window.c:144
+#: src/ephy-window.c:154
 msgid "View and remove cookies and passwords"
 msgstr ""
 
-#: src/ephy-window.c:146
+#: src/ephy-window.c:156
 msgid "T_oolbars"
 msgstr ""
 
-#: src/ephy-window.c:147
+#: src/ephy-window.c:157
 msgid "Customize toolbars"
 msgstr ""
 
-#: src/ephy-window.c:149
+#: src/ephy-window.c:159
 msgid "P_references"
 msgstr "Ngā _tina hiahia"
 
-#: src/ephy-window.c:150
+#: src/ephy-window.c:160
 msgid "Configure the web browser"
 msgstr ""
 
 #. View menu
-#: src/ephy-window.c:154
+#: src/ephy-window.c:164
 msgid "_Stop"
 msgstr "Whaka_mutua"
 
-#: src/ephy-window.c:155
+#: src/ephy-window.c:165
 msgid "Stop current data transfer"
 msgstr ""
 
-#: src/ephy-window.c:157
+#: src/ephy-window.c:167
 #, fuzzy
 msgid "_Reload"
 msgstr "_Mahi Anō"
 
-#: src/ephy-window.c:158
+#: src/ephy-window.c:168
 msgid "Display the latest content of the current page"
 msgstr ""
 
-#: src/ephy-window.c:160
+#: src/ephy-window.c:170
 msgid "Zoom _In"
 msgstr "Tere _Roto"
 
-#: src/ephy-window.c:161
+#: src/ephy-window.c:171
 msgid "Increase the text size"
 msgstr ""
 
-#: src/ephy-window.c:163
+#: src/ephy-window.c:173
 msgid "Zoom _Out"
 msgstr "Tere _Waho"
 
-#: src/ephy-window.c:164
+#: src/ephy-window.c:174
 msgid "Decrease the text size"
 msgstr ""
 
-#: src/ephy-window.c:166
+#: src/ephy-window.c:176
 msgid "_Normal Size"
 msgstr ""
 
-#: src/ephy-window.c:167
+#: src/ephy-window.c:177
 msgid "Use the normal text size"
 msgstr ""
 
-#: src/ephy-window.c:169
+#: src/ephy-window.c:179
 msgid "Text _Encoding"
 msgstr ""
 
-#: src/ephy-window.c:170
+#: src/ephy-window.c:180
 msgid "Change the text encoding"
 msgstr ""
 
-#: src/ephy-window.c:172
+#: src/ephy-window.c:182
 #, fuzzy
 msgid "_Page Source"
 msgstr "Whārangi %u"
 
-#: src/ephy-window.c:173
+#: src/ephy-window.c:183
 msgid "View the source code of the page"
 msgstr ""
 
 #. Bookmarks menu
-#: src/ephy-window.c:177
+#: src/ephy-window.c:187
 msgid "_Add Bookmark..."
 msgstr ""
 
-#: src/ephy-window.c:178 src/ephy-window.c:257
+#: src/ephy-window.c:188 src/ephy-window.c:267
 msgid "Add a bookmark for the current page"
 msgstr ""
 
-#: src/ephy-window.c:180
+#: src/ephy-window.c:190
 msgid "_Edit Bookmarks"
 msgstr ""
 
-#: src/ephy-window.c:181
+#: src/ephy-window.c:191
 msgid "Open the bookmarks window"
 msgstr ""
 
 #. Go menu
-#: src/ephy-window.c:185
+#: src/ephy-window.c:195
 msgid "_Back"
 msgstr "Whakamuri"
 
-#: src/ephy-window.c:186
+#: src/ephy-window.c:196
 msgid "Go to the previous visited page"
 msgstr ""
 
-#: src/ephy-window.c:188
+#: src/ephy-window.c:198
 msgid "_Forward"
 msgstr "_Whakamua"
 
-#: src/ephy-window.c:189
+#: src/ephy-window.c:199
 msgid "Go to the next visited page"
 msgstr ""
 
-#: src/ephy-window.c:192
+#: src/ephy-window.c:202
 msgid "Go up one level"
 msgstr ""
 
-#: src/ephy-window.c:194
+#: src/ephy-window.c:204
 msgid "_Home"
 msgstr "_Kāinga"
 
-#: src/ephy-window.c:195
+#: src/ephy-window.c:205
 msgid "Go to the home page"
 msgstr ""
 
-#: src/ephy-window.c:197
+#: src/ephy-window.c:207
 #, fuzzy
 msgid "_Location..."
 msgstr "_Kitea..."
 
-#: src/ephy-window.c:198
+#: src/ephy-window.c:208
 msgid "Go to a specified location"
 msgstr ""
 
-#: src/ephy-window.c:200
+#: src/ephy-window.c:210
 msgid "H_istory"
 msgstr ""
 
-#: src/ephy-window.c:201
+#: src/ephy-window.c:211
 msgid "Open the history window"
 msgstr ""
 
 #. Tabs menu
-#: src/ephy-window.c:205
+#: src/ephy-window.c:215
 msgid "_Previous Tab"
 msgstr ""
 
-#: src/ephy-window.c:206
+#: src/ephy-window.c:216
 msgid "Activate previous tab"
 msgstr ""
 
-#: src/ephy-window.c:208
+#: src/ephy-window.c:218
 msgid "_Next Tab"
 msgstr ""
 
-#: src/ephy-window.c:209
+#: src/ephy-window.c:219
 msgid "Activate next tab"
 msgstr ""
 
-#: src/ephy-window.c:211
+#: src/ephy-window.c:221
 msgid "Move Tab _Left"
 msgstr ""
 
-#: src/ephy-window.c:212
+#: src/ephy-window.c:222
 msgid "Move current tab to left"
 msgstr ""
 
-#: src/ephy-window.c:214
+#: src/ephy-window.c:224
 msgid "Move Tab _Right"
 msgstr ""
 
-#: src/ephy-window.c:215
+#: src/ephy-window.c:225
 msgid "Move current tab to right"
 msgstr ""
 
-#: src/ephy-window.c:217
+#: src/ephy-window.c:227
 msgid "_Detach Tab"
 msgstr ""
 
-#: src/ephy-window.c:218
+#: src/ephy-window.c:228
 msgid "Detach current tab"
 msgstr ""
 
-#: src/ephy-window.c:223
+#: src/ephy-window.c:233
 msgid "Display web browser help"
 msgstr ""
 
 #. View Menu
-#: src/ephy-window.c:234
+#: src/ephy-window.c:244
 msgid "_Toolbar"
 msgstr ""
 
-#: src/ephy-window.c:235
+#: src/ephy-window.c:245
 msgid "Show or hide toolbar"
 msgstr ""
 
-#: src/ephy-window.c:237
+#: src/ephy-window.c:247
 msgid "_Bookmarks Bar"
 msgstr ""
 
-#: src/ephy-window.c:238
+#: src/ephy-window.c:248
 msgid "Show or hide bookmarks bar"
 msgstr ""
 
-#: src/ephy-window.c:240
+#: src/ephy-window.c:250
 msgid "St_atusbar"
 msgstr ""
 
-#: src/ephy-window.c:241
+#: src/ephy-window.c:251
 msgid "Show or hide statusbar"
 msgstr ""
 
-#: src/ephy-window.c:243
+#: src/ephy-window.c:253
 msgid "_Fullscreen"
 msgstr ""
 
-#: src/ephy-window.c:244
+#: src/ephy-window.c:254
 msgid "Browse at full screen"
 msgstr ""
 
-#: src/ephy-window.c:246
+#: src/ephy-window.c:256
 msgid "Selection Caret"
 msgstr ""
 
 #. Document
-#: src/ephy-window.c:254
+#: src/ephy-window.c:264
 #, fuzzy
 msgid "_Save Background As..."
 msgstr "P_urihia Pēneitia..."
 
-#: src/ephy-window.c:256
+#: src/ephy-window.c:266
 msgid "Add Boo_kmark..."
 msgstr ""
 
 #. Framed document
-#: src/ephy-window.c:261
+#: src/ephy-window.c:271
 #, fuzzy
 msgid "_Open Frame"
 msgstr "Huaki he kōnae"
 
-#: src/ephy-window.c:263
-msgid "Open Frame in _New Window"
-msgstr ""
-
-#: src/ephy-window.c:265
-msgid "Open Frame in New _Tab"
-msgstr ""
-
 #. Links
-#: src/ephy-window.c:269
+#: src/ephy-window.c:275
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Huaki"
 
-#: src/ephy-window.c:271
+#: src/ephy-window.c:277
 msgid "Open Link in _New Window"
 msgstr ""
 
-#: src/ephy-window.c:273
+#: src/ephy-window.c:279
 msgid "Open Link in New _Tab"
 msgstr ""
 
-#: src/ephy-window.c:275
+#: src/ephy-window.c:281
 msgid "_Download Link"
 msgstr ""
 
-#: src/ephy-window.c:277
+#: src/ephy-window.c:283
 #, fuzzy
 msgid "_Save Link As..."
 msgstr "P_urihia Pēneitia..."
 
-#: src/ephy-window.c:279
+#: src/ephy-window.c:285
 msgid "_Bookmark Link..."
 msgstr ""
 
-#: src/ephy-window.c:281
+#: src/ephy-window.c:287
 msgid "_Copy Link Address"
 msgstr ""
 
 #. Images
-#: src/ephy-window.c:285
+#: src/ephy-window.c:291
 #, fuzzy
 msgid "Open _Image"
 msgstr "Huaki he kōnae"
 
-#: src/ephy-window.c:287
-msgid "Open Image in New _Window"
-msgstr ""
-
-#: src/ephy-window.c:289
-msgid "Open Image in New T_ab"
-msgstr ""
-
-#: src/ephy-window.c:291
+#: src/ephy-window.c:293
 #, fuzzy
 msgid "_Save Image As..."
 msgstr "P_urihia Pēneitia..."
 
-#: src/ephy-window.c:293
+#: src/ephy-window.c:295
 msgid "_Use Image As Background"
 msgstr ""
 
-#: src/ephy-window.c:295
+#: src/ephy-window.c:297
 msgid "Copy I_mage Address"
 msgstr ""
 
-#: src/ephy-window.c:584
+#: src/ephy-window.c:542
 msgid "Exit Fullscreen"
 msgstr ""
 
-#: src/ephy-window.c:658
+#: src/ephy-window.c:616
 #, fuzzy
-msgid "_Close document"
+msgid "Close _Document"
 msgstr "_Tuhinga"
 
-#: src/ephy-window.c:685
+#: src/ephy-window.c:644
 msgid "There are unsubmitted changes to form elements."
 msgstr ""
 
-#: src/ephy-window.c:686
+#: src/ephy-window.c:645
 msgid "If you close the document anyway, you will lose that information."
 msgstr ""
 
-#: src/ephy-window.c:943 src/window-commands.c:395
+#: src/ephy-window.c:1015 src/window-commands.c:396
 msgid "Open"
 msgstr "Huaki"
 
-#: src/ephy-window.c:945 src/window-commands.c:420
+#: src/ephy-window.c:1017 src/window-commands.c:422
 msgid "Save As"
 msgstr "P_urihia Pēneitia"
 
-#: src/ephy-window.c:949
+#: src/ephy-window.c:1021
 msgid "Bookmark"
 msgstr ""
 
-#: src/ephy-window.c:1135
-#, fuzzy
-msgid "Insecure"
-msgstr "_Kuhu"
-
-#: src/ephy-window.c:1138
+#: src/ephy-window.c:1210
 msgid "Broken"
 msgstr ""
 
-#: src/ephy-window.c:1141
+#: src/ephy-window.c:1213
 msgid "Medium"
 msgstr ""
 
-#: src/ephy-window.c:1145
+#: src/ephy-window.c:1217
 msgid "Low"
 msgstr ""
 
-#: src/ephy-window.c:1149
+#: src/ephy-window.c:1221
 #, fuzzy
 msgid "High"
 msgstr "_Katau"
 
-#: src/ephy-window.c:1159
+#: src/ephy-window.c:1231
 #, c-format
 msgid ""
 "Security level: %s\n"
 "%s"
 msgstr ""
 
-#: src/ephy-window.c:1165
+#: src/ephy-window.c:1237
 #, c-format
 msgid "Security level: %s"
 msgstr ""
@@ -3185,17 +3039,16 @@ msgstr "Whakapiri"
 
 #: src/pdm-dialog.c:914
 #, fuzzy
-msgid "Secure:"
-msgstr "Mata"
+msgid "Send for:"
+msgstr "_Huaki..."
 
 #: src/pdm-dialog.c:923
-msgid "Yes"
-msgstr "Āe"
+msgid "Encrypted connections only"
+msgstr ""
 
 #: src/pdm-dialog.c:923
-#, fuzzy
-msgid "No"
-msgstr "_Kāo"
+msgid "Any type of connection"
+msgstr ""
 
 #: src/pdm-dialog.c:929
 msgid "Expires:"
@@ -3205,23 +3058,50 @@ msgstr ""
 msgid "End of current session"
 msgstr ""
 
-#: src/popup-commands.c:329 src/popup-commands.c:337
+#: src/popup-commands.c:245 src/popup-commands.c:253
 msgid "Download link"
 msgstr ""
 
+#: src/popup-commands.c:260
+#, fuzzy
+msgid "Save Image As"
+msgstr "P_urihia Pēneitia"
+
+#: src/popup-commands.c:350
+msgid "Save Background As"
+msgstr ""
+
+#: src/ppview-toolbar.c:92
+#, fuzzy
+msgid "First"
+msgstr "Ngā Kōnae"
+
 #: src/ppview-toolbar.c:93
 msgid "Go to the first page"
 msgstr ""
 
+#: src/ppview-toolbar.c:96
+#, fuzzy
+msgid "Last"
+msgstr "Whakapiri"
+
 #: src/ppview-toolbar.c:97
 #, fuzzy
 msgid "Go to the last page"
 msgstr "Whakakore te mahi toenga"
 
+#: src/ppview-toolbar.c:100
+msgid "Previous"
+msgstr ""
+
 #: src/ppview-toolbar.c:101
 msgid "Go to the previous page"
 msgstr ""
 
+#: src/ppview-toolbar.c:104
+msgid "Next"
+msgstr ""
+
 #: src/ppview-toolbar.c:105
 msgid "Go to next page"
 msgstr ""
@@ -3423,7 +3303,7 @@ msgstr ""
 msgid "Walloon"
 msgstr ""
 
-#: src/prefs-dialog.c:1057
+#: src/prefs-dialog.c:1058
 #, c-format
 msgid "Custom [%s]"
 msgstr ""
@@ -3432,87 +3312,137 @@ msgstr ""
 #. * user's home folder. It should be translated by the same
 #. * term as GTK+'s "Home" string to be consistent with the
 #. * filechooser
-#: src/prefs-dialog.c:1102
+#: src/prefs-dialog.c:1103
 msgid "Home"
 msgstr "Kāinga"
 
-#: src/prefs-dialog.c:1111
+#: src/prefs-dialog.c:1112
 msgid "Desktop"
 msgstr ""
 
-#: src/prefs-dialog.c:1322
+#: src/prefs-dialog.c:1321
 msgid "Select a directory"
 msgstr ""
 
-#: src/toolbar.c:332
+#: src/toolbar.c:368
 msgid "Back"
 msgstr "Whakamuri"
 
-#: src/toolbar.c:334
+#: src/toolbar.c:370
 msgid "Go back"
 msgstr ""
 
-#: src/toolbar.c:346
+#: src/toolbar.c:382
 #, fuzzy
 msgid "Forward"
 msgstr "_Whakamua"
 
-#: src/toolbar.c:348
+#: src/toolbar.c:384
 #, fuzzy
 msgid "Go forward"
 msgstr "_Whakamua"
 
-#: src/toolbar.c:359
+#: src/toolbar.c:395
 msgid "Up"
 msgstr "Runga"
 
-#: src/toolbar.c:361
+#: src/toolbar.c:397
 msgid "Go up"
 msgstr ""
 
-#: src/toolbar.c:375
-msgid "Address Entry"
-msgstr ""
-
-#: src/toolbar.c:377
+#: src/toolbar.c:413
 msgid "Enter a web address to open, or a phrase to search for on the web"
 msgstr ""
 
-#: src/toolbar.c:389
+#: src/toolbar.c:425
 #, fuzzy
 msgid "Zoom"
 msgstr "Tere _Roto"
 
-#: src/toolbar.c:391
+#: src/toolbar.c:427
 msgid "Adjust the text size"
 msgstr ""
 
-#: src/toolbar.c:401
+#: src/toolbar.c:437
 msgid "Favicon"
 msgstr ""
 
-#: src/toolbar.c:411
+#: src/toolbar.c:447
 msgid "Go to the address entered in the address entry"
 msgstr ""
 
-#: src/window-commands.c:168
+#: src/window-commands.c:169
 msgid "Check this out!"
 msgstr ""
 
-#: src/window-commands.c:881
+#: src/window-commands.c:855
 msgid "Toolbar Editor"
 msgstr ""
 
-#: src/window-commands.c:903
+#: src/window-commands.c:877
 msgid "_Add a New Toolbar"
 msgstr ""
 
 #. Translator credits
-#: src/window-commands.c:954
+#: src/window-commands.c:928
 msgid "translator-credits"
 msgstr ""
 
-#: src/window-commands.c:984
+#: src/window-commands.c:958
 msgid "A GNOME browser based on Mozilla"
 msgstr ""
 
+#~ msgid "Copy"
+#~ msgstr "Tārua"
+
+#, fuzzy
+#~ msgid "Copy the Selection"
+#~ msgstr "Tārua te whiringa"
+
+#~ msgid "Cut"
+#~ msgstr "Kotia"
+
+#, fuzzy
+#~ msgid "Cut the Selection"
+#~ msgstr "Kotia te whiringa"
+
+#, fuzzy
+#~ msgid "Open Frame"
+#~ msgstr "Huaki he kōnae"
+
+#, fuzzy
+#~ msgid "Open Image"
+#~ msgstr "Huaki he kōnae"
+
+#~ msgid "Paste"
+#~ msgstr "Whakapiri"
+
+#, fuzzy
+#~ msgid "Save Background As..."
+#~ msgstr "P_urihia Pēneitia..."
+
+#, fuzzy
+#~ msgid "Save Image As..."
+#~ msgstr "P_urihia Pēneitia..."
+
+#, fuzzy
+#~ msgid "Save Page As..."
+#~ msgstr "P_urihia Pēneitia..."
+
+#, fuzzy
+#~ msgid "Save Page As"
+#~ msgstr "P_urihia Pēneitia"
+
+#~ msgid "_Open"
+#~ msgstr "_Huaki"
+
+#, fuzzy
+#~ msgid "GConf Error"
+#~ msgstr "Pōhēhē"
+
+#~ msgid "Yes"
+#~ msgstr "Āe"
+
+#, fuzzy
+#~ msgid "No"
+#~ msgstr "_Kāo"