Fixes for bug 167403

2005-03-13  David Lodge <dave@cirt.net>

	* en_GB.po: Fixes for bug 167403

2 files changed, 532 insertions, 284 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index fbc208616..3bf4c8ebd 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-13  David Lodge <dave@cirt.net>
+
+	* en_GB.po: Fixes for Bug 167403
+
 2005-03-10  Hendrik Richter  <hendrik@gnome-de.org>
 
 	* de.po: Updated German translation.
diff --git a/po/en_GB.po b/po/en_GB.po
index d930497f5..18b1202df 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: epiphany\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-15 21:41+0000\n"
+"POT-Creation-Date: 2005-03-13 14:48+0000\n"
 "PO-Revision-Date: 2005-02-15 21:41+0100\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: English/GB <en@li.org>\n"
@@ -37,8 +37,12 @@ msgid "Web Bookmarks"
 msgstr "Web Bookmarks"
 
 #: ../data/epiphany-lockdown.schemas.in.h:1
-msgid "A list of protocols to be considered safe in addition to the default, when disable_unsafe_protocols is enabled."
-msgstr "A list of protocols to be considered safe in addition to the default, when disable_unsafe_protocols is enabled."
+msgid ""
+"A list of protocols to be considered safe in addition to the default, when "
+"disable_unsafe_protocols is enabled."
+msgstr ""
+"A list of protocols to be considered safe in addition to the default, when "
+"disable_unsafe_protocols is enabled."
 
 #: ../data/epiphany-lockdown.schemas.in.h:2
 msgid "Additional safe protocols"
@@ -53,8 +57,12 @@ msgid "Disable JavaScript's control over window chrome."
 msgstr "Disable JavaScript's control over window chrome."
 
 #: ../data/epiphany-lockdown.schemas.in.h:5
-msgid "Disable all historical information by disabling back and forward navigation, not allowing the history dialog and hiding the most used bookmarks list."
-msgstr "Disable all historical information by disabling back and forward navigation, not allowing the history dialogue and hiding the most used bookmarks list."
+msgid ""
+"Disable all historical information by disabling back and forward navigation, "
+"not allowing the history dialog and hiding the most used bookmarks list."
+msgstr ""
+"Disable all historical information by disabling back and forward navigation, "
+"not allowing the history dialogue and hiding the most used bookmarks list."
 
 #: ../data/epiphany-lockdown.schemas.in.h:6
 msgid "Disable arbitrary URLs"
@@ -89,16 +97,22 @@ msgid "Disable unsafe protocols"
 msgstr "Disable unsafe protocols"
 
 #: ../data/epiphany-lockdown.schemas.in.h:14
-msgid "Disables loading of content from unsafe protocols. Safe protocols are http and https."
-msgstr "Disables loading of content from unsafe protocols. Safe protocols are http and https."
+msgid ""
+"Disables loading of content from unsafe protocols. Safe protocols are http "
+"and https."
+msgstr ""
+"Disables loading of content from unsafe protocols. Safe protocols are http "
+"and https."
 
 #: ../data/epiphany-lockdown.schemas.in.h:15
 msgid "Hide menubar by default"
 msgstr "Hide menubar by default"
 
 #: ../data/epiphany-lockdown.schemas.in.h:16
-msgid "Hide the menubar by default. The menubar can still be accessed using F10."
-msgstr "Hide the menubar by default. The menubar can still be accessed using F10."
+msgid ""
+"Hide the menubar by default. The menubar can still be accessed using F10."
+msgstr ""
+"Hide the menubar by default. The menubar can still be accessed using F10."
 
 #: ../data/epiphany-lockdown.schemas.in.h:17
 msgid "Lock in fullscreen mode"
@@ -112,8 +126,7 @@ msgstr "Locks Epiphany in fullscreen mode."
 msgid "Browse the web"
 msgstr "Browse the web"
 
-#: ../data/epiphany.desktop.in.h:2
-#: ../src/ephy-main.c:177
+#: ../data/epiphany.desktop.in.h:2 ../src/ephy-main.c:234
 msgid "Epiphany Web Browser"
 msgstr "Epiphany Web Browser"
 
@@ -134,8 +147,10 @@ msgid "Allow popups"
 msgstr "Allow popups"
 
 #: ../data/epiphany.schemas.in.h:4
-msgid "Allow sites to open new windows using JavaScript (if JavaScript is enabled)."
-msgstr "Allow sites to open new windows using JavaScript (if JavaScript is enabled)."
+msgid ""
+"Allow sites to open new windows using JavaScript (if JavaScript is enabled)."
+msgstr ""
+"Allow sites to open new windows using JavaScript (if JavaScript is enabled)."
 
 #: ../data/epiphany.schemas.in.h:5
 msgid "Always show the tab bar"
@@ -162,8 +177,42 @@ msgid "Default encoding"
 msgstr "Default encoding"
 
 #: ../data/epiphany.schemas.in.h:11
-msgid "Default encoding. Accepted values are: \"armscii-8\", \"Big5\", \"Big5-HKSCS\", \"EUC-JP\", \"EUC-KR\", \"gb18030\", \"GB2312\", \"geostd8\", \"HZ-GB-2312\", \"IBM850\", \"IBM852\", \"IBM855\", \"IBM857\", \"IBM862\", \"IBM864\", \"IBM866\", \"ISO-2022-CN\", \"ISO-2022-JP\", \"ISO-2022-KR\", \"ISO-8859-1\", \"ISO-8859-2\", \"ISO-8859-3\", \"ISO-8859-4\", \"ISO-8859-5\", \"ISO-8859-6\", \"ISO-8859-7\", \"ISO-8859-8\", \"ISO-8859-8-I\", \"ISO-8859-9\", \"ISO-8859-10\", \"ISO-8859-11\", \"ISO-8859-13\", \"ISO-8859-14\", \"ISO-8859-15\", \"ISO-8859-16\", \"ISO-IR-111\", \"KOI8-R\", \"KOI8-U\", \"Shift_JIS\", \"TIS-620\", \"UTF-7\", \"UTF-8\", \"VISCII\", \"windows-874\", \"windows-1250\", \"windows-1251\", \"windows-1252\", \"windows-1253\", \"windows-1254\", \"windows-1255\", \"windows-1256\", \"windows-1257\", \"windows-1258\", \"x-euc-tw\", \"x-gbk\", \"x-johab\", \"x-mac-arabic\", \"x-mac-ce\", \"x-mac-croatian\", \"x-mac-cyrillic\", \"x-mac-devanagari\", \"x-mac-farsi\", \"x-mac-greek\", \"x-mac-gujarati\", \"x-mac-gurmukhi\", \"x-mac-hebrew\", \"x-mac-icelandic\", \"x-mac-roman\", \"x-mac-romanian\", \"x-mac-turkish\", \"x-mac-ukrainian\", \"x-user-defined\", \"x-viet-tcvn5712\", \"x-viet-vps\" and \"x-windows-949\"."
-msgstr "Default encoding. Accepted values are: \"armscii-8\", \"Big5\", \"Big5-HKSCS\", \"EUC-JP\", \"EUC-KR\", \"gb18030\", \"GB2312\", \"geostd8\", \"HZ-GB-2312\", \"IBM850\", \"IBM852\", \"IBM855\", \"IBM857\", \"IBM862\", \"IBM864\", \"IBM866\", \"ISO-2022-CN\", \"ISO-2022-JP\", \"ISO-2022-KR\", \"ISO-8859-1\", \"ISO-8859-2\", \"ISO-8859-3\", \"ISO-8859-4\", \"ISO-8859-5\", \"ISO-8859-6\", \"ISO-8859-7\", \"ISO-8859-8\", \"ISO-8859-8-I\", \"ISO-8859-9\", \"ISO-8859-10\", \"ISO-8859-11\", \"ISO-8859-13\", \"ISO-8859-14\", \"ISO-8859-15\", \"ISO-8859-16\", \"ISO-IR-111\", \"KOI8-R\", \"KOI8-U\", \"Shift_JIS\", \"TIS-620\", \"UTF-7\", \"UTF-8\", \"VISCII\", \"windows-874\", \"windows-1250\", \"windows-1251\", \"windows-1252\", \"windows-1253\", \"windows-1254\", \"windows-1255\", \"windows-1256\", \"windows-1257\", \"windows-1258\", \"x-euc-tw\", \"x-gbk\", \"x-johab\", \"x-mac-arabic\", \"x-mac-ce\", \"x-mac-croatian\", \"x-mac-cyrillic\", \"x-mac-devanagari\", \"x-mac-farsi\", \"x-mac-greek\", \"x-mac-gujarati\", \"x-mac-gurmukhi\", \"x-mac-hebrew\", \"x-mac-icelandic\", \"x-mac-roman\", \"x-mac-romanian\", \"x-mac-turkish\", \"x-mac-ukrainian\", \"x-user-defined\", \"x-viet-tcvn5712\", \"x-viet-vps\" and \"x-windows-949\"."
+msgid ""
+"Default encoding. Accepted values are: \"armscii-8\", \"Big5\", \"Big5-HKSCS"
+"\", \"EUC-JP\", \"EUC-KR\", \"gb18030\", \"GB2312\", \"geostd8\", \"HZ-GB-"
+"2312\", \"IBM850\", \"IBM852\", \"IBM855\", \"IBM857\", \"IBM862\", \"IBM864"
+"\", \"IBM866\", \"ISO-2022-CN\", \"ISO-2022-JP\", \"ISO-2022-KR\", \"ISO-"
+"8859-1\", \"ISO-8859-2\", \"ISO-8859-3\", \"ISO-8859-4\", \"ISO-8859-5\", "
+"\"ISO-8859-6\", \"ISO-8859-7\", \"ISO-8859-8\", \"ISO-8859-8-I\", \"ISO-8859-"
+"9\", \"ISO-8859-10\", \"ISO-8859-11\", \"ISO-8859-13\", \"ISO-8859-14\", "
+"\"ISO-8859-15\", \"ISO-8859-16\", \"ISO-IR-111\", \"KOI8-R\", \"KOI8-U\", "
+"\"Shift_JIS\", \"TIS-620\", \"UTF-7\", \"UTF-8\", \"VISCII\", \"windows-874"
+"\", \"windows-1250\", \"windows-1251\", \"windows-1252\", \"windows-1253\", "
+"\"windows-1254\", \"windows-1255\", \"windows-1256\", \"windows-1257\", "
+"\"windows-1258\", \"x-euc-tw\", \"x-gbk\", \"x-johab\", \"x-mac-arabic\", "
+"\"x-mac-ce\", \"x-mac-croatian\", \"x-mac-cyrillic\", \"x-mac-devanagari\", "
+"\"x-mac-farsi\", \"x-mac-greek\", \"x-mac-gujarati\", \"x-mac-gurmukhi\", "
+"\"x-mac-hebrew\", \"x-mac-icelandic\", \"x-mac-roman\", \"x-mac-romanian\", "
+"\"x-mac-turkish\", \"x-mac-ukrainian\", \"x-user-defined\", \"x-viet-tcvn5712"
+"\", \"x-viet-vps\" and \"x-windows-949\"."
+msgstr ""
+"Default encoding. Accepted values are: \"armscii-8\", \"Big5\", \"Big5-HKSCS"
+"\", \"EUC-JP\", \"EUC-KR\", \"gb18030\", \"GB2312\", \"geostd8\", \"HZ-GB-"
+"2312\", \"IBM850\", \"IBM852\", \"IBM855\", \"IBM857\", \"IBM862\", \"IBM864"
+"\", \"IBM866\", \"ISO-2022-CN\", \"ISO-2022-JP\", \"ISO-2022-KR\", \"ISO-"
+"8859-1\", \"ISO-8859-2\", \"ISO-8859-3\", \"ISO-8859-4\", \"ISO-8859-5\", "
+"\"ISO-8859-6\", \"ISO-8859-7\", \"ISO-8859-8\", \"ISO-8859-8-I\", \"ISO-8859-"
+"9\", \"ISO-8859-10\", \"ISO-8859-11\", \"ISO-8859-13\", \"ISO-8859-14\", "
+"\"ISO-8859-15\", \"ISO-8859-16\", \"ISO-IR-111\", \"KOI8-R\", \"KOI8-U\", "
+"\"Shift_JIS\", \"TIS-620\", \"UTF-7\", \"UTF-8\", \"VISCII\", \"windows-874"
+"\", \"windows-1250\", \"windows-1251\", \"windows-1252\", \"windows-1253\", "
+"\"windows-1254\", \"windows-1255\", \"windows-1256\", \"windows-1257\", "
+"\"windows-1258\", \"x-euc-tw\", \"x-gbk\", \"x-johab\", \"x-mac-arabic\", "
+"\"x-mac-ce\", \"x-mac-croatian\", \"x-mac-cyrillic\", \"x-mac-devanagari\", "
+"\"x-mac-farsi\", \"x-mac-greek\", \"x-mac-gujarati\", \"x-mac-gurmukhi\", "
+"\"x-mac-hebrew\", \"x-mac-icelandic\", \"x-mac-roman\", \"x-mac-romanian\", "
+"\"x-mac-turkish\", \"x-mac-ukrainian\", \"x-user-defined\", \"x-viet-tcvn5712"
+"\", \"x-viet-vps\" and \"x-windows-949\"."
 
 #: ../data/epiphany.schemas.in.h:12
 msgid "Default font type"
