Updated British English translation

1 files changed, 584 insertions, 599 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index 15a5de6a6..294d50007 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: epiphany\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-23 14:41+0100\n"
-"PO-Revision-Date: 2004-02-21 21:50+0200\n"
-"Last-Translator: Christian Persch <chpe@cvs.gnome.org>\n"
+"POT-Creation-Date: 2004-04-16 12:09-0400\n"
+"PO-Revision-Date: 2004-04-16 12:12-0400\n"
+"Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
 "Language-Team: British English\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,26 +24,6 @@ msgstr ""
 msgid "Epiphany automation"
 msgstr "Epiphany automation"
 
-#: data/GNOME_Epiphany_NautilusView.server.in.h:1
-msgid "Epiphany Nautilus view"
-msgstr "Epiphany Nautilus view"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:2
-msgid "Epiphany content view component"
-msgstr "Epiphany content view component"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:3
-msgid "View as Web Page"
-msgstr "View as Web Page"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:4
-msgid "Web Page"
-msgstr "Web Page"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:5
-msgid "Web Page Viewer"
-msgstr "Web Page Viewer"
-
 #: data/bme.desktop.in.h:1
 msgid "Browse and organize your bookmarks"
 msgstr "Browse and organise your bookmarks"
@@ -606,7 +586,7 @@ msgid "MD5 Fingerprint:"
 msgstr "MD5 Fingerprint:"
 
 #: data/glade/certificate-dialogs.glade.h:16
-#: embed/mozilla/GtkNSSDialogs.cpp:964
+#: embed/mozilla/GtkNSSDialogs.cpp:967
 msgid "Organization:"
 msgstr "Organisation:"
 
@@ -651,8 +631,7 @@ msgstr "Cookies"
 msgid "Download Manager"
 msgstr "Download Manager"
 
-#: 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:1014
 msgid "Find"
 msgstr "Find"
 
@@ -668,7 +647,7 @@ msgstr "Personal Data Manager"
 msgid "Text Encoding"
 msgstr "Text Encoding"
 
-#: data/glade/epiphany.glade.h:12 src/ephy-encoding-menu.c:388
+#: data/glade/epiphany.glade.h:12 src/ephy-encoding-menu.c:389
 msgid "Use the encoding specified by the document"
 msgstr "Use the encoding specified by the document"
 
@@ -777,8 +756,8 @@ msgid "Fonts and Colors"
 msgstr "Fonts and Colours"
 
 #: data/glade/prefs-dialog.glade.h:24
-msgid "For _Language:"
-msgstr "For _Language:"
+msgid "For l_anguage:"
+msgstr "For l_anguage:"
 
 #: data/glade/prefs-dialog.glade.h:26
 msgid "Language"
@@ -849,7 +828,7 @@ msgstr "_Never accept"
 msgid "_Remove"
 msgstr "_Remove"
 
-#: 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 "_Up"
 
@@ -933,8 +912,7 @@ msgstr "Page _numbers"
 msgid "Paper"
 msgstr "Paper"
 
-#: 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:1010
 msgid "Print"
 msgstr "Print"
 
@@ -1002,148 +980,6 @@ msgstr "fr_om:"
 msgid "lpr"
 msgstr "lpr"
 
-#: data/ui/nautilus-epiphany-view.xml.h:1
-msgid "Add Bookmark for Frame"
-msgstr "Add Bookmark for Frame"
-
-#: data/ui/nautilus-epiphany-view.xml.h:2
-msgid "Copy"
-msgstr "Copy"
-
-#: data/ui/nautilus-epiphany-view.xml.h:3
-msgid "Copy Email Address"
-msgstr "Copy Email Address"
-
-#: data/ui/nautilus-epiphany-view.xml.h:4
-msgid "Copy Image Address"
-msgstr "Copy Image Address"
-
-#: data/ui/nautilus-epiphany-view.xml.h:5
-msgid "Copy Link Address"
-msgstr "Copy Link Address"
-
-#: data/ui/nautilus-epiphany-view.xml.h:6
-msgid "Copy Page Address"
-msgstr "Copy Page Address"
-
-#: data/ui/nautilus-epiphany-view.xml.h:7
-msgid "Copy the Selection"
-msgstr "Copy the Selection"
-
-#: data/ui/nautilus-epiphany-view.xml.h:8
-msgid "Cut"
-msgstr "Cut"
-
-#: data/ui/nautilus-epiphany-view.xml.h:9
-msgid "Cut the Selection"
-msgstr "Cut the Selection"
-
-#: data/ui/nautilus-epiphany-view.xml.h:10
-#: embed/ephy-embed-popup-control.c:551
-msgid "Download Link"
-msgstr "Download Link"
-
-#: data/ui/nautilus-epiphany-view.xml.h:12 src/ppview-toolbar.c:92
-msgid "First"
-msgstr "First"
-
-#: data/ui/nautilus-epiphany-view.xml.h:13 src/ppview-toolbar.c:96
-msgid "Last"
-msgstr "Last"
-
-#: data/ui/nautilus-epiphany-view.xml.h:14 src/ppview-toolbar.c:104
-msgid "Next"
-msgstr "Next"
-
-#: data/ui/nautilus-epiphany-view.xml.h:15
-msgid "Open Frame"
-msgstr "Open Frame"
-
-#: data/ui/nautilus-epiphany-view.xml.h:16
-msgid "Open Frame in New Window"
-msgstr "Open Frame in New Window"
-
-#: data/ui/nautilus-epiphany-view.xml.h:17
-msgid "Open Image"
-msgstr "Open Image"
-
-#: data/ui/nautilus-epiphany-view.xml.h:18
-msgid "Open Image in New Window"
-msgstr "Open Image in New Window"
-
-#: data/ui/nautilus-epiphany-view.xml.h:19
-msgid "Open in New Window"
-msgstr "Open in New Window"
-
-#: data/ui/nautilus-epiphany-view.xml.h:20
-msgid "Paste"
-msgstr "Paste"
-
-#: data/ui/nautilus-epiphany-view.xml.h:21
-msgid "Paste the Clipboard"
-msgstr "Paste the Clipboard"
-
-#: data/ui/nautilus-epiphany-view.xml.h:22 src/ppview-toolbar.c:100
-msgid "Previous"
-msgstr "Previous"
-
-#: data/ui/nautilus-epiphany-view.xml.h:24
-msgid "Print the Current File"
-msgstr "Print the Current File"
-
-#: data/ui/nautilus-epiphany-view.xml.h:25
-msgid "Save Background As..."
-msgstr "Save Background As..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:26
-msgid "Save Image As..."
-msgstr "Save Image As..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:27
-msgid "Save Page As..."
-msgstr "Save Page As..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:28
-msgid "Search for a String"
-msgstr "Search for a String"
-
-#: data/ui/nautilus-epiphany-view.xml.h:29
-msgid "Select All"
-msgstr "Select All"
-
-#: data/ui/nautilus-epiphany-view.xml.h:30
-msgid "Select the Entire Document"
-msgstr "Select the Entire Document"
-
-#: data/ui/nautilus-epiphany-view.xml.h:31
-msgid "Text _Encoding..."
-msgstr "Text _Encoding..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:32
-msgid "Use Image As Background"
-msgstr "Use Image As Background"
-
-#: 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 "_Edit"
-
-#. 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 "_File"
-
-#: data/ui/nautilus-epiphany-view.xml.h:35 src/ephy-window.c:134
-msgid "_Find..."
-msgstr "_Find..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:36 src/ephy-window.c:105
-msgid "_Print..."
-msgstr "_Print..."
-
 #: embed/downloader-view.c:225
 #, c-format
 msgid "%u:%02u.%02u"
@@ -1158,8 +994,8 @@ msgstr "%02u.%02u"
 msgid "_Resume"
 msgstr "_Resume"
 
-#: embed/downloader-view.c:343 lib/widgets/ephy-cell-renderer-progress.c:35
-#: src/ephy-window.c:1132
+#: embed/downloader-view.c:343 lib/widgets/ephy-cell-renderer-progress.c:40
+#: src/ephy-window.c:1195
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -1184,30 +1020,18 @@ msgid_plural "%d downloads"
 msgstr[0] "%d download"
 msgstr[1] "%d downloads"
 
-#: embed/downloader-view.c:513
+#: embed/downloader-view.c:515
 msgid "%"
 msgstr "%"
 
-#: embed/downloader-view.c:524
+#: embed/downloader-view.c:526 src/bookmarks/ephy-bookmarks-editor.c:647
 msgid "File"
 msgstr "File"
 
-#: embed/downloader-view.c:538
+#: embed/downloader-view.c:540
 msgid "Remaining"
 msgstr "Remaining"
 
-#: embed/ephy-embed-popup-control.c:561 src/popup-commands.c:344
-msgid "Save Image As"
-msgstr "Save Image As..."
-
-#: embed/ephy-embed-popup-control.c:647
-msgid "Save Page As"
-msgstr "Save Page As..."
-
-#: embed/ephy-embed-popup-control.c:656 src/popup-commands.c:434
-msgid "Save Background As"
-msgstr "Save Background As..."
-
 #: embed/ephy-encodings.c:63
 msgid "Arabic (_IBM-864)"
 msgstr "Arabic (_IBM-864)"
@@ -1428,183 +1252,175 @@ msgstr "South _European (ISO-8859-3)"
 msgid "Thai (TIS-_620)"
 msgstr "Thai (TIS-_620)"
 
-#: embed/ephy-encodings.c:119
+#: embed/ephy-encodings.c:118
 msgid "Thai (IS_O-8859-11)"
 msgstr "Thai (IS_O-8859-11)"
 
-#: embed/ephy-encodings.c:120
+#: embed/ephy-encodings.c:119
 msgid "_Thai (Windows-874)"
 msgstr "_Thai (Windows-874)"
 
-#: embed/ephy-encodings.c:122
+#: embed/ephy-encodings.c:120
 msgid "Turkish (_IBM-857)"
 msgstr "Turkish (_IBM-857)"
 
-#: embed/ephy-encodings.c:123
+#: embed/ephy-encodings.c:121
 msgid "Turkish (I_SO-8859-9)"
 msgstr "Turkish (I_SO-8859-9)"
 
-#: embed/ephy-encodings.c:124
+#: embed/ephy-encodings.c:122
 msgid "Turkish (_MacTurkish)"
 msgstr "Turkish (_MacTurkish)"
 
-#: embed/ephy-encodings.c:125
+#: embed/ephy-encodings.c:123
 msgid "Turkish (_Windows-1254)"
 msgstr "Turkish (_Windows-1254)"
 
-#: embed/ephy-encodings.c:126
+#: embed/ephy-encodings.c:124
 msgid "Unicode (UTF-_8)"
 msgstr "Unicode (UTF-_8)"
 
-#: embed/ephy-encodings.c:127
+#: embed/ephy-encodings.c:125
 msgid "Cyrillic/Ukrainian (_KOI8-U)"
 msgstr "Cyrillic/Ukrainian (_KOI8-U)"
 
-#: embed/ephy-encodings.c:128
+#: embed/ephy-encodings.c:126
 msgid "Cyrillic/Ukrainian (Mac_Ukrainian)"
 msgstr "Cyrillic/Ukrainian (Mac_Ukrainian)"
 
-#: embed/ephy-encodings.c:129
+#: embed/ephy-encodings.c:127
 msgid "Vietnamese (_TCVN)"
 msgstr "Vietnamese (_TCVN)"
 
-#: embed/ephy-encodings.c:130
+#: embed/ephy-encodings.c:128
 msgid "Vietnamese (_VISCII)"
 msgstr "Vietnamese (_VISCII)"
 
-#: embed/ephy-encodings.c:131
+#: embed/ephy-encodings.c:129
 msgid "Vietnamese (V_PS)"
 msgstr "Vietnamese (V_PS)"
 
-#: embed/ephy-encodings.c:132
+#: embed/ephy-encodings.c:130
 msgid "Vietnamese (_Windows-1258)"
 msgstr "Vietnamese (_Windows-1258)"
 
-#: embed/ephy-encodings.c:133
+#: embed/ephy-encodings.c:131
 msgid "Western (_IBM-850)"
 msgstr "Western (_IBM-850)"
 
-#: embed/ephy-encodings.c:134
+#: embed/ephy-encodings.c:132
 msgid "Western (_ISO-8859-1)"
 msgstr "Western (_ISO-8859-1)"
 
-#: embed/ephy-encodings.c:135
+#: embed/ephy-encodings.c:133
 msgid "Western (IS_O-8859-15)"
 msgstr "Western (IS_O-8859-15)"
 
-#: embed/ephy-encodings.c:136
+#: embed/ephy-encodings.c:134
 msgid "Western (_MacRoman)"
 msgstr "Western (_MacRoman)"
 
-#: embed/ephy-encodings.c:137
+#: embed/ephy-encodings.c:135
 msgid "Western (_Windows-1252)"
 msgstr "Western (_Windows-1252)"
 
 #. 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 "English (_US-ASCII)"
 
-#: embed/ephy-encodings.c:143
+#: embed/ephy-encodings.c:141
 msgid "Unicode (UTF-_16 BE)"
 msgstr "Unicode (UTF-_16 BE)"
 
-#: embed/ephy-encodings.c:144
+#: embed/ephy-encodings.c:142
 msgid "Unicode (UTF-1_6 LE)"
 msgstr "Unicode (UTF-1_6 LE)"
 
-#: embed/ephy-encodings.c:145
+#: embed/ephy-encodings.c:143
 msgid "Unicode (UTF-_32 BE)"
 msgstr "Unicode (UTF-_32 BE)"
 
-#: embed/ephy-encodings.c:146
+#: embed/ephy-encodings.c:144
 msgid "Unicode (UTF-3_2 LE)"
 msgstr "Unicode (UTF-3_2 LE)"
 
-#: embed/ephy-encodings.c:148
+#: embed/ephy-encodings.c:146
 msgid "Off"
 msgstr "Off"
 
-#: embed/ephy-encodings.c:149 src/prefs-dialog.c:117
+#: embed/ephy-encodings.c:147 src/prefs-dialog.c:117
 msgid "Chinese"
 msgstr "Chinese"
 
-#: embed/ephy-encodings.c:150
+#: embed/ephy-encodings.c:148
 msgid "Chinese Simplified"
 msgstr "Chinese Simplified"
 
-#: embed/ephy-encodings.c:151
+#: embed/ephy-encodings.c:149
 msgid "Chinese Traditional"
 msgstr "Chinese Traditional"
 
-#: embed/ephy-encodings.c:152
+#: embed/ephy-encodings.c:150
 msgid "East Asian"
 msgstr "East Asian"
 
-#: 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 "Japanese"
 
-#: 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 "Korean"
 
-#: embed/ephy-encodings.c:155 src/prefs-dialog.c:150
+#: embed/ephy-encodings.c:153 src/prefs-dialog.c:150
 msgid "Russian"
 msgstr "Russian"
 
-#: embed/ephy-encodings.c:156
+#: embed/ephy-encodings.c:154
 msgid "Universal"
 msgstr "Universal"
 
-#: embed/ephy-encodings.c:157 src/prefs-dialog.c:159
+#: embed/ephy-encodings.c:155 src/prefs-dialog.c:159
 msgid "Ukrainian"
 msgstr "Ukrainian"
 
 #. 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 "Unknown (%s)"
 
-#: embed/ephy-history.c:487 src/bookmarks/ephy-bookmarks.c:612
+#: embed/ephy-history.c:486 src/bookmarks/ephy-bookmarks.c:644
 msgid "All"
 msgstr "All"
 
-#: embed/ephy-history.c:662
+#: embed/ephy-history.c:660
 msgid "Others"
 msgstr "Others"
 
-#: embed/ephy-history.c:668
+#: embed/ephy-history.c:666
 msgid "Local files"
 msgstr "Local files"
 
-#: embed/mozilla/ContentHandler.cpp:135
-#: embed/mozilla/EphyHeaderSniffer.cpp:316
+#: embed/mozilla/ContentHandler.cpp:128
+#: embed/mozilla/EphyHeaderSniffer.cpp:345
 msgid "Save"
 msgstr "Save"
 
-#: embed/mozilla/ContentHandler.cpp:265
+#: embed/mozilla/ContentHandler.cpp:247
 msgid "_Save As..."
 msgstr "_Save As..."
 
-#: embed/mozilla/ContentHandler.cpp:268
-msgid "_Open"
-msgstr "_Open"
-
-#: embed/mozilla/ContentHandler.cpp:268
-msgid "_Download"
-msgstr "_Download"
-
-#: embed/mozilla/ContentHandler.cpp:286
+#: embed/mozilla/ContentHandler.cpp:264
 msgid "Download the unsafe file?"
 msgstr "Download the unsafe file?"
 
-#: embed/mozilla/ContentHandler.cpp:287
+#: embed/mozilla/ContentHandler.cpp:265
 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."
@@ -1612,11 +1428,11 @@ msgstr ""
 "This type of file could potentially damage your documents or invade your "
 "privacy. It is not safe to open it directly. You can save it instead."
 
-#: embed/mozilla/ContentHandler.cpp:295
+#: embed/mozilla/ContentHandler.cpp:273
 msgid "Open the file in another application?"
 msgstr "Open the file in another application?"
 
-#: embed/mozilla/ContentHandler.cpp:296
+#: embed/mozilla/ContentHandler.cpp:274
 msgid ""
 "It's not possible to view this file type directly in the browser. You can "
 "open it with another application or save it."
@@ -1624,11 +1440,11 @@ msgstr ""
 "It is not possible to view this file type directly in the browser. You can "
 "open it with another application or save it."
 
-#: embed/mozilla/ContentHandler.cpp:303
+#: embed/mozilla/ContentHandler.cpp:281
 msgid "Download the file?"
 msgstr "Download the file?"
 
-#: embed/mozilla/ContentHandler.cpp:304
+#: embed/mozilla/ContentHandler.cpp:282
 msgid ""
 "It's not possible to view this file because there is no application "
 "installed that can open it. You can save it instead."
@@ -1636,82 +1452,63 @@ msgstr ""
 "It is not possible to view this file because there is no application "
 "installed that can open it. You can save it instead."
 
-#: embed/mozilla/EphyHeaderSniffer.cpp:291
-#: src/bookmarks/ephy-bookmarks-import.c:247
-#: src/bookmarks/ephy-bookmarks-import.c:373 src/ephy-toolbars-model.c:201
-#: src/window-commands.c:342
+#: embed/mozilla/EphyHeaderSniffer.cpp:311
+#: src/bookmarks/ephy-bookmarks-import.c:253 src/ephy-toolbars-model.c:205
+#: src/window-commands.c:343
 msgid "Untitled"
 msgstr "Untitled"
 
-#: embed/mozilla/ExternalProtocolService.cpp:121
-msgid ""
-"Epiphany cannot handle this protocol,\n"
-"and no GNOME default handler is set"
-msgstr ""
-"Epiphany cannot handle this protocol,\n"
-"and no GNOME default handler is set"
-
-#: embed/mozilla/ExternalProtocolService.cpp:135
-msgid ""
-"The protocol specified is not recognised.\n"
-"\n"
-"Would you like to try the GNOME default?"
-msgstr ""
-"The protocol specified is not recognised.\n"
-"\n"
-"Would you like to try the GNOME default?"
-
-#: embed/mozilla/FilePicker.cpp:156
+#: embed/mozilla/FilePicker.cpp:162
 msgid "All files"
 msgstr "All files"
 
-#: embed/mozilla/FilePicker.cpp:161
+#: embed/mozilla/FilePicker.cpp:167
 msgid "HTML files"
 msgstr "HTML files"
 
-#: embed/mozilla/FilePicker.cpp:166
+#: embed/mozilla/FilePicker.cpp:172
 msgid "Text files"
 msgstr "Text files"
 
-#: embed/mozilla/FilePicker.cpp:171
+#: embed/mozilla/FilePicker.cpp:177
 msgid "Image files"
 msgstr "Image files"
 
-#: embed/mozilla/FilePicker.cpp:176
+#: embed/mozilla/FilePicker.cpp:182
 msgid "XML files"
 msgstr "XML files"
 
-#: embed/mozilla/FilePicker.cpp:181
+#: embed/mozilla/FilePicker.cpp:187
 msgid "XUL files"
 msgstr "XUL files"
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:182
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:153
 msgid "_Select Certificate"
 msgstr "_Select Certificate"
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:221
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:192
 #, c-format
 msgid "Choose a certificate to present as identification to %s."
 msgstr "Choose a certificate to present as identification to %s."
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:224
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:195
 msgid "Select a certificate to identify yourself."
 msgstr "Select a certificate to identify yourself."
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:274
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:227
 msgid "Certificate _Details"
 msgstr "Certificate _Details"
 
 #. Add the buttons
-#: embed/mozilla/GtkNSSDialogs.cpp:222 embed/mozilla/GtkNSSDialogs.cpp:533
+#: embed/mozilla/GtkNSSDialogs.cpp:225 embed/mozilla/GtkNSSDialogs.cpp:536
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:230
+#: embed/mozilla/GtkNSSDialogs.cpp:233
 msgid "_Accept"
 msgstr "_Accept"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:294
+#: embed/mozilla/GtkNSSDialogs.cpp:297
 #, c-format
 msgid ""
 "The site %s returned security information for %s. It is possible that "
@@ -1722,17 +1519,17 @@ msgstr ""
 "someone is intercepting your communication to obtain your confidential "
 "information."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:300
+#: embed/mozilla/GtkNSSDialogs.cpp:303
 #, c-format
 msgid "You should only accept the security information if you trust %s and %s."
 msgstr ""
 "You should only accept the security information if you trust %s and %s."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:305
+#: embed/mozilla/GtkNSSDialogs.cpp:308
 msgid "Accept incorrect security information?"
 msgstr "Accept incorrect security information?"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:337
+#: embed/mozilla/GtkNSSDialogs.cpp:340
 #, c-format
 msgid ""
 "Your browser was unable to trust %s. It is possible that someone is "
@@ -1741,7 +1538,7 @@ msgstr ""
 "Your browser was unable to trust %s. It is possible that someone is "
 "intercepting your communication to obtain your confidential information."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:343
+#: embed/mozilla/GtkNSSDialogs.cpp:346
 #, c-format
 msgid ""
 "You should only connect to the site if you are certain you are connected to %"
@@ -1750,32 +1547,32 @@ msgstr ""
 "You should only connect to the site if you are certain you are connected to %"
 "s."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:348
+#: embed/mozilla/GtkNSSDialogs.cpp:351
 msgid "Connect to untrusted site?"
 msgstr "Connect to untrusted site?"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:352
+#: embed/mozilla/GtkNSSDialogs.cpp:355
 msgid "_Don't show this message again for this site"
 msgstr "_Don't show this message again for this site"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:353
+#: embed/mozilla/GtkNSSDialogs.cpp:356
 msgid "Co_nnect"
 msgstr "Co_nnect"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:414
+#: embed/mozilla/GtkNSSDialogs.cpp:417
 msgid "Accept expired security information?"
 msgstr "Accept expired security information?"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:415
+#: embed/mozilla/GtkNSSDialogs.cpp:418
 #, c-format
 msgid "The security information for %s expired on %s."
 msgstr "The security information for %s expired on %s."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:421
+#: embed/mozilla/GtkNSSDialogs.cpp:424
 msgid "Accept not yet valid security information?"
 msgstr "Accept not yet valid security information?"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:422
+#: embed/mozilla/GtkNSSDialogs.cpp:425
 #, c-format
 msgid "The security information for %s isn't valid until %s."
 msgstr "The security information for %s isn't valid until %s."
@@ -1783,42 +1580,42 @@ msgstr "The security information for %s isn't valid until %s."
 #. 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:436
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:444
+#: embed/mozilla/GtkNSSDialogs.cpp:447
 msgid "You should ensure that your computer's time is correct."
 msgstr "You should ensure that your computer's time is correct."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:489
+#: embed/mozilla/GtkNSSDialogs.cpp:492
 #, c-format
 msgid "Cannot establish connection to %s."
 msgstr "Cannot establish connection to %s."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:492
+#: embed/mozilla/GtkNSSDialogs.cpp:495
 #, c-format
 msgid "The certificate revocation list (CRL) from %s needs to be updated."
 msgstr "The certificate revocation list (CRL) from %s needs to be updated."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:497
+#: embed/mozilla/GtkNSSDialogs.cpp:500
 msgid "Please ask your system administrator for assistance."
 msgstr "Please ask your system administrator for assistance."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:536
+#: embed/mozilla/GtkNSSDialogs.cpp:539
 msgid "_Trust CA"
 msgstr "_Trust CA"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:548
+#: embed/mozilla/GtkNSSDialogs.cpp:551
 #, c-format
 msgid "Trust %s to identify:"
 msgstr "Trust %s to identify:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:552
+#: embed/mozilla/GtkNSSDialogs.cpp:555
 msgid "Trust new Certificate Authority?"
 msgstr "Trust new Certificate Authority?"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:553
+#: embed/mozilla/GtkNSSDialogs.cpp:556
 msgid ""
 "Before trusting a Certificate Authority (CA) you should verify the "
 "certificate is authentic."
@@ -1826,122 +1623,122 @@ msgstr ""
 "Before trusting a Certificate Authority (CA) you should verify the "
 "certificate is authentic."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:563
+#: embed/mozilla/GtkNSSDialogs.cpp:566
 msgid "_Web sites"
 msgstr "_Web sites"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:568
+#: embed/mozilla/GtkNSSDialogs.cpp:571
 msgid "_Software developers"
 msgstr "_Software developers"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:634
+#: embed/mozilla/GtkNSSDialogs.cpp:637
 msgid "Certificate already exists."
 msgstr "Certificate already exists."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:635
+#: embed/mozilla/GtkNSSDialogs.cpp:638
 msgid "The certificate has already been imported."
 msgstr "The certificate has already been imported."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:754
+#: embed/mozilla/GtkNSSDialogs.cpp:757
 msgid "_Backup Certificate"
 msgstr "_Backup Certificate"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:761
+#: embed/mozilla/GtkNSSDialogs.cpp:764
 msgid "Select password."
 msgstr "Select password."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:762
+#: embed/mozilla/GtkNSSDialogs.cpp:765
 msgid "Select a password to protect this certificate."
 msgstr "Select a password to protect this certificate."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:774 embed/mozilla/GtkNSSDialogs.cpp:876
+#: embed/mozilla/GtkNSSDialogs.cpp:777 embed/mozilla/GtkNSSDialogs.cpp:879
 msgid "_Password:"
 msgstr "_Password:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:788
+#: embed/mozilla/GtkNSSDialogs.cpp:791
 msgid "Con_firm password:"
 msgstr "Con_firm password:"
 
 #. TODO: We need a better password quality meter
-#: embed/mozilla/GtkNSSDialogs.cpp:800
+#: embed/mozilla/GtkNSSDialogs.cpp:803
 msgid "Password quality:"
 msgstr "Password quality:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:857
+#: embed/mozilla/GtkNSSDialogs.cpp:860
 msgid "I_mport Certificate"
 msgstr "I_mport Certificate"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:865
+#: embed/mozilla/GtkNSSDialogs.cpp:868
 msgid "Password required."
 msgstr "Password required."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:866
+#: embed/mozilla/GtkNSSDialogs.cpp:869
 msgid "Enter the password for this certificate."
 msgstr "Enter the password for this certificate."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:944
+#: embed/mozilla/GtkNSSDialogs.cpp:947
 msgid "Certificate Revocation list successfully imported."
 msgstr "Certificate Revocation list successfully imported."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:945
+#: embed/mozilla/GtkNSSDialogs.cpp:948
 msgid "Certificate Revocation list (CRL) imported:"
 msgstr "Certificate Revocation list (CRL) imported:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:967
+#: embed/mozilla/GtkNSSDialogs.cpp:970
 msgid "Unit:"
 msgstr "Unit:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:970
+#: embed/mozilla/GtkNSSDialogs.cpp:973
 msgid "Next Update:"
 msgstr "Next Update:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:997
+#: embed/mozilla/GtkNSSDialogs.cpp:1000
 msgid "Not part of certificate"
 msgstr "Not part of certificate"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1265
+#: embed/mozilla/GtkNSSDialogs.cpp:1268
 msgid "Certificate Properties"
 msgstr "Certificate Properties"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1287
+#: embed/mozilla/GtkNSSDialogs.cpp:1290
 msgid "This certificate has been verified for the following uses:"
 msgstr "This certificate has been verified for the following uses:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1290
+#: embed/mozilla/GtkNSSDialogs.cpp:1293
 msgid "Could not verify this certificate because it has been revoked."
 msgstr "Could not verify this certificate because it has been revoked."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1293
+#: embed/mozilla/GtkNSSDialogs.cpp:1296
 msgid "Could not verify this certificate because it has expired."
 msgstr "Could not verify this certificate because it has expired."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1296
+#: embed/mozilla/GtkNSSDialogs.cpp:1299
 msgid "Could not verify this certificate because it is not trusted."
 msgstr "Could not verify this certificate because it is not trusted."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1299
+#: embed/mozilla/GtkNSSDialogs.cpp:1302
 msgid "Could not verify this certificate because the issuer is not trusted."
 msgstr "Could not verify this certificate because the issuer is not trusted."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1302
+#: embed/mozilla/GtkNSSDialogs.cpp:1305
 msgid "Could not verify this certificate because the issuer is unknown."
 msgstr "Could not verify this certificate because the issuer is unknown."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1305
+#: embed/mozilla/GtkNSSDialogs.cpp:1308
 msgid ""
 "Could not verify this certificate because the CA certificate is invalid."
 msgstr ""
 "Could not verify this certificate because the CA certificate is invalid."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1310
+#: embed/mozilla/GtkNSSDialogs.cpp:1313
 msgid "Could not verify this certificate for unknown reasons."
 msgstr "Could not verify this certificate for unknown reasons."
 
-#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:181
+#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:185
 msgid "Generating Private Key."
 msgstr "Generating Private Key."
 
-#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:182
+#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:186
 msgid ""
 "Please wait while a new private key is generated. This process could take a "
 "few minutes."
@@ -1949,7 +1746,11 @@ msgstr ""
 "Please wait while a new private key is generated. This process could take a "
 "few minutes."
 
-#: embed/mozilla/mozilla-embed-single.cpp:501
+#: embed/mozilla/MozDownload.cpp:528
+msgid "Files"
+msgstr "Files"
+
+#: embed/mozilla/mozilla-embed-single.cpp:485
 msgid ""
 "Epiphany can't be used now. Mozilla initialization failed. Check your "
 "MOZILLA_FIVE_HOME environmental variable."
@@ -1972,11 +1773,11 @@ msgstr ""
 msgid "system-language"
 msgstr "en-gb,en"
 
-#: embed/print-dialog.c:289
+#: embed/print-dialog.c:293
 msgid "Print to"
 msgstr "Print to"
 
-#: lib/eel-gconf-extensions.c:82
+#: lib/eel-gconf-extensions.c:81
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -1985,30 +1786,15 @@ msgstr ""
 "GConf error:\n"
 "  %s"
 
-#: lib/eel-gconf-extensions.c:86
-#, c-format
-msgid ""
-"GConf error:\n"
-"  %s\n"
-"All further errors shown only on terminal"
-msgstr ""
-"GConf error:\n"
-"  %s\n"
-"All further errors shown only on terminal"
-
-#: lib/eel-gconf-extensions.c:90
-msgid "GConf Error"
-msgstr "GConf Error"
-
-#: lib/egg/egg-editable-toolbar.c:510
+#: lib/egg/egg-editable-toolbar.c:512
 msgid "_Remove Toolbar"
 msgstr "_Remove Toolbar"
 
-#: lib/egg/egg-toolbar-editor.c:552
+#: lib/egg/egg-toolbar-editor.c:559
 msgid "Separator"
 msgstr "Separator"
 
-#: lib/egg/egg-toolbar-editor.c:582
+#: lib/egg/egg-toolbar-editor.c:589
 msgid ""
 "Drag an item onto the toolbars above to add it, from the toolbars in the "
 "items table to remove it."
@@ -2017,26 +1803,26 @@ msgstr ""
 "items table to remove it."
 
 #. The name of the default downloads folder
-#: lib/ephy-file-helpers.c:72 src/prefs-dialog.c:1107
+#: lib/ephy-file-helpers.c:75 src/prefs-dialog.c:1107
 msgid "Downloads"
 msgstr "Downloads"
 
-#: lib/ephy-file-helpers.c:149
+#: lib/ephy-file-helpers.c:164
 #, c-format
 msgid "Failed to find %s"
 msgstr "Failed to find %s"
 
-#: lib/ephy-file-helpers.c:214
+#: lib/ephy-file-helpers.c:229
 #, c-format
 msgid "%s exists, please move it out of the way."
 msgstr "%s exists, please move it out of the way."
 
-#: lib/ephy-file-helpers.c:217
+#: lib/ephy-file-helpers.c:232
 #, c-format
 msgid "Failed to create directory %s."
 msgstr "Failed to create directory %s."
 
-#: lib/ephy-gui.c:90
+#: lib/ephy-gui.c:95
 #, c-format
 msgid ""
 "File %s will be overwritten.\n"
@@ -2049,7 +1835,7 @@ msgstr ""
 "\n"
 "Do you want to continue?"
 
-#: lib/ephy-gui.c:121
+#: lib/ephy-gui.c:127
 #, c-format
 msgid "Could not display help: %s"
 msgstr "Could not display help: %s"
@@ -2098,22 +1884,47 @@ msgstr "Thai"
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: lib/ephy-langs.c:45
+#: lib/ephy-langs.c:44
 msgid "Traditional Chinese (Hong Kong)"
 msgstr "Traditional Chinese (Hong Kong)"
 
-#: lib/ephy-langs.c:47 src/prefs-dialog.c:158
+#: lib/ephy-langs.c:45 src/prefs-dialog.c:158
 msgid "Turkish"
 msgstr "Turkish"
 
-#: lib/ephy-langs.c:48
+#: lib/ephy-langs.c:46
 msgid "Unicode"
 msgstr "Unicode"
 
-#: lib/ephy-langs.c:49
+#: lib/ephy-langs.c:47
 msgid "Western"
 msgstr "Western"
 
+#: lib/ephy-stock-icons.c:54
+msgid "Secure"
+msgstr "Secure"
+
+#: lib/ephy-stock-icons.c:55 src/ephy-window.c:1198
+msgid "Insecure"
+msgstr "Insecure"
+
+#: lib/ephy-stock-icons.c:56 src/ephy-history-window.c:1192
+msgid "History"
+msgstr "History"
+
+#: lib/ephy-stock-icons.c:57 src/bookmarks/ephy-bookmarks-editor.c:1373
+#: src/bookmarks/ephy-topic-action.c:597 src/ephy-window.c:1016
+msgid "Bookmarks"
+msgstr "Bookmarks"
+
+#: lib/ephy-stock-icons.c:58 src/toolbar.c:375
+msgid "Address Entry"
+msgstr "Address Entry"
+
+#: lib/ephy-stock-icons.c:59
+msgid "_Download"
+msgstr "_Download"
+
 #: lib/ephy-zoom.h:41
 msgid "50%"
 msgstr "50%"
@@ -2150,27 +1961,27 @@ msgstr "300%"
 msgid "400%"
 msgstr "400%"
 
-#: lib/widgets/ephy-cell-renderer-progress.c:98
+#: lib/widgets/ephy-cell-renderer-progress.c:103
 msgid "Failed"
 msgstr "Failed"
 
-#: src/bookmarks/ephy-bookmark-action.c:221
+#: src/bookmarks/ephy-bookmark-action.c:248
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: src/bookmarks/ephy-bookmark-properties.c:229
+#: src/bookmarks/ephy-bookmark-properties.c:230
 #, c-format
 msgid "%s Properties"
 msgstr "%s Properties"
 
 #: src/bookmarks/ephy-bookmark-properties.c:352
-#: src/bookmarks/ephy-new-bookmark.c:215
+#: src/bookmarks/ephy-new-bookmark.c:216
 msgid "_Title:"
 msgstr "_Title:"
 
 #: src/bookmarks/ephy-bookmark-properties.c:394
-#: src/bookmarks/ephy-new-bookmark.c:238
+#: src/bookmarks/ephy-new-bookmark.c:239
 msgid "To_pics:"
 msgstr "To_pics:"
 
@@ -2178,13 +1989,24 @@ msgstr "To_pics:"
 msgid "_Show in bookmarks bar"
 msgstr "_Show in bookmarks bar"
 
+#. Toplevel
+#: src/bookmarks/ephy-bookmarks-editor.c:161 src/ephy-history-window.c:151
+#: src/ephy-window.c:83
+msgid "_File"
+msgstr "_File"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:162 src/ephy-history-window.c:152
+#: src/ephy-window.c:84
+msgid "_Edit"
+msgstr "_Edit"
+
 #: 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 "_View"
 
 #: 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 "_Help"
 
@@ -2199,7 +2021,7 @@ msgstr "Create a new topic"
 
 #. 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:996 src/ephy-history-window.c:158
 #: src/ephy-history-window.c:738
 msgid "_Open in New Window"
 msgstr "_Open in New Window"
@@ -2209,7 +2031,7 @@ msgid "Open the selected bookmark in a new window"
 msgstr "Open the selected bookmark in a new window"
 
 #: 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:997 src/ephy-history-window.c:161
 #: src/ephy-history-window.c:739
 msgid "Open in New _Tab"
 msgstr "Open in New _Tab"
@@ -2251,7 +2073,7 @@ msgid "Import bookmarks from another browser or a bookmarks file"
 msgstr "Import bookmarks from another browser or from a bookmarks file"
 
 #: 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 "_Close"
 
@@ -2261,28 +2083,28 @@ msgstr "Close the bookmarks window"
 
 #. 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 "Cu_t"
 
 #: 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 "Cut the selection"
 
 #: 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:1006 src/ephy-history-window.c:178
+#: src/ephy-history-window.c:748 src/ephy-window.c:135
 msgid "_Copy"
 msgstr "_Copy"
 
 #: 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 "Copy the selection"
 
 #: 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 "_Paste"
 
@@ -2291,7 +2113,7 @@ msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
 #: 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 "Select _All"
 
@@ -2301,7 +2123,7 @@ msgstr "Select all bookmarks or text"
 
 #. 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
 msgid "_Contents"
 msgstr "_Contents"
 
@@ -2310,12 +2132,12 @@ msgid "Display bookmarks help"
 msgstr "Display bookmarks help"
 
 #: 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 "_About"
 
 #: 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 "Display credits for the web browser creators"
 
@@ -2349,68 +2171,67 @@ msgstr "Show both the title and address columns"
 msgid "Type a topic"
 msgstr "Type a topic"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:547
+#: src/bookmarks/ephy-bookmarks-editor.c:558
 msgid "Import bookmarks from file"
 msgstr "Import bookmarks from file"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:580
+#: src/bookmarks/ephy-bookmarks-editor.c:592
 msgid "Import Bookmarks"
 msgstr "Import Bookmarks"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:600
-msgid "Choose the bookmarks source:"
-msgstr "Choose the bookmarks source:"
+#: src/bookmarks/ephy-bookmarks-editor.c:598
+msgid "I_mport"
+msgstr "I_mport"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:612
+msgid "Import bookmarks from:"
+msgstr "Import bookmarks from:"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:618
-msgid "Mozilla bookmarks"
-msgstr "Mozilla bookmarks"
+#: src/bookmarks/ephy-bookmarks-editor.c:635
+msgid "Firebird"
+msgstr "Firebird"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:620
-msgid "Firebird bookmarks"
-msgstr "Firebird bookmarks"
+#: src/bookmarks/ephy-bookmarks-editor.c:637
+msgid "Firefox"
+msgstr "Firefox"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:622
-msgid "Galeon bookmarks"
-msgstr "Galeon bookmarks"
+#: src/bookmarks/ephy-bookmarks-editor.c:639
+msgid "Galeon"
+msgstr "Galeon"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:624
-msgid "Konqueror bookmarks"
-msgstr "Konqueror bookmarks"
+#: src/bookmarks/ephy-bookmarks-editor.c:641
+msgid "Konqueror"
+msgstr "Konqueror"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:628
-msgid "Import from a file"
-msgstr "Import from a file"
+#: src/bookmarks/ephy-bookmarks-editor.c:643
+msgid "Mozilla"
+msgstr "Mozilla"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:972 src/ephy-history-window.c:733
+#: src/bookmarks/ephy-bookmarks-editor.c:991 src/ephy-history-window.c:733
 msgid "_Open in New Windows"
 msgstr "_Open in New Windows"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:973 src/ephy-history-window.c:734
+#: src/bookmarks/ephy-bookmarks-editor.c:992 src/ephy-history-window.c:734
 msgid "Open in New _Tabs"
 msgstr "Open in New _Tabs"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:983 src/ephy-history-window.c:744
+#: src/bookmarks/ephy-bookmarks-editor.c:1002 src/ephy-history-window.c:744
 msgid "_Copy Address"
 msgstr "_Copy Address"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1224 src/ephy-history-window.c:1038
+#: src/bookmarks/ephy-bookmarks-editor.c:1243 src/ephy-history-window.c:1038
 msgid "_Search:"
 msgstr "_Search:"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1357
-#: src/bookmarks/ephy-topic-action.c:597 src/ephy-window.c:953
-msgid "Bookmarks"
-msgstr "Bookmarks"
-
-#: src/bookmarks/ephy-bookmarks-editor.c:1440
+#: src/bookmarks/ephy-bookmarks-editor.c:1456
 msgid "Topics"
 msgstr "Topics"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1502 src/ephy-history-window.c:1318
+#: src/bookmarks/ephy-bookmarks-editor.c:1518 src/ephy-history-window.c:1318
 msgid "Title"
 msgstr "Title"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1509 src/ephy-history-window.c:1324
+#: src/bookmarks/ephy-bookmarks-editor.c:1525 src/ephy-history-window.c:1324
 msgid "Address"
 msgstr "Address"
 
@@ -2451,15 +2272,15 @@ msgstr "Travel"
 msgid "Work"
 msgstr "Work"
 
-#: src/bookmarks/ephy-bookmarks.c:647
+#: src/bookmarks/ephy-bookmarks.c:677
 msgid "Most Visited"
 msgstr "Most Visited"
 
-#: src/bookmarks/ephy-bookmarks.c:664
+#: src/bookmarks/ephy-bookmarks.c:693
 msgid "Not Categorized"
 msgstr "Not Categorised"
 
-#: src/bookmarks/ephy-new-bookmark.c:261
+#: src/bookmarks/ephy-new-bookmark.c:262
 msgid "Add Bookmark"
 msgstr "Add Bookmark"
 
@@ -2467,11 +2288,11 @@ msgstr "Add Bookmark"
 #. * 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 "Duplicated Bookmark"
 
-#: 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 "A bookmark titled %s already exists for this page."
@@ -2485,15 +2306,15 @@ msgstr "Empty"
 msgid "Encodings"
 msgstr "Encodings"
 
-#: src/ephy-encoding-menu.c:379
+#: src/ephy-encoding-menu.c:380
 msgid "_Other..."
 msgstr "_Other..."
 
-#: src/ephy-encoding-menu.c:380
+#: src/ephy-encoding-menu.c:381
 msgid "Other encodings"
 msgstr "Other encodings"
 
-#: src/ephy-encoding-menu.c:387
+#: src/ephy-encoding-menu.c:388
 msgid "_Automatic"
 msgstr "_Automatic"
 
@@ -2553,15 +2374,15 @@ msgstr "Show only the address column"
 msgid "Clear History"
 msgstr "Clear History"
 
-#: src/ephy-history-window.c:278
+#: src/ephy-history-window.c:276
 msgid "C_lear"
 msgstr "C_lear"
 
-#: src/ephy-history-window.c:301
+#: src/ephy-history-window.c:300
 msgid "Clear browsing history?"
 msgstr "Clear browsing history?"
 
-#: 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."
@@ -2582,81 +2403,77 @@ msgid_plural "Last %d days"
 msgstr[0] "Last %d day"
 msgstr[1] "Last %d days"
 
-#: src/ephy-history-window.c:1192
-msgid "History"
-msgstr "History"
-
 #: src/ephy-history-window.c:1264
 msgid "Sites"
 msgstr "Sites"
 
-#: src/ephy-main.c:55
+#: src/ephy-main.c:56
 msgid "Open a new tab in an existing Epiphany window"
 msgstr "Open a new tab in an existing Epiphany window"
 
-#: src/ephy-main.c:58
+#: src/ephy-main.c:59
 msgid "Run Epiphany in full screen mode"
 msgstr "Run Epiphany in full screen mode"
 
-#: src/ephy-main.c:61
+#: src/ephy-main.c:62
 msgid "Load the given session file"
 msgstr "Load the given session file"
 
-#: src/ephy-main.c:62 src/ephy-main.c:68
+#: src/ephy-main.c:63 src/ephy-main.c:69
 msgid "FILE"
 msgstr "FILE"
 
-#: src/ephy-main.c:64
+#: src/ephy-main.c:65
 msgid "Add a bookmark (don't open any window)"
 msgstr "Add a bookmark (don't open any window)"
 
-#: src/ephy-main.c:65
+#: src/ephy-main.c:66
 msgid "URL"
 msgstr "URL"
 
-#: src/ephy-main.c:67
+#: src/ephy-main.c:68
 msgid "Import bookmarks from the given file"
 msgstr "Import bookmarks from the given file"
 
-#: src/ephy-main.c:70
+#: src/ephy-main.c:71
 msgid "Launch the bookmarks editor"
 msgstr "Launch the bookmarks editor"
 
-#: src/ephy-main.c:73
+#: src/ephy-main.c:74
 msgid "Used internally by the bonobo interface"
 msgstr "Used internally by the bonobo interface"
 
-#: src/ephy-main.c:108
+#: src/ephy-main.c:109
 msgid "Epiphany Web Browser"
 msgstr "Epiphany Web Browser"
 
-#: src/ephy-main.c:112
+#: src/ephy-main.c:113
 msgid "Ephy"
 msgstr "Epiphany"
 
-#: src/ephy-session.c:299
+#: src/ephy-session.c:367
 msgid "Crash Recovery"
 msgstr "Crash Recovery"
 
-#: src/ephy-session.c:301
+#: src/ephy-session.c:369
 msgid "_Don't Recover"
 msgstr "_Don't Recover"
 
-#: src/ephy-session.c:302
+#: src/ephy-session.c:370
 msgid "_Recover"
 msgstr "_Recover"
 
-#: src/ephy-session.c:332
+#: src/ephy-session.c:401
 msgid ""
 "Epiphany appears to have crashed or been killed the last time it was run."
 msgstr ""
 "Epiphany appears to have crashed or been killed the last time it was run."
 
-#: src/ephy-session.c:338
+#: src/ephy-session.c:407
 msgid "You can recover the opened tabs and windows."
 msgstr "You can recover the opened tabs and windows."
 
-#: 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 "
@@ -2666,7 +2483,7 @@ msgstr ""
 "use bonobo-activation-sysconf to configure the search path for bonobo server "
 "files."
 
-#: 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"
@@ -2674,7 +2491,7 @@ msgstr ""
 "Epiphany can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the automation server"
 
-#: 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."
@@ -2682,510 +2499,506 @@ msgstr ""
 "Epiphany can't be used now, due to an unexpected error from Bonobo when "
 "attempting to locate the automation object."
 
-#: src/ephy-tab.c:327 src/ephy-tab.c:1172 src/ephy-tab.c:1354
+#: src/ephy-tab.c:358 src/ephy-tab.c:1247 src/ephy-tab.c:1456
 msgid "Blank page"
 msgstr "Blank page"
 
-#: src/ephy-tab.c:748
+#: src/ephy-tab.c:802
 msgid "site"
 msgstr "site"
 
-#: src/ephy-tab.c:772
+#: src/ephy-tab.c:826
 #, c-format
 msgid "Redirecting to %s..."
 msgstr "Redirecting to %s..."
 
-#: src/ephy-tab.c:776
+#: src/ephy-tab.c:830
 #, c-format
 msgid "Transferring data from %s..."
 msgstr "Transferring data from %s..."
 
-#: src/ephy-tab.c:780
+#: src/ephy-tab.c:834
 #, c-format
 msgid "Waiting for authorization from %s..."
 msgstr "Waiting for authorisation from %s..."
 
-#: src/ephy-tab.c:788
+#: src/ephy-tab.c:842
 #, c-format
 msgid "Loading %s..."
 msgstr "Loading %s..."
 
-#: src/ephy-window.c:79
+#: src/ephy-window.c:86
 msgid "_Bookmarks"
 msgstr "_Bookmarks"
 
-#: src/ephy-window.c:80
+#: src/ephy-window.c:87
 msgid "_Go"
 msgstr "_Go"
 
-#: src/ephy-window.c:81
+#: src/ephy-window.c:88
 msgid "T_ools"
 msgstr "T_ools"
 
-#: src/ephy-window.c:82
+#: src/ephy-window.c:89
 msgid "_Tabs"
 msgstr "_Tabs"
 
 #. File menu
-#: src/ephy-window.c:87
+#: src/ephy-window.c:94
 msgid "_New Window"
 msgstr "_New Window"
 
-#: src/ephy-window.c:88
+#: src/ephy-window.c:95
 msgid "Open a new window"
 msgstr "Open a new window"
 
-#: src/ephy-window.c:90
+#: src/ephy-window.c:97
 msgid "New _Tab"
 msgstr "New _Tab"
 
-#: src/ephy-window.c:91
+#: src/ephy-window.c:98
 msgid "Open a new tab"
 msgstr "Open a new tab"
 
-#: src/ephy-window.c:93
+#: src/ephy-window.c:100
 msgid "_Open..."
 msgstr "_Open..."
 
-#: src/ephy-window.c:94
+#: src/ephy-window.c:101
 msgid "Open a file"
 msgstr "Open a file"
 
-#: src/ephy-window.c:96
+#: src/ephy-window.c:103 src/ephy-window.c:106
 msgid "Save _As..."
 msgstr "Save _As..."
 
-#: src/ephy-window.c:97
+#: src/ephy-window.c:104 src/ephy-window.c:107
 msgid "Save the current page"
 msgstr "Save the current page"
 
-#: src/ephy-window.c:99
+#: src/ephy-window.c:109
 msgid "Print Set_up..."
 msgstr "Print Set_up..."
 
-#: src/ephy-window.c:100
+#: src/ephy-window.c:110
 msgid "Setup the page settings for printing"
 msgstr "Setup the page settings for printing"
 
-#: src/ephy-window.c:102
+#: src/ephy-window.c:112
 msgid "Print Pre_view"
 msgstr "Print Pre_view"
 
-#: src/ephy-window.c:103
+#: src/ephy-window.c:113
 msgid "Print preview"
 msgstr "Print preview"
 
-#: src/ephy-window.c:106
+#: src/ephy-window.c:115
+msgid "_Print..."
+msgstr "_Print..."
+
+#: src/ephy-window.c:116
 msgid "Print the current page"
 msgstr "Print the current page"
 
-#: src/ephy-window.c:108
+#: src/ephy-window.c:118
 msgid "S_end To..."
 msgstr "S_end To..."
 
-#: src/ephy-window.c:109
+#: src/ephy-window.c:119
 msgid "Send a link of the current page"
 msgstr "Send a link of the current page"
 
-#: src/ephy-window.c:112
+#: src/ephy-window.c:122
 msgid "Close this window"
 msgstr "Close this window"
 
 #. Edit menu
-#: src/ephy-window.c:116
+#: src/ephy-window.c:126
 msgid "_Undo"
 msgstr "_Undo"
 
-#: src/ephy-window.c:117
+#: src/ephy-window.c:127
 msgid "Undo the last action"
 msgstr "Undo the last action"
 
-#: src/ephy-window.c:119
+#: src/ephy-window.c:129
 msgid "Re_do"
 msgstr "Re_do"
 
-#: src/ephy-window.c:120
+#: src/ephy-window.c:130
 msgid "Redo the last undone action"
 msgstr "Redo the last undone action"
 
-#: src/ephy-window.c:129
+#: src/ephy-window.c:139
 msgid "Paste clipboard"
 msgstr "Paste clipboard"
 
-#: src/ephy-window.c:132
+#: src/ephy-window.c:142
 msgid "Select the entire page"
 msgstr "Select the entire page"
 
-#: src/ephy-window.c:135
+#: src/ephy-window.c:144
+msgid "_Find..."
+msgstr "_Find..."
+
+#: src/ephy-window.c:145
 msgid "Find a word or phrase in the page"
 msgstr "Find a word or phrase in the page"
 
-#: src/ephy-window.c:137
+#: src/ephy-window.c:147
 msgid "Find Ne_xt"
 msgstr "Find Ne_xt"
 
-#: src/ephy-window.c:138
+#: src/ephy-window.c:148
 msgid "Find next occurrence of the word or phrase"
 msgstr "Find next occurrence of the word or phrase"
 
-#: src/ephy-window.c:140
+#: src/ephy-window.c:150
 msgid "Find Pre_vious"
 msgstr "Find Pre_vious"
 
-#: src/ephy-window.c:141
+#: src/ephy-window.c:151
 msgid "Find previous occurrence of the word or phrase"
 msgstr "Find previous occurrence of the word or phrase"
 
-#: src/ephy-window.c:143
+#: src/ephy-window.c:153
 msgid "P_ersonal Data"
 msgstr "P_ersonal Data"
 
-#: src/ephy-window.c:144
+#: src/ephy-window.c:154
 msgid "View and remove cookies and passwords"
 msgstr "View and remove cookies and passwords"
 
-#: src/ephy-window.c:146
+#: src/ephy-window.c:156
 msgid "T_oolbars"
 msgstr "T_oolbars"
 
-#: src/ephy-window.c:147
+#: src/ephy-window.c:157
 msgid "Customize toolbars"
 msgstr "Customise toolbars"
 
-#: src/ephy-window.c:149
+#: src/ephy-window.c:159
 msgid "P_references"
 msgstr "P_references"
 
-#: src/ephy-window.c:150
+#: src/ephy-window.c:160
 msgid "Configure the web browser"
 msgstr "Configure the web browser"
 
 #. View menu
-#: src/ephy-window.c:154
+#: src/ephy-window.c:164
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/ephy-window.c:155
+#: src/ephy-window.c:165
 msgid "Stop current data transfer"
 msgstr "Stop current data transfer"
 
-#: src/ephy-window.c:157
+#: src/ephy-window.c:167
 msgid "_Reload"
 msgstr "_Reload"
 
-#: src/ephy-window.c:158
+#: src/ephy-window.c:168
 msgid "Display the latest content of the current page"
 msgstr "Display the latest content of the current page"
 
-#: src/ephy-window.c:160
+#: src/ephy-window.c:170
 msgid "Zoom _In"
 msgstr "Zoom _In"
 
-#: src/ephy-window.c:161
+#: src/ephy-window.c:171
 msgid "Increase the text size"
 msgstr "Increase the text size"
 
-#: src/ephy-window.c:163
+#: src/ephy-window.c:173
 msgid "Zoom _Out"
 msgstr "Zoom _Out"
 
-#: src/ephy-window.c:164
+#: src/ephy-window.c:174
 msgid "Decrease the text size"
 msgstr "Decrease the text size"
 
-#: src/ephy-window.c:166
+#: src/ephy-window.c:176
 msgid "_Normal Size"
 msgstr "_Normal Size"
 
-#: src/ephy-window.c:167
+#: src/ephy-window.c:177
 msgid "Use the normal text size"
 msgstr "Use the normal text size"
 
-#: src/ephy-window.c:169
+#: src/ephy-window.c:179
 msgid "Text _Encoding"
 msgstr "Text _Encoding"
 
-#: src/ephy-window.c:170
+#: src/ephy-window.c:180
 msgid "Change the text encoding"
 msgstr "Change the text encoding"
 
-#: src/ephy-window.c:172
+#: src/ephy-window.c:182
 msgid "_Page Source"
 msgstr "_Page Source"
 
-#: src/ephy-window.c:173
+#: src/ephy-window.c:183
 msgid "View the source code of the page"
 msgstr "View the source code of the page"
 
 #. Bookmarks menu
-#: src/ephy-window.c:177
+#: src/ephy-window.c:187
 msgid "_Add Bookmark..."
 msgstr "_Add Bookmark..."
 
-#: 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 "Add a bookmark for the current page"
 
-#: src/ephy-window.c:180
+#: src/ephy-window.c:190
 msgid "_Edit Bookmarks"
 msgstr "_Edit Bookmarks"
 
-#: src/ephy-window.c:181
+#: src/ephy-window.c:191
 msgid "Open the bookmarks window"
 msgstr "Open the bookmarks window"
 
 #. Go menu
-#: src/ephy-window.c:185
+#: src/ephy-window.c:195
 msgid "_Back"
 msgstr "_Back"
 
-#: src/ephy-window.c:186
+#: src/ephy-window.c:196
 msgid "Go to the previous visited page"
 msgstr "Go to the previous visited page"
 
-#: src/ephy-window.c:188
+#: src/ephy-window.c:198
 msgid "_Forward"
 msgstr "_Forward"
 
-#: src/ephy-window.c:189
+#: src/ephy-window.c:199
 msgid "Go to the next visited page"
 msgstr "Go to the next visited page"
 
-#: src/ephy-window.c:192
+#: src/ephy-window.c:202
 msgid "Go up one level"
 msgstr "Go up one level"
 
-#: src/ephy-window.c:194
+#: src/ephy-window.c:204
 msgid "_Home"
 msgstr "_Home"
 
-#: src/ephy-window.c:195
+#: src/ephy-window.c:205
 msgid "Go to the home page"
 msgstr "Go to the home page"
 
-#: src/ephy-window.c:197
+#: src/ephy-window.c:207
 msgid "_Location..."
 msgstr "_Location..."
 
-#: src/ephy-window.c:198
+#: src/ephy-window.c:208
 msgid "Go to a specified location"
 msgstr "Go to a specified location"
 
-#: src/ephy-window.c:200
+#: src/ephy-window.c:210
 msgid "H_istory"
 msgstr "H_istory"
 
-#: src/ephy-window.c:201
+#: src/ephy-window.c:211
 msgid "Open the history window"
 msgstr "Open the history window"
 
 #. Tabs menu
-#: src/ephy-window.c:205
+#: src/ephy-window.c:215
 msgid "_Previous Tab"
 msgstr "_Previous Tab"
 
-#: src/ephy-window.c:206
+#: src/ephy-window.c:216
 msgid "Activate previous tab"
 msgstr "Activate previous tab"
 
-#: src/ephy-window.c:208
+#: src/ephy-window.c:218
 msgid "_Next Tab"
 msgstr "_Next Tab"
 
-#: src/ephy-window.c:209
+#: src/ephy-window.c:219
 msgid "Activate next tab"
 msgstr "Activate next tab"
 
-#: src/ephy-window.c:211
+#: src/ephy-window.c:221
 msgid "Move Tab _Left"
 msgstr "Move Tab _Left"
 
-#: src/ephy-window.c:212
+#: src/ephy-window.c:222
 msgid "Move current tab to left"
 msgstr "Move current tab to left"
 
-#: src/ephy-window.c:214
+#: src/ephy-window.c:224
 msgid "Move Tab _Right"
 msgstr "Move Tab _Right"
 
-#: src/ephy-window.c:215
+#: src/ephy-window.c:225
 msgid "Move current tab to right"
 msgstr "Move current tab to right"
 
-#: src/ephy-window.c:217
+#: src/ephy-window.c:227
 msgid "_Detach Tab"
 msgstr "_Detach Tab"
 
-#: src/ephy-window.c:218
+#: src/ephy-window.c:228
 msgid "Detach current tab"
 msgstr "Detach current tab"
 
-#: src/ephy-window.c:223
+#: src/ephy-window.c:233
 msgid "Display web browser help"
 msgstr "Display web browser help"
 
 #. View Menu
-#: src/ephy-window.c:234
+#: src/ephy-window.c:244
 msgid "_Toolbar"
 msgstr "_Toolbar"
 
-#: src/ephy-window.c:235
+#: src/ephy-window.c:245
 msgid "Show or hide toolbar"
 msgstr "Show or hide toolbar"
 
-#: src/ephy-window.c:237
+#: src/ephy-window.c:247
 msgid "_Bookmarks Bar"
 msgstr "_Bookmarks Bar"
 
-#: src/ephy-window.c:238
+#: src/ephy-window.c:248
 msgid "Show or hide bookmarks bar"
 msgstr "Show or hide bookmarks bar"
 
-#: src/ephy-window.c:240
+#: src/ephy-window.c:250
 msgid "St_atusbar"
 msgstr "St_atusbar"
 
-#: src/ephy-window.c:241
+#: src/ephy-window.c:251
 msgid "Show or hide statusbar"
 msgstr "Show or hide statusbar"
 
-#: src/ephy-window.c:243
+#: src/ephy-window.c:253
 msgid "_Fullscreen"
 msgstr "_Full Screen"
 
-#: src/ephy-window.c:244
+#: src/ephy-window.c:254
 msgid "Browse at full screen"
 msgstr "Browse at full screen"
 
-#: src/ephy-window.c:246
+#: src/ephy-window.c:256
 msgid "Selection Caret"
 msgstr "Selection Caret"
 
 #. Document
-#: src/ephy-window.c:254
+#: src/ephy-window.c:264
 msgid "_Save Background As..."
 msgstr "_Save Background As..."
 
-#: src/ephy-window.c:256
+#: src/ephy-window.c:266
 msgid "Add Boo_kmark..."
 msgstr "Add Boo_kmark..."
 
 #. Framed document
-#: src/ephy-window.c:261
+#: src/ephy-window.c:271
 msgid "_Open Frame"
 msgstr "_Open Frame"
 
-#: src/ephy-window.c:263
+#: src/ephy-window.c:273
 msgid "Open Frame in _New Window"
 msgstr "Open Frame in _New Window"
 
-#: src/ephy-window.c:265
+#: src/ephy-window.c:275
 msgid "Open Frame in New _Tab"
 msgstr "Open Frame in New _Tab"
 
 #. Links
-#: src/ephy-window.c:269
+#: src/ephy-window.c:279
 msgid "_Open Link"
 msgstr "_Open Link"
 
-#: src/ephy-window.c:271
+#: src/ephy-window.c:281
 msgid "Open Link in _New Window"
 msgstr "Open Link in _New Window"
 
-#: src/ephy-window.c:273
+#: src/ephy-window.c:283
 msgid "Open Link in New _Tab"
 msgstr "Open Link in New _Tab"
 
-#: src/ephy-window.c:275
+#: src/ephy-window.c:285
 msgid "_Download Link"
 msgstr "_Download Link"
 
-#: src/ephy-window.c:277
+#: src/ephy-window.c:287
 msgid "_Save Link As..."
 msgstr "_Save Link As..."
 
-#: src/ephy-window.c:279
+#: src/ephy-window.c:289
 msgid "_Bookmark Link..."
 msgstr "_Bookmark Link..."
 
-#: src/ephy-window.c:281
+#: src/ephy-window.c:291
 msgid "_Copy Link Address"
 msgstr "_Copy Link Address"
 
 #. Images
-#: src/ephy-window.c:285
+#: src/ephy-window.c:295
 msgid "Open _Image"
 msgstr "Open _Image"
 
-#: src/ephy-window.c:287
-msgid "Open Image in New _Window"
-msgstr "Open Image in New _Window"
-
-#: src/ephy-window.c:289
-msgid "Open Image in New T_ab"
-msgstr "Open Image in New T_ab"
-
-#: src/ephy-window.c:291
+#: src/ephy-window.c:297
 msgid "_Save Image As..."
 msgstr "_Save Image As..."
 
-#: src/ephy-window.c:293
+#: src/ephy-window.c:299
 msgid "_Use Image As Background"
 msgstr "_Use Image As Background"
 
-#: src/ephy-window.c:295
+#: src/ephy-window.c:301
 msgid "Copy I_mage Address"
 msgstr "Copy I_mage Address"
 
-#: src/ephy-window.c:584
+#: src/ephy-window.c:546
 msgid "Exit Fullscreen"
 msgstr "Exit Full Screen"
 
-#: src/ephy-window.c:658
-msgid "_Close document"
-msgstr "_Close document"
+#: src/ephy-window.c:620
+msgid "Close _Document"
+msgstr "Close _Document"
 
-#: src/ephy-window.c:685
+#: src/ephy-window.c:648
 msgid "There are unsubmitted changes to form elements."
 msgstr "There are unsubmitted changes to form elements."
 
-#: src/ephy-window.c:686
+#: src/ephy-window.c:649
 msgid "If you close the document anyway, you will lose that information."
 msgstr "If you close the document anyway, you will lose that information."
 
-#: src/ephy-window.c:943 src/window-commands.c:392
+#: src/ephy-window.c:1006 src/window-commands.c:396
 msgid "Open"
 msgstr "Open"
 
-#: src/ephy-window.c:945 src/window-commands.c:417
+#: src/ephy-window.c:1008 src/window-commands.c:421
 msgid "Save As"
 msgstr "Save As"
 
-#: src/ephy-window.c:949
+#: src/ephy-window.c:1012
 msgid "Bookmark"
 msgstr "Bookmark"
 
-#: src/ephy-window.c:1135
-msgid "Insecure"
-msgstr "Insecure"
-
-#: src/ephy-window.c:1138
+#: src/ephy-window.c:1201
 msgid "Broken"
 msgstr "Broken"
 
-#: src/ephy-window.c:1141
+#: src/ephy-window.c:1204
 msgid "Medium"
 msgstr "Medium"
 
-#: src/ephy-window.c:1145
+#: src/ephy-window.c:1208
 msgid "Low"
 msgstr "Low"
 
-#: src/ephy-window.c:1149
+#: src/ephy-window.c:1212
 msgid "High"
 msgstr "High"
 
-#: src/ephy-window.c:1159
+#: src/ephy-window.c:1222
 #, c-format
 msgid ""
 "Security level: %s\n"
@@ -3194,7 +3007,7 @@ msgstr ""
 "Security level: %s\n"
 "%s"
 
-#: src/ephy-window.c:1165
+#: src/ephy-window.c:1228
 #, c-format
 msgid "Security level: %s"
 msgstr "Security level: %s"
@@ -3228,16 +3041,16 @@ msgid "Path:"
 msgstr "Path:"
 
 #: src/pdm-dialog.c:914
-msgid "Secure:"
-msgstr "Secure:"
+msgid "Send for:"
+msgstr "Send for:"
 
 #: src/pdm-dialog.c:923
-msgid "Yes"
-msgstr "Yes"
+msgid "Encrypted connections only"
+msgstr "Encrypted connections only"
 
 #: src/pdm-dialog.c:923
-msgid "No"
-msgstr "No"
+msgid "Any type of connection"
+msgstr "Any type of connection"
 
 #: src/pdm-dialog.c:929
 msgid "Expires:"
@@ -3247,22 +3060,46 @@ msgstr "Expires:"
 msgid "End of current session"
 msgstr "End of current session"
 
-#: src/popup-commands.c:329 src/popup-commands.c:337
+#: src/popup-commands.c:289 src/popup-commands.c:297
 msgid "Download link"
 msgstr "Download Link"
 
+#: src/popup-commands.c:304
+msgid "Save Image As"
+msgstr "Save Image As..."
+
+#: src/popup-commands.c:394
+msgid "Save Background As"
+msgstr "Save Background As..."
+
+#: src/ppview-toolbar.c:92
+msgid "First"
+msgstr "First"
+
 #: src/ppview-toolbar.c:93
 msgid "Go to the first page"
 msgstr "Go to the first page"
 
+#: src/ppview-toolbar.c:96
+msgid "Last"
+msgstr "Last"
+
 #: src/ppview-toolbar.c:97
 msgid "Go to the last page"
 msgstr "Go to the last page"
 
+#: src/ppview-toolbar.c:100
+msgid "Previous"
+msgstr "Previous"
+
 #: src/ppview-toolbar.c:101
 msgid "Go to the previous page"
 msgstr "Go to the previous page"
 
+#: src/ppview-toolbar.c:104
+msgid "Next"
+msgstr "Next"
+
 #: src/ppview-toolbar.c:105
 msgid "Go to next page"
 msgstr "Go to next page"
@@ -3479,7 +3316,7 @@ msgstr "Home"
 msgid "Desktop"
 msgstr "Desktop"
 
-#: src/prefs-dialog.c:1322
+#: src/prefs-dialog.c:1320
 msgid "Select a directory"
 msgstr "Select a directory"
 
@@ -3507,10 +3344,6 @@ msgstr "Up"
 msgid "Go up"
 msgstr "Go up"
 
-#: src/toolbar.c:375
-msgid "Address Entry"
-msgstr "Address Entry"
-
 #: src/toolbar.c:377
 msgid "Enter a web address to open, or a phrase to search for on the web"
 msgstr "Enter a web address to open, or a phrase to search for on the web"
@@ -3531,27 +3364,179 @@ msgstr "Icon"
 msgid "Go to the address entered in the address entry"
 msgstr "Go to the address entered in the address entry"
 
-#: src/window-commands.c:168
+#: src/window-commands.c:169
 msgid "Check this out!"
 msgstr "Check this out!"
 
-#: src/window-commands.c:878
+#: src/window-commands.c:854
 msgid "Toolbar Editor"
 msgstr "Toolbar Editor"
 
-#: src/window-commands.c:900
+#: src/window-commands.c:876
 msgid "_Add a New Toolbar"
 msgstr "_Add a New Toolbar"
 
 #. Translator credits
-#: src/window-commands.c:952
+#: src/window-commands.c:927
 msgid "translator-credits"
-msgstr "Christian Persch <chpe@gnome.org>"
+msgstr "Christian Persch <chpe@gnome.org>\n"
+"Gareth Owen <gowen72@yahoo.com>"
 
-#: src/window-commands.c:982
+#: src/window-commands.c:957
 msgid "A GNOME browser based on Mozilla"
 msgstr "A GNOME web browser based on Mozilla"
 
+#~ msgid "Epiphany Nautilus view"
+#~ msgstr "Epiphany Nautilus view"
+
+#~ msgid "Epiphany content view component"
+#~ msgstr "Epiphany content view component"
+
+#~ msgid "View as Web Page"
+#~ msgstr "View as Web Page"
+
+#~ msgid "Web Page"
+#~ msgstr "Web Page"
+
+#~ msgid "Web Page Viewer"
+#~ msgstr "Web Page Viewer"
+
+#~ msgid "Add Bookmark for Frame"
+#~ msgstr "Add Bookmark for Frame"
+
+#~ msgid "Copy"
+#~ msgstr "Copy"
+
+#~ msgid "Copy Email Address"
+#~ msgstr "Copy Email Address"
+
+#~ msgid "Copy Image Address"
+#~ msgstr "Copy Image Address"
+
+#~ msgid "Copy Link Address"
+#~ msgstr "Copy Link Address"
+
+#~ msgid "Copy Page Address"
+#~ msgstr "Copy Page Address"
+
+#~ msgid "Copy the Selection"
+#~ msgstr "Copy the Selection"
+
+#~ msgid "Cut"
+#~ msgstr "Cut"
+
+#~ msgid "Cut the Selection"
+#~ msgstr "Cut the Selection"
+
+#~ msgid "Download Link"
+#~ msgstr "Download Link"
+
+#~ msgid "Open Frame"
+#~ msgstr "Open Frame"
+
+#~ msgid "Open Frame in New Window"
+#~ msgstr "Open Frame in New Window"
+
+#~ msgid "Open Image"
+#~ msgstr "Open Image"
+
+#~ msgid "Open Image in New Window"
+#~ msgstr "Open Image in New Window"
+
+#~ msgid "Open in New Window"
+#~ msgstr "Open in New Window"
+
+#~ msgid "Paste"
+#~ msgstr "Paste"
+
+#~ msgid "Paste the Clipboard"
+#~ msgstr "Paste the Clipboard"
+
+#~ msgid "Print the Current File"
+#~ msgstr "Print the Current File"
+
+#~ msgid "Save Background As..."
+#~ msgstr "Save Background As..."
+
+#~ msgid "Save Image As..."
+#~ msgstr "Save Image As..."
+
+#~ msgid "Save Page As..."
+#~ msgstr "Save Page As..."
+
+#~ msgid "Search for a String"
+#~ msgstr "Search for a String"
+
+#~ msgid "Select All"
+#~ msgstr "Select All"
+
+#~ msgid "Select the Entire Document"
+#~ msgstr "Select the Entire Document"
+
+#~ msgid "Text _Encoding..."
+#~ msgstr "Text _Encoding..."
+
+#~ msgid "Use Image As Background"
+#~ msgstr "Use Image As Background"
+
+#~ msgid "Save Page As"
+#~ msgstr "Save Page As..."
+
+#~ msgid "_Open"
+#~ msgstr "_Open"
+
+#~ msgid ""
+#~ "Epiphany cannot handle this protocol,\n"
+#~ "and no GNOME default handler is set"
+#~ msgstr ""
+#~ "Epiphany cannot handle this protocol,\n"
+#~ "and no GNOME default handler is set"
+
+#~ msgid ""
+#~ "The protocol specified is not recognised.\n"
+#~ "\n"
+#~ "Would you like to try the GNOME default?"
+#~ msgstr ""
+#~ "The protocol specified is not recognised.\n"
+#~ "\n"
+#~ "Would you like to try the GNOME default?"
+
+#~ msgid ""
+#~ "GConf error:\n"
+#~ "  %s\n"
+#~ "All further errors shown only on terminal"
+#~ msgstr ""
+#~ "GConf error:\n"
+#~ "  %s\n"
+#~ "All further errors shown only on terminal"
+
+#~ msgid "GConf Error"
+#~ msgstr "GConf Error"
+
+#~ msgid "Choose the bookmarks source:"
+#~ msgstr "Choose the bookmarks source:"
+
+#~ msgid "Mozilla bookmarks"
+#~ msgstr "Mozilla bookmarks"
+
+#~ msgid "Galeon bookmarks"
+#~ msgstr "Galeon bookmarks"
+
+#~ msgid "Import from a file"
+#~ msgstr "Import from a file"
+
+#~ msgid "Open Image in New _Window"
+#~ msgstr "Open Image in New _Window"
+
+#~ msgid "Open Image in New T_ab"
+#~ msgstr "Open Image in New T_ab"
+
+#~ msgid "Yes"
+#~ msgstr "Yes"
+
+#~ msgid "No"
+#~ msgstr "No"
+
 #~ msgid ""
 #~ "Automatically open downloaded files which are \"safe\" to open, like "
 #~ "videos, images, text documents, compressed files, etc."