[epiphany] Updated Traditional Chinese translation(Hong Kong and Taiwan)

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [epiphany] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Sun, 29 Jan 2012 15:12:02 +0000 (UTC)
commit 4220f80676712492175b64cc1eeaef9541b9d8c6
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sun Jan 29 23:11:49 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1686 +++++++++++++++++------------------------------------------
 po/zh_TW.po | 1686 +++++++++++++++++------------------------------------------
 2 files changed, 974 insertions(+), 2398 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 07a51ce..2f15f2a 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -10,11 +10,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: epiphany 3.1.91\n"
+"Project-Id-Version: epiphany 3.3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=epiphany\n"
-"POT-Creation-Date: 2011-09-10 14:57+0800\n"
-"PO-Revision-Date: 2011-09-10 14:57+0800\n"
+"POT-Creation-Date: 2012-01-29 23:11+0800\n"
+"PO-Revision-Date: 2012-01-29 23:11+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: \n"
@@ -23,18 +23,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/bme.desktop.in.in.h:1
-msgid "Browse and organize your bookmarks"
-msgstr "çèåççæç"
-
-#: ../data/bme.desktop.in.in.h:2
-msgid "Epiphany Web Bookmarks"
-msgstr "Epiphany çéæç"
-
-#: ../data/bme.desktop.in.in.h:3
-msgid "Web Bookmarks"
-msgstr "çéæç"
-
 #: ../data/default-bookmarks.rdf.in.h:1
 msgid "Search the web"
 msgstr "æåçé"
@@ -59,161 +47,88 @@ msgid "Browse the web"
 msgstr "çèçé"
 
 #: ../data/epiphany.desktop.in.in.h:2
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../data/epiphany.desktop.in.in.h:3
 msgid "Epiphany Web Browser"
 msgstr "Epiphany çéçèå"
 
-#: ../data/epiphany.desktop.in.in.h:4 ../src/ephy-main.c:465
+#: ../data/epiphany.desktop.in.in.h:3 ../src/ephy-main.c:73
+#: ../src/ephy-main.c:321 ../src/ephy-main.c:455 ../src/window-commands.c:1226
+msgid "Web"
+msgstr "çé"
+
+#: ../data/epiphany.desktop.in.in.h:4
 msgid "Web Browser"
 msgstr "çéçèå"
 
-#: ../data/glade/certificate-dialogs.ui.h:1
-msgid "Certificate _Fields"
-msgstr "èææä(_F)"
-
-#: ../data/glade/certificate-dialogs.ui.h:2
-msgid "Certificate _Hierarchy"
-msgstr "èæéå(_H)"
-
-#: ../data/glade/certificate-dialogs.ui.h:3
-msgid "Common Name:"
-msgstr "èæåç"
-
-#: ../data/glade/certificate-dialogs.ui.h:4
-msgid "Details"
-msgstr "èçèæ"
-
-#: ../data/glade/certificate-dialogs.ui.h:5
-msgid "Expires On:"
-msgstr "æéï"
-
-#: ../data/glade/certificate-dialogs.ui.h:6
-msgid "Field _Value"
-msgstr "æäçå(_V)"
-
-#: ../data/glade/certificate-dialogs.ui.h:7
-msgid "Fingerprints"
-msgstr "æçæç"
-
-#: ../data/glade/certificate-dialogs.ui.h:8 ../data/glade/prefs-dialog.ui.h:16
-msgid "General"
-msgstr "äè"
-
-#: ../data/glade/certificate-dialogs.ui.h:9
-msgid "Issued By"
-msgstr "ççè"
-
-#: ../data/glade/certificate-dialogs.ui.h:10
-msgid "Issued On:"
-msgstr "çèæï"
-
-#: ../data/glade/certificate-dialogs.ui.h:11
-msgid "Issued To"
-msgstr "çç"
-
-#: ../data/glade/certificate-dialogs.ui.h:12
-msgid "MD5 Fingerprint:"
-msgstr "MD5 æçççï"
-
-#: ../data/glade/certificate-dialogs.ui.h:13
-msgid "Organization:"
-msgstr "ççï"
-
-#: ../data/glade/certificate-dialogs.ui.h:14
-msgid "Organizational Unit:"
-msgstr "ççåäï"
-
-#: ../data/glade/certificate-dialogs.ui.h:15
-msgid "SHA1 Fingerprint:"
-msgstr "SHA1 æçççï"
-
-#: ../data/glade/certificate-dialogs.ui.h:16
-msgid "Serial Number:"
-msgstr "åèï"
-
-#: ../data/glade/certificate-dialogs.ui.h:17
-msgid "Validity"
-msgstr "æææ"
-
-#: ../data/glade/epiphany.ui.h:1
+#: ../data/ui/epiphany.ui.h:1
 msgid "<b>_Automatic</b>"
 msgstr "<b>èå(_A)ï</b>"
 
-#: ../data/glade/epiphany.ui.h:2
+#: ../data/ui/epiphany.ui.h:2
 msgid "<b>_Use a different encoding:</b>"
 msgstr "äçäåççç(_U)ï"
 
-#: ../data/glade/epiphany.ui.h:3
-msgid "Clear _All..."
-msgstr "åéæé(_A)â"
+#: ../data/ui/epiphany.ui.h:3
+msgid "Content:"
+msgstr "åå"
+
+#: ../data/ui/epiphany.ui.h:4
+msgid "Cookie properties"
+msgstr "Cookie åæ"
 
-#: ../data/glade/epiphany.ui.h:4 ../data/glade/prefs-dialog.ui.h:8
+#: ../data/ui/epiphany.ui.h:5 ../data/ui/prefs-dialog.ui.h:8
 msgid "Cookies"
 msgstr "Cookie"
 
-#: ../data/glade/epiphany.ui.h:5 ../data/glade/prefs-dialog.ui.h:23
+#: ../data/ui/epiphany.ui.h:6
+msgid "Expires:"
+msgstr "æéï"
+
+#: ../data/ui/epiphany.ui.h:7 ../data/ui/prefs-dialog.ui.h:22
 msgid "Passwords"
 msgstr "åç"
 
-#: ../data/glade/epiphany.ui.h:6
+#: ../data/ui/epiphany.ui.h:8
+msgid "Path:"
+msgstr "èåï"
+
+#: ../data/ui/epiphany.ui.h:9
 msgid "Personal Data"
 msgstr "åäèæ"
 
-#: ../data/glade/epiphany.ui.h:7
+#: ../data/ui/epiphany.ui.h:10
+msgid "Send for:"
+msgstr "åéçï"
+
+#: ../data/ui/epiphany.ui.h:11
 msgid "Text Encoding"
 msgstr "åççç"
 
-#: ../data/glade/epiphany.ui.h:8 ../src/ephy-encoding-menu.c:338
+#: ../data/ui/epiphany.ui.h:12 ../src/ephy-encoding-menu.c:338
 msgid "Use the encoding specified by the document"
 msgstr "äçæäæåçççæå"
 
-#: ../data/glade/epiphany.ui.h:9
+#: ../data/ui/epiphany.ui.h:13
 msgid "_Show passwords"
 msgstr "éçåç(_S)"
 
-#: ../data/glade/form-signing-dialog.ui.h:1
-msgid "Sign Text"
-msgstr "ççæå"
-
-#: ../data/glade/form-signing-dialog.ui.h:2
-msgid ""
-"To confirm that you want to sign the above text, choose a certificate to "
-"sign the text with and enter its password below."
-msgstr "çåèççääæåïèéæççæåçèæååäæèååçã"
-
-#: ../data/glade/form-signing-dialog.ui.h:3
-msgid "_Certificate:"
-msgstr "èæ(_C)ï"
-
-#: ../data/glade/form-signing-dialog.ui.h:4
-msgid "_Password:"
-msgstr "åç(_P)ï"
-
-#: ../data/glade/form-signing-dialog.ui.h:5
-msgid "_View Certificate&#x2026;"
-msgstr "æèèæ(_V)&#x2026;"
-
 #. Refers to "Only from sites you visit" option under Cookies.
-#: ../data/glade/prefs-dialog.ui.h:2
+#: ../data/ui/prefs-dialog.ui.h:2
 msgid "<small>For example, not from advertisers on these sites</small>"
 msgstr "<small>äåïäèäèéäçççåå</small>"
 
-#: ../data/glade/prefs-dialog.ui.h:3
+#: ../data/ui/prefs-dialog.ui.h:3
 msgid "A_utomatically open downloaded files"
 msgstr "èåäèäéåææ(_U)"
 
-#: ../data/glade/prefs-dialog.ui.h:4
+#: ../data/ui/prefs-dialog.ui.h:4
 msgid "Add Language"
 msgstr "ååèè"
 
-#: ../data/glade/prefs-dialog.ui.h:5
+#: ../data/ui/prefs-dialog.ui.h:5
 msgid "Allow popup _windows"
 msgstr "åèåååèç(_W)"
 
-#: ../data/glade/prefs-dialog.ui.h:6
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "Choose a l_anguage:"
 msgstr "éæèè(_A)ï"
 
@@ -221,202 +136,138 @@ msgstr "éæèè(_A)ï"
 #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
 #. * Select All, Input Methods and Insert Unicode control character.)
 #.
-#: ../data/glade/prefs-dialog.ui.h:7 ../lib/widgets/ephy-location-entry.c:607
-#: ../src/ephy-history-window.c:227 ../src/pdm-dialog.c:356
+#: ../data/ui/prefs-dialog.ui.h:7 ../lib/widgets/ephy-location-entry.c:577
+#: ../src/ephy-history-window.c:225 ../src/pdm-dialog.c:355
 msgid "Cl_ear"
 msgstr "æé(_E)"
 
-#: ../data/glade/prefs-dialog.ui.h:9
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "De_fault:"
 msgstr "éè(_F)ï"
 
 #. If we don't have XDG user dirs info, return an educated guess.
-#: ../data/glade/prefs-dialog.ui.h:10 ../lib/ephy-file-helpers.c:116
+#: ../data/ui/prefs-dialog.ui.h:10 ../lib/ephy-file-helpers.c:116
 msgid "Downloads"
 msgstr "äè"
 
-#: ../data/glade/prefs-dialog.ui.h:11
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Enable Java_Script"
 msgstr "åç Java_Script"
 
-#: ../data/glade/prefs-dialog.ui.h:12
+#: ../data/ui/prefs-dialog.ui.h:12
 msgid "Enable _plugins"
 msgstr "åçåæçå(_P)"
 
-#: ../data/glade/prefs-dialog.ui.h:13 ../src/ephy-encoding-dialog.c:302
+#: ../data/ui/prefs-dialog.ui.h:13 ../src/ephy-encoding-dialog.c:302
 msgid "Encodings"
 msgstr "çç(_E)"
 
-#: ../data/glade/prefs-dialog.ui.h:14
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Fonts"
 msgstr "åå"
 
-#: ../data/glade/prefs-dialog.ui.h:15
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Fonts & Style"
 msgstr "ååèæå"
 
-#: ../data/glade/prefs-dialog.ui.h:17
-msgid "Home page"
-msgstr "éé"
+#: ../data/ui/prefs-dialog.ui.h:16
+msgid "General"
+msgstr "äè"
 
-#: ../data/glade/prefs-dialog.ui.h:18 ../src/prefs-dialog.c:774
+#: ../data/ui/prefs-dialog.ui.h:17 ../src/prefs-dialog.c:774
 msgid "Language"
 msgstr "èè"
 
-#: ../data/glade/prefs-dialog.ui.h:19
+#: ../data/ui/prefs-dialog.ui.h:18
 msgid "Languages"
 msgstr "èè"
 
-#: ../data/glade/prefs-dialog.ui.h:20
+#: ../data/ui/prefs-dialog.ui.h:19
 msgid "MB"
 msgstr "MB"
 
-#: ../data/glade/prefs-dialog.ui.h:21
+#: ../data/ui/prefs-dialog.ui.h:20
 msgid "Monospace font:"
 msgstr "çåååï"
 
-#: ../data/glade/prefs-dialog.ui.h:22
+#: ../data/ui/prefs-dialog.ui.h:21
 msgid "Only _from sites you visit"
 msgstr "åäèäçèççç(_F)"
 
-#: ../data/glade/prefs-dialog.ui.h:24
+#: ../data/ui/prefs-dialog.ui.h:23
 msgid "Preferences"
 msgstr "ååèå"
 
-#: ../data/glade/prefs-dialog.ui.h:25
+#: ../data/ui/prefs-dialog.ui.h:24
 msgid "Privacy"
 msgstr "çé"
 
-#: ../data/glade/prefs-dialog.ui.h:26
+#: ../data/ui/prefs-dialog.ui.h:25
 msgid "Sans serif font:"
 msgstr "çèçååï"
 
-#: ../data/glade/prefs-dialog.ui.h:27
+#: ../data/ui/prefs-dialog.ui.h:26
 msgid "Serif font:"
 msgstr "èçååï"
 
-#: ../data/glade/prefs-dialog.ui.h:28
-msgid "Set to Current _Page"
-msgstr "èåççåéé(_P)"
-
-#: ../data/glade/prefs-dialog.ui.h:29
-msgid "Set to _Blank Page"
-msgstr "äçççéé(_B)"
-
-#: ../data/glade/prefs-dialog.ui.h:30
+#: ../data/ui/prefs-dialog.ui.h:27
 msgid "Spell checking"
 msgstr "æåææ"
 
-#: ../data/glade/prefs-dialog.ui.h:31
+#: ../data/ui/prefs-dialog.ui.h:28
 msgid "Style"
 msgstr "æå"
 
-#: ../data/glade/prefs-dialog.ui.h:32
+#: ../data/ui/prefs-dialog.ui.h:29
 msgid "Temporary Files"
 msgstr "æåæ"
 
-#: ../data/glade/prefs-dialog.ui.h:33
+#: ../data/ui/prefs-dialog.ui.h:30
 msgid "Use custom _stylesheet"
 msgstr "äçèéæåè(_S)"
 
-#: ../data/glade/prefs-dialog.ui.h:34
+#: ../data/ui/prefs-dialog.ui.h:31
 msgid "Web Content"
 msgstr "çéåå"
 
-#: ../data/glade/prefs-dialog.ui.h:35
-msgid "_Address:"
-msgstr "äå(_A)ï"
-
-#: ../data/glade/prefs-dialog.ui.h:36
+#: ../data/ui/prefs-dialog.ui.h:32
 msgid "_Always accept"
 msgstr "çææå(_A)"
 
-#: ../data/glade/prefs-dialog.ui.h:37
+#: ../data/ui/prefs-dialog.ui.h:33
 msgid "_Disk space:"
 msgstr "çççé(_D)ï"
 
-#: ../data/glade/prefs-dialog.ui.h:38
+#: ../data/ui/prefs-dialog.ui.h:34
 msgid "_Download folder:"
 msgstr "äèèæå(_D)"
 
-#: ../data/glade/prefs-dialog.ui.h:39
+#: ../data/ui/prefs-dialog.ui.h:35
 msgid "_Edit Stylesheetâ"
 msgstr "çèæåè(_E)â"
 
-#: ../data/glade/prefs-dialog.ui.h:40
+#: ../data/ui/prefs-dialog.ui.h:36
 msgid "_Enable spell checking"
 msgstr "åçæåææ(_E)"
 
-#: ../data/glade/prefs-dialog.ui.h:41
+#: ../data/ui/prefs-dialog.ui.h:37
 msgid "_Never accept"
 msgstr "æäæå(_N)"
 
-#: ../data/glade/prefs-dialog.ui.h:42
+#: ../data/ui/prefs-dialog.ui.h:38
 msgid "_Remember passwords"
 msgstr "èéåç(_R)"
 
-#: ../data/glade/prefs-dialog.ui.h:43
+#: ../data/ui/prefs-dialog.ui.h:39
 msgid "_Use system fonts"
 msgstr "äçççåå(_U)"
 
-#: ../data/glade/print.ui.h:1
-msgid "As laid out on the _screen"
-msgstr "çéçéç(_S)"
-
-#: ../data/glade/print.ui.h:2
-msgid "Background"
-msgstr "èæ"
-
-#: ../data/glade/print.ui.h:3
-msgid "Footers"
-msgstr "éå"
-
-#: ../data/glade/print.ui.h:4
-msgid "Frames"
-msgstr "ææ"
-
-#: ../data/glade/print.ui.h:5
-msgid "Headers"
-msgstr "æé"
-
-#: ../data/glade/print.ui.h:6
-msgid "O_nly the selected frame"
-msgstr "åæåéçææ(_N)"
-
-#: ../data/glade/print.ui.h:7
-msgid "P_age title"
-msgstr "ééæé(_A)"
-
-#: ../data/glade/print.ui.h:8
-msgid "Page _numbers"
-msgstr "éæ(_N)"
-
-#: ../data/glade/print.ui.h:9
-msgid "Print background c_olors"
-msgstr "æåèæéè(_O)"
-
-#: ../data/glade/print.ui.h:10
-msgid "Print background i_mages"
-msgstr "æåèæåç(_M)"
-
-#: ../data/glade/print.ui.h:11
-msgid "_Date"
-msgstr "ææ(_D)"
-
-#: ../data/glade/print.ui.h:12
-msgid "_Each frame separately"
-msgstr "æåææåé(_E)"
-
-#: ../data/glade/print.ui.h:13
-msgid "_Page address"
-msgstr "çéäå(_P)"
-
-#: ../embed/ephy-download.c:171
+#: ../embed/ephy-download.c:217
 msgctxt "file type"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../embed/ephy-embed.c:568
+#: ../embed/ephy-embed.c:778
 msgid "Web Inspector"
 msgstr "çéææå"
 
@@ -424,12 +275,6 @@ msgstr "çéææå"
 msgid "Epiphany can't be used now. Initialization failed."
 msgstr "Epiphany çåçæäçãåååçååæã"
 
-#: ../embed/ephy-embed-single.c:485
-msgid ""
-"CA Certificates file we should use was not found, all SSL sites will be "
-"considered to have a broken certificate."
-msgstr "æäåæåæèäçç CA èæïææç SSL ççéæèèçåèæåæåã"
-
 #: ../embed/ephy-embed-utils.c:61
 #, c-format
 msgid "Send an email message to â%sâ"
@@ -771,104 +616,105 @@ msgstr "åå"
 msgid "Local files"
 msgstr "ææææ"
 
-#: ../embed/ephy-request-about.c:98 ../embed/ephy-request-about.c:101
+#: ../embed/ephy-request-about.c:101 ../embed/ephy-request-about.c:104
 msgid "Installed plugins"
 msgstr "ååèçåæçå"
 
-#: ../embed/ephy-request-about.c:113
+#: ../embed/ephy-request-about.c:116
 msgid "Enabled"
 msgstr "ååç"
 
-#: ../embed/ephy-request-about.c:113
+#: ../embed/ephy-request-about.c:116
 msgid "Yes"
 msgstr "æ"
 
-#: ../embed/ephy-request-about.c:113
+#: ../embed/ephy-request-about.c:116
 msgid "No"
 msgstr "å"
 
-#: ../embed/ephy-request-about.c:114
+#: ../embed/ephy-request-about.c:117
 msgid "MIME type"
 msgstr "MIME éå"
 
-#: ../embed/ephy-request-about.c:114
+#: ../embed/ephy-request-about.c:117
 msgid "Description"
-msgstr "æè"
+msgstr "èæ"
 
-#: ../embed/ephy-request-about.c:114
+#: ../embed/ephy-request-about.c:117
 msgid "Suffixes"
 msgstr "åç"
 
-#: ../embed/ephy-request-about.c:143
+#: ../embed/ephy-request-about.c:146 ../embed/ephy-request-about.c:149
 msgid "Memory usage"
 msgstr "èæéäçé"
 
-#: ../embed/ephy-request-about.c:171 ../embed/ephy-request-about.c:173
+#: ../embed/ephy-request-about.c:175 ../embed/ephy-request-about.c:177
 msgid "Applications"
 msgstr "æççå"
 
-#: ../embed/ephy-request-about.c:174
+#: ../embed/ephy-request-about.c:178
 msgid "List of installed web applications"
 msgstr "ååèççéæççåæå"
 
-#: ../embed/ephy-request-about.c:189
+#. Note for translators: this refers to the installation date.
+#: ../embed/ephy-request-about.c:195
 msgid "Installed on:"
 msgstr "åèæï"
 
 #. characters
 #. ms
 #. RELOAD_DELAY * RELOAD_DELAY_MAX_TICKS = 10 s
-#: ../embed/ephy-web-view.c:70 ../embed/ephy-web-view.c:3445
+#: ../embed/ephy-web-view.c:70 ../embed/ephy-web-view.c:3396
 msgid "Blank page"
 msgstr "ççéé"
 
-#: ../embed/ephy-web-view.c:753
-msgid "Not now"
-msgstr "çåäè"
-
 #: ../embed/ephy-web-view.c:758
-msgid "Store password"
-msgstr "åååç"
+msgid "_Not now"
+msgstr "çåäè(_N)"
+
+#: ../embed/ephy-web-view.c:763
+msgid "_Store password"
+msgstr "åååç(_S)"
 
 #. Translators: The first %s is the username and the second one is the
 #. * hostname where this is happening. Example: gnome gmail com and
 #. * mail.google.com.
 #.
-#: ../embed/ephy-web-view.c:769
+#: ../embed/ephy-web-view.c:774
 #, c-format
 msgid ""
 "<big>Would you like to store the password for <b>%s</b> in <b>%s</b>?</big>"
 msgstr "<big>æåèåå <b>%s</b> å <b>%s</b> çåçï</big>"
 
 #. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1728
+#: ../embed/ephy-web-view.c:1746
 msgid "Deny"
 msgstr "çæ"
 
 #. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1734
+#: ../embed/ephy-web-view.c:1752
 msgid "Allow"
 msgstr "åè"
 
-#: ../embed/ephy-web-view.c:1741
+#: ../embed/ephy-web-view.c:1759
 #, c-format
 msgid "The page at <b>%s</b> wants to know your location."
 msgstr "å <b>%s</b> ççéæèçéäçäçã"
 
-#: ../embed/ephy-web-view.c:2016
+#: ../embed/ephy-web-view.c:2037
 msgid "None specified"
 msgstr "æææå"
 
-#: ../embed/ephy-web-view.c:2025 ../embed/ephy-web-view.c:2043
+#: ../embed/ephy-web-view.c:2046 ../embed/ephy-web-view.c:2064
 #, c-format
 msgid "Oops! Error loading %s"
 msgstr "åïèå %s æççéè"
 
-#: ../embed/ephy-web-view.c:2027
+#: ../embed/ephy-web-view.c:2048
 msgid "Oops! It was not possible to show this website"
 msgstr "åïçæéçéåçç"
 
-#: ../embed/ephy-web-view.c:2028
+#: ../embed/ephy-web-view.c:2049
 #, c-format
 msgid ""
 "<p>The website at <strong>%s</strong> seems to be unavailable. The precise "
@@ -877,15 +723,15 @@ msgid ""
 "is working correctly.</p>"
 msgstr "<p>çç <strong>%s</strong> åèçæäçïæçäèéèçï</p><p><em>%s</em></p><p>ååèèææééæçååæçäåãäèåäææäèçéçæåæåéäã</p>"
 
-#: ../embed/ephy-web-view.c:2037
+#: ../embed/ephy-web-view.c:2058
 msgid "Try again"
 msgstr "åèäæ"
 
-#: ../embed/ephy-web-view.c:2045
+#: ../embed/ephy-web-view.c:2066
 msgid "Oops! This site might have caused the web browser to close unexpectedly"
 msgstr "åïéåççåèåéæçéçèåæéæçéé"
 
-#: ../embed/ephy-web-view.c:2047
+#: ../embed/ephy-web-view.c:2068
 #, c-format
 msgid ""
 "<p>This page was loading when the web browser closed unexpectedly.</"
@@ -893,33 +739,33 @@ msgid ""
 "report the problem to the <strong>%s</strong> developers.</p>"
 msgstr "<p>éåçéååèåäçèååçåééäã</p><p>åæäéæèåèééäçåèååççéåçæãåæççéæïèååéååç <strong>%s</strong> éçéäã</p>"
 
-#: ../embed/ephy-web-view.c:2055
+#: ../embed/ephy-web-view.c:2076
 msgid "Load again anyway"
 msgstr "åååæèå"
 
-#: ../embed/ephy-web-view.c:2330
+#: ../embed/ephy-web-view.c:2356
 #, c-format
 msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8";
 msgstr "http://www.google.com.tw/search?q=%s&ie=UTF-8&oe=UTF-8";
 
-#: ../embed/ephy-web-view.c:2520
+#: ../embed/ephy-web-view.c:2567
 msgid "Plugins"
 msgstr "åæçå"
 
 #. translators: %s here is the address of the web page
-#: ../embed/ephy-web-view.c:2627
+#: ../embed/ephy-web-view.c:2674
 #, c-format
 msgid "Loading â%sââ"
 msgstr "æåèåâ%sââ"
 
-#: ../embed/ephy-web-view.c:2629
+#: ../embed/ephy-web-view.c:2676
 msgid "Loadingâ"
 msgstr "èåäâ"
 
 #. Translators: this is the directory name to store auxilary files
 #. * when saving html files.
 #.