@@ -198,8 +247,12 @@ msgid "Filename to print to."
 msgstr "Filename to print to."
 
 #: ../data/epiphany.schemas.in.h:20
-msgid "For find in page, whether to start again at the beginning after reaching the end of the page."
-msgstr "For find in page, whether to start again at the beginning after reaching the end of the page."
+msgid ""
+"For find in page, whether to start again at the beginning after reaching the "
+"end of the page."
+msgstr ""
+"For find in page, whether to start again at the beginning after reaching the "
+"end of the page."
 
 #: ../data/epiphany.schemas.in.h:21
 msgid "History pages time range"
@@ -230,20 +283,30 @@ msgid "Match case for find in page."
 msgstr "Match case for find in page."
 
 #: ../data/epiphany.schemas.in.h:28
-msgid "Middle click to open the web page pointed to by the currently selected text"
-msgstr "Middle click to open the web page pointed to by the currently selected text"
+msgid ""
+"Middle click to open the web page pointed to by the currently selected text"
+msgstr ""
+"Middle click to open the web page pointed to by the currently selected text"
 
 #: ../data/epiphany.schemas.in.h:29
-msgid "Middle clicking on the main view pane will open the web page pointed to by the currently selected text."
-msgstr "Middle clicking on the main view pane will open the web page pointed to by the currently selected text."
+msgid ""
+"Middle clicking on the main view pane will open the web page pointed to by "
+"the currently selected text."
+msgstr ""
+"Middle clicking on the main view pane will open the web page pointed to by "
+"the currently selected text."
 
 #: ../data/epiphany.schemas.in.h:30
 msgid "Paper type"
 msgstr "Paper type"
 
 #: ../data/epiphany.schemas.in.h:31
-msgid "Paper type. Supported values are \"A4\", \"Letter\", \"Legal\" and \"Executive\"."
-msgstr "Paper type. Supported values are \"A4\", \"Letter\", \"Legal\" and \"Executive\"."
+msgid ""
+"Paper type. Supported values are \"A4\", \"Letter\", \"Legal\" and "
+"\"Executive\"."
+msgstr ""
+"Paper type. Supported values are \"A4\", \"Letter\", \"Legal\" and "
+"\"Executive\"."
 
 #: ../data/epiphany.schemas.in.h:32
 msgid "Preferred languages, two letter codes."
@@ -306,8 +369,12 @@ msgid "Show statusbar by default."
 msgstr "Show statusbar by default."
 
 #: ../data/epiphany.schemas.in.h:47
-msgid "Show the history pages visited \"ever\", \"last_two_days\", \"last_three_days\", \"today\"."
-msgstr "Show the history pages visited \"ever\", \"last_two_days\", \"last_three_days\", \"today\"."
+msgid ""
+"Show the history pages visited \"ever\", \"last_two_days\", \"last_three_days"
+"\", \"today\"."
+msgstr ""
+"Show the history pages visited \"ever\", \"last_two_days\", \"last_three_days"
+"\", \"today\"."
 
 #: ../data/epiphany.schemas.in.h:48
 msgid "Show the tab bar also when there is only one tab open."
@@ -334,16 +401,35 @@ msgid "The bookmark information shown in the editor view"
 msgstr "The bookmark information shown in the editor view"
 
 #: ../data/epiphany.schemas.in.h:54
-msgid "The bookmark information shown in the editor view. Valid values in the list are \"address\" and \"title\"."
-msgstr "The bookmark information shown in the editor view. Valid values in the list are \"address\" and \"title\"."
+msgid ""
+"The bookmark information shown in the editor view. Valid values in the list "
+"are \"address\" and \"title\"."
+msgstr ""
+"The bookmark information shown in the editor view. Valid values in the list "
+"are \"address\" and \"title\"."
 
 #: ../data/epiphany.schemas.in.h:55
 msgid "The currently selected fonts language"
 msgstr "The currently selected fonts language"
 
 #: ../data/epiphany.schemas.in.h:56
