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

[Chao-Hsiung Liao <chliao src gnome org>]

commit 1f0e7468b543ec053a2a3203aea539e80aa25f54
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Wed Jan 15 19:41:30 2014 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1375 ++++++++++++++++++++++++++++++++--------------------------
 po/zh_TW.po | 1396 +++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 1543 insertions(+), 1228 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index d57da6e..d5eb5b7 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -13,11 +13,11 @@ msgstr ""
 "Project-Id-Version: epiphany 3.3.91\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=epiphany\n"
-"POT-Creation-Date: 2013-09-30 19:22+0800\n"
-"PO-Revision-Date: 2013-09-30 19:22+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
+"POT-Creation-Date: 2014-01-15 19:37+0800\n"
+"PO-Revision-Date: 2014-01-15 19:39+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"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,11 +37,12 @@ msgstr "搜尋網頁"
 #. duckduckgo must be translated. So, for a Finnish localized
 #. version of duckduckgo that will render results tailored for
 #. Finland, the string would be:
-#. http://duckduckgo.com/?t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI
+#. https://duckduckgo.com/?t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI
 #.
 #: ../data/default-bookmarks.rdf.in.h:13
-msgid "http://duckduckgo.com/?t=epiphany";
-msgstr "http://duckduckgo.com/?t=epiphany";
+#| msgid "http://duckduckgo.com/?t=epiphany";
+msgid "https://duckduckgo.com/?t=epiphany";
+msgstr "https://duckduckgo.com/?t=epiphany";
 
 #. Translators: you can use the regions listed in
 #. https://duckduckgo.com/params to boost a particular region
@@ -51,22 +52,23 @@ msgstr "http://duckduckgo.com/?t=epiphany";
 #. 'kad' parameter can be used to specify the locale in which
 #. duckduckgo must be translated. For such case, the search url
 #. would be
-#. http://duckduckgo.com/?q=%s&amp;t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI
-#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-web-view.c:2061
-#: ../src/ephy-search-provider.c:290
+#. https://duckduckgo.com/?q=%s&amp;t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI
+#: ../data/default-bookmarks.rdf.in.h:24
 #, no-c-format
-msgid "http://duckduckgo.com/?q=%s&amp;t=epiphany";
-msgstr "http://duckduckgo.com/?q=%s&amp;t=epiphany";
+#| msgid "http://duckduckgo.com/?q=%s&amp;t=epiphany";
+msgid "https://duckduckgo.com/?q=%s&amp;t=epiphany";
+msgstr "https://duckduckgo.com/?q=%s&amp;t=epiphany";
 
 #: ../data/epiphany.appdata.xml.in.h:1
 msgid ""
-"The web browser for the GNOME desktop, featuring tight integration with the "
-"desktop and a simple and intuitive user interface that allows you to focus "
-"on your web pages."
-msgstr "GNOME 桌面的網頁瀏覽器，帶來與桌面緊密的整合、簡單且直觀的使用者介面，讓你可以專注於你的網頁。"
-
-#: ../data/epiphany.desktop.in.in.h:1 ../src/ephy-main.c:68
-#: ../src/ephy-main.c:320 ../src/ephy-main.c:478 ../src/window-commands.c:1787
+"The web browser for GNOME, featuring tight integration with the desktop and "
+"a simple and intuitive user interface that allows you to focus on your web "
+"pages."
+msgstr "GNOME 的網頁瀏覽器，帶來與桌面的緊密整合、簡易且直觀的使用者介面，讓你可以專注在你的網頁上。"
+
+#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:312
+#: ../embed/ephy-about-handler.c:342 ../src/ephy-main.c:67
+#: ../src/ephy-main.c:314 ../src/ephy-main.c:467 ../src/window-commands.c:1574
 msgid "Web"
 msgstr "網頁"
 
@@ -90,68 +92,81 @@ msgstr "web;browser;internet;網頁;瀏覽器;互聯網;"
 msgid "Browse with caret"
 msgstr "鍵盤瀏覽"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:2
+#. DuckDuckGo is the default search engine. Must exactly match the URL used
+#. in the preferences dialog, except this string is surrounded by single quotes
+#. and uses &amp; instead of simply &. If the match is not otherwise exact,
+#. there will be a spurious, ugly entry in the preferences combo, so please
+#. test this. Should ideally also match the default smart bookmark link in
+#. default-bookmarks.rdf. See the comment there for region parameters to
+#. the URL.
+#: ../data/org.gnome.epiphany.gschema.xml.h:10
+#, no-c-format
+#| msgid "'http://duckduckgo.com/?q=%s&amp;t=epiphany'"
+msgid "'https://duckduckgo.com/?q=%s&amp;t=epiphany'"
+msgstr "'https://duckduckgo.com/?q=%s&amp;t=epiphany'"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:11
 msgid "URL Search"
 msgstr "URL 搜尋"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:3
+#: ../data/org.gnome.epiphany.gschema.xml.h:12
 msgid "Search string for keywords entered in the URL bar."
 msgstr "搜尋在 URL 列中輸入關鍵字的字串。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:4
+#: ../data/org.gnome.epiphany.gschema.xml.h:13
 msgid "User agent"
 msgstr "使用者代理"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:5
+#: ../data/org.gnome.epiphany.gschema.xml.h:14
 msgid ""
 "String that will be used as user agent, to identify the browser to the web "
 "servers."
 msgstr "用作使用者代理的字串，讓網頁伺服器辨認瀏覽器時使用。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:6
+#: ../data/org.gnome.epiphany.gschema.xml.h:15
 msgid "Automatic downloads"
 msgstr "自動下載"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:7
+#: ../data/org.gnome.epiphany.gschema.xml.h:16
 msgid ""
 "When files cannot be opened by the browser they are automatically downloaded "
 "to the download folder and opened with the appropriate application."
 msgstr "當檔案不能被瀏覽器開啟時，它們會自動被下載到下載資料夾並以合適的應用程式開啟。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:8
+#: ../data/org.gnome.epiphany.gschema.xml.h:17
 msgid "Force new windows to be opened in tabs"
 msgstr "強制新視窗在分頁中開啟"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:9
+#: ../data/org.gnome.epiphany.gschema.xml.h:18
 msgid ""
 "Force new window requests to be opened in tabs instead of using a new window."
 msgstr "強制開新視窗的要求在分頁中開啟而不是在新視窗中。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:10
+#: ../data/org.gnome.epiphany.gschema.xml.h:19
 msgid "Remember passwords"
 msgstr "記錄密碼"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:11
+#: ../data/org.gnome.epiphany.gschema.xml.h:20
 msgid "Whether to store and prefill passwords in web sites."
 msgstr "是否儲存並預先填寫網站密碼。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:12
+#: ../data/org.gnome.epiphany.gschema.xml.h:21
 msgid "Automatically manage offline status with NetworkManager"
 msgstr "使用 NetworkManager 自動管理離線狀態"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:13
+#: ../data/org.gnome.epiphany.gschema.xml.h:22
 msgid "Enable smooth scrolling"
 msgstr "啟用平滑捲動"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:14
+#: ../data/org.gnome.epiphany.gschema.xml.h:23
 msgid "Don't use an external application to view page source."
 msgstr "不要使用外部應用程式檢視網頁原始檔。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:15
+#: ../data/org.gnome.epiphany.gschema.xml.h:24
 msgid "Whether to automatically restore the last session"
 msgstr "是否自動還原上次作業階段"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:16
+#: ../data/org.gnome.epiphany.gschema.xml.h:25
 msgid ""
 "Defines how the session will be restored during startup. Allowed values are "
 "'always' (the previous state of the application is always restored), "
@@ -159,339 +174,360 @@ msgid ""
 "'never' (the homepage is always shown)."
 msgstr "定義啟動時作業階段要如何還原。允許的數值有「always」(應用程式的前一個狀態永遠會還原)、「crashed」(作業階段只有在應用程式當機時還原) 和「never」(永遠只顯示首頁)。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:17
+#: ../data/org.gnome.epiphany.gschema.xml.h:26
 msgid ""
 "Whether to delay loading of tabs that are not immediately visible on session "
 "restore"
 msgstr "是否延遲載入在作業階段還原時無法立即顯示的分頁"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:18
+#: ../data/org.gnome.epiphany.gschema.xml.h:27
 msgid ""
 "When this option is set to true, tabs will not start loading until the user "
 "switches to them, upon session restore."
 msgstr "當這個選項設定為 true，分頁在作業階段還原時只會在使用者切換到它們時才開始載入。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:19
+#: ../data/org.gnome.epiphany.gschema.xml.h:28
 msgid "Show toolbars by default"
 msgstr "預設顯示工具列"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:20
+#: ../data/org.gnome.epiphany.gschema.xml.h:29
 msgid "Toolbar style"
 msgstr "工具列樣式"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:21
+#: ../data/org.gnome.epiphany.gschema.xml.h:30
 msgid ""
 "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both"
 "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and "
 "\"text\"."
 msgstr "工具列樣式。允許的數值有 \"\" (使用 GNOME 預設樣式)、\"both\" (文字和圖示)、\"both-horiz\" (文字在圖示旁)、\"icons\" 和 \"text\"。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:22
+#: ../data/org.gnome.epiphany.gschema.xml.h:31
 msgid "[Deprecated]"
 msgstr "[已廢棄]"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:23
+#: ../data/org.gnome.epiphany.gschema.xml.h:32
 msgid ""
 "[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' "
 "instead."
 msgstr "[已廢棄] 這個設定值已廢棄，使用「tabs-bar-visibility-policy」代替。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:24
+#: ../data/org.gnome.epiphany.gschema.xml.h:33
 msgid "Visibility of the downloads window"
 msgstr "下載視窗的顯示"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:25
+#: ../data/org.gnome.epiphany.gschema.xml.h:34
 msgid ""
 "Hide or show the downloads window. When hidden, a notification will be shown "
 "when new downloads are started."
 msgstr "隱藏或顯示下載視窗。當隱藏時，新的下載開始時會顯示一個通知。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:26
+#: ../data/org.gnome.epiphany.gschema.xml.h:35
 msgid "The visibility policy for the tabs bar."
 msgstr "分頁列顯示原則。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:27
+#: ../data/org.gnome.epiphany.gschema.xml.h:36
 msgid ""
 "Controls when the tabs bar is shown. Possible values are 'always' (the tabs "
 "bar is always shown), 'more-than-one' (the tabs bar is only shown if there's "
 "two or more tabs) and 'never' (the tabs bar is never shown)."
 msgstr "控制分頁列何時顯示。可能的數值有「always」(永遠顯示分頁列)、「more-than-one」(如果有兩個以上分頁才顯示分頁列) 和「never」(永遠不顯示分頁列)。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:28
+#: ../data/org.gnome.epiphany.gschema.xml.h:37
 msgid "Minimum font size"
 msgstr "最小字型大小"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:29
+#: ../data/org.gnome.epiphany.gschema.xml.h:38
 msgid "Use GNOME fonts"
 msgstr "使用 GNOME 字型"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:30
-msgid "Use GNOME desktop wide font configuration."
-msgstr "使用 GNOME 桌面字型組態。"
+#: ../data/org.gnome.epiphany.gschema.xml.h:39
+msgid "Use GNOME font settings."
+msgstr "使用 GNOME 字型設定值。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:31
+#: ../data/org.gnome.epiphany.gschema.xml.h:40
 msgid "Custom sans-serif font"
 msgstr "自選無襯線字型"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:32
+#: ../data/org.gnome.epiphany.gschema.xml.h:41
 msgid ""
 "A value to be used to override sans-serif desktop font when use-gnome-fonts "
 "is set."
 msgstr "當設定「use-gnome-fonts」時用來覆蓋 sans-serif 桌面字型的數值。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:33
+#: ../data/org.gnome.epiphany.gschema.xml.h:42
 msgid "Custom serif font"
 msgstr "自選有襯線字型"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:34
+#: ../data/org.gnome.epiphany.gschema.xml.h:43
 msgid ""
 "A value to be used to override serif desktop font when use-gnome-fonts is "
 "set."
 msgstr "當設定「use-gnome-fonts」時用來覆蓋 serif 桌面字型的數值。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:35
+#: ../data/org.gnome.epiphany.gschema.xml.h:44
 msgid "Custom monospace font"
 msgstr "自選等寬字型"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:36
+#: ../data/org.gnome.epiphany.gschema.xml.h:45
 msgid ""
 "A value to be used to override monospace desktop font when use-gnome-fonts "
 "is set."
 msgstr "當設定「use-gnome-fonts」時用來覆蓋 monospace 桌面字型的數值。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:37
+#: ../data/org.gnome.epiphany.gschema.xml.h:46
 msgid "Use own colors"
 msgstr "使用自選顏色"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:38
+#: ../data/org.gnome.epiphany.gschema.xml.h:47
 msgid "Use your own colors instead of the colors the page requests."
 msgstr "使用你自己的顏色取代網頁要求的顏色。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:39
+#: ../data/org.gnome.epiphany.gschema.xml.h:48
 msgid "Use own fonts"
 msgstr "使用自用字型(_U)"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:40
+#: ../data/org.gnome.epiphany.gschema.xml.h:49
 msgid "Use your own fonts instead of the fonts the page requests."
 msgstr "使用你自己的字型取代網頁要求的字型。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:41
+#: ../data/org.gnome.epiphany.gschema.xml.h:50
 msgid "Use a custom CSS"
 msgstr "使用自選 CSS"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:42
+#: ../data/org.gnome.epiphany.gschema.xml.h:51
 msgid "Use a custom CSS file to modify websites own CSS."
 msgstr "使用自選的 CSS 檔案來修改網站自己的 CSS。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:43
+#: ../data/org.gnome.epiphany.gschema.xml.h:52
 msgid "Enable spell checking"
 msgstr "啟用拼字檢查"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:44
+#: ../data/org.gnome.epiphany.gschema.xml.h:53
 msgid "Spell check any text typed in editable areas."
 msgstr "對任何在可編輯區域中輸入的文字進行拼字檢查。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:45
+#: ../data/org.gnome.epiphany.gschema.xml.h:54
 msgid "Default encoding"
 msgstr "預設編碼"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:46
+#: ../data/org.gnome.epiphany.gschema.xml.h:55
 msgid ""
 "Default encoding. Accepted values are the ones WebKitGTK+ can understand."
 msgstr "預設的編碼。可接受的數值為 WebKitGTK+ 能辨識的數值。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:47
+#: ../data/org.gnome.epiphany.gschema.xml.h:56
 msgid "Size of disk cache"
 msgstr "磁碟快取大小"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:48
+#: ../data/org.gnome.epiphany.gschema.xml.h:57
 msgid "Size of disk cache, in MB."
 msgstr "磁碟快取大小，單位為 MB。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:49
-#: ../src/resources/prefs-dialog.ui.h:38
+#: ../data/org.gnome.epiphany.gschema.xml.h:58
+#: ../src/resources/prefs-dialog.ui.h:41
 msgid "Languages"
 msgstr "語言"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:50
+#: ../data/org.gnome.epiphany.gschema.xml.h:59
 msgid "Preferred languages, two letter codes."
 msgstr "偏好的語言，兩個英文字母的代碼。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:51
+#: ../data/org.gnome.epiphany.gschema.xml.h:60
 msgid "Cookie accept"
 msgstr "Cookie 接受"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:52
+#: ../data/org.gnome.epiphany.gschema.xml.h:61
 msgid ""
 "Where to accept cookies from. Possible values are \"anywhere\", \"current "
 "site\" and \"nowhere\"."
 msgstr "要接受來自何處的 cookies。可能的數值有「anywhere」、「current site」和「nowhere」。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:53
+#: ../data/org.gnome.epiphany.gschema.xml.h:62
 msgid "Image animation mode"
 msgstr "影像動畫模式"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:54
+#: ../data/org.gnome.epiphany.gschema.xml.h:63
 msgid ""
 "How to present animated images. Possible values are \"normal\", \"once\" and "
 "\"disabled\"."
 msgstr "如何顯示動畫影像。可能的數值有「normal」、「once」和「disabled」。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:55
+#: ../data/org.gnome.epiphany.gschema.xml.h:64
 msgid "Allow popups"
 msgstr "允許彈出式視窗"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:56
+#: ../data/org.gnome.epiphany.gschema.xml.h:65
 msgid ""
 "Allow sites to open new windows using JavaScript (if JavaScript is enabled)."
 msgstr "允許網站使用 JavaScript 開啟新視窗 (如果啟用 JavaScript)。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:57
+#: ../data/org.gnome.epiphany.gschema.xml.h:66
 msgid "Enable Plugins"
 msgstr "啟用外掛程式"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:58
+#: ../data/org.gnome.epiphany.gschema.xml.h:67
 msgid "Enable JavaScript"
 msgstr "啟用 JavaScript"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:59
+#: ../data/org.gnome.epiphany.gschema.xml.h:68
 msgid "Enable WebGL"
 msgstr "啟用 WebGL"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:60
+#: ../data/org.gnome.epiphany.gschema.xml.h:69
 msgid "Whether to enable support for WebGL contexts."
 msgstr "是否啟用支援 WebGL 內容。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:61
+#: ../data/org.gnome.epiphany.gschema.xml.h:70
 msgid "Enable WebAudio"
 msgstr "啟用 WebAudio"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:62
+#: ../data/org.gnome.epiphany.gschema.xml.h:71
 msgid "Whether to enable support for WebAudio."
 msgstr "是否啟用支援 WebAudio。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:63
+#: ../data/org.gnome.epiphany.gschema.xml.h:72
 msgid "Do Not Track"
 msgstr "不要追蹤"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:64
+#: ../data/org.gnome.epiphany.gschema.xml.h:73
 msgid ""
 "Whether to tell websites that we do not wish to be tracked. Please note that "
 "web pages are not forced to follow this setting."
 msgstr "是否告訴網站我們不希望被追蹤。請注意網站頁面並不會被強制要求聽從這個設定值。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:65
+#: ../data/org.gnome.epiphany.gschema.xml.h:74
 msgid "Enable Adblock"
 msgstr "啟用廣告阻擋"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:66
+#: ../data/org.gnome.epiphany.gschema.xml.h:75
 msgid ""
 "Whether to block the embedded advertisements that web pages might want to "
 "show."
 msgstr "是否阻擋內嵌於網頁可能顯示的廣告。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:67
+#: ../data/org.gnome.epiphany.gschema.xml.h:76
 msgid "The downloads folder"
 msgstr "下載資料夾"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:68
+#: ../data/org.gnome.epiphany.gschema.xml.h:77
 msgid ""
 "The path of the folder where to download files to; or \"Downloads\" to use "
 "the default downloads folder, or \"Desktop\" to use the desktop folder."
 msgstr "放置下載的檔案的資料夾路徑；或是「Downloads」代表預設的下載目錄，或「Desktop」使用桌面資料夾。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:69
+#: ../data/org.gnome.epiphany.gschema.xml.h:78
 msgid "History pages time range"
 msgstr "歷史紀錄時間範圍"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:70
+#: ../data/org.gnome.epiphany.gschema.xml.h:79
 msgid "Whether to show the title column in the history window."
 msgstr "是否在歷史紀錄視窗顯示標題欄。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:71
+#: ../data/org.gnome.epiphany.gschema.xml.h:80
 msgid "Whether to show the address column in the history window."
 msgstr "是否在歷史紀錄視窗顯示位址欄。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:72
+#: ../data/org.gnome.epiphany.gschema.xml.h:81
 msgid "Whether to show the date-time column in the history window."
 msgstr "是否在歷史紀錄視窗顯示日期-時刻欄。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:73
+#: ../data/org.gnome.epiphany.gschema.xml.h:82
 msgid "Whether to show the title column in the bookmarks window."
 msgstr "是否在書籤視窗顯示標題欄。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:74
+#: ../data/org.gnome.epiphany.gschema.xml.h:83
 msgid "Whether to show the address column in the bookmarks window."
 msgstr "是否在書籤視窗顯示位址欄。"
 
-#: ../embed/ephy-about-handler.c:144 ../embed/ephy-about-handler.c:146
+#: ../embed/ephy-about-handler.c:153
 msgid "Installed plugins"
 msgstr "已安裝的外掛程式"
 
-#: ../embed/ephy-about-handler.c:159
+#: ../embed/ephy-about-handler.c:155
+msgid "Plugins"
+msgstr "外掛程式"
+
+#: ../embed/ephy-about-handler.c:158
+msgid "Plugins are disabled in the preferences"
+msgstr "外掛程式在偏好設定中已停用"
+
+#: ../embed/ephy-about-handler.c:171
 msgid "Enabled"
 msgstr "已啟用"
 
-#. webkit_plugin_get_enabled (plugin)
-#: ../embed/ephy-about-handler.c:159
+#. webkit_plugin_get_enabled (plugin) &&
+#: ../embed/ephy-about-handler.c:171
 msgid "Yes"
 msgstr "是"
 
-#: ../embed/ephy-about-handler.c:159
+#: ../embed/ephy-about-handler.c:171
 msgid "No"
 msgstr "否"
 
-#: ../embed/ephy-about-handler.c:160
+#: ../embed/ephy-about-handler.c:172
 msgid "MIME type"
 msgstr "MIME 類型"
 
-#: ../embed/ephy-about-handler.c:160
+#: ../embed/ephy-about-handler.c:172
 msgid "Description"
 msgstr "說明"
 
-#: ../embed/ephy-about-handler.c:160
+#: ../embed/ephy-about-handler.c:172
 msgid "Suffixes"
 msgstr "後綴"
 
-#: ../embed/ephy-about-handler.c:220 ../embed/ephy-about-handler.c:223
+#: ../embed/ephy-about-handler.c:232 ../embed/ephy-about-handler.c:235
 msgid "Memory usage"
 msgstr "記憶體使用量"
 
-#: ../embed/ephy-about-handler.c:303 ../embed/ephy-about-handler.c:305
+#: ../embed/ephy-about-handler.c:285
+#, c-format
+msgid "Version %s"
+msgstr "版本 %s"
+
+#: ../embed/ephy-about-handler.c:309
+msgid "About Web"
+msgstr "關於 Web"
+
+#: ../embed/ephy-about-handler.c:314
+msgid "A simple, clean, beautiful view of the web"
+msgstr "簡單、乾淨、美麗的網頁面貌。"
+
+#: ../embed/ephy-about-handler.c:365 ../embed/ephy-about-handler.c:367
 msgid "Applications"
 msgstr "應用程式"
 
-#: ../embed/ephy-about-handler.c:306
+#: ../embed/ephy-about-handler.c:368
 msgid "List of installed web applications"
 msgstr "已安裝的網頁應用程式清單"
 
 #. Note for translators: this refers to the installation date.
-#: ../embed/ephy-about-handler.c:327
+#: ../embed/ephy-about-handler.c:389
 msgid "Installed on:"
 msgstr "安裝於："
 
-#: ../embed/ephy-about-handler.c:400 ../embed/ephy-about-handler.c:403
+#: ../embed/ephy-about-handler.c:468 ../embed/ephy-about-handler.c:471
 msgid "Private Browsing"
 msgstr "隱密瀏覽"
 
-#: ../embed/ephy-about-handler.c:404
+#: ../embed/ephy-about-handler.c:472
 msgid ""
 "You are currently browsing <em>incognito</em>. Pages viewed in this mode "
 "will not show up in your browsing history and all stored information will be "
 "cleared when you close the window."
 msgstr "你現在使用<em>隱密</em>瀏覽。在這個模式中檢視的網頁將不會顯示在瀏覽紀錄中，而所有儲存的資訊都會在關閉視窗時清除。"
 