-#: ../embed/ephy-web-view.c:3649
+#: ../embed/ephy-web-view.c:3600
 #, c-format
 msgid "%s Files"
 msgstr "%s åææ"
@@ -959,42 +805,6 @@ msgstr "äèåéæä URI èãType=Linkãæééç"
 msgid "Not a launchable item"
 msgstr "äæåäååçéç"
 
-#. Translaters: This string is for a toggle to display a toolbar.
-#. * The name of the toolbar is automatically computed from the widgets
-#. * on the toolbar, and is placed at the %s. Note the _ before the %s
-#. * which is used to add mnemonics. We know that this is likely to
-#. * produce duplicates, but don't worry about it. If your language
-#. * normally has a mnemonic at the start, please use the _. If not,
-#. * please remove.
-#: ../lib/egg/egg-editable-toolbar.c:988
-#, c-format
-msgid "Show â_%sâ"
-msgstr "éçâ_%sâ"
-
-#: ../lib/egg/egg-editable-toolbar.c:1481
-msgid "_Move on Toolbar"
-msgstr "çèååå(_M)"
-
-#: ../lib/egg/egg-editable-toolbar.c:1482
-msgid "Move the selected item on the toolbar"
-msgstr "ååéçéççèååå"
-
-#: ../lib/egg/egg-editable-toolbar.c:1483
-msgid "_Remove from Toolbar"
-msgstr "ååååäçé(_R)"
-
-#: ../lib/egg/egg-editable-toolbar.c:1484
-msgid "Remove the selected item from the toolbar"
-msgstr "ååååäçéåéçéç"
-
-#: ../lib/egg/egg-editable-toolbar.c:1485
-msgid "_Delete Toolbar"
-msgstr "åéååå(_D)"
-
-#: ../lib/egg/egg-editable-toolbar.c:1486
-msgid "Remove the selected toolbar"
-msgstr "çéåéååå"
-
 #: ../lib/egg/eggsmclient.c:225
 msgid "Disable connection to session manager"
 msgstr "åçåäæéæçççåçéç"
@@ -1003,7 +813,7 @@ msgstr "åçåäæéæçççåçéç"
 msgid "Specify file containing saved configuration"
 msgstr "æååååååçæçææ"
 
-#: ../lib/egg/eggsmclient.c:228 ../src/ephy-main.c:94 ../src/ephy-main.c:96
+#: ../lib/egg/eggsmclient.c:228 ../src/ephy-main.c:88 ../src/ephy-main.c:90
 msgid "FILE"
 msgstr "ææ"
 
@@ -1023,23 +833,19 @@ msgstr "äæéæççééï"
 msgid "Show session management options"
 msgstr "éçäæéæççéé"
 
-#: ../lib/egg/egg-toolbar-editor.c:489
-msgid "Separator"
-msgstr "åéç"
-
-#: ../lib/ephy-file-chooser.c:385
+#: ../lib/ephy-file-chooser.c:382
 msgid "All supported types"
 msgstr "ææææçéå"
 
-#: ../lib/ephy-file-chooser.c:396
+#: ../lib/ephy-file-chooser.c:393
 msgid "Web pages"
 msgstr "çé"
 
-#: ../lib/ephy-file-chooser.c:404
+#: ../lib/ephy-file-chooser.c:401
 msgid "Images"
 msgstr "ååæ"
 
-#: ../lib/ephy-file-chooser.c:412 ../src/bookmarks/ephy-bookmarks-editor.c:754
+#: ../lib/ephy-file-chooser.c:409 ../src/bookmarks/ephy-bookmarks-editor.c:635
 msgid "All files"
 msgstr "ææææ"
 
@@ -1063,35 +869,35 @@ msgstr "ææâ%sâ åçååïèåååçèååäçã"
 msgid "Failed to create directory â%sâ."
 msgstr "çæåççéâ%sâã"
 
-#: ../lib/ephy-gui.c:292
+#: ../lib/ephy-gui.c:206
 #, c-format
 msgid "Directory â%sâ is not writable"
 msgstr "çéâ%sâæäèååç"
 
-#: ../lib/ephy-gui.c:296
+#: ../lib/ephy-gui.c:210
 msgid "You do not have permission to create files in this directory."
 msgstr "äææåèçéåçææçæéã"
 
-#: ../lib/ephy-gui.c:299
+#: ../lib/ephy-gui.c:213
 msgid "Directory not Writable"
 msgstr "çéçæåå"
 
-#: ../lib/ephy-gui.c:329
+#: ../lib/ephy-gui.c:242
 #, c-format
 msgid "Cannot overwrite existing file â%sâ"
 msgstr "äèèååååçææâ%sâ"
 
-#: ../lib/ephy-gui.c:333
+#: ../lib/ephy-gui.c:246
 msgid ""
 "A file with this name already exists and you don't have permission to "
 "overwrite it."
 msgstr "äæçåçææåçååèäæææéåäèååã"
 
-#: ../lib/ephy-gui.c:336
+#: ../lib/ephy-gui.c:249
 msgid "Cannot Overwrite File"
 msgstr "çæèåææ"
 
-#: ../lib/ephy-gui.c:391
+#: ../lib/ephy-gui.c:307
 #, c-format
 msgid "Could not display help: %s"
 msgstr "çæéçèææäï%s"
@@ -1111,34 +917,6 @@ msgstr "ååäçæ (Gecko) äæååçåçéäçäæåçéå
 msgid "Failed to copy cookies file from Mozilla."
 msgstr "å Mozilla èè cookies ææåæã"
 
-#: ../lib/ephy-stock-icons.c:47
-msgid "Popup Windows"
-msgstr "åååèç"
-
-#: ../lib/ephy-stock-icons.c:48 ../src/ephy-history-window.c:1098
-msgid "History"
-msgstr "çèèé"
-
-#: ../lib/ephy-stock-icons.c:49
-#: ../src/bookmarks/ephy-bookmark-factory-action.c:300
-#: ../src/ephy-window.c:1634
-msgid "Bookmark"
-msgstr "ååæç"
-
-#: ../lib/ephy-stock-icons.c:50 ../src/bookmarks/ephy-bookmarks-editor.c:882
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1658
-#: ../src/bookmarks/ephy-topic-action.c:442 ../src/ephy-window.c:1638
-msgid "Bookmarks"
-msgstr "æç"
-
-#: ../lib/ephy-stock-icons.c:51 ../src/ephy-toolbar.c:277
-msgid "Address Entry"
-msgstr "äåèåæ"
-
-#: ../lib/ephy-stock-icons.c:52
-msgid "_Download"
-msgstr "äè(_D)"
-
 #. Translators: "friendly time" string for the current day, strftime format. like "Today 12:34 am"
 #: ../lib/ephy-time-helpers.c:223
 msgid "Today %I:%M %p"
@@ -1173,9 +951,9 @@ msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
 #. impossible time or broken locale settings
-#: ../lib/ephy-time-helpers.c:279 ../src/ephy-window.c:1872
+#: ../lib/ephy-time-helpers.c:279
 msgid "Unknown"
-msgstr "äè"
+msgstr "äæ"
 
 #: ../lib/ephy-zoom.h:44
 msgid "50%"
@@ -1213,57 +991,57 @@ msgstr "300%"
 msgid "400%"
 msgstr "400%"
 
-#: ../lib/widgets/ephy-download-widget.c:101
+#: ../lib/widgets/ephy-download-widget.c:88
 #, c-format
 msgid "%u:%02u hour left"
 msgid_plural "%u:%02u hours left"
 msgstr[0] "åé %u:%02u åæ"
 
-#: ../lib/widgets/ephy-download-widget.c:103
+#: ../lib/widgets/ephy-download-widget.c:90
 #, c-format
 msgid "%u hour left"
 msgid_plural "%u hours left"
 msgstr[0] "åé %u åæ"
 
-#: ../lib/widgets/ephy-download-widget.c:106
+#: ../lib/widgets/ephy-download-widget.c:93
 #, c-format
 msgid "%u:%02u minute left"
 msgid_plural "%u:%02u minutes left"
 msgstr[0] "åé %u:%02u åé"
 
-#: ../lib/widgets/ephy-download-widget.c:108
+#: ../lib/widgets/ephy-download-widget.c:95
 #, c-format
 msgid "%u second left"
 msgid_plural "%u seconds left"
 msgstr[0] "åé %u çé"
 
-#: ../lib/widgets/ephy-download-widget.c:172
+#: ../lib/widgets/ephy-download-widget.c:164
 msgid "Finished"
 msgstr "ååæ"
 
-#: ../lib/widgets/ephy-download-widget.c:211
+#: ../lib/widgets/ephy-download-widget.c:203
 #, c-format
 msgid "Error downloading: %s"
 msgstr "äèæççéèï%s"
 
-#: ../lib/widgets/ephy-download-widget.c:279 ../src/window-commands.c:534
+#: ../lib/widgets/ephy-download-widget.c:271 ../src/window-commands.c:482
 msgid "Cancel"
 msgstr "åæ"
 
-#: ../lib/widgets/ephy-download-widget.c:288 ../src/ephy-window.c:1626
-#: ../src/window-commands.c:315
+#: ../lib/widgets/ephy-download-widget.c:280 ../src/ephy-window.c:1285
+#: ../src/window-commands.c:263
 msgid "Open"
 msgstr "éå"
 
-#: ../lib/widgets/ephy-download-widget.c:294
+#: ../lib/widgets/ephy-download-widget.c:286
 msgid "Show in folder"
 msgstr "åèæåéç"
 
-#: ../lib/widgets/ephy-download-widget.c:467
+#: ../lib/widgets/ephy-download-widget.c:458
 msgid "Startingâ"
 msgstr "æåéåâ"
 
-#: ../lib/widgets/ephy-location-entry.c:890
+#: ../lib/widgets/ephy-location-entry.c:857
 msgid "Drag and drop this icon to create a link to this page"
 msgstr "ææéååçäåçéèèçéçéç"
 
@@ -1271,51 +1049,41 @@ msgstr "ææéååçäåçéèèçéçéç"
 msgid "Clear"
 msgstr "æé"
 
-#: ../src/bookmarks/ephy-bookmark-action.c:319
-#, c-format
-msgid "%s:"
-msgstr "%sï"
-
-#: ../src/bookmarks/ephy-bookmark-action.c:499
-#, c-format
-msgid "Executes the script â%sâ"
-msgstr "åèåäçâ%sâ"
-
 #. Translators: This string is used when counting bookmarks that
 #. * are similar to each other
-#: ../src/bookmarks/ephy-bookmark-properties.c:85
-#: ../src/bookmarks/ephy-bookmark-properties.c:611
+#: ../src/bookmarks/ephy-bookmark-properties.c:84
+#: ../src/bookmarks/ephy-bookmark-properties.c:613
 #, c-format
 msgid "%d _Similar"
 msgid_plural "%d _Similar"
 msgstr[0] "%d åçä(_S)"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:257
+#: ../src/bookmarks/ephy-bookmark-properties.c:256
 #, c-format
 msgid "_Unify With %d Identical Bookmark"
 msgid_plural "_Unify With %d Identical Bookmarks"
 msgstr[0] "è %d åçåçæçåä(_U)"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:277
-#: ../src/bookmarks/ephy-bookmark-properties.c:299
+#: ../src/bookmarks/ephy-bookmark-properties.c:276
+#: ../src/bookmarks/ephy-bookmark-properties.c:298
 #, c-format
 msgid "Show â%sâ"
 msgstr "éçâ%sâ"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:424
+#: ../src/bookmarks/ephy-bookmark-properties.c:423
 #, c-format
 msgid "â%sâ Properties"
 msgstr "â%sâåæ"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:550
+#: ../src/bookmarks/ephy-bookmark-properties.c:547
 msgid "_Title:"
 msgstr "æé(_T)ï"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:566
+#: ../src/bookmarks/ephy-bookmark-properties.c:564
 msgid "A_ddress:"
 msgstr "äå(_D)ï"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:577
+#: ../src/bookmarks/ephy-bookmark-properties.c:576
 msgid "T_opics:"
 msgstr "äé(_O)ï"
 
@@ -1323,434 +1091,413 @@ msgstr "äé(_O)ï"
 msgid "Sho_w all topics"
 msgstr "éçææäé(_W)"
 
-#: ../src/bookmarks/ephy-bookmarks.c:95
+#: ../src/bookmarks/ephy-bookmarks.c:94
 msgid "Entertainment"
 msgstr "åæ"
 
-#: ../src/bookmarks/ephy-bookmarks.c:96
+#: ../src/bookmarks/ephy-bookmarks.c:95
 msgid "News"
 msgstr "æè"
 
-#: ../src/bookmarks/ephy-bookmarks.c:97
+#: ../src/bookmarks/ephy-bookmarks.c:96
 msgid "Shopping"
 msgstr "èç"
 
-#: ../src/bookmarks/ephy-bookmarks.c:98
+#: ../src/bookmarks/ephy-bookmarks.c:97
 msgid "Sports"
 msgstr "éå"
 
-#: ../src/bookmarks/ephy-bookmarks.c:99
+#: ../src/bookmarks/ephy-bookmarks.c:98
 msgid "Travel"
 msgstr "æé"
 
-#: ../src/bookmarks/ephy-bookmarks.c:100
+#: ../src/bookmarks/ephy-bookmarks.c:99
 msgid "Work"
 msgstr "åä"
 
 #. translators: the %s is the title of the bookmark
-#: ../src/bookmarks/ephy-bookmarks.c:435
+#: ../src/bookmarks/ephy-bookmarks.c:434
 #, c-format
 msgid "Update bookmark â%sâ?"
 msgstr "æææçâ%sâï"
 
 #. translators: the %s is a URL
-#: ../src/bookmarks/ephy-bookmarks.c:440
+#: ../src/bookmarks/ephy-bookmarks.c:439
 #, c-format
 msgid "The bookmarked page has moved to â%sâ."
 msgstr "æçäççéåçèâ%sâã"
 
-#: ../src/bookmarks/ephy-bookmarks.c:444
+#: ../src/bookmarks/ephy-bookmarks.c:443
 msgid "_Don't Update"
 msgstr "äèææ(_D)"
 
-#: ../src/bookmarks/ephy-bookmarks.c:446
+#: ../src/bookmarks/ephy-bookmarks.c:445
 msgid "_Update"
 msgstr "ææ(_U)"
 
-#: ../src/bookmarks/ephy-bookmarks.c:449
+#: ../src/bookmarks/ephy-bookmarks.c:448
 msgid "Update Bookmark?"
 msgstr "æææçï"
 
 #. Translators: this topic contains all bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:1180
+#: ../src/bookmarks/ephy-bookmarks.c:1178
 msgctxt "bookmarks"
 msgid "All"
 msgstr "åé"
 
 #. Translators: this topic contains the most used bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:1183
+#: ../src/bookmarks/ephy-bookmarks.c:1181
 msgctxt "bookmarks"
 msgid "Most Visited"
 msgstr "æåçè"
 
 #. Translators: this topic contains the not categorized
 #. bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:1187
+#: ../src/bookmarks/ephy-bookmarks.c:1185
 msgctxt "bookmarks"
 msgid "Not Categorized"
 msgstr "æåé"
 
 #. Translators: this is an automatic topic containing local
 #. * websites bookmarks autodiscovered with zeroconf.
-#: ../src/bookmarks/ephy-bookmarks.c:1192
+#: ../src/bookmarks/ephy-bookmarks.c:1190
 msgctxt "bookmarks"
 msgid "Nearby Sites"
 msgstr "æåçç"
 
-#: ../src/bookmarks/ephy-bookmarks.c:1426
+#: ../src/bookmarks/ephy-bookmarks.c:1424
 #: ../src/bookmarks/ephy-bookmarks-import.c:271
 msgid "Untitled"
 msgstr "æåå"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:78
+#: ../src/bookmarks/ephy-bookmarks-editor.c:76
 msgid "Epiphany (RDF)"
 msgstr "Epiphany (RDF)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:79
+#: ../src/bookmarks/ephy-bookmarks-editor.c:77
 msgid "Mozilla (HTML)"
 msgstr "Mozilla (HTML)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:129
+#: ../src/bookmarks/ephy-bookmarks-editor.c:125
 msgid "Remove from this topic"
 msgstr "åæäéäåé"
 
 #. Toplevel
-#: ../src/bookmarks/ephy-bookmarks-editor.c:156
-#: ../src/ephy-history-window.c:127 ../src/ephy-window.c:114
+#: ../src/bookmarks/ephy-bookmarks-editor.c:152
+#: ../src/ephy-history-window.c:125
 msgid "_File"
 msgstr "ææ(_F)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:157
-#: ../src/ephy-history-window.c:128 ../src/ephy-window.c:115
+#: ../src/bookmarks/ephy-bookmarks-editor.c:153
+#: ../src/ephy-history-window.c:126
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:158
-#: ../src/ephy-history-window.c:129 ../src/ephy-window.c:116
+#: ../src/bookmarks/ephy-bookmarks-editor.c:154
+#: ../src/ephy-history-window.c:127
 msgid "_View"
 msgstr "éç(_V)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:159
-#: ../src/ephy-history-window.c:130 ../src/ephy-window.c:121
+#: ../src/bookmarks/ephy-bookmarks-editor.c:155
+#: ../src/ephy-history-window.c:128
 msgid "_Help"
 msgstr "æå(_H)"
 
 #. File Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:163
+#: ../src/bookmarks/ephy-bookmarks-editor.c:159
 msgid "_New Topic"
 msgstr "æåäé(_N)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:164
+#: ../src/bookmarks/ephy-bookmarks-editor.c:160
 msgid "Create a new topic"
 msgstr "åçæçäé"
 
-#. FIXME ngettext
 #. File Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:166
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1292
-#: ../src/bookmarks/ephy-bookmarks-ui.c:323 ../src/ephy-history-window.c:134
-#: ../src/ephy-history-window.c:612
+#: ../src/bookmarks/ephy-bookmarks-editor.c:162
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1161
+#: ../src/ephy-history-window.c:132 ../src/ephy-history-window.c:609
 msgid "Open in New _Window"
 msgid_plural "Open in New _Windows"
 msgstr[0] "åæçèçäéå(_W)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:167
+#: ../src/bookmarks/ephy-bookmarks-editor.c:163
 msgid "Open the selected bookmark in a new window"
 msgstr "åæçèçäéååéçæç"
 
-#. FIXME ngettext
-#: ../src/bookmarks/ephy-bookmarks-editor.c:169
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1295
-#: ../src/bookmarks/ephy-bookmarks-ui.c:311 ../src/ephy-history-window.c:137
-#: ../src/ephy-history-window.c:615
+#: ../src/bookmarks/ephy-bookmarks-editor.c:165
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1164
+#: ../src/ephy-history-window.c:135 ../src/ephy-history-window.c:612
 msgid "Open in New _Tab"
 msgid_plural "Open in New _Tabs"
 msgstr[0] "åæçåéäéå(_T)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:170
+#: ../src/bookmarks/ephy-bookmarks-editor.c:166
 msgid "Open the selected bookmark in a new tab"
 msgstr "åæçåéäéååéçæç"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:172
+#: ../src/bookmarks/ephy-bookmarks-editor.c:168
 msgid "_Renameâ"
 msgstr "éæåå(_R)â"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:173
+#: ../src/bookmarks/ephy-bookmarks-editor.c:169
 msgid "Rename the selected bookmark or topic"
 msgstr "ææåéçæçæäéçåç"
 
-#. Add popup menu actions that are specific to the bookmark widgets
-#: ../src/bookmarks/ephy-bookmarks-editor.c:174
-#: ../src/bookmarks/ephy-bookmarks-ui.c:299
+#: ../src/bookmarks/ephy-bookmarks-editor.c:170
 msgid "_Properties"
 msgstr "åæ(_P)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:175
+#: ../src/bookmarks/ephy-bookmarks-editor.c:171
 msgid "View or modify the properties of the selected bookmark"
 msgstr "éçæäæåéæççåæ"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:177
+#: ../src/bookmarks/ephy-bookmarks-editor.c:173
 msgid "_Import Bookmarksâ"
 msgstr "ååæç(_I)â"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:178
+#: ../src/bookmarks/ephy-bookmarks-editor.c:174
 msgid "Import bookmarks from another browser or a bookmarks file"
 msgstr "åååçèåææçæååæç"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:180
+#: ../src/bookmarks/ephy-bookmarks-editor.c:176
 msgid "_Export Bookmarksâ"
 msgstr "ååæç(_E)â"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:181
+#: ../src/bookmarks/ephy-bookmarks-editor.c:177
 msgid "Export bookmarks to a file"
 msgstr "åæçåååææ"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:183
-#: ../src/ephy-history-window.c:143 ../src/ephy-window.c:149
+#: ../src/bookmarks/ephy-bookmarks-editor.c:179
+#: ../src/ephy-history-window.c:141 ../src/ephy-window.c:104
 msgid "_Close"
 msgstr "éé(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:184
+#: ../src/bookmarks/ephy-bookmarks-editor.c:180
 msgid "Close the bookmarks window"
 msgstr "ééæçèç"
 
 #. Edit Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:188
-#: ../src/ephy-history-window.c:148 ../src/ephy-window.c:161
+#: ../src/bookmarks/ephy-bookmarks-editor.c:184
+#: ../src/ephy-history-window.c:146 ../src/ephy-window.c:113
 msgid "Cu_t"
 msgstr "åä(_T)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:189
-#: ../src/ephy-history-window.c:149 ../src/ephy-window.c:162
+#: ../src/bookmarks/ephy-bookmarks-editor.c:185
+#: ../src/ephy-history-window.c:147
 msgid "Cut the selection"
 msgstr "åäéåçåå"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:191
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1305
-#: ../src/ephy-history-window.c:151 ../src/ephy-history-window.c:625
-#: ../src/ephy-window.c:164
+#: ../src/bookmarks/ephy-bookmarks-editor.c:187
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1174
+#: ../src/ephy-history-window.c:149 ../src/ephy-history-window.c:622
+#: ../src/ephy-window.c:115
 msgid "_Copy"
 msgstr "èè(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:192
-#: ../src/ephy-history-window.c:152 ../src/ephy-window.c:165
+#: ../src/bookmarks/ephy-bookmarks-editor.c:188
+#: ../src/ephy-history-window.c:150
 msgid "Copy the selection"
 msgstr "èèéåçåå"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:194
-#: ../src/ephy-history-window.c:154 ../src/ephy-window.c:167
+#: ../src/bookmarks/ephy-bookmarks-editor.c:190
+#: ../src/ephy-history-window.c:152 ../src/ephy-window.c:117
 msgid "_Paste"
 msgstr "èä(_P)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:195
-#: ../src/ephy-history-window.c:155
+#: ../src/bookmarks/ephy-bookmarks-editor.c:191
+#: ../src/ephy-history-window.c:153
 msgid "Paste the clipboard"
 msgstr "èäåèçäçåå"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:197
-#: ../src/ephy-history-window.c:157
+#: ../src/bookmarks/ephy-bookmarks-editor.c:193
+#: ../src/ephy-history-window.c:155
 msgid "_Delete"
 msgstr "åé(_D)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:198
+#: ../src/bookmarks/ephy-bookmarks-editor.c:194
 msgid "Delete the selected bookmark or topic"
 msgstr "åéåéçæçæäé"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:200
-#: ../src/ephy-history-window.c:160 ../src/ephy-window.c:173
+#: ../src/bookmarks/ephy-bookmarks-editor.c:196
+#: ../src/ephy-history-window.c:158 ../src/ephy-window.c:121
 msgid "Select _All"
 msgstr "åééå(_A)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:201
+#: ../src/bookmarks/ephy-bookmarks-editor.c:197
 msgid "Select all bookmarks or text"
 msgstr "éåæææçææå"
 
 #. Help Menu
-#. Help menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:205
-#: ../src/ephy-history-window.c:168 ../src/ephy-window.c:267
+#: ../src/bookmarks/ephy-bookmarks-editor.c:201
+#: ../src/ephy-history-window.c:166
 msgid "_Contents"
 msgstr "åå(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:206
+#: ../src/bookmarks/ephy-bookmarks-editor.c:202
 msgid "Display bookmarks help"
 msgstr "éçæçèææä"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:208
-#: ../src/ephy-history-window.c:171 ../src/ephy-window.c:270
+#: ../src/bookmarks/ephy-bookmarks-editor.c:204
+#: ../src/ephy-history-window.c:169
 msgid "_About"
 msgstr "éæ(_A)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:209
-#: ../src/ephy-history-window.c:172 ../src/ephy-window.c:271
+#: ../src/bookmarks/ephy-bookmarks-editor.c:205
+#: ../src/ephy-history-window.c:170
 msgid "Display credits for the web browser creators"
 msgstr "éèææéåçéçèåçåäè"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:214
-msgid "_Show on Toolbar"
-msgstr "ååååéç(_S)"
-
-#: ../src/bookmarks/ephy-bookmarks-editor.c:215
-msgid "Show the selected bookmark on a toolbar"
-msgstr "ååååäéçåéçæç"
-
 #. View Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:218
-#: ../src/ephy-history-window.c:186
+#: ../src/bookmarks/ephy-bookmarks-editor.c:211
+#: ../src/ephy-history-window.c:184
 msgid "_Title"
 msgstr "æé(_T)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:219