-msgid "The currently selected fonts language. Valid values are \"ar\" (arabic), \"x-baltic\" (baltic languages), \"x-central-euro\" (central european languages), \"x-cyrillic\" (languages written with cyrillic alphabet), \"el\" (greek), \"he\" (hebrew), \"ja\" (japanese), \"ko\" (korean), \"zh-CN\" (simplified chinese), \"th\" (thai), \"zh-TW\" (traditional chinese), \"tr\" (turkish), \"x-unicode\" (other languages), \"x-western\" (languages written in latin script), \"x-tamil\" (tamil) and \"x-devanagari\" (devanagari)."
-msgstr "The currently selected fonts language. Values are \"ar\" (arabic), \"x-baltic\" (baltic languages), \"x-central-euro\" (central european languages), \"x-cyrillic\" (languages written with cyrillic alphabet), \"el\" (greek), \"he\" (hebrew), \"ja\" (japanese), \"ko\" (korean), \"zh-CN\" (simplified chinese), \"th\" (thai), \"zh-TW\" (traditional chinese), \"tr\" (turkish), \"x-unicode\" (other languages), \"x-western\" (languages written in latin script), \"x-tamil\" (tamil) and \"x-devanagari\" (devanagari)."
+msgid ""
+"The currently selected fonts language. Valid values are \"ar\" (arabic), \"x-"
+"baltic\" (baltic languages), \"x-central-euro\" (central european "
+"languages), \"x-cyrillic\" (languages written with cyrillic alphabet), \"el"
+"\" (greek), \"he\" (hebrew), \"ja\" (japanese), \"ko\" (korean), \"zh-CN"
+"\" (simplified chinese), \"th\" (thai), \"zh-TW\" (traditional chinese), \"tr"
+"\" (turkish), \"x-unicode\" (other languages), \"x-western\" (languages "
+"written in latin script), \"x-tamil\" (tamil) and \"x-devanagari"
+"\" (devanagari)."
+msgstr ""
+"The currently selected fonts language. Values are \"ar\" (arabic), \"x-baltic"
+"\" (baltic languages), \"x-central-euro\" (central european languages), \"x-"
+"cyrillic\" (languages written with cyrillic alphabet), \"el\" (greek), \"he"
+"\" (hebrew), \"ja\" (japanese), \"ko\" (korean), \"zh-CN\" (simplified "
+"chinese), \"th\" (thai), \"zh-TW\" (traditional chinese), \"tr\" (turkish), "
+"\"x-unicode\" (other languages), \"x-western\" (languages written in latin "
+"script), \"x-tamil\" (tamil) and \"x-devanagari\" (devanagari)."
 
 #: ../data/epiphany.schemas.in.h:57
 msgid "The downloads folder"
@@ -354,16 +440,38 @@ msgid "The encoding autodetector. Empty string means autodetect is off"
 msgstr "The encoding autodetector. Empty string means autodetect is off"
 
 #: ../data/epiphany.schemas.in.h:59
-msgid "The encoding autodetector. Valid entries are \"\" (autodetectors off), \"cjk_parallel_state_machine\" (autodetect east asian encodings), \"ja_parallel_state_machine\" (autodetect japanese encodings), \"ko_parallel_state_machine\" (autodetect korean encodings), \"ruprob\" (autodetect russian encodings), \"ukprob\" (autodetect ukrainian encodings), \"zh_parallel_state_machine\" (autodetect chinese encodings), \"zhcn_parallel_state_machine\" (autodetect simplified chinese encodings), \"zhtw_parallel_state_machine\" (autodetect traditional chinese encodings) and \"universal_charset_detector\" (autodetect most encodings)."
-msgstr "The encoding autodetector. Valid entries are \"\" (autodetectors off), \"cjk_parallel_state_machine\" (autodetect east asian encodings), \"ja_parallel_state_machine\" (autodetect japanese encodings), \"ko_parallel_state_machine\" (autodetect korean encodings), \"ruprob\" (autodetect russian encodings), \"ukprob\" (autodetect ukrainian encodings), \"zh_parallel_state_machine\" (autodetect chinese encodings), \"zhcn_parallel_state_machine\" (autodetect simplified chinese encodings), \"zhtw_parallel_state_machine\" (autodetect traditional chinese encodings) and \"universal_charset_detector\" (autodetect most encodings)."
+msgid ""
+"The encoding autodetector. Valid entries are \"\" (autodetectors off), "
+"\"cjk_parallel_state_machine\" (autodetect east asian encodings), "
+"\"ja_parallel_state_machine\" (autodetect japanese encodings), "
+"\"ko_parallel_state_machine\" (autodetect korean encodings), \"ruprob"
+"\" (autodetect russian encodings), \"ukprob\" (autodetect ukrainian "
+"encodings), \"zh_parallel_state_machine\" (autodetect chinese encodings), "
+"\"zhcn_parallel_state_machine\" (autodetect simplified chinese encodings), "
+"\"zhtw_parallel_state_machine\" (autodetect traditional chinese encodings) "
+"and \"universal_charset_detector\" (autodetect most encodings)."
+msgstr ""
+"The encoding autodetector. Valid entries are \"\" (autodetectors off), "
+"\"cjk_parallel_state_machine\" (autodetect east asian encodings), "
+"\"ja_parallel_state_machine\" (autodetect japanese encodings), "
+"\"ko_parallel_state_machine\" (autodetect korean encodings), \"ruprob"
+"\" (autodetect russian encodings), \"ukprob\" (autodetect ukrainian "
+"encodings), \"zh_parallel_state_machine\" (autodetect chinese encodings), "
+"\"zhcn_parallel_state_machine\" (autodetect simplified chinese encodings), "
+"\"zhtw_parallel_state_machine\" (autodetect traditional chinese encodings) "
+"and \"universal_charset_detector\" (autodetect most encodings)."
 
 #: ../data/epiphany.schemas.in.h:60
 msgid "The page information shown in the history view"
 msgstr "The page information shown in the history view"
 
 #: ../data/epiphany.schemas.in.h:61
-msgid "The page information shown in the history view. Valid values in the list are \"address\", \"title\"."
-msgstr "The page information shown in the history view. Valid values in the list are \"address\", \"title\"."
+msgid ""
+"The page information shown in the history view. Valid values in the list are "
+"\"address\", \"title\"."
+msgstr ""
+"The page information shown in the history view. Valid values in the list are "
+"\"address\", \"title\"."
 
 #: ../data/epiphany.schemas.in.h:62
 msgid "The path of the folder where downloads are saved."
@@ -374,8 +482,14 @@ msgid "Toolbar style"
 msgstr "Toolbar style"
 
 #: ../data/epiphany.schemas.in.h:64
-msgid "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and \"text\"."
-msgstr "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and \"text\"."
+msgid ""
+"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both"
+"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and "
+"\"text\"."
+msgstr ""
+"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both"
+"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and "
+"\"text\"."
 
 #: ../data/epiphany.schemas.in.h:65
 msgid "Use caret browsing mode."
@@ -398,12 +512,20 @@ msgid "Use your own fonts instead of the fonts the page requests."
 msgstr "Use your own fonts instead of the fonts the page requests."
 
 #: ../data/epiphany.schemas.in.h:70
-msgid "When files cannot be opened by the browser they are automatically downloaded to the download folder and opened with the appropriate application."
-msgstr "When files cannot be opened by the browser they are automatically downloaded to the download folder and opened with the appropriate application."
+msgid ""
+"When files cannot be opened by the browser they are automatically downloaded "
+"to the download folder and opened with the appropriate application."
+msgstr ""
+"When files cannot be opened by the browser they are automatically downloaded "
+"to the download folder and opened with the appropriate application."
 
 #: ../data/epiphany.schemas.in.h:71
-msgid "Where to accept cookies from. Possible values are \"anywhere\", \"current site\" and \"nowhere\"."
-msgstr "Where to accept cookies from. Possible values are \"anywhere\", \"current site\" and \"nowhere\"."
+msgid ""
+"Where to accept cookies from. Possible values are \"anywhere\", \"current "
+"site\" and \"nowhere\"."
+msgstr ""
+"Where to accept cookies from. Possible values are \"anywhere\", \"current "
+"site\" and \"nowhere\"."
 
 #: ../data/epiphany.schemas.in.h:72
 msgid "Whether to print the date in the footer"
@@ -535,8 +657,7 @@ msgstr "Cookies"
 msgid "Download Manager"
 msgstr "Download Manager"
 
-#: ../data/glade/epiphany.glade.h:6
-#: ../src/ephy-window.c:1114
+#: ../data/glade/epiphany.glade.h:6 ../src/ephy-window.c:1116
 msgid "Find"
 msgstr "Find"
 
@@ -552,8 +673,7 @@ msgstr "Personal Data Manager"
 msgid "Text Encoding"
 msgstr "Text Encoding"
 
-#: ../data/glade/epiphany.glade.h:10
-#: ../src/ephy-encoding-menu.c:359
+#: ../data/glade/epiphany.glade.h:10 ../src/ephy-encoding-menu.c:359
 msgid "Use the encoding specified by the document"
 msgstr "Use the encoding specified by the document"
 
@@ -565,8 +685,7 @@ msgstr "_Find:"
 msgid "_Next"
 msgstr "_Next"
 
-#: ../data/glade/epiphany.glade.h:13
-#: ../embed/downloader-view.c:314
+#: ../data/glade/epiphany.glade.h:13 ../embed/downloader-view.c:314
 msgid "_Pause"
 msgstr "_Pause"
 
@@ -578,8 +697,7 @@ msgstr "_Previous"
 msgid "_Wrap around"
 msgstr "_Wrap around"
 
-#: ../data/glade/prefs-dialog.glade.h:1
-#: ../data/glade/print.glade.h:1
+#: ../data/glade/prefs-dialog.glade.h:1 ../data/glade/print.glade.h:1
 msgid "<b>Colors</b>"
 msgstr "<b>Colours</b>"
 
@@ -644,10 +762,11 @@ msgid "Choose a l_anguage:"
 msgstr "Choose a l_anguage:"
 
 #. Translators: the mnemonic shouldn't conflict with any of the
+#. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
 #. * Select All, Input Methods and Insert Unicode control character.)
+#.
 #: ../data/glade/prefs-dialog.glade.h:17
-#: ../lib/widgets/ephy-location-entry.c:425
-#: ../src/ephy-history-window.c:264
+#: ../lib/widgets/ephy-location-entry.c:425 ../src/ephy-history-window.c:264
 msgid "Cl_ear"
 msgstr "Cl_ear"
 
@@ -808,8 +927,7 @@ msgstr "Page _numbers"
 msgid "Paper"
 msgstr "Paper"
 