-#: ../embed/ephy-embed.c:487
+#: ../embed/ephy-embed.c:490
 #, c-format
 msgid "Press %s to exit fullscreen"
 msgstr "按下 %s 離開全螢幕"
 
 #. Translators: 'ESC' and 'F11' are keyboard keys.
-#: ../embed/ephy-embed.c:490
+#: ../embed/ephy-embed.c:493
 msgid "ESC"
 msgstr "ESC"
 
-#: ../embed/ephy-embed.c:490
+#: ../embed/ephy-embed.c:493
 msgid "F11"
 msgstr "F11"
 
@@ -825,121 +861,141 @@ msgstr "萬國碼 (UTF-3_2BE)"
 msgid "Unknown (%s)"
 msgstr "不明 (%s)"
 
+#: ../embed/ephy-find-toolbar.c:103
+msgid "Text not found"
+msgstr "找不到文字"
+
+#: ../embed/ephy-find-toolbar.c:110
+msgid "Search wrapped back to the top"
+msgstr "搜尋至結尾後返回開頭"
+
+#: ../embed/ephy-find-toolbar.c:463
+msgid "Type to search…"
+msgstr "輸入以搜尋…"
+
+#: ../embed/ephy-find-toolbar.c:469
+msgid "Find previous occurrence of the search string"
+msgstr "尋找上一個出現搜尋字串的地方"
+
+#: ../embed/ephy-find-toolbar.c:477
+msgid "Find next occurrence of the search string"
+msgstr "尋找下一個出現搜尋字串的地方"
+
 #: ../embed/ephy-overview.h:53
 msgid "Most Visited"
 msgstr "最常瀏覽"
 
 #. characters
-#: ../embed/ephy-web-view.c:64 ../embed/ephy-web-view.c:2757
+#: ../embed/ephy-web-view.c:64 ../embed/ephy-web-view.c:2778
 msgid "Blank page"
 msgstr "空白頁面"
 
-#: ../embed/ephy-web-view.c:495
-msgid "Not now"
-msgstr "現在不要"
-
-#: ../embed/ephy-web-view.c:496
-msgid "Store password"
-msgstr "儲存密碼"
+#: ../embed/ephy-web-view.c:496 ../src/window-commands.c:329
+msgid "Save"
+msgstr "儲存"
 
-#. 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.
+#. Translators: The %s the hostname where this is happening.
+#. * Example: mail.google.com.
 #.
 #: ../embed/ephy-web-view.c:508
 #, 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>"
+msgid "Do you want to save your password for “%s”?"
+msgstr "你是否要儲存你在“%s”的密碼？"
 
-#: ../embed/ephy-web-view.c:1364
+#: ../embed/ephy-web-view.c:1380
 msgid "Deny"
 msgstr "禁止"
 
-#: ../embed/ephy-web-view.c:1365
+#: ../embed/ephy-web-view.c:1381
 msgid "Allow"
 msgstr "允許"
 
-#: ../embed/ephy-web-view.c:1375
+#: ../embed/ephy-web-view.c:1391
 #, c-format
 msgid "The page at <b>%s</b> wants to know your location."
 msgstr "在 <b>%s</b> 的網頁想要知道你的位置。"
 
-#: ../embed/ephy-web-view.c:1704
+#: ../embed/ephy-web-view.c:1741
 msgid "None specified"
 msgstr "沒有指定"
 
-#: ../embed/ephy-web-view.c:1713 ../embed/ephy-web-view.c:1731
+#: ../embed/ephy-web-view.c:1752 ../embed/ephy-web-view.c:1769
 #, c-format
-msgid "Oops! Error loading %s"
-msgstr "噢！載入 %s 時發生錯誤"
+msgid "Problem loading “%s”"
+msgstr "載入“%s”時發生錯誤"
 
-#: ../embed/ephy-web-view.c:1715
-msgid "Oops! It was not possible to show this website"
-msgstr "噢！無法顯示這個網站"
+#: ../embed/ephy-web-view.c:1754
+msgid "Oops! Unable to display this website."
+msgstr "噢！無法顯示這個網站。"
 
-#: ../embed/ephy-web-view.c:1716
+#: ../embed/ephy-web-view.c:1755
 #, c-format
 msgid ""
-"<p>The website at <strong>%s</strong> seems to be unavailable. The precise "
-"error was:</p><p><em>%s</em></p><p>It could be temporarily switched off or "
-"moved to a new address. Don't forget to check that your internet connection "
-"is working correctly.</p>"
-msgstr "<p>網站 <strong>%s</strong> 
可能無法使用，準確來說錯誤為：</p><p><em>%s</em></p><p>它可能被暫時關閉或移動到新的位址。不要忘了檢查互聯網連線是否正常運作。</p>"
+"<p>The site at “%s” seems to be unavailable. The precise error was:</"
+"p><p><code>%s</code></p><p>It may be temporarily unavailable or moved to a "
+"new address. You may wish to verify that your internet connection is working "
+"correctly.</p>"
+msgstr "<p>在“%s”的網站似乎無法使用。更準確的說錯誤是：</p><p><code>%s</code></p><p>它可能是暫時無法使用或移動到新的位址。你可能會想要檢查你的互聯網連線是否正常。</p>"
 
-#: ../embed/ephy-web-view.c:1725
-msgid "Try again"
-msgstr "再試一次"
+#: ../embed/ephy-web-view.c:1764
+msgid "Try Again"
+msgstr "重試"
 
-#: ../embed/ephy-web-view.c:1733
-msgid "Oops! This site might have caused the web browser to close unexpectedly"
-msgstr "噢！這個網站可能已造成網頁瀏覽器未預期的關閉"
+#: ../embed/ephy-web-view.c:1771
+msgid "Oops! There may be a problem."
+msgstr "噢！可能有問題發生。"
 
-#: ../embed/ephy-web-view.c:1735
+#: ../embed/ephy-web-view.c:1772
 #, c-format
 msgid ""
-"<p>This page was loading when the web browser closed unexpectedly.</"
-"p><p>This might happen again if you reload the page. If it does, please "
-"report the problem to the <strong>%s</strong> developers.</p>"
-msgstr "<p>這個網頁尚在讀取但瀏覽器已異常關閉了。</p><p>如果你重新載入該頁面仍然可能再度發生這個狀況。如果真的這樣，請將問題匯報給 <strong>%s</strong> 開發隊伍。</p>"
+"<p>This site may have caused Web to close unexpectedly.</p><p>If this "
+"happens again, please report the problem to the <strong>%s</strong> "
+"developers.</p>"
+msgstr "<p>這個網站可能造成 Web 未預期的關閉。</p><p>如果這再次發生，請將這個問題匯報給 <strong>%s</strong> 開發隊伍。</p>"
 
-#: ../embed/ephy-web-view.c:1743
-msgid "Load again anyway"
-msgstr "强制再次載入"
+#: ../embed/ephy-web-view.c:1778 ../embed/ephy-web-view.c:1786
+msgid "Reload Anyway"
+msgstr "強制重新載入"
 
-#: ../embed/ephy-web-view.c:1749
+#: ../embed/ephy-web-view.c:1783
 #, c-format
-msgid "Oops! Something went wrong displaying %s"
-msgstr "噢！顯示 %s 時發生問題"
+msgid "Problem displaying “%s”"
+msgstr "顯示“%s”時發生問題"
 
-#: ../embed/ephy-web-view.c:1750
+#: ../embed/ephy-web-view.c:1784
 msgid "Oops!"
 msgstr "噢！"
 
-#: ../embed/ephy-web-view.c:1751
+#: ../embed/ephy-web-view.c:1785
 msgid ""
 "Something went wrong while displaying this page. Please reload or visit a "
 "different page to continue."
 msgstr "顯示這個頁面時有錯誤發生。請重新載入或瀏覽不同的頁面以繼續。"
 
+#: ../embed/ephy-web-view.c:2090 ../src/ephy-search-provider.c:287
+#, c-format
+msgid "http://duckduckgo.com/?q=%s&amp;t=epiphany";
+msgstr "http://duckduckgo.com/?q=%s&amp;t=epiphany";
+
 #. translators: %s here is the address of the web page
-#: ../embed/ephy-web-view.c:2299
+#: ../embed/ephy-web-view.c:2328
 #, c-format
 msgid "Loading “%s”…"
 msgstr "正在載入“%s”…"
 
-#: ../embed/ephy-web-view.c:2301
+#: ../embed/ephy-web-view.c:2330
 msgid "Loading…"
 msgstr "載入中…"
 
-#: ../embed/ephy-web-view.c:2661 ../src/bookmarks/ephy-bookmarks-editor.c:818
+#: ../embed/ephy-web-view.c:2682
 msgid "_OK"
 msgstr "確定(_O)"
 
 #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193
-#: ../src/bookmarks/ephy-bookmark-properties.c:639
-#: ../src/bookmarks/ephy-bookmarks-editor.c:815 ../src/pdm-dialog.c:343
-#: ../src/window-commands.c:992
+#: ../src/bookmarks/ephy-bookmark-properties.c:640
+#: ../src/bookmarks/ephy-bookmarks-editor.c:815
+#: ../src/resources/clear-data-dialog.ui.h:2
+#: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:877
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -968,7 +1024,7 @@ msgid "All files"
 msgstr "所有檔案"
 
 #. If we don't have XDG user dirs info, return an educated guess.
-#: ../lib/ephy-file-helpers.c:112 ../src/resources/prefs-dialog.ui.h:4
+#: ../lib/ephy-file-helpers.c:112 ../src/resources/prefs-dialog.ui.h:3
 msgid "Downloads"
 msgstr "下載"
 
@@ -996,11 +1052,19 @@ msgstr "無法建立目錄“%s”。"
 #. * hostname where this is happening. Example: gnome gmail com and
 #. * mail.google.com.
 #.
-#: ../lib/ephy-form-auth-data.c:126
+#: ../lib/ephy-form-auth-data.c:139
 #, c-format
 msgid "Password for %s in a form in %s"
 msgstr "%s 用於 %s 表單的密碼"
 
+#. Translators: The first %s is the hostname where this is happening.
+#. * Example: mail.google.com.
+#.
+#: ../lib/ephy-form-auth-data.c:145
+#, c-format
+msgid "Password in a form in %s"
+msgstr "用於 %s 表單的密碼"
+
 #: ../lib/ephy-gui.c:206
 #, c-format
 msgid "Directory “%s” is not writable"
@@ -1040,10 +1104,9 @@ msgstr "需要主控密碼"
 
 #: ../lib/ephy-nss-glue.c:64
 msgid ""
-"The passwords from the previous version (Gecko) are locked with a master "
-"password. If you want Epiphany to import them, please enter your master "
-"password below."
-msgstr "在前一版本 (Gecko) 中所儲存的密碼都使用主控密碼鎖定了。如果你想要 Epiphany 匯入它們，請在下面輸入你的主控密碼。"
+"The passwords from the previous version are locked with a master password. "
+"If you want to import them, please enter your master password below."
+msgstr "前一版中的密碼被鎖定在主控密碼中。如果你想要匯入它們，請在下面輸入你的主控密碼。"
 
 #: ../lib/ephy-profile-migrator.c:100
 msgid "Failed to copy cookies file from Mozilla."
@@ -1051,9 +1114,9 @@ msgstr "從 Mozilla 複製 cookies 檔案失敗。"
 
 #: ../lib/ephy-profile-migrator.c:652
 msgid ""
-"Epiphany 3.6 deprecated this directory and tried migrating this "
-"configuration to ~/.config/epiphany"
-msgstr "Epiphany 3.6 已廢棄這個目錄並且嘗試將這個組態轉移到 ~/.config/epiphany"
+"Web 3.6 deprecated this directory and tried migrating this configuration to "
+"~/.config/epiphany"
+msgstr "Web 3.6 已廢棄這個目錄並且嘗試將這個組態轉移到 ~/.config/epiphany"
 
 #: ../lib/ephy-profile-migrator.c:1030
 msgid "Executes only the n-th migration step"
@@ -1068,12 +1131,12 @@ msgid "Specifies the profile where the migrator should run"
 msgstr "指定轉移器應執行的設定組合"
 
 #: ../lib/ephy-profile-migrator.c:1047
-msgid "Epiphany profile migrator"
-msgstr "Epiphany 設定組合轉移器"
+msgid "Web profile migrator"
+msgstr "Web 設定組合轉移器"
 
 #: ../lib/ephy-profile-migrator.c:1048
-msgid "Epiphany profile migrator options"
-msgstr "Epiphany 設定組合轉移器選項"
+msgid "Web profile migrator options"
+msgstr "Web 設定組合轉移器選項"
 
 #. Translators: "friendly time" string for the current day, strftime format. like "Today 12:34 am"
 #: ../lib/ephy-time-helpers.c:223
@@ -1193,66 +1256,91 @@ msgstr "這個網站的身分已經通過檢驗"
 msgid "The identity of this website has not been verified"
 msgstr "這個網站的身分並沒有通過檢驗"
 
-#: ../lib/widgets/ephy-certificate-dialog.c:323
-#: ../src/bookmarks/ephy-bookmark-properties.c:649
+#: ../lib/widgets/ephy-certificate-dialog.c:326
+#: ../src/bookmarks/ephy-bookmark-properties.c:650
 #: ../src/bookmarks/ephy-bookmarks-editor.c:178
-#: ../src/ephy-history-window.c:143 ../src/ephy-window.c:118
+#: ../src/resources/cookies-dialog.ui.h:3 ../src/resources/epiphany.ui.h:2
+#: ../src/resources/passwords-dialog.ui.h:3
+#: ../src/resources/prefs-dialog.ui.h:2 ../src/ephy-history-window.c:143
+#: ../src/ephy-window.c:113
 msgid "_Close"
 msgstr "關閉(_C)"
 
+#: ../lib/widgets/ephy-download-widget.c:107
+#, c-format
+#| msgid "%u second left"
+#| msgid_plural "%u seconds left"
+msgid "%d second left"
+msgid_plural "%d seconds left"
+msgstr[0] "剩下 %d 秒鐘"
+
+#: ../lib/widgets/ephy-download-widget.c:113
+#, c-format
+#| msgid "%u:%02u minute left"
+#| msgid_plural "%u:%02u minutes left"
+msgid "%d minute left"
+msgid_plural "%d minutes left"
+msgstr[0] "剩下 %d 分鐘"
+
 #: ../lib/widgets/ephy-download-widget.c:119
 #, c-format
-msgid "%u:%02u hour left"
-msgid_plural "%u:%02u hours left"
-msgstr[0] "剩餘 %u:%02u 小時"
+#| msgid "%u hour left"
+#| msgid_plural "%u hours left"
+msgid "%d hour left"
+msgid_plural "%d hours left"
+msgstr[0] "剩下 %d 小時"
 
-#: ../lib/widgets/ephy-download-widget.c:121
+#: ../lib/widgets/ephy-download-widget.c:125
 #, c-format
-msgid "%u hour left"
-msgid_plural "%u hours left"
-msgstr[0] "剩餘 %u 小時"
+#| msgid "%u second left"
+#| msgid_plural "%u seconds left"
+msgid "%d day left"
+msgid_plural "%d days left"
+msgstr[0] "剩下 %d 天"
 
-#: ../lib/widgets/ephy-download-widget.c:124
+#: ../lib/widgets/ephy-download-widget.c:131
 #, c-format
-msgid "%u:%02u minute left"
-msgid_plural "%u:%02u minutes left"
-msgstr[0] "剩餘 %u:%02u 分鐘"
+#| msgid "%u second left"
+#| msgid_plural "%u seconds left"
+msgid "%d week left"
+msgid_plural "%d weeks left"
+msgstr[0] "剩下 %d 週"
 
-#: ../lib/widgets/ephy-download-widget.c:126
+#: ../lib/widgets/ephy-download-widget.c:137
 #, c-format
-msgid "%u second left"
-msgid_plural "%u seconds left"
-msgstr[0] "剩餘 %u 秒鐘"
+#| msgid "%u second left"
+#| msgid_plural "%u seconds left"
+msgid "%d month left"
+msgid_plural "%d months left"
+msgstr[0] "剩下 %d 月"
 
-#: ../lib/widgets/ephy-download-widget.c:296
-#: ../lib/widgets/ephy-download-widget.c:313
+#: ../lib/widgets/ephy-download-widget.c:293
 msgid "Finished"
 msgstr "已完成"
 
-#: ../lib/widgets/ephy-download-widget.c:328
-#: ../lib/widgets/ephy-download-widget.c:346
+#: ../lib/widgets/ephy-download-widget.c:309
 #, c-format
 msgid "Error downloading: %s"
 msgstr "下載時發生錯誤：%s"
 
-#: ../lib/widgets/ephy-download-widget.c:414 ../src/window-commands.c:896
+#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:781
 msgid "Cancel"
 msgstr "取消"
 
-#: ../lib/widgets/ephy-download-widget.c:423 ../src/ephy-window.c:1309
-#: ../src/window-commands.c:280
+#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1170
+#: ../src/window-commands.c:275
 msgid "Open"
 msgstr "開啟"
 
-#: ../lib/widgets/ephy-download-widget.c:429
+#: ../lib/widgets/ephy-download-widget.c:377
 msgid "Show in folder"
 msgstr "在資料夾顯示"
 
-#: ../lib/widgets/ephy-download-widget.c:628
+#: ../lib/widgets/ephy-download-widget.c:586
 msgid "Starting…"
 msgstr "正在開始…"
 
-#: ../lib/widgets/ephy-hosts-store.c:303
+#: ../lib/widgets/ephy-hosts-store.c:246
 msgid "All sites"
 msgstr "所有網站"
 
@@ -1264,33 +1352,32 @@ msgstr "網站"
 #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
 #. * Select All, Input Methods and Insert Unicode control character.)
 #.
-#: ../lib/widgets/ephy-location-entry.c:591
-#: ../src/resources/prefs-dialog.ui.h:34 ../src/ephy-history-window.c:229
-#: ../src/pdm-dialog.c:349
+#: ../lib/widgets/ephy-location-entry.c:618
+#: ../src/resources/prefs-dialog.ui.h:37 ../src/ephy-history-window.c:229
 msgid "Cl_ear"
 msgstr "清除(_E)"
 
 #. Edit actions.
-#: ../lib/widgets/ephy-location-entry.c:610 ../src/ephy-window.c:125
+#: ../lib/widgets/ephy-location-entry.c:637 ../src/ephy-window.c:120
 msgid "_Undo"
 msgstr "復原(_U)"
 
-#: ../lib/widgets/ephy-location-entry.c:617
+#: ../lib/widgets/ephy-location-entry.c:644
 msgid "_Redo"
 msgstr "取消復原(_R)"
 
-#: ../lib/widgets/ephy-location-entry.c:873
+#: ../lib/widgets/ephy-location-entry.c:924
 msgid "Drag and drop this icon to create a link to this page"
 msgstr "拖放這個圖示來建立連至該網頁的連結"
 
 #: ../lib/widgets/ephy-urls-view.c:43
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1698
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1623
 msgid "Title"
 msgstr "標題"
 
 #: ../lib/widgets/ephy-urls-view.c:51
 #: ../src/bookmarks/ephy-bookmarks-editor.c:212
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1709
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1634
 msgid "Address"
 msgstr "地址"
 
@@ -1301,55 +1388,56 @@ msgstr "日期"
 #. Translators: This string is used when counting bookmarks that
 #. * are similar to each other
 #: ../src/bookmarks/ephy-bookmark-properties.c:84
-#: ../src/bookmarks/ephy-bookmark-properties.c:610
+#: ../src/bookmarks/ephy-bookmark-properties.c:611
 #, c-format
 msgid "%d _Similar"
 msgid_plural "%d _Similar"
 msgstr[0] "%d 個相似(_S)"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:256
+#: ../src/bookmarks/ephy-bookmark-properties.c:257
 #, 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:273
-#: ../src/bookmarks/ephy-bookmark-properties.c:295
+#: ../src/bookmarks/ephy-bookmark-properties.c:274
+#: ../src/bookmarks/ephy-bookmark-properties.c:296
 #, c-format
 msgid "Show “%s”"
 msgstr "顯示“%s”"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:420
+#: ../src/bookmarks/ephy-bookmark-properties.c:421
 #, c-format
 msgid "“%s” Properties"
 msgstr "“%s”屬性"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:544
+#: ../src/bookmarks/ephy-bookmark-properties.c:545
 msgid "_Title:"
 msgstr "標題(_T)："
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:561
+#: ../src/bookmarks/ephy-bookmark-properties.c:562
 msgid "A_ddress:"
 msgstr "位址(_D)："
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:573
+#: ../src/bookmarks/ephy-bookmark-properties.c:574
 msgid "T_opics:"
 msgstr "主題(_O)："
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:596
+#: ../src/bookmarks/ephy-bookmark-properties.c:597
 msgid "Sho_w all topics"
 msgstr "顯示所有主題(_W)"
 
 #. Help.
-#: ../src/bookmarks/ephy-bookmark-properties.c:626
+#: ../src/bookmarks/ephy-bookmark-properties.c:627
 #: ../src/bookmarks/ephy-bookmarks-editor.c:154
-#: ../src/resources/epiphany-application-menu.ui.h:8
-#: ../src/ephy-history-window.c:130 ../src/ephy-window.c:197
-#: ../src/pdm-dialog.c:341
+#: ../src/resources/epiphany-application-menu.ui.h:7
+#: ../src/ephy-history-window.c:130 ../src/ephy-window.c:190
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:642
+#: ../src/bookmarks/ephy-bookmark-properties.c:643
+#: ../src/resources/prefs-dialog.ui.h:42
+#: ../src/resources/prefs-lang-dialog.ui.h:3
 msgid "_Add"
 msgstr "加入(_A)"
 
@@ -1378,33 +1466,33 @@ msgid "Work"
 msgstr "工作"
 
 #. Translators: this topic contains all bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:945
+#: ../src/bookmarks/ephy-bookmarks.c:926
 msgctxt "bookmarks"
 msgid "All"
 msgstr "全部"
 
 #. Translators: this topic contains the not categorized
 #. bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:949
+#: ../src/bookmarks/ephy-bookmarks.c:930
 msgctxt "bookmarks"
 msgid "Not Categorized"
 msgstr "未分類"
 
 #. Translators: this is an automatic topic containing local
 #. * websites bookmarks autodiscovered with zeroconf.
-#: ../src/bookmarks/ephy-bookmarks.c:953
+#: ../src/bookmarks/ephy-bookmarks.c:934
 msgctxt "bookmarks"
 msgid "Nearby Sites"
 msgstr "本地網站"
 
-#: ../src/bookmarks/ephy-bookmarks.c:1167
+#: ../src/bookmarks/ephy-bookmarks.c:1148
 #: ../src/bookmarks/ephy-bookmarks-import.c:270
 msgid "Untitled"
 msgstr "未命名"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:75
-msgid "Epiphany (RDF)"
-msgstr "Epiphany (RDF)"
+msgid "Web (RDF)"
+msgstr "Web (RDF)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:76
 msgid "Mozilla (HTML)"
@@ -1500,7 +1588,7 @@ msgstr "關閉書籤視窗"
 
 #. Edit Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:183
-#: ../src/ephy-history-window.c:148 ../src/ephy-window.c:129
+#: ../src/ephy-history-window.c:148 ../src/ephy-window.c:124
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
@@ -1512,7 +1600,7 @@ msgstr "剪下選定的內容"
 #: ../src/bookmarks/ephy-bookmarks-editor.c:186
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1171
 #: ../src/ephy-history-window.c:151 ../src/ephy-history-window.c:649
-#: ../src/ephy-window.c:131
+#: ../src/ephy-window.c:126
 msgid "_Copy"
 msgstr "複製(_C)"
 
@@ -1522,7 +1610,7 @@ msgid "Copy the selection"
 msgstr "複製選定的內容"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:189
-#: ../src/ephy-history-window.c:154 ../src/ephy-window.c:133
+#: ../src/ephy-history-window.c:154 ../src/ephy-window.c:128
 msgid "_Paste"
 msgstr "貼上(_P)"
 
@@ -1541,7 +1629,7 @@ msgid "Delete the selected bookmark or topic"
 msgstr "刪除已選的書籤或主題"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:195
-#: ../src/ephy-history-window.c:160 ../src/ephy-window.c:137
+#: ../src/ephy-history-window.c:160 ../src/ephy-window.c:132
 msgid "Select _All"
 msgstr "全部選取(_A)"
 
@@ -1560,8 +1648,8 @@ msgid "Display bookmarks help"
 msgstr "顯示書籤說明文件"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:203
-#: ../src/resources/epiphany-application-menu.ui.h:9
-#: ../src/ephy-history-window.c:171 ../src/ephy-window.c:199
+#: ../src/resources/epiphany-application-menu.ui.h:8
+#: ../src/ephy-history-window.c:171 ../src/ephy-window.c:192
 msgid "_About"
 msgstr "關於(_A)"
 
@@ -1662,15 +1750,15 @@ msgid "Galeon/Konqueror bookmarks"
 msgstr "Galeon/Konqueror 書籤"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:629
-msgid "Epiphany bookmarks"
-msgstr "Epiphany 書籤"
+msgid "Web bookmarks"
+msgstr "Web 書籤"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:753
 msgid "Export Bookmarks"
 msgstr "匯出書籤"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:760
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1572
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1497
 #: ../src/bookmarks/ephy-topic-action.c:217
 msgid "Bookmarks"
 msgstr "書籤"
@@ -1701,7 +1789,7 @@ msgstr "檔案"
 msgid "_Copy Address"
 msgstr "複製位址(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1628
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1553
 msgid "Topics"
 msgstr "主題"
 
@@ -1719,12 +1807,68 @@ msgstr "在新的分頁中開啟本主日題的書籤"
 msgid "Create topic “%s”"
 msgstr "建立主題“%s”"
 
+#: ../src/resources/clear-data-dialog.ui.h:1
+msgid "Clear Personal Data"
+msgstr "清除個人資料"
+
+#: ../src/resources/clear-data-dialog.ui.h:3
+msgid "C_lear"
+msgstr "清除(_L)"
+
+#: ../src/resources/clear-data-dialog.ui.h:4
+msgid "Select the personal data you wish to clear"
+msgstr "選擇你想要清除的個人資料"
+
+#: ../src/resources/clear-data-dialog.ui.h:5
+msgid ""
+"You are about to clear personal data that is stored about the web pages you "
+"have visited. Check the types of information that you want to remove:"
+msgstr "你即將清除用來儲存你瀏覽過的網頁的個人資料。請檢查你想要移除的資訊類型："
+
+#: ../src/resources/clear-data-dialog.ui.h:6
+#: ../src/resources/cookies-dialog.ui.h:1
+#: ../src/resources/prefs-dialog.ui.h:22
+msgid "Cookies"
+msgstr "Cookie"
+
+#: ../src/resources/clear-data-dialog.ui.h:7
+msgid "Cache and temporary files"
+msgstr "快取與暫存檔"
+
+#: ../src/resources/clear-data-dialog.ui.h:8
+msgid "Browsing history"
+msgstr "瀏覽記錄"
+
+#: ../src/resources/clear-data-dialog.ui.h:9
+msgid "Saved passwords"
+msgstr "已儲存的密碼"
+
+#: ../src/resources/clear-data-dialog.ui.h:10
+msgid ""
+"You cannot undo this action. The data you are choosing to clear will be "
+"removed forever."
+msgstr "你不可以將這個動作復原。你選擇要清除的資料會永遠移除。"
+
+#: ../src/resources/cookies-dialog.ui.h:2
+#: ../src/resources/passwords-dialog.ui.h:2
+msgid "C_lear All"
+msgstr "全部清除(_L)"
+
+#: ../src/resources/cookies-dialog.ui.h:4
+#: ../src/resources/passwords-dialog.ui.h:5
+msgid "Site"
+msgstr "網站"
+
+#: ../src/resources/cookies-dialog.ui.h:5
+msgid "Remove"
+msgstr "移除"
+
 #. File actions.
-#: ../src/resources/epiphany-application-menu.ui.h:1 ../src/ephy-window.c:104
+#: ../src/resources/epiphany-application-menu.ui.h:1 ../src/ephy-window.c:99
 msgid "_New Window"
 msgstr "新視窗(_N)"
 
-#: ../src/resources/epiphany-application-menu.ui.h:2 ../src/ephy-window.c:106
+#: ../src/resources/epiphany-application-menu.ui.h:2 ../src/ephy-window.c:101
 msgid "New _Incognito Window"
 msgstr "新增隱密視窗(_I)"
 
@@ -1733,219 +1877,232 @@ msgid "Reopen Closed _Tab"
 msgstr "重新開啟關閉的分頁(_T)"
 
 #. Toplevel
-#: ../src/resources/epiphany-application-menu.ui.h:4 ../src/ephy-window.c:97
+#: ../src/resources/epiphany-application-menu.ui.h:4 ../src/ephy-window.c:92
 msgid "_Bookmarks"
 msgstr "書籤(_B)"
 
-#: ../src/resources/epiphany-application-menu.ui.h:5 ../src/ephy-window.c:147
+#: ../src/resources/epiphany-application-menu.ui.h:5 ../src/ephy-window.c:142
 msgid "_History"
 msgstr "瀏覽記錄(_H)"
 
-#: ../src/resources/epiphany-application-menu.ui.h:6 ../src/ephy-window.c:151
-msgid "_Personal Data"
-msgstr "個人資料(_P)"
-
-#: ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:149
+#: ../src/resources/epiphany-application-menu.ui.h:6 ../src/ephy-window.c:144
 msgid "Pr_eferences"
 msgstr "偏好設定(_E)"
 
-#: ../src/resources/epiphany-application-menu.ui.h:10 ../src/ephy-window.c:120
+#: ../src/resources/epiphany-application-menu.ui.h:9 ../src/ephy-window.c:115
 msgid "_Quit"
 msgstr "結束(_Q)"
 
 #: ../src/resources/epiphany.ui.h:1
-msgid "Cookie properties"
-msgstr "Cookie 屬性"
-
-#: ../src/resources/epiphany.ui.h:2
-msgid "Content:"
-msgstr "內容"
-
-#: ../src/resources/epiphany.ui.h:3
-msgid "Path:"
-msgstr "路徑："
-
-#: ../src/resources/epiphany.ui.h:4
-msgid "Send for:"
-msgstr "傳送給："
-
-#: ../src/resources/epiphany.ui.h:5
-msgid "Expires:"
-msgstr "時限："
-
-#: ../src/resources/epiphany.ui.h:6
 msgid "Text Encoding"
 msgstr "字符編碼"
 
-#: ../src/resources/epiphany.ui.h:7
-msgid "<b>_Automatic</b>"
-msgstr "<b>自動(_A)：</b>"
+#: ../src/resources/epiphany.ui.h:3 ../src/ephy-encoding-menu.c:327
+msgid "_Automatic"
+msgstr "自動(_A)"
 
-#: ../src/resources/epiphany.ui.h:8 ../src/ephy-encoding-menu.c:349
+#: ../src/resources/epiphany.ui.h:4 ../src/ephy-encoding-menu.c:328
 msgid "Use the encoding specified by the document"
 msgstr "使用文件指定的編碼方式"
 
-#: ../src/resources/epiphany.ui.h:9
-msgid "<b>_Use a different encoding:</b>"
-msgstr "使用不同的編碼(_U)："
+#: ../src/resources/epiphany.ui.h:5
+msgid "_Use a different encoding:"
+msgstr "使用不同的編碼方式(_U):"
 
-#: ../src/resources/epiphany.ui.h:10
-msgid "Personal Data"
-msgstr "個人資料"
+#: ../src/resources/passwords-dialog.ui.h:1
+#: ../src/resources/prefs-dialog.ui.h:31
+msgid "Passwords"
+msgstr "密碼"
 
-#: ../src/resources/epiphany.ui.h:11 ../src/resources/prefs-dialog.ui.h:21
-msgid "Cookies"
-msgstr "Cookie"
+#: ../src/resources/passwords-dialog.ui.h:4
+msgid "Search passwords"
+msgstr "搜尋密碼"
 
-#: ../src/resources/epiphany.ui.h:12
-msgid "_Show passwords"
-msgstr "顯示密碼(_S)"
+#: ../src/resources/passwords-dialog.ui.h:6
+msgid "User Name"
+msgstr "使用者名稱"
 
-#: ../src/resources/epiphany.ui.h:13 ../src/resources/prefs-dialog.ui.h:29
-msgid "Passwords"
+#: ../src/resources/passwords-dialog.ui.h:7
+msgid "Password"
 msgstr "密碼"
 
-#: ../src/resources/prefs-dialog.ui.h:1
-msgid "Add Language"
-msgstr "增加語言"
+#: ../src/resources/passwords-dialog.ui.h:8
+msgid "_Copy Password"
+msgstr "複製密碼(_C)"
 
-#: ../src/resources/prefs-dialog.ui.h:2
-msgid "Choose a l_anguage:"
-msgstr "選擇語言(_A)："
+#: ../src/resources/passwords-dialog.ui.h:9
+msgid "C_opy Username"
+msgstr "複製使用者名稱(_O)"
 
-#: ../src/resources/prefs-dialog.ui.h:3
+#: ../src/resources/prefs-dialog.ui.h:1
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../src/resources/prefs-dialog.ui.h:5
+#: ../src/resources/prefs-dialog.ui.h:4
 msgid "_Download folder:"
 msgstr "下載資料夾(_D)"
 
-#: ../src/resources/prefs-dialog.ui.h:6
+#: ../src/resources/prefs-dialog.ui.h:5
 msgid "A_utomatically open downloaded files"
 msgstr "自動下載並開啟檔案(_U)"
 
+#: ../src/resources/prefs-dialog.ui.h:6
+msgid "Search"
+msgstr "搜尋"
+
 #: ../src/resources/prefs-dialog.ui.h:7
+msgid "_Engine:"
+msgstr "引擎(_E):"
+
+#: ../src/resources/prefs-dialog.ui.h:8
 msgid "Web Content"
 msgstr "網頁內容"
 
-#: ../src/resources/prefs-dialog.ui.h:8
+#: ../src/resources/prefs-dialog.ui.h:9
 msgid "Allow popup _windows"
 msgstr "允許彈出式視窗(_W)"
 
-#: ../src/resources/prefs-dialog.ui.h:9
+#: ../src/resources/prefs-dialog.ui.h:10
 msgid "Allow _advertisements"
 msgstr "允許廣告(_A)"
 
-#: ../src/resources/prefs-dialog.ui.h:10
+#: ../src/resources/prefs-dialog.ui.h:11
 msgid "Enable _plugins"
 msgstr "啟用外掛程式(_P)"
 
-#: ../src/resources/prefs-dialog.ui.h:11
+#: ../src/resources/prefs-dialog.ui.h:12
 msgid "General"
 msgstr "一般"
 
-#: ../src/resources/prefs-dialog.ui.h:12
+#: ../src/resources/prefs-dialog.ui.h:13
 msgid "Fonts"
 msgstr "字型"
 
-#: ../src/resources/prefs-dialog.ui.h:13
+#: ../src/resources/prefs-dialog.ui.h:14
 msgid "_Use system fonts"
 msgstr "使用系統字型(_U)"
 
-#: ../src/resources/prefs-dialog.ui.h:14
+#: ../src/resources/prefs-dialog.ui.h:15
 msgid "Sans serif font:"
 msgstr "無襯線字型："
 
-#: ../src/resources/prefs-dialog.ui.h:15
+#: ../src/resources/prefs-dialog.ui.h:16
 msgid "Serif font:"
 msgstr "襯線字型："
 
-#: ../src/resources/prefs-dialog.ui.h:16
+#: ../src/resources/prefs-dialog.ui.h:17
 msgid "Monospace font:"
 msgstr "等寬字型："
 
-#: ../src/resources/prefs-dialog.ui.h:17
+#: ../src/resources/prefs-dialog.ui.h:18
 msgid "Style"
 msgstr "樣式"
 
-#: ../src/resources/prefs-dialog.ui.h:18
+#: ../src/resources/prefs-dialog.ui.h:19
 msgid "Use custom _stylesheet"
 msgstr "使用自選樣式表(_S)"
 
-#: ../src/resources/prefs-dialog.ui.h:19
+#: ../src/resources/prefs-dialog.ui.h:20
 msgid "_Edit Stylesheet…"
 msgstr "編輯樣式表(_E)…"
 
-#: ../src/resources/prefs-dialog.ui.h:20
+#: ../src/resources/prefs-dialog.ui.h:21
 msgid "Fonts & Style"
 msgstr "字型與樣式"
 
-#: ../src/resources/prefs-dialog.ui.h:22
+#: ../src/resources/prefs-dialog.ui.h:23
+msgid "Manage Cookies"
+msgstr "管理 Cookies"
+
+#: ../src/resources/prefs-dialog.ui.h:24
 msgid "_Always accept"
 msgstr "總是接受(_A)"
 
-#: ../src/resources/prefs-dialog.ui.h:23
+#: ../src/resources/prefs-dialog.ui.h:25
 msgid "Only _from sites you visit"
 msgstr "只來自你瀏覽的網站(_F)"
 
 #. Refers to "Only from sites you visit" option under Cookies.
-#: ../src/resources/prefs-dialog.ui.h:25
+#: ../src/resources/prefs-dialog.ui.h:27
 msgid "<small>For example, not from advertisers on these sites</small>"
 msgstr "<small>例如，不要來自這些網站的廣告</small>"
 
-#: ../src/resources/prefs-dialog.ui.h:26
+#: ../src/resources/prefs-dialog.ui.h:28
 msgid "_Never accept"
 msgstr "永不接受(_N)"
 
-#: ../src/resources/prefs-dialog.ui.h:27
+#: ../src/resources/prefs-dialog.ui.h:29
 msgid "Tracking"
 msgstr "追蹤"
 
-#: ../src/resources/prefs-dialog.ui.h:28
+#: ../src/resources/prefs-dialog.ui.h:30
 msgid "_Tell web sites I do not want to be tracked"
 msgstr "告訴網站我不想被追蹤(_T)"
 
-#: ../src/resources/prefs-dialog.ui.h:30
+#: ../src/resources/prefs-dialog.ui.h:32
+msgid "Manage Passwords"
+msgstr "管理密碼"
+
+#: ../src/resources/prefs-dialog.ui.h:33
 msgid "_Remember passwords"
 msgstr "記錄密碼(_R)"
 
-#: ../src/resources/prefs-dialog.ui.h:31
+#: ../src/resources/prefs-dialog.ui.h:34
 msgid "Temporary Files"
 msgstr "暫存檔"
 
-#: ../src/resources/prefs-dialog.ui.h:32
+#: ../src/resources/prefs-dialog.ui.h:35
 msgid "_Disk space:"
 msgstr "磁碟空間(_D)："
 
-#: ../src/resources/prefs-dialog.ui.h:33
+#: ../src/resources/prefs-dialog.ui.h:36
 msgid "MB"
 msgstr "MB"
 
-#: ../src/resources/prefs-dialog.ui.h:35
+#: ../src/resources/prefs-dialog.ui.h:38
 msgid "Privacy"
 msgstr "私隱"
 
-#: ../src/resources/prefs-dialog.ui.h:36 ../src/ephy-encoding-dialog.c:416
+#: ../src/resources/prefs-dialog.ui.h:39 ../src/ephy-encoding-dialog.c:379
 msgid "Encodings"
 msgstr "編碼"
 
-#: ../src/resources/prefs-dialog.ui.h:37
+#: ../src/resources/prefs-dialog.ui.h:40
 msgid "De_fault:"
 msgstr "預設(_F)："
 
-#: ../src/resources/prefs-dialog.ui.h:39
+#: ../src/resources/prefs-dialog.ui.h:43
+msgid "_Remove"
+msgstr "移除(_R)"
+
+#: ../src/resources/prefs-dialog.ui.h:44
+msgid "_Up"
+msgstr "上(_U)"
+
+#: ../src/resources/prefs-dialog.ui.h:45
+msgid "_Down"
+msgstr "下(_D)"
+
+#: ../src/resources/prefs-dialog.ui.h:46
 msgid "Spell checking"
 msgstr "拼字檢查"
 
-#: ../src/resources/prefs-dialog.ui.h:40
+#: ../src/resources/prefs-dialog.ui.h:47
 msgid "_Enable spell checking"
 msgstr "啟用拼字檢查(_E)"
 
-#: ../src/resources/prefs-dialog.ui.h:41 ../src/prefs-dialog.c:755
+#: ../src/resources/prefs-dialog.ui.h:48 ../src/prefs-dialog.c:835
 msgid "Language"
 msgstr "語言"
 
+#: ../src/resources/prefs-lang-dialog.ui.h:1
+msgid "Add Language"
+msgstr "增加語言"
+
+#: ../src/resources/prefs-lang-dialog.ui.h:4
+msgid "Choose a l_anguage:"
+msgstr "選擇語言(_A)："
+
 #: ../src/ephy-combined-stop-reload-action.c:41
 msgid "Stop"
 msgstr "停止"
@@ -1954,7 +2111,7 @@ msgstr "停止"
 msgid "Stop current data transfer"
 msgstr "停止傳送目前的資料"
 
-#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:160
+#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:153
 msgid "_Reload"
 msgstr "重新載入(_R)"
 
@@ -1962,38 +2119,14 @@ msgstr "重新載入(_R)"
 msgid "Display the latest content of the current page"
 msgstr "顯示本頁的最新內容"
 
-#: ../src/ephy-encoding-menu.c:341
+#: ../src/ephy-encoding-menu.c:320
 msgid "_Other…"
 msgstr "其它(_O)…"
 
-#: ../src/ephy-encoding-menu.c:342
+#: ../src/ephy-encoding-menu.c:321
 msgid "Other encodings"
 msgstr "其他字符編碼方式"
 
-#: ../src/ephy-encoding-menu.c:348
-msgid "_Automatic"
-msgstr "自動(_A)"
-
-#: ../src/ephy-find-toolbar.c:148
-msgid "Text not found"
-msgstr "找不到文字"
-
-#: ../src/ephy-find-toolbar.c:155
-msgid "Search wrapped back to the top"
-msgstr "搜尋至結尾後返回開頭"
-
-#: ../src/ephy-find-toolbar.c:579
-msgid "Type to search…"
-msgstr "輸入以搜尋…"
-
-#: ../src/ephy-find-toolbar.c:585
-msgid "Find previous occurrence of the search string"
-msgstr "尋找上一個出現搜尋字串的地方"
-
-#: ../src/ephy-find-toolbar.c:593
-msgid "Find next occurrence of the search string"
-msgstr "尋找下一個出現搜尋字串的地方"
-
 #: ../src/ephy-history-window.c:135
 msgid "Open the selected history link in a new window"
 msgstr "在新的視窗中開啟已選的瀏覽記錄連結"
@@ -2081,75 +2214,71 @@ msgstr[0] "最近 %d 日"
 msgid "All history"
 msgstr "所有瀏覽記錄"
 
-#: ../src/ephy-history-window.c:1113
+#: ../src/ephy-history-window.c:1107
 msgid "History"
 msgstr "瀏覽記錄"
 
-#: ../src/ephy-main.c:77
+#: ../src/ephy-main.c:76
 msgid "Open a new tab in an existing browser window"
 msgstr "在現有的瀏覽器視窗中開啟新的分頁"
 
-#: ../src/ephy-main.c:79
+#: ../src/ephy-main.c:78
 msgid "Open a new browser window"
 msgstr "開啟新的瀏覽器視窗"
 
-#: ../src/ephy-main.c:81
+#: ../src/ephy-main.c:80
 msgid "Import bookmarks from the given file"
 msgstr "從所指定的檔案匯入書籤"
 
-#: ../src/ephy-main.c:81 ../src/ephy-main.c:83
+#: ../src/ephy-main.c:80 ../src/ephy-main.c:82
 msgid "FILE"
 msgstr "檔案"
 
-#: ../src/ephy-main.c:83
+#: ../src/ephy-main.c:82
 msgid "Load the given session file"
 msgstr "載入指定的作業階段檔案"
 
-#: ../src/ephy-main.c:85
+#: ../src/ephy-main.c:84
 msgid "Add a bookmark"
 msgstr "加入書籤"
 
-#: ../src/ephy-main.c:85
+#: ../src/ephy-main.c:84
 msgid "URL"
 msgstr "URL"
 
-#: ../src/ephy-main.c:87
+#: ../src/ephy-main.c:86
 msgid "Start a private instance"
 msgstr "啟動私密實體"
 
-#: ../src/ephy-main.c:89
+#: ../src/ephy-main.c:88
 msgid "Start an instance in incognito mode"
 msgstr "以隱密模式啟動瀏覽器"
 
-#: ../src/ephy-main.c:91
+#: ../src/ephy-main.c:90
 msgid "Start an instance in netbank mode"
 msgstr "以網絡銀行模式啟動瀏覽器"
 
-#: ../src/ephy-main.c:93
+#: ../src/ephy-main.c:92
 msgid "Start the browser in application mode"
 msgstr "以應用程式模式啟動瀏覽器"
 
-#: ../src/ephy-main.c:95
-msgid "Start the application without opening windows"
-msgstr "不開啟視窗而啟動應用程式"
-
-#: ../src/ephy-main.c:97
+#: ../src/ephy-main.c:94
 msgid "Profile directory to use in the private instance"
 msgstr "在私密實體中使用的設定組合目錄"
 
-#: ../src/ephy-main.c:97
+#: ../src/ephy-main.c:94
 msgid "DIR"
 msgstr "DIR"
 
-#: ../src/ephy-main.c:99
+#: ../src/ephy-main.c:96
 msgid "URL …"
 msgstr "URL…"
 
-#: ../src/ephy-main.c:204
+#: ../src/ephy-main.c:201
 msgid "Could not start Web"
 msgstr "無法啟動網頁"
 
-#: ../src/ephy-main.c:207
+#: ../src/ephy-main.c:204
 #, c-format
 msgid ""
 "Startup failed because of the following error:\n"
@@ -2158,357 +2287,262 @@ msgstr ""
 "由於以下原因，因此無法執行：\n"
 "%s"
 
-#: ../src/ephy-main.c:321
+#: ../src/ephy-main.c:315
 msgid "Web options"
 msgstr "網頁選項"
 
-#: ../src/ephy-notebook.c:599
+#: ../src/ephy-notebook.c:602
 msgid "Close tab"
 msgstr "關閉分頁"
 
-#: ../src/ephy-search-provider.c:202
+#: ../src/ephy-search-provider.c:199
 #, c-format
 msgid "Search the Web for %s"
 msgstr "在網絡搜尋 %s"
 
-#: ../src/ephy-window.c:108
+#: ../src/ephy-window.c:103
 msgid "_Open…"
 msgstr "開啟(_O)…"
 
-#: ../src/ephy-window.c:110
+#: ../src/ephy-window.c:105
 msgid "Save _As…"
 msgstr "另存新檔(_A)…"
 
-#: ../src/ephy-window.c:112
+#: ../src/ephy-window.c:107
 msgid "Save As _Web Application…"
 msgstr "儲存為網頁應用程式(_W)…"
 
-#: ../src/ephy-window.c:114
+#: ../src/ephy-window.c:109
 msgid "_Print…"
 msgstr "打印(_P)…"
 
-#: ../src/ephy-window.c:116
+#: ../src/ephy-window.c:111
 msgid "S_end Link by Email…"
 msgstr "以電郵傳送連結(_E)…"
 
-#: ../src/ephy-window.c:127
+#: ../src/ephy-window.c:122
 msgid "Re_do"
 msgstr "取消復原(_D)"
 
-#: ../src/ephy-window.c:139
+#: ../src/ephy-window.c:134
 msgid "_Find…"
 msgstr "尋找(_F)…"
 
-#: ../src/ephy-window.c:141
+#: ../src/ephy-window.c:136
 msgid "Find Ne_xt"
 msgstr "找下一個(_X)"
 
-#: ../src/ephy-window.c:143
+#: ../src/ephy-window.c:138
 msgid "Find Pre_vious"
 msgstr "找上一個(_V)"
 
-#: ../src/ephy-window.c:145
+#: ../src/ephy-window.c:140
 msgid "Edit _Bookmarks"
 msgstr "編輯書籤(_B)"
 
 #. View actions.
-#: ../src/ephy-window.c:156 ../src/ephy-window.c:158
+#: ../src/ephy-window.c:149 ../src/ephy-window.c:151
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: ../src/ephy-window.c:162
+#: ../src/ephy-window.c:155
 msgid "Zoom _In"
 msgstr "拉近(_I)"
 
-#: ../src/ephy-window.c:164
+#: ../src/ephy-window.c:157
 msgid "Zoom O_ut"
 msgstr "拉遠(_U)"
 
-#: ../src/ephy-window.c:166
+#: ../src/ephy-window.c:159
 msgid "_Normal Size"
 msgstr "正常大小(_N)"
 
-#: ../src/ephy-window.c:168
+#: ../src/ephy-window.c:161
 msgid "Text _Encoding"
 msgstr "字符編碼(_E)"
 
-#: ../src/ephy-window.c:169
+#: ../src/ephy-window.c:162
 msgid "_Page Source"
 msgstr "網頁原始內容(_P)"
 
 #. Bookmarks actions.
-#: ../src/ephy-window.c:174
+#: ../src/ephy-window.c:167
 msgid "_Add Bookmark…"
 msgstr "加入書籤(_A)…"
 
 #. Go actions.
-#: ../src/ephy-window.c:179
+#: ../src/ephy-window.c:172
 msgid "_Location…"
 msgstr "位置(_L)…"
 
 #. Tabs actions.
-#: ../src/ephy-window.c:184
+#: ../src/ephy-window.c:177
 msgid "_Previous Tab"
 msgstr "上一個分頁(_P)"
 
-#: ../src/ephy-window.c:186
+#: ../src/ephy-window.c:179
 msgid "_Next Tab"
 msgstr "下一個分頁(_N)"
 
-#: ../src/ephy-window.c:188
+#: ../src/ephy-window.c:181
 msgid "Move Tab _Left"
 msgstr "分頁向左移(_L)"
 
-#: ../src/ephy-window.c:190
+#: ../src/ephy-window.c:183
 msgid "Move Tab _Right"
 msgstr "分頁向右移(_R)"
 
-#: ../src/ephy-window.c:192
+#: ../src/ephy-window.c:185
 msgid "_Detach Tab"
 msgstr "分離分頁(_D)"
 
 #. View actions.
-#: ../src/ephy-window.c:207
+#: ../src/ephy-window.c:200
 msgid "_Downloads Bar"
 msgstr "下載列(_D)"
 
-#: ../src/ephy-window.c:210
+#: ../src/ephy-window.c:203
 msgid "_Fullscreen"
 msgstr "全螢幕(_F)"
 
-#: ../src/ephy-window.c:212
+#: ../src/ephy-window.c:205
 msgid "Popup _Windows"
 msgstr "彈出式視窗(_W)"
 
-#: ../src/ephy-window.c:214
+#: ../src/ephy-window.c:207
 msgid "Selection Caret"
 msgstr "選擇游標"
 
 #. Document.
-#: ../src/ephy-window.c:221
+#: ../src/ephy-window.c:214
 msgid "Add Boo_kmark…"
 msgstr "加入書籤(_K)…"
 
 #. Links.
-#: ../src/ephy-window.c:226
-msgid "_Open Link"
-msgstr "開啟連結(_O)"
-
-#: ../src/ephy-window.c:228
+#: ../src/ephy-window.c:219
 msgid "Open Link in New _Window"
 msgstr "在新的視窗中開啟連結(_W)"
 
-#: ../src/ephy-window.c:230
+#: ../src/ephy-window.c:221
 msgid "Open Link in New _Tab"
 msgstr "在新的分頁中開啟連結(_T)"
 
-#: ../src/ephy-window.c:232
-msgid "_Download Link"
-msgstr "下載連結(_D)"
-
-#: ../src/ephy-window.c:234
+#: ../src/ephy-window.c:223
 msgid "_Save Link As…"
 msgstr "另存連結(_S)…"
 
-#: ../src/ephy-window.c:236
-msgid "_Bookmark Link…"
-msgstr "將連結加入書籤(_B)…"
-
-#: ../src/ephy-window.c:238
+#: ../src/ephy-window.c:225
 msgid "_Copy Link Address"
 msgstr "複製連結地址(_C)"
 
-#: ../src/ephy-window.c:240
+#: ../src/ephy-window.c:227
 msgid "_Copy E-mail Address"
 msgstr "複製電子郵件位址(_C)"
 
 #. Images.
-#: ../src/ephy-window.c:245
-msgid "Open _Image"
-msgstr "開啟圖片(_I)"
+#: ../src/ephy-window.c:232
+msgid "View _Image"
+msgstr "檢視圖片(_I)"
 
-#: ../src/ephy-window.c:247
+#: ../src/ephy-window.c:234
+msgid "Copy I_mage Address"
+msgstr "複製圖片地址(_M)"
+
+#: ../src/ephy-window.c:236
 msgid "_Save Image As…"
 msgstr "另存圖片(_S)…"
 
-#: ../src/ephy-window.c:249
-msgid "_Use Image As Background"
-msgstr "使用圖片作為桌面背景(_U)"
-
-#: ../src/ephy-window.c:251
-msgid "Copy I_mage Address"
-msgstr "複製圖片地址(_M)"
+#: ../src/ephy-window.c:238
+msgid "Set as _Wallpaper"
+msgstr "設為桌布(_W)"
 
-#: ../src/ephy-window.c:253
+#: ../src/ephy-window.c:240
 msgid "St_art Animation"
 msgstr "動畫開始(_A)"
 
-#: ../src/ephy-window.c:255
+#: ../src/ephy-window.c:242
 msgid "St_op Animation"
 msgstr "動畫停止(_O)"
 
-#. Inspector.
-#: ../src/ephy-window.c:271
-msgid "Inspect _Element"
-msgstr "檢查元素(_E)"
-
-#: ../src/ephy-window.c:478
+#: ../src/ephy-window.c:450
 msgid "There are unsubmitted changes to form elements"
 msgstr "對表單的元素而言沒有經確認的改變"
 
-#: ../src/ephy-window.c:479
+#: ../src/ephy-window.c:451
 msgid "If you close the document anyway, you will lose that information."
 msgstr "如果你無論無何要關閉此文件，你將會失去未儲存的資訊。"
 
-#: ../src/ephy-window.c:481
+#: ../src/ephy-window.c:453
 msgid "Close _Document"
 msgstr "關閉文件(_D)"
 
-#: ../src/ephy-window.c:496
+#: ../src/ephy-window.c:468
 msgid "There are ongoing downloads in this window"
 msgstr "這個視窗還有進行中的下載"
 
-#: ../src/ephy-window.c:497
+#: ../src/ephy-window.c:469
 msgid "If you close this window, the downloads will be cancelled"
 msgstr "如果你關閉這個視窗，這個下載也會被取消"
 
-#: ../src/ephy-window.c:498
+#: ../src/ephy-window.c:470
 msgid "Close window and cancel downloads"
 msgstr "關閉視窗並取消下載"
 
-#: ../src/ephy-window.c:1311
+#: ../src/ephy-window.c:1172
 msgid "Save As"
 msgstr "另存新檔"
 
-#: ../src/ephy-window.c:1313
+#: ../src/ephy-window.c:1174
 msgid "Save As Application"
 msgstr "儲存為應用程式"
 
-#: ../src/ephy-window.c:1315
+#: ../src/ephy-window.c:1176
 msgid "Print"
 msgstr "列印"
 
-#: ../src/ephy-window.c:1317
+#: ../src/ephy-window.c:1178
 msgid "Bookmark"
 msgstr "加入書籤"
 
-#: ../src/ephy-window.c:1319
+#: ../src/ephy-window.c:1180
 msgid "Find"
 msgstr "尋找"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1328
+#: ../src/ephy-window.c:1189
 msgid "Larger"
 msgstr "放大"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1331
+#: ../src/ephy-window.c:1192
 msgid "Smaller"
 msgstr "縮小"
 
-#: ../src/ephy-window.c:1359
+#: ../src/ephy-window.c:1220
 msgid "Back"
 msgstr "上一頁"
 
-#: ../src/ephy-window.c:1371
+#: ../src/ephy-window.c:1232
 msgid "Forward"
 msgstr "下一頁"
 
-#: ../src/ephy-window.c:1383
+#: ../src/ephy-window.c:1244
 msgid "Zoom"
 msgstr "縮放"
 
-#: ../src/ephy-window.c:1392
+#: ../src/ephy-window.c:1253
 msgid "New _Tab"
 msgstr "新增分頁(_T)"
 
-#: ../src/ephy-window.c:1400
+#: ../src/ephy-window.c:1261
 msgid "Go to most visited"
 msgstr "移至最常瀏覽"
 
-#: ../src/pdm-dialog.c:330
-msgid "<b>Select the personal data you want to clear</b>"
-msgstr "<b>選擇想要清除的個人資料</b>"
-
-#: ../src/pdm-dialog.c:333
-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:338
-msgid "Clear All Personal Data"
-msgstr "清除所有的個人資料"
-
-#. Cookies
-#: ../src/pdm-dialog.c:370
-msgid "C_ookies"
-msgstr "C_ookies"
-
-#. Passwords
-#: ../src/pdm-dialog.c:382
-msgid "Saved _passwords"
-msgstr "儲存的密碼(_P)"
-
-#. History
-#: ../src/pdm-dialog.c:394
-msgid "Hi_story"
-msgstr "歷史記錄(_S)"
-
-#. Cache
-#: ../src/pdm-dialog.c:406
-msgid "_Temporary files"
-msgstr "暫存檔案(_T)"
-
-#: ../src/pdm-dialog.c:422
-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:645
-msgid "Encrypted connections only"
-msgstr "只限加密後的連線"
-
-#: ../src/pdm-dialog.c:646
-msgid "Any type of connection"
-msgstr "任何類型的連線"
-
-#. Session cookie
-#: ../src/pdm-dialog.c:651
-msgid "End of current session"
-msgstr "結束目前的作業階段"
-
-#: ../src/pdm-dialog.c:775
-msgid "Domain"
-msgstr "網域"
-
-#: ../src/pdm-dialog.c:787
-msgid "Name"
-msgstr "名稱"
-
-#: ../src/pdm-dialog.c:1305
-msgid "Host"
-msgstr "主機"
-
-#: ../src/pdm-dialog.c:1318
-msgid "User Name"
-msgstr "使用者名稱"
-
-#: ../src/pdm-dialog.c:1331
-msgid "User Password"
-msgstr "使用者密碼"
-
-#: ../src/popup-commands.c:321
-msgid "Download Link"
-msgstr "下載連結"
-
-#: ../src/popup-commands.c:329
+#: ../src/popup-commands.c:234
 msgid "Save Link As"
 msgstr "另存連結(_A)…"
 
-#: ../src/popup-commands.c:336
+#: ../src/popup-commands.c:240
 msgid "Save Image As"
 msgstr "另存圖片"
 
@@ -2516,7 +2550,7 @@ msgstr "另存圖片"
 #. * second %s is the locale name. Example:
 #. * "French (France)"
 #.
-#: ../src/prefs-dialog.c:449 ../src/prefs-dialog.c:455
+#: ../src/prefs-dialog.c:549 ../src/prefs-dialog.c:555
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -2525,101 +2559,111 @@ msgstr "%s (%s)"
 #. Translators: this refers to a user-define language code
 #. * (one which isn't in our built-in list).
 #.
-#: ../src/prefs-dialog.c:464
+#: ../src/prefs-dialog.c:564
 #, c-format
 msgctxt "language"
 msgid "User defined (%s)"
 msgstr "使用者定義 (%s)"
 
-#: ../src/prefs-dialog.c:486
+#: ../src/prefs-dialog.c:586
 #, c-format
 msgid "System language (%s)"
 msgid_plural "System languages (%s)"
 msgstr[0] "系統語言 (%s)"
 
-#: ../src/prefs-dialog.c:844
+#: ../src/prefs-dialog.c:918
 msgid "Select a Directory"
 msgstr "選擇一個目錄"
 
-#: ../src/window-commands.c:358
-msgid "Save"
-msgstr "儲存"
+#. Search engine option in the preferences dialog
+#: ../src/prefs-dialog.c:1011
+msgid "DuckDuckGo"
+msgstr "DuckDuckGo"
 
-#: ../src/window-commands.c:893
+#. For the preferences dialog. Must exactly match the URL
+#. * you chose in the gschema, but with & instead of &amp;
+#. * If the match is not exact, there will be a spurious, ugly
+#. * entry in the preferences combo, so please test this.
+#: ../src/prefs-dialog.c:1016
+#, c-format
+#| msgid "http://duckduckgo.com/?q=%s&t=epiphany";
+msgid "https://duckduckgo.com/?q=%s&t=epiphany";
+msgstr "https://duckduckgo.com/?q=%s&t=epiphany";
+
+#. Search engine option in the preferences dialog
+#: ../src/prefs-dialog.c:1018
+msgid "Google"
+msgstr "Google"
+
+#. For the preferences dialog. Consider a regional variant, like google.co.uk
+#: ../src/prefs-dialog.c:1020
+#, c-format
+#| msgid "http://google.com/search?q=%s";
+msgid "https://google.com/search?q=%s";
+msgstr "https://www.google.com.tw/search?q=%s";
+
+#. Search engine option in the preferences dialog
+#: ../src/prefs-dialog.c:1022
+msgid "Bing"
+msgstr "Bing"
+
+#. For the preferences dialog. Consider a regional variant, like uk.bing.com
+#: ../src/prefs-dialog.c:1024
+#, c-format
+msgid "http://www.bing.com/search?q=%s";
+msgstr "http://www.bing.com/search?q=%s";
+
+#: ../src/window-commands.c:778
 #, c-format
 msgid "A web application named '%s' already exists. Do you want to replace it?"
 msgstr "已存在名為「%s」的網頁應用程式。你想要取代它嗎？"
 
-#: ../src/window-commands.c:898
+#: ../src/window-commands.c:783
 msgid "Replace"
 msgstr "取代"
 
-#: ../src/window-commands.c:902
+#: ../src/window-commands.c:787
 msgid ""
 "An application with the same name already exists. Replacing it will "
 "overwrite it."
 msgstr "以此為名的應用程式已經存在。取代它會將它覆蓋。"
 
-#: ../src/window-commands.c:938
+#: ../src/window-commands.c:823
 #, c-format
 msgid "The application '%s' is ready to be used"
 msgstr "應用程式「%s」已經準備好可以使用"
 
-#: ../src/window-commands.c:941
+#: ../src/window-commands.c:826
 #, c-format
 msgid "The application '%s' could not be created"
 msgstr "無法建立應用程式「%s」"
 
-#: ../src/window-commands.c:949
+#: ../src/window-commands.c:834
 msgid "Launch"
 msgstr "執行"
 
 #. Show dialog with icon, title.
-#: ../src/window-commands.c:989
+#: ../src/window-commands.c:874
 msgid "Create Web Application"
 msgstr "建立網頁應用程式"
 
-#: ../src/window-commands.c:994
+#: ../src/window-commands.c:879
 msgid "C_reate"
 msgstr "建立(_R)"
 
-#: ../src/window-commands.c:1676
-msgid ""
-"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:1680
-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 "
-"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
-msgstr "GNOME 網頁瀏覽器係基於使用目的而加以散布，然而不負任何擔保責任；亦無對適售性或特定目的適用性所為的默示性擔保。詳情請參照 GNU 通用公共授權。"
-
-#: ../src/window-commands.c:1684
-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:1730 ../src/window-commands.c:1746
-#: ../src/window-commands.c:1757
+#: ../src/window-commands.c:1535 ../src/window-commands.c:1558
 msgid "Contact us at:"
 msgstr "聯絡我們於："
 
-#: ../src/window-commands.c:1733
+#: ../src/window-commands.c:1538
 msgid "Contributors:"
 msgstr "貢獻者："
 
-#: ../src/window-commands.c:1736
+#: ../src/window-commands.c:1541
 msgid "Past developers:"
 msgstr "前度開發人員："
 
-#: ../src/window-commands.c:1767 ../src/window-commands.c:1773
+#: ../src/window-commands.c:1567
 #, c-format
 msgid ""
 "A simple, clean, beautiful view of the web.\n"
@@ -2636,7 +2680,7 @@ msgstr ""
 #. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
 #.
-#: ../src/window-commands.c:1803
+#: ../src/window-commands.c:1590
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -2647,27 +2691,158 @@ msgstr ""
 "Ching-Hung Lin <billlin wshlab2 ee kuas edu tw>, 2004\n"
 "Abel Cheung <maddog linux org hk>, 2003"
 
-#: ../src/window-commands.c:1806
+#: ../src/window-commands.c:1593
 msgid "Web Website"
 msgstr "網頁網站"
 
-#: ../src/window-commands.c:1946
+#: ../src/window-commands.c:1732
 msgid "Enable caret browsing mode?"
 msgstr "是否啟用鍵盤瀏覽？"
 
-#: ../src/window-commands.c:1949
+#: ../src/window-commands.c:1735
 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?"
 msgstr "按下 F7 會開啟或關閉鍵盤瀏覽。這個功能會在網頁中放置一個可移動的游標，讓你可以使用鍵盤隨處移動。你是否要啟用鍵盤瀏覽？"
 
-#: ../src/window-commands.c:1952
+#: ../src/window-commands.c:1738
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#~ 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";
+#~ msgid "%u:%02u hour left"
+#~ msgid_plural "%u:%02u hours left"
+#~ msgstr[0] "剩餘 %u:%02u 小時"
+
+#~ msgid "Use GNOME desktop wide font configuration."
+#~ msgstr "使用 GNOME 桌面字型組態。"
+
+#~ msgid "Not now"
+#~ msgstr "現在不要"
+
+#~ msgid "Store password"
+#~ msgstr "儲存密碼"
+
+#~ 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>"
+
+#~ msgid "Oops! Error loading %s"
+#~ msgstr "噢！載入 %s 時發生錯誤"
+
+#~ msgid ""
+#~ "Oops! This site might have caused the web browser to close unexpectedly"
+#~ msgstr "噢！這個網站可能已造成網頁瀏覽器未預期的關閉"
+
+#~ msgid "Oops! Something went wrong displaying %s"
+#~ msgstr "噢！顯示 %s 時發生問題"
+
+#~ msgid "Epiphany (RDF)"
+#~ msgstr "Epiphany (RDF)"
+
+#~ msgid "Epiphany bookmarks"
+#~ msgstr "Epiphany 書籤"
+
+#~ msgid "_Personal Data"
+#~ msgstr "個人資料(_P)"
+
+#~ msgid "Cookie properties"
+#~ msgstr "Cookie 屬性"
+
+#~ msgid "Content:"
+#~ msgstr "內容"
+
+#~ msgid "Path:"
+#~ msgstr "路徑："
+
+#~ msgid "Send for:"
+#~ msgstr "傳送給："
+
+#~ msgid "Expires:"
+#~ msgstr "時限："
+
+#~ msgid "<b>_Automatic</b>"
+#~ msgstr "<b>自動(_A)：</b>"
+
+#~ msgid "Personal Data"
+#~ msgstr "個人資料"
+
+#~ msgid "Start the application without opening windows"
+#~ msgstr "不開啟視窗而啟動應用程式"
+
+#~ msgid "_Open Link"
+#~ msgstr "開啟連結(_O)"
+
+#~ msgid "_Download Link"
+#~ msgstr "下載連結(_D)"
+
+#~ msgid "_Bookmark Link…"
+#~ msgstr "將連結加入書籤(_B)…"
+
+#~ msgid "_Use Image As Background"
+#~ msgstr "使用圖片作為桌面背景(_U)"
+
+#~ msgid "Inspect _Element"
+#~ msgstr "檢查元素(_E)"
+
+#~ msgid "C_ookies"
+#~ msgstr "C_ookies"
+
+#~ msgid "Hi_story"
+#~ msgstr "歷史記錄(_S)"
+
+#~ msgid "Encrypted connections only"
+#~ msgstr "只限加密後的連線"
+
+#~ msgid "Any type of connection"
+#~ msgstr "任何類型的連線"
+
+#~ msgid "End of current session"
+#~ msgstr "結束目前的作業階段"
+
+#~ msgid "Domain"
+#~ msgstr "網域"
+
+#~ msgid "Name"
+#~ msgstr "名稱"
+
+#~ msgid "Host"
+#~ msgstr "主機"
+
+#~ msgid "User Password"
+#~ msgstr "使用者密碼"
+
+#~ msgid "Download Link"
+#~ msgstr "下載連結"
+
+#~ msgid ""
+#~ "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 通用公共"
+#~ "授權條款規定，就本程式再為散布與／或修改；無論您依據的是本授權的第二版或"
+#~ "（您自行選擇的）任一日後發行的版本。"
+
+#~ 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 or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details."
+#~ msgstr ""
+#~ "GNOME 網頁瀏覽器係基於使用目的而加以散布，然而不負任何擔保責任；亦無對適售"
+#~ "性或特定目的適用性所為的默示性擔保。詳情請參照 GNU 通用公共授權。"
+
+#~ 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"
 
 #~ msgid "http://www.google.com";
 #~ msgstr "http://www.google.com.tw";
@@ -2703,9 +2878,6 @@ msgstr "啟用(_E)"
 #~ msgid "Lists the active extensions."
 #~ msgstr "使用中擴充功能清單。"
 
-#~ msgid "Plugins"
-#~ msgstr "外掛程式"
-
 #~ msgid "File is not a valid .desktop file"
 #~ msgstr "檔案不是有效的 .desktop 檔案"
 
@@ -2727,12 +2899,6 @@ msgstr "啟用(_E)"
 #~ msgid "Not a launchable item"
 #~ msgstr "不是可以啟動的項目"
 
-#~ msgid "Clear"
-#~ msgstr "清除"
-
-#~ msgid "_Search:"
-#~ msgstr "搜尋(_S)："
-
 #~ msgid "Enable Java_Script"
 #~ msgstr "啟用 Java_Script"
 
@@ -2837,8 +3003,5 @@ msgstr "啟用(_E)"
 #~ msgid "_Don't Update"
 #~ msgstr "不要更新(_D)"
 
-#~ msgid "_Update"
-#~ msgstr "更新(_U)"
-
 #~ msgid "Update Bookmark?"
 #~ msgstr "更新書籤？"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 295598e..ac8d2fc 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -13,11 +13,11 @@ msgstr ""
 "Project-Id-Version: epiphany 3.3.91\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=epiphany\n"
-"POT-Creation-Date: 2013-09-30 19:22+0800\n"
-"PO-Revision-Date: 2013-09-29 03:16+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
+"POT-Creation-Date: 2014-01-15 19:37+0800\n"
+"PO-Revision-Date: 2014-01-15 19:39+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"
-"Language: \n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,11 +37,12 @@ msgstr "搜尋網頁"
 #. duckduckgo must be translated. So, for a Finnish localized
 #. version of duckduckgo that will render results tailored for
 #. Finland, the string would be:
-#. http://duckduckgo.com/?t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI
+#. https://duckduckgo.com/?t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI
 #.
 #: ../data/default-bookmarks.rdf.in.h:13
-msgid "http://duckduckgo.com/?t=epiphany";
-msgstr "http://duckduckgo.com/?t=epiphany";
+#| msgid "http://duckduckgo.com/?t=epiphany";
+msgid "https://duckduckgo.com/?t=epiphany";
+msgstr "https://duckduckgo.com/?t=epiphany";
 
 #. Translators: you can use the regions listed in
 #. https://duckduckgo.com/params to boost a particular region
@@ -51,24 +52,25 @@ msgstr "http://duckduckgo.com/?t=epiphany";
 #. 'kad' parameter can be used to specify the locale in which
 #. duckduckgo must be translated. For such case, the search url
 #. would be
-#. http://duckduckgo.com/?q=%s&amp;t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI
-#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-web-view.c:2061
-#: ../src/ephy-search-provider.c:290
+#. https://duckduckgo.com/?q=%s&amp;t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI
+#: ../data/default-bookmarks.rdf.in.h:24
 #, no-c-format
-msgid "http://duckduckgo.com/?q=%s&amp;t=epiphany";
-msgstr "http://duckduckgo.com/?q=%s&amp;t=epiphany";
+#| msgid "http://duckduckgo.com/?q=%s&amp;t=epiphany";
+msgid "https://duckduckgo.com/?q=%s&amp;t=epiphany";
+msgstr "https://duckduckgo.com/?q=%s&amp;t=epiphany";
 
 #: ../data/epiphany.appdata.xml.in.h:1
 msgid ""
-"The web browser for the GNOME desktop, featuring tight integration with the "
-"desktop and a simple and intuitive user interface that allows you to focus "
-"on your web pages."
+"The web browser for GNOME, featuring tight integration with the desktop and "
+"a simple and intuitive user interface that allows you to focus on your web "
+"pages."
 msgstr ""
-"GNOME 桌面的網頁瀏覽器，帶來與桌面緊密的整合、簡單且直觀的使用者介面，讓您可"
-"以專注於您的網頁。"
+"GNOME 的網頁瀏覽器，帶來與桌面的緊密整合、簡易且直觀的使用者介面，讓您可以專"
+"注在您的網頁上。"
 
-#: ../data/epiphany.desktop.in.in.h:1 ../src/ephy-main.c:68
-#: ../src/ephy-main.c:320 ../src/ephy-main.c:478 ../src/window-commands.c:1787
+#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:312
+#: ../embed/ephy-about-handler.c:342 ../src/ephy-main.c:67
+#: ../src/ephy-main.c:314 ../src/ephy-main.c:467 ../src/window-commands.c:1574
 msgid "Web"
 msgstr "網頁"
 
@@ -92,29 +94,42 @@ msgstr "web;browser;internet;網頁;瀏覽器;網際網路;"
 msgid "Browse with caret"
 msgstr "鍵盤瀏覽"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:2
+#. DuckDuckGo is the default search engine. Must exactly match the URL used
+#. in the preferences dialog, except this string is surrounded by single quotes
+#. and uses &amp; instead of simply &. If the match is not otherwise exact,
+#. there will be a spurious, ugly entry in the preferences combo, so please
+#. test this. Should ideally also match the default smart bookmark link in
+#. default-bookmarks.rdf. See the comment there for region parameters to
+#. the URL.
+#: ../data/org.gnome.epiphany.gschema.xml.h:10
+#, no-c-format
+#| msgid "'http://duckduckgo.com/?q=%s&amp;t=epiphany'"
+msgid "'https://duckduckgo.com/?q=%s&amp;t=epiphany'"
+msgstr "'https://duckduckgo.com/?q=%s&amp;t=epiphany'"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:11
 msgid "URL Search"
 msgstr "URL 搜尋"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:3
+#: ../data/org.gnome.epiphany.gschema.xml.h:12
 msgid "Search string for keywords entered in the URL bar."
 msgstr "搜尋在 URL 列中輸入關鍵字的字串。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:4
+#: ../data/org.gnome.epiphany.gschema.xml.h:13
 msgid "User agent"
 msgstr "使用者代理"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:5
+#: ../data/org.gnome.epiphany.gschema.xml.h:14
 msgid ""
 "String that will be used as user agent, to identify the browser to the web "
 "servers."
 msgstr "用作使用者代理的字串，讓網頁伺服器辨認瀏覽器時使用。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:6
+#: ../data/org.gnome.epiphany.gschema.xml.h:15
 msgid "Automatic downloads"
 msgstr "自動下載"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:7
+#: ../data/org.gnome.epiphany.gschema.xml.h:16
 msgid ""
 "When files cannot be opened by the browser they are automatically downloaded "
 "to the download folder and opened with the appropriate application."
@@ -122,40 +137,40 @@ msgstr ""
 "當檔案不能被瀏覽器開啟時，它們會自動被下載到下載資料夾並以合適的應用程式開"
 "啟。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:8
+#: ../data/org.gnome.epiphany.gschema.xml.h:17
 msgid "Force new windows to be opened in tabs"
 msgstr "強制新視窗在分頁中開啟"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:9
+#: ../data/org.gnome.epiphany.gschema.xml.h:18
 msgid ""
 "Force new window requests to be opened in tabs instead of using a new window."
 msgstr "強制開新視窗的要求在分頁中開啟而不是在新視窗中。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:10
+#: ../data/org.gnome.epiphany.gschema.xml.h:19
 msgid "Remember passwords"
 msgstr "記錄密碼"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:11
+#: ../data/org.gnome.epiphany.gschema.xml.h:20
 msgid "Whether to store and prefill passwords in web sites."
 msgstr "是否儲存並預先填寫網站密碼。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:12
+#: ../data/org.gnome.epiphany.gschema.xml.h:21
 msgid "Automatically manage offline status with NetworkManager"
 msgstr "使用 NetworkManager 自動管理離線狀態"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:13
+#: ../data/org.gnome.epiphany.gschema.xml.h:22
 msgid "Enable smooth scrolling"
 msgstr "啟用平滑捲動"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:14
+#: ../data/org.gnome.epiphany.gschema.xml.h:23
 msgid "Don't use an external application to view page source."
 msgstr "不要使用外部應用程式檢視網頁原始檔。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:15
+#: ../data/org.gnome.epiphany.gschema.xml.h:24
 msgid "Whether to automatically restore the last session"
 msgstr "是否自動還原上次作業階段"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:16
+#: ../data/org.gnome.epiphany.gschema.xml.h:25
 msgid ""
 "Defines how the session will be restored during startup. Allowed values are "
 "'always' (the previous state of the application is always restored), "
@@ -166,13 +181,13 @@ msgstr ""
 "會還原)、「crashed」(作業階段只有在應用程式當機時還原) 和「never」(永遠只顯示"
 "首頁)。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:17
+#: ../data/org.gnome.epiphany.gschema.xml.h:26
 msgid ""
 "Whether to delay loading of tabs that are not immediately visible on session "
 "restore"
 msgstr "是否延遲載入在作業階段還原時無法立即顯示的分頁"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:18
+#: ../data/org.gnome.epiphany.gschema.xml.h:27
 msgid ""
 "When this option is set to true, tabs will not start loading until the user "
 "switches to them, upon session restore."
@@ -180,15 +195,15 @@ msgstr ""
 "當這個選項設定為 true，分頁在作業階段還原時只會在使用者切換到它們時才開始載"
 "入。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:19
+#: ../data/org.gnome.epiphany.gschema.xml.h:28
 msgid "Show toolbars by default"
 msgstr "預設顯示工具列"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:20
+#: ../data/org.gnome.epiphany.gschema.xml.h:29
 msgid "Toolbar style"
 msgstr "工具列樣式"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:21
+#: ../data/org.gnome.epiphany.gschema.xml.h:30
 msgid ""
 "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both"
 "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and "
@@ -197,31 +212,31 @@ msgstr ""
 "工具列樣式。允許的數值有 \"\" (使用 GNOME 預設樣式)、\"both\" (文字和圖"
 "示)、\"both-horiz\" (文字在圖示旁)、\"icons\" 和 \"text\"。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:22
+#: ../data/org.gnome.epiphany.gschema.xml.h:31
 msgid "[Deprecated]"
 msgstr "[已廢棄]"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:23
+#: ../data/org.gnome.epiphany.gschema.xml.h:32
 msgid ""
 "[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' "
 "instead."
 msgstr "[已廢棄] 這個設定值已廢棄，使用「tabs-bar-visibility-policy」代替。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:24
+#: ../data/org.gnome.epiphany.gschema.xml.h:33
 msgid "Visibility of the downloads window"
 msgstr "下載視窗的顯示"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:25
+#: ../data/org.gnome.epiphany.gschema.xml.h:34
 msgid ""
 "Hide or show the downloads window. When hidden, a notification will be shown "
 "when new downloads are started."
 msgstr "隱藏或顯示下載視窗。當隱藏時，新的下載開始時會顯示一個通知。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:26
+#: ../data/org.gnome.epiphany.gschema.xml.h:35
 msgid "The visibility policy for the tabs bar."
 msgstr "分頁列顯示原則。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:27
+#: ../data/org.gnome.epiphany.gschema.xml.h:36
 msgid ""
 "Controls when the tabs bar is shown. Possible values are 'always' (the tabs "
 "bar is always shown), 'more-than-one' (the tabs bar is only shown if there's "
@@ -230,111 +245,111 @@ msgstr ""
 "控制分頁列何時顯示。可能的數值有「always」(永遠顯示分頁列)、「more-than-one」"
 "(如果有兩個以上分頁才顯示分頁列) 和「never」(永遠不顯示分頁列)。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:28
+#: ../data/org.gnome.epiphany.gschema.xml.h:37
 msgid "Minimum font size"
 msgstr "最小字型大小"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:29
+#: ../data/org.gnome.epiphany.gschema.xml.h:38
 msgid "Use GNOME fonts"
 msgstr "使用 GNOME 字型"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:30
-msgid "Use GNOME desktop wide font configuration."
-msgstr "使用 GNOME 桌面字型組態。"
+#: ../data/org.gnome.epiphany.gschema.xml.h:39
+msgid "Use GNOME font settings."
+msgstr "使用 GNOME 字型設定值。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:31
+#: ../data/org.gnome.epiphany.gschema.xml.h:40
 msgid "Custom sans-serif font"
 msgstr "自訂無襯線字型"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:32
+#: ../data/org.gnome.epiphany.gschema.xml.h:41
 msgid ""
 "A value to be used to override sans-serif desktop font when use-gnome-fonts "
 "is set."
 msgstr "當設定「use-gnome-fonts」時用來覆蓋 sans-serif 桌面字型的數值。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:33
+#: ../data/org.gnome.epiphany.gschema.xml.h:42
 msgid "Custom serif font"
 msgstr "自訂有襯線字型"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:34
+#: ../data/org.gnome.epiphany.gschema.xml.h:43
 msgid ""
 "A value to be used to override serif desktop font when use-gnome-fonts is "
 "set."
 msgstr "當設定「use-gnome-fonts」時用來覆蓋 serif 桌面字型的數值。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:35
+#: ../data/org.gnome.epiphany.gschema.xml.h:44
 msgid "Custom monospace font"
 msgstr "自訂等寬字型"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:36
+#: ../data/org.gnome.epiphany.gschema.xml.h:45
 msgid ""
 "A value to be used to override monospace desktop font when use-gnome-fonts "
 "is set."
 msgstr "當設定「use-gnome-fonts」時用來覆蓋 monospace 桌面字型的數值。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:37
+#: ../data/org.gnome.epiphany.gschema.xml.h:46
 msgid "Use own colors"
 msgstr "使用自訂顏色"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:38
+#: ../data/org.gnome.epiphany.gschema.xml.h:47
 msgid "Use your own colors instead of the colors the page requests."
 msgstr "使用您自己的顏色取代網頁要求的顏色。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:39
+#: ../data/org.gnome.epiphany.gschema.xml.h:48
 msgid "Use own fonts"
 msgstr "使用自用字型(_U)"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:40
+#: ../data/org.gnome.epiphany.gschema.xml.h:49
 msgid "Use your own fonts instead of the fonts the page requests."
 msgstr "使用您自己的字型取代網頁要求的字型。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:41
+#: ../data/org.gnome.epiphany.gschema.xml.h:50
 msgid "Use a custom CSS"
 msgstr "使用自訂 CSS"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:42
+#: ../data/org.gnome.epiphany.gschema.xml.h:51
 msgid "Use a custom CSS file to modify websites own CSS."
 msgstr "使用自訂的 CSS 檔案來修改網站自己的 CSS。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:43
+#: ../data/org.gnome.epiphany.gschema.xml.h:52
 msgid "Enable spell checking"
 msgstr "啟用拼字檢查"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:44
+#: ../data/org.gnome.epiphany.gschema.xml.h:53
 msgid "Spell check any text typed in editable areas."
 msgstr "對任何在可編輯區域中輸入的文字進行拼字檢查。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:45
+#: ../data/org.gnome.epiphany.gschema.xml.h:54
 msgid "Default encoding"
 msgstr "預設編碼"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:46
+#: ../data/org.gnome.epiphany.gschema.xml.h:55
 msgid ""
 "Default encoding. Accepted values are the ones WebKitGTK+ can understand."
 msgstr "預設的編碼。可接受的數值為 WebKitGTK+ 能辨識的數值。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:47
+#: ../data/org.gnome.epiphany.gschema.xml.h:56
 msgid "Size of disk cache"
 msgstr "磁碟快取大小"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:48
+#: ../data/org.gnome.epiphany.gschema.xml.h:57
 msgid "Size of disk cache, in MB."
 msgstr "磁碟快取大小，單位為 MB。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:49
-#: ../src/resources/prefs-dialog.ui.h:38
+#: ../data/org.gnome.epiphany.gschema.xml.h:58
+#: ../src/resources/prefs-dialog.ui.h:41
 msgid "Languages"
 msgstr "語言"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:50
+#: ../data/org.gnome.epiphany.gschema.xml.h:59
 msgid "Preferred languages, two letter codes."
 msgstr "偏好的語言，兩個英文字母的代碼。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:51
+#: ../data/org.gnome.epiphany.gschema.xml.h:60
 msgid "Cookie accept"
 msgstr "Cookie 接受"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:52
+#: ../data/org.gnome.epiphany.gschema.xml.h:61
 msgid ""
 "Where to accept cookies from. Possible values are \"anywhere\", \"current "
 "site\" and \"nowhere\"."
@@ -342,75 +357,75 @@ msgstr ""
 "要接受來自何處的 cookies。可能的數值有「anywhere」、「current site」和"
 "「nowhere」。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:53
+#: ../data/org.gnome.epiphany.gschema.xml.h:62
 msgid "Image animation mode"
 msgstr "影像動畫模式"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:54
+#: ../data/org.gnome.epiphany.gschema.xml.h:63
 msgid ""
 "How to present animated images. Possible values are \"normal\", \"once\" and "
 "\"disabled\"."
 msgstr "如何顯示動畫影像。可能的數值有「normal」、「once」和「disabled」。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:55
+#: ../data/org.gnome.epiphany.gschema.xml.h:64
 msgid "Allow popups"
 msgstr "允許彈出式視窗"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:56
+#: ../data/org.gnome.epiphany.gschema.xml.h:65
 msgid ""
 "Allow sites to open new windows using JavaScript (if JavaScript is enabled)."
 msgstr "允許網站使用 JavaScript 開啟新視窗 (如果啟用 JavaScript)。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:57
+#: ../data/org.gnome.epiphany.gschema.xml.h:66
 msgid "Enable Plugins"
 msgstr "啟用外掛程式"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:58
+#: ../data/org.gnome.epiphany.gschema.xml.h:67
 msgid "Enable JavaScript"
 msgstr "啟用 JavaScript"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:59
+#: ../data/org.gnome.epiphany.gschema.xml.h:68
 msgid "Enable WebGL"
 msgstr "啟用 WebGL"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:60
+#: ../data/org.gnome.epiphany.gschema.xml.h:69
 msgid "Whether to enable support for WebGL contexts."
 msgstr "是否啟用支援 WebGL 內容。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:61
+#: ../data/org.gnome.epiphany.gschema.xml.h:70
 msgid "Enable WebAudio"
 msgstr "啟用 WebAudio"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:62
+#: ../data/org.gnome.epiphany.gschema.xml.h:71
 msgid "Whether to enable support for WebAudio."
 msgstr "是否啟用支援 WebAudio。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:63
+#: ../data/org.gnome.epiphany.gschema.xml.h:72
 msgid "Do Not Track"
 msgstr "不要追蹤"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:64
+#: ../data/org.gnome.epiphany.gschema.xml.h:73
 msgid ""
 "Whether to tell websites that we do not wish to be tracked. Please note that "
 "web pages are not forced to follow this setting."
 msgstr ""
 "是否告訴網站我們不希望被追蹤。請注意網站頁面並不會被強制要求聽從這個設定值。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:65
+#: ../data/org.gnome.epiphany.gschema.xml.h:74
 msgid "Enable Adblock"
 msgstr "啟用廣告阻擋"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:66
+#: ../data/org.gnome.epiphany.gschema.xml.h:75
 msgid ""
 "Whether to block the embedded advertisements that web pages might want to "
 "show."
 msgstr "是否阻擋內嵌於網頁可能顯示的廣告。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:67
+#: ../data/org.gnome.epiphany.gschema.xml.h:76
 msgid "The downloads folder"
 msgstr "下載資料夾"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:68
+#: ../data/org.gnome.epiphany.gschema.xml.h:77
 msgid ""
 "The path of the folder where to download files to; or \"Downloads\" to use "
 "the default downloads folder, or \"Desktop\" to use the desktop folder."
@@ -418,81 +433,102 @@ msgstr ""
 "放置下載的檔案的資料夾路徑；或是「Downloads」代表預設的下載目錄，或"
 "「Desktop」使用桌面資料夾。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:69
+#: ../data/org.gnome.epiphany.gschema.xml.h:78
 msgid "History pages time range"
 msgstr "歷史紀錄時間範圍"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:70
+#: ../data/org.gnome.epiphany.gschema.xml.h:79
 msgid "Whether to show the title column in the history window."
 msgstr "是否在歷史紀錄視窗顯示標題欄。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:71
+#: ../data/org.gnome.epiphany.gschema.xml.h:80
 msgid "Whether to show the address column in the history window."
 msgstr "是否在歷史紀錄視窗顯示位址欄。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:72
+#: ../data/org.gnome.epiphany.gschema.xml.h:81
 msgid "Whether to show the date-time column in the history window."
 msgstr "是否在歷史紀錄視窗顯示日期-時刻欄。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:73
+#: ../data/org.gnome.epiphany.gschema.xml.h:82
 msgid "Whether to show the title column in the bookmarks window."
 msgstr "是否在書籤視窗顯示標題欄。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:74
+#: ../data/org.gnome.epiphany.gschema.xml.h:83
 msgid "Whether to show the address column in the bookmarks window."
 msgstr "是否在書籤視窗顯示位址欄。"
 
-#: ../embed/ephy-about-handler.c:144 ../embed/ephy-about-handler.c:146
+#: ../embed/ephy-about-handler.c:153
 msgid "Installed plugins"
 msgstr "已安裝的外掛程式"
 
-#: ../embed/ephy-about-handler.c:159
+#: ../embed/ephy-about-handler.c:155
+msgid "Plugins"
+msgstr "外掛程式"
+
+#: ../embed/ephy-about-handler.c:158
+msgid "Plugins are disabled in the preferences"
+msgstr "外掛程式在偏好設定中已停用"
+
+#: ../embed/ephy-about-handler.c:171
 msgid "Enabled"
 msgstr "已啟用"
 
-#. webkit_plugin_get_enabled (plugin)
-#: ../embed/ephy-about-handler.c:159
+#. webkit_plugin_get_enabled (plugin) &&
+#: ../embed/ephy-about-handler.c:171
 msgid "Yes"
 msgstr "是"
 
-#: ../embed/ephy-about-handler.c:159
+#: ../embed/ephy-about-handler.c:171
 msgid "No"
 msgstr "否"
 
-#: ../embed/ephy-about-handler.c:160
+#: ../embed/ephy-about-handler.c:172
 msgid "MIME type"
 msgstr "MIME 類型"
 
-#: ../embed/ephy-about-handler.c:160
+#: ../embed/ephy-about-handler.c:172
 msgid "Description"
 msgstr "說明"
 
-#: ../embed/ephy-about-handler.c:160
+#: ../embed/ephy-about-handler.c:172
 msgid "Suffixes"
 msgstr "後綴"
 
-#: ../embed/ephy-about-handler.c:220 ../embed/ephy-about-handler.c:223
+#: ../embed/ephy-about-handler.c:232 ../embed/ephy-about-handler.c:235
 msgid "Memory usage"
 msgstr "記憶體使用量"
 
-#: ../embed/ephy-about-handler.c:303 ../embed/ephy-about-handler.c:305
+#: ../embed/ephy-about-handler.c:285
+#, c-format
+msgid "Version %s"
+msgstr "版本 %s"
+
+#: ../embed/ephy-about-handler.c:309
+msgid "About Web"
+msgstr "關於 Web"
+
+#: ../embed/ephy-about-handler.c:314
+msgid "A simple, clean, beautiful view of the web"
+msgstr "簡單、乾淨、美麗的網頁面貌。"
+
+#: ../embed/ephy-about-handler.c:365 ../embed/ephy-about-handler.c:367
 msgid "Applications"
 msgstr "應用程式"
 
-#: ../embed/ephy-about-handler.c:306
+#: ../embed/ephy-about-handler.c:368
 msgid "List of installed web applications"
 msgstr "已安裝的網頁應用程式清單"
 
 #. Note for translators: this refers to the installation date.
-#: ../embed/ephy-about-handler.c:327
+#: ../embed/ephy-about-handler.c:389
 msgid "Installed on:"
 msgstr "安裝於："
 
-#: ../embed/ephy-about-handler.c:400 ../embed/ephy-about-handler.c:403
+#: ../embed/ephy-about-handler.c:468 ../embed/ephy-about-handler.c:471
 msgid "Private Browsing"
 msgstr "隱密瀏覽"
 
-#: ../embed/ephy-about-handler.c:404
+#: ../embed/ephy-about-handler.c:472
 msgid ""
 "You are currently browsing <em>incognito</em>. Pages viewed in this mode "
 "will not show up in your browsing history and all stored information will be "
@@ -501,17 +537,17 @@ msgstr ""
 "您現在使用<em>隱密</em>瀏覽。在這個模式中檢視的網頁將不會顯示在瀏覽紀錄中，而"
 "所有儲存的資訊都會在關閉視窗時清除。"
 
-#: ../embed/ephy-embed.c:487
+#: ../embed/ephy-embed.c:490
 #, c-format
 msgid "Press %s to exit fullscreen"
 msgstr "按下 %s 離開全螢幕"
 
 #. Translators: 'ESC' and 'F11' are keyboard keys.
-#: ../embed/ephy-embed.c:490
+#: ../embed/ephy-embed.c:493
 msgid "ESC"
 msgstr "ESC"
 
-#: ../embed/ephy-embed.c:490
+#: ../embed/ephy-embed.c:493
 msgid "F11"
 msgstr "F11"
 
@@ -845,127 +881,146 @@ msgstr "萬國碼 (UTF-3_2BE)"
 msgid "Unknown (%s)"
 msgstr "不明 (%s)"
 
+#: ../embed/ephy-find-toolbar.c:103
+msgid "Text not found"
+msgstr "找不到文字"
+
+#: ../embed/ephy-find-toolbar.c:110
+msgid "Search wrapped back to the top"
+msgstr "搜尋至結尾後返回開頭"
+
+#: ../embed/ephy-find-toolbar.c:463
+msgid "Type to search…"
+msgstr "輸入以搜尋…"
+
+#: ../embed/ephy-find-toolbar.c:469
+msgid "Find previous occurrence of the search string"
+msgstr "尋找上一個出現搜尋字串的地方"
+
+#: ../embed/ephy-find-toolbar.c:477
+msgid "Find next occurrence of the search string"
+msgstr "尋找下一個出現搜尋字串的地方"
+
 #: ../embed/ephy-overview.h:53
 msgid "Most Visited"
 msgstr "最常瀏覽"
 
 #. characters
-#: ../embed/ephy-web-view.c:64 ../embed/ephy-web-view.c:2757
+#: ../embed/ephy-web-view.c:64 ../embed/ephy-web-view.c:2778
 msgid "Blank page"
 msgstr "空白頁面"
 
-#: ../embed/ephy-web-view.c:495
-msgid "Not now"
-msgstr "現在不要"
-
-#: ../embed/ephy-web-view.c:496
-msgid "Store password"
-msgstr "儲存密碼"
+#: ../embed/ephy-web-view.c:496 ../src/window-commands.c:329
+msgid "Save"
+msgstr "儲存"
 
-#. 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.
+#. Translators: The %s the hostname where this is happening.
+#. * Example: mail.google.com.
 #.
 #: ../embed/ephy-web-view.c:508
 #, 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>"
+msgid "Do you want to save your password for “%s”?"
+msgstr "您是否要儲存您在“%s”的密碼？"
 
-#: ../embed/ephy-web-view.c:1364
+#: ../embed/ephy-web-view.c:1380
 msgid "Deny"
 msgstr "禁止"
 
-#: ../embed/ephy-web-view.c:1365
+#: ../embed/ephy-web-view.c:1381
 msgid "Allow"
 msgstr "允許"
 
-#: ../embed/ephy-web-view.c:1375
+#: ../embed/ephy-web-view.c:1391
 #, c-format
 msgid "The page at <b>%s</b> wants to know your location."
 msgstr "在 <b>%s</b> 的網頁想要知道您的位置。"
 
-#: ../embed/ephy-web-view.c:1704
+#: ../embed/ephy-web-view.c:1741
 msgid "None specified"
 msgstr "沒有指定"
 
-#: ../embed/ephy-web-view.c:1713 ../embed/ephy-web-view.c:1731
+#: ../embed/ephy-web-view.c:1752 ../embed/ephy-web-view.c:1769
 #, c-format
-msgid "Oops! Error loading %s"
-msgstr "噢！載入 %s 時發生錯誤"
+msgid "Problem loading “%s”"
+msgstr "載入“%s”時發生錯誤"
 
-#: ../embed/ephy-web-view.c:1715
-msgid "Oops! It was not possible to show this website"
-msgstr "噢！無法顯示這個網站"
+#: ../embed/ephy-web-view.c:1754
+msgid "Oops! Unable to display this website."
+msgstr "噢！無法顯示這個網站。"
 
-#: ../embed/ephy-web-view.c:1716
+#: ../embed/ephy-web-view.c:1755
 #, c-format
 msgid ""
-"<p>The website at <strong>%s</strong> seems to be unavailable. The precise "
-"error was:</p><p><em>%s</em></p><p>It could be temporarily switched off or "
-"moved to a new address. Don't forget to check that your internet connection "
-"is working correctly.</p>"
+"<p>The site at “%s” seems to be unavailable. The precise error was:</"
+"p><p><code>%s</code></p><p>It may be temporarily unavailable or moved to a "
+"new address. You may wish to verify that your internet connection is working "
+"correctly.</p>"
 msgstr ""
-"<p>網站 <strong>%s</strong> 可能無法使用，準確來說錯誤為：</p><p><em>%s</"
-"em></p><p>它可能被暫時關閉或移動到新的位址。不要忘了檢查網際網路連線是否正常"
-"運作。</p>"
+"<p>在“%s”的網站似乎無法使用。更準確的說錯誤是：</p><p><code>%s</code></p><p>"
+"它可能是暫時無法使用或移動到新的位址。您可能會想要檢查您的網際網路連線是否正"
+"常。</p>"
 
-#: ../embed/ephy-web-view.c:1725
-msgid "Try again"
-msgstr "再試一次"
+#: ../embed/ephy-web-view.c:1764
+msgid "Try Again"
+msgstr "重試"
 
-#: ../embed/ephy-web-view.c:1733
-msgid "Oops! This site might have caused the web browser to close unexpectedly"
-msgstr "噢！這個網站可能已造成網頁瀏覽器未預期的關閉"
+#: ../embed/ephy-web-view.c:1771
+msgid "Oops! There may be a problem."
+msgstr "噢！可能有問題發生。"
 
-#: ../embed/ephy-web-view.c:1735
+#: ../embed/ephy-web-view.c:1772
 #, c-format
 msgid ""
-"<p>This page was loading when the web browser closed unexpectedly.</"
-"p><p>This might happen again if you reload the page. If it does, please "
-"report the problem to the <strong>%s</strong> developers.</p>"
+"<p>This site may have caused Web to close unexpectedly.</p><p>If this "
+"happens again, please report the problem to the <strong>%s</strong> "
+"developers.</p>"
 msgstr ""
-"<p>這個網頁尚在讀取但瀏覽器已異常關閉了。</p><p>如果您重新載入該頁面仍然可能"
-"再度發生這個狀況。如果真的這樣，請將問題回報給 <strong>%s</strong> 開發團隊。"
-"</p>"
+"<p>這個網站可能造成 Web 未預期的關閉。</p><p>如果這再次發生，請將這個問題回報"
+"給 <strong>%s</strong> 開發團隊。</p>"
 
-#: ../embed/ephy-web-view.c:1743
-msgid "Load again anyway"
-msgstr "强制再次載入"
+#: ../embed/ephy-web-view.c:1778 ../embed/ephy-web-view.c:1786
+msgid "Reload Anyway"
+msgstr "強制重新載入"
 
-#: ../embed/ephy-web-view.c:1749
+#: ../embed/ephy-web-view.c:1783
 #, c-format
-msgid "Oops! Something went wrong displaying %s"
-msgstr "噢！顯示 %s 時發生問題"
+msgid "Problem displaying “%s”"
+msgstr "顯示“%s”時發生問題"
 
-#: ../embed/ephy-web-view.c:1750
+#: ../embed/ephy-web-view.c:1784
 msgid "Oops!"
 msgstr "噢！"
 
-#: ../embed/ephy-web-view.c:1751
+#: ../embed/ephy-web-view.c:1785
 msgid ""
 "Something went wrong while displaying this page. Please reload or visit a "
 "different page to continue."
 msgstr "顯示這個頁面時有錯誤發生。請重新載入或瀏覽不同的頁面以繼續。"
 
+#: ../embed/ephy-web-view.c:2090 ../src/ephy-search-provider.c:287
+#, c-format
+msgid "http://duckduckgo.com/?q=%s&amp;t=epiphany";
+msgstr "http://duckduckgo.com/?q=%s&amp;t=epiphany";
+
 #. translators: %s here is the address of the web page
-#: ../embed/ephy-web-view.c:2299
+#: ../embed/ephy-web-view.c:2328
 #, c-format
 msgid "Loading “%s”…"
 msgstr "正在載入“%s”…"
 
-#: ../embed/ephy-web-view.c:2301
+#: ../embed/ephy-web-view.c:2330
 msgid "Loading…"
 msgstr "載入中…"
 
-#: ../embed/ephy-web-view.c:2661 ../src/bookmarks/ephy-bookmarks-editor.c:818
+#: ../embed/ephy-web-view.c:2682
 msgid "_OK"
 msgstr "確定(_O)"
 
 #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193
-#: ../src/bookmarks/ephy-bookmark-properties.c:639
-#: ../src/bookmarks/ephy-bookmarks-editor.c:815 ../src/pdm-dialog.c:343
-#: ../src/window-commands.c:992
+#: ../src/bookmarks/ephy-bookmark-properties.c:640
+#: ../src/bookmarks/ephy-bookmarks-editor.c:815
+#: ../src/resources/clear-data-dialog.ui.h:2
+#: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:877
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -994,7 +1049,7 @@ msgid "All files"
 msgstr "所有檔案"
 
 #. If we don't have XDG user dirs info, return an educated guess.
-#: ../lib/ephy-file-helpers.c:112 ../src/resources/prefs-dialog.ui.h:4
+#: ../lib/ephy-file-helpers.c:112 ../src/resources/prefs-dialog.ui.h:3
 msgid "Downloads"
 msgstr "下載"
 
@@ -1022,11 +1077,19 @@ msgstr "無法建立目錄“%s”。"
 #. * hostname where this is happening. Example: gnome gmail com and
 #. * mail.google.com.
 #.
-#: ../lib/ephy-form-auth-data.c:126
+#: ../lib/ephy-form-auth-data.c:139
 #, c-format
 msgid "Password for %s in a form in %s"
 msgstr "%s 用於 %s 表單的密碼"
 
+#. Translators: The first %s is the hostname where this is happening.
+#. * Example: mail.google.com.
+#.
+#: ../lib/ephy-form-auth-data.c:145
+#, c-format
+msgid "Password in a form in %s"
+msgstr "用於 %s 表單的密碼"
+
 #: ../lib/ephy-gui.c:206
 #, c-format
 msgid "Directory “%s” is not writable"
@@ -1066,12 +1129,11 @@ msgstr "需要主控密碼"
 
 #: ../lib/ephy-nss-glue.c:64
 msgid ""
-"The passwords from the previous version (Gecko) are locked with a master "
-"password. If you want Epiphany to import them, please enter your master "
-"password below."
+"The passwords from the previous version are locked with a master password. "
+"If you want to import them, please enter your master password below."
 msgstr ""
-"在前一版本 (Gecko) 中所儲存的密碼都使用主控密碼鎖定了。如果您想要 Epiphany 匯"
-"入它們，請在下面輸入您的主控密碼。"
+"前一版中的密碼被鎖定在主控密碼中。如果您想要匯入它們，請在下面輸入您的主控密"
+"碼。"
 
 #: ../lib/ephy-profile-migrator.c:100
 msgid "Failed to copy cookies file from Mozilla."
@@ -1079,9 +1141,9 @@ msgstr "從 Mozilla 複製 cookies 檔案失敗。"
 
 #: ../lib/ephy-profile-migrator.c:652
 msgid ""
-"Epiphany 3.6 deprecated this directory and tried migrating this "
-"configuration to ~/.config/epiphany"
-msgstr "Epiphany 3.6 已廢棄這個目錄並且嘗試將這個組態轉移到 ~/.config/epiphany"
+"Web 3.6 deprecated this directory and tried migrating this configuration to "
+"~/.config/epiphany"
+msgstr "Web 3.6 已廢棄這個目錄並且嘗試將這個組態轉移到 ~/.config/epiphany"
 
 #: ../lib/ephy-profile-migrator.c:1030
 msgid "Executes only the n-th migration step"
@@ -1096,12 +1158,12 @@ msgid "Specifies the profile where the migrator should run"
 msgstr "指定轉移器應執行的設定組合"
 
 #: ../lib/ephy-profile-migrator.c:1047
-msgid "Epiphany profile migrator"
-msgstr "Epiphany 設定組合轉移器"
+msgid "Web profile migrator"
+msgstr "Web 設定組合轉移器"
 
 #: ../lib/ephy-profile-migrator.c:1048
-msgid "Epiphany profile migrator options"
-msgstr "Epiphany 設定組合轉移器選項"
+msgid "Web profile migrator options"
+msgstr "Web 設定組合轉移器選項"
 
 #. Translators: "friendly time" string for the current day, strftime format. like "Today 12:34 am"
 #: ../lib/ephy-time-helpers.c:223
@@ -1221,66 +1283,91 @@ msgstr "這個網站的身分已經通過檢驗"
 msgid "The identity of this website has not been verified"
 msgstr "這個網站的身分並沒有通過檢驗"
 
-#: ../lib/widgets/ephy-certificate-dialog.c:323
-#: ../src/bookmarks/ephy-bookmark-properties.c:649
+#: ../lib/widgets/ephy-certificate-dialog.c:326
+#: ../src/bookmarks/ephy-bookmark-properties.c:650
 #: ../src/bookmarks/ephy-bookmarks-editor.c:178
-#: ../src/ephy-history-window.c:143 ../src/ephy-window.c:118
+#: ../src/resources/cookies-dialog.ui.h:3 ../src/resources/epiphany.ui.h:2
+#: ../src/resources/passwords-dialog.ui.h:3
+#: ../src/resources/prefs-dialog.ui.h:2 ../src/ephy-history-window.c:143
+#: ../src/ephy-window.c:113
 msgid "_Close"
 msgstr "關閉(_C)"
 
+#: ../lib/widgets/ephy-download-widget.c:107
+#, c-format
+#| msgid "%u second left"
+#| msgid_plural "%u seconds left"
+msgid "%d second left"
+msgid_plural "%d seconds left"
+msgstr[0] "剩下 %d 秒鐘"
+
+#: ../lib/widgets/ephy-download-widget.c:113
+#, c-format
+#| msgid "%u:%02u minute left"
+#| msgid_plural "%u:%02u minutes left"
+msgid "%d minute left"
+msgid_plural "%d minutes left"
+msgstr[0] "剩下 %d 分鐘"
+
 #: ../lib/widgets/ephy-download-widget.c:119
 #, c-format
-msgid "%u:%02u hour left"
-msgid_plural "%u:%02u hours left"
-msgstr[0] "剩餘 %u:%02u 小時"
+#| msgid "%u hour left"
+#| msgid_plural "%u hours left"
+msgid "%d hour left"
+msgid_plural "%d hours left"
+msgstr[0] "剩下 %d 小時"
 
-#: ../lib/widgets/ephy-download-widget.c:121
+#: ../lib/widgets/ephy-download-widget.c:125
 #, c-format
-msgid "%u hour left"
-msgid_plural "%u hours left"
-msgstr[0] "剩餘 %u 小時"
+#| msgid "%u second left"
+#| msgid_plural "%u seconds left"
+msgid "%d day left"
+msgid_plural "%d days left"
+msgstr[0] "剩下 %d 天"
 
-#: ../lib/widgets/ephy-download-widget.c:124
+#: ../lib/widgets/ephy-download-widget.c:131
 #, c-format
-msgid "%u:%02u minute left"
-msgid_plural "%u:%02u minutes left"
-msgstr[0] "剩餘 %u:%02u 分鐘"
+#| msgid "%u second left"
+#| msgid_plural "%u seconds left"
+msgid "%d week left"
+msgid_plural "%d weeks left"
+msgstr[0] "剩下 %d 週"
 
-#: ../lib/widgets/ephy-download-widget.c:126
+#: ../lib/widgets/ephy-download-widget.c:137
 #, c-format
-msgid "%u second left"
-msgid_plural "%u seconds left"
-msgstr[0] "剩餘 %u 秒鐘"
+#| msgid "%u second left"
+#| msgid_plural "%u seconds left"
+msgid "%d month left"
+msgid_plural "%d months left"
+msgstr[0] "剩下 %d 月"
 
-#: ../lib/widgets/ephy-download-widget.c:296
-#: ../lib/widgets/ephy-download-widget.c:313
+#: ../lib/widgets/ephy-download-widget.c:293
 msgid "Finished"
 msgstr "已完成"
 
-#: ../lib/widgets/ephy-download-widget.c:328
-#: ../lib/widgets/ephy-download-widget.c:346
+#: ../lib/widgets/ephy-download-widget.c:309
 #, c-format
 msgid "Error downloading: %s"
 msgstr "下載時發生錯誤：%s"
 
-#: ../lib/widgets/ephy-download-widget.c:414 ../src/window-commands.c:896
+#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:781
 msgid "Cancel"
 msgstr "取消"
 
-#: ../lib/widgets/ephy-download-widget.c:423 ../src/ephy-window.c:1309
-#: ../src/window-commands.c:280
+#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1170
+#: ../src/window-commands.c:275
 msgid "Open"
 msgstr "開啟"
 
-#: ../lib/widgets/ephy-download-widget.c:429
+#: ../lib/widgets/ephy-download-widget.c:377
 msgid "Show in folder"
 msgstr "在資料夾顯示"
 
-#: ../lib/widgets/ephy-download-widget.c:628
+#: ../lib/widgets/ephy-download-widget.c:586
 msgid "Starting…"
 msgstr "正在開始…"
 
-#: ../lib/widgets/ephy-hosts-store.c:303
+#: ../lib/widgets/ephy-hosts-store.c:246
 msgid "All sites"
 msgstr "所有網站"
 
@@ -1292,33 +1379,32 @@ msgstr "網站"
 #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
 #. * Select All, Input Methods and Insert Unicode control character.)
 #.
-#: ../lib/widgets/ephy-location-entry.c:591
-#: ../src/resources/prefs-dialog.ui.h:34 ../src/ephy-history-window.c:229
-#: ../src/pdm-dialog.c:349
+#: ../lib/widgets/ephy-location-entry.c:618
+#: ../src/resources/prefs-dialog.ui.h:37 ../src/ephy-history-window.c:229
 msgid "Cl_ear"
 msgstr "清除(_E)"
 
 #. Edit actions.
-#: ../lib/widgets/ephy-location-entry.c:610 ../src/ephy-window.c:125
+#: ../lib/widgets/ephy-location-entry.c:637 ../src/ephy-window.c:120
 msgid "_Undo"
 msgstr "復原(_U)"
 
-#: ../lib/widgets/ephy-location-entry.c:617
+#: ../lib/widgets/ephy-location-entry.c:644
 msgid "_Redo"
 msgstr "取消復原(_R)"
 
-#: ../lib/widgets/ephy-location-entry.c:873
+#: ../lib/widgets/ephy-location-entry.c:924
 msgid "Drag and drop this icon to create a link to this page"
 msgstr "拖放這個圖示來建立連至該網頁的連結"
 
 #: ../lib/widgets/ephy-urls-view.c:43
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1698
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1623
 msgid "Title"
 msgstr "標題"
 
 #: ../lib/widgets/ephy-urls-view.c:51
 #: ../src/bookmarks/ephy-bookmarks-editor.c:212
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1709
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1634
 msgid "Address"
 msgstr "地址"
 
@@ -1329,55 +1415,56 @@ msgstr "日期"
 #. Translators: This string is used when counting bookmarks that
 #. * are similar to each other
 #: ../src/bookmarks/ephy-bookmark-properties.c:84
-#: ../src/bookmarks/ephy-bookmark-properties.c:610
+#: ../src/bookmarks/ephy-bookmark-properties.c:611
 #, c-format
 msgid "%d _Similar"
 msgid_plural "%d _Similar"
 msgstr[0] "%d 個相似(_S)"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:256
+#: ../src/bookmarks/ephy-bookmark-properties.c:257
 #, 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:273
-#: ../src/bookmarks/ephy-bookmark-properties.c:295
+#: ../src/bookmarks/ephy-bookmark-properties.c:274
+#: ../src/bookmarks/ephy-bookmark-properties.c:296
 #, c-format
 msgid "Show “%s”"
 msgstr "顯示“%s”"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:420
+#: ../src/bookmarks/ephy-bookmark-properties.c:421
 #, c-format
 msgid "“%s” Properties"
 msgstr "“%s”屬性"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:544
+#: ../src/bookmarks/ephy-bookmark-properties.c:545
 msgid "_Title:"
 msgstr "標題(_T)："
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:561
+#: ../src/bookmarks/ephy-bookmark-properties.c:562
 msgid "A_ddress:"
 msgstr "位址(_D)："
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:573
+#: ../src/bookmarks/ephy-bookmark-properties.c:574
 msgid "T_opics:"
 msgstr "主題(_O)："
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:596
+#: ../src/bookmarks/ephy-bookmark-properties.c:597
 msgid "Sho_w all topics"
 msgstr "顯示所有主題(_W)"
 
 #. Help.
-#: ../src/bookmarks/ephy-bookmark-properties.c:626
+#: ../src/bookmarks/ephy-bookmark-properties.c:627
 #: ../src/bookmarks/ephy-bookmarks-editor.c:154
-#: ../src/resources/epiphany-application-menu.ui.h:8
-#: ../src/ephy-history-window.c:130 ../src/ephy-window.c:197
-#: ../src/pdm-dialog.c:341
+#: ../src/resources/epiphany-application-menu.ui.h:7
+#: ../src/ephy-history-window.c:130 ../src/ephy-window.c:190
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:642
+#: ../src/bookmarks/ephy-bookmark-properties.c:643
+#: ../src/resources/prefs-dialog.ui.h:42
+#: ../src/resources/prefs-lang-dialog.ui.h:3
 msgid "_Add"
 msgstr "加入(_A)"
 
@@ -1406,33 +1493,33 @@ msgid "Work"
 msgstr "工作"
 
 #. Translators: this topic contains all bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:945
+#: ../src/bookmarks/ephy-bookmarks.c:926
 msgctxt "bookmarks"
 msgid "All"
 msgstr "全部"
 
 #. Translators: this topic contains the not categorized
 #. bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:949
+#: ../src/bookmarks/ephy-bookmarks.c:930
 msgctxt "bookmarks"
 msgid "Not Categorized"
 msgstr "未分類"
 
 #. Translators: this is an automatic topic containing local
 #. * websites bookmarks autodiscovered with zeroconf.
-#: ../src/bookmarks/ephy-bookmarks.c:953
+#: ../src/bookmarks/ephy-bookmarks.c:934
 msgctxt "bookmarks"
 msgid "Nearby Sites"
 msgstr "本地網站"
 
-#: ../src/bookmarks/ephy-bookmarks.c:1167
+#: ../src/bookmarks/ephy-bookmarks.c:1148
 #: ../src/bookmarks/ephy-bookmarks-import.c:270
 msgid "Untitled"
 msgstr "未命名"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:75
-msgid "Epiphany (RDF)"
-msgstr "Epiphany (RDF)"
+msgid "Web (RDF)"
+msgstr "Web (RDF)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:76
 msgid "Mozilla (HTML)"
@@ -1528,7 +1615,7 @@ msgstr "關閉書籤視窗"
 
 #. Edit Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:183
-#: ../src/ephy-history-window.c:148 ../src/ephy-window.c:129
+#: ../src/ephy-history-window.c:148 ../src/ephy-window.c:124
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
@@ -1540,7 +1627,7 @@ msgstr "剪下選定的內容"
 #: ../src/bookmarks/ephy-bookmarks-editor.c:186
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1171
 #: ../src/ephy-history-window.c:151 ../src/ephy-history-window.c:649
-#: ../src/ephy-window.c:131
+#: ../src/ephy-window.c:126
 msgid "_Copy"
 msgstr "複製(_C)"
 
@@ -1550,7 +1637,7 @@ msgid "Copy the selection"
 msgstr "複製選定的內容"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:189
-#: ../src/ephy-history-window.c:154 ../src/ephy-window.c:133
+#: ../src/ephy-history-window.c:154 ../src/ephy-window.c:128
 msgid "_Paste"
 msgstr "貼上(_P)"
 
@@ -1569,7 +1656,7 @@ msgid "Delete the selected bookmark or topic"
 msgstr "刪除已選的書籤或主題"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:195
-#: ../src/ephy-history-window.c:160 ../src/ephy-window.c:137
+#: ../src/ephy-history-window.c:160 ../src/ephy-window.c:132
 msgid "Select _All"
 msgstr "全部選取(_A)"
 
@@ -1588,8 +1675,8 @@ msgid "Display bookmarks help"
 msgstr "顯示書籤說明文件"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:203
-#: ../src/resources/epiphany-application-menu.ui.h:9
-#: ../src/ephy-history-window.c:171 ../src/ephy-window.c:199
+#: ../src/resources/epiphany-application-menu.ui.h:8
+#: ../src/ephy-history-window.c:171 ../src/ephy-window.c:192
 msgid "_About"
 msgstr "關於(_A)"
 
@@ -1692,15 +1779,15 @@ msgid "Galeon/Konqueror bookmarks"
 msgstr "Galeon/Konqueror 書籤"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:629
-msgid "Epiphany bookmarks"
-msgstr "Epiphany 書籤"
+msgid "Web bookmarks"
+msgstr "Web 書籤"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:753
 msgid "Export Bookmarks"
 msgstr "匯出書籤"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:760
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1572
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1497
 #: ../src/bookmarks/ephy-topic-action.c:217
 msgid "Bookmarks"
 msgstr "書籤"
@@ -1731,7 +1818,7 @@ msgstr "檔案"
 msgid "_Copy Address"
 msgstr "複製位址(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1628
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1553
 msgid "Topics"
 msgstr "主題"
 
@@ -1749,12 +1836,69 @@ msgstr "在新的分頁中開啟本主日題的書籤"
 msgid "Create topic “%s”"
 msgstr "建立主題“%s”"
 
+#: ../src/resources/clear-data-dialog.ui.h:1
+msgid "Clear Personal Data"
+msgstr "清除個人資料"
+
+#: ../src/resources/clear-data-dialog.ui.h:3
+msgid "C_lear"
+msgstr "清除(_L)"
+
+#: ../src/resources/clear-data-dialog.ui.h:4
+msgid "Select the personal data you wish to clear"
+msgstr "選擇您想要清除的個人資料"
+
+#: ../src/resources/clear-data-dialog.ui.h:5
+msgid ""
+"You are about to clear personal data that is stored about the web pages you "
+"have visited. Check the types of information that you want to remove:"
+msgstr ""
+"您即將清除用來儲存您瀏覽過的網頁的個人資料。請檢查您想要移除的資訊類型："
+
+#: ../src/resources/clear-data-dialog.ui.h:6
+#: ../src/resources/cookies-dialog.ui.h:1
+#: ../src/resources/prefs-dialog.ui.h:22
+msgid "Cookies"
+msgstr "Cookie"
+
+#: ../src/resources/clear-data-dialog.ui.h:7
+msgid "Cache and temporary files"
+msgstr "快取與暫存檔"
+
+#: ../src/resources/clear-data-dialog.ui.h:8
+msgid "Browsing history"
+msgstr "瀏覽記錄"
+
+#: ../src/resources/clear-data-dialog.ui.h:9
+msgid "Saved passwords"
+msgstr "已儲存的密碼"
+
+#: ../src/resources/clear-data-dialog.ui.h:10
+msgid ""
+"You cannot undo this action. The data you are choosing to clear will be "
+"removed forever."
+msgstr "您不可以將這個動作復原。您選擇要清除的資料會永遠移除。"
+
+#: ../src/resources/cookies-dialog.ui.h:2
+#: ../src/resources/passwords-dialog.ui.h:2
+msgid "C_lear All"
+msgstr "全部清除(_L)"
+
+#: ../src/resources/cookies-dialog.ui.h:4
+#: ../src/resources/passwords-dialog.ui.h:5
+msgid "Site"
+msgstr "網站"
+
+#: ../src/resources/cookies-dialog.ui.h:5
+msgid "Remove"
+msgstr "移除"
+
 #. File actions.
-#: ../src/resources/epiphany-application-menu.ui.h:1 ../src/ephy-window.c:104
+#: ../src/resources/epiphany-application-menu.ui.h:1 ../src/ephy-window.c:99
 msgid "_New Window"
 msgstr "新視窗(_N)"
 
-#: ../src/resources/epiphany-application-menu.ui.h:2 ../src/ephy-window.c:106
+#: ../src/resources/epiphany-application-menu.ui.h:2 ../src/ephy-window.c:101
 msgid "New _Incognito Window"
 msgstr "新增隱密視窗(_I)"
 
@@ -1763,219 +1907,232 @@ msgid "Reopen Closed _Tab"
 msgstr "重新開啟關閉的分頁(_T)"
 
 #. Toplevel
-#: ../src/resources/epiphany-application-menu.ui.h:4 ../src/ephy-window.c:97
+#: ../src/resources/epiphany-application-menu.ui.h:4 ../src/ephy-window.c:92
 msgid "_Bookmarks"
 msgstr "書籤(_B)"
 
-#: ../src/resources/epiphany-application-menu.ui.h:5 ../src/ephy-window.c:147
+#: ../src/resources/epiphany-application-menu.ui.h:5 ../src/ephy-window.c:142
 msgid "_History"
 msgstr "瀏覽記錄(_H)"
 
-#: ../src/resources/epiphany-application-menu.ui.h:6 ../src/ephy-window.c:151
-msgid "_Personal Data"
-msgstr "個人資料(_P)"
-
-#: ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:149
+#: ../src/resources/epiphany-application-menu.ui.h:6 ../src/ephy-window.c:144
 msgid "Pr_eferences"
 msgstr "偏好設定(_E)"
 
-#: ../src/resources/epiphany-application-menu.ui.h:10 ../src/ephy-window.c:120
+#: ../src/resources/epiphany-application-menu.ui.h:9 ../src/ephy-window.c:115
 msgid "_Quit"
 msgstr "結束(_Q)"
 
 #: ../src/resources/epiphany.ui.h:1
-msgid "Cookie properties"
-msgstr "Cookie 屬性"
-
-#: ../src/resources/epiphany.ui.h:2
-msgid "Content:"
-msgstr "內容"
-
-#: ../src/resources/epiphany.ui.h:3
-msgid "Path:"
-msgstr "路徑："
-
-#: ../src/resources/epiphany.ui.h:4
-msgid "Send for:"
-msgstr "傳送給："
-
-#: ../src/resources/epiphany.ui.h:5
-msgid "Expires:"
-msgstr "時限："
-
-#: ../src/resources/epiphany.ui.h:6
 msgid "Text Encoding"
 msgstr "字元編碼"
 
-#: ../src/resources/epiphany.ui.h:7
-msgid "<b>_Automatic</b>"
-msgstr "<b>自動(_A)：</b>"
+#: ../src/resources/epiphany.ui.h:3 ../src/ephy-encoding-menu.c:327
+msgid "_Automatic"
+msgstr "自動(_A)"
 
-#: ../src/resources/epiphany.ui.h:8 ../src/ephy-encoding-menu.c:349
+#: ../src/resources/epiphany.ui.h:4 ../src/ephy-encoding-menu.c:328
 msgid "Use the encoding specified by the document"
 msgstr "使用文件指定的編碼方式"
 
-#: ../src/resources/epiphany.ui.h:9
-msgid "<b>_Use a different encoding:</b>"
-msgstr "使用不同的編碼(_U)："
+#: ../src/resources/epiphany.ui.h:5
+msgid "_Use a different encoding:"
+msgstr "使用不同的編碼方式(_U):"
 
-#: ../src/resources/epiphany.ui.h:10
-msgid "Personal Data"
-msgstr "個人資料"
+#: ../src/resources/passwords-dialog.ui.h:1
+#: ../src/resources/prefs-dialog.ui.h:31
+msgid "Passwords"
+msgstr "密碼"
 
-#: ../src/resources/epiphany.ui.h:11 ../src/resources/prefs-dialog.ui.h:21
-msgid "Cookies"
-msgstr "Cookie"
+#: ../src/resources/passwords-dialog.ui.h:4
+msgid "Search passwords"
+msgstr "搜尋密碼"
 
-#: ../src/resources/epiphany.ui.h:12
-msgid "_Show passwords"
-msgstr "顯示密碼(_S)"
+#: ../src/resources/passwords-dialog.ui.h:6
+msgid "User Name"
+msgstr "使用者名稱"
 
-#: ../src/resources/epiphany.ui.h:13 ../src/resources/prefs-dialog.ui.h:29
-msgid "Passwords"
+#: ../src/resources/passwords-dialog.ui.h:7
+msgid "Password"
 msgstr "密碼"
 
-#: ../src/resources/prefs-dialog.ui.h:1
-msgid "Add Language"
-msgstr "增加語言"
+#: ../src/resources/passwords-dialog.ui.h:8
+msgid "_Copy Password"
+msgstr "複製密碼(_C)"
 
-#: ../src/resources/prefs-dialog.ui.h:2
-msgid "Choose a l_anguage:"
-msgstr "選擇語言(_A)："
+#: ../src/resources/passwords-dialog.ui.h:9
+msgid "C_opy Username"
+msgstr "複製使用者名稱(_O)"
 
-#: ../src/resources/prefs-dialog.ui.h:3
+#: ../src/resources/prefs-dialog.ui.h:1
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../src/resources/prefs-dialog.ui.h:5
+#: ../src/resources/prefs-dialog.ui.h:4
 msgid "_Download folder:"
 msgstr "下載資料夾(_D)"
 
-#: ../src/resources/prefs-dialog.ui.h:6
+#: ../src/resources/prefs-dialog.ui.h:5
 msgid "A_utomatically open downloaded files"
 msgstr "自動下載並開啟檔案(_U)"
 
+#: ../src/resources/prefs-dialog.ui.h:6
+msgid "Search"
+msgstr "搜尋"
+
 #: ../src/resources/prefs-dialog.ui.h:7
+msgid "_Engine:"
+msgstr "引擎(_E):"
+
+#: ../src/resources/prefs-dialog.ui.h:8
 msgid "Web Content"
 msgstr "網頁內容"
 
-#: ../src/resources/prefs-dialog.ui.h:8
+#: ../src/resources/prefs-dialog.ui.h:9
 msgid "Allow popup _windows"
 msgstr "允許彈出式視窗(_W)"
 
-#: ../src/resources/prefs-dialog.ui.h:9
+#: ../src/resources/prefs-dialog.ui.h:10
 msgid "Allow _advertisements"
 msgstr "允許廣告(_A)"
 
-#: ../src/resources/prefs-dialog.ui.h:10
+#: ../src/resources/prefs-dialog.ui.h:11
 msgid "Enable _plugins"
 msgstr "啟用外掛程式(_P)"
 
-#: ../src/resources/prefs-dialog.ui.h:11
+#: ../src/resources/prefs-dialog.ui.h:12
 msgid "General"
 msgstr "一般"
 
-#: ../src/resources/prefs-dialog.ui.h:12
+#: ../src/resources/prefs-dialog.ui.h:13
 msgid "Fonts"
 msgstr "字型"
 
-#: ../src/resources/prefs-dialog.ui.h:13
+#: ../src/resources/prefs-dialog.ui.h:14
 msgid "_Use system fonts"
 msgstr "使用系統字型(_U)"
 
-#: ../src/resources/prefs-dialog.ui.h:14
+#: ../src/resources/prefs-dialog.ui.h:15
 msgid "Sans serif font:"
 msgstr "無襯線字型："
 
-#: ../src/resources/prefs-dialog.ui.h:15
+#: ../src/resources/prefs-dialog.ui.h:16
 msgid "Serif font:"
 msgstr "襯線字型："
 
-#: ../src/resources/prefs-dialog.ui.h:16
+#: ../src/resources/prefs-dialog.ui.h:17
 msgid "Monospace font:"
 msgstr "等寬字型："
 
-#: ../src/resources/prefs-dialog.ui.h:17
+#: ../src/resources/prefs-dialog.ui.h:18
 msgid "Style"
 msgstr "樣式"
 
-#: ../src/resources/prefs-dialog.ui.h:18
+#: ../src/resources/prefs-dialog.ui.h:19
 msgid "Use custom _stylesheet"
 msgstr "使用自訂樣式表(_S)"
 
-#: ../src/resources/prefs-dialog.ui.h:19
+#: ../src/resources/prefs-dialog.ui.h:20
 msgid "_Edit Stylesheet…"
 msgstr "編輯樣式表(_E)…"
 
-#: ../src/resources/prefs-dialog.ui.h:20
+#: ../src/resources/prefs-dialog.ui.h:21
 msgid "Fonts & Style"
 msgstr "字型與樣式"
 
-#: ../src/resources/prefs-dialog.ui.h:22
+#: ../src/resources/prefs-dialog.ui.h:23
+msgid "Manage Cookies"
+msgstr "管理 Cookies"
+
+#: ../src/resources/prefs-dialog.ui.h:24
 msgid "_Always accept"
 msgstr "總是接受(_A)"
 
-#: ../src/resources/prefs-dialog.ui.h:23
+#: ../src/resources/prefs-dialog.ui.h:25
 msgid "Only _from sites you visit"
 msgstr "只來自您瀏覽的網站(_F)"
 
 #. Refers to "Only from sites you visit" option under Cookies.
-#: ../src/resources/prefs-dialog.ui.h:25
+#: ../src/resources/prefs-dialog.ui.h:27
 msgid "<small>For example, not from advertisers on these sites</small>"
 msgstr "<small>例如，不要來自這些網站的廣告</small>"
 
-#: ../src/resources/prefs-dialog.ui.h:26
+#: ../src/resources/prefs-dialog.ui.h:28
 msgid "_Never accept"
 msgstr "永不接受(_N)"
 
-#: ../src/resources/prefs-dialog.ui.h:27
+#: ../src/resources/prefs-dialog.ui.h:29
 msgid "Tracking"
 msgstr "追蹤"
 
-#: ../src/resources/prefs-dialog.ui.h:28
+#: ../src/resources/prefs-dialog.ui.h:30
 msgid "_Tell web sites I do not want to be tracked"
 msgstr "告訴網站我不想被追蹤(_T)"
 
-#: ../src/resources/prefs-dialog.ui.h:30
+#: ../src/resources/prefs-dialog.ui.h:32
+msgid "Manage Passwords"
+msgstr "管理密碼"
+
+#: ../src/resources/prefs-dialog.ui.h:33
 msgid "_Remember passwords"
 msgstr "記錄密碼(_R)"
 
-#: ../src/resources/prefs-dialog.ui.h:31
+#: ../src/resources/prefs-dialog.ui.h:34
 msgid "Temporary Files"
 msgstr "暫存檔"
 
-#: ../src/resources/prefs-dialog.ui.h:32
+#: ../src/resources/prefs-dialog.ui.h:35
 msgid "_Disk space:"
 msgstr "磁碟空間(_D)："
 
-#: ../src/resources/prefs-dialog.ui.h:33
+#: ../src/resources/prefs-dialog.ui.h:36
 msgid "MB"
 msgstr "MB"
 
-#: ../src/resources/prefs-dialog.ui.h:35
+#: ../src/resources/prefs-dialog.ui.h:38
 msgid "Privacy"
 msgstr "隱私"
 
-#: ../src/resources/prefs-dialog.ui.h:36 ../src/ephy-encoding-dialog.c:416
+#: ../src/resources/prefs-dialog.ui.h:39 ../src/ephy-encoding-dialog.c:379
 msgid "Encodings"
 msgstr "編碼"
 
-#: ../src/resources/prefs-dialog.ui.h:37
+#: ../src/resources/prefs-dialog.ui.h:40
 msgid "De_fault:"
 msgstr "預設(_F)："
 
-#: ../src/resources/prefs-dialog.ui.h:39
+#: ../src/resources/prefs-dialog.ui.h:43
+msgid "_Remove"
+msgstr "移除(_R)"
+
+#: ../src/resources/prefs-dialog.ui.h:44
+msgid "_Up"
+msgstr "上(_U)"
+
+#: ../src/resources/prefs-dialog.ui.h:45
+msgid "_Down"
+msgstr "下(_D)"
+
+#: ../src/resources/prefs-dialog.ui.h:46
 msgid "Spell checking"
 msgstr "拼字檢查"
 
-#: ../src/resources/prefs-dialog.ui.h:40
+#: ../src/resources/prefs-dialog.ui.h:47
 msgid "_Enable spell checking"
 msgstr "啟用拼字檢查(_E)"
 
-#: ../src/resources/prefs-dialog.ui.h:41 ../src/prefs-dialog.c:755
+#: ../src/resources/prefs-dialog.ui.h:48 ../src/prefs-dialog.c:835
 msgid "Language"
 msgstr "語言"
 
+#: ../src/resources/prefs-lang-dialog.ui.h:1
+msgid "Add Language"
+msgstr "增加語言"
+
+#: ../src/resources/prefs-lang-dialog.ui.h:4
+msgid "Choose a l_anguage:"
+msgstr "選擇語言(_A)："
+
 #: ../src/ephy-combined-stop-reload-action.c:41
 msgid "Stop"
 msgstr "停止"
@@ -1984,7 +2141,7 @@ msgstr "停止"
 msgid "Stop current data transfer"
 msgstr "停止傳送目前的資料"
 
-#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:160
+#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:153
 msgid "_Reload"
 msgstr "重新載入(_R)"
 
@@ -1992,38 +2149,14 @@ msgstr "重新載入(_R)"
 msgid "Display the latest content of the current page"
 msgstr "顯示本頁的最新內容"
 
-#: ../src/ephy-encoding-menu.c:341
+#: ../src/ephy-encoding-menu.c:320
 msgid "_Other…"
 msgstr "其它(_O)…"
 
-#: ../src/ephy-encoding-menu.c:342
+#: ../src/ephy-encoding-menu.c:321
 msgid "Other encodings"
 msgstr "其他字元編碼方式"
 
-#: ../src/ephy-encoding-menu.c:348
-msgid "_Automatic"
-msgstr "自動(_A)"
-
-#: ../src/ephy-find-toolbar.c:148
-msgid "Text not found"
-msgstr "找不到文字"
-
-#: ../src/ephy-find-toolbar.c:155
-msgid "Search wrapped back to the top"
-msgstr "搜尋至結尾後返回開頭"
-
-#: ../src/ephy-find-toolbar.c:579
-msgid "Type to search…"
-msgstr "輸入以搜尋…"
-
-#: ../src/ephy-find-toolbar.c:585
-msgid "Find previous occurrence of the search string"
-msgstr "尋找上一個出現搜尋字串的地方"
-
-#: ../src/ephy-find-toolbar.c:593
-msgid "Find next occurrence of the search string"
-msgstr "尋找下一個出現搜尋字串的地方"
-
 #: ../src/ephy-history-window.c:135
 msgid "Open the selected history link in a new window"
 msgstr "在新的視窗中開啟已選的瀏覽記錄連結"
@@ -2111,75 +2244,71 @@ msgstr[0] "最近 %d 日"
 msgid "All history"
 msgstr "所有瀏覽記錄"
 
-#: ../src/ephy-history-window.c:1113
+#: ../src/ephy-history-window.c:1107
 msgid "History"
 msgstr "瀏覽記錄"
 
-#: ../src/ephy-main.c:77
+#: ../src/ephy-main.c:76
 msgid "Open a new tab in an existing browser window"
 msgstr "在現有的瀏覽器視窗中開啟新的分頁"
 
-#: ../src/ephy-main.c:79
+#: ../src/ephy-main.c:78
 msgid "Open a new browser window"
 msgstr "開啟新的瀏覽器視窗"
 
-#: ../src/ephy-main.c:81
+#: ../src/ephy-main.c:80
 msgid "Import bookmarks from the given file"
 msgstr "從所指定的檔案匯入書籤"
 
-#: ../src/ephy-main.c:81 ../src/ephy-main.c:83
+#: ../src/ephy-main.c:80 ../src/ephy-main.c:82
 msgid "FILE"
 msgstr "檔案"
 
-#: ../src/ephy-main.c:83
+#: ../src/ephy-main.c:82
 msgid "Load the given session file"
 msgstr "載入指定的作業階段檔案"
 
-#: ../src/ephy-main.c:85
+#: ../src/ephy-main.c:84
 msgid "Add a bookmark"
 msgstr "加入書籤"
 
-#: ../src/ephy-main.c:85
+#: ../src/ephy-main.c:84
 msgid "URL"
 msgstr "URL"
 
-#: ../src/ephy-main.c:87
+#: ../src/ephy-main.c:86
 msgid "Start a private instance"
 msgstr "啟動私密實體"
 
-#: ../src/ephy-main.c:89
+#: ../src/ephy-main.c:88
 msgid "Start an instance in incognito mode"
 msgstr "以隱密模式啟動瀏覽器"
 
-#: ../src/ephy-main.c:91
+#: ../src/ephy-main.c:90
 msgid "Start an instance in netbank mode"
 msgstr "以網路銀行模式啟動瀏覽器"
 
-#: ../src/ephy-main.c:93
+#: ../src/ephy-main.c:92
 msgid "Start the browser in application mode"
 msgstr "以應用程式模式啟動瀏覽器"
 
-#: ../src/ephy-main.c:95
-msgid "Start the application without opening windows"
-msgstr "不開啟視窗而啟動應用程式"
-
-#: ../src/ephy-main.c:97
+#: ../src/ephy-main.c:94
 msgid "Profile directory to use in the private instance"
 msgstr "在私密實體中使用的設定組合目錄"
 
-#: ../src/ephy-main.c:97
+#: ../src/ephy-main.c:94
 msgid "DIR"
 msgstr "DIR"
 
-#: ../src/ephy-main.c:99
+#: ../src/ephy-main.c:96
 msgid "URL …"
 msgstr "URL…"
 
-#: ../src/ephy-main.c:204
+#: ../src/ephy-main.c:201
 msgid "Could not start Web"
 msgstr "無法啟動網頁"
 
-#: ../src/ephy-main.c:207
+#: ../src/ephy-main.c:204
 #, c-format
 msgid ""
 "Startup failed because of the following error:\n"
@@ -2188,361 +2317,262 @@ msgstr ""
 "由於以下原因，因此無法執行：\n"
 "%s"
 
-#: ../src/ephy-main.c:321
+#: ../src/ephy-main.c:315
 msgid "Web options"
 msgstr "網頁選項"
 
-#: ../src/ephy-notebook.c:599
+#: ../src/ephy-notebook.c:602
 msgid "Close tab"
 msgstr "關閉分頁"
 
-#: ../src/ephy-search-provider.c:202
+#: ../src/ephy-search-provider.c:199
 #, c-format
 msgid "Search the Web for %s"
 msgstr "在網路搜尋 %s"
 
-#: ../src/ephy-window.c:108
+#: ../src/ephy-window.c:103
 msgid "_Open…"
 msgstr "開啟(_O)…"
 
-#: ../src/ephy-window.c:110
+#: ../src/ephy-window.c:105
 msgid "Save _As…"
 msgstr "另存新檔(_A)…"
 
-#: ../src/ephy-window.c:112
+#: ../src/ephy-window.c:107
 msgid "Save As _Web Application…"
 msgstr "儲存為網頁應用程式(_W)…"
 
-#: ../src/ephy-window.c:114
+#: ../src/ephy-window.c:109
 msgid "_Print…"
 msgstr "列印(_P)…"
 
-#: ../src/ephy-window.c:116
+#: ../src/ephy-window.c:111
 msgid "S_end Link by Email…"
 msgstr "以電郵傳送連結(_E)…"
 
-#: ../src/ephy-window.c:127
+#: ../src/ephy-window.c:122
 msgid "Re_do"
 msgstr "取消復原(_D)"
 
-#: ../src/ephy-window.c:139
+#: ../src/ephy-window.c:134
 msgid "_Find…"
 msgstr "尋找(_F)…"
 
-#: ../src/ephy-window.c:141
+#: ../src/ephy-window.c:136
 msgid "Find Ne_xt"
 msgstr "找下一個(_X)"
 
-#: ../src/ephy-window.c:143
+#: ../src/ephy-window.c:138
 msgid "Find Pre_vious"
 msgstr "找上一個(_V)"
 
-#: ../src/ephy-window.c:145
+#: ../src/ephy-window.c:140
 msgid "Edit _Bookmarks"
 msgstr "編輯書籤(_B)"
 
 #. View actions.
-#: ../src/ephy-window.c:156 ../src/ephy-window.c:158
+#: ../src/ephy-window.c:149 ../src/ephy-window.c:151
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: ../src/ephy-window.c:162
+#: ../src/ephy-window.c:155
 msgid "Zoom _In"
 msgstr "拉近(_I)"
 
-#: ../src/ephy-window.c:164
+#: ../src/ephy-window.c:157
 msgid "Zoom O_ut"
 msgstr "拉遠(_U)"
 
-#: ../src/ephy-window.c:166
+#: ../src/ephy-window.c:159
 msgid "_Normal Size"
 msgstr "正常大小(_N)"
 
-#: ../src/ephy-window.c:168
+#: ../src/ephy-window.c:161
 msgid "Text _Encoding"
 msgstr "字元編碼(_E)"
 
-#: ../src/ephy-window.c:169
+#: ../src/ephy-window.c:162
 msgid "_Page Source"
 msgstr "網頁原始內容(_P)"
 
 #. Bookmarks actions.
-#: ../src/ephy-window.c:174
+#: ../src/ephy-window.c:167
 msgid "_Add Bookmark…"
 msgstr "加入書籤(_A)…"
 
 #. Go actions.
-#: ../src/ephy-window.c:179
+#: ../src/ephy-window.c:172
 msgid "_Location…"
 msgstr "位置(_L)…"
 
 #. Tabs actions.
-#: ../src/ephy-window.c:184
+#: ../src/ephy-window.c:177
 msgid "_Previous Tab"
 msgstr "上一個分頁(_P)"
 
-#: ../src/ephy-window.c:186
+#: ../src/ephy-window.c:179
 msgid "_Next Tab"
 msgstr "下一個分頁(_N)"
 
-#: ../src/ephy-window.c:188
+#: ../src/ephy-window.c:181
 msgid "Move Tab _Left"
 msgstr "分頁向左移(_L)"
 
-#: ../src/ephy-window.c:190
+#: ../src/ephy-window.c:183
 msgid "Move Tab _Right"
 msgstr "分頁向右移(_R)"
 
-#: ../src/ephy-window.c:192
+#: ../src/ephy-window.c:185
 msgid "_Detach Tab"
 msgstr "分離分頁(_D)"
 
 #. View actions.
-#: ../src/ephy-window.c:207
+#: ../src/ephy-window.c:200
 msgid "_Downloads Bar"
 msgstr "下載列(_D)"
 
-#: ../src/ephy-window.c:210
+#: ../src/ephy-window.c:203
 msgid "_Fullscreen"
 msgstr "全螢幕(_F)"
 
-#: ../src/ephy-window.c:212
+#: ../src/ephy-window.c:205
 msgid "Popup _Windows"
 msgstr "彈出式視窗(_W)"
 
-#: ../src/ephy-window.c:214
+#: ../src/ephy-window.c:207
 msgid "Selection Caret"
 msgstr "選擇游標"
 
 #. Document.
-#: ../src/ephy-window.c:221
+#: ../src/ephy-window.c:214
 msgid "Add Boo_kmark…"
 msgstr "加入書籤(_K)…"
 
 #. Links.
-#: ../src/ephy-window.c:226
-msgid "_Open Link"
-msgstr "開啟連結(_O)"
-
-#: ../src/ephy-window.c:228
+#: ../src/ephy-window.c:219
 msgid "Open Link in New _Window"
 msgstr "在新的視窗中開啟連結(_W)"
 
-#: ../src/ephy-window.c:230
+#: ../src/ephy-window.c:221
 msgid "Open Link in New _Tab"
 msgstr "在新的分頁中開啟連結(_T)"
 
-#: ../src/ephy-window.c:232
-msgid "_Download Link"
-msgstr "下載連結(_D)"
-
-#: ../src/ephy-window.c:234
+#: ../src/ephy-window.c:223
 msgid "_Save Link As…"
 msgstr "另存連結(_S)…"
 
-#: ../src/ephy-window.c:236
-msgid "_Bookmark Link…"
-msgstr "將連結加入書籤(_B)…"
-
-#: ../src/ephy-window.c:238
+#: ../src/ephy-window.c:225
 msgid "_Copy Link Address"
 msgstr "複製連結地址(_C)"
 
-#: ../src/ephy-window.c:240
+#: ../src/ephy-window.c:227
 msgid "_Copy E-mail Address"
 msgstr "複製電子郵件位址(_C)"
 
 #. Images.
-#: ../src/ephy-window.c:245
-msgid "Open _Image"
-msgstr "開啟圖片(_I)"
+#: ../src/ephy-window.c:232
+msgid "View _Image"
+msgstr "檢視圖片(_I)"
 
-#: ../src/ephy-window.c:247
+#: ../src/ephy-window.c:234
+msgid "Copy I_mage Address"
+msgstr "複製圖片地址(_M)"
+
+#: ../src/ephy-window.c:236
 msgid "_Save Image As…"
 msgstr "另存圖片(_S)…"
 
-#: ../src/ephy-window.c:249
-msgid "_Use Image As Background"
-msgstr "使用圖片作為桌面背景(_U)"
-
-#: ../src/ephy-window.c:251
-msgid "Copy I_mage Address"
-msgstr "複製圖片地址(_M)"
+#: ../src/ephy-window.c:238
+msgid "Set as _Wallpaper"
+msgstr "設為桌布(_W)"
 
-#: ../src/ephy-window.c:253
+#: ../src/ephy-window.c:240
 msgid "St_art Animation"
 msgstr "動畫開始(_A)"
 
-#: ../src/ephy-window.c:255
+#: ../src/ephy-window.c:242
 msgid "St_op Animation"
 msgstr "動畫停止(_O)"
 
-#. Inspector.
-#: ../src/ephy-window.c:271
-msgid "Inspect _Element"
-msgstr "檢查元素(_E)"
-
-#: ../src/ephy-window.c:478
+#: ../src/ephy-window.c:450
 msgid "There are unsubmitted changes to form elements"
 msgstr "對表單的元素而言沒有經確認的改變"
 
-#: ../src/ephy-window.c:479
+#: ../src/ephy-window.c:451
 msgid "If you close the document anyway, you will lose that information."
 msgstr "如果您無論無何要關閉此文件，您將會失去未儲存的資訊。"
 
-#: ../src/ephy-window.c:481
+#: ../src/ephy-window.c:453
 msgid "Close _Document"
 msgstr "關閉文件(_D)"
 
-#: ../src/ephy-window.c:496
+#: ../src/ephy-window.c:468
 msgid "There are ongoing downloads in this window"
 msgstr "這個視窗還有進行中的下載"
 
-#: ../src/ephy-window.c:497
+#: ../src/ephy-window.c:469
 msgid "If you close this window, the downloads will be cancelled"
 msgstr "如果您關閉這個視窗，這個下載也會被取消"
 
-#: ../src/ephy-window.c:498
+#: ../src/ephy-window.c:470
 msgid "Close window and cancel downloads"
 msgstr "關閉視窗並取消下載"
 
-#: ../src/ephy-window.c:1311
+#: ../src/ephy-window.c:1172
 msgid "Save As"
 msgstr "另存新檔"
 
-#: ../src/ephy-window.c:1313
+#: ../src/ephy-window.c:1174
 msgid "Save As Application"
 msgstr "儲存為應用程式"
 
-#: ../src/ephy-window.c:1315
+#: ../src/ephy-window.c:1176
 msgid "Print"
 msgstr "列印"
 
-#: ../src/ephy-window.c:1317
+#: ../src/ephy-window.c:1178
 msgid "Bookmark"
 msgstr "加入書籤"
 
-#: ../src/ephy-window.c:1319
+#: ../src/ephy-window.c:1180
 msgid "Find"
 msgstr "尋找"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1328
+#: ../src/ephy-window.c:1189
 msgid "Larger"
 msgstr "放大"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1331
+#: ../src/ephy-window.c:1192
 msgid "Smaller"
 msgstr "縮小"
 
-#: ../src/ephy-window.c:1359
+#: ../src/ephy-window.c:1220
 msgid "Back"
 msgstr "上一頁"
 
-#: ../src/ephy-window.c:1371
+#: ../src/ephy-window.c:1232
 msgid "Forward"
 msgstr "下一頁"
 
-#: ../src/ephy-window.c:1383
+#: ../src/ephy-window.c:1244
 msgid "Zoom"
 msgstr "縮放"
 
-#: ../src/ephy-window.c:1392
+#: ../src/ephy-window.c:1253
 msgid "New _Tab"
 msgstr "新增分頁(_T)"
 
-#: ../src/ephy-window.c:1400
+#: ../src/ephy-window.c:1261
 msgid "Go to most visited"
 msgstr "移至最常瀏覽"
 
-#: ../src/pdm-dialog.c:330
-msgid "<b>Select the personal data you want to clear</b>"
-msgstr "<b>選擇想要清除的個人資料</b>"
-
-#: ../src/pdm-dialog.c:333
-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:338
-msgid "Clear All Personal Data"
-msgstr "清除所有的個人資料"
-
-#. Cookies
-#: ../src/pdm-dialog.c:370
-msgid "C_ookies"
-msgstr "C_ookies"
-
-#. Passwords
-#: ../src/pdm-dialog.c:382
-msgid "Saved _passwords"
-msgstr "儲存的密碼(_P)"
-
-#. History
-#: ../src/pdm-dialog.c:394
-msgid "Hi_story"
-msgstr "歷史記錄(_S)"
-
-#. Cache
-#: ../src/pdm-dialog.c:406
-msgid "_Temporary files"
-msgstr "暫存檔案(_T)"
-
-#: ../src/pdm-dialog.c:422
-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:645
-msgid "Encrypted connections only"
-msgstr "只限加密後的連線"
-
-#: ../src/pdm-dialog.c:646
-msgid "Any type of connection"
-msgstr "任何類型的連線"
-
-#. Session cookie
-#: ../src/pdm-dialog.c:651
-msgid "End of current session"
-msgstr "結束目前的作業階段"
-
-#: ../src/pdm-dialog.c:775
-msgid "Domain"
-msgstr "網域"
-
-#: ../src/pdm-dialog.c:787
-msgid "Name"
-msgstr "名稱"
-
-#: ../src/pdm-dialog.c:1305
-msgid "Host"
-msgstr "主機"
-
-#: ../src/pdm-dialog.c:1318
-msgid "User Name"
-msgstr "使用者名稱"
-
-#: ../src/pdm-dialog.c:1331
-msgid "User Password"
-msgstr "使用者密碼"
-
-#: ../src/popup-commands.c:321
-msgid "Download Link"
-msgstr "下載連結"
-
-#: ../src/popup-commands.c:329
+#: ../src/popup-commands.c:234
 msgid "Save Link As"
 msgstr "另存連結(_A)…"
 
-#: ../src/popup-commands.c:336
+#: ../src/popup-commands.c:240
 msgid "Save Image As"
 msgstr "另存圖片"
 
@@ -2550,7 +2580,7 @@ msgstr "另存圖片"
 #. * second %s is the locale name. Example:
 #. * "French (France)"
 #.
-#: ../src/prefs-dialog.c:449 ../src/prefs-dialog.c:455
+#: ../src/prefs-dialog.c:549 ../src/prefs-dialog.c:555
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -2559,108 +2589,111 @@ msgstr "%s (%s)"
 #. Translators: this refers to a user-define language code
 #. * (one which isn't in our built-in list).
 #.
-#: ../src/prefs-dialog.c:464
+#: ../src/prefs-dialog.c:564
 #, c-format
 msgctxt "language"
 msgid "User defined (%s)"
 msgstr "使用者定義 (%s)"
 
-#: ../src/prefs-dialog.c:486
+#: ../src/prefs-dialog.c:586
 #, c-format
 msgid "System language (%s)"
 msgid_plural "System languages (%s)"
 msgstr[0] "系統語言 (%s)"
 
-#: ../src/prefs-dialog.c:844
+#: ../src/prefs-dialog.c:918
 msgid "Select a Directory"
 msgstr "選擇一個目錄"
 
-#: ../src/window-commands.c:358
-msgid "Save"
-msgstr "儲存"
+#. Search engine option in the preferences dialog
+#: ../src/prefs-dialog.c:1011
+msgid "DuckDuckGo"
+msgstr "DuckDuckGo"
 
-#: ../src/window-commands.c:893
+#. For the preferences dialog. Must exactly match the URL
+#. * you chose in the gschema, but with & instead of &amp;
+#. * If the match is not exact, there will be a spurious, ugly
+#. * entry in the preferences combo, so please test this.
+#: ../src/prefs-dialog.c:1016
+#, c-format
+#| msgid "http://duckduckgo.com/?q=%s&t=epiphany";
+msgid "https://duckduckgo.com/?q=%s&t=epiphany";
+msgstr "https://duckduckgo.com/?q=%s&t=epiphany";
+
+#. Search engine option in the preferences dialog
+#: ../src/prefs-dialog.c:1018
+msgid "Google"
+msgstr "Google"
+
+#. For the preferences dialog. Consider a regional variant, like google.co.uk
+#: ../src/prefs-dialog.c:1020
+#, c-format
+#| msgid "http://google.com/search?q=%s";
+msgid "https://google.com/search?q=%s";
+msgstr "https://www.google.com.tw/search?q=%s";
+
+#. Search engine option in the preferences dialog
+#: ../src/prefs-dialog.c:1022
+msgid "Bing"
+msgstr "Bing"
+
+#. For the preferences dialog. Consider a regional variant, like uk.bing.com
+#: ../src/prefs-dialog.c:1024
+#, c-format
+msgid "http://www.bing.com/search?q=%s";
+msgstr "http://www.bing.com/search?q=%s";
+
+#: ../src/window-commands.c:778
 #, c-format
 msgid "A web application named '%s' already exists. Do you want to replace it?"
 msgstr "已存在名為「%s」的網頁應用程式。您想要取代它嗎？"
 
-#: ../src/window-commands.c:898
+#: ../src/window-commands.c:783
 msgid "Replace"
 msgstr "取代"
 
-#: ../src/window-commands.c:902
+#: ../src/window-commands.c:787
 msgid ""
 "An application with the same name already exists. Replacing it will "
 "overwrite it."
 msgstr "以此為名的應用程式已經存在。取代它會將它覆蓋。"
 
-#: ../src/window-commands.c:938
+#: ../src/window-commands.c:823
 #, c-format
 msgid "The application '%s' is ready to be used"
 msgstr "應用程式「%s」已經準備好可以使用"
 
-#: ../src/window-commands.c:941
+#: ../src/window-commands.c:826
 #, c-format
 msgid "The application '%s' could not be created"
 msgstr "無法建立應用程式「%s」"
 
-#: ../src/window-commands.c:949
+#: ../src/window-commands.c:834
 msgid "Launch"
 msgstr "執行"
 
 #. Show dialog with icon, title.
-#: ../src/window-commands.c:989
+#: ../src/window-commands.c:874
 msgid "Create Web Application"
 msgstr "建立網頁應用程式"
 
-#: ../src/window-commands.c:994
+#: ../src/window-commands.c:879
 msgid "C_reate"
 msgstr "建立(_R)"
 
-#: ../src/window-commands.c:1676
-msgid ""
-"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:1680
-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 "
-"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
-msgstr ""
-"GNOME 網頁瀏覽器係基於使用目的而加以散布，然而不負任何擔保責任；亦無對適售性"
-"或特定目的適用性所為的默示性擔保。詳情請參照 GNU 通用公共授權。"
-
-#: ../src/window-commands.c:1684
-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:1730 ../src/window-commands.c:1746
-#: ../src/window-commands.c:1757
+#: ../src/window-commands.c:1535 ../src/window-commands.c:1558
 msgid "Contact us at:"
 msgstr "聯絡我們於："
 
-#: ../src/window-commands.c:1733
+#: ../src/window-commands.c:1538
 msgid "Contributors:"
 msgstr "貢獻者："
 
-#: ../src/window-commands.c:1736
+#: ../src/window-commands.c:1541
 msgid "Past developers:"
 msgstr "前度開發人員："
 
-#: ../src/window-commands.c:1767 ../src/window-commands.c:1773
+#: ../src/window-commands.c:1567
 #, c-format
 msgid ""
 "A simple, clean, beautiful view of the web.\n"
@@ -2677,7 +2710,7 @@ msgstr ""
 #. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
 #.
-#: ../src/window-commands.c:1803
+#: ../src/window-commands.c:1590
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -2688,15 +2721,15 @@ msgstr ""
 "Ching-Hung Lin <billlin wshlab2 ee kuas edu tw>, 2004\n"
 "Abel Cheung <maddog linux org hk>, 2003"
 
-#: ../src/window-commands.c:1806
+#: ../src/window-commands.c:1593
 msgid "Web Website"
 msgstr "網頁網站"
 
-#: ../src/window-commands.c:1946
+#: ../src/window-commands.c:1732
 msgid "Enable caret browsing mode?"
 msgstr "是否啟用鍵盤瀏覽？"
 
-#: ../src/window-commands.c:1949
+#: ../src/window-commands.c:1735
 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 "
@@ -2705,12 +2738,143 @@ msgstr ""
 "按下 F7 會開啟或關閉鍵盤瀏覽。這個功能會在網頁中放置一個可移動的游標，讓您可"
 "以使用鍵盤隨處移動。您是否要啟用鍵盤瀏覽？"
 
-#: ../src/window-commands.c:1952
+#: ../src/window-commands.c:1738
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#~ 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";
+#~ msgid "%u:%02u hour left"
+#~ msgid_plural "%u:%02u hours left"
+#~ msgstr[0] "剩餘 %u:%02u 小時"
+
+#~ msgid "Use GNOME desktop wide font configuration."
+#~ msgstr "使用 GNOME 桌面字型組態。"
+
+#~ msgid "Not now"
+#~ msgstr "現在不要"
+
+#~ msgid "Store password"
+#~ msgstr "儲存密碼"
+
+#~ 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>"
+
+#~ msgid "Oops! Error loading %s"
+#~ msgstr "噢！載入 %s 時發生錯誤"
+
+#~ msgid ""
+#~ "Oops! This site might have caused the web browser to close unexpectedly"
+#~ msgstr "噢！這個網站可能已造成網頁瀏覽器未預期的關閉"
+
+#~ msgid "Oops! Something went wrong displaying %s"
+#~ msgstr "噢！顯示 %s 時發生問題"
+
+#~ msgid "Epiphany (RDF)"
+#~ msgstr "Epiphany (RDF)"
+
+#~ msgid "Epiphany bookmarks"
+#~ msgstr "Epiphany 書籤"
+
+#~ msgid "_Personal Data"
+#~ msgstr "個人資料(_P)"
+
+#~ msgid "Cookie properties"
+#~ msgstr "Cookie 屬性"
+
+#~ msgid "Content:"
+#~ msgstr "內容"
+
+#~ msgid "Path:"
+#~ msgstr "路徑："
+
+#~ msgid "Send for:"
+#~ msgstr "傳送給："
+
+#~ msgid "Expires:"
+#~ msgstr "時限："
+
+#~ msgid "<b>_Automatic</b>"
+#~ msgstr "<b>自動(_A)：</b>"
+
+#~ msgid "Personal Data"
+#~ msgstr "個人資料"
+
+#~ msgid "Start the application without opening windows"
+#~ msgstr "不開啟視窗而啟動應用程式"
+
+#~ msgid "_Open Link"
+#~ msgstr "開啟連結(_O)"
+
+#~ msgid "_Download Link"
+#~ msgstr "下載連結(_D)"
+
+#~ msgid "_Bookmark Link…"
+#~ msgstr "將連結加入書籤(_B)…"
+
+#~ msgid "_Use Image As Background"
+#~ msgstr "使用圖片作為桌面背景(_U)"
+
+#~ msgid "Inspect _Element"
+#~ msgstr "檢查元素(_E)"
+
+#~ msgid "C_ookies"
+#~ msgstr "C_ookies"
+
+#~ msgid "Hi_story"
+#~ msgstr "歷史記錄(_S)"
+
+#~ msgid "Encrypted connections only"
+#~ msgstr "只限加密後的連線"
+
+#~ msgid "Any type of connection"
+#~ msgstr "任何類型的連線"
+
+#~ msgid "End of current session"
+#~ msgstr "結束目前的作業階段"
+
+#~ msgid "Domain"
+#~ msgstr "網域"
+
+#~ msgid "Name"
+#~ msgstr "名稱"
+
+#~ msgid "Host"
+#~ msgstr "主機"
+
+#~ msgid "User Password"
+#~ msgstr "使用者密碼"
+
+#~ msgid "Download Link"
+#~ msgstr "下載連結"
+
+#~ msgid ""
+#~ "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 通用公共"
+#~ "授權條款規定，就本程式再為散布與／或修改；無論您依據的是本授權的第二版或"
+#~ "（您自行選擇的）任一日後發行的版本。"
+
+#~ 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 or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details."
+#~ msgstr ""
+#~ "GNOME 網頁瀏覽器係基於使用目的而加以散布，然而不負任何擔保責任；亦無對適售"
+#~ "性或特定目的適用性所為的默示性擔保。詳情請參照 GNU 通用公共授權。"
+
+#~ 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"
 
 #~ msgid "http://www.google.com";
 #~ msgstr "http://www.google.com.tw";
@@ -2746,9 +2910,6 @@ msgstr "啟用(_E)"
 #~ msgid "Lists the active extensions."
 #~ msgstr "使用中擴充功能清單。"
 
-#~ msgid "Plugins"
-#~ msgstr "外掛程式"
-
 #~ msgid "File is not a valid .desktop file"
 #~ msgstr "檔案不是有效的 .desktop 檔案"
 
@@ -2770,12 +2931,6 @@ msgstr "啟用(_E)"
 #~ msgid "Not a launchable item"
 #~ msgstr "不是可以啟動的項目"
 
-#~ msgid "Clear"
-#~ msgstr "清除"
-
-#~ msgid "_Search:"
-#~ msgstr "搜尋(_S)："
-
 #~ msgid "Enable Java_Script"
 #~ msgstr "啟用 Java_Script"
 
@@ -2880,8 +3035,5 @@ msgstr "啟用(_E)"
 #~ msgid "_Don't Update"
 #~ msgstr "不要更新(_D)"
 
-#~ msgid "_Update"
-#~ msgstr "更新(_U)"
-
 #~ msgid "Update Bookmark?"
 #~ msgstr "更新書籤？"