-#: ../src/ephy-history-window.c:187
+#: ../src/bookmarks/ephy-bookmarks-editor.c:212
+#: ../src/ephy-history-window.c:185
 msgid "Show the title column"
 msgstr "éçæéæä"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:220
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1796
-#: ../src/ephy-history-window.c:1229
+#: ../src/bookmarks/ephy-bookmarks-editor.c:213
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1657
+#: ../src/ephy-history-window.c:1225
 msgid "Address"
-msgstr "äå"
+msgstr "åå"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:221
-#: ../src/ephy-history-window.c:189
+#: ../src/bookmarks/ephy-bookmarks-editor.c:214
+#: ../src/ephy-history-window.c:187
 msgid "Show the address column"
 msgstr "éçäåæä"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:263
+#: ../src/bookmarks/ephy-bookmarks-editor.c:256
 msgid "Type a topic"
 msgstr "èèåäéåç"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:382
+#: ../src/bookmarks/ephy-bookmarks-editor.c:375
 #, c-format
 msgid "Delete topic â%sâ?"
 msgstr "åéäéâ%sâï"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:385
+#: ../src/bookmarks/ephy-bookmarks-editor.c:378
 msgid "Delete this topic?"
 msgstr "åéæäéï"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:387
+#: ../src/bookmarks/ephy-bookmarks-editor.c:380
 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 "åéæäéæäåææååääèääéæååäéçæçèæææåéïäæçäæèåéã"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:390
+#: ../src/bookmarks/ephy-bookmarks-editor.c:383
 msgid "_Delete Topic"
 msgstr "åéäé(_D)"
 
 #. FIXME: proper i18n after freeze
-#: ../src/bookmarks/ephy-bookmarks-editor.c:612
-#: ../src/bookmarks/ephy-bookmarks-editor.c:616
+#: ../src/bookmarks/ephy-bookmarks-editor.c:493
+#: ../src/bookmarks/ephy-bookmarks-editor.c:497
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:621
-#: ../src/bookmarks/ephy-bookmarks-editor.c:625
+#: ../src/bookmarks/ephy-bookmarks-editor.c:502
+#: ../src/bookmarks/ephy-bookmarks-editor.c:506
 msgid "Firebird"
 msgstr "Firebird"
 
 #. Translators: The %s is the name of a Mozilla profile.
-#: ../src/bookmarks/ephy-bookmarks-editor.c:630
+#: ../src/bookmarks/ephy-bookmarks-editor.c:511
 #, c-format
 msgid "Mozilla â%sâ profile"
 msgstr "Mozillaâ%sâèåçå"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:634
+#: ../src/bookmarks/ephy-bookmarks-editor.c:515
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:638
+#: ../src/bookmarks/ephy-bookmarks-editor.c:519
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:667
+#: ../src/bookmarks/ephy-bookmarks-editor.c:548
 msgid "Import failed"
 msgstr "åååæ"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:669
+#: ../src/bookmarks/ephy-bookmarks-editor.c:550
 msgid "Import Failed"
 msgstr "åååæ"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:672
+#: ../src/bookmarks/ephy-bookmarks-editor.c:553
 #, c-format
 msgid ""
 "The bookmarks from â%sâ could not be imported because the file is corrupted "
 "or of an unsupported type."
 msgstr "çæåâ%sâååæçïååæèæåèåçåæææäææçæåã"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:735
+#: ../src/bookmarks/ephy-bookmarks-editor.c:616
 msgid "Import Bookmarks from File"
 msgstr "åææååæç"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:742
+#: ../src/bookmarks/ephy-bookmarks-editor.c:623
 msgid "Firefox/Mozilla bookmarks"
 msgstr "Firefox/Mozilla æç"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:746
+#: ../src/bookmarks/ephy-bookmarks-editor.c:627
 msgid "Galeon/Konqueror bookmarks"
 msgstr "Galeon/Konqueror æç"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:750
+#: ../src/bookmarks/ephy-bookmarks-editor.c:631
 msgid "Epiphany bookmarks"
 msgstr "Epiphany æç"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:874
+#: ../src/bookmarks/ephy-bookmarks-editor.c:755
 msgid "Export Bookmarks"
 msgstr "ååæç"
 
+#: ../src/bookmarks/ephy-bookmarks-editor.c:763
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1520
+#: ../src/bookmarks/ephy-topic-action.c:217
+msgid "Bookmarks"
+msgstr "æç"
+
 #. Make a format selection combo & label
-#: ../src/bookmarks/ephy-bookmarks-editor.c:888
+#: ../src/bookmarks/ephy-bookmarks-editor.c:769
 msgid "File f_ormat:"
 msgstr "æææå(_O)ï"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:934
+#: ../src/bookmarks/ephy-bookmarks-editor.c:815
 msgid "Import Bookmarks"
 msgstr "ååæç"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:939
+#: ../src/bookmarks/ephy-bookmarks-editor.c:820
 msgid "I_mport"
 msgstr "åå(_M)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:955
+#: ../src/bookmarks/ephy-bookmarks-editor.c:836
 msgid "Import bookmarks from:"
 msgstr "ååæççäæï"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:975
+#: ../src/bookmarks/ephy-bookmarks-editor.c:856
 msgid "File"
 msgstr "ææ"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1301
-#: ../src/ephy-history-window.c:621
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1170
+#: ../src/ephy-history-window.c:618
 msgid "_Copy Address"
 msgstr "èèäå(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1549
-#: ../src/ephy-history-window.c:949
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1411
+#: ../src/ephy-history-window.c:946
 msgid "_Search:"
 msgstr "æå(_S)ï"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1715
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1576
 msgid "Topics"
 msgstr "äé"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1785
-#: ../src/ephy-history-window.c:1220
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1646
+#: ../src/ephy-history-window.c:1216
 msgid "Title"
 msgstr "æé"
 
-#: ../src/bookmarks/ephy-bookmarks-ui.c:300
-msgid "Show properties for this bookmark"
-msgstr "éçææççåæ"
-
-#: ../src/bookmarks/ephy-bookmarks-ui.c:312
-msgid "Open this bookmark in a new tab"
-msgstr "åæçåéäéåææç"
-
-#: ../src/bookmarks/ephy-bookmarks-ui.c:324
-msgid "Open this bookmark in a new window"
-msgstr "åæçèçäéåææç"
-
 #. FIXME !!!!
 #: ../src/bookmarks/ephy-open-tabs-action.c:74
 msgid "Open in New _Tabs"
@@ -1760,19 +1507,27 @@ msgstr "åæçåéäéå(_T)"
 msgid "Open the bookmarks in this topic in new tabs"
 msgstr "åæçåéäéåæäæéçæç"
 
-#: ../src/bookmarks/ephy-related-action.c:152
-msgid "Related"
-msgstr "çéç"
-
-#: ../src/bookmarks/ephy-topic-factory-action.c:299
-msgid "Topic"
-msgstr "äé"
-
 #: ../src/bookmarks/ephy-topics-entry.c:330
 #, c-format
 msgid "Create topic â%sâ"
 msgstr "åçäéâ%sâ"
 
+#: ../src/ephy-combined-stop-reload-action.c:41
+msgid "Stop"
+msgstr "åæ"
+
+#: ../src/ephy-combined-stop-reload-action.c:42
+msgid "Stop current data transfer"
+msgstr "åæåéçåçèæ"
+
+#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:136
+msgid "_Reload"
+msgstr "éæèå(_R)"
+
+#: ../src/ephy-combined-stop-reload-action.c:45
+msgid "Display the latest content of the current page"
+msgstr "éçæéçææåå"
+
 #: ../src/ephy-encoding-menu.c:330
 msgid "_Otherâ"
 msgstr "åå(_O)â"
@@ -1824,162 +1579,158 @@ msgid "Find next occurrence of the search string"
 msgstr "åæääååçæååäçåæ"
 
 #. exit button
-#: ../src/ephy-fullscreen-popup.c:232 ../src/ephy-toolbar.c:617
+#: ../src/ephy-fullscreen-popup.c:232
 msgid "Leave Fullscreen"
 msgstr "ééåèå"
 
-#: ../src/ephy-go-action.c:41 ../src/ephy-toolbar.c:307
-msgid "Go"
-msgstr "åå"
-
-#: ../src/ephy-history-window.c:135
+#: ../src/ephy-history-window.c:133
 msgid "Open the selected history link in a new window"
 msgstr "åæçèçäéååéççèèééç"
 
-#: ../src/ephy-history-window.c:138
+#: ../src/ephy-history-window.c:136
 msgid "Open the selected history link in a new tab"
 msgstr "åæçåéäéååéççèèééç"
 
-#: ../src/ephy-history-window.c:140
+#: ../src/ephy-history-window.c:138
 msgid "Add _Bookmarkâ"
 msgstr "ååæç(_B)â"
 
-#: ../src/ephy-history-window.c:141
+#: ../src/ephy-history-window.c:139
 msgid "Bookmark the selected history link"
 msgstr "ååéççèèééçååèæç"
 
-#: ../src/ephy-history-window.c:144
+#: ../src/ephy-history-window.c:142
 msgid "Close the history window"
 msgstr "ééçèèéèç"
 
-#: ../src/ephy-history-window.c:158
+#: ../src/ephy-history-window.c:156
 msgid "Delete the selected history link"
 msgstr "åéåéççèèééç"
 
-#: ../src/ephy-history-window.c:161
+#: ../src/ephy-history-window.c:159
 msgid "Select all history links or text"
 msgstr "éåææçèèééçææå"
 
-#: ../src/ephy-history-window.c:163
+#: ../src/ephy-history-window.c:161
 msgid "Clear _History"
 msgstr "æéçèèé(_H)"
 
-#: ../src/ephy-history-window.c:164
+#: ../src/ephy-history-window.c:162
 msgid "Clear your browsing history"
 msgstr "æéçèèé"
 
-#: ../src/ephy-history-window.c:169
+#: ../src/ephy-history-window.c:167
 msgid "Display history help"
 msgstr "éççèèéèææä"
 
-#: ../src/ephy-history-window.c:188
+#: ../src/ephy-history-window.c:186
 msgid "_Address"
 msgstr "äå(_A)"
 
-#: ../src/ephy-history-window.c:190
+#: ../src/ephy-history-window.c:188
 msgid "_Date and Time"
 msgstr "ææåæå(_D)"
 
-#: ../src/ephy-history-window.c:191
+#: ../src/ephy-history-window.c:189
 msgid "Show the date and time column"
 msgstr "éçææåæåæä"
 
-#: ../src/ephy-history-window.c:217
+#: ../src/ephy-history-window.c:215
 msgid "Clear browsing history?"
 msgstr "æåæéçèèéï"
 
-#: ../src/ephy-history-window.c:221
+#: ../src/ephy-history-window.c:219
 msgid ""
 "Clearing the browsing history will cause all history links to be permanently "
 "deleted."
 msgstr "æéçèèéåæäææçèèéæéèåéã"
 
-#: ../src/ephy-history-window.c:236
+#: ../src/ephy-history-window.c:234
 msgid "Clear History"
 msgstr "æéçèèé"
 
-#: ../src/ephy-history-window.c:958
+#: ../src/ephy-history-window.c:955
 msgid "Last 30 minutes"
 msgstr "å 30 åé"
 
-#: ../src/ephy-history-window.c:959
+#: ../src/ephy-history-window.c:956
 msgid "Today"
 msgstr "äæ"
 
 #. keep this in sync with embed/ephy-history.c's
 #. * HISTORY_PAGE_OBSOLETE_DAYS
-#: ../src/ephy-history-window.c:961 ../src/ephy-history-window.c:965
-#: ../src/ephy-history-window.c:971
+#: ../src/ephy-history-window.c:958 ../src/ephy-history-window.c:962
+#: ../src/ephy-history-window.c:968
 #, c-format
 msgid "Last %d day"
 msgid_plural "Last %d days"
 msgstr[0] "æè %d æ"
 
-#: ../src/ephy-history-window.c:1157
+#: ../src/ephy-history-window.c:1095
+msgid "History"
+msgstr "çèèé"
+
+#: ../src/ephy-history-window.c:1153
 msgid "Sites"
 msgstr "çç"
 
-#: ../src/ephy-history-window.c:1237
+#: ../src/ephy-history-window.c:1233
 msgid "Date"
 msgstr "ææ"
 
-#: ../src/ephy-main.c:79 ../src/ephy-main.c:330 ../src/window-commands.c:1346
-msgid "GNOME Web Browser"
-msgstr "GNOME çéçèå"
-
-#: ../src/ephy-main.c:88
+#: ../src/ephy-main.c:82
 msgid "Open a new tab in an existing browser window"
 msgstr "åçæççèåèçäéåæçåé"
 
-#: ../src/ephy-main.c:90
+#: ../src/ephy-main.c:84
 msgid "Open a new browser window"
 msgstr "éåæççèåèç"
 
-#: ../src/ephy-main.c:92
+#: ../src/ephy-main.c:86
 msgid "Launch the bookmarks editor"
 msgstr "ååæççèå"
 
-#: ../src/ephy-main.c:94
+#: ../src/ephy-main.c:88
 msgid "Import bookmarks from the given file"
 msgstr "åææåçææååæç"
 
-#: ../src/ephy-main.c:96
+#: ../src/ephy-main.c:90
 msgid "Load the given session file"
 msgstr "èåæåçäæéæææ"
 
-#: ../src/ephy-main.c:98
+#: ../src/ephy-main.c:92
 msgid "Add a bookmark"
 msgstr "ååæç"
 
-#: ../src/ephy-main.c:98
+#: ../src/ephy-main.c:92
 msgid "URL"
 msgstr "URL"
 
-#: ../src/ephy-main.c:100
+#: ../src/ephy-main.c:94
 msgid "Start a private instance"
 msgstr "åå private instance"
 
-#: ../src/ephy-main.c:102
+#: ../src/ephy-main.c:96
 msgid "Start the browser in application mode"
 msgstr "äæççåæåååçèå"
 
-#: ../src/ephy-main.c:104
+#: ../src/ephy-main.c:98
 msgid "Profile directory to use in the private instance"
 msgstr "å private instance äççèåçåçé"
 
-#: ../src/ephy-main.c:104
+#: ../src/ephy-main.c:98
 msgid "DIR"
 msgstr "DIR"
 
-#: ../src/ephy-main.c:106
+#: ../src/ephy-main.c:100
 msgid "URL â"
 msgstr "URLâ"
 
-#: ../src/ephy-main.c:214
-msgid "Could not start GNOME Web Browser"
-msgstr "çæåè GNOME çéçèå"
+#: ../src/ephy-main.c:208
+msgid "Could not start Web"
+msgstr "çæååçé"
 
-#: ../src/ephy-main.c:217
+#: ../src/ephy-main.c:211
 #, c-format
 msgid ""
 "Startup failed because of the following error:\n"
@@ -1988,852 +1739,392 @@ msgstr ""
 "çæääååïåæçæåèï\n"
 "%s"
 
-#: ../src/ephy-main.c:331
-msgid "GNOME Web Browser options"
-msgstr "GNOME çéçèåéé"
+#: ../src/ephy-main.c:322
+msgid "Web options"
+msgstr "çééé"
 
-#: ../src/ephy-notebook.c:618
+#: ../src/ephy-notebook.c:592
 msgid "Close tab"
 msgstr "ééåé"
 
-#: ../src/ephy-session.c:118
+#: ../src/ephy-session.c:115
 #, c-format
 msgid "Downloads will be aborted and logout proceed in %d second."
 msgid_plural "Downloads will be aborted and logout proceed in %d seconds."
 msgstr[0] "äèåæèäæåå %d åçåã"
 
-#: ../src/ephy-session.c:222
+#: ../src/ephy-session.c:219
 msgid "Abort pending downloads?"
 msgstr "åææåæçäèï"
 
-#: ../src/ephy-session.c:227
+#: ../src/ephy-session.c:224
 msgid ""
 "There are still downloads pending. If you log out, they will be aborted and "
 "lost."
 msgstr "éæäèæåæãåæäçåïåååæèäæåéåã"
 
-#: ../src/ephy-session.c:231
+#: ../src/ephy-session.c:228
 msgid "_Cancel Logout"
 msgstr "åæçå(_C)"
 
-#: ../src/ephy-session.c:233
+#: ../src/ephy-session.c:230
 msgid "_Abort Downloads"
 msgstr "åæäè(_A)"
 
-#: ../src/ephy-session.c:774
-msgid "Don't recover"
-msgstr "äèåå"
+#: ../src/ephy-session.c:770
+msgid "_Don't recover"
+msgstr "äèåå(_D)"
 
-#: ../src/ephy-session.c:779
-msgid "Recover session"
-msgstr "ååäæéæ"
+#: ../src/ephy-session.c:775
+msgid "_Recover session"
+msgstr "ååäæéæ(_R)"
 
-#: ../src/ephy-session.c:784
+#: ../src/ephy-session.c:780
 msgid "Do you want to recover the previous browser windows and tabs?"
 msgstr "æåèååååççèåèçååéï"
 
-#: ../src/ephy-tabs-menu.c:210
-msgid "Switch to this tab"
-msgstr "åæåæåé"
-
-#: ../src/ephy-toolbar.c:217
-msgid "_Back"
-msgstr "ääé(_B)"
-
-#: ../src/ephy-toolbar.c:219
-msgid "Go to the previous visited page"
-msgstr "ååääåçèçéé"
-
-#. 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:223
-msgid "Back history"
-msgstr "ääéçèé"
-
-#: ../src/ephy-toolbar.c:237
-msgid "_Forward"
-msgstr "ääé(_F)"
-
-#: ../src/ephy-toolbar.c:239
-msgid "Go to the next visited page"
-msgstr "ååääåçèçéé"
-
-#. 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:243
-msgid "Forward history"
-msgstr "ääéçèé"
-
-#: ../src/ephy-toolbar.c:256
-msgid "_Up"
-msgstr "ääå(_U)"
-
-#: ../src/ephy-toolbar.c:258
-msgid "Go up one level"
-msgstr "ååääåçéé"
-
-#. 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:262
-msgid "List of upper levels"
-msgstr "ææäåçé"
-
-#: ../src/ephy-toolbar.c:279
-msgid "Enter a web address to open, or a phrase to search for"
-msgstr "èåæéåççåïæèææåççè"
-
-#: ../src/ephy-toolbar.c:295
-msgid "Zoom"
-msgstr "çæ"
-
-#: ../src/ephy-toolbar.c:297
-msgid "Adjust the text size"
-msgstr "èææååå"
-
-#: ../src/ephy-toolbar.c:309
-msgid "Go to the address entered in the address entry"
-msgstr "ååäåèåæääæåçäå"
-
-#: ../src/ephy-toolbar.c:318
-msgid "_Home"
-msgstr "éé(_H)"
-
-#: ../src/ephy-toolbar.c:320
-msgid "Go to the home page"
-msgstr "ååéé"
-
-#: ../src/ephy-toolbar.c:330
-msgid "New _Tab"
-msgstr "æååé(_T)"
-
-#: ../src/ephy-toolbar.c:332
-msgid "Open a new tab"
-msgstr "éåæçåé"
-
-#: ../src/ephy-toolbar.c:343
-msgid "_New Window"
-msgstr "æåèç(_N)"
-
-#: ../src/ephy-toolbar.c:345
-msgid "Open a new window"
-msgstr "éåæçèç"
-
-#: ../src/ephy-toolbar-editor.c:71
-msgctxt "toolbar style"
-msgid "Default"
-msgstr "éèå"
-
-#. separator row
-#: ../src/ephy-toolbar-editor.c:73
-msgctxt "toolbar style"
-msgid "Text below icons"
-msgstr "æåååçä"
-
-#: ../src/ephy-toolbar-editor.c:74
-msgctxt "toolbar style"
-msgid "Text beside icons"
-msgstr "æåååçæ"
-
-#: ../src/ephy-toolbar-editor.c:75
-msgctxt "toolbar style"
-msgid "Icons only"
-msgstr "åæåç"
-
-#: ../src/ephy-toolbar-editor.c:76
-msgctxt "toolbar style"
-msgid "Text only"
-msgstr "åææå"
-
-#: ../src/ephy-toolbar-editor.c:185
-msgid "Toolbar Editor"
-msgstr "åååçèå"
-
-#. translators: translate the same as in gnome-control-center
-#: ../src/ephy-toolbar-editor.c:204
-msgid "Toolbar _button labels:"
-msgstr "åååæéæå(_B)ï"
-
-#: ../src/ephy-toolbar-editor.c:269
-msgid "_Add a New Toolbar"
-msgstr "æåååå(_A)"
-
-#: ../src/ephy-window.c:117
+#. Toplevel
+#: ../src/ephy-window.c:87
 msgid "_Bookmarks"
 msgstr "æç(_B)"
 
-#: ../src/ephy-window.c:118
-msgid "_Go"
-msgstr "åå(_G)"
-
-#: ../src/ephy-window.c:119
-msgid "T_ools"
-msgstr "ååå(_O)"
-
-#: ../src/ephy-window.c:120
-msgid "_Tabs"
-msgstr "åé(_T)"
-
-#: ../src/ephy-window.c:122
-msgid "_Toolbars"
-msgstr "ååå(_T)"
-
-#. File menu
-#: ../src/ephy-window.c:128
+#. File actions.
+#: ../src/ephy-window.c:94
 msgid "_Openâ"
 msgstr "éå(_O)â"
 
-#: ../src/ephy-window.c:129
-msgid "Open a file"
-msgstr "éåææ"
-
-#: ../src/ephy-window.c:131
+#: ../src/ephy-window.c:96
 msgid "Save _Asâ"
 msgstr "ååææ(_A)â"
 
-#: ../src/ephy-window.c:132
-msgid "Save the current page"
-msgstr "ååçåçééåå"
-
-#: ../src/ephy-window.c:134
+#: ../src/ephy-window.c:98
 msgid "Save As _Web Applicationâ"
 msgstr "ååççéæççå(_W)â"
 
-#: ../src/ephy-window.c:135
-msgid "Save the current page as a Web Application"
-msgstr "ååçåçééççéæççå"
-
-#: ../src/ephy-window.c:137
-msgid "Page Set_up"
-msgstr "ééèå(_U)"
-
-#: ../src/ephy-window.c:138
-msgid "Setup the page settings for printing"
-msgstr "èåæåæçééèå"
-
-#: ../src/ephy-window.c:140
-msgid "Print Pre_view"
-msgstr "éèæå(_V)"
-
-#: ../src/ephy-window.c:141
-msgid "Print preview"
-msgstr "éèæå"
-
-#: ../src/ephy-window.c:143
+#: ../src/ephy-window.c:100
 msgid "_Printâ"
 msgstr "æå(_P)â"
 
-#: ../src/ephy-window.c:144
-msgid "Print the current page"
-msgstr "æåçåçééåå"
-
-#: ../src/ephy-window.c:146
+#: ../src/ephy-window.c:102
 msgid "S_end Link by Emailâ"
 msgstr "äééåééç(_E)â"
 
-#: ../src/ephy-window.c:147
-msgid "Send a link of the current page"
-msgstr "åéæééçéç"
-
-#: ../src/ephy-window.c:150
-msgid "Close this tab"
-msgstr "ééæåé"
-
-#. Edit menu
-#: ../src/ephy-window.c:155
+#. Edit actions.
+#: ../src/ephy-window.c:109
 msgid "_Undo"
 msgstr "åå(_U)"
 
-#: ../src/ephy-window.c:156
-msgid "Undo the last action"
-msgstr "ååääååä"
-
-#: ../src/ephy-window.c:158
+#: ../src/ephy-window.c:111
 msgid "Re_do"
 msgstr "åæåå(_D)"
 
-#: ../src/ephy-window.c:159
-msgid "Redo the last undone action"
-msgstr "åæääåçåååä"
-
-#: ../src/ephy-window.c:168
-msgid "Paste clipboard"
-msgstr "èäåèççåå"
-
-#: ../src/ephy-window.c:171
-msgid "Delete text"
-msgstr "åéæå"
-
-#: ../src/ephy-window.c:174
-msgid "Select the entire page"
-msgstr "éåæåééçåå"
-
-#: ../src/ephy-window.c:176
+#: ../src/ephy-window.c:123
 msgid "_Findâ"
 msgstr "åæ(_F)â"
 
-#: ../src/ephy-window.c:177
-msgid "Find a word or phrase in the page"
-msgstr "åééäåæäååèæåä"
-
-#: ../src/ephy-window.c:179
+#: ../src/ephy-window.c:125
 msgid "Find Ne_xt"
 msgstr "æääå(_X)"
 
-#: ../src/ephy-window.c:180
-msgid "Find next occurrence of the word or phrase"
-msgstr "åæääæåçæååèæåäçåæ"
-
-#: ../src/ephy-window.c:182
+#: ../src/ephy-window.c:127
 msgid "Find Pre_vious"
 msgstr "æääå(_V)"
 
-#: ../src/ephy-window.c:183
-msgid "Find previous occurrence of the word or phrase"
-msgstr "åæääæåçæååèæåäçåæ"
-
-#: ../src/ephy-window.c:185
-msgid "P_ersonal Data"
-msgstr "åäèæ(_E)"
-
-#: ../src/ephy-window.c:186
-msgid "View and remove cookies and passwords"
-msgstr "éçåçéææ cookie ååç"
-
-#: ../src/ephy-window.c:189
-msgid "Certificate_s"
-msgstr "èæ(_S)"
-
-#: ../src/ephy-window.c:190
-msgid "Manage Certificates"
-msgstr "ççèæ"
-
-#: ../src/ephy-window.c:193
-msgid "P_references"
-msgstr "ååèå(_R)"
-
-#: ../src/ephy-window.c:194
-msgid "Configure the web browser"
-msgstr "çéçèåèç"
-
-#. View menu
-#: ../src/ephy-window.c:199
-msgid "_Customize Toolbarsâ"
-msgstr "èéååå(_C)â"
-
-#: ../src/ephy-window.c:200
-msgid "Customize toolbars"
-msgstr "èéååå"
-
-#: ../src/ephy-window.c:202 ../src/ephy-window.c:205
+#. View actions.
+#: ../src/ephy-window.c:132 ../src/ephy-window.c:134
 msgid "_Stop"
 msgstr "åæ(_S)"
 
-#: ../src/ephy-window.c:203
-msgid "Stop current data transfer"
-msgstr "åæåéçåçèæ"
-
-#: ../src/ephy-window.c:207
-msgid "_Reload"
-msgstr "éæèå(_R)"
-
-#: ../src/ephy-window.c:208
-msgid "Display the latest content of the current page"
-msgstr "éçæéçææåå"
-
-#: ../src/ephy-window.c:210
+#: ../src/ephy-window.c:138
 msgid "_Larger Text"
 msgstr "æååå(_L)"
 
-#: ../src/ephy-window.c:211
-msgid "Increase the text size"
-msgstr "åæåæå"
-
-#: ../src/ephy-window.c:213
+#: ../src/ephy-window.c:140
 msgid "S_maller Text"
 msgstr "çååå(_M)"
 
-#: ../src/ephy-window.c:214
-msgid "Decrease the text size"
-msgstr "åæåçå"
-
-#: ../src/ephy-window.c:216
+#: ../src/ephy-window.c:142
 msgid "_Normal Size"
 msgstr "æååå(_N)"
 
-#: ../src/ephy-window.c:217
-msgid "Use the normal text size"
-msgstr "åæåéåçæååå"
-
-#: ../src/ephy-window.c:219
+#: ../src/ephy-window.c:144
 msgid "Text _Encoding"
 msgstr "åççç(_E)"
 
-#: ../src/ephy-window.c:220
-msgid "Change the text encoding"
-msgstr "æèåçççæå"
-
-#: ../src/ephy-window.c:222
+#: ../src/ephy-window.c:145
 msgid "_Page Source"
 msgstr "çéåååå(_P)"
 
-#: ../src/ephy-window.c:223
-msgid "View the source code of the page"
-msgstr "éçèééçåååå"
-
-#: ../src/ephy-window.c:225
-msgid "Page _Security Information"
-msgstr "çéååèè(_S)"
-
-#: ../src/ephy-window.c:226
-msgid "Display security information for the web page"
-msgstr "éççéçååèè"
-
-#. Bookmarks menu
-#: ../src/ephy-window.c:231
+#. Bookmarks actions.
+#: ../src/ephy-window.c:150
 msgid "_Add Bookmarkâ"
 msgstr "ååæç(_A)â"
 
-#: ../src/ephy-window.c:232 ../src/ephy-window.c:309
-msgid "Add a bookmark for the current page"
-msgstr "æåæéæééçæç"
-
-#: ../src/ephy-window.c:234
-msgid "_Edit Bookmarks"
-msgstr "äææç(_E)"
-
-#: ../src/ephy-window.c:235
-msgid "Open the bookmarks window"
-msgstr "éåæçèç"
-
-#. Go menu
-#: ../src/ephy-window.c:240
+#. Go actions.
+#: ../src/ephy-window.c:155
 msgid "_Locationâ"
 msgstr "äç(_L)â"
 
-#: ../src/ephy-window.c:241
-msgid "Go to a specified location"
-msgstr "ååæåçäç"
-
-#. History
-#: ../src/ephy-window.c:243 ../src/pdm-dialog.c:403
-msgid "Hi_story"
-msgstr "æåèé(_S)"
-
-#: ../src/ephy-window.c:244
-msgid "Open the history window"
-msgstr "éåçèèéèç"
-
-#. Tabs menu
-#: ../src/ephy-window.c:249
+#. Tabs actions.
+#: ../src/ephy-window.c:160
 msgid "_Previous Tab"
 msgstr "ääååé(_P)"
 
-#: ../src/ephy-window.c:250
-msgid "Activate previous tab"
-msgstr "åçääååé"
-
-#: ../src/ephy-window.c:252
+#: ../src/ephy-window.c:162
 msgid "_Next Tab"
 msgstr "ääååé(_N)"
 
-#: ../src/ephy-window.c:253
-msgid "Activate next tab"
-msgstr "åçääååé"
-
-#: ../src/ephy-window.c:255
+#: ../src/ephy-window.c:164
 msgid "Move Tab _Left"
 msgstr "åéååç(_L)"
 
-#: ../src/ephy-window.c:256
-msgid "Move current tab to left"
-msgstr "åçåçåéååçå"
-
-#: ../src/ephy-window.c:258
+#: ../src/ephy-window.c:166
 msgid "Move Tab _Right"
 msgstr "åéååç(_R)"
 
-#: ../src/ephy-window.c:259
-msgid "Move current tab to right"
-msgstr "åçåçåéååçå"
-
-#: ../src/ephy-window.c:261
+#: ../src/ephy-window.c:168
 msgid "_Detach Tab"
 msgstr "åéåé(_D)"
 
-#: ../src/ephy-window.c:262
-msgid "Detach current tab"
-msgstr "åéçåçééåå"
-
-#: ../src/ephy-window.c:268
-msgid "Display web browser help"
-msgstr "éççéçèåçåé"
-
-#. File Menu
-#: ../src/ephy-window.c:279
+#. File actions.
+#: ../src/ephy-window.c:176
 msgid "_Work Offline"
 msgstr "éçæå(_W)"
 
-#: ../src/ephy-window.c:280
-msgid "Switch to offline mode"
-msgstr "åæèéçæå"
-
-#. View Menu
-#: ../src/ephy-window.c:285
-msgid "_Hide Toolbars"
-msgstr "éèååå(_H)"
-
-#: ../src/ephy-window.c:286
-msgid "Show or hide toolbar"
-msgstr "éçæéèååå"
-
-#: ../src/ephy-window.c:288
+#. View actions.
+#: ../src/ephy-window.c:181
 msgid "_Downloads Bar"
 msgstr "äèå(_D)"
 
-#: ../src/ephy-window.c:289
-msgid "Show the active downloads for this window"
-msgstr "éçéåèçäæåéèçäè"
-
-#: ../src/ephy-window.c:292
-msgid "Men_ubar"
-msgstr "éåå(_U)"
-
-#: ../src/ephy-window.c:294
+#: ../src/ephy-window.c:184
 msgid "_Fullscreen"
 msgstr "åèå(_F)"
 
-#: ../src/ephy-window.c:295
-msgid "Browse at full screen"
-msgstr "äåèåæåçè"
-
-#: ../src/ephy-window.c:297
+#: ../src/ephy-window.c:186
 msgid "Popup _Windows"
 msgstr "åååèç(_W)"
 
-#: ../src/ephy-window.c:298
-msgid "Show or hide unrequested popup windows from this site"
-msgstr "éçæéèéåçèæèæçåååèç"
-
-#: ../src/ephy-window.c:300
+#: ../src/ephy-window.c:188
 msgid "Selection Caret"
 msgstr "éæææ"
 
-#. Document
-#: ../src/ephy-window.c:308
+#. Document.
+#: ../src/ephy-window.c:195
 msgid "Add Boo_kmarkâ"
 msgstr "ååæç(_K)â"
 
-#. Framed document
-#: ../src/ephy-window.c:314
-msgid "Show Only _This Frame"
-msgstr "åéçéåææ(_T)"
-
-#: ../src/ephy-window.c:315
-msgid "Show only this frame in this window"
-msgstr "ååæèçäéçæéæéä"
-
-#. Links
-#: ../src/ephy-window.c:320
+#. Links.
+#: ../src/ephy-window.c:200
 msgid "_Open Link"
 msgstr "éåéç(_O)"
 
-#: ../src/ephy-window.c:321
-msgid "Open link in this window"
-msgstr "åéèçäéåéç"
-
-#: ../src/ephy-window.c:323
+#: ../src/ephy-window.c:202
 msgid "Open Link in New _Window"
 msgstr "åæçèçäéåéç(_W)"
 
-#: ../src/ephy-window.c:324
-msgid "Open link in a new window"
-msgstr "åæçèçäéåéç"
-
-#: ../src/ephy-window.c:326
+#: ../src/ephy-window.c:204
 msgid "Open Link in New _Tab"
 msgstr "åæçåéäéåéç(_T)"
 
-#: ../src/ephy-window.c:327
-msgid "Open link in a new tab"
-msgstr "åæçåéäéåéç"
-
-#: ../src/ephy-window.c:329
+#: ../src/ephy-window.c:206
 msgid "_Download Link"
 msgstr "äèéç(_D)"
 
-#: ../src/ephy-window.c:331
+#: ../src/ephy-window.c:208
 msgid "_Save Link Asâ"
 msgstr "ååéç(_S)â"
 
-#: ../src/ephy-window.c:332
-msgid "Save link with a different name"
-msgstr "äåäååçååéç"
-
-#: ../src/ephy-window.c:334
+#: ../src/ephy-window.c:210
 msgid "_Bookmark Linkâ"
 msgstr "åéçååæç(_B)â"
 
-#: ../src/ephy-window.c:336
+#: ../src/ephy-window.c:212
 msgid "_Copy Link Address"
 msgstr "èèéçåå(_C)"
 
-#. Email links
-#. This is on the context menu on a mailto: link and opens the mail program
-#: ../src/ephy-window.c:342
-msgid "_Send Emailâ"
-msgstr "åééä(_S)â"
-
-#: ../src/ephy-window.c:344
-msgid "_Copy Email Address"
-msgstr "èèéåéäåå(_C)"
-
-#. Images
-#: ../src/ephy-window.c:349
+#. Images.
+#: ../src/ephy-window.c:217
 msgid "Open _Image"
 msgstr "éååç(_I)"
 
-#: ../src/ephy-window.c:351
+#: ../src/ephy-window.c:219
 msgid "_Save Image Asâ"
 msgstr "åååç(_S)â"
 
-#: ../src/ephy-window.c:353
+#: ../src/ephy-window.c:221
 msgid "_Use Image As Background"
 msgstr "äçåçäçæéèæ(_U)"
 
-#: ../src/ephy-window.c:355
+#: ../src/ephy-window.c:223
 msgid "Copy I_mage Address"
 msgstr "èèåçåå(_M)"
 
-#: ../src/ephy-window.c:357
+#: ../src/ephy-window.c:225
 msgid "St_art Animation"
 msgstr "åçéå(_A)"
 
-#: ../src/ephy-window.c:359
+#: ../src/ephy-window.c:227
 msgid "St_op Animation"
 msgstr "åçåæ(_O)"
 
-#. Inspector
-#: ../src/ephy-window.c:375
+#. Inspector.
+#: ../src/ephy-window.c:243
 msgid "Inspect _Element"
 msgstr "ææåç(_E)"
 
-#: ../src/ephy-window.c:579
+#: ../src/ephy-window.c:449
 msgid "There are unsubmitted changes to form elements"
 msgstr "åèåçåçèèææççèçæè"
 
-#: ../src/ephy-window.c:580
+#: ../src/ephy-window.c:450
 msgid "If you close the document anyway, you will lose that information."
 msgstr "åæäçèçäèééææäïäåæååæååçèèã"
 
-#: ../src/ephy-window.c:582
+#: ../src/ephy-window.c:452
 msgid "Close _Document"
 msgstr "ééæä(_D)"
 
-#: ../src/ephy-window.c:600
+#: ../src/ephy-window.c:470
 msgid "There are ongoing downloads in this window"
 msgstr "éåèçéæéèäçäè"
 
-#: ../src/ephy-window.c:601
+#: ../src/ephy-window.c:471
 msgid "If you close this window, the downloads will be cancelled"
 msgstr "åæäéééåèçïéåäèäæèåæ"
 
-#: ../src/ephy-window.c:602
+#: ../src/ephy-window.c:472
 msgid "Close window and cancel downloads"
 msgstr "ééèçäåæäè"
 
-#: ../src/ephy-window.c:1628
+#: ../src/ephy-window.c:1287
 msgid "Save As"
 msgstr "ååææ"
 
-#: ../src/ephy-window.c:1630
+#: ../src/ephy-window.c:1289
 msgid "Save As Application"
 msgstr "ååçæççå"
 
-#: ../src/ephy-window.c:1632
+#: ../src/ephy-window.c:1291
 msgid "Print"
-msgstr "æå"
+msgstr "åå"
+
+#: ../src/ephy-window.c:1293
+msgid "Bookmark"
+msgstr "ååæç"
 
-#: ../src/ephy-window.c:1636
+#: ../src/ephy-window.c:1295
 msgid "Find"
 msgstr "åæ"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1649
+#: ../src/ephy-window.c:1304
 msgid "Larger"
 msgstr "æå"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1652
+#: ../src/ephy-window.c:1307
 msgid "Smaller"
 msgstr "çå"
 
-#: ../src/ephy-window.c:1875
-msgid "Insecure"
-msgstr "äåå"
-
-#: ../src/ephy-window.c:1880
-msgid "Broken"
-msgstr "äæ"
+#: ../src/ephy-window.c:1321
+msgid "Back"
+msgstr "ääé"
 
-#: ../src/ephy-window.c:1888
-msgid "Low"
-msgstr "ä"
+#: ../src/ephy-window.c:1333
+msgid "Forward"
+msgstr "ääé"
 
-#: ../src/ephy-window.c:1895
-msgid "High"
-msgstr "é"
-
-#: ../src/ephy-window.c:1905
-#, c-format
-msgid "Security level: %s"
-msgstr "ååççï%s"
-
-#: ../src/ephy-window.c:2180
-#, c-format
-msgid "Open image â%sâ"
-msgstr "éååçâ%sâ"
-
-#: ../src/ephy-window.c:2185
-#, c-format
-msgid "Use as desktop background â%sâ"
-msgstr "äçåçäçæéèæâ%sâ"
-
-#: ../src/ephy-window.c:2190
-#, c-format
-msgid "Save image â%sâ"
-msgstr "åååçâ%sâ"
-
-#: ../src/ephy-window.c:2195
-#, c-format
-msgid "Copy image address â%sâ"
-msgstr "èèåçäåâ%sâ"
-
-#: ../src/ephy-window.c:2209
-#, c-format
-msgid "Send email to address â%sâ"
-msgstr "åéééèäåâ%sâ"
-
-#: ../src/ephy-window.c:2215
-#, c-format
-msgid "Copy email address â%sâ"
-msgstr "èèééäåâ%sâ"
-
-#: ../src/ephy-window.c:2229
-#, c-format
-msgid "Save link â%sâ"
-msgstr "ååéçâ%sâ"
-
-#: ../src/ephy-window.c:2235
-#, c-format
-msgid "Bookmark link â%sâ"
-msgstr "æçéçâ%sâ"
+#: ../src/ephy-window.c:1345
+msgid "Zoom"
+msgstr "çæ"
 
-#: ../src/ephy-window.c:2240
-#, c-format
-msgid "Copy link's address â%sâ"
-msgstr "èèéçäåâ%sâ"
+#: ../src/ephy-window.c:1353
+msgid "New _Tab"
+msgstr "æååé(_T)"
 
-#: ../src/pdm-dialog.c:337
+#: ../src/pdm-dialog.c:336
 msgid "<b>Select the personal data you want to clear</b>"
 msgstr "<b>éææèæéçåäèæ</b>"
 
-#: ../src/pdm-dialog.c:340
+#: ../src/pdm-dialog.c:339
 msgid ""
 "You are about to clear personal data that is stored about the web pages you "
 "have visited. Before proceeding, check the types of information that you "
 "want to remove:"
 msgstr "äæèæéçåäèæååääæåèéççéãåéåæéäåïèçåèçéåäéåçèèï"
 
-#: ../src/pdm-dialog.c:345
+#: ../src/pdm-dialog.c:344
 msgid "Clear All Personal Data"
 msgstr "æéææçåäèæ"
 
 #. Cookies
-#: ../src/pdm-dialog.c:379
+#: ../src/pdm-dialog.c:378
 msgid "C_ookies"
 msgstr "C_ookies"
 
 #. Passwords
-#: ../src/pdm-dialog.c:391
+#: ../src/pdm-dialog.c:390
 msgid "Saved _passwords"
 msgstr "ååçåç(_P)"
 
+#. History
+#: ../src/pdm-dialog.c:402
+msgid "Hi_story"
+msgstr "æåèé(_S)"
+
 #. Cache
-#: ../src/pdm-dialog.c:415
+#: ../src/pdm-dialog.c:414
 msgid "_Temporary files"
 msgstr "æåææ(_T)"
 
-#: ../src/pdm-dialog.c:431
+#: ../src/pdm-dialog.c:430
 msgid ""
 "<small><i><b>Note:</b> You cannot undo this action. The data you are "
 "choosing to clear will be deleted forever.</i></small>"
 msgstr "<small><i><b>ææï</b>ääèååéååäãäæéæçèæåèæéåéã</i></small>"
 
-#: ../src/pdm-dialog.c:622
-msgid "Cookie Properties"
-msgstr "Cookie åæ"
-
-#: ../src/pdm-dialog.c:639
-msgid "Content:"
-msgstr "åå"
-
-#: ../src/pdm-dialog.c:655
-msgid "Path:"
-msgstr "èåï"
-
-#: ../src/pdm-dialog.c:671
-msgid "Send for:"
-msgstr "åéçï"
-
-#: ../src/pdm-dialog.c:680
+#: ../src/pdm-dialog.c:649
 msgid "Encrypted connections only"
 msgstr "åéåååçéç"
 
-#: ../src/pdm-dialog.c:680
+#: ../src/pdm-dialog.c:650
 msgid "Any type of connection"
 msgstr "ääéåçéç"
 
-#: ../src/pdm-dialog.c:686
-msgid "Expires:"
-msgstr "æéï"
-
 #. Session cookie
-#: ../src/pdm-dialog.c:698
+#: ../src/pdm-dialog.c:655
 msgid "End of current session"
 msgstr "çæçåçäæéæ"
 
-#: ../src/pdm-dialog.c:830
+#: ../src/pdm-dialog.c:774
 msgid "Domain"
 msgstr "çå"
 
-#: ../src/pdm-dialog.c:842
+#: ../src/pdm-dialog.c:786
 msgid "Name"
 msgstr "åç"
 
-#: ../src/pdm-dialog.c:1256
+#: ../src/pdm-dialog.c:1200
 msgid "Host"
 msgstr "äæ"
 
-#: ../src/pdm-dialog.c:1269
+#: ../src/pdm-dialog.c:1213
 msgid "User Name"
 msgstr "äçèåç"
 
-#: ../src/pdm-dialog.c:1282
+#: ../src/pdm-dialog.c:1226
 msgid "User Password"
 msgstr "äçèåç"
 
-#: ../src/popup-commands.c:281
+#: ../src/popup-commands.c:273
 msgid "Download Link"
 msgstr "äèéç"
 
-#: ../src/popup-commands.c:289
+#: ../src/popup-commands.c:281
 msgid "Save Link As"
 msgstr "ååéç(_A)â"
 
-#: ../src/popup-commands.c:296
+#: ../src/popup-commands.c:288
 msgid "Save Image As"
 msgstr "åååç"
 
@@ -2866,57 +2157,57 @@ msgstr[0] "ççèè (%s)"
 msgid "Select a Directory"
 msgstr "éæäåçé"
 
-#: ../src/window-commands.c:368
+#: ../src/window-commands.c:316
 msgid "Save"
 msgstr "åå"
 
-#: ../src/window-commands.c:531
+#: ../src/window-commands.c:479
 #, c-format
 msgid "A web application named '%s' already exists. Do you want to replace it?"
 msgstr "ååååçã%sãççéæççåãäæèåäååï"
 
-#: ../src/window-commands.c:536
+#: ../src/window-commands.c:484
 msgid "Replace"
 msgstr "åä"
 
-#: ../src/window-commands.c:540
+#: ../src/window-commands.c:488
 msgid ""
 "An application with the same name already exists. Replacing it will "
 "overwrite it."
 msgstr "äæçåçæççååçååãåäåæååèèã"
 
-#: ../src/window-commands.c:580
+#: ../src/window-commands.c:528
 #, c-format
 msgid "The application '%s' is ready to be used"
 msgstr "æççåã%sãåçæåååääç"
 
-#: ../src/window-commands.c:583
+#: ../src/window-commands.c:531
 #, c-format
 msgid "The application '%s' could not be created"
 msgstr "çæåçæççåã%sã"
 
-#: ../src/window-commands.c:591
+#: ../src/window-commands.c:539
 msgid "Launch"
 msgstr "åè"
 
 #. Show dialog with icon, title.
-#: ../src/window-commands.c:624
+#: ../src/window-commands.c:572
 msgid "Create Web Application"
 msgstr "åççéæççå"
 
-#: ../src/window-commands.c:629
+#: ../src/window-commands.c:577
 msgid "Create"
 msgstr "åç"
 
-#: ../src/window-commands.c:1246
+#: ../src/window-commands.c:1123
 msgid ""
-"The GNOME Web Browser is free software; you can redistribute it and/or "
-"modify it under the terms of the GNU General Public License as published by "
-"the Free Software Foundation; either version 2 of the License, or (at your "
-"option) any later version."
-msgstr "GNOME çéçèåçèçèäïäåæææèçèäåéææçèç GNU éçååææææèåïåæçååçæåèïæäæïçèäæææçææææççäçæïäèèéæçïääæåçèççæã"
+"Web is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version."
+msgstr "Web çèçèäïäåæææèçèäåéææçèç GNU éçååææææèåïåæçååçæåèïæäæïçèäæææçææææççäçæïäèèéæçïääæåçèççæã"
 
-#: ../src/window-commands.c:1250
+#: ../src/window-commands.c:1127
 msgid ""
 "The GNOME Web Browser is distributed in the hope that it will be useful, but "
 "WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY "
@@ -2924,34 +2215,34 @@ msgid ""
 "more details."
 msgstr "GNOME çéçèåäåæäçççèåäæåïçèäèääæäèäïäçåéåææçåççéçææççéçææäãèæèåç GNU éçååææã"
 
-#: ../src/window-commands.c:1254
+#: ../src/window-commands.c:1131
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "the GNOME Web Browser; if not, write to the Free Software Foundation, Inc., "
 "51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
 msgstr "äæåæåééææçåç GNU éçååææçåæïåçïèåäèèçèäåéæï51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA"
 
-#: ../src/window-commands.c:1300 ../src/window-commands.c:1316
-#: ../src/window-commands.c:1327
+#: ../src/window-commands.c:1177 ../src/window-commands.c:1193
+#: ../src/window-commands.c:1204
 msgid "Contact us at:"
 msgstr "èçæåæï"
 
-#: ../src/window-commands.c:1303
+#: ../src/window-commands.c:1180
 msgid "Contributors:"
 msgstr "èçèï"
 
-#: ../src/window-commands.c:1306
+#: ../src/window-commands.c:1183
 msgid "Past developers:"
 msgstr "ååéçäåï"
 
-#: ../src/window-commands.c:1336
+#: ../src/window-commands.c:1213
 #, c-format
 msgid ""
 "Lets you view web pages and find information on the internet.\n"
-"Powered by WebKit"
+"Powered by WebKit %d.%d.%d"
 msgstr ""
 "èäåäèçäçèçéååæèèã\n"
-"åæ WebKit"
+"åæ WebKit %d.%d.%d"
 
 #. Translators: This is a special message that shouldn't be translated
 #. * literally. It is used in the about box to give credits to
@@ -2961,7 +2252,7 @@ msgstr ""
 #. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
 #.
-#: ../src/window-commands.c:1362
+#: ../src/window-commands.c:1242
 msgid "translator-credits"
 msgstr ""
 "ååçèæääæèïèéäåéåéäç\n"
@@ -2972,24 +2263,21 @@ msgstr ""
 "Ching-Hung Lin <billlin wshlab2 ee kuas edu tw>, 2004\n"
 "Abel Cheung <maddog linux org hk>, 2003"
 
-#: ../src/window-commands.c:1365
-msgid "GNOME Web Browser Website"
-msgstr "GNOME çéçèåçç"
+#: ../src/window-commands.c:1245
+msgid "Web Website"
+msgstr "çéçç"
 
-#: ../src/window-commands.c:1509
+#: ../src/window-commands.c:1387
 msgid "Enable caret browsing mode?"
 msgstr "æååçéççèï"
 
-#: ../src/window-commands.c:1512
+#: ../src/window-commands.c:1390
 msgid ""
 "Pressing F7 turns caret browsing on or off. This feature places a moveable "
 "cursor in web pages, allowing you to move around with your keyboard. Do you "
 "want to enable caret browsing on?"
 msgstr "æä F7 æéåæéééççèãéååèæåçéäæçäååçåçææïèäåääçéçéèçåãäæåèåçéççèï"
 
-#: ../src/window-commands.c:1515
+#: ../src/window-commands.c:1393
 msgid "_Enable"
 msgstr "åç(_E)"
-
-#~ msgid "Icon"
-#~ msgstr "åç"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index dd8a6d7..0301137 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: epiphany 3.1.91\n"
+"Project-Id-Version: epiphany 3.3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=epiphany\n"
-"POT-Creation-Date: 2011-09-10 14:57+0800\n"
+"POT-Creation-Date: 2012-01-29 23:11+0800\n"
 "PO-Revision-Date: 2011-09-10 10:25+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
@@ -23,18 +23,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/bme.desktop.in.in.h:1
-msgid "Browse and organize your bookmarks"
-msgstr "çèåççæç"
-
-#: ../data/bme.desktop.in.in.h:2
-msgid "Epiphany Web Bookmarks"
-msgstr "Epiphany çéæç"
-
-#: ../data/bme.desktop.in.in.h:3
-msgid "Web Bookmarks"
-msgstr "çéæç"
-
 #: ../data/default-bookmarks.rdf.in.h:1
 msgid "Search the web"
 msgstr "æåçé"
@@ -59,161 +47,88 @@ msgid "Browse the web"
 msgstr "çèçé"
 
 #: ../data/epiphany.desktop.in.in.h:2
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../data/epiphany.desktop.in.in.h:3
 msgid "Epiphany Web Browser"
 msgstr "Epiphany çéçèå"
 
-#: ../data/epiphany.desktop.in.in.h:4 ../src/ephy-main.c:465
+#: ../data/epiphany.desktop.in.in.h:3 ../src/ephy-main.c:73
+#: ../src/ephy-main.c:321 ../src/ephy-main.c:455 ../src/window-commands.c:1226
+msgid "Web"
+msgstr "çé"
+
+#: ../data/epiphany.desktop.in.in.h:4
 msgid "Web Browser"
 msgstr "çéçèå"
 
-#: ../data/glade/certificate-dialogs.ui.h:1
-msgid "Certificate _Fields"
-msgstr "æèæä(_F)"
-
-#: ../data/glade/certificate-dialogs.ui.h:2
-msgid "Certificate _Hierarchy"
-msgstr "æèéå(_H)"
-
-#: ../data/glade/certificate-dialogs.ui.h:3
-msgid "Common Name:"
-msgstr "æèåç"
-
-#: ../data/glade/certificate-dialogs.ui.h:4
-msgid "Details"
-msgstr "èçèæ"
-
-#: ../data/glade/certificate-dialogs.ui.h:5
-msgid "Expires On:"
-msgstr "æéï"
-
-#: ../data/glade/certificate-dialogs.ui.h:6
-msgid "Field _Value"
-msgstr "æäçå(_V)"
-
-#: ../data/glade/certificate-dialogs.ui.h:7
-msgid "Fingerprints"
-msgstr "æäæç"
-
-#: ../data/glade/certificate-dialogs.ui.h:8 ../data/glade/prefs-dialog.ui.h:16
-msgid "General"
-msgstr "äè"
-
-#: ../data/glade/certificate-dialogs.ui.h:9
-msgid "Issued By"
-msgstr "ççè"
-
-#: ../data/glade/certificate-dialogs.ui.h:10
-msgid "Issued On:"
-msgstr "çèæï"
-
-#: ../data/glade/certificate-dialogs.ui.h:11
-msgid "Issued To"
-msgstr "çç"
-
-#: ../data/glade/certificate-dialogs.ui.h:12
-msgid "MD5 Fingerprint:"
-msgstr "MD5 æäççï"
-
-#: ../data/glade/certificate-dialogs.ui.h:13
-msgid "Organization:"
-msgstr "ççï"
-
-#: ../data/glade/certificate-dialogs.ui.h:14
-msgid "Organizational Unit:"
-msgstr "ççåäï"
-
-#: ../data/glade/certificate-dialogs.ui.h:15
-msgid "SHA1 Fingerprint:"
-msgstr "SHA1 æäççï"
-
-#: ../data/glade/certificate-dialogs.ui.h:16
-msgid "Serial Number:"
-msgstr "åèï"
-
-#: ../data/glade/certificate-dialogs.ui.h:17
-msgid "Validity"
-msgstr "æææ"
-
-#: ../data/glade/epiphany.ui.h:1
+#: ../data/ui/epiphany.ui.h:1
 msgid "<b>_Automatic</b>"
 msgstr "<b>èå(_A)ï</b>"
 
-#: ../data/glade/epiphany.ui.h:2
+#: ../data/ui/epiphany.ui.h:2
 msgid "<b>_Use a different encoding:</b>"
 msgstr "äçäåççç(_U)ï"
 
-#: ../data/glade/epiphany.ui.h:3
-msgid "Clear _All..."
-msgstr "åéæé(_A)â"
+#: ../data/ui/epiphany.ui.h:3
+msgid "Content:"
+msgstr "åå"
+
+#: ../data/ui/epiphany.ui.h:4
+msgid "Cookie properties"
+msgstr "Cookie åæ"
 
-#: ../data/glade/epiphany.ui.h:4 ../data/glade/prefs-dialog.ui.h:8
+#: ../data/ui/epiphany.ui.h:5 ../data/ui/prefs-dialog.ui.h:8
 msgid "Cookies"
 msgstr "Cookie"
 
-#: ../data/glade/epiphany.ui.h:5 ../data/glade/prefs-dialog.ui.h:23
+#: ../data/ui/epiphany.ui.h:6
+msgid "Expires:"
+msgstr "æéï"
+
+#: ../data/ui/epiphany.ui.h:7 ../data/ui/prefs-dialog.ui.h:22
 msgid "Passwords"
 msgstr "åç"
 
-#: ../data/glade/epiphany.ui.h:6
+#: ../data/ui/epiphany.ui.h:8
+msgid "Path:"
+msgstr "èåï"
+
+#: ../data/ui/epiphany.ui.h:9
 msgid "Personal Data"
 msgstr "åäèæ"
 
-#: ../data/glade/epiphany.ui.h:7
+#: ../data/ui/epiphany.ui.h:10
+msgid "Send for:"
+msgstr "åéçï"
+
+#: ../data/ui/epiphany.ui.h:11
 msgid "Text Encoding"
 msgstr "ååçç"
 
-#: ../data/glade/epiphany.ui.h:8 ../src/ephy-encoding-menu.c:338
+#: ../data/ui/epiphany.ui.h:12 ../src/ephy-encoding-menu.c:338
 msgid "Use the encoding specified by the document"
 msgstr "äçæäæåçççæå"
 
-#: ../data/glade/epiphany.ui.h:9
+#: ../data/ui/epiphany.ui.h:13
 msgid "_Show passwords"
 msgstr "éçåç(_S)"
 
-#: ../data/glade/form-signing-dialog.ui.h:1
-msgid "Sign Text"
-msgstr "ççæå"
-
-#: ../data/glade/form-signing-dialog.ui.h:2
-msgid ""
-"To confirm that you want to sign the above text, choose a certificate to "
-"sign the text with and enter its password below."
-msgstr "çåèççääæåïèéæççæåçæèååäæèååçã"
-
-#: ../data/glade/form-signing-dialog.ui.h:3
-msgid "_Certificate:"
-msgstr "æè(_C)ï"
-
-#: ../data/glade/form-signing-dialog.ui.h:4
-msgid "_Password:"
-msgstr "åç(_P)ï"
-
-#: ../data/glade/form-signing-dialog.ui.h:5
-msgid "_View Certificate&#x2026;"
-msgstr "æèæè(_V)&#x2026;"
-
 #. Refers to "Only from sites you visit" option under Cookies.
-#: ../data/glade/prefs-dialog.ui.h:2
+#: ../data/ui/prefs-dialog.ui.h:2
 msgid "<small>For example, not from advertisers on these sites</small>"
 msgstr "<small>äåïäèäèéäçççåå</small>"
 
-#: ../data/glade/prefs-dialog.ui.h:3
+#: ../data/ui/prefs-dialog.ui.h:3
 msgid "A_utomatically open downloaded files"
 msgstr "èåäèäéåææ(_U)"
 
-#: ../data/glade/prefs-dialog.ui.h:4
+#: ../data/ui/prefs-dialog.ui.h:4
 msgid "Add Language"
 msgstr "ååèè"
 
-#: ../data/glade/prefs-dialog.ui.h:5
+#: ../data/ui/prefs-dialog.ui.h:5
 msgid "Allow popup _windows"
 msgstr "åèåååèç(_W)"
 
-#: ../data/glade/prefs-dialog.ui.h:6
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "Choose a l_anguage:"
 msgstr "éæèè(_A)ï"
 
@@ -221,202 +136,138 @@ msgstr "éæèè(_A)ï"
 #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
 #. * Select All, Input Methods and Insert Unicode control character.)
 #.
-#: ../data/glade/prefs-dialog.ui.h:7 ../lib/widgets/ephy-location-entry.c:607
-#: ../src/ephy-history-window.c:227 ../src/pdm-dialog.c:356
+#: ../data/ui/prefs-dialog.ui.h:7 ../lib/widgets/ephy-location-entry.c:577
+#: ../src/ephy-history-window.c:225 ../src/pdm-dialog.c:355
 msgid "Cl_ear"
 msgstr "æé(_E)"
 
-#: ../data/glade/prefs-dialog.ui.h:9
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "De_fault:"
 msgstr "éè(_F)ï"
 
 #. If we don't have XDG user dirs info, return an educated guess.
-#: ../data/glade/prefs-dialog.ui.h:10 ../lib/ephy-file-helpers.c:116
+#: ../data/ui/prefs-dialog.ui.h:10 ../lib/ephy-file-helpers.c:116
 msgid "Downloads"
 msgstr "äè"
 
-#: ../data/glade/prefs-dialog.ui.h:11
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Enable Java_Script"
 msgstr "åç Java_Script"
 
-#: ../data/glade/prefs-dialog.ui.h:12
+#: ../data/ui/prefs-dialog.ui.h:12
 msgid "Enable _plugins"
 msgstr "åçåæçå(_P)"
 
-#: ../data/glade/prefs-dialog.ui.h:13 ../src/ephy-encoding-dialog.c:302
+#: ../data/ui/prefs-dialog.ui.h:13 ../src/ephy-encoding-dialog.c:302
 msgid "Encodings"
 msgstr "çç(_E)"
 
-#: ../data/glade/prefs-dialog.ui.h:14
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Fonts"
 msgstr "åå"
 
-#: ../data/glade/prefs-dialog.ui.h:15
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Fonts & Style"
 msgstr "ååèæå"
 
-#: ../data/glade/prefs-dialog.ui.h:17
-msgid "Home page"
-msgstr "éé"
+#: ../data/ui/prefs-dialog.ui.h:16
+msgid "General"
+msgstr "äè"
 
-#: ../data/glade/prefs-dialog.ui.h:18 ../src/prefs-dialog.c:774
+#: ../data/ui/prefs-dialog.ui.h:17 ../src/prefs-dialog.c:774
 msgid "Language"
 msgstr "èè"
 
-#: ../data/glade/prefs-dialog.ui.h:19
+#: ../data/ui/prefs-dialog.ui.h:18
 msgid "Languages"
 msgstr "èè"
 
-#: ../data/glade/prefs-dialog.ui.h:20
+#: ../data/ui/prefs-dialog.ui.h:19
 msgid "MB"
 msgstr "MB"
 
-#: ../data/glade/prefs-dialog.ui.h:21
+#: ../data/ui/prefs-dialog.ui.h:20
 msgid "Monospace font:"
 msgstr "çåååï"
 
-#: ../data/glade/prefs-dialog.ui.h:22
+#: ../data/ui/prefs-dialog.ui.h:21
 msgid "Only _from sites you visit"
 msgstr "åäèæçèççç(_F)"
 
-#: ../data/glade/prefs-dialog.ui.h:24
+#: ../data/ui/prefs-dialog.ui.h:23
 msgid "Preferences"
 msgstr "ååèå"
 
-#: ../data/glade/prefs-dialog.ui.h:25
+#: ../data/ui/prefs-dialog.ui.h:24
 msgid "Privacy"
 msgstr "éç"
 
-#: ../data/glade/prefs-dialog.ui.h:26
+#: ../data/ui/prefs-dialog.ui.h:25
 msgid "Sans serif font:"
 msgstr "çèçååï"
 
-#: ../data/glade/prefs-dialog.ui.h:27
+#: ../data/ui/prefs-dialog.ui.h:26
 msgid "Serif font:"
 msgstr "èçååï"
 
-#: ../data/glade/prefs-dialog.ui.h:28
-msgid "Set to Current _Page"
-msgstr "èåççåéé(_P)"
-
-#: ../data/glade/prefs-dialog.ui.h:29
-msgid "Set to _Blank Page"
-msgstr "äçççéé(_B)"
-
-#: ../data/glade/prefs-dialog.ui.h:30
+#: ../data/ui/prefs-dialog.ui.h:27
 msgid "Spell checking"
 msgstr "æåææ"
 
-#: ../data/glade/prefs-dialog.ui.h:31
+#: ../data/ui/prefs-dialog.ui.h:28
 msgid "Style"
 msgstr "æå"
 
-#: ../data/glade/prefs-dialog.ui.h:32
+#: ../data/ui/prefs-dialog.ui.h:29
 msgid "Temporary Files"
 msgstr "æåæ"
 
-#: ../data/glade/prefs-dialog.ui.h:33
+#: ../data/ui/prefs-dialog.ui.h:30
 msgid "Use custom _stylesheet"
 msgstr "äçèèæåè(_S)"
 
-#: ../data/glade/prefs-dialog.ui.h:34
+#: ../data/ui/prefs-dialog.ui.h:31
 msgid "Web Content"
 msgstr "çéåå"
 
-#: ../data/glade/prefs-dialog.ui.h:35
-msgid "_Address:"
-msgstr "äå(_A)ï"
-
-#: ../data/glade/prefs-dialog.ui.h:36
+#: ../data/ui/prefs-dialog.ui.h:32
 msgid "_Always accept"
 msgstr "çææå(_A)"
 
-#: ../data/glade/prefs-dialog.ui.h:37
+#: ../data/ui/prefs-dialog.ui.h:33
 msgid "_Disk space:"
 msgstr "çççé(_D)ï"
 
-#: ../data/glade/prefs-dialog.ui.h:38
+#: ../data/ui/prefs-dialog.ui.h:34
 msgid "_Download folder:"
 msgstr "äèèæå(_D)"
 
-#: ../data/glade/prefs-dialog.ui.h:39
+#: ../data/ui/prefs-dialog.ui.h:35
 msgid "_Edit Stylesheetâ"
 msgstr "çèæåè(_E)â"
 
-#: ../data/glade/prefs-dialog.ui.h:40
+#: ../data/ui/prefs-dialog.ui.h:36
 msgid "_Enable spell checking"
 msgstr "åçæåææ(_E)"
 
-#: ../data/glade/prefs-dialog.ui.h:41
+#: ../data/ui/prefs-dialog.ui.h:37
 msgid "_Never accept"
 msgstr "æäæå(_N)"
 
-#: ../data/glade/prefs-dialog.ui.h:42
+#: ../data/ui/prefs-dialog.ui.h:38
 msgid "_Remember passwords"
 msgstr "èéåç(_R)"
 
-#: ../data/glade/prefs-dialog.ui.h:43
+#: ../data/ui/prefs-dialog.ui.h:39
 msgid "_Use system fonts"
 msgstr "äçççåå(_U)"
 
-#: ../data/glade/print.ui.h:1
-msgid "As laid out on the _screen"
-msgstr "çéçéç(_S)"
-
-#: ../data/glade/print.ui.h:2
-msgid "Background"
-msgstr "èæ"
-
-#: ../data/glade/print.ui.h:3
-msgid "Footers"
-msgstr "éå"
-
-#: ../data/glade/print.ui.h:4
-msgid "Frames"
-msgstr "ææ"
-
-#: ../data/glade/print.ui.h:5
-msgid "Headers"
-msgstr "æé"
-
-#: ../data/glade/print.ui.h:6
-msgid "O_nly the selected frame"
-msgstr "åæåéçææ(_N)"
-
-#: ../data/glade/print.ui.h:7
-msgid "P_age title"
-msgstr "ééæé(_A)"
-
-#: ../data/glade/print.ui.h:8
-msgid "Page _numbers"
-msgstr "éæ(_N)"
-
-#: ../data/glade/print.ui.h:9
-msgid "Print background c_olors"
-msgstr "ååèæéè(_O)"
-
-#: ../data/glade/print.ui.h:10
-msgid "Print background i_mages"
-msgstr "ååèæåç(_M)"
-
-#: ../data/glade/print.ui.h:11
-msgid "_Date"
-msgstr "ææ(_D)"
-
-#: ../data/glade/print.ui.h:12
-msgid "_Each frame separately"
-msgstr "æåææåé(_E)"
-
-#: ../data/glade/print.ui.h:13
-msgid "_Page address"
-msgstr "çéäå(_P)"
-
-#: ../embed/ephy-download.c:171
+#: ../embed/ephy-download.c:217
 msgctxt "file type"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../embed/ephy-embed.c:568
+#: ../embed/ephy-embed.c:778
 msgid "Web Inspector"
 msgstr "çéææå"
 
@@ -424,12 +275,6 @@ msgstr "çéææå"
 msgid "Epiphany can't be used now. Initialization failed."
 msgstr "Epiphany çåçæäçãåååçååæã"
 
-#: ../embed/ephy-embed-single.c:485
-msgid ""
-"CA Certificates file we should use was not found, all SSL sites will be "
-"considered to have a broken certificate."
-msgstr "æäåæåæèäçç CA æèïææç SSL ççéæèèçåæèåæåã"
-
 #: ../embed/ephy-embed-utils.c:61
 #, c-format
 msgid "Send an email message to â%sâ"
@@ -771,104 +616,105 @@ msgstr "åå"
 msgid "Local files"
 msgstr "ææææ"
 
-#: ../embed/ephy-request-about.c:98 ../embed/ephy-request-about.c:101
+#: ../embed/ephy-request-about.c:101 ../embed/ephy-request-about.c:104
 msgid "Installed plugins"
 msgstr "ååèçåæçå"
 
-#: ../embed/ephy-request-about.c:113
+#: ../embed/ephy-request-about.c:116
 msgid "Enabled"
 msgstr "ååç"
 
-#: ../embed/ephy-request-about.c:113
+#: ../embed/ephy-request-about.c:116
 msgid "Yes"
 msgstr "æ"
 
-#: ../embed/ephy-request-about.c:113
+#: ../embed/ephy-request-about.c:116
 msgid "No"
 msgstr "å"
 
-#: ../embed/ephy-request-about.c:114
+#: ../embed/ephy-request-about.c:117
 msgid "MIME type"
 msgstr "MIME éå"
 
-#: ../embed/ephy-request-about.c:114
+#: ../embed/ephy-request-about.c:117
 msgid "Description"
-msgstr "æè"
+msgstr "èæ"
 
-#: ../embed/ephy-request-about.c:114
+#: ../embed/ephy-request-about.c:117
 msgid "Suffixes"
 msgstr "åç"
 
-#: ../embed/ephy-request-about.c:143
+#: ../embed/ephy-request-about.c:146 ../embed/ephy-request-about.c:149
 msgid "Memory usage"
 msgstr "èæéäçé"
 
-#: ../embed/ephy-request-about.c:171 ../embed/ephy-request-about.c:173
+#: ../embed/ephy-request-about.c:175 ../embed/ephy-request-about.c:177
 msgid "Applications"
 msgstr "æççå"
 
-#: ../embed/ephy-request-about.c:174
+#: ../embed/ephy-request-about.c:178
 msgid "List of installed web applications"
 msgstr "ååèççéæççåæå"
 
-#: ../embed/ephy-request-about.c:189
+#. Note for translators: this refers to the installation date.
+#: ../embed/ephy-request-about.c:195
 msgid "Installed on:"
 msgstr "åèæï"
 
 #. characters
 #. ms
 #. RELOAD_DELAY * RELOAD_DELAY_MAX_TICKS = 10 s
-#: ../embed/ephy-web-view.c:70 ../embed/ephy-web-view.c:3445
+#: ../embed/ephy-web-view.c:70 ../embed/ephy-web-view.c:3396
 msgid "Blank page"
 msgstr "ççéé"
 
-#: ../embed/ephy-web-view.c:753
-msgid "Not now"
-msgstr "çåäè"
-
 #: ../embed/ephy-web-view.c:758
-msgid "Store password"
-msgstr "åååç"
+msgid "_Not now"
+msgstr "çåäè(_N)"
+
+#: ../embed/ephy-web-view.c:763
+msgid "_Store password"
+msgstr "åååç(_S)"
 
 #. Translators: The first %s is the username and the second one is the
 #. * hostname where this is happening. Example: gnome gmail com and
 #. * mail.google.com.
 #.
-#: ../embed/ephy-web-view.c:769
+#: ../embed/ephy-web-view.c:774
 #, c-format
 msgid ""
 "<big>Would you like to store the password for <b>%s</b> in <b>%s</b>?</big>"
 msgstr "<big>æåèåå <b>%s</b> å <b>%s</b> çåçï</big>"
 
 #. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1728
+#: ../embed/ephy-web-view.c:1746
 msgid "Deny"
 msgstr "çæ"
 
 #. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1734
+#: ../embed/ephy-web-view.c:1752
 msgid "Allow"
 msgstr "åè"
 
-#: ../embed/ephy-web-view.c:1741
+#: ../embed/ephy-web-view.c:1759
 #, c-format
 msgid "The page at <b>%s</b> wants to know your location."
 msgstr "å <b>%s</b> ççéæèçéæçäçã"
 
-#: ../embed/ephy-web-view.c:2016
+#: ../embed/ephy-web-view.c:2037
 msgid "None specified"
 msgstr "æææå"
 
-#: ../embed/ephy-web-view.c:2025 ../embed/ephy-web-view.c:2043
+#: ../embed/ephy-web-view.c:2046 ../embed/ephy-web-view.c:2064
 #, c-format
 msgid "Oops! Error loading %s"
 msgstr "åïèå %s æççéè"
 
-#: ../embed/ephy-web-view.c:2027
+#: ../embed/ephy-web-view.c:2048
 msgid "Oops! It was not possible to show this website"
 msgstr "åïçæéçéåçç"
 
-#: ../embed/ephy-web-view.c:2028
+#: ../embed/ephy-web-view.c:2049
 #, c-format
 msgid ""
 "<p>The website at <strong>%s</strong> seems to be unavailable. The precise "
@@ -880,15 +726,15 @@ msgstr ""
 "em></p><p>ååèèææééæçååæçäåãäèåäææçéçèéçæåæå"
 "éäã</p>"
 
-#: ../embed/ephy-web-view.c:2037
+#: ../embed/ephy-web-view.c:2058
 msgid "Try again"
 msgstr "åèäæ"
 
-#: ../embed/ephy-web-view.c:2045
+#: ../embed/ephy-web-view.c:2066
 msgid "Oops! This site might have caused the web browser to close unexpectedly"
 msgstr "åïéåççåèåéæçéçèåæéæçéé"
 
-#: ../embed/ephy-web-view.c:2047
+#: ../embed/ephy-web-view.c:2068
 #, c-format
 msgid ""
 "<p>This page was loading when the web browser closed unexpectedly.</"
@@ -899,33 +745,33 @@ msgstr ""
 "ååççéåçæãåæççéæïèååéååç <strong>%s</strong> éçåéã"
 "</p>"
 
-#: ../embed/ephy-web-view.c:2055
+#: ../embed/ephy-web-view.c:2076
 msgid "Load again anyway"
 msgstr "åååæèå"
 
-#: ../embed/ephy-web-view.c:2330
+#: ../embed/ephy-web-view.c:2356
 #, c-format
 msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8";
 msgstr "http://www.google.com.tw/search?q=%s&ie=UTF-8&oe=UTF-8";
 
-#: ../embed/ephy-web-view.c:2520
+#: ../embed/ephy-web-view.c:2567
 msgid "Plugins"
 msgstr "åæçå"
 
 #. translators: %s here is the address of the web page
-#: ../embed/ephy-web-view.c:2627
+#: ../embed/ephy-web-view.c:2674
 #, c-format
 msgid "Loading â%sââ"
 msgstr "æåèåâ%sââ"
 
-#: ../embed/ephy-web-view.c:2629
+#: ../embed/ephy-web-view.c:2676
 msgid "Loadingâ"
 msgstr "èåäâ"
 
 #. Translators: this is the directory name to store auxilary files
 #. * when saving html files.
 #.
-#: ../embed/ephy-web-view.c:3649
+#: ../embed/ephy-web-view.c:3600
 #, c-format
 msgid "%s Files"
 msgstr "%s åææ"
@@ -965,42 +811,6 @@ msgstr "äèåéæä URI èãType=Linkãæééç"
 msgid "Not a launchable item"
 msgstr "äæåäååçéç"
 
-#. Translaters: This string is for a toggle to display a toolbar.
-#. * The name of the toolbar is automatically computed from the widgets
-#. * on the toolbar, and is placed at the %s. Note the _ before the %s
-#. * which is used to add mnemonics. We know that this is likely to
-#. * produce duplicates, but don't worry about it. If your language
-#. * normally has a mnemonic at the start, please use the _. If not,
-#. * please remove.
-#: ../lib/egg/egg-editable-toolbar.c:988
-#, c-format
-msgid "Show â_%sâ"
-msgstr "éçâ_%sâ"
-
-#: ../lib/egg/egg-editable-toolbar.c:1481
-msgid "_Move on Toolbar"
-msgstr "çèååå(_M)"
-
-#: ../lib/egg/egg-editable-toolbar.c:1482
-msgid "Move the selected item on the toolbar"
-msgstr "ååéçéççèååå"
-
-#: ../lib/egg/egg-editable-toolbar.c:1483
-msgid "_Remove from Toolbar"
-msgstr "ååååäçé(_R)"
-
-#: ../lib/egg/egg-editable-toolbar.c:1484
-msgid "Remove the selected item from the toolbar"
-msgstr "ååååäçéåéçéç"
-
-#: ../lib/egg/egg-editable-toolbar.c:1485
-msgid "_Delete Toolbar"
-msgstr "åéååå(_D)"
-
-#: ../lib/egg/egg-editable-toolbar.c:1486
-msgid "Remove the selected toolbar"
-msgstr "çéåéååå"
-
 #: ../lib/egg/eggsmclient.c:225
 msgid "Disable connection to session manager"
 msgstr "åçåäæéæçççåçéç"
@@ -1009,7 +819,7 @@ msgstr "åçåäæéæçççåçéç"
 msgid "Specify file containing saved configuration"
 msgstr "æååååååçæçææ"
 
-#: ../lib/egg/eggsmclient.c:228 ../src/ephy-main.c:94 ../src/ephy-main.c:96
+#: ../lib/egg/eggsmclient.c:228 ../src/ephy-main.c:88 ../src/ephy-main.c:90
 msgid "FILE"
 msgstr "ææ"
 
@@ -1029,23 +839,19 @@ msgstr "äæéæççééï"
 msgid "Show session management options"
 msgstr "éçäæéæççéé"
 
-#: ../lib/egg/egg-toolbar-editor.c:489
-msgid "Separator"
-msgstr "åéç"
-
-#: ../lib/ephy-file-chooser.c:385
+#: ../lib/ephy-file-chooser.c:382
 msgid "All supported types"
 msgstr "ææææçéå"
 
-#: ../lib/ephy-file-chooser.c:396
+#: ../lib/ephy-file-chooser.c:393
 msgid "Web pages"
 msgstr "çé"
 
-#: ../lib/ephy-file-chooser.c:404
+#: ../lib/ephy-file-chooser.c:401
 msgid "Images"
 msgstr "ååæ"
 
-#: ../lib/ephy-file-chooser.c:412 ../src/bookmarks/ephy-bookmarks-editor.c:754
+#: ../lib/ephy-file-chooser.c:409 ../src/bookmarks/ephy-bookmarks-editor.c:635
 msgid "All files"
 msgstr "ææææ"
 
@@ -1069,35 +875,35 @@ msgstr "ææâ%sâ åçååïèåååçèååäçã"
 msgid "Failed to create directory â%sâ."
 msgstr "çæåççéâ%sâã"
 
-#: ../lib/ephy-gui.c:292
+#: ../lib/ephy-gui.c:206
 #, c-format
 msgid "Directory â%sâ is not writable"
 msgstr "çéâ%sâæäèååç"
 
-#: ../lib/ephy-gui.c:296
+#: ../lib/ephy-gui.c:210
 msgid "You do not have permission to create files in this directory."
 msgstr "æææåèçéåçææçæéã"
 
-#: ../lib/ephy-gui.c:299
+#: ../lib/ephy-gui.c:213
 msgid "Directory not Writable"
 msgstr "çéçæåå"
 
-#: ../lib/ephy-gui.c:329
+#: ../lib/ephy-gui.c:242
 #, c-format
 msgid "Cannot overwrite existing file â%sâ"
 msgstr "äèèååååçææâ%sâ"
 
-#: ../lib/ephy-gui.c:333
+#: ../lib/ephy-gui.c:246
 msgid ""
 "A file with this name already exists and you don't have permission to "
 "overwrite it."
 msgstr "äæçåçææåçååèææææéåäèååã"
 
-#: ../lib/ephy-gui.c:336
+#: ../lib/ephy-gui.c:249
 msgid "Cannot Overwrite File"
 msgstr "çæèåææ"
 
-#: ../lib/ephy-gui.c:391
+#: ../lib/ephy-gui.c:307
 #, c-format
 msgid "Could not display help: %s"
 msgstr "çæéçèææäï%s"
@@ -1119,34 +925,6 @@ msgstr ""
 msgid "Failed to copy cookies file from Mozilla."
 msgstr "å Mozilla èè cookies ææåæã"
 
-#: ../lib/ephy-stock-icons.c:47
-msgid "Popup Windows"
-msgstr "åååèç"
-
-#: ../lib/ephy-stock-icons.c:48 ../src/ephy-history-window.c:1098
-msgid "History"
-msgstr "çèèé"
-
-#: ../lib/ephy-stock-icons.c:49
-#: ../src/bookmarks/ephy-bookmark-factory-action.c:300
-#: ../src/ephy-window.c:1634
-msgid "Bookmark"
-msgstr "ååæç"
-
-#: ../lib/ephy-stock-icons.c:50 ../src/bookmarks/ephy-bookmarks-editor.c:882
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1658
-#: ../src/bookmarks/ephy-topic-action.c:442 ../src/ephy-window.c:1638
-msgid "Bookmarks"
-msgstr "æç"
-
-#: ../lib/ephy-stock-icons.c:51 ../src/ephy-toolbar.c:277
-msgid "Address Entry"
-msgstr "äåèåæ"
-
-#: ../lib/ephy-stock-icons.c:52
-msgid "_Download"
-msgstr "äè(_D)"
-
 #. Translators: "friendly time" string for the current day, strftime format. like "Today 12:34 am"
 #: ../lib/ephy-time-helpers.c:223
 msgid "Today %I:%M %p"
@@ -1181,9 +959,9 @@ msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
 #. impossible time or broken locale settings
-#: ../lib/ephy-time-helpers.c:279 ../src/ephy-window.c:1872
+#: ../lib/ephy-time-helpers.c:279
 msgid "Unknown"
-msgstr "äè"
+msgstr "äæ"
 
 #: ../lib/ephy-zoom.h:44
 msgid "50%"
@@ -1221,57 +999,57 @@ msgstr "300%"
 msgid "400%"
 msgstr "400%"
 
-#: ../lib/widgets/ephy-download-widget.c:101
+#: ../lib/widgets/ephy-download-widget.c:88
 #, c-format
 msgid "%u:%02u hour left"
 msgid_plural "%u:%02u hours left"
 msgstr[0] "åé %u:%02u åæ"
 
-#: ../lib/widgets/ephy-download-widget.c:103
+#: ../lib/widgets/ephy-download-widget.c:90
 #, c-format
 msgid "%u hour left"
 msgid_plural "%u hours left"
 msgstr[0] "åé %u åæ"
 
-#: ../lib/widgets/ephy-download-widget.c:106
+#: ../lib/widgets/ephy-download-widget.c:93
 #, c-format
 msgid "%u:%02u minute left"
 msgid_plural "%u:%02u minutes left"
 msgstr[0] "åé %u:%02u åé"
 
-#: ../lib/widgets/ephy-download-widget.c:108
+#: ../lib/widgets/ephy-download-widget.c:95
 #, c-format
 msgid "%u second left"
 msgid_plural "%u seconds left"
 msgstr[0] "åé %u çé"
 
-#: ../lib/widgets/ephy-download-widget.c:172
+#: ../lib/widgets/ephy-download-widget.c:164
 msgid "Finished"
 msgstr "ååæ"
 
-#: ../lib/widgets/ephy-download-widget.c:211
+#: ../lib/widgets/ephy-download-widget.c:203
 #, c-format
 msgid "Error downloading: %s"
 msgstr "äèæççéèï%s"
 
-#: ../lib/widgets/ephy-download-widget.c:279 ../src/window-commands.c:534
+#: ../lib/widgets/ephy-download-widget.c:271 ../src/window-commands.c:482
 msgid "Cancel"
 msgstr "åæ"
 
-#: ../lib/widgets/ephy-download-widget.c:288 ../src/ephy-window.c:1626
-#: ../src/window-commands.c:315
+#: ../lib/widgets/ephy-download-widget.c:280 ../src/ephy-window.c:1285
+#: ../src/window-commands.c:263
 msgid "Open"
 msgstr "éå"
 
-#: ../lib/widgets/ephy-download-widget.c:294
+#: ../lib/widgets/ephy-download-widget.c:286
 msgid "Show in folder"
 msgstr "åèæåéç"
 
-#: ../lib/widgets/ephy-download-widget.c:467
+#: ../lib/widgets/ephy-download-widget.c:458
 msgid "Startingâ"
 msgstr "æåéåâ"
 
-#: ../lib/widgets/ephy-location-entry.c:890
+#: ../lib/widgets/ephy-location-entry.c:857
 msgid "Drag and drop this icon to create a link to this page"
 msgstr "ææéååçäåçéèèçéçéç"
 
@@ -1279,51 +1057,41 @@ msgstr "ææéååçäåçéèèçéçéç"
 msgid "Clear"
 msgstr "æé"
 
-#: ../src/bookmarks/ephy-bookmark-action.c:319
-#, c-format
-msgid "%s:"
-msgstr "%sï"
-
-#: ../src/bookmarks/ephy-bookmark-action.c:499
-#, c-format
-msgid "Executes the script â%sâ"
-msgstr "åèåäçâ%sâ"
-
 #. Translators: This string is used when counting bookmarks that
 #. * are similar to each other
-#: ../src/bookmarks/ephy-bookmark-properties.c:85
-#: ../src/bookmarks/ephy-bookmark-properties.c:611
+#: ../src/bookmarks/ephy-bookmark-properties.c:84
+#: ../src/bookmarks/ephy-bookmark-properties.c:613
 #, c-format
 msgid "%d _Similar"
 msgid_plural "%d _Similar"
 msgstr[0] "%d åçä(_S)"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:257
+#: ../src/bookmarks/ephy-bookmark-properties.c:256
 #, c-format
 msgid "_Unify With %d Identical Bookmark"
 msgid_plural "_Unify With %d Identical Bookmarks"
 msgstr[0] "è %d åçåçæçåä(_U)"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:277
-#: ../src/bookmarks/ephy-bookmark-properties.c:299
+#: ../src/bookmarks/ephy-bookmark-properties.c:276
+#: ../src/bookmarks/ephy-bookmark-properties.c:298
 #, c-format
 msgid "Show â%sâ"
 msgstr "éçâ%sâ"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:424
+#: ../src/bookmarks/ephy-bookmark-properties.c:423
 #, c-format
 msgid "â%sâ Properties"
 msgstr "â%sâåæ"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:550
+#: ../src/bookmarks/ephy-bookmark-properties.c:547
 msgid "_Title:"
 msgstr "æé(_T)ï"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:566
+#: ../src/bookmarks/ephy-bookmark-properties.c:564
 msgid "A_ddress:"
 msgstr "äå(_D)ï"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:577
+#: ../src/bookmarks/ephy-bookmark-properties.c:576
 msgid "T_opics:"
 msgstr "äé(_O)ï"
 
@@ -1331,313 +1099,298 @@ msgstr "äé(_O)ï"
 msgid "Sho_w all topics"
 msgstr "éçææäé(_W)"
 
-#: ../src/bookmarks/ephy-bookmarks.c:95
+#: ../src/bookmarks/ephy-bookmarks.c:94
 msgid "Entertainment"
 msgstr "åæ"
 
-#: ../src/bookmarks/ephy-bookmarks.c:96
+#: ../src/bookmarks/ephy-bookmarks.c:95
 msgid "News"
 msgstr "æè"
 
-#: ../src/bookmarks/ephy-bookmarks.c:97
+#: ../src/bookmarks/ephy-bookmarks.c:96
 msgid "Shopping"
 msgstr "èç"
 
-#: ../src/bookmarks/ephy-bookmarks.c:98
+#: ../src/bookmarks/ephy-bookmarks.c:97
 msgid "Sports"
 msgstr "éå"
 
-#: ../src/bookmarks/ephy-bookmarks.c:99
+#: ../src/bookmarks/ephy-bookmarks.c:98
 msgid "Travel"
 msgstr "æé"
 
-#: ../src/bookmarks/ephy-bookmarks.c:100
+#: ../src/bookmarks/ephy-bookmarks.c:99
 msgid "Work"
 msgstr "åä"
 
 #. translators: the %s is the title of the bookmark
-#: ../src/bookmarks/ephy-bookmarks.c:435
+#: ../src/bookmarks/ephy-bookmarks.c:434
 #, c-format
 msgid "Update bookmark â%sâ?"
 msgstr "æææçâ%sâï"
 
 #. translators: the %s is a URL
-#: ../src/bookmarks/ephy-bookmarks.c:440
+#: ../src/bookmarks/ephy-bookmarks.c:439
 #, c-format
 msgid "The bookmarked page has moved to â%sâ."
 msgstr "æçäççéåçèâ%sâã"
 
-#: ../src/bookmarks/ephy-bookmarks.c:444
+#: ../src/bookmarks/ephy-bookmarks.c:443
 msgid "_Don't Update"
 msgstr "äèææ(_D)"
 
-#: ../src/bookmarks/ephy-bookmarks.c:446
+#: ../src/bookmarks/ephy-bookmarks.c:445
 msgid "_Update"
 msgstr "ææ(_U)"
 
-#: ../src/bookmarks/ephy-bookmarks.c:449
+#: ../src/bookmarks/ephy-bookmarks.c:448
 msgid "Update Bookmark?"
 msgstr "æææçï"
 
 #. Translators: this topic contains all bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:1180
+#: ../src/bookmarks/ephy-bookmarks.c:1178
 msgctxt "bookmarks"
 msgid "All"
 msgstr "åé"
 
 #. Translators: this topic contains the most used bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:1183
+#: ../src/bookmarks/ephy-bookmarks.c:1181
 msgctxt "bookmarks"
 msgid "Most Visited"
 msgstr "æåçè"
 
 #. Translators: this topic contains the not categorized
 #. bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:1187
+#: ../src/bookmarks/ephy-bookmarks.c:1185
 msgctxt "bookmarks"
 msgid "Not Categorized"
 msgstr "æåé"
 
 #. Translators: this is an automatic topic containing local
 #. * websites bookmarks autodiscovered with zeroconf.
-#: ../src/bookmarks/ephy-bookmarks.c:1192
+#: ../src/bookmarks/ephy-bookmarks.c:1190
 msgctxt "bookmarks"
 msgid "Nearby Sites"
 msgstr "æåçç"
 
-#: ../src/bookmarks/ephy-bookmarks.c:1426
+#: ../src/bookmarks/ephy-bookmarks.c:1424
 #: ../src/bookmarks/ephy-bookmarks-import.c:271
 msgid "Untitled"
 msgstr "æåå"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:78
+#: ../src/bookmarks/ephy-bookmarks-editor.c:76
 msgid "Epiphany (RDF)"
 msgstr "Epiphany (RDF)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:79
+#: ../src/bookmarks/ephy-bookmarks-editor.c:77
 msgid "Mozilla (HTML)"
 msgstr "Mozilla (HTML)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:129
+#: ../src/bookmarks/ephy-bookmarks-editor.c:125
 msgid "Remove from this topic"
 msgstr "åæäéäåé"
 
 #. Toplevel
-#: ../src/bookmarks/ephy-bookmarks-editor.c:156
-#: ../src/ephy-history-window.c:127 ../src/ephy-window.c:114
+#: ../src/bookmarks/ephy-bookmarks-editor.c:152
+#: ../src/ephy-history-window.c:125
 msgid "_File"
 msgstr "ææ(_F)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:157
-#: ../src/ephy-history-window.c:128 ../src/ephy-window.c:115
+#: ../src/bookmarks/ephy-bookmarks-editor.c:153
+#: ../src/ephy-history-window.c:126
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:158
-#: ../src/ephy-history-window.c:129 ../src/ephy-window.c:116
+#: ../src/bookmarks/ephy-bookmarks-editor.c:154
+#: ../src/ephy-history-window.c:127
 msgid "_View"
 msgstr "éç(_V)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:159
-#: ../src/ephy-history-window.c:130 ../src/ephy-window.c:121
+#: ../src/bookmarks/ephy-bookmarks-editor.c:155
+#: ../src/ephy-history-window.c:128
 msgid "_Help"
 msgstr "æå(_H)"
 
 #. File Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:163
+#: ../src/bookmarks/ephy-bookmarks-editor.c:159
 msgid "_New Topic"
 msgstr "æåäé(_N)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:164
+#: ../src/bookmarks/ephy-bookmarks-editor.c:160
 msgid "Create a new topic"
 msgstr "åçæçäé"
 
-#. FIXME ngettext
 #. File Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:166
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1292
-#: ../src/bookmarks/ephy-bookmarks-ui.c:323 ../src/ephy-history-window.c:134
-#: ../src/ephy-history-window.c:612
+#: ../src/bookmarks/ephy-bookmarks-editor.c:162
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1161
+#: ../src/ephy-history-window.c:132 ../src/ephy-history-window.c:609
 msgid "Open in New _Window"
 msgid_plural "Open in New _Windows"
 msgstr[0] "åæçèçäéå(_W)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:167
+#: ../src/bookmarks/ephy-bookmarks-editor.c:163
 msgid "Open the selected bookmark in a new window"
 msgstr "åæçèçäéååéçæç"
 
-#. FIXME ngettext
-#: ../src/bookmarks/ephy-bookmarks-editor.c:169
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1295
-#: ../src/bookmarks/ephy-bookmarks-ui.c:311 ../src/ephy-history-window.c:137
-#: ../src/ephy-history-window.c:615
+#: ../src/bookmarks/ephy-bookmarks-editor.c:165
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1164
+#: ../src/ephy-history-window.c:135 ../src/ephy-history-window.c:612
 msgid "Open in New _Tab"
 msgid_plural "Open in New _Tabs"
 msgstr[0] "åæçåéäéå(_T)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:170
+#: ../src/bookmarks/ephy-bookmarks-editor.c:166
 msgid "Open the selected bookmark in a new tab"
 msgstr "åæçåéäéååéçæç"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:172
+#: ../src/bookmarks/ephy-bookmarks-editor.c:168
 msgid "_Renameâ"
 msgstr "éæåå(_R)â"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:173
+#: ../src/bookmarks/ephy-bookmarks-editor.c:169
 msgid "Rename the selected bookmark or topic"
 msgstr "ææåéçæçæäéçåç"
 
-#. Add popup menu actions that are specific to the bookmark widgets
-#: ../src/bookmarks/ephy-bookmarks-editor.c:174
-#: ../src/bookmarks/ephy-bookmarks-ui.c:299
+#: ../src/bookmarks/ephy-bookmarks-editor.c:170
 msgid "_Properties"
 msgstr "åæ(_P)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:175
+#: ../src/bookmarks/ephy-bookmarks-editor.c:171
 msgid "View or modify the properties of the selected bookmark"
 msgstr "éçæäæåéæççåæ"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:177
+#: ../src/bookmarks/ephy-bookmarks-editor.c:173
 msgid "_Import Bookmarksâ"
 msgstr "ååæç(_I)â"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:178
+#: ../src/bookmarks/ephy-bookmarks-editor.c:174
 msgid "Import bookmarks from another browser or a bookmarks file"
 msgstr "åååçèåææçæååæç"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:180
+#: ../src/bookmarks/ephy-bookmarks-editor.c:176
 msgid "_Export Bookmarksâ"
 msgstr "ååæç(_E)â"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:181
+#: ../src/bookmarks/ephy-bookmarks-editor.c:177
 msgid "Export bookmarks to a file"
 msgstr "åæçåååææ"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:183
-#: ../src/ephy-history-window.c:143 ../src/ephy-window.c:149
+#: ../src/bookmarks/ephy-bookmarks-editor.c:179
+#: ../src/ephy-history-window.c:141 ../src/ephy-window.c:104
 msgid "_Close"
 msgstr "éé(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:184
+#: ../src/bookmarks/ephy-bookmarks-editor.c:180
 msgid "Close the bookmarks window"
 msgstr "ééæçèç"
 
 #. Edit Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:188
-#: ../src/ephy-history-window.c:148 ../src/ephy-window.c:161
+#: ../src/bookmarks/ephy-bookmarks-editor.c:184
+#: ../src/ephy-history-window.c:146 ../src/ephy-window.c:113
 msgid "Cu_t"
 msgstr "åä(_T)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:189
-#: ../src/ephy-history-window.c:149 ../src/ephy-window.c:162
+#: ../src/bookmarks/ephy-bookmarks-editor.c:185
+#: ../src/ephy-history-window.c:147
 msgid "Cut the selection"
 msgstr "åäéåçåå"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:191
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1305
-#: ../src/ephy-history-window.c:151 ../src/ephy-history-window.c:625
-#: ../src/ephy-window.c:164
+#: ../src/bookmarks/ephy-bookmarks-editor.c:187
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1174
+#: ../src/ephy-history-window.c:149 ../src/ephy-history-window.c:622
+#: ../src/ephy-window.c:115
 msgid "_Copy"
 msgstr "èè(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:192
-#: ../src/ephy-history-window.c:152 ../src/ephy-window.c:165
+#: ../src/bookmarks/ephy-bookmarks-editor.c:188
+#: ../src/ephy-history-window.c:150
 msgid "Copy the selection"
 msgstr "èèéåçåå"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:194
-#: ../src/ephy-history-window.c:154 ../src/ephy-window.c:167
+#: ../src/bookmarks/ephy-bookmarks-editor.c:190
+#: ../src/ephy-history-window.c:152 ../src/ephy-window.c:117
 msgid "_Paste"
 msgstr "èä(_P)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:195
-#: ../src/ephy-history-window.c:155
+#: ../src/bookmarks/ephy-bookmarks-editor.c:191
+#: ../src/ephy-history-window.c:153
 msgid "Paste the clipboard"
 msgstr "èäåèçäçåå"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:197
-#: ../src/ephy-history-window.c:157
+#: ../src/bookmarks/ephy-bookmarks-editor.c:193
+#: ../src/ephy-history-window.c:155
 msgid "_Delete"
 msgstr "åé(_D)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:198
+#: ../src/bookmarks/ephy-bookmarks-editor.c:194
 msgid "Delete the selected bookmark or topic"
 msgstr "åéåéçæçæäé"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:200
-#: ../src/ephy-history-window.c:160 ../src/ephy-window.c:173
+#: ../src/bookmarks/ephy-bookmarks-editor.c:196
+#: ../src/ephy-history-window.c:158 ../src/ephy-window.c:121
 msgid "Select _All"
 msgstr "åééå(_A)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:201
+#: ../src/bookmarks/ephy-bookmarks-editor.c:197
 msgid "Select all bookmarks or text"
 msgstr "éåæææçææå"
 
 #. Help Menu
-#. Help menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:205
-#: ../src/ephy-history-window.c:168 ../src/ephy-window.c:267
+#: ../src/bookmarks/ephy-bookmarks-editor.c:201
+#: ../src/ephy-history-window.c:166
 msgid "_Contents"
 msgstr "åå(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:206
+#: ../src/bookmarks/ephy-bookmarks-editor.c:202
 msgid "Display bookmarks help"
 msgstr "éçæçèææä"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:208
-#: ../src/ephy-history-window.c:171 ../src/ephy-window.c:270
+#: ../src/bookmarks/ephy-bookmarks-editor.c:204
+#: ../src/ephy-history-window.c:169
 msgid "_About"
 msgstr "éæ(_A)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:209
-#: ../src/ephy-history-window.c:172 ../src/ephy-window.c:271
+#: ../src/bookmarks/ephy-bookmarks-editor.c:205
+#: ../src/ephy-history-window.c:170
 msgid "Display credits for the web browser creators"
 msgstr "éèææéåçéçèåçåäè"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:214
-msgid "_Show on Toolbar"
-msgstr "ååååéç(_S)"
-
-#: ../src/bookmarks/ephy-bookmarks-editor.c:215
-msgid "Show the selected bookmark on a toolbar"
-msgstr "ååååäéçåéçæç"
-
 #. View Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:218
-#: ../src/ephy-history-window.c:186
+#: ../src/bookmarks/ephy-bookmarks-editor.c:211
+#: ../src/ephy-history-window.c:184
 msgid "_Title"
 msgstr "æé(_T)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:219
-#: ../src/ephy-history-window.c:187
+#: ../src/bookmarks/ephy-bookmarks-editor.c:212
+#: ../src/ephy-history-window.c:185
 msgid "Show the title column"
 msgstr "éçæéæä"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:220
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1796
-#: ../src/ephy-history-window.c:1229
+#: ../src/bookmarks/ephy-bookmarks-editor.c:213
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1657
+#: ../src/ephy-history-window.c:1225
 msgid "Address"
-msgstr "äå"
+msgstr "åå"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:221
-#: ../src/ephy-history-window.c:189
+#: ../src/bookmarks/ephy-bookmarks-editor.c:214
+#: ../src/ephy-history-window.c:187
 msgid "Show the address column"
 msgstr "éçäåæä"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:263
+#: ../src/bookmarks/ephy-bookmarks-editor.c:256
 msgid "Type a topic"
 msgstr "èèåäéåç"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:382
+#: ../src/bookmarks/ephy-bookmarks-editor.c:375
 #, c-format
 msgid "Delete topic â%sâ?"
 msgstr "åéäéâ%sâï"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:385
+#: ../src/bookmarks/ephy-bookmarks-editor.c:378
 msgid "Delete this topic?"
 msgstr "åéæäéï"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:387
+#: ../src/bookmarks/ephy-bookmarks-editor.c:380
 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."
@@ -1645,122 +1398,116 @@ msgstr ""
 "åéæäéæäåææååääèääéæååäéçæçèæææåéïäæçäæ"
 "èåéã"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:390
+#: ../src/bookmarks/ephy-bookmarks-editor.c:383
 msgid "_Delete Topic"
 msgstr "åéäé(_D)"
 
 #. FIXME: proper i18n after freeze
-#: ../src/bookmarks/ephy-bookmarks-editor.c:612
-#: ../src/bookmarks/ephy-bookmarks-editor.c:616
+#: ../src/bookmarks/ephy-bookmarks-editor.c:493
+#: ../src/bookmarks/ephy-bookmarks-editor.c:497
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:621
-#: ../src/bookmarks/ephy-bookmarks-editor.c:625
+#: ../src/bookmarks/ephy-bookmarks-editor.c:502
+#: ../src/bookmarks/ephy-bookmarks-editor.c:506
 msgid "Firebird"
 msgstr "Firebird"
 
 #. Translators: The %s is the name of a Mozilla profile.
-#: ../src/bookmarks/ephy-bookmarks-editor.c:630
+#: ../src/bookmarks/ephy-bookmarks-editor.c:511
 #, c-format
 msgid "Mozilla â%sâ profile"
 msgstr "Mozillaâ%sâèåçå"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:634
+#: ../src/bookmarks/ephy-bookmarks-editor.c:515
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:638
+#: ../src/bookmarks/ephy-bookmarks-editor.c:519
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:667
+#: ../src/bookmarks/ephy-bookmarks-editor.c:548
 msgid "Import failed"
 msgstr "åååæ"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:669
+#: ../src/bookmarks/ephy-bookmarks-editor.c:550
 msgid "Import Failed"
 msgstr "åååæ"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:672
+#: ../src/bookmarks/ephy-bookmarks-editor.c:553
 #, c-format
 msgid ""
 "The bookmarks from â%sâ could not be imported because the file is corrupted "
 "or of an unsupported type."
 msgstr "çæåâ%sâååæçïååæèæåèåçåæææäææçæåã"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:735
+#: ../src/bookmarks/ephy-bookmarks-editor.c:616
 msgid "Import Bookmarks from File"
 msgstr "åææååæç"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:742
+#: ../src/bookmarks/ephy-bookmarks-editor.c:623
 msgid "Firefox/Mozilla bookmarks"
 msgstr "Firefox/Mozilla æç"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:746
+#: ../src/bookmarks/ephy-bookmarks-editor.c:627
 msgid "Galeon/Konqueror bookmarks"
 msgstr "Galeon/Konqueror æç"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:750
+#: ../src/bookmarks/ephy-bookmarks-editor.c:631
 msgid "Epiphany bookmarks"
 msgstr "Epiphany æç"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:874
+#: ../src/bookmarks/ephy-bookmarks-editor.c:755
 msgid "Export Bookmarks"
 msgstr "ååæç"
 
+#: ../src/bookmarks/ephy-bookmarks-editor.c:763
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1520
+#: ../src/bookmarks/ephy-topic-action.c:217
+msgid "Bookmarks"
+msgstr "æç"
+
 #. Make a format selection combo & label
-#: ../src/bookmarks/ephy-bookmarks-editor.c:888
+#: ../src/bookmarks/ephy-bookmarks-editor.c:769
 msgid "File f_ormat:"
 msgstr "æææå(_O)ï"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:934
+#: ../src/bookmarks/ephy-bookmarks-editor.c:815
 msgid "Import Bookmarks"
 msgstr "ååæç"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:939
+#: ../src/bookmarks/ephy-bookmarks-editor.c:820
 msgid "I_mport"
 msgstr "åå(_M)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:955
+#: ../src/bookmarks/ephy-bookmarks-editor.c:836
 msgid "Import bookmarks from:"
 msgstr "ååæççäæï"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:975
+#: ../src/bookmarks/ephy-bookmarks-editor.c:856
 msgid "File"
 msgstr "ææ"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1301
-#: ../src/ephy-history-window.c:621
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1170
+#: ../src/ephy-history-window.c:618
 msgid "_Copy Address"
 msgstr "èèäå(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1549
-#: ../src/ephy-history-window.c:949
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1411
+#: ../src/ephy-history-window.c:946
 msgid "_Search:"
 msgstr "æå(_S)ï"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1715
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1576
 msgid "Topics"
 msgstr "äé"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1785
-#: ../src/ephy-history-window.c:1220
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1646
+#: ../src/ephy-history-window.c:1216
 msgid "Title"
 msgstr "æé"
 
-#: ../src/bookmarks/ephy-bookmarks-ui.c:300
-msgid "Show properties for this bookmark"
-msgstr "éçææççåæ"
-
-#: ../src/bookmarks/ephy-bookmarks-ui.c:312
-msgid "Open this bookmark in a new tab"
-msgstr "åæçåéäéåææç"
-
-#: ../src/bookmarks/ephy-bookmarks-ui.c:324
-msgid "Open this bookmark in a new window"
-msgstr "åæçèçäéåææç"
-
 #. FIXME !!!!
 #: ../src/bookmarks/ephy-open-tabs-action.c:74
 msgid "Open in New _Tabs"
@@ -1770,19 +1517,27 @@ msgstr "åæçåéäéå(_T)"
 msgid "Open the bookmarks in this topic in new tabs"
 msgstr "åæçåéäéåæäæéçæç"
 
-#: ../src/bookmarks/ephy-related-action.c:152
-msgid "Related"
-msgstr "çéç"
-
-#: ../src/bookmarks/ephy-topic-factory-action.c:299
-msgid "Topic"
-msgstr "äé"
-
 #: ../src/bookmarks/ephy-topics-entry.c:330
 #, c-format
 msgid "Create topic â%sâ"
 msgstr "åçäéâ%sâ"
 
+#: ../src/ephy-combined-stop-reload-action.c:41
+msgid "Stop"
+msgstr "åæ"
+
+#: ../src/ephy-combined-stop-reload-action.c:42
+msgid "Stop current data transfer"
+msgstr "åæåéçåçèæ"
+
+#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:136
+msgid "_Reload"
+msgstr "éæèå(_R)"
+
+#: ../src/ephy-combined-stop-reload-action.c:45
+msgid "Display the latest content of the current page"
+msgstr "éçæéçææåå"
+
 #: ../src/ephy-encoding-menu.c:330
 msgid "_Otherâ"
 msgstr "åå(_O)â"
@@ -1834,162 +1589,158 @@ msgid "Find next occurrence of the search string"
 msgstr "åæääååçæååäçåæ"
 
 #. exit button
-#: ../src/ephy-fullscreen-popup.c:232 ../src/ephy-toolbar.c:617
+#: ../src/ephy-fullscreen-popup.c:232
 msgid "Leave Fullscreen"
 msgstr "ééåèå"
 
-#: ../src/ephy-go-action.c:41 ../src/ephy-toolbar.c:307
-msgid "Go"
-msgstr "åå"
-
-#: ../src/ephy-history-window.c:135
+#: ../src/ephy-history-window.c:133
 msgid "Open the selected history link in a new window"
 msgstr "åæçèçäéååéççèèééç"
 
-#: ../src/ephy-history-window.c:138
+#: ../src/ephy-history-window.c:136
 msgid "Open the selected history link in a new tab"
 msgstr "åæçåéäéååéççèèééç"
 
-#: ../src/ephy-history-window.c:140
+#: ../src/ephy-history-window.c:138
 msgid "Add _Bookmarkâ"
 msgstr "ååæç(_B)â"
 
-#: ../src/ephy-history-window.c:141
+#: ../src/ephy-history-window.c:139
 msgid "Bookmark the selected history link"
 msgstr "ååéççèèééçååèæç"
 
-#: ../src/ephy-history-window.c:144
+#: ../src/ephy-history-window.c:142
 msgid "Close the history window"
 msgstr "ééçèèéèç"
 
-#: ../src/ephy-history-window.c:158
+#: ../src/ephy-history-window.c:156
 msgid "Delete the selected history link"
 msgstr "åéåéççèèééç"
 
-#: ../src/ephy-history-window.c:161
+#: ../src/ephy-history-window.c:159
 msgid "Select all history links or text"
 msgstr "éåææçèèééçææå"
 
-#: ../src/ephy-history-window.c:163
+#: ../src/ephy-history-window.c:161
 msgid "Clear _History"
 msgstr "æéçèèé(_H)"
 
-#: ../src/ephy-history-window.c:164
+#: ../src/ephy-history-window.c:162
 msgid "Clear your browsing history"
 msgstr "æéçèèé"
 
-#: ../src/ephy-history-window.c:169
+#: ../src/ephy-history-window.c:167
 msgid "Display history help"
 msgstr "éççèèéèææä"
 
-#: ../src/ephy-history-window.c:188
+#: ../src/ephy-history-window.c:186
 msgid "_Address"
 msgstr "äå(_A)"
 
-#: ../src/ephy-history-window.c:190
+#: ../src/ephy-history-window.c:188
 msgid "_Date and Time"
 msgstr "ææåæå(_D)"
 
-#: ../src/ephy-history-window.c:191
+#: ../src/ephy-history-window.c:189
 msgid "Show the date and time column"
 msgstr "éçææåæåæä"
 
-#: ../src/ephy-history-window.c:217
+#: ../src/ephy-history-window.c:215
 msgid "Clear browsing history?"
 msgstr "æåæéçèèéï"
 
-#: ../src/ephy-history-window.c:221
+#: ../src/ephy-history-window.c:219
 msgid ""
 "Clearing the browsing history will cause all history links to be permanently "
 "deleted."
 msgstr "æéçèèéåæäææçèèéæéèåéã"
 
-#: ../src/ephy-history-window.c:236
+#: ../src/ephy-history-window.c:234
 msgid "Clear History"
 msgstr "æéçèèé"
 
-#: ../src/ephy-history-window.c:958
+#: ../src/ephy-history-window.c:955
 msgid "Last 30 minutes"
 msgstr "å 30 åé"
 
-#: ../src/ephy-history-window.c:959
+#: ../src/ephy-history-window.c:956
 msgid "Today"
 msgstr "äæ"
 
 #. keep this in sync with embed/ephy-history.c's
 #. * HISTORY_PAGE_OBSOLETE_DAYS
-#: ../src/ephy-history-window.c:961 ../src/ephy-history-window.c:965
-#: ../src/ephy-history-window.c:971
+#: ../src/ephy-history-window.c:958 ../src/ephy-history-window.c:962
+#: ../src/ephy-history-window.c:968
 #, c-format
 msgid "Last %d day"
 msgid_plural "Last %d days"
 msgstr[0] "æè %d æ"
 
-#: ../src/ephy-history-window.c:1157
+#: ../src/ephy-history-window.c:1095
+msgid "History"
+msgstr "çèèé"
+
+#: ../src/ephy-history-window.c:1153
 msgid "Sites"
 msgstr "çç"
 
-#: ../src/ephy-history-window.c:1237
+#: ../src/ephy-history-window.c:1233
 msgid "Date"
 msgstr "ææ"
 
-#: ../src/ephy-main.c:79 ../src/ephy-main.c:330 ../src/window-commands.c:1346
-msgid "GNOME Web Browser"
-msgstr "GNOME çéçèå"
-
-#: ../src/ephy-main.c:88
+#: ../src/ephy-main.c:82
 msgid "Open a new tab in an existing browser window"
 msgstr "åçæççèåèçäéåæçåé"
 
-#: ../src/ephy-main.c:90
+#: ../src/ephy-main.c:84
 msgid "Open a new browser window"
 msgstr "éåæççèåèç"
 
-#: ../src/ephy-main.c:92
+#: ../src/ephy-main.c:86
 msgid "Launch the bookmarks editor"
 msgstr "ååæççèå"
 
-#: ../src/ephy-main.c:94
+#: ../src/ephy-main.c:88
 msgid "Import bookmarks from the given file"
 msgstr "åææåçææååæç"
 
-#: ../src/ephy-main.c:96
+#: ../src/ephy-main.c:90
 msgid "Load the given session file"
 msgstr "èåæåçäæéæææ"
 
-#: ../src/ephy-main.c:98
+#: ../src/ephy-main.c:92
 msgid "Add a bookmark"
 msgstr "ååæç"
 
-#: ../src/ephy-main.c:98
+#: ../src/ephy-main.c:92
 msgid "URL"
 msgstr "URL"
 
-#: ../src/ephy-main.c:100
+#: ../src/ephy-main.c:94
 msgid "Start a private instance"
 msgstr "åå private instance"
 
-#: ../src/ephy-main.c:102
+#: ../src/ephy-main.c:96
 msgid "Start the browser in application mode"
 msgstr "äæççåæåååçèå"
 
-#: ../src/ephy-main.c:104
+#: ../src/ephy-main.c:98
 msgid "Profile directory to use in the private instance"
 msgstr "å private instance äççèåçåçé"
 
-#: ../src/ephy-main.c:104
+#: ../src/ephy-main.c:98
 msgid "DIR"
 msgstr "DIR"
 
-#: ../src/ephy-main.c:106
+#: ../src/ephy-main.c:100
 msgid "URL â"
 msgstr "URLâ"
 
-#: ../src/ephy-main.c:214
-msgid "Could not start GNOME Web Browser"
-msgstr "çæåè GNOME çéçèå"
+#: ../src/ephy-main.c:208
+msgid "Could not start Web"
+msgstr "çæååçé"
 
-#: ../src/ephy-main.c:217
+#: ../src/ephy-main.c:211
 #, c-format
 msgid ""
 "Startup failed because of the following error:\n"
@@ -1998,759 +1749,314 @@ msgstr ""
 "çæääååïåæçæåèï\n"
 "%s"
 
-#: ../src/ephy-main.c:331
-msgid "GNOME Web Browser options"
-msgstr "GNOME çéçèåéé"
+#: ../src/ephy-main.c:322
+msgid "Web options"
+msgstr "çééé"
 
-#: ../src/ephy-notebook.c:618
+#: ../src/ephy-notebook.c:592
 msgid "Close tab"
 msgstr "ééåé"
 
-#: ../src/ephy-session.c:118
+#: ../src/ephy-session.c:115
 #, c-format
 msgid "Downloads will be aborted and logout proceed in %d second."
 msgid_plural "Downloads will be aborted and logout proceed in %d seconds."
 msgstr[0] "äèåæèäæåå %d åçåã"
 
-#: ../src/ephy-session.c:222
+#: ../src/ephy-session.c:219
 msgid "Abort pending downloads?"
 msgstr "åææåæçäèï"
 
-#: ../src/ephy-session.c:227
+#: ../src/ephy-session.c:224
 msgid ""
 "There are still downloads pending. If you log out, they will be aborted and "
 "lost."
 msgstr "éæäèæåæãåææçåïåååæèäæåéåã"
 
-#: ../src/ephy-session.c:231
+#: ../src/ephy-session.c:228
 msgid "_Cancel Logout"
 msgstr "åæçå(_C)"
 
-#: ../src/ephy-session.c:233
+#: ../src/ephy-session.c:230
 msgid "_Abort Downloads"
 msgstr "åæäè(_A)"
 
-#: ../src/ephy-session.c:774
-msgid "Don't recover"
-msgstr "äèåå"
+#: ../src/ephy-session.c:770
+msgid "_Don't recover"
+msgstr "äèåå(_D)"
 
-#: ../src/ephy-session.c:779
-msgid "Recover session"
-msgstr "ååäæéæ"
+#: ../src/ephy-session.c:775
+msgid "_Recover session"
+msgstr "ååäæéæ(_R)"
 
-#: ../src/ephy-session.c:784
+#: ../src/ephy-session.c:780
 msgid "Do you want to recover the previous browser windows and tabs?"
 msgstr "æåèååååççèåèçååéï"
 
-#: ../src/ephy-tabs-menu.c:210
-msgid "Switch to this tab"
-msgstr "åæåæåé"
-
-#: ../src/ephy-toolbar.c:217
-msgid "_Back"
-msgstr "ääé(_B)"
-
-#: ../src/ephy-toolbar.c:219
-msgid "Go to the previous visited page"
-msgstr "ååääåçèçéé"
-
-#. 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:223
-msgid "Back history"
-msgstr "ääéçèé"
-
-#: ../src/ephy-toolbar.c:237
-msgid "_Forward"
-msgstr "ääé(_F)"
-
-#: ../src/ephy-toolbar.c:239
-msgid "Go to the next visited page"
-msgstr "ååääåçèçéé"
-
-#. 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:243
-msgid "Forward history"
-msgstr "ääéçèé"
-
-#: ../src/ephy-toolbar.c:256
-msgid "_Up"
-msgstr "ääå(_U)"
-
-#: ../src/ephy-toolbar.c:258
-msgid "Go up one level"
-msgstr "ååääåçéé"
-
-#. 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:262
-msgid "List of upper levels"
-msgstr "ææäåçé"
-
-#: ../src/ephy-toolbar.c:279
-msgid "Enter a web address to open, or a phrase to search for"
-msgstr "èåæéåççåïæèææåççè"
-
-#: ../src/ephy-toolbar.c:295
-msgid "Zoom"
-msgstr "çæ"
-
-#: ../src/ephy-toolbar.c:297
-msgid "Adjust the text size"
-msgstr "èææååå"
-
-#: ../src/ephy-toolbar.c:309
-msgid "Go to the address entered in the address entry"
-msgstr "ååäåèåæääæåçäå"
-
-#: ../src/ephy-toolbar.c:318
-msgid "_Home"
-msgstr "éé(_H)"
-
-#: ../src/ephy-toolbar.c:320
-msgid "Go to the home page"
-msgstr "ååéé"
-
-#: ../src/ephy-toolbar.c:330
-msgid "New _Tab"
-msgstr "æååé(_T)"
-
-#: ../src/ephy-toolbar.c:332
-msgid "Open a new tab"
-msgstr "éåæçåé"
-
-#: ../src/ephy-toolbar.c:343
-msgid "_New Window"
-msgstr "æåèç(_N)"
-
-#: ../src/ephy-toolbar.c:345
-msgid "Open a new window"
-msgstr "éåæçèç"
-
-#: ../src/ephy-toolbar-editor.c:71
-msgctxt "toolbar style"
-msgid "Default"
-msgstr "éèå"
-
-#. separator row
-#: ../src/ephy-toolbar-editor.c:73
-msgctxt "toolbar style"
-msgid "Text below icons"
-msgstr "æåååçä"
-
-#: ../src/ephy-toolbar-editor.c:74
-msgctxt "toolbar style"
-msgid "Text beside icons"
-msgstr "æåååçæ"
-
-#: ../src/ephy-toolbar-editor.c:75
-msgctxt "toolbar style"
-msgid "Icons only"
-msgstr "åæåç"
-
-#: ../src/ephy-toolbar-editor.c:76
-msgctxt "toolbar style"
-msgid "Text only"
-msgstr "åææå"
-
-#: ../src/ephy-toolbar-editor.c:185
-msgid "Toolbar Editor"
-msgstr "åååçèå"
-
-#. translators: translate the same as in gnome-control-center
-#: ../src/ephy-toolbar-editor.c:204
-msgid "Toolbar _button labels:"
-msgstr "åååæéæå(_B)ï"
-
-#: ../src/ephy-toolbar-editor.c:269
-msgid "_Add a New Toolbar"
-msgstr "æåååå(_A)"
-
-#: ../src/ephy-window.c:117
+#. Toplevel
+#: ../src/ephy-window.c:87
 msgid "_Bookmarks"
 msgstr "æç(_B)"
 
-#: ../src/ephy-window.c:118
-msgid "_Go"
-msgstr "åå(_G)"
-
-#: ../src/ephy-window.c:119
-msgid "T_ools"
-msgstr "ååå(_O)"
-
-#: ../src/ephy-window.c:120
-msgid "_Tabs"
-msgstr "åé(_T)"
-
-#: ../src/ephy-window.c:122
-msgid "_Toolbars"
-msgstr "ååå(_T)"
-
-#. File menu
-#: ../src/ephy-window.c:128
+#. File actions.
+#: ../src/ephy-window.c:94
 msgid "_Openâ"
 msgstr "éå(_O)â"
 
-#: ../src/ephy-window.c:129
-msgid "Open a file"
-msgstr "éåææ"
-
-#: ../src/ephy-window.c:131
+#: ../src/ephy-window.c:96
 msgid "Save _Asâ"
 msgstr "ååææ(_A)â"
 
-#: ../src/ephy-window.c:132
-msgid "Save the current page"
-msgstr "ååçåçééåå"
-
-#: ../src/ephy-window.c:134
+#: ../src/ephy-window.c:98
 msgid "Save As _Web Applicationâ"
 msgstr "ååççéæççå(_W)â"
 
-#: ../src/ephy-window.c:135
-msgid "Save the current page as a Web Application"
-msgstr "ååçåçééççéæççå"
-
-#: ../src/ephy-window.c:137
-msgid "Page Set_up"
-msgstr "ééèå(_U)"
-
-#: ../src/ephy-window.c:138
-msgid "Setup the page settings for printing"
-msgstr "èåååæçééèå"
-
-#: ../src/ephy-window.c:140
-msgid "Print Pre_view"
-msgstr "éèåå(_V)"
-
-#: ../src/ephy-window.c:141
-msgid "Print preview"
-msgstr "éèåå"
-
-#: ../src/ephy-window.c:143
+#: ../src/ephy-window.c:100
 msgid "_Printâ"
 msgstr "åå(_P)â"
 
-#: ../src/ephy-window.c:144
-msgid "Print the current page"
-msgstr "ååçåçééåå"
-
-#: ../src/ephy-window.c:146
+#: ../src/ephy-window.c:102
 msgid "S_end Link by Emailâ"
 msgstr "äééåééç(_E)â"
 
-#: ../src/ephy-window.c:147
-msgid "Send a link of the current page"
-msgstr "åéæééçéç"
-
-#: ../src/ephy-window.c:150
-msgid "Close this tab"
-msgstr "ééæåé"
-
-#. Edit menu
-#: ../src/ephy-window.c:155
+#. Edit actions.
+#: ../src/ephy-window.c:109
 msgid "_Undo"
 msgstr "åå(_U)"
 
-#: ../src/ephy-window.c:156
-msgid "Undo the last action"
-msgstr "ååääååä"
-
-#: ../src/ephy-window.c:158
+#: ../src/ephy-window.c:111
 msgid "Re_do"
 msgstr "åæåå(_D)"
 
-#: ../src/ephy-window.c:159
-msgid "Redo the last undone action"
-msgstr "åæääåçåååä"
-
-#: ../src/ephy-window.c:168
-msgid "Paste clipboard"
-msgstr "èäåèççåå"
-
-#: ../src/ephy-window.c:171
-msgid "Delete text"
-msgstr "åéæå"
-
-#: ../src/ephy-window.c:174
-msgid "Select the entire page"
-msgstr "éåæåééçåå"
-
-#: ../src/ephy-window.c:176
+#: ../src/ephy-window.c:123
 msgid "_Findâ"
 msgstr "åæ(_F)â"
 
-#: ../src/ephy-window.c:177
-msgid "Find a word or phrase in the page"
-msgstr "åééäåæäååèæåä"
-
-#: ../src/ephy-window.c:179
+#: ../src/ephy-window.c:125
 msgid "Find Ne_xt"
 msgstr "æääå(_X)"
 
-#: ../src/ephy-window.c:180
-msgid "Find next occurrence of the word or phrase"
-msgstr "åæääæåçæååèæåäçåæ"
-
-#: ../src/ephy-window.c:182
+#: ../src/ephy-window.c:127
 msgid "Find Pre_vious"
 msgstr "æääå(_V)"
 
-#: ../src/ephy-window.c:183
-msgid "Find previous occurrence of the word or phrase"
-msgstr "åæääæåçæååèæåäçåæ"
-
-#: ../src/ephy-window.c:185
-msgid "P_ersonal Data"
-msgstr "åäèæ(_E)"
-
-#: ../src/ephy-window.c:186
-msgid "View and remove cookies and passwords"
-msgstr "éçåçéææ cookie ååç"
-
-#: ../src/ephy-window.c:189
-msgid "Certificate_s"
-msgstr "æè(_S)"
-
-#: ../src/ephy-window.c:190
-msgid "Manage Certificates"
-msgstr "ççæè"
-
-#: ../src/ephy-window.c:193
-msgid "P_references"
-msgstr "ååèå(_R)"
-
-#: ../src/ephy-window.c:194
-msgid "Configure the web browser"
-msgstr "çéçèåèç"
-
-#. View menu
-#: ../src/ephy-window.c:199
-msgid "_Customize Toolbarsâ"
-msgstr "èèååå(_C)â"
-
-#: ../src/ephy-window.c:200
-msgid "Customize toolbars"
-msgstr "èèååå"
-
-#: ../src/ephy-window.c:202 ../src/ephy-window.c:205
+#. View actions.
+#: ../src/ephy-window.c:132 ../src/ephy-window.c:134
 msgid "_Stop"
 msgstr "åæ(_S)"
 
-#: ../src/ephy-window.c:203
-msgid "Stop current data transfer"
-msgstr "åæåéçåçèæ"
-
-#: ../src/ephy-window.c:207
-msgid "_Reload"
-msgstr "éæèå(_R)"
-
-#: ../src/ephy-window.c:208
-msgid "Display the latest content of the current page"
-msgstr "éçæéçææåå"
-
-#: ../src/ephy-window.c:210
+#: ../src/ephy-window.c:138
 msgid "_Larger Text"
 msgstr "æååå(_L)"
 
-#: ../src/ephy-window.c:211
-msgid "Increase the text size"
-msgstr "åæåæå"
-
-#: ../src/ephy-window.c:213
+#: ../src/ephy-window.c:140
 msgid "S_maller Text"
 msgstr "çååå(_M)"
 
-#: ../src/ephy-window.c:214
-msgid "Decrease the text size"
-msgstr "åæåçå"
-
-#: ../src/ephy-window.c:216
+#: ../src/ephy-window.c:142
 msgid "_Normal Size"
 msgstr "æååå(_N)"
 
-#: ../src/ephy-window.c:217
-msgid "Use the normal text size"
-msgstr "åæåéåçæååå"
-
-#: ../src/ephy-window.c:219
+#: ../src/ephy-window.c:144
 msgid "Text _Encoding"
 msgstr "ååçç(_E)"
 
-#: ../src/ephy-window.c:220
-msgid "Change the text encoding"
-msgstr "æèååççæå"
-
-#: ../src/ephy-window.c:222
+#: ../src/ephy-window.c:145
 msgid "_Page Source"
 msgstr "çéåååå(_P)"
 
-#: ../src/ephy-window.c:223
-msgid "View the source code of the page"
-msgstr "éçèééçåååå"
-
-#: ../src/ephy-window.c:225
-msgid "Page _Security Information"
-msgstr "çéååèè(_S)"
-
-#: ../src/ephy-window.c:226
-msgid "Display security information for the web page"
-msgstr "éççéçååèè"
-
-#. Bookmarks menu
-#: ../src/ephy-window.c:231
+#. Bookmarks actions.
+#: ../src/ephy-window.c:150
 msgid "_Add Bookmarkâ"
 msgstr "ååæç(_A)â"
 
-#: ../src/ephy-window.c:232 ../src/ephy-window.c:309
-msgid "Add a bookmark for the current page"
-msgstr "æåæéæééçæç"
-
-#: ../src/ephy-window.c:234
-msgid "_Edit Bookmarks"
-msgstr "äææç(_E)"
-
-#: ../src/ephy-window.c:235
-msgid "Open the bookmarks window"
-msgstr "éåæçèç"
-
-#. Go menu
-#: ../src/ephy-window.c:240
+#. Go actions.
+#: ../src/ephy-window.c:155
 msgid "_Locationâ"
 msgstr "äç(_L)â"
 
-#: ../src/ephy-window.c:241
-msgid "Go to a specified location"
-msgstr "ååæåçäç"
-
-#. History
-#: ../src/ephy-window.c:243 ../src/pdm-dialog.c:403
-msgid "Hi_story"
-msgstr "æåèé(_S)"
-
-#: ../src/ephy-window.c:244
-msgid "Open the history window"
-msgstr "éåçèèéèç"
-
-#. Tabs menu
-#: ../src/ephy-window.c:249
+#. Tabs actions.
+#: ../src/ephy-window.c:160
 msgid "_Previous Tab"
 msgstr "ääååé(_P)"
 
-#: ../src/ephy-window.c:250
-msgid "Activate previous tab"
-msgstr "åçääååé"
-
-#: ../src/ephy-window.c:252
+#: ../src/ephy-window.c:162
 msgid "_Next Tab"
 msgstr "ääååé(_N)"
 
-#: ../src/ephy-window.c:253
-msgid "Activate next tab"
-msgstr "åçääååé"
-
-#: ../src/ephy-window.c:255
+#: ../src/ephy-window.c:164
 msgid "Move Tab _Left"
 msgstr "åéååç(_L)"
 
-#: ../src/ephy-window.c:256
-msgid "Move current tab to left"
-msgstr "åçåçåéååçå"
-
-#: ../src/ephy-window.c:258
+#: ../src/ephy-window.c:166
 msgid "Move Tab _Right"
 msgstr "åéååç(_R)"
 
-#: ../src/ephy-window.c:259
-msgid "Move current tab to right"
-msgstr "åçåçåéååçå"
-
-#: ../src/ephy-window.c:261
+#: ../src/ephy-window.c:168
 msgid "_Detach Tab"
 msgstr "åéåé(_D)"
 
-#: ../src/ephy-window.c:262
-msgid "Detach current tab"
-msgstr "åéçåçééåå"
-
-#: ../src/ephy-window.c:268
-msgid "Display web browser help"
-msgstr "éççéçèåçåé"
-
-#. File Menu
-#: ../src/ephy-window.c:279
+#. File actions.
+#: ../src/ephy-window.c:176
 msgid "_Work Offline"
 msgstr "éçæå(_W)"
 
-#: ../src/ephy-window.c:280
-msgid "Switch to offline mode"
-msgstr "åæèéçæå"
-
-#. View Menu
-#: ../src/ephy-window.c:285
-msgid "_Hide Toolbars"
-msgstr "éèååå(_H)"
-
-#: ../src/ephy-window.c:286
-msgid "Show or hide toolbar"
-msgstr "éçæéèååå"
-
-#: ../src/ephy-window.c:288
+#. View actions.
+#: ../src/ephy-window.c:181
 msgid "_Downloads Bar"
 msgstr "äèå(_D)"
 
-#: ../src/ephy-window.c:289
-msgid "Show the active downloads for this window"
-msgstr "éçéåèçäæåéèçäè"
-
-#: ../src/ephy-window.c:292
-msgid "Men_ubar"
-msgstr "éåå(_U)"
-
-#: ../src/ephy-window.c:294
+#: ../src/ephy-window.c:184
 msgid "_Fullscreen"
 msgstr "åèå(_F)"
 
-#: ../src/ephy-window.c:295
-msgid "Browse at full screen"
-msgstr "äåèåæåçè"
-
-#: ../src/ephy-window.c:297
+#: ../src/ephy-window.c:186
 msgid "Popup _Windows"
 msgstr "åååèç(_W)"
 
-#: ../src/ephy-window.c:298
-msgid "Show or hide unrequested popup windows from this site"
-msgstr "éçæéèéåçèæèæçåååèç"
-
-#: ../src/ephy-window.c:300
+#: ../src/ephy-window.c:188
 msgid "Selection Caret"
 msgstr "éæææ"
 
-#. Document
-#: ../src/ephy-window.c:308
+#. Document.
+#: ../src/ephy-window.c:195
 msgid "Add Boo_kmarkâ"
 msgstr "ååæç(_K)â"
 
-#. Framed document
-#: ../src/ephy-window.c:314
-msgid "Show Only _This Frame"
-msgstr "åéçéåææ(_T)"
-
-#: ../src/ephy-window.c:315
-msgid "Show only this frame in this window"
-msgstr "ååæèçäéçæéæéä"
-
-#. Links
-#: ../src/ephy-window.c:320
+#. Links.
+#: ../src/ephy-window.c:200
 msgid "_Open Link"
 msgstr "éåéç(_O)"
 
-#: ../src/ephy-window.c:321
-msgid "Open link in this window"
-msgstr "åéèçäéåéç"
-
-#: ../src/ephy-window.c:323
+#: ../src/ephy-window.c:202
 msgid "Open Link in New _Window"
 msgstr "åæçèçäéåéç(_W)"
 
-#: ../src/ephy-window.c:324
-msgid "Open link in a new window"
-msgstr "åæçèçäéåéç"
-
-#: ../src/ephy-window.c:326
+#: ../src/ephy-window.c:204
 msgid "Open Link in New _Tab"
 msgstr "åæçåéäéåéç(_T)"
 
-#: ../src/ephy-window.c:327
-msgid "Open link in a new tab"
-msgstr "åæçåéäéåéç"
-
-#: ../src/ephy-window.c:329
+#: ../src/ephy-window.c:206
 msgid "_Download Link"
 msgstr "äèéç(_D)"
 
-#: ../src/ephy-window.c:331
+#: ../src/ephy-window.c:208
 msgid "_Save Link Asâ"
 msgstr "ååéç(_S)â"
 
-#: ../src/ephy-window.c:332
-msgid "Save link with a different name"
-msgstr "äåäååçååéç"
-
-#: ../src/ephy-window.c:334
+#: ../src/ephy-window.c:210
 msgid "_Bookmark Linkâ"
 msgstr "åéçååæç(_B)â"
 
-#: ../src/ephy-window.c:336
+#: ../src/ephy-window.c:212
 msgid "_Copy Link Address"
 msgstr "èèéçåå(_C)"
 
-#. Email links
-#. This is on the context menu on a mailto: link and opens the mail program
-#: ../src/ephy-window.c:342
-msgid "_Send Emailâ"
-msgstr "åééä(_S)â"
-
-#: ../src/ephy-window.c:344
-msgid "_Copy Email Address"
-msgstr "èèéäåå(_C)"
-
-#. Images
-#: ../src/ephy-window.c:349
+#. Images.
+#: ../src/ephy-window.c:217
 msgid "Open _Image"
 msgstr "éååç(_I)"
 
-#: ../src/ephy-window.c:351
+#: ../src/ephy-window.c:219
 msgid "_Save Image Asâ"
 msgstr "åååç(_S)â"
 
-#: ../src/ephy-window.c:353
+#: ../src/ephy-window.c:221
 msgid "_Use Image As Background"
 msgstr "äçåçäçæéèæ(_U)"
 
-#: ../src/ephy-window.c:355
+#: ../src/ephy-window.c:223
 msgid "Copy I_mage Address"
 msgstr "èèåçåå(_M)"
 
-#: ../src/ephy-window.c:357
+#: ../src/ephy-window.c:225
 msgid "St_art Animation"
 msgstr "åçéå(_A)"
 
-#: ../src/ephy-window.c:359
+#: ../src/ephy-window.c:227
 msgid "St_op Animation"
 msgstr "åçåæ(_O)"
 
-#. Inspector
-#: ../src/ephy-window.c:375
+#. Inspector.
+#: ../src/ephy-window.c:243
 msgid "Inspect _Element"
 msgstr "ææåç(_E)"
 
-#: ../src/ephy-window.c:579
+#: ../src/ephy-window.c:449
 msgid "There are unsubmitted changes to form elements"
 msgstr "åèåçåçèèææççèçæè"
 
-#: ../src/ephy-window.c:580
+#: ../src/ephy-window.c:450
 msgid "If you close the document anyway, you will lose that information."
 msgstr "åææçèçäèééææäïæåæååæååçèèã"
 
-#: ../src/ephy-window.c:582
+#: ../src/ephy-window.c:452
 msgid "Close _Document"
 msgstr "ééæä(_D)"
 
-#: ../src/ephy-window.c:600
+#: ../src/ephy-window.c:470
 msgid "There are ongoing downloads in this window"
 msgstr "éåèçéæéèäçäè"
 
-#: ../src/ephy-window.c:601
+#: ../src/ephy-window.c:471
 msgid "If you close this window, the downloads will be cancelled"
 msgstr "åææéééåèçïéåäèäæèåæ"
 
-#: ../src/ephy-window.c:602
+#: ../src/ephy-window.c:472
 msgid "Close window and cancel downloads"
 msgstr "ééèçäåæäè"
 
-#: ../src/ephy-window.c:1628
+#: ../src/ephy-window.c:1287
 msgid "Save As"
 msgstr "ååææ"
 
-#: ../src/ephy-window.c:1630
+#: ../src/ephy-window.c:1289
 msgid "Save As Application"
 msgstr "ååçæççå"
 
-#: ../src/ephy-window.c:1632
+#: ../src/ephy-window.c:1291
 msgid "Print"
 msgstr "åå"
 
-#: ../src/ephy-window.c:1636
+#: ../src/ephy-window.c:1293
+msgid "Bookmark"
+msgstr "ååæç"
+
+#: ../src/ephy-window.c:1295
 msgid "Find"
 msgstr "åæ"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1649
+#: ../src/ephy-window.c:1304
 msgid "Larger"
 msgstr "æå"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1652
+#: ../src/ephy-window.c:1307
 msgid "Smaller"
 msgstr "çå"
 
-#: ../src/ephy-window.c:1875
-msgid "Insecure"
-msgstr "äåå"
-
-#: ../src/ephy-window.c:1880
-msgid "Broken"
-msgstr "äæ"
+#: ../src/ephy-window.c:1321
+msgid "Back"
+msgstr "ääé"
 
-#: ../src/ephy-window.c:1888
-msgid "Low"
-msgstr "ä"
+#: ../src/ephy-window.c:1333
+msgid "Forward"
+msgstr "ääé"
 
-#: ../src/ephy-window.c:1895
-msgid "High"
-msgstr "é"
-
-#: ../src/ephy-window.c:1905
-#, c-format
-msgid "Security level: %s"
-msgstr "ååççï%s"
-
-#: ../src/ephy-window.c:2180
-#, c-format
-msgid "Open image â%sâ"
-msgstr "éååçâ%sâ"
-
-#: ../src/ephy-window.c:2185
-#, c-format
-msgid "Use as desktop background â%sâ"
-msgstr "äçåçäçæéèæâ%sâ"
-
-#: ../src/ephy-window.c:2190
-#, c-format
-msgid "Save image â%sâ"
-msgstr "åååçâ%sâ"
-
-#: ../src/ephy-window.c:2195
-#, c-format
-msgid "Copy image address â%sâ"
-msgstr "èèåçäåâ%sâ"
-
-#: ../src/ephy-window.c:2209
-#, c-format
-msgid "Send email to address â%sâ"
-msgstr "åéééèäåâ%sâ"
-
-#: ../src/ephy-window.c:2215
-#, c-format
-msgid "Copy email address â%sâ"
-msgstr "èèééäåâ%sâ"
-
-#: ../src/ephy-window.c:2229
-#, c-format
-msgid "Save link â%sâ"
-msgstr "ååéçâ%sâ"
-
-#: ../src/ephy-window.c:2235
-#, c-format
-msgid "Bookmark link â%sâ"
-msgstr "æçéçâ%sâ"
+#: ../src/ephy-window.c:1345
+msgid "Zoom"
+msgstr "çæ"
 
-#: ../src/ephy-window.c:2240
-#, c-format
-msgid "Copy link's address â%sâ"
-msgstr "èèéçäåâ%sâ"
+#: ../src/ephy-window.c:1353
+msgid "New _Tab"
+msgstr "æååé(_T)"
 
-#: ../src/pdm-dialog.c:337
+#: ../src/pdm-dialog.c:336
 msgid "<b>Select the personal data you want to clear</b>"
 msgstr "<b>éææèæéçåäèæ</b>"
 
-#: ../src/pdm-dialog.c:340
+#: ../src/pdm-dialog.c:339
 msgid ""
 "You are about to clear personal data that is stored about the web pages you "
 "have visited. Before proceeding, check the types of information that you "
@@ -2759,26 +2065,31 @@ msgstr ""
 "ææèæéçåäèæååäææåèéççéãåéåæéäåïèçåèçéåä"
 "éåçèèï"
 
-#: ../src/pdm-dialog.c:345
+#: ../src/pdm-dialog.c:344
 msgid "Clear All Personal Data"
 msgstr "æéææçåäèæ"
 
 #. Cookies
-#: ../src/pdm-dialog.c:379
+#: ../src/pdm-dialog.c:378
 msgid "C_ookies"
 msgstr "C_ookies"
 
 #. Passwords
-#: ../src/pdm-dialog.c:391
+#: ../src/pdm-dialog.c:390
 msgid "Saved _passwords"
 msgstr "ååçåç(_P)"
 
+#. History
+#: ../src/pdm-dialog.c:402
+msgid "Hi_story"
+msgstr "æåèé(_S)"
+
 #. Cache
-#: ../src/pdm-dialog.c:415
+#: ../src/pdm-dialog.c:414
 msgid "_Temporary files"
 msgstr "æåææ(_T)"
 
-#: ../src/pdm-dialog.c:431
+#: ../src/pdm-dialog.c:430
 msgid ""
 "<small><i><b>Note:</b> You cannot undo this action. The data you are "
 "choosing to clear will be deleted forever.</i></small>"
@@ -2786,68 +2097,48 @@ msgstr ""
 "<small><i><b>ææï</b>æäèååéååäãææéæçèæåèæéåéã</i></"
 "small>"
 
-#: ../src/pdm-dialog.c:622
-msgid "Cookie Properties"
-msgstr "Cookie åæ"
-
-#: ../src/pdm-dialog.c:639
-msgid "Content:"
-msgstr "åå"
-
-#: ../src/pdm-dialog.c:655
-msgid "Path:"
-msgstr "èåï"
-
-#: ../src/pdm-dialog.c:671
-msgid "Send for:"
-msgstr "åéçï"
-
-#: ../src/pdm-dialog.c:680
+#: ../src/pdm-dialog.c:649
 msgid "Encrypted connections only"
 msgstr "åéåååçéç"
 
-#: ../src/pdm-dialog.c:680
+#: ../src/pdm-dialog.c:650
 msgid "Any type of connection"
 msgstr "ääéåçéç"
 
-#: ../src/pdm-dialog.c:686
-msgid "Expires:"
-msgstr "æéï"
-
 #. Session cookie
-#: ../src/pdm-dialog.c:698
+#: ../src/pdm-dialog.c:655
 msgid "End of current session"
 msgstr "çæçåçäæéæ"
 
-#: ../src/pdm-dialog.c:830
+#: ../src/pdm-dialog.c:774
 msgid "Domain"
 msgstr "çå"
 
-#: ../src/pdm-dialog.c:842
+#: ../src/pdm-dialog.c:786
 msgid "Name"
 msgstr "åç"
 
-#: ../src/pdm-dialog.c:1256
+#: ../src/pdm-dialog.c:1200
 msgid "Host"
 msgstr "äæ"
 
-#: ../src/pdm-dialog.c:1269
+#: ../src/pdm-dialog.c:1213
 msgid "User Name"
 msgstr "äçèåç"
 
-#: ../src/pdm-dialog.c:1282
+#: ../src/pdm-dialog.c:1226
 msgid "User Password"
 msgstr "äçèåç"
 
-#: ../src/popup-commands.c:281
+#: ../src/popup-commands.c:273
 msgid "Download Link"
 msgstr "äèéç"
 
-#: ../src/popup-commands.c:289
+#: ../src/popup-commands.c:281
 msgid "Save Link As"
 msgstr "ååéç(_A)â"
 
-#: ../src/popup-commands.c:296
+#: ../src/popup-commands.c:288
 msgid "Save Image As"
 msgstr "åååç"
 
@@ -2880,60 +2171,60 @@ msgstr[0] "ççèè (%s)"
 msgid "Select a Directory"
 msgstr "éæäåçé"
 
-#: ../src/window-commands.c:368
+#: ../src/window-commands.c:316
 msgid "Save"
 msgstr "åå"
 
-#: ../src/window-commands.c:531
+#: ../src/window-commands.c:479
 #, c-format
 msgid "A web application named '%s' already exists. Do you want to replace it?"
 msgstr "ååååçã%sãççéæççåãææèåäååï"
 
-#: ../src/window-commands.c:536
+#: ../src/window-commands.c:484
 msgid "Replace"
 msgstr "åä"
 
-#: ../src/window-commands.c:540
+#: ../src/window-commands.c:488
 msgid ""
 "An application with the same name already exists. Replacing it will "
 "overwrite it."
 msgstr "äæçåçæççååçååãåäåæååèèã"
 
-#: ../src/window-commands.c:580
+#: ../src/window-commands.c:528
 #, c-format
 msgid "The application '%s' is ready to be used"
 msgstr "æççåã%sãåçæåååääç"
 
-#: ../src/window-commands.c:583
+#: ../src/window-commands.c:531
 #, c-format
 msgid "The application '%s' could not be created"
 msgstr "çæåçæççåã%sã"
 
-#: ../src/window-commands.c:591
+#: ../src/window-commands.c:539
 msgid "Launch"
 msgstr "åè"
 
 #. Show dialog with icon, title.
-#: ../src/window-commands.c:624
+#: ../src/window-commands.c:572
 msgid "Create Web Application"
 msgstr "åççéæççå"
 
-#: ../src/window-commands.c:629
+#: ../src/window-commands.c:577
 msgid "Create"
 msgstr "åç"
 
-#: ../src/window-commands.c:1246
+#: ../src/window-commands.c:1123
 msgid ""
-"The GNOME Web Browser is free software; you can redistribute it and/or "
-"modify it under the terms of the GNU General Public License as published by "
-"the Free Software Foundation; either version 2 of the License, or (at your "
-"option) any later version."
+"Web is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version."
 msgstr ""
-"GNOME çéçèåçèçèéïæåäæèçèéåéææçèç GNU éçååæææ"
-"æèåïåæçååçæåèïæäæïçèæäæçææææççäçæïæèèé"
-"æçïääæåçèççæã"
+"Web çèçèéïæåäæèçèéåéææçèç GNU éçååææææèåïåæ"
+"çååçæåèïæäæïçèæäæçææææççäçæïæèèéæçïääæ"
+"åçèççæã"
 
-#: ../src/window-commands.c:1250
+#: ../src/window-commands.c:1127
 msgid ""
 "The GNOME Web Browser is distributed in the hope that it will be useful, but "
 "WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY "
@@ -2943,7 +2234,7 @@ msgstr ""
 "GNOME çéçèåäåæäçççèåäæåïçèäèääæäèäïäçåéåæ"
 "æçåççéçææççéçææäãèæèåç GNU éçååææã"
 
-#: ../src/window-commands.c:1254
+#: ../src/window-commands.c:1131
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "the GNOME Web Browser; if not, write to the Free Software Foundation, Inc., "
@@ -2952,27 +2243,27 @@ msgstr ""
 "ææåæåééææçåç GNU éçååææçåæïåçïèåäèèçèéåé"
 "æï51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA"
 
-#: ../src/window-commands.c:1300 ../src/window-commands.c:1316
-#: ../src/window-commands.c:1327
+#: ../src/window-commands.c:1177 ../src/window-commands.c:1193
+#: ../src/window-commands.c:1204
 msgid "Contact us at:"
 msgstr "èçæåæï"
 
-#: ../src/window-commands.c:1303
+#: ../src/window-commands.c:1180
 msgid "Contributors:"
 msgstr "èçèï"
 
-#: ../src/window-commands.c:1306
+#: ../src/window-commands.c:1183
 msgid "Past developers:"
 msgstr "ååéçäåï"
 
-#: ../src/window-commands.c:1336
+#: ../src/window-commands.c:1213
 #, c-format
 msgid ""
 "Lets you view web pages and find information on the internet.\n"
-"Powered by WebKit"
+"Powered by WebKit %d.%d.%d"
 msgstr ""
 "èæåçéçèäçèçéååæèèã\n"
-"åæ WebKit"
+"åæ WebKit %d.%d.%d"
 
 #. Translators: This is a special message that shouldn't be translated
 #. * literally. It is used in the about box to give credits to
@@ -2982,7 +2273,7 @@ msgstr ""
 #. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
 #.
-#: ../src/window-commands.c:1362
+#: ../src/window-commands.c:1242
 msgid "translator-credits"
 msgstr ""
 "ååçèæääæèïèéäåéåéäç\n"
@@ -2993,15 +2284,15 @@ msgstr ""
 "Ching-Hung Lin <billlin wshlab2 ee kuas edu tw>, 2004\n"
 "Abel Cheung <maddog linux org hk>, 2003"
 
-#: ../src/window-commands.c:1365
-msgid "GNOME Web Browser Website"
-msgstr "GNOME çéçèåçç"
+#: ../src/window-commands.c:1245
+msgid "Web Website"
+msgstr "çéçç"
 
-#: ../src/window-commands.c:1509
+#: ../src/window-commands.c:1387
 msgid "Enable caret browsing mode?"
 msgstr "æååçéççèï"
 
-#: ../src/window-commands.c:1512
+#: ../src/window-commands.c:1390
 msgid ""
 "Pressing F7 turns caret browsing on or off. This feature places a moveable "
 "cursor in web pages, allowing you to move around with your keyboard. Do you "
@@ -3010,9 +2301,6 @@ msgstr ""
 "æä F7 æéåæéééççèãéååèæåçéäæçäååçåçææïèæå"
 "ääçéçéèçåãææåèåçéççèï"
 
-#: ../src/window-commands.c:1515
+#: ../src/window-commands.c:1393
 msgid "_Enable"
 msgstr "åç(_E)"
-
-#~ msgid "Icon"
-#~ msgstr "åç"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]