-#: ../data/glade/print.glade.h:21
-#: ../src/ephy-window.c:1110
+#: ../data/glade/print.glade.h:21 ../src/ephy-window.c:1112
 msgid "Print"
 msgstr "Print"
 
@@ -902,8 +1020,7 @@ msgstr ""
 "%s\n"
 "%s of %s"
 
-#: ../embed/downloader-view.c:372
-#: ../src/ephy-window.c:1308
+#: ../embed/downloader-view.c:372 ../src/ephy-window.c:1310
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -915,18 +1032,18 @@ msgstr[0] "%d download"
 msgstr[1] "%d downloads"
 
 #. Translators: The text before the "|" is context to help you decide on
-#: ../embed/downloader-view.c:521
-#: ../embed/downloader-view.c:534
+#. * the correct translation. You MUST OMIT it in the translated string.
+#: ../embed/downloader-view.c:521 ../embed/downloader-view.c:534
 msgid "download status|Unknown"
-msgstr "download status|Unknown"
+msgstr "Unknown"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../embed/downloader-view.c:526
 msgid "download status|Failed"
-msgstr "download status|Failed"
+msgstr "Failed"
 
-#: ../embed/downloader-view.c:588
-#: ../src/bookmarks/ephy-bookmarks-editor.c:875
+#: ../embed/downloader-view.c:588 ../src/bookmarks/ephy-bookmarks-editor.c:875
 msgid "File"
 msgstr "File"
 
@@ -1231,6 +1348,8 @@ 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:137
 msgid "English (_US-ASCII)"
 msgstr "English (_US-ASCII)"
@@ -1252,56 +1371,68 @@ msgid "Unicode (UTF-3_2 LE)"
 msgstr "Unicode (UTF-3_2 LE)"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../embed/ephy-encodings.c:145
 msgid "autodetectors|Off"
-msgstr "autodetectors|Off"
+msgstr "Off"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../embed/ephy-encodings.c:148
 msgid "automatically detect ... character encodings|Chinese"
-msgstr "automatically detect ... character encodings|Chinese"
+msgstr "Chinese"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../embed/ephy-encodings.c:151
 msgid "automatically detect ... character encodings|Simplified Chinese"
-msgstr "automatically detect ... character encodings|Simplified Chinese"
+msgstr "Simplified Chinese"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../embed/ephy-encodings.c:154
 msgid "automatically detect ... character encodings|Traditional Chinese"
-msgstr "automatically detect ... character encodings|Traditional Chinese"
+msgstr "Traditional Chinese"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../embed/ephy-encodings.c:157
 msgid "automatically detect ... character encodings|East Asian"
-msgstr "automatically detect ... character encodings|East Asian"
+msgstr "East Asian"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../embed/ephy-encodings.c:160
 msgid "automatically detect ... character encodings|Japanese"
-msgstr "automatically detect ... character encodings|Japanese"
+msgstr "Japanese"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../embed/ephy-encodings.c:163
 msgid "automatically detect ... character encodings|Korean"
-msgstr "automatically detect ... character encodings|Korean"
+msgstr "Korean"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../embed/ephy-encodings.c:166
 msgid "automatically detect ... character encodings|Russian"
-msgstr "automatically detect ... character encodings|Russian"
+msgstr "Russian"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../embed/ephy-encodings.c:169
 msgid "automatically detect ... character encodings|Universal"
-msgstr "automatically detect ... character encodings|Universal"
+msgstr "Universal"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../embed/ephy-encodings.c:172
 msgid "automatically detect ... character encodings|Ukrainian"
-msgstr "automatically detect ... character encodings|Ukrainian"
+msgstr "Ukrainian"
 
 #. translators: this is the title that an unknown encoding will
+#. * be displayed as.
+#.
 #: ../embed/ephy-encodings.c:364
 #, c-format
 msgid "Unknown (%s)"
@@ -1319,59 +1450,67 @@ msgstr "Others"
 msgid "Local files"
 msgstr "Local files"
 
-#: ../embed/mozilla/ContentHandler.cpp:147
-#: ../embed/mozilla/EphyHeaderSniffer.cpp:358
+#: ../embed/mozilla/ContentHandler.cpp:155
+#: ../embed/mozilla/EphyHeaderSniffer.cpp:365
 msgid "Save"
 msgstr "Save"
 
-#: ../embed/mozilla/ContentHandler.cpp:258
+#: ../embed/mozilla/ContentHandler.cpp:269
 msgid "Download the unsafe file?"
 msgstr "Download the unsafe file?"
 
-#: ../embed/mozilla/ContentHandler.cpp:261
-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 "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:272
+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 ""
+"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."
 
 #. translators: %s is the name of the application
-#: ../embed/mozilla/ContentHandler.cpp:272
+#: ../embed/mozilla/ContentHandler.cpp:283
 #, c-format
 msgid "Open this file with \"%s\"?"
 msgstr "Open this file with \"%s\"?"
 
 #. translators: %s is the name of the application
-#: ../embed/mozilla/ContentHandler.cpp:277
+#: ../embed/mozilla/ContentHandler.cpp:288
 #, c-format
-msgid "It's not possible to view this file type directly in the browser. You can open it with \"%s\" or save it."
-msgstr "It's not possible to view this file type directly in the browser. You can open it with \"%s\" or save it."
+msgid ""
+"It's not possible to view this file type directly in the browser. You can "
+"open it with \"%s\" or save it."
+msgstr ""
+"It's not possible to view this file type directly in the browser. You can "
+"open it with \"%s\" or save it."
 
-#: ../embed/mozilla/ContentHandler.cpp:287
+#: ../embed/mozilla/ContentHandler.cpp:298
 msgid "Download the file?"
 msgstr "Download the file?"
 
-#: ../embed/mozilla/ContentHandler.cpp:290
-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 "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/ContentHandler.cpp:301
+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 ""
+"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/ContentHandler.cpp:295
+#: ../embed/mozilla/ContentHandler.cpp:306
 msgid "_Save As..."
 msgstr "_Save As..."
 
 #: ../embed/mozilla/EphyHeaderSniffer.cpp:321
 #: ../src/bookmarks/ephy-bookmarks-import.c:245
-#: ../src/bookmarks/ephy-bookmarksbar-model.c:350
-#: ../src/window-commands.c:316
+#: ../src/bookmarks/ephy-bookmarksbar-model.c:350 ../src/window-commands.c:315
 msgid "Untitled"
 msgstr "Untitled"
 
-#: ../embed/mozilla/FilePicker.cpp:148
-#: ../embed/print-dialog.c:337
-#: ../lib/ephy-file-chooser.c:371
-#: ../src/bookmarks/ephy-bookmarks-editor.c:717
+#: ../embed/mozilla/FilePicker.cpp:148 ../embed/print-dialog.c:337
+#: ../lib/ephy-file-chooser.c:371 ../src/bookmarks/ephy-bookmarks-editor.c:717
 msgid "All files"
 msgstr "All files"
 
-#: ../embed/mozilla/FilePicker.cpp:153
-#: ../lib/ephy-file-chooser.c:355
+#: ../embed/mozilla/FilePicker.cpp:153 ../lib/ephy-file-chooser.c:355
 msgid "Web pages"
 msgstr "Web pages"
 
@@ -1379,8 +1518,7 @@ msgstr "Web pages"
 msgid "Text files"
 msgstr "Text files"
 
-#: ../embed/mozilla/FilePicker.cpp:166
-#: ../lib/ephy-file-chooser.c:363
+#: ../embed/mozilla/FilePicker.cpp:166 ../lib/ephy-file-chooser.c:363
 msgid "Images"
 msgstr "Images"
 
@@ -1421,13 +1559,23 @@ msgstr "_Accept"
 
 #: ../embed/mozilla/GtkNSSDialogs.cpp:303
 #, c-format
-msgid "The site \"%s\" returned security information for \"%s\". It is possible that someone is intercepting your communication to obtain your confidential information."
-msgstr "The site \"%s\" returned security information for \"%s\". It is possible that someone is intercepting your communication to obtain your confidential information."
+msgid ""
+"The site \"%s\" returned security information for \"%s\". It is possible "
+"that someone is intercepting your communication to obtain your confidential "
+"information."
+msgstr ""
+"The site \"%s\" returned security information for \"%s\". It is possible "
+"that someone is intercepting your communication to obtain your confidential "
+"information."
 
 #: ../embed/mozilla/GtkNSSDialogs.cpp:309
 #, 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\"."
+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:314
 msgid "Accept incorrect security information?"
@@ -1435,13 +1583,23 @@ msgstr "Accept incorrect security information?"
 
 #: ../embed/mozilla/GtkNSSDialogs.cpp:345
 #, c-format
-msgid "It was not possible to automatically trust \"%s\". It is possible that someone is intercepting your communication to obtain your confidential information."
-msgstr "It was not possible to automatically trust \"%s\". It is possible that someone is intercepting your communication to obtain your confidential information."
+msgid ""
+"It was not possible to automatically trust \"%s\". It is possible that "
+"someone is intercepting your communication to obtain your confidential "
+"information."
+msgstr ""
+"It was not possible to automatically trust \"%s\". It is possible that "
+"someone is intercepting your communication to obtain your confidential "
+"information."
 
 #: ../embed/mozilla/GtkNSSDialogs.cpp:351
 #, c-format
-msgid "You should only connect to the site if you are certain you are connected to \"%s\"."
-msgstr "You should only connect to the site if you are certain you are connected to \"%s\"."
+msgid ""
+"You should only connect to the site if you are certain you are connected to "
+"\"%s\"."
+msgstr ""
+"You should only connect to the site if you are certain you are connected to "
+"\"%s\"."
 
 #: ../embed/mozilla/GtkNSSDialogs.cpp:356
 msgid "Connect to untrusted site?"
@@ -1474,6 +1632,7 @@ msgid "The security information for \"%s\" isn't valid until %s."
 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:444
 msgid "%a %d %b %Y"
@@ -1511,8 +1670,12 @@ msgid "Trust new Certificate Authority?"
 msgstr "Trust new Certificate Authority?"
 
 #: ../embed/mozilla/GtkNSSDialogs.cpp:568
-msgid "Before trusting a Certificate Authority (CA) you should verify the certificate is authentic."
-msgstr "Before trusting a Certificate Authority (CA) you should verify the certificate is authentic."
+msgid ""
+"Before trusting a Certificate Authority (CA) you should verify the "
+"certificate is authentic."
+msgstr ""
+"Before trusting a Certificate Authority (CA) you should verify the "
+"certificate is authentic."
 
 #: ../embed/mozilla/GtkNSSDialogs.cpp:578
 msgid "_Web sites"
@@ -1617,8 +1780,10 @@ 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:1368
-msgid "Could not verify this certificate because the CA certificate is invalid."
-msgstr "Could not verify this certificate because the CA certificate is invalid."
+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:1373
 msgid "Could not verify this certificate for unknown reasons."
@@ -1629,8 +1794,12 @@ msgid "Generating Private Key."
 msgstr "Generating Private Key."
 
 #: ../embed/mozilla/GtkNSSKeyPairDialogs.cpp:231
-msgid "Please wait while a new private key is generated. This process could take a few minutes."
-msgstr "Please wait while a new private key is generated. This process could take a few minutes."
+msgid ""
+"Please wait while a new private key is generated. This process could take a "
+"few minutes."
+msgstr ""
+"Please wait while a new private key is generated. This process could take a "
+"few minutes."
 
 #: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:92
 msgid "Security Notice"
@@ -1641,8 +1810,12 @@ msgid "This page is loaded over a secure connection"
 msgstr "This page is loaded over a secure connection"
 
 #: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:94
-msgid "You can always see the security status of a page from the padlock icon on the statusbar."
-msgstr "You can always see the security status of a page from the padlock icon on the statusbar."
+msgid ""
+"You can always see the security status of a page from the padlock icon on "
+"the statusbar."
+msgstr ""
+"You can always see the security status of a page from the padlock icon on "
+"the statusbar."
 
 #: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:111
 #: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:139
@@ -1656,16 +1829,24 @@ msgid "This page is loaded over a low security connection"
 msgstr "This page is loaded over a low security connection"
 
 #: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:113
-msgid "Any information you see or enter on this page could easily be intercepted by a third party."
-msgstr "Any information you see or enter on this page could easily be intercepted by a third party."
+msgid ""
+"Any information you see or enter on this page could easily be intercepted by "
+"a third party."
+msgstr ""
+"Any information you see or enter on this page could easily be intercepted by "
+"a third party."
 
 #: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:140
 msgid "Some parts of this page are loaded over an insecure connection"
 msgstr "Some parts of this page are loaded over an insecure connection"
 
 #: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:141
-msgid "Some information you see or enter will be sent over an insecure connection, and could easily be intercepted by a third party."
-msgstr "Some information you see or enter will be sent over an insecure connection, and could easily be intercepted by a third party."
+msgid ""
+"Some information you see or enter will be sent over an insecure connection, "
+"and could easily be intercepted by a third party."
+msgstr ""
+"Some information you see or enter will be sent over an insecure connection, "
+"and could easily be intercepted by a third party."
 
 #: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:159
 #: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:179
@@ -1673,8 +1854,12 @@ msgid "Send this information over an insecure connection?"
 msgstr "Send this information over an insecure connection?"
 
 #: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:160
-msgid "The information you have entered will be sent over an insecure connection, and could easily be intercepted by a third party."
-msgstr "The information you have entered will be sent over an insecure connection, and could easily be intercepted by a third party."
+msgid ""
+"The information you have entered will be sent over an insecure connection, "
+"and could easily be intercepted by a third party."
+msgstr ""
+"The information you have entered will be sent over an insecure connection, "
+"and could easily be intercepted by a third party."
 
 #: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:163
 #: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:184
@@ -1682,17 +1867,29 @@ msgid "_Send"
 msgstr "_Send"
 
 #: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:180
-msgid "Although this page was loaded over a secure connection, the information you have entered will be sent over an insecure connection, and could easily be intercepted by a third party."
-msgstr "Although this page was loaded over a secure connection, the information you have entered will be sent over an insecure connection, and could easily be intercepted by a third party."
+msgid ""
+"Although this page was loaded over a secure connection, the information you "
+"have entered will be sent over an insecure connection, and could easily be "
+"intercepted by a third party."
+msgstr ""
+"Although this page was loaded over a secure connection, the information you "
+"have entered will be sent over an insecure connection, and could easily be "
+"intercepted by a third party."
 
-#: ../embed/mozilla/MozDownload.cpp:604
+#: ../embed/mozilla/MozDownload.cpp:611
 msgid "Files"
 msgstr "Files"
 
 #. We do this before reading the user pref file so that the user
+#. * still can overwrite this pref.
 #. * We don't use the default-prefs.js file since that cannot be
+#. * localised (see bug #144909).
+#.
 #. translators: this is the URL that searches from the location
+#. * entry get directed to. The search terms will be _appended_ to it,
 #. * in url-escaped UTF-8; that means that if you're choosing google,
+#. * the 'q=' part needs to come last.
+#.
 #: ../embed/mozilla/mozilla-embed-single.cpp:228
 msgid "http://www.google.com/search?ie=UTF-8&oe=UTF-8&q="
 msgstr "http://www.google.co.uk/search?ie=UTF-8&oe=UTF-8&q="
@@ -1731,132 +1928,152 @@ msgid "All supported types"
 msgstr "All supported types"
 
 #. The name of the default downloads folder
-#: ../lib/ephy-file-helpers.c:81
-#: ../src/prefs-dialog.c:1446
+#: ../lib/ephy-file-helpers.c:96 ../src/prefs-dialog.c:1446
 msgid "Downloads"
 msgstr "Downloads"
 
-#: ../lib/ephy-file-helpers.c:182
+#: ../lib/ephy-file-helpers.c:197
 #, c-format
 msgid "Failed to find %s"
 msgstr "Failed to find %s"
 
-#: ../lib/ephy-file-helpers.c:255
+#: ../lib/ephy-file-helpers.c:270
 #, 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:261
+#: ../lib/ephy-file-helpers.c:276
 #, c-format
 msgid "Failed to create directory %s."
 msgstr "Failed to create directory %s."
 
-#: ../lib/ephy-gui.c:210
+#: ../lib/ephy-gui.c:223
 #, c-format
 msgid "Overwrite \"%s\"?"
 msgstr "Overwrite \"%s\"?"
 
-#: ../lib/ephy-gui.c:214
-msgid "A file with this name already exists. If you choose to overwrite this file, the contents will be lost."
-msgstr "A file with this name already exists. If you choose to overwrite this file, the contents will be lost."
+#: ../lib/ephy-gui.c:227
+msgid ""
+"A file with this name already exists. If you choose to overwrite this file, "
+"the contents will be lost."
+msgstr ""
+"A file with this name already exists. If you choose to overwrite this file, "
+"the contents will be lost."
 
-#: ../lib/ephy-gui.c:218
+#: ../lib/ephy-gui.c:231
 msgid "_Overwrite"
 msgstr "_Overwrite"
 
-#: ../lib/ephy-gui.c:220
+#: ../lib/ephy-gui.c:233
 msgid "Overwrite File?"
 msgstr "Overwrite File?"
 
-#: ../lib/ephy-gui.c:256
+#: ../lib/ephy-gui.c:269
 #, c-format
 msgid "Could not display help: %s"
 msgstr "Could not display help: %s"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../lib/ephy-langs.c:39
 msgid "select fonts for|Arabic"
-msgstr "select fonts for|Arabic"
+msgstr "Arabic"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../lib/ephy-langs.c:42
 msgid "select fonts for|Baltic"
-msgstr "select fonts for|Baltic"
+msgstr "Baltic"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../lib/ephy-langs.c:45
 msgid "select fonts for|Central European"
-msgstr "select fonts for|Central European"
+msgstr "Central European"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../lib/ephy-langs.c:48
 msgid "select fonts for|Cyrillic"
-msgstr "select fonts for|Cyrillic"
+msgstr "Cyrillic"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../lib/ephy-langs.c:51
 msgid "select fonts for|Devanagari"
-msgstr "select fonts for|Devanagari"
+msgstr "Devanagari"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../lib/ephy-langs.c:54
 msgid "select fonts for|Greek"
-msgstr "select fonts for|Greek"
+msgstr "Greek"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../lib/ephy-langs.c:57
 msgid "select fonts for|Hebrew"
-msgstr "select fonts for|Hebrew"
+msgstr "Hebrew"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../lib/ephy-langs.c:60
 msgid "select fonts for|Japanese"
-msgstr "select fonts for|Japanese"
+msgstr "Japanese"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../lib/ephy-langs.c:63
 msgid "select fonts for|Korean"
-msgstr "select fonts for|Korean"
+msgstr "Korean"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../lib/ephy-langs.c:66
 msgid "select fonts for|Simplified Chinese"
-msgstr "select fonts for|Simplified Chinese"
+msgstr "Simplified Chinese"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../lib/ephy-langs.c:69
 msgid "select fonts for|Tamil"
-msgstr "select fonts for|Tamil"
+msgstr "Tamil"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../lib/ephy-langs.c:72
 msgid "select fonts for|Thai"
-msgstr "select fonts for|Thai"
+msgstr "Thai"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../lib/ephy-langs.c:75
 msgid "select fonts for|Traditional Chinese"
-msgstr "select fonts for|Traditional Chinese"
+msgstr "Traditional Chinese"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../lib/ephy-langs.c:78
 msgid "select fonts for|Traditional Chinese (Hong Kong)"
-msgstr "select fonts for|Traditional Chinese (Hong Kong)"
+msgstr "Traditional Chinese (Hong Kong)"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../lib/ephy-langs.c:81
 msgid "select fonts for|Turkish"
-msgstr "select fonts for|Turkish"
+msgstr "Turkish"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../lib/ephy-langs.c:84
 msgid "select fonts for|Unicode"
-msgstr "select fonts for|Unicode"
+msgstr "Unicode"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../lib/ephy-langs.c:87
 msgid "select fonts for|Western"
-msgstr "select fonts for|Western"
+msgstr "Western"
 
 #: ../lib/ephy-stock-icons.c:56
 msgid "Close Tab"
@@ -1866,21 +2083,17 @@ msgstr "Close Tab"
 msgid "Popup Windows"
 msgstr "Popup Windows"
 
-#: ../lib/ephy-stock-icons.c:58
-#: ../src/ephy-history-window.c:1194
+#: ../lib/ephy-stock-icons.c:58 ../src/ephy-history-window.c:1194
 msgid "History"
 msgstr "History"
 
-#: ../lib/ephy-stock-icons.c:59
-#: ../src/bookmarks/ephy-bookmarks-editor.c:757
+#: ../lib/ephy-stock-icons.c:59 ../src/bookmarks/ephy-bookmarks-editor.c:757
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1619
-#: ../src/bookmarks/ephy-topic-action.c:930
-#: ../src/ephy-window.c:1116
+#: ../src/bookmarks/ephy-topic-action.c:930 ../src/ephy-window.c:1118
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
-#: ../lib/ephy-stock-icons.c:60
-#: ../src/ephy-toolbar.c:357
+#: ../lib/ephy-stock-icons.c:60 ../src/ephy-toolbar.c:357
 msgid "Address Entry"
 msgstr "Address Entry"
 
@@ -1936,8 +2149,7 @@ msgstr "%s:"
 #: ../src/bookmarks/ephy-bookmark-action.c:552
 #: ../src/bookmarks/ephy-bookmarks-editor.c:181
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1239
-#: ../src/bookmarks/ephy-topic-action.c:448
-#: ../src/ephy-history-window.c:174
+#: ../src/bookmarks/ephy-topic-action.c:448 ../src/ephy-history-window.c:174
 #: ../src/ephy-history-window.c:714
 msgid "Open in New _Tab"
 msgid_plural "Open in New _Tabs"
@@ -1948,8 +2160,7 @@ msgstr[1] "Open in New _Tabs"
 #: ../src/bookmarks/ephy-bookmark-action.c:558
 #: ../src/bookmarks/ephy-bookmarks-editor.c:178
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1236
-#: ../src/ephy-history-window.c:171
-#: ../src/ephy-history-window.c:711
+#: ../src/ephy-history-window.c:171 ../src/ephy-history-window.c:711
 msgid "Open in New _Window"
 msgid_plural "Open in New _Windows"
 msgstr[0] "Open in New _Window"
@@ -1991,26 +2202,22 @@ msgstr "_Show in bookmarks bar"
 
 #. Toplevel
 #: ../src/bookmarks/ephy-bookmarks-editor.c:168
-#: ../src/ephy-history-window.c:164
-#: ../src/ephy-window.c:108
+#: ../src/ephy-history-window.c:164 ../src/ephy-window.c:108
 msgid "_File"
 msgstr "_File"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:169
-#: ../src/ephy-history-window.c:165
-#: ../src/ephy-window.c:109
+#: ../src/ephy-history-window.c:165 ../src/ephy-window.c:109
 msgid "_Edit"
 msgstr "_Edit"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:170
-#: ../src/ephy-history-window.c:166
-#: ../src/ephy-window.c:110
+#: ../src/ephy-history-window.c:166 ../src/ephy-window.c:110
 msgid "_View"
 msgstr "_View"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:171
-#: ../src/ephy-history-window.c:167
-#: ../src/ephy-window.c:115
+#: ../src/ephy-history-window.c:167 ../src/ephy-window.c:115
 msgid "_Help"
 msgstr "_Help"
 
@@ -2074,8 +2281,7 @@ msgid "Export bookmarks to a file"
 msgstr "Export bookmarks to a file"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:198
-#: ../src/ephy-history-window.c:183
-#: ../src/ephy-window.c:148
+#: ../src/ephy-history-window.c:183 ../src/ephy-window.c:148
 msgid "_Close"
 msgstr "_Close"
 
@@ -2085,34 +2291,29 @@ msgstr "Close the bookmarks window"
 
 #. Edit Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:203
-#: ../src/ephy-history-window.c:188
-#: ../src/ephy-window.c:160
+#: ../src/ephy-history-window.c:188 ../src/ephy-window.c:160
 msgid "Cu_t"
 msgstr "Cu_t"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:204
-#: ../src/ephy-history-window.c:189
-#: ../src/ephy-window.c:161
+#: ../src/ephy-history-window.c:189 ../src/ephy-window.c:161
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:206
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1249
-#: ../src/ephy-history-window.c:191
-#: ../src/ephy-history-window.c:724
+#: ../src/ephy-history-window.c:191 ../src/ephy-history-window.c:724
 #: ../src/ephy-window.c:163
 msgid "_Copy"
 msgstr "_Copy"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:207
-#: ../src/ephy-history-window.c:192
-#: ../src/ephy-window.c:164
+#: ../src/ephy-history-window.c:192 ../src/ephy-window.c:164
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:209
-#: ../src/ephy-history-window.c:194
-#: ../src/ephy-window.c:166
+#: ../src/ephy-history-window.c:194 ../src/ephy-window.c:166
 msgid "_Paste"
 msgstr "_Paste"
 
@@ -2122,8 +2323,7 @@ msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:212
-#: ../src/ephy-history-window.c:197
-#: ../src/ephy-window.c:169
+#: ../src/ephy-history-window.c:197 ../src/ephy-window.c:169
 msgid "Select _All"
 msgstr "Select _All"
 
@@ -2132,9 +2332,9 @@ msgid "Select all bookmarks or text"
 msgstr "Select all bookmarks or text"
 
 #. Help Menu
+#. Help menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:217
-#: ../src/ephy-history-window.c:205
-#: ../src/ephy-window.c:262
+#: ../src/ephy-history-window.c:205 ../src/ephy-window.c:262
 msgid "_Contents"
 msgstr "_Contents"
 
@@ -2143,14 +2343,12 @@ msgid "Display bookmarks help"
 msgstr "Display bookmarks help"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:220
-#: ../src/ephy-history-window.c:208
-#: ../src/ephy-window.c:265
+#: ../src/ephy-history-window.c:208 ../src/ephy-window.c:265
 msgid "_About"
 msgstr "_About"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:221
-#: ../src/ephy-history-window.c:209
-#: ../src/ephy-window.c:266
+#: ../src/ephy-history-window.c:209 ../src/ephy-window.c:266
 msgid "Display credits for the web browser creators"
 msgstr "Display credits for the web browser creators"
 
@@ -2199,8 +2397,12 @@ msgid "Delete this topic?"
 msgstr "Delete this topic?"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:471
-msgid "Deleting this topic will cause all its bookmarks to become uncategorized, unless they also belong to other topics. The bookmarks will not be deleted."
-msgstr "Deleting this topic will cause all its bookmarks to become uncategorised, unless they also belong to other topics. The bookmarks will not be deleted."
+msgid ""
+"Deleting this topic will cause all its bookmarks to become uncategorized, "
+"unless they also belong to other topics. The bookmarks will not be deleted."
+msgstr ""
+"Deleting this topic will cause all its bookmarks to become uncategorised, "
+"unless they also belong to other topics. The bookmarks will not be deleted."
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:474
 msgid "_Delete Topic"
@@ -2239,8 +2441,12 @@ msgstr "Import Failed"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:635
 #, c-format
-msgid "The bookmarks from \"%s\" could not be imported because the file is corrupted or of an unsupported type."
-msgstr "The bookmarks from \"%s\" could not be imported because the file is corrupted or of an unsupported type."
+msgid ""
+"The bookmarks from \"%s\" could not be imported because the file is "
+"corrupted or of an unsupported type."
+msgstr ""
+"The bookmarks from \"%s\" could not be imported because the file is "
+"corrupted or of an unsupported type."
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:698
 msgid "Import bookmarks from file"
@@ -2313,7 +2519,9 @@ msgid "Address"
 msgstr "Address"
 
 #. Translators you should change these links to respect your locale.
+#. * For instance in .nl these should be
 #. * "http://www.google.nl" and "http://www.google.nl/search?q=%s"
+#.
 #: ../src/bookmarks/ephy-bookmarks.c:87
 msgid "Search the web"
 msgstr "Search the web"
@@ -2372,22 +2580,25 @@ msgid "Update Bookmark?"
 msgstr "Update Bookmark?"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #. Translators: this topic contains all bookmarks
 #: ../src/bookmarks/ephy-bookmarks.c:796
 msgid "bookmarks|All"
-msgstr "bookmarks|All"
+msgstr "All"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #. Translators: this topic contains the most used bookmarks
 #: ../src/bookmarks/ephy-bookmarks.c:832
 msgid "bookmarks|Most Visited"
-msgstr "bookmarks|Most Visited"
+msgstr "Most Visited"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #. Translators: this topic contains the not categorized bookmarks
 #: ../src/bookmarks/ephy-bookmarks.c:851
 msgid "bookmarks|Not Categorized"
-msgstr "bookmarks|Not Categorised"
+msgstr "Not Categorised"
 
 #: ../src/bookmarks/ephy-new-bookmark.c:275
 msgid "Add Bookmark"
@@ -2427,13 +2638,11 @@ msgstr "Other encodings"
 msgid "_Automatic"
 msgstr "_Automatic"
 
-#: ../src/ephy-fullscreen-popup.c:301
-#: ../src/ephy-toolbar.c:666
+#: ../src/ephy-fullscreen-popup.c:292 ../src/ephy-toolbar.c:666
 msgid "Leave Fullscreen"
 msgstr "Leave Fullscreen"
 
-#: ../src/ephy-go-action.c:71
-#: ../src/ephy-toolbar.c:388
+#: ../src/ephy-go-action.c:71 ../src/ephy-toolbar.c:388
 msgid "Go"
 msgstr "Go"
 
@@ -2490,8 +2699,12 @@ msgid "Clear browsing history?"
 msgstr "Clear browsing history?"
 
 #: ../src/ephy-history-window.c:261
-msgid "Clearing the browsing history will cause all history links to be permanently deleted."
-msgstr "Clearing the browsing history will cause all history links to be permanently deleted."
+msgid ""
+"Clearing the browsing history will cause all history links to be permanently "
+"deleted."
+msgstr ""
+"Clearing the browsing history will cause all history links to be permanently "
+"deleted."
 
 #: ../src/ephy-history-window.c:273
 msgid "Clear History"
@@ -2506,8 +2719,7 @@ msgid "Today"
 msgstr "Today"
 
 #. keep this in sync with embed/ephy-history.c's HISTORY_PAGE_OBSOLETE_DAYS
-#: ../src/ephy-history-window.c:1047
-#: ../src/ephy-history-window.c:1050
+#: ../src/ephy-history-window.c:1047 ../src/ephy-history-window.c:1050
 #: ../src/ephy-history-window.c:1054
 #, c-format
 msgid "Last %d day"
@@ -2519,64 +2731,67 @@ msgstr[1] "Last %d days"
 msgid "Sites"
 msgstr "Sites"
 
-#: ../src/ephy-main.c:55
+#: ../src/ephy-main.c:57
 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:60
 msgid "Run Epiphany in full screen mode"
 msgstr "Run Epiphany in full screen mode"
 
-#: ../src/ephy-main.c:61
+#: ../src/ephy-main.c:63
 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:64 ../src/ephy-main.c:70
 msgid "FILE"
 msgstr "FILE"
 
-#: ../src/ephy-main.c:64
+#: ../src/ephy-main.c:66
 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:67
 msgid "URL"
 msgstr "URL"
 
-#: ../src/ephy-main.c:67
+#: ../src/ephy-main.c:69
 msgid "Import bookmarks from the given file"
 msgstr "Import bookmarks from the given file"
 
-#: ../src/ephy-main.c:70
+#: ../src/ephy-main.c:72
 msgid "Launch the bookmarks editor"
 msgstr "Launch the bookmarks editor"
 
-#: ../src/ephy-main.c:173
+#: ../src/ephy-main.c:226
 msgid "Ephy"
 msgstr "Epiphany"
 
-#: ../src/ephy-notebook.c:892
+#: ../src/ephy-notebook.c:893
 msgid "Close tab"
 msgstr "Close tab"
 
-#: ../src/ephy-session.c:372
+#: ../src/ephy-session.c:388
 msgid "Recover previous browser windows and tabs?"
 msgstr "Recover previous browser windows and tabs?"
 
-#: ../src/ephy-session.c:376
-msgid "Epiphany appears to have exited unexpectedly the last time it was run. You can recover the opened windows and tabs."
-msgstr "Epiphany appears to have exited unexpectedly the last time it was run. You can recover the opened windows and tabs."
+#: ../src/ephy-session.c:392
+msgid ""
+"Epiphany appears to have exited unexpectedly the last time it was run. You "
+"can recover the opened windows and tabs."
+msgstr ""
+"Epiphany appears to have exited unexpectedly the last time it was run. You "
+"can recover the opened windows and tabs."
 
-#: ../src/ephy-session.c:380
+#: ../src/ephy-session.c:396
 msgid "_Don't Recover"
 msgstr "_Don't Recover"
 
-#: ../src/ephy-session.c:382
+#: ../src/ephy-session.c:398
 msgid "_Recover"
 msgstr "_Recover"
 
-#: ../src/ephy-session.c:384
+#: ../src/ephy-session.c:400
 msgid "Crash Recovery"
 msgstr "Crash Recovery"
 
@@ -2593,38 +2808,51 @@ msgid "The link you clicked needs the sidebar extension to be installed."
 msgstr "The link you clicked needs the sidebar extension to be installed."
 
 #: ../src/ephy-shell.c:447
-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 "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."
+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 ""
+"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."
 
 #: ../src/ephy-shell.c:454
-msgid "Epiphany can't be used now, due to an unexpected error from Bonobo when attempting to register the automation server"
-msgstr "Epiphany can't be used now, due to an unexpected error from Bonobo when attempting to register the automation server"
+msgid ""
+"Epiphany can't be used now, due to an unexpected error from Bonobo when "
+"attempting to register the automation server"
+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:471
-msgid "Epiphany can't be used now, due to an unexpected error from Bonobo when attempting to locate the automation object."
-msgstr "Epiphany can't be used now, due to an unexpected error from Bonobo when attempting to locate the automation object."
+msgid ""
+"Epiphany can't be used now, due to an unexpected error from Bonobo when "
+"attempting to locate the automation object."
+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:434
-#: ../src/ephy-tab.c:1811
+#: ../src/ephy-tab.c:446 ../src/ephy-tab.c:1823
 msgid "Blank page"
 msgstr "Blank page"
 
-#: ../src/ephy-tab.c:1187
+#: ../src/ephy-tab.c:1199
 #, c-format
 msgid "Redirecting to %s..."
 msgstr "Redirecting to %s..."
 
-#: ../src/ephy-tab.c:1191
+#: ../src/ephy-tab.c:1203
 #, c-format
 msgid "Transferring data from %s..."
 msgstr "Transferring data from %s..."
 
-#: ../src/ephy-tab.c:1195
+#: ../src/ephy-tab.c:1207
 #, c-format
 msgid "Waiting for authorization from %s..."
 msgstr "Waiting for authorisation from %s..."
 
-#: ../src/ephy-tab.c:1203
+#: ../src/ephy-tab.c:1215
 #, c-format
 msgid "Loading %s..."
 msgstr "Loading %s..."
@@ -2634,33 +2862,39 @@ msgid "Switch to this tab"
 msgstr "Switch to this tab"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #: ../src/ephy-toolbar-editor.c:80
 msgid "toolbar style|Default"
-msgstr "toolbar style|Default"
+msgstr "Default"
 
 #. separator row
+#. Translators: The text before the "|" is context to help you decide on
 #. * the correct translation. You MUST OMIT it in the translated string. *
+#. * Translators: translate the same as in gnome-control-center
 #: ../src/ephy-toolbar-editor.c:85
 msgid "toolbar style|Text below icons"
-msgstr "toolbar style|Text below icons"
+msgstr "Text below icons"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string. *
 #. * Translators: translate the same as in gnome-control-center
 #: ../src/ephy-toolbar-editor.c:89
 msgid "toolbar style|Text beside icons"
-msgstr "toolbar style|Text beside icons"
+msgstr "Text beside icons"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string. *
 #. * Translators: translate the same as in gnome-control-center
 #: ../src/ephy-toolbar-editor.c:93
 msgid "toolbar style|Icons only"
-msgstr "toolbar style|Icons only"
+msgstr "Icons only"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string. *
 #. * Translators: translate the same as in gnome-control-center
 #: ../src/ephy-toolbar-editor.c:97
 msgid "toolbar style|Text only"
-msgstr "toolbar style|Text only"
+msgstr "Text only"
 
 #: ../src/ephy-toolbar-editor.c:205
 msgid "Toolbar Editor"
@@ -2684,6 +2918,8 @@ msgid "Go back"
 msgstr "Go back"
 
 #. this is the tooltip on the Back button's drop-down arrow, which will show
+#. * a menu with all sites you can go 'back' to
+#.
 #: ../src/ephy-toolbar.c:303
 msgid "Back history"
 msgstr "Back history"
@@ -2697,6 +2933,8 @@ msgid "Go forward"
 msgstr "Go forward"
 
 #. this is the tooltip on the Forward button's drop-down arrow, which will show
+#. * a menu with all sites you can go 'forward' to
+#.
 #: ../src/ephy-toolbar.c:322
 msgid "Forward history"
 msgstr "Forward history"
@@ -2705,12 +2943,13 @@ msgstr "Forward history"
 msgid "Up"
 msgstr "Up"
 
-#: ../src/ephy-toolbar.c:336
-#: ../src/ephy-window.c:233
+#: ../src/ephy-toolbar.c:336 ../src/ephy-window.c:233
 msgid "Go up one level"
 msgstr "Go up one level"
 
 #. this is the tooltip on the Up button's drop-down arrow, which will show
+#. * a menu with al sites you can go 'up' to
+#.
 #: ../src/ephy-toolbar.c:340
 msgid "List of upper levels"
 msgstr "List of upper levels"
@@ -2780,13 +3019,11 @@ msgstr "_Open..."
 msgid "Open a file"
 msgstr "Open a file"
 
-#: ../src/ephy-window.c:130
-#: ../src/ephy-window.c:133
+#: ../src/ephy-window.c:130 ../src/ephy-window.c:133
 msgid "Save _As..."
 msgstr "Save _As..."
 
-#: ../src/ephy-window.c:131
-#: ../src/ephy-window.c:134
+#: ../src/ephy-window.c:131 ../src/ephy-window.c:134
 msgid "Save the current page"
 msgstr "Save the current page"
 
@@ -2961,8 +3198,7 @@ msgstr "View the source code of the page"
 msgid "_Add Bookmark..."
 msgstr "_Add Bookmark..."
 
-#: ../src/ephy-window.c:218
-#: ../src/ephy-window.c:308
+#: ../src/ephy-window.c:218 ../src/ephy-window.c:308
 msgid "Add a bookmark for the current page"
 msgstr "Add a bookmark for the current page"
 
@@ -3174,6 +3410,7 @@ msgid "_Copy Link Address"
 msgstr "_Copy Link Address"
 
 #. Email links
+#. This is on the context menu on a mailto: link and opens the mail program
 #: ../src/ephy-window.c:341
 msgid "_Send Email..."
 msgstr "_Send Email..."
@@ -3199,106 +3436,104 @@ msgstr "_Use Image As Background"
 msgid "Copy I_mage Address"
 msgstr "Copy I_mage Address"
 
-#: ../src/ephy-window.c:643
+#: ../src/ephy-window.c:645
 msgid "There are unsubmitted changes to form elements"
 msgstr "There are unsubmitted changes to form elements"
 
-#: ../src/ephy-window.c:647
+#: ../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:651
+#: ../src/ephy-window.c:653
 msgid "Close _Document"
 msgstr "Close _Document"
 
-#: ../src/ephy-window.c:1106
-#: ../src/window-commands.c:369
+#: ../src/ephy-window.c:1108 ../src/window-commands.c:368
 msgid "Open"
 msgstr "Open"
 
-#: ../src/ephy-window.c:1108
-#: ../src/window-commands.c:395
+#: ../src/ephy-window.c:1110 ../src/window-commands.c:394
 msgid "Save As"
 msgstr "Save As"
 
-#: ../src/ephy-window.c:1112
+#: ../src/ephy-window.c:1114
 msgid "Bookmark"
 msgstr "Bookmark"
 
-#: ../src/ephy-window.c:1311
+#: ../src/ephy-window.c:1313
 msgid "Insecure"
 msgstr "Insecure"
 
-#: ../src/ephy-window.c:1316
+#: ../src/ephy-window.c:1318
 msgid "Broken"
 msgstr "Broken"
 
-#: ../src/ephy-window.c:1324
+#: ../src/ephy-window.c:1326
 msgid "Low"
 msgstr "Low"
 
-#: ../src/ephy-window.c:1331
+#: ../src/ephy-window.c:1333
 msgid "High"
 msgstr "High"
 
-#: ../src/ephy-window.c:1340
+#: ../src/ephy-window.c:1342
 #, c-format
 msgid "Security level: %s"
 msgstr "Security level: %s"
 
-#: ../src/ephy-window.c:1380
+#: ../src/ephy-window.c:1382
 #, c-format
 msgid "%d hidden popup window"
 msgid_plural "%d hidden popup windows"
 msgstr[0] "%d hidden popup window"
 msgstr[1] "%d hidden popup windows"
 
-#: ../src/ephy-window.c:1612
+#: ../src/ephy-window.c:1614
 #, c-format
 msgid "Save background image '%s'"
 msgstr "Save background image '%s'"
 
-#: ../src/ephy-window.c:1626
+#: ../src/ephy-window.c:1628
 #, c-format
 msgid "Open image '%s'"
 msgstr "Open image '%s'"
 
-#: ../src/ephy-window.c:1631
+#: ../src/ephy-window.c:1633
 #, c-format
 msgid "Use as desktop background '%s'"
 msgstr "Use as desktop background '%s'"
 
-#: ../src/ephy-window.c:1636
+#: ../src/ephy-window.c:1638
 #, c-format
 msgid "Save image '%s'"
 msgstr "Save image '%s'"
 
-#: ../src/ephy-window.c:1641
+#: ../src/ephy-window.c:1643
 #, c-format
 msgid "Copy image address '%s'"
 msgstr "Copy image address '%s'"
 
-#: ../src/ephy-window.c:1654
+#: ../src/ephy-window.c:1656
 #, c-format
 msgid "Send email to address '%s'"
 msgstr "Send email to address '%s'"
 
-#: ../src/ephy-window.c:1660
+#: ../src/ephy-window.c:1662
 #, c-format
 msgid "Copy email address '%s'"
 msgstr "Copy email address '%s'"
 
-#: ../src/ephy-window.c:1672
+#: ../src/ephy-window.c:1674
 #, c-format
 msgid "Save link '%s'"
 msgstr "Save link '%s'"
 
-#: ../src/ephy-window.c:1678
+#: ../src/ephy-window.c:1680
 #, c-format
 msgid "Bookmark link '%s'"
 msgstr "Bookmark link '%s'"
 
-#: ../src/ephy-window.c:1684
+#: ../src/ephy-window.c:1686
 #, c-format
 msgid "Copy link's address '%s'"
 msgstr "Copy link's address '%s'"
@@ -3351,19 +3586,19 @@ msgstr "Expires:"
 msgid "End of current session"
 msgstr "End of current session"
 
-#: ../src/popup-commands.c:245
+#: ../src/popup-commands.c:246
 msgid "Download Link"
 msgstr "Download Link"
 
-#: ../src/popup-commands.c:253
+#: ../src/popup-commands.c:254
 msgid "Save Link As"
 msgstr "Save Link As"
 
-#: ../src/popup-commands.c:260
+#: ../src/popup-commands.c:261
 msgid "Save Image As"
 msgstr "Save Image As..."
 
-#: ../src/popup-commands.c:355
+#: ../src/popup-commands.c:353
 msgid "Save Background As"
 msgstr "Save Background As..."
 
@@ -3632,21 +3867,27 @@ msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #. * Translators: the first %s is the language name, and the
+#. * second %s is the locale name. Example:
 #. * "French (France)"
-#: ../src/prefs-dialog.c:1016
-#: ../src/prefs-dialog.c:1024
+#.
+#. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
+#: ../src/prefs-dialog.c:1016 ../src/prefs-dialog.c:1024
 #, c-format
 msgid "language|%s (%s)"
-msgstr "language|%s (%s)"
+msgstr "%s (%s)"
 
 #. Translators: The text before the "|" is context to help you decide on
+#. * the correct translation. You MUST OMIT it in the translated string.
 #. * Translators: this refers to a user-define language code
-#: ../src/prefs-dialog.c:1035
-#: ../src/prefs-dialog.c:1393
+#. * (one which isn't in our built-in list).
+#.
+#: ../src/prefs-dialog.c:1035 ../src/prefs-dialog.c:1393
 #, c-format
 msgid "language|User defined (%s)"
-msgstr "language|User defined (%s)"
+msgstr "User defined (%s)"
 
 #: ../src/prefs-dialog.c:1058
 #, c-format
@@ -3667,21 +3908,24 @@ msgstr "Desktop"
 msgid "Select a directory"
 msgstr "Select a directory"
 
-#: ../src/window-commands.c:163
+#: ../src/window-commands.c:162
 msgid "Check this out!"
 msgstr "Check this out!"
 
-#: ../src/window-commands.c:797
+#: ../src/window-commands.c:772
 msgid "Epiphany"
 msgstr "Epiphany"
 
 #. Translators: This is a special message that shouldn't be translated
+#. * literally. It is used in the about box to give credits to
 #. * the translators.
+#. * Thus, you should translate it to your name and email address.
 #. * You should also include other translators who have contributed to
+#. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
-#: ../src/window-commands.c:810
+#.
+#: ../src/window-commands.c:785
 msgid "translator-credits"
 msgstr ""
 "Christian Persch <chpe@gnome.org>\n"
 "Gareth Owen <gowen72@yahoo.com>"
-