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

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [epiphany] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Sat, 15 Feb 2014 11:04:32 +0000 (UTC)
commit bd6d769a4b60ae31bb7aca9be735a75709e9043b
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sat Feb 15 19:03:37 2014 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  755 +++++++++++++++++++++++++++-------------------------------
 po/zh_TW.po |  758 +++++++++++++++++++++++++++-------------------------------
 2 files changed, 703 insertions(+), 810 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 3fdbef4..3fbe54d 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -13,8 +13,8 @@ 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: 2014-01-16 19:30+0800\n"
-"PO-Revision-Date: 2014-01-16 19:32+0800\n"
+"POT-Creation-Date: 2014-02-15 19:03+0800\n"
+"PO-Revision-Date: 2014-02-15 19:03+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.3\n"
 
 #: ../data/default-bookmarks.rdf.in.h:1
 msgid "Search the web"
@@ -40,7 +40,6 @@ msgstr "搜尋網頁"
 #. 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";
 msgid "https://duckduckgo.com/?t=epiphany";
 msgstr "https://duckduckgo.com/?t=epiphany";
 
@@ -55,7 +54,6 @@ msgstr "https://duckduckgo.com/?t=epiphany";
 #. 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";
 msgid "https://duckduckgo.com/?q=%s&amp;t=epiphany";
 msgstr "https://duckduckgo.com/?q=%s&amp;t=epiphany";
 
@@ -68,7 +66,7 @@ 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
+#: ../src/ephy-main.c:314 ../src/ephy-main.c:472 ../src/window-commands.c:1509
 msgid "Web"
 msgstr "網頁"
 
@@ -101,7 +99,6 @@ msgstr "鍵盤瀏覽"
 #. 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'"
 
@@ -187,255 +184,246 @@ msgid ""
 msgstr "當這個選項設定為 true，分頁在作業階段還原時只會在使用者切換到它們時才開始載入。"
 
 #: ../data/org.gnome.epiphany.gschema.xml.h:28
-msgid "Show toolbars by default"
-msgstr "預設顯示工具列"
+msgid "Process model"
+msgstr "程序模型"
 
 #: ../data/org.gnome.epiphany.gschema.xml.h:29
+msgid ""
+"This option allows to set the process model used. Use 'shared-secondary-"
+"process' to use a single web process shared by all the tabs and 'one-"
+"secondary-process-per-web-view' to use a different web process for each tab."
+msgstr "這個選項允許設定使用的程序模型。使用「shared-secondary-process」讓所有分頁共享單一 web 
程序，而「one-secondary-process-per-web-view」則會為每個分頁使用不同的 web 程序。"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:30
 msgid "Toolbar style"
 msgstr "工具列樣式"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:30
+#: ../data/org.gnome.epiphany.gschema.xml.h:31
 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:31
+#: ../data/org.gnome.epiphany.gschema.xml.h:32
 msgid "[Deprecated]"
 msgstr "[已廢棄]"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:32
+#: ../data/org.gnome.epiphany.gschema.xml.h:33
 msgid ""
 "[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' "
 "instead."
 msgstr "[已廢棄] 這個設定值已廢棄，使用「tabs-bar-visibility-policy」代替。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:33
+#: ../data/org.gnome.epiphany.gschema.xml.h:34
 msgid "Visibility of the downloads window"
 msgstr "下載視窗的顯示"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:34
+#: ../data/org.gnome.epiphany.gschema.xml.h:35
 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:35
+#: ../data/org.gnome.epiphany.gschema.xml.h:36
 msgid "The visibility policy for the tabs bar."
 msgstr "分頁列顯示原則。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:36
+#: ../data/org.gnome.epiphany.gschema.xml.h:37
 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:37
+#: ../data/org.gnome.epiphany.gschema.xml.h:38
 msgid "Minimum font size"
 msgstr "最小字型大小"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:38
+#: ../data/org.gnome.epiphany.gschema.xml.h:39
 msgid "Use GNOME fonts"
 msgstr "使用 GNOME 字型"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:39
+#: ../data/org.gnome.epiphany.gschema.xml.h:40
 msgid "Use GNOME font settings."
 msgstr "使用 GNOME 字型設定值。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:40
+#: ../data/org.gnome.epiphany.gschema.xml.h:41
 msgid "Custom sans-serif font"
 msgstr "自選無襯線字型"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:41
+#: ../data/org.gnome.epiphany.gschema.xml.h:42
 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:42
+#: ../data/org.gnome.epiphany.gschema.xml.h:43
 msgid "Custom serif font"
 msgstr "自選有襯線字型"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:43
+#: ../data/org.gnome.epiphany.gschema.xml.h:44
 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:44
+#: ../data/org.gnome.epiphany.gschema.xml.h:45
 msgid "Custom monospace font"
 msgstr "自選等寬字型"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:45
+#: ../data/org.gnome.epiphany.gschema.xml.h:46
 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:46
+#: ../data/org.gnome.epiphany.gschema.xml.h:47
 msgid "Use own colors"
 msgstr "使用自選顏色"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:47
+#: ../data/org.gnome.epiphany.gschema.xml.h:48
 msgid "Use your own colors instead of the colors the page requests."
 msgstr "使用你自己的顏色取代網頁要求的顏色。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:48
+#: ../data/org.gnome.epiphany.gschema.xml.h:49
 msgid "Use own fonts"
 msgstr "使用自用字型(_U)"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:49
+#: ../data/org.gnome.epiphany.gschema.xml.h:50
 msgid "Use your own fonts instead of the fonts the page requests."
 msgstr "使用你自己的字型取代網頁要求的字型。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:50
+#: ../data/org.gnome.epiphany.gschema.xml.h:51
 msgid "Use a custom CSS"
 msgstr "使用自選 CSS"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:51
+#: ../data/org.gnome.epiphany.gschema.xml.h:52
 msgid "Use a custom CSS file to modify websites own CSS."
 msgstr "使用自選的 CSS 檔案來修改網站自己的 CSS。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:52
+#: ../data/org.gnome.epiphany.gschema.xml.h:53
 msgid "Enable spell checking"
 msgstr "啟用拼字檢查"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:53
+#: ../data/org.gnome.epiphany.gschema.xml.h:54
 msgid "Spell check any text typed in editable areas."
 msgstr "對任何在可編輯區域中輸入的文字進行拼字檢查。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:54
+#: ../data/org.gnome.epiphany.gschema.xml.h:55
 msgid "Default encoding"
 msgstr "預設編碼"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:55
+#: ../data/org.gnome.epiphany.gschema.xml.h:56
 msgid ""
 "Default encoding. Accepted values are the ones WebKitGTK+ can understand."
 msgstr "預設的編碼。可接受的數值為 WebKitGTK+ 能辨識的數值。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:56
+#: ../data/org.gnome.epiphany.gschema.xml.h:57
 msgid "Size of disk cache"
 msgstr "磁碟快取大小"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:57
+#: ../data/org.gnome.epiphany.gschema.xml.h:58
 msgid "Size of disk cache, in MB."
 msgstr "磁碟快取大小，單位為 MB。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:58
-#: ../src/resources/prefs-dialog.ui.h:41
+#: ../data/org.gnome.epiphany.gschema.xml.h:59
+#: ../src/resources/prefs-dialog.ui.h:40
 msgid "Languages"
 msgstr "語言"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:59
+#: ../data/org.gnome.epiphany.gschema.xml.h:60
 msgid "Preferred languages, two letter codes."
 msgstr "偏好的語言，兩個英文字母的代碼。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:60
+#: ../data/org.gnome.epiphany.gschema.xml.h:61
 msgid "Cookie accept"
 msgstr "Cookie 接受"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:61
+#: ../data/org.gnome.epiphany.gschema.xml.h:62
 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:62
+#: ../data/org.gnome.epiphany.gschema.xml.h:63
 msgid "Image animation mode"
 msgstr "影像動畫模式"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:63
+#: ../data/org.gnome.epiphany.gschema.xml.h:64
 msgid ""
 "How to present animated images. Possible values are \"normal\", \"once\" and "
 "\"disabled\"."
 msgstr "如何顯示動畫影像。可能的數值有「normal」、「once」和「disabled」。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:64
+#: ../data/org.gnome.epiphany.gschema.xml.h:65
 msgid "Allow popups"
 msgstr "允許彈出式視窗"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:65
+#: ../data/org.gnome.epiphany.gschema.xml.h:66
 msgid ""
 "Allow sites to open new windows using JavaScript (if JavaScript is enabled)."
 msgstr "允許網站使用 JavaScript 開啟新視窗 (如果啟用 JavaScript)。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:66
+#: ../data/org.gnome.epiphany.gschema.xml.h:67
 msgid "Enable Plugins"
 msgstr "啟用外掛程式"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:67
+#: ../data/org.gnome.epiphany.gschema.xml.h:68
 msgid "Enable JavaScript"
 msgstr "啟用 JavaScript"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:68
+#: ../data/org.gnome.epiphany.gschema.xml.h:69
 msgid "Enable WebGL"
 msgstr "啟用 WebGL"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:69
+#: ../data/org.gnome.epiphany.gschema.xml.h:70
 msgid "Whether to enable support for WebGL contexts."
 msgstr "是否啟用支援 WebGL 內容。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:70
+#: ../data/org.gnome.epiphany.gschema.xml.h:71
 msgid "Enable WebAudio"
 msgstr "啟用 WebAudio"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:71
+#: ../data/org.gnome.epiphany.gschema.xml.h:72
 msgid "Whether to enable support for WebAudio."
 msgstr "是否啟用支援 WebAudio。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:72
+#: ../data/org.gnome.epiphany.gschema.xml.h:73
 msgid "Do Not Track"
 msgstr "不要追蹤"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:73
+#: ../data/org.gnome.epiphany.gschema.xml.h:74
 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:74
+#: ../data/org.gnome.epiphany.gschema.xml.h:75
 msgid "Enable Adblock"
 msgstr "啟用廣告阻擋"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:75
+#: ../data/org.gnome.epiphany.gschema.xml.h:76
 msgid ""
 "Whether to block the embedded advertisements that web pages might want to "
 "show."
 msgstr "是否阻擋內嵌於網頁可能顯示的廣告。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:76
+#: ../data/org.gnome.epiphany.gschema.xml.h:77
 msgid "The downloads folder"
 msgstr "下載資料夾"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:77
+#: ../data/org.gnome.epiphany.gschema.xml.h:78
 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:78
-msgid "History pages time range"
-msgstr "歷史紀錄時間範圍"
-
 #: ../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:80
-msgid "Whether to show the address column in the history window."
-msgstr "是否在歷史紀錄視窗顯示位址欄。"
-
-#: ../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:82
 msgid "Whether to show the title column in the bookmarks window."
 msgstr "是否在書籤視窗顯示標題欄。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:83
+#: ../data/org.gnome.epiphany.gschema.xml.h:80
 msgid "Whether to show the address column in the bookmarks window."
 msgstr "是否在書籤視窗顯示位址欄。"
 
@@ -517,17 +505,17 @@ msgid ""
 "cleared when you close the window."
 msgstr "你現在使用<em>隱密</em>瀏覽。在這個模式中檢視的網頁將不會顯示在瀏覽紀錄中，而所有儲存的資訊都會在關閉視窗時清除。"
 
-#: ../embed/ephy-embed.c:490
+#: ../embed/ephy-embed.c:506
 #, c-format
 msgid "Press %s to exit fullscreen"
 msgstr "按下 %s 離開全螢幕"
 
 #. Translators: 'ESC' and 'F11' are keyboard keys.
-#: ../embed/ephy-embed.c:493
+#: ../embed/ephy-embed.c:509
 msgid "ESC"
 msgstr "ESC"
 
-#: ../embed/ephy-embed.c:493
+#: ../embed/ephy-embed.c:509
 msgid "F11"
 msgstr "F11"
 
@@ -861,23 +849,23 @@ msgstr "萬國碼 (UTF-3_2BE)"
 msgid "Unknown (%s)"
 msgstr "不明 (%s)"
 
-#: ../embed/ephy-find-toolbar.c:103
+#: ../embed/ephy-find-toolbar.c:105
 msgid "Text not found"
 msgstr "找不到文字"
 
-#: ../embed/ephy-find-toolbar.c:110
+#: ../embed/ephy-find-toolbar.c:112
 msgid "Search wrapped back to the top"
 msgstr "搜尋至結尾後返回開頭"
 
-#: ../embed/ephy-find-toolbar.c:463
+#: ../embed/ephy-find-toolbar.c:456
 msgid "Type to search…"
 msgstr "輸入以搜尋…"
 
-#: ../embed/ephy-find-toolbar.c:469
+#: ../embed/ephy-find-toolbar.c:462
 msgid "Find previous occurrence of the search string"
 msgstr "尋找上一個出現搜尋字串的地方"
 
-#: ../embed/ephy-find-toolbar.c:477
+#: ../embed/ephy-find-toolbar.c:470
 msgid "Find next occurrence of the search string"
 msgstr "尋找下一個出現搜尋字串的地方"
 
@@ -886,49 +874,49 @@ msgid "Most Visited"
 msgstr "最常瀏覽"
 
 #. characters
-#: ../embed/ephy-web-view.c:64 ../embed/ephy-web-view.c:2779
+#: ../embed/ephy-web-view.c:65 ../embed/ephy-web-view.c:2946
 msgid "Blank page"
 msgstr "空白頁面"
 
-#: ../embed/ephy-web-view.c:496 ../src/window-commands.c:329
+#: ../embed/ephy-web-view.c:497 ../src/window-commands.c:329
 msgid "Save"
 msgstr "儲存"
 
 #. Translators: The %s the hostname where this is happening.
 #. * Example: mail.google.com.
 #.
-#: ../embed/ephy-web-view.c:508
+#: ../embed/ephy-web-view.c:509
 #, c-format
 msgid "Do you want to save your password for “%s”?"
 msgstr "你是否要儲存你在“%s”的密碼？"
 
-#: ../embed/ephy-web-view.c:1381
+#: ../embed/ephy-web-view.c:1403
 msgid "Deny"
 msgstr "禁止"
 
-#: ../embed/ephy-web-view.c:1382
+#: ../embed/ephy-web-view.c:1404
 msgid "Allow"
 msgstr "允許"
 
-#: ../embed/ephy-web-view.c:1392
+#: ../embed/ephy-web-view.c:1414
 #, c-format
 msgid "The page at <b>%s</b> wants to know your location."
 msgstr "在 <b>%s</b> 的網頁想要知道你的位置。"
 
-#: ../embed/ephy-web-view.c:1742
+#: ../embed/ephy-web-view.c:1765
 msgid "None specified"
 msgstr "沒有指定"
 
-#: ../embed/ephy-web-view.c:1753 ../embed/ephy-web-view.c:1770
+#: ../embed/ephy-web-view.c:1778 ../embed/ephy-web-view.c:1793
 #, c-format
 msgid "Problem loading “%s”"
 msgstr "載入“%s”時發生錯誤"
 
-#: ../embed/ephy-web-view.c:1755
+#: ../embed/ephy-web-view.c:1780
 msgid "Oops! Unable to display this website."
 msgstr "噢！無法顯示這個網站。"
 
-#: ../embed/ephy-web-view.c:1756
+#: ../embed/ephy-web-view.c:1781
 #, c-format
 msgid ""
 "<p>The site at “%s” seems to be unavailable. The precise error was:</"
@@ -937,15 +925,15 @@ msgid ""
 "correctly.</p>"
 msgstr "<p>在“%s”的網站似乎無法使用。更準確的說錯誤是：</p><p><code>%s</code></p><p>它可能是暫時無法使用或移動到新的位址。你可能會想要檢查你的互聯網連線是否正常。</p>"
 
-#: ../embed/ephy-web-view.c:1765
-msgid "Try Again"
-msgstr "重試"
+#: ../embed/ephy-web-view.c:1789
+msgid "Try again"
+msgstr "再試一次"
 
-#: ../embed/ephy-web-view.c:1772
+#: ../embed/ephy-web-view.c:1795
 msgid "Oops! There may be a problem."
 msgstr "噢！可能有問題發生。"
 
-#: ../embed/ephy-web-view.c:1773
+#: ../embed/ephy-web-view.c:1796
 #, c-format
 msgid ""
 "<p>This site may have caused Web to close unexpectedly.</p><p>If this "
@@ -953,53 +941,53 @@ msgid ""
 "developers.</p>"
 msgstr "<p>這個網站可能造成 Web 未預期的關閉。</p><p>如果這再次發生，請將這個問題匯報給 <strong>%s</strong> 開發隊伍。</p>"
 
-#: ../embed/ephy-web-view.c:1779 ../embed/ephy-web-view.c:1787
+#: ../embed/ephy-web-view.c:1801 ../embed/ephy-web-view.c:1808
 msgid "Reload Anyway"
 msgstr "強制重新載入"
 
-#: ../embed/ephy-web-view.c:1784
+#: ../embed/ephy-web-view.c:1805
 #, c-format
 msgid "Problem displaying “%s”"
 msgstr "顯示“%s”時發生問題"
 
-#: ../embed/ephy-web-view.c:1785
+#: ../embed/ephy-web-view.c:1806
 msgid "Oops!"
 msgstr "噢！"
 
-#: ../embed/ephy-web-view.c:1786
+#: ../embed/ephy-web-view.c:1807
 msgid ""
 "Something went wrong while displaying this page. Please reload or visit a "
 "different page to continue."
 msgstr "顯示這個頁面時有錯誤發生。請重新載入或瀏覽不同的頁面以繼續。"
 
-#: ../embed/ephy-web-view.c:2091 ../src/ephy-search-provider.c:287
+#: ../embed/ephy-web-view.c:2120 ../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:2329
+#: ../embed/ephy-web-view.c:2358
 #, c-format
 msgid "Loading “%s”…"
 msgstr "正在載入“%s”…"
 
-#: ../embed/ephy-web-view.c:2331
+#: ../embed/ephy-web-view.c:2360
 msgid "Loading…"
 msgstr "載入中…"
 
-#: ../embed/ephy-web-view.c:2683
+#: ../embed/ephy-web-view.c:2850
 msgid "_OK"
 msgstr "確定(_O)"
 
 #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193
-#: ../src/bookmarks/ephy-bookmark-properties.c:640
+#: ../src/bookmarks/ephy-bookmark-properties.c:428
 #: ../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
+#: ../src/resources/clear-data-dialog.ui.h:3
+#: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:808
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../lib/ephy-file-chooser.c:185
+#: ../lib/ephy-file-chooser.c:185 ../src/resources/history-dialog.ui.h:7
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -1024,7 +1012,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:3
+#: ../lib/ephy-file-helpers.c:112 ../src/resources/prefs-dialog.ui.h:2
 msgid "Downloads"
 msgstr "下載"
 
@@ -1212,11 +1200,11 @@ msgstr "300%"
 msgid "400%"
 msgstr "400%"
 
-#: ../lib/history/ephy-history-service-hosts-table.c:362
+#: ../lib/history/ephy-history-service-hosts-table.c:363
 msgid "Others"
 msgstr "其它"
 
-#: ../lib/history/ephy-history-service-hosts-table.c:366
+#: ../lib/history/ephy-history-service-hosts-table.c:367
 msgid "Local files"
 msgstr "本機檔案"
 
@@ -1256,60 +1244,38 @@ msgstr "這個網站的身分已經通過檢驗"
 msgid "The identity of this website has not been verified"
 msgstr "這個網站的身分並沒有通過檢驗"
 
-#: ../lib/widgets/ephy-certificate-dialog.c:326
-#: ../src/bookmarks/ephy-bookmark-properties.c:650
-#: ../src/bookmarks/ephy-bookmarks-editor.c:178
-#: ../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 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:125
 #, c-format
-#| 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:131
 #, c-format
-#| 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:137
 #, c-format
-#| msgid "%u second left"
-#| msgid_plural "%u seconds left"
 msgid "%d month left"
 msgid_plural "%d months left"
 msgstr[0] "剩下 %d 月"
@@ -1323,11 +1289,11 @@ msgstr "已完成"
 msgid "Error downloading: %s"
 msgstr "下載時發生錯誤：%s"
 
-#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:781
+#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:712
 msgid "Cancel"
 msgstr "取消"
 
-#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1170
+#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1135
 #: ../src/window-commands.c:275
 msgid "Open"
 msgstr "開啟"
@@ -1340,20 +1306,12 @@ msgstr "在資料夾顯示"
 msgid "Starting…"
 msgstr "正在開始…"
 
-#: ../lib/widgets/ephy-hosts-store.c:246
-msgid "All sites"
-msgstr "所有網站"
-
-#: ../lib/widgets/ephy-hosts-view.c:46
-msgid "Sites"
-msgstr "網站"
-
 #. Translators: the mnemonic shouldn't conflict with any of the
 #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
 #. * Select All, Input Methods and Insert Unicode control character.)
 #.
 #: ../lib/widgets/ephy-location-entry.c:618
-#: ../src/resources/prefs-dialog.ui.h:37 ../src/ephy-history-window.c:229
+#: ../src/resources/prefs-dialog.ui.h:36 ../src/ephy-history-window.c:189
 msgid "Cl_ear"
 msgstr "清除(_E)"
 
@@ -1370,77 +1328,46 @@ msgstr "取消復原(_R)"
 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:1623
-msgid "Title"
-msgstr "標題"
-
-#: ../lib/widgets/ephy-urls-view.c:51
-#: ../src/bookmarks/ephy-bookmarks-editor.c:212
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1634
-msgid "Address"
-msgstr "地址"
-
-#: ../lib/widgets/ephy-urls-view.c:59
-msgid "Date"
-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:611
-#, c-format
-msgid "%d _Similar"
-msgid_plural "%d _Similar"
-msgstr[0] "%d 個相似(_S)"
-
-#: ../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)"
+msgid "%d bookmark is similar"
+msgid_plural "%d bookmarks are similar"
+msgstr[0] "%d 個書籤是類似的"
 
-#: ../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:421
+#: ../src/bookmarks/ephy-bookmark-properties.c:234
 #, c-format
 msgid "“%s” Properties"
 msgstr "“%s”屬性"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:545
+#: ../src/bookmarks/ephy-bookmark-properties.c:358
 msgid "_Title:"
 msgstr "標題(_T)："
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:562
+#: ../src/bookmarks/ephy-bookmark-properties.c:375
 msgid "A_ddress:"
 msgstr "位址(_D)："
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:574
+#: ../src/bookmarks/ephy-bookmark-properties.c:387
 msgid "T_opics:"
 msgstr "主題(_O)："
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:597
+#: ../src/bookmarks/ephy-bookmark-properties.c:410
 msgid "Sho_w all topics"
 msgstr "顯示所有主題(_W)"
 
-#. Help.
-#: ../src/bookmarks/ephy-bookmark-properties.c:627
-#: ../src/bookmarks/ephy-bookmarks-editor.c:154
-#: ../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:643
-#: ../src/resources/prefs-dialog.ui.h:42
+#: ../src/bookmarks/ephy-bookmark-properties.c:431
+#: ../src/resources/prefs-dialog.ui.h:41
 #: ../src/resources/prefs-lang-dialog.ui.h:3
 msgid "_Add"
 msgstr "加入(_A)"
 
+#: ../src/bookmarks/ephy-bookmark-properties.c:438
+#: ../src/bookmarks/ephy-bookmarks-editor.c:178 ../src/ephy-window.c:113
+msgid "_Close"
+msgstr "關閉(_C)"
+
 #: ../src/bookmarks/ephy-bookmarks.c:88
 msgid "Entertainment"
 msgstr "娛樂"
@@ -1504,20 +1431,23 @@ msgstr "從本主題中刪除"
 
 #. Toplevel
 #: ../src/bookmarks/ephy-bookmarks-editor.c:151
-#: ../src/ephy-history-window.c:127
 msgid "_File"
 msgstr "檔案(_F)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:152
-#: ../src/ephy-history-window.c:128
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:153
-#: ../src/ephy-history-window.c:129
 msgid "_View"
 msgstr "顯示(_V)"
 
+#. Help.
+#: ../src/bookmarks/ephy-bookmarks-editor.c:154
+#: ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:190
+msgid "_Help"
+msgstr "求助(_H)"
+
 #. File Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:158
 msgid "_New Topic"
@@ -1527,10 +1457,8 @@ msgstr "新增主題(_N)"
 msgid "Create a new topic"
 msgstr "建立新的主題"
 
-#. File Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:161
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1158
-#: ../src/ephy-history-window.c:134 ../src/ephy-history-window.c:636
 msgid "Open in New _Window"
 msgid_plural "Open in New _Windows"
 msgstr[0] "在新的視窗中開啟(_W)"
@@ -1541,7 +1469,6 @@ msgstr "在新的視窗中開啟已選的書籤"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:164
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1161
-#: ../src/ephy-history-window.c:137 ../src/ephy-history-window.c:639
 msgid "Open in New _Tab"
 msgid_plural "Open in New _Tabs"
 msgstr[0] "在新的分頁中開啟(_T)"
@@ -1587,40 +1514,33 @@ msgid "Close the bookmarks window"
 msgstr "關閉書籤視窗"
 
 #. Edit Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:183
-#: ../src/ephy-history-window.c:148 ../src/ephy-window.c:124
+#: ../src/bookmarks/ephy-bookmarks-editor.c:183 ../src/ephy-window.c:124
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:184
-#: ../src/ephy-history-window.c:149
 msgid "Cut the selection"
 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:126
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1171 ../src/ephy-window.c:126
 msgid "_Copy"
 msgstr "複製(_C)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:187
-#: ../src/ephy-history-window.c:152
 msgid "Copy the selection"
 msgstr "複製選定的內容"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:189
-#: ../src/ephy-history-window.c:154 ../src/ephy-window.c:128
+#: ../src/bookmarks/ephy-bookmarks-editor.c:189 ../src/ephy-window.c:128
 msgid "_Paste"
 msgstr "貼上(_P)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:190
-#: ../src/ephy-history-window.c:155
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿中的內容"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:192
-#: ../src/ephy-history-window.c:157
+#: ../src/resources/history-dialog.ui.h:10
 msgid "_Delete"
 msgstr "刪除(_D)"
 
@@ -1628,8 +1548,7 @@ msgstr "刪除(_D)"
 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:132
+#: ../src/bookmarks/ephy-bookmarks-editor.c:195 ../src/ephy-window.c:132
 msgid "Select _All"
 msgstr "全部選取(_A)"
 
@@ -1639,7 +1558,6 @@ msgstr "選取所有書籤或文字"
 
 #. Help Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:200
-#: ../src/ephy-history-window.c:168
 msgid "_Contents"
 msgstr "內容(_C)"
 
@@ -1648,29 +1566,29 @@ msgid "Display bookmarks help"
 msgstr "顯示書籤說明文件"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:203
-#: ../src/resources/epiphany-application-menu.ui.h:8
-#: ../src/ephy-history-window.c:171 ../src/ephy-window.c:192
+#: ../src/resources/epiphany-application-menu.ui.h:8 ../src/ephy-window.c:192
 msgid "_About"
 msgstr "關於(_A)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:204
-#: ../src/ephy-history-window.c:172
 msgid "Display credits for the web browser creators"
 msgstr "鳴謝所有這個網頁瀏覽器的創作者"
 
 #. View Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:210
-#: ../src/ephy-history-window.c:186
 msgid "_Title"
 msgstr "標題(_T)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:211
-#: ../src/ephy-history-window.c:187
 msgid "Show the title column"
 msgstr "顯示標題欄位"
 
+#: ../src/bookmarks/ephy-bookmarks-editor.c:212
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1634
+msgid "Address"
+msgstr "地址"
+
 #: ../src/bookmarks/ephy-bookmarks-editor.c:213
-#: ../src/ephy-history-window.c:189
 msgid "Show the address column"
 msgstr "顯示位址欄位"
 
@@ -1785,7 +1703,6 @@ msgid "File"
 msgstr "檔案"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1167
-#: ../src/ephy-history-window.c:645
 msgid "_Copy Address"
 msgstr "複製位址(_C)"
 
@@ -1793,6 +1710,10 @@ msgstr "複製位址(_C)"
 msgid "Topics"
 msgstr "主題"
 
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1623
+msgid "Title"
+msgstr "標題"
+
 #. FIXME !!!!
 #: ../src/bookmarks/ephy-open-tabs-action.c:74
 msgid "Open in New _Tabs"
@@ -1811,7 +1732,7 @@ msgstr "建立主題“%s”"
 msgid "Clear Personal Data"
 msgstr "清除個人資料"
 
-#: ../src/resources/clear-data-dialog.ui.h:3
+#: ../src/resources/clear-data-dialog.ui.h:2
 msgid "C_lear"
 msgstr "清除(_L)"
 
@@ -1827,7 +1748,7 @@ msgstr "你即將清除用來儲存你瀏覽過的網頁的個人資料。請檢
 
 #: ../src/resources/clear-data-dialog.ui.h:6
 #: ../src/resources/cookies-dialog.ui.h:1
-#: ../src/resources/prefs-dialog.ui.h:22
+#: ../src/resources/prefs-dialog.ui.h:21
 msgid "Cookies"
 msgstr "Cookie"
 
@@ -1850,16 +1771,17 @@ msgid ""
 msgstr "你不可以將這個動作復原。你選擇要清除的資料會永遠移除。"
 
 #: ../src/resources/cookies-dialog.ui.h:2
+#: ../src/resources/history-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
+#: ../src/resources/cookies-dialog.ui.h:3
+#: ../src/resources/passwords-dialog.ui.h:4
 msgid "Site"
 msgstr "網站"
 
-#: ../src/resources/cookies-dialog.ui.h:5
+#: ../src/resources/cookies-dialog.ui.h:4
 msgid "Remove"
 msgstr "移除"
 
@@ -1897,40 +1819,68 @@ msgstr "結束(_Q)"
 msgid "Text Encoding"
 msgstr "字符編碼"
 
-#: ../src/resources/epiphany.ui.h:3 ../src/ephy-encoding-menu.c:327
+#: ../src/resources/epiphany.ui.h:2 ../src/ephy-encoding-menu.c:327
 msgid "_Automatic"
 msgstr "自動(_A)"
 
-#: ../src/resources/epiphany.ui.h:4 ../src/ephy-encoding-menu.c:328
+#: ../src/resources/epiphany.ui.h:3 ../src/ephy-encoding-menu.c:328
 msgid "Use the encoding specified by the document"
 msgstr "使用文件指定的編碼方式"
 
-#: ../src/resources/epiphany.ui.h:5
+#: ../src/resources/epiphany.ui.h:4
 msgid "_Use a different encoding:"
 msgstr "使用不同的編碼方式(_U):"
 
+#: ../src/resources/history-dialog.ui.h:1
+msgid "History"
+msgstr "瀏覽記錄"
+
+#: ../src/resources/history-dialog.ui.h:3
+msgid "Search history"
+msgstr "搜尋歷史紀錄"
+
+#: ../src/resources/history-dialog.ui.h:4
+msgid "Date"
+msgstr "日期"
+
+#: ../src/resources/history-dialog.ui.h:5
+msgid "Name"
+msgstr "名稱"
+
+#: ../src/resources/history-dialog.ui.h:6
+msgid "Location"
+msgstr "位置"
+
+#: ../src/resources/history-dialog.ui.h:8
+msgid "_Copy Location"
+msgstr "複製位置(_C)"
+
+#: ../src/resources/history-dialog.ui.h:9
+msgid "Add _Bookmark"
+msgstr "加入書籤(_B)"
+
 #: ../src/resources/passwords-dialog.ui.h:1
-#: ../src/resources/prefs-dialog.ui.h:31
+#: ../src/resources/prefs-dialog.ui.h:30
 msgid "Passwords"
 msgstr "密碼"
 
-#: ../src/resources/passwords-dialog.ui.h:4
+#: ../src/resources/passwords-dialog.ui.h:3
 msgid "Search passwords"
 msgstr "搜尋密碼"
 
-#: ../src/resources/passwords-dialog.ui.h:6
+#: ../src/resources/passwords-dialog.ui.h:5
 msgid "User Name"
 msgstr "使用者名稱"
 
-#: ../src/resources/passwords-dialog.ui.h:7
+#: ../src/resources/passwords-dialog.ui.h:6
 msgid "Password"
 msgstr "密碼"
 
-#: ../src/resources/passwords-dialog.ui.h:8
+#: ../src/resources/passwords-dialog.ui.h:7
 msgid "_Copy Password"
 msgstr "複製密碼(_C)"
 
-#: ../src/resources/passwords-dialog.ui.h:9
+#: ../src/resources/passwords-dialog.ui.h:8
 msgid "C_opy Username"
 msgstr "複製使用者名稱(_O)"
 
@@ -1938,160 +1888,160 @@ msgstr "複製使用者名稱(_O)"
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../src/resources/prefs-dialog.ui.h:4
+#: ../src/resources/prefs-dialog.ui.h:3
 msgid "_Download folder:"
 msgstr "下載資料夾(_D)"
 
-#: ../src/resources/prefs-dialog.ui.h:5
+#: ../src/resources/prefs-dialog.ui.h:4
 msgid "A_utomatically open downloaded files"
 msgstr "自動下載並開啟檔案(_U)"
 
-#: ../src/resources/prefs-dialog.ui.h:6
+#: ../src/resources/prefs-dialog.ui.h:5
 msgid "Search"
 msgstr "搜尋"
 
-#: ../src/resources/prefs-dialog.ui.h:7
+#: ../src/resources/prefs-dialog.ui.h:6
 msgid "_Engine:"
 msgstr "引擎(_E):"
 
-#: ../src/resources/prefs-dialog.ui.h:8
+#: ../src/resources/prefs-dialog.ui.h:7
 msgid "Web Content"
 msgstr "網頁內容"
 
-#: ../src/resources/prefs-dialog.ui.h:9
+#: ../src/resources/prefs-dialog.ui.h:8
 msgid "Allow popup _windows"
 msgstr "允許彈出式視窗(_W)"
 
-#: ../src/resources/prefs-dialog.ui.h:10
+#: ../src/resources/prefs-dialog.ui.h:9
 msgid "Allow _advertisements"
 msgstr "允許廣告(_A)"
 
-#: ../src/resources/prefs-dialog.ui.h:11
+#: ../src/resources/prefs-dialog.ui.h:10
 msgid "Enable _plugins"
 msgstr "啟用外掛程式(_P)"
 
-#: ../src/resources/prefs-dialog.ui.h:12
+#: ../src/resources/prefs-dialog.ui.h:11
 msgid "General"
 msgstr "一般"
 
-#: ../src/resources/prefs-dialog.ui.h:13
+#: ../src/resources/prefs-dialog.ui.h:12
 msgid "Fonts"
 msgstr "字型"
 
-#: ../src/resources/prefs-dialog.ui.h:14
+#: ../src/resources/prefs-dialog.ui.h:13
 msgid "_Use system fonts"
 msgstr "使用系統字型(_U)"
 
-#: ../src/resources/prefs-dialog.ui.h:15
+#: ../src/resources/prefs-dialog.ui.h:14
 msgid "Sans serif font:"
 msgstr "無襯線字型："
 
-#: ../src/resources/prefs-dialog.ui.h:16
+#: ../src/resources/prefs-dialog.ui.h:15
 msgid "Serif font:"
 msgstr "襯線字型："
 
-#: ../src/resources/prefs-dialog.ui.h:17
+#: ../src/resources/prefs-dialog.ui.h:16
 msgid "Monospace font:"
 msgstr "等寬字型："
 
-#: ../src/resources/prefs-dialog.ui.h:18
+#: ../src/resources/prefs-dialog.ui.h:17
 msgid "Style"
 msgstr "樣式"
 
-#: ../src/resources/prefs-dialog.ui.h:19
+#: ../src/resources/prefs-dialog.ui.h:18
 msgid "Use custom _stylesheet"
 msgstr "使用自選樣式表(_S)"
 
-#: ../src/resources/prefs-dialog.ui.h:20
+#: ../src/resources/prefs-dialog.ui.h:19
 msgid "_Edit Stylesheet…"
 msgstr "編輯樣式表(_E)…"
 
-#: ../src/resources/prefs-dialog.ui.h:21
+#: ../src/resources/prefs-dialog.ui.h:20
 msgid "Fonts & Style"
 msgstr "字型與樣式"
 
-#: ../src/resources/prefs-dialog.ui.h:23
+#: ../src/resources/prefs-dialog.ui.h:22
 msgid "Manage Cookies"
 msgstr "管理 Cookies"
 
-#: ../src/resources/prefs-dialog.ui.h:24
+#: ../src/resources/prefs-dialog.ui.h:23
 msgid "_Always accept"
 msgstr "總是接受(_A)"
 
-#: ../src/resources/prefs-dialog.ui.h:25
+#: ../src/resources/prefs-dialog.ui.h:24
 msgid "Only _from sites you visit"
 msgstr "只來自你瀏覽的網站(_F)"
 
 #. Refers to "Only from sites you visit" option under Cookies.
-#: ../src/resources/prefs-dialog.ui.h:27
+#: ../src/resources/prefs-dialog.ui.h:26
 msgid "<small>For example, not from advertisers on these sites</small>"
 msgstr "<small>例如，不要來自這些網站的廣告</small>"
 
-#: ../src/resources/prefs-dialog.ui.h:28
+#: ../src/resources/prefs-dialog.ui.h:27
 msgid "_Never accept"
 msgstr "永不接受(_N)"
 
-#: ../src/resources/prefs-dialog.ui.h:29
+#: ../src/resources/prefs-dialog.ui.h:28
 msgid "Tracking"
 msgstr "追蹤"
 
-#: ../src/resources/prefs-dialog.ui.h:30
+#: ../src/resources/prefs-dialog.ui.h:29
 msgid "_Tell web sites I do not want to be tracked"
 msgstr "告訴網站我不想被追蹤(_T)"
 
-#: ../src/resources/prefs-dialog.ui.h:32
+#: ../src/resources/prefs-dialog.ui.h:31
 msgid "Manage Passwords"
 msgstr "管理密碼"
 
-#: ../src/resources/prefs-dialog.ui.h:33
+#: ../src/resources/prefs-dialog.ui.h:32
 msgid "_Remember passwords"
 msgstr "記錄密碼(_R)"
 
-#: ../src/resources/prefs-dialog.ui.h:34
+#: ../src/resources/prefs-dialog.ui.h:33
 msgid "Temporary Files"
 msgstr "暫存檔"
 
-#: ../src/resources/prefs-dialog.ui.h:35
+#: ../src/resources/prefs-dialog.ui.h:34
 msgid "_Disk space:"
 msgstr "磁碟空間(_D)："
 
-#: ../src/resources/prefs-dialog.ui.h:36
+#: ../src/resources/prefs-dialog.ui.h:35
 msgid "MB"
 msgstr "MB"
 
-#: ../src/resources/prefs-dialog.ui.h:38
+#: ../src/resources/prefs-dialog.ui.h:37
 msgid "Privacy"
 msgstr "私隱"
 
-#: ../src/resources/prefs-dialog.ui.h:39 ../src/ephy-encoding-dialog.c:379
+#: ../src/resources/prefs-dialog.ui.h:38 ../src/ephy-encoding-dialog.c:379
 msgid "Encodings"
 msgstr "編碼"
 
-#: ../src/resources/prefs-dialog.ui.h:40
+#: ../src/resources/prefs-dialog.ui.h:39
 msgid "De_fault:"
 msgstr "預設(_F)："
 
-#: ../src/resources/prefs-dialog.ui.h:43
+#: ../src/resources/prefs-dialog.ui.h:42
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../src/resources/prefs-dialog.ui.h:44
+#: ../src/resources/prefs-dialog.ui.h:43
 msgid "_Up"
 msgstr "上(_U)"
 
-#: ../src/resources/prefs-dialog.ui.h:45
+#: ../src/resources/prefs-dialog.ui.h:44
 msgid "_Down"
 msgstr "下(_D)"
 
-#: ../src/resources/prefs-dialog.ui.h:46
+#: ../src/resources/prefs-dialog.ui.h:45
 msgid "Spell checking"
 msgstr "拼字檢查"
 
-#: ../src/resources/prefs-dialog.ui.h:47
+#: ../src/resources/prefs-dialog.ui.h:46
 msgid "_Enable spell checking"
 msgstr "啟用拼字檢查(_E)"
 
-#: ../src/resources/prefs-dialog.ui.h:48 ../src/prefs-dialog.c:835
+#: ../src/resources/prefs-dialog.ui.h:47 ../src/prefs-dialog.c:839
 msgid "Language"
 msgstr "語言"
 
@@ -2127,97 +2077,16 @@ msgstr "其它(_O)…"
 msgid "Other encodings"
 msgstr "其他字符編碼方式"
 
-#: ../src/ephy-history-window.c:135
-msgid "Open the selected history link in a new window"
-msgstr "在新的視窗中開啟已選的瀏覽記錄連結"
-
-#: ../src/ephy-history-window.c:138
-msgid "Open the selected history link in a new tab"
-msgstr "在新的分頁中開啟已選的瀏覽記錄連結"
-
-#: ../src/ephy-history-window.c:140
-msgid "Add _Bookmark…"
-msgstr "加入書籤(_B)…"
-
-#: ../src/ephy-history-window.c:141
-msgid "Bookmark the selected history link"
-msgstr "將已選的瀏覽記錄連結加入至書籤"
-
-#: ../src/ephy-history-window.c:144
-msgid "Close the history window"
-msgstr "關閉瀏覽記錄視窗"
-
-#: ../src/ephy-history-window.c:158
-msgid "Delete the selected history link"
-msgstr "刪除已選的瀏覽記錄連結"
-
-#: ../src/ephy-history-window.c:161
-msgid "Select all history links or text"
-msgstr "選取所有瀏覽記錄連結或文字"
-
-#: ../src/ephy-history-window.c:163
-msgid "Clear _History"
-msgstr "清除瀏覽記錄(_H)"
-
-#: ../src/ephy-history-window.c:164
-msgid "Clear your browsing history"
-msgstr "清除瀏覽記錄"
-
-#: ../src/ephy-history-window.c:169
-msgid "Display history help"
-msgstr "顯示瀏覽記錄說明文件"
-
-#: ../src/ephy-history-window.c:188
-msgid "_Address"
-msgstr "位址(_A)"
-
-#: ../src/ephy-history-window.c:190
-msgid "_Date and Time"
-msgstr "日期和時刻(_D)"
-
-#: ../src/ephy-history-window.c:191
-msgid "Show the date and time column"
-msgstr "顯示日期及時刻欄位"
-
-#: ../src/ephy-history-window.c:219
+#: ../src/ephy-history-window.c:179
 msgid "Clear browsing history?"
 msgstr "是否清除瀏覽記錄？"
 
-#: ../src/ephy-history-window.c:223
+#: ../src/ephy-history-window.c:183
 msgid ""
 "Clearing the browsing history will cause all history links to be permanently "
 "deleted."
 msgstr "清除瀏覽記錄將會使所有瀏覽記錄永遠被刪除。"
 
-#: ../src/ephy-history-window.c:235
-msgid "Clear History"
-msgstr "清除瀏覽記錄"
-
-#: ../src/ephy-history-window.c:799
-msgid "Last 30 minutes"
-msgstr "前 30 分鐘"
-
-#: ../src/ephy-history-window.c:800
-msgid "Today"
-msgstr "今日"
-
-#. keep this in sync with embed/ephy-history.c's
-#. * HISTORY_PAGE_OBSOLETE_DAYS
-#: ../src/ephy-history-window.c:802 ../src/ephy-history-window.c:806
-#: ../src/ephy-history-window.c:812
-#, c-format
-msgid "Last %d day"
-msgid_plural "Last %d days"
-msgstr[0] "最近 %d 日"
-
-#: ../src/ephy-history-window.c:816
-msgid "All history"
-msgstr "所有瀏覽記錄"
-
-#: ../src/ephy-history-window.c:1107
-msgid "History"
-msgstr "瀏覽記錄"
-
 #: ../src/ephy-main.c:76
 msgid "Open a new tab in an existing browser window"
 msgstr "在現有的瀏覽器視窗中開啟新的分頁"
@@ -2464,77 +2333,77 @@ msgstr "動畫開始(_A)"
 msgid "St_op Animation"
 msgstr "動畫停止(_O)"
 
-#: ../src/ephy-window.c:450
+#: ../src/ephy-window.c:448
 msgid "There are unsubmitted changes to form elements"
 msgstr "對表單的元素而言沒有經確認的改變"
 
-#: ../src/ephy-window.c:451
+#: ../src/ephy-window.c:449
 msgid "If you close the document anyway, you will lose that information."
 msgstr "如果你無論無何要關閉此文件，你將會失去未儲存的資訊。"
 
-#: ../src/ephy-window.c:453
+#: ../src/ephy-window.c:451
 msgid "Close _Document"
 msgstr "關閉文件(_D)"
 
-#: ../src/ephy-window.c:468
+#: ../src/ephy-window.c:466
 msgid "There are ongoing downloads in this window"
 msgstr "這個視窗還有進行中的下載"
 
-#: ../src/ephy-window.c:469
+#: ../src/ephy-window.c:467
 msgid "If you close this window, the downloads will be cancelled"
 msgstr "如果你關閉這個視窗，這個下載也會被取消"
 
-#: ../src/ephy-window.c:470
+#: ../src/ephy-window.c:468
 msgid "Close window and cancel downloads"
 msgstr "關閉視窗並取消下載"
 
-#: ../src/ephy-window.c:1172
+#: ../src/ephy-window.c:1137
 msgid "Save As"
 msgstr "另存新檔"
 
-#: ../src/ephy-window.c:1174
+#: ../src/ephy-window.c:1139
 msgid "Save As Application"
 msgstr "儲存為應用程式"
 
-#: ../src/ephy-window.c:1176
+#: ../src/ephy-window.c:1141
 msgid "Print"
 msgstr "列印"
 
-#: ../src/ephy-window.c:1178
+#: ../src/ephy-window.c:1143
 msgid "Bookmark"
 msgstr "加入書籤"
 
-#: ../src/ephy-window.c:1180
+#: ../src/ephy-window.c:1145
 msgid "Find"
 msgstr "尋找"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1189
+#: ../src/ephy-window.c:1154
 msgid "Larger"
 msgstr "放大"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1192
+#: ../src/ephy-window.c:1157
 msgid "Smaller"
 msgstr "縮小"
 
-#: ../src/ephy-window.c:1220
+#: ../src/ephy-window.c:1185
 msgid "Back"
 msgstr "上一頁"
 
-#: ../src/ephy-window.c:1232
+#: ../src/ephy-window.c:1197
 msgid "Forward"
 msgstr "下一頁"
 
-#: ../src/ephy-window.c:1244
+#: ../src/ephy-window.c:1209
 msgid "Zoom"
 msgstr "縮放"
 
-#: ../src/ephy-window.c:1253
+#: ../src/ephy-window.c:1218
 msgid "New _Tab"
 msgstr "新增分頁(_T)"
 
-#: ../src/ephy-window.c:1261
+#: ../src/ephy-window.c:1226
 msgid "Go to most visited"
 msgstr "移至最常瀏覽"
 
@@ -2550,7 +2419,7 @@ msgstr "另存圖片"
 #. * second %s is the locale name. Example:
 #. * "French (France)"
 #.
-#: ../src/prefs-dialog.c:549 ../src/prefs-dialog.c:555
+#: ../src/prefs-dialog.c:553 ../src/prefs-dialog.c:559
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -2559,24 +2428,24 @@ 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:564
+#: ../src/prefs-dialog.c:568
 #, c-format
 msgctxt "language"
 msgid "User defined (%s)"
 msgstr "使用者定義 (%s)"
 
-#: ../src/prefs-dialog.c:586
+#: ../src/prefs-dialog.c:590
 #, c-format
 msgid "System language (%s)"
 msgid_plural "System languages (%s)"
 msgstr[0] "系統語言 (%s)"
 
-#: ../src/prefs-dialog.c:918
+#: ../src/prefs-dialog.c:922
 msgid "Select a Directory"
 msgstr "選擇一個目錄"
 
 #. Search engine option in the preferences dialog
-#: ../src/prefs-dialog.c:1011
+#: ../src/prefs-dialog.c:1017
 msgid "DuckDuckGo"
 msgstr "DuckDuckGo"
 
@@ -2584,86 +2453,84 @@ msgstr "DuckDuckGo"
 #. * 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
+#: ../src/prefs-dialog.c:1022
 #, 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
+#: ../src/prefs-dialog.c:1024
 msgid "Google"
 msgstr "Google"
 
 #. For the preferences dialog. Consider a regional variant, like google.co.uk
-#: ../src/prefs-dialog.c:1020
+#: ../src/prefs-dialog.c:1026
 #, 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
+#: ../src/prefs-dialog.c:1028
 msgid "Bing"
 msgstr "Bing"
 
 #. For the preferences dialog. Consider a regional variant, like uk.bing.com
-#: ../src/prefs-dialog.c:1024
+#: ../src/prefs-dialog.c:1030
 #, c-format
 msgid "http://www.bing.com/search?q=%s";
 msgstr "http://www.bing.com/search?q=%s";
 
-#: ../src/window-commands.c:778
+#: ../src/window-commands.c:709
 #, c-format
 msgid "A web application named '%s' already exists. Do you want to replace it?"
 msgstr "已存在名為「%s」的網頁應用程式。你想要取代它嗎？"
 
-#: ../src/window-commands.c:783
+#: ../src/window-commands.c:714
 msgid "Replace"
 msgstr "取代"
 
-#: ../src/window-commands.c:787
+#: ../src/window-commands.c:718
 msgid ""
 "An application with the same name already exists. Replacing it will "
 "overwrite it."
 msgstr "以此為名的應用程式已經存在。取代它會將它覆蓋。"
 
-#: ../src/window-commands.c:823
+#: ../src/window-commands.c:754
 #, c-format
 msgid "The application '%s' is ready to be used"
 msgstr "應用程式「%s」已經準備好可以使用"
 
-#: ../src/window-commands.c:826
+#: ../src/window-commands.c:757
 #, c-format
 msgid "The application '%s' could not be created"
 msgstr "無法建立應用程式「%s」"
 
-#: ../src/window-commands.c:834
+#: ../src/window-commands.c:765
 msgid "Launch"
 msgstr "執行"
 
 #. Show dialog with icon, title.
-#: ../src/window-commands.c:874
+#: ../src/window-commands.c:805
 msgid "Create Web Application"
 msgstr "建立網頁應用程式"
 
-#: ../src/window-commands.c:879
+#: ../src/window-commands.c:810
 msgid "C_reate"
 msgstr "建立(_R)"
 
-#: ../src/window-commands.c:1535 ../src/window-commands.c:1558
+#: ../src/window-commands.c:1470 ../src/window-commands.c:1493
 msgid "Contact us at:"
 msgstr "聯絡我們於："
 
-#: ../src/window-commands.c:1538
+#: ../src/window-commands.c:1473
 msgid "Contributors:"
 msgstr "貢獻者："
 
-#: ../src/window-commands.c:1541
+#: ../src/window-commands.c:1476
 msgid "Past developers:"
 msgstr "前度開發人員："
 
-#: ../src/window-commands.c:1567
+#: ../src/window-commands.c:1502
 #, c-format
 msgid ""
 "A simple, clean, beautiful view of the web.\n"
@@ -2680,7 +2547,7 @@ msgstr ""
 #. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
 #.
-#: ../src/window-commands.c:1590
+#: ../src/window-commands.c:1525
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -2691,25 +2558,106 @@ msgstr ""
 "Ching-Hung Lin <billlin wshlab2 ee kuas edu tw>, 2004\n"
 "Abel Cheung <maddog linux org hk>, 2003"
 
-#: ../src/window-commands.c:1593
+#: ../src/window-commands.c:1528
 msgid "Web Website"
 msgstr "網頁網站"
 
-#: ../src/window-commands.c:1732
+#: ../src/window-commands.c:1667
 msgid "Enable caret browsing mode?"
 msgstr "是否啟用鍵盤瀏覽？"
 
-#: ../src/window-commands.c:1735
+#: ../src/window-commands.c:1670
 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:1738
+#: ../src/window-commands.c:1673
 msgid "_Enable"
 msgstr "啟用(_E)"
 
+#~ msgid "Show toolbars by default"
+#~ msgstr "預設顯示工具列"
+
+#~ msgid "History pages time range"
+#~ msgstr "歷史紀錄時間範圍"
+
+#~ msgid "Whether to show the title column in the history window."
+#~ msgstr "是否在歷史紀錄視窗顯示標題欄。"
+
+#~ msgid "Whether to show the address column in the history window."
+#~ msgstr "是否在歷史紀錄視窗顯示位址欄。"
+
+#~ msgid "Whether to show the date-time column in the history window."
+#~ msgstr "是否在歷史紀錄視窗顯示日期-時刻欄。"
+
+#~ msgid "All sites"
+#~ msgstr "所有網站"
+
+#~ msgid "Sites"
+#~ msgstr "網站"
+
+#~ msgid "%d _Similar"
+#~ msgid_plural "%d _Similar"
+#~ msgstr[0] "%d 個相似(_S)"
+
+#~ msgid "_Unify With %d Identical Bookmark"
+#~ msgid_plural "_Unify With %d Identical Bookmarks"
+#~ msgstr[0] "與 %d 個相同的書籤合併(_U)"
+
+#~ msgid "Show “%s”"
+#~ msgstr "顯示“%s”"
+
+#~ msgid "Open the selected history link in a new window"
+#~ msgstr "在新的視窗中開啟已選的瀏覽記錄連結"
+
+#~ msgid "Open the selected history link in a new tab"
+#~ msgstr "在新的分頁中開啟已選的瀏覽記錄連結"
+
+#~ msgid "Bookmark the selected history link"
+#~ msgstr "將已選的瀏覽記錄連結加入至書籤"
+
+#~ msgid "Close the history window"
+#~ msgstr "關閉瀏覽記錄視窗"
+
+#~ msgid "Delete the selected history link"
+#~ msgstr "刪除已選的瀏覽記錄連結"
+
+#~ msgid "Select all history links or text"
+#~ msgstr "選取所有瀏覽記錄連結或文字"
+
+#~ msgid "Clear _History"
+#~ msgstr "清除瀏覽記錄(_H)"
+
+#~ msgid "Clear your browsing history"
+#~ msgstr "清除瀏覽記錄"
+
+#~ msgid "Display history help"
+#~ msgstr "顯示瀏覽記錄說明文件"
+
+#~ msgid "_Address"
+#~ msgstr "位址(_A)"
+
+#~ msgid "_Date and Time"
+#~ msgstr "日期和時刻(_D)"
+
+#~ msgid "Show the date and time column"
+#~ msgstr "顯示日期及時刻欄位"
+
+#~ msgid "Last 30 minutes"
+#~ msgstr "前 30 分鐘"
+
+#~ msgid "Today"
+#~ msgstr "今日"
+
+#~ msgid "Last %d day"
+#~ msgid_plural "Last %d days"
+#~ msgstr[0] "最近 %d 日"
+
+#~ msgid "All history"
+#~ msgstr "所有瀏覽記錄"
+
 #~ msgid "%u:%02u hour left"
 #~ msgid_plural "%u:%02u hours left"
 #~ msgstr[0] "剩餘 %u:%02u 小時"
@@ -2804,9 +2752,6 @@ msgstr "啟用(_E)"
 #~ msgid "Domain"
 #~ msgstr "網域"
 
-#~ msgid "Name"
-#~ msgstr "名稱"
-
 #~ msgid "Host"
 #~ msgstr "主機"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 88c44cc..804b78c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -13,8 +13,8 @@ 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: 2014-01-16 19:30+0800\n"
-"PO-Revision-Date: 2014-01-16 19:32+0800\n"
+"POT-Creation-Date: 2014-02-15 19:03+0800\n"
+"PO-Revision-Date: 2014-02-11 21:29+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: zh_TW\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.3\n"
 
 #: ../data/default-bookmarks.rdf.in.h:1
 msgid "Search the web"
@@ -40,7 +40,6 @@ msgstr "搜尋網頁"
 #. 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";
 msgid "https://duckduckgo.com/?t=epiphany";
 msgstr "https://duckduckgo.com/?t=epiphany";
 
@@ -55,7 +54,6 @@ msgstr "https://duckduckgo.com/?t=epiphany";
 #. 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";
 msgid "https://duckduckgo.com/?q=%s&amp;t=epiphany";
 msgstr "https://duckduckgo.com/?q=%s&amp;t=epiphany";
 
@@ -70,7 +68,7 @@ msgstr ""
 
 #: ../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
+#: ../src/ephy-main.c:314 ../src/ephy-main.c:472 ../src/window-commands.c:1509
 msgid "Web"
 msgstr "網頁"
 
@@ -103,7 +101,6 @@ msgstr "鍵盤瀏覽"
 #. 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'"
 
@@ -196,14 +193,24 @@ msgstr ""
 "入。"
 
 #: ../data/org.gnome.epiphany.gschema.xml.h:28
-msgid "Show toolbars by default"
-msgstr "預設顯示工具列"
+msgid "Process model"
+msgstr "程序模型"
 
 #: ../data/org.gnome.epiphany.gschema.xml.h:29
+msgid ""
+"This option allows to set the process model used. Use 'shared-secondary-"
+"process' to use a single web process shared by all the tabs and 'one-"
+"secondary-process-per-web-view' to use a different web process for each tab."
+msgstr ""
+"這個選項允許設定使用的程序模型。使用「shared-secondary-process」讓所有分頁共"
+"享單一 web 程序，而「one-secondary-process-per-web-view」則會為每個分頁使用不"
+"同的 web 程序。"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:30
 msgid "Toolbar style"
 msgstr "工具列樣式"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:30
+#: ../data/org.gnome.epiphany.gschema.xml.h:31
 msgid ""
 "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both"
 "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and "
@@ -212,31 +219,31 @@ msgstr ""
 "工具列樣式。允許的數值有 \"\" (使用 GNOME 預設樣式)、\"both\" (文字和圖"
 "示)、\"both-horiz\" (文字在圖示旁)、\"icons\" 和 \"text\"。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:31
+#: ../data/org.gnome.epiphany.gschema.xml.h:32
 msgid "[Deprecated]"
 msgstr "[已廢棄]"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:32
+#: ../data/org.gnome.epiphany.gschema.xml.h:33
 msgid ""
 "[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' "
 "instead."
 msgstr "[已廢棄] 這個設定值已廢棄，使用「tabs-bar-visibility-policy」代替。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:33
+#: ../data/org.gnome.epiphany.gschema.xml.h:34
 msgid "Visibility of the downloads window"
 msgstr "下載視窗的顯示"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:34
+#: ../data/org.gnome.epiphany.gschema.xml.h:35
 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:35
+#: ../data/org.gnome.epiphany.gschema.xml.h:36
 msgid "The visibility policy for the tabs bar."
 msgstr "分頁列顯示原則。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:36
+#: ../data/org.gnome.epiphany.gschema.xml.h:37
 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 "
@@ -245,111 +252,111 @@ msgstr ""
 "控制分頁列何時顯示。可能的數值有「always」(永遠顯示分頁列)、「more-than-one」"
 "(如果有兩個以上分頁才顯示分頁列) 和「never」(永遠不顯示分頁列)。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:37
+#: ../data/org.gnome.epiphany.gschema.xml.h:38
 msgid "Minimum font size"
 msgstr "最小字型大小"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:38
+#: ../data/org.gnome.epiphany.gschema.xml.h:39
 msgid "Use GNOME fonts"
 msgstr "使用 GNOME 字型"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:39
+#: ../data/org.gnome.epiphany.gschema.xml.h:40
 msgid "Use GNOME font settings."
 msgstr "使用 GNOME 字型設定值。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:40
+#: ../data/org.gnome.epiphany.gschema.xml.h:41
 msgid "Custom sans-serif font"
 msgstr "自訂無襯線字型"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:41
+#: ../data/org.gnome.epiphany.gschema.xml.h:42
 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:42
+#: ../data/org.gnome.epiphany.gschema.xml.h:43
 msgid "Custom serif font"
 msgstr "自訂有襯線字型"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:43
+#: ../data/org.gnome.epiphany.gschema.xml.h:44
 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:44
+#: ../data/org.gnome.epiphany.gschema.xml.h:45
 msgid "Custom monospace font"
 msgstr "自訂等寬字型"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:45
+#: ../data/org.gnome.epiphany.gschema.xml.h:46
 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:46
+#: ../data/org.gnome.epiphany.gschema.xml.h:47
 msgid "Use own colors"
 msgstr "使用自訂顏色"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:47
+#: ../data/org.gnome.epiphany.gschema.xml.h:48
 msgid "Use your own colors instead of the colors the page requests."
 msgstr "使用您自己的顏色取代網頁要求的顏色。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:48
+#: ../data/org.gnome.epiphany.gschema.xml.h:49
 msgid "Use own fonts"
 msgstr "使用自用字型(_U)"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:49
+#: ../data/org.gnome.epiphany.gschema.xml.h:50
 msgid "Use your own fonts instead of the fonts the page requests."
 msgstr "使用您自己的字型取代網頁要求的字型。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:50
+#: ../data/org.gnome.epiphany.gschema.xml.h:51
 msgid "Use a custom CSS"
 msgstr "使用自訂 CSS"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:51
+#: ../data/org.gnome.epiphany.gschema.xml.h:52
 msgid "Use a custom CSS file to modify websites own CSS."
 msgstr "使用自訂的 CSS 檔案來修改網站自己的 CSS。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:52
+#: ../data/org.gnome.epiphany.gschema.xml.h:53
 msgid "Enable spell checking"
 msgstr "啟用拼字檢查"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:53
+#: ../data/org.gnome.epiphany.gschema.xml.h:54
 msgid "Spell check any text typed in editable areas."
 msgstr "對任何在可編輯區域中輸入的文字進行拼字檢查。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:54
+#: ../data/org.gnome.epiphany.gschema.xml.h:55
 msgid "Default encoding"
 msgstr "預設編碼"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:55
+#: ../data/org.gnome.epiphany.gschema.xml.h:56
 msgid ""
 "Default encoding. Accepted values are the ones WebKitGTK+ can understand."
 msgstr "預設的編碼。可接受的數值為 WebKitGTK+ 能辨識的數值。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:56
+#: ../data/org.gnome.epiphany.gschema.xml.h:57
 msgid "Size of disk cache"
 msgstr "磁碟快取大小"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:57
+#: ../data/org.gnome.epiphany.gschema.xml.h:58
 msgid "Size of disk cache, in MB."
 msgstr "磁碟快取大小，單位為 MB。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:58
-#: ../src/resources/prefs-dialog.ui.h:41
+#: ../data/org.gnome.epiphany.gschema.xml.h:59
+#: ../src/resources/prefs-dialog.ui.h:40
 msgid "Languages"
 msgstr "語言"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:59
+#: ../data/org.gnome.epiphany.gschema.xml.h:60
 msgid "Preferred languages, two letter codes."
 msgstr "偏好的語言，兩個英文字母的代碼。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:60
+#: ../data/org.gnome.epiphany.gschema.xml.h:61
 msgid "Cookie accept"
 msgstr "Cookie 接受"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:61
+#: ../data/org.gnome.epiphany.gschema.xml.h:62
 msgid ""
 "Where to accept cookies from. Possible values are \"anywhere\", \"current "
 "site\" and \"nowhere\"."
@@ -357,75 +364,75 @@ msgstr ""
 "要接受來自何處的 cookies。可能的數值有「anywhere」、「current site」和"
 "「nowhere」。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:62
+#: ../data/org.gnome.epiphany.gschema.xml.h:63
 msgid "Image animation mode"
 msgstr "影像動畫模式"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:63
+#: ../data/org.gnome.epiphany.gschema.xml.h:64
 msgid ""
 "How to present animated images. Possible values are \"normal\", \"once\" and "
 "\"disabled\"."
 msgstr "如何顯示動畫影像。可能的數值有「normal」、「once」和「disabled」。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:64
+#: ../data/org.gnome.epiphany.gschema.xml.h:65
 msgid "Allow popups"
 msgstr "允許彈出式視窗"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:65
+#: ../data/org.gnome.epiphany.gschema.xml.h:66
 msgid ""
 "Allow sites to open new windows using JavaScript (if JavaScript is enabled)."
 msgstr "允許網站使用 JavaScript 開啟新視窗 (如果啟用 JavaScript)。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:66
+#: ../data/org.gnome.epiphany.gschema.xml.h:67
 msgid "Enable Plugins"
 msgstr "啟用外掛程式"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:67
+#: ../data/org.gnome.epiphany.gschema.xml.h:68
 msgid "Enable JavaScript"
 msgstr "啟用 JavaScript"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:68
+#: ../data/org.gnome.epiphany.gschema.xml.h:69
 msgid "Enable WebGL"
 msgstr "啟用 WebGL"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:69
+#: ../data/org.gnome.epiphany.gschema.xml.h:70
 msgid "Whether to enable support for WebGL contexts."
 msgstr "是否啟用支援 WebGL 內容。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:70
+#: ../data/org.gnome.epiphany.gschema.xml.h:71
 msgid "Enable WebAudio"
 msgstr "啟用 WebAudio"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:71
+#: ../data/org.gnome.epiphany.gschema.xml.h:72
 msgid "Whether to enable support for WebAudio."
 msgstr "是否啟用支援 WebAudio。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:72
+#: ../data/org.gnome.epiphany.gschema.xml.h:73
 msgid "Do Not Track"
 msgstr "不要追蹤"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:73
+#: ../data/org.gnome.epiphany.gschema.xml.h:74
 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:74
+#: ../data/org.gnome.epiphany.gschema.xml.h:75
 msgid "Enable Adblock"
 msgstr "啟用廣告阻擋"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:75
+#: ../data/org.gnome.epiphany.gschema.xml.h:76
 msgid ""
 "Whether to block the embedded advertisements that web pages might want to "
 "show."
 msgstr "是否阻擋內嵌於網頁可能顯示的廣告。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:76
+#: ../data/org.gnome.epiphany.gschema.xml.h:77
 msgid "The downloads folder"
 msgstr "下載資料夾"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:77
+#: ../data/org.gnome.epiphany.gschema.xml.h:78
 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."
@@ -433,27 +440,11 @@ msgstr ""
 "放置下載的檔案的資料夾路徑；或是「Downloads」代表預設的下載目錄，或"
 "「Desktop」使用桌面資料夾。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:78
-msgid "History pages time range"
-msgstr "歷史紀錄時間範圍"
-
 #: ../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:80
-msgid "Whether to show the address column in the history window."
-msgstr "是否在歷史紀錄視窗顯示位址欄。"
-
-#: ../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:82
 msgid "Whether to show the title column in the bookmarks window."
 msgstr "是否在書籤視窗顯示標題欄。"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:83
+#: ../data/org.gnome.epiphany.gschema.xml.h:80
 msgid "Whether to show the address column in the bookmarks window."
 msgstr "是否在書籤視窗顯示位址欄。"
 
@@ -537,17 +528,17 @@ msgstr ""
 "您現在使用<em>隱密</em>瀏覽。在這個模式中檢視的網頁將不會顯示在瀏覽紀錄中，而"
 "所有儲存的資訊都會在關閉視窗時清除。"
 
-#: ../embed/ephy-embed.c:490
+#: ../embed/ephy-embed.c:506
 #, c-format
 msgid "Press %s to exit fullscreen"
 msgstr "按下 %s 離開全螢幕"
 
 #. Translators: 'ESC' and 'F11' are keyboard keys.
-#: ../embed/ephy-embed.c:493
+#: ../embed/ephy-embed.c:509
 msgid "ESC"
 msgstr "ESC"
 
-#: ../embed/ephy-embed.c:493
+#: ../embed/ephy-embed.c:509
 msgid "F11"
 msgstr "F11"
 
@@ -881,23 +872,23 @@ msgstr "萬國碼 (UTF-3_2BE)"
 msgid "Unknown (%s)"
 msgstr "不明 (%s)"
 
-#: ../embed/ephy-find-toolbar.c:103
+#: ../embed/ephy-find-toolbar.c:105
 msgid "Text not found"
 msgstr "找不到文字"
 
-#: ../embed/ephy-find-toolbar.c:110
+#: ../embed/ephy-find-toolbar.c:112
 msgid "Search wrapped back to the top"
 msgstr "搜尋至結尾後返回開頭"
 
-#: ../embed/ephy-find-toolbar.c:463
+#: ../embed/ephy-find-toolbar.c:456
 msgid "Type to search…"
 msgstr "輸入以搜尋…"
 
-#: ../embed/ephy-find-toolbar.c:469
+#: ../embed/ephy-find-toolbar.c:462
 msgid "Find previous occurrence of the search string"
 msgstr "尋找上一個出現搜尋字串的地方"
 
-#: ../embed/ephy-find-toolbar.c:477
+#: ../embed/ephy-find-toolbar.c:470
 msgid "Find next occurrence of the search string"
 msgstr "尋找下一個出現搜尋字串的地方"
 
@@ -906,49 +897,49 @@ msgid "Most Visited"
 msgstr "最常瀏覽"
 
 #. characters
-#: ../embed/ephy-web-view.c:64 ../embed/ephy-web-view.c:2779
+#: ../embed/ephy-web-view.c:65 ../embed/ephy-web-view.c:2946
 msgid "Blank page"
 msgstr "空白頁面"
 
-#: ../embed/ephy-web-view.c:496 ../src/window-commands.c:329
+#: ../embed/ephy-web-view.c:497 ../src/window-commands.c:329
 msgid "Save"
 msgstr "儲存"
 
 #. Translators: The %s the hostname where this is happening.
 #. * Example: mail.google.com.
 #.
-#: ../embed/ephy-web-view.c:508
+#: ../embed/ephy-web-view.c:509
 #, c-format
 msgid "Do you want to save your password for “%s”?"
 msgstr "您是否要儲存您在“%s”的密碼？"
 
-#: ../embed/ephy-web-view.c:1381
+#: ../embed/ephy-web-view.c:1403
 msgid "Deny"
 msgstr "禁止"
 
-#: ../embed/ephy-web-view.c:1382
+#: ../embed/ephy-web-view.c:1404
 msgid "Allow"
 msgstr "允許"
 
-#: ../embed/ephy-web-view.c:1392
+#: ../embed/ephy-web-view.c:1414
 #, c-format
 msgid "The page at <b>%s</b> wants to know your location."
 msgstr "在 <b>%s</b> 的網頁想要知道您的位置。"
 
-#: ../embed/ephy-web-view.c:1742
+#: ../embed/ephy-web-view.c:1765
 msgid "None specified"
 msgstr "沒有指定"
 
-#: ../embed/ephy-web-view.c:1753 ../embed/ephy-web-view.c:1770
+#: ../embed/ephy-web-view.c:1778 ../embed/ephy-web-view.c:1793
 #, c-format
 msgid "Problem loading “%s”"
 msgstr "載入“%s”時發生錯誤"
 
-#: ../embed/ephy-web-view.c:1755
+#: ../embed/ephy-web-view.c:1780
 msgid "Oops! Unable to display this website."
 msgstr "噢！無法顯示這個網站。"
 
-#: ../embed/ephy-web-view.c:1756
+#: ../embed/ephy-web-view.c:1781
 #, c-format
 msgid ""
 "<p>The site at “%s” seems to be unavailable. The precise error was:</"
@@ -960,15 +951,15 @@ msgstr ""
 "它可能是暫時無法使用或移動到新的位址。您可能會想要檢查您的網際網路連線是否正"
 "常。</p>"
 
-#: ../embed/ephy-web-view.c:1765
-msgid "Try Again"
-msgstr "重試"
+#: ../embed/ephy-web-view.c:1789
+msgid "Try again"
+msgstr "再試一次"
 
-#: ../embed/ephy-web-view.c:1772
+#: ../embed/ephy-web-view.c:1795
 msgid "Oops! There may be a problem."
 msgstr "噢！可能有問題發生。"
 
-#: ../embed/ephy-web-view.c:1773
+#: ../embed/ephy-web-view.c:1796
 #, c-format
 msgid ""
 "<p>This site may have caused Web to close unexpectedly.</p><p>If this "
@@ -978,53 +969,53 @@ msgstr ""
 "<p>這個網站可能造成 Web 未預期的關閉。</p><p>如果這再次發生，請將這個問題回報"
 "給 <strong>%s</strong> 開發團隊。</p>"
 
-#: ../embed/ephy-web-view.c:1779 ../embed/ephy-web-view.c:1787
+#: ../embed/ephy-web-view.c:1801 ../embed/ephy-web-view.c:1808
 msgid "Reload Anyway"
 msgstr "強制重新載入"
 
-#: ../embed/ephy-web-view.c:1784
+#: ../embed/ephy-web-view.c:1805
 #, c-format
 msgid "Problem displaying “%s”"
 msgstr "顯示“%s”時發生問題"
 
-#: ../embed/ephy-web-view.c:1785
+#: ../embed/ephy-web-view.c:1806
 msgid "Oops!"
 msgstr "噢！"
 
-#: ../embed/ephy-web-view.c:1786
+#: ../embed/ephy-web-view.c:1807
 msgid ""
 "Something went wrong while displaying this page. Please reload or visit a "
 "different page to continue."
 msgstr "顯示這個頁面時有錯誤發生。請重新載入或瀏覽不同的頁面以繼續。"
 
-#: ../embed/ephy-web-view.c:2091 ../src/ephy-search-provider.c:287
+#: ../embed/ephy-web-view.c:2120 ../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:2329
+#: ../embed/ephy-web-view.c:2358
 #, c-format
 msgid "Loading “%s”…"
 msgstr "正在載入“%s”…"
 
-#: ../embed/ephy-web-view.c:2331
+#: ../embed/ephy-web-view.c:2360
 msgid "Loading…"
 msgstr "載入中…"
 
-#: ../embed/ephy-web-view.c:2683
+#: ../embed/ephy-web-view.c:2850
 msgid "_OK"
 msgstr "確定(_O)"
 
 #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193
-#: ../src/bookmarks/ephy-bookmark-properties.c:640
+#: ../src/bookmarks/ephy-bookmark-properties.c:428
 #: ../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
+#: ../src/resources/clear-data-dialog.ui.h:3
+#: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:808
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../lib/ephy-file-chooser.c:185
+#: ../lib/ephy-file-chooser.c:185 ../src/resources/history-dialog.ui.h:7
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -1049,7 +1040,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:3
+#: ../lib/ephy-file-helpers.c:112 ../src/resources/prefs-dialog.ui.h:2
 msgid "Downloads"
 msgstr "下載"
 
@@ -1239,11 +1230,11 @@ msgstr "300%"
 msgid "400%"
 msgstr "400%"
 
-#: ../lib/history/ephy-history-service-hosts-table.c:362
+#: ../lib/history/ephy-history-service-hosts-table.c:363
 msgid "Others"
 msgstr "其它"
 
-#: ../lib/history/ephy-history-service-hosts-table.c:366
+#: ../lib/history/ephy-history-service-hosts-table.c:367
 msgid "Local files"
 msgstr "本機檔案"
 
@@ -1283,60 +1274,38 @@ msgstr "這個網站的身分已經通過檢驗"
 msgid "The identity of this website has not been verified"
 msgstr "這個網站的身分並沒有通過檢驗"
 
-#: ../lib/widgets/ephy-certificate-dialog.c:326
-#: ../src/bookmarks/ephy-bookmark-properties.c:650
-#: ../src/bookmarks/ephy-bookmarks-editor.c:178
-#: ../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 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:125
 #, c-format
-#| 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:131
 #, c-format
-#| 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:137
 #, c-format
-#| msgid "%u second left"
-#| msgid_plural "%u seconds left"
 msgid "%d month left"
 msgid_plural "%d months left"
 msgstr[0] "剩下 %d 月"
@@ -1350,11 +1319,11 @@ msgstr "已完成"
 msgid "Error downloading: %s"
 msgstr "下載時發生錯誤：%s"
 
-#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:781
+#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:712
 msgid "Cancel"
 msgstr "取消"
 
-#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1170
+#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1135
 #: ../src/window-commands.c:275
 msgid "Open"
 msgstr "開啟"
@@ -1367,20 +1336,12 @@ msgstr "在資料夾顯示"
 msgid "Starting…"
 msgstr "正在開始…"
 
-#: ../lib/widgets/ephy-hosts-store.c:246
-msgid "All sites"
-msgstr "所有網站"
-
-#: ../lib/widgets/ephy-hosts-view.c:46
-msgid "Sites"
-msgstr "網站"
-
 #. Translators: the mnemonic shouldn't conflict with any of the
 #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
 #. * Select All, Input Methods and Insert Unicode control character.)
 #.
 #: ../lib/widgets/ephy-location-entry.c:618
-#: ../src/resources/prefs-dialog.ui.h:37 ../src/ephy-history-window.c:229
+#: ../src/resources/prefs-dialog.ui.h:36 ../src/ephy-history-window.c:189
 msgid "Cl_ear"
 msgstr "清除(_E)"
 
@@ -1397,77 +1358,46 @@ msgstr "取消復原(_R)"
 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:1623
-msgid "Title"
-msgstr "標題"
-
-#: ../lib/widgets/ephy-urls-view.c:51
-#: ../src/bookmarks/ephy-bookmarks-editor.c:212
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1634
-msgid "Address"
-msgstr "地址"
-
-#: ../lib/widgets/ephy-urls-view.c:59
-msgid "Date"
-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:611
-#, c-format
-msgid "%d _Similar"
-msgid_plural "%d _Similar"
-msgstr[0] "%d 個相似(_S)"
-
-#: ../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:274
-#: ../src/bookmarks/ephy-bookmark-properties.c:296
 #, c-format
-msgid "Show “%s”"
-msgstr "顯示“%s”"
+msgid "%d bookmark is similar"
+msgid_plural "%d bookmarks are similar"
+msgstr[0] "%d 個書籤是類似的"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:421
+#: ../src/bookmarks/ephy-bookmark-properties.c:234
 #, c-format
 msgid "“%s” Properties"
 msgstr "“%s”屬性"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:545
+#: ../src/bookmarks/ephy-bookmark-properties.c:358
 msgid "_Title:"
 msgstr "標題(_T)："
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:562
+#: ../src/bookmarks/ephy-bookmark-properties.c:375
 msgid "A_ddress:"
 msgstr "位址(_D)："
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:574
+#: ../src/bookmarks/ephy-bookmark-properties.c:387
 msgid "T_opics:"
 msgstr "主題(_O)："
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:597
+#: ../src/bookmarks/ephy-bookmark-properties.c:410
 msgid "Sho_w all topics"
 msgstr "顯示所有主題(_W)"
 
-#. Help.
-#: ../src/bookmarks/ephy-bookmark-properties.c:627
-#: ../src/bookmarks/ephy-bookmarks-editor.c:154
-#: ../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:643
-#: ../src/resources/prefs-dialog.ui.h:42
+#: ../src/bookmarks/ephy-bookmark-properties.c:431
+#: ../src/resources/prefs-dialog.ui.h:41
 #: ../src/resources/prefs-lang-dialog.ui.h:3
 msgid "_Add"
 msgstr "加入(_A)"
 
+#: ../src/bookmarks/ephy-bookmark-properties.c:438
+#: ../src/bookmarks/ephy-bookmarks-editor.c:178 ../src/ephy-window.c:113
+msgid "_Close"
+msgstr "關閉(_C)"
+
 #: ../src/bookmarks/ephy-bookmarks.c:88
 msgid "Entertainment"
 msgstr "娛樂"
@@ -1531,20 +1461,23 @@ msgstr "從本主題中刪除"
 
 #. Toplevel
 #: ../src/bookmarks/ephy-bookmarks-editor.c:151
-#: ../src/ephy-history-window.c:127
 msgid "_File"
 msgstr "檔案(_F)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:152
-#: ../src/ephy-history-window.c:128
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:153
-#: ../src/ephy-history-window.c:129
 msgid "_View"
 msgstr "顯示(_V)"
 
+#. Help.
+#: ../src/bookmarks/ephy-bookmarks-editor.c:154
+#: ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:190
+msgid "_Help"
+msgstr "求助(_H)"
+
 #. File Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:158
 msgid "_New Topic"
@@ -1554,10 +1487,8 @@ msgstr "新增主題(_N)"
 msgid "Create a new topic"
 msgstr "建立新的主題"
 
-#. File Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:161
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1158
-#: ../src/ephy-history-window.c:134 ../src/ephy-history-window.c:636
 msgid "Open in New _Window"
 msgid_plural "Open in New _Windows"
 msgstr[0] "在新的視窗中開啟(_W)"
@@ -1568,7 +1499,6 @@ msgstr "在新的視窗中開啟已選的書籤"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:164
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1161
-#: ../src/ephy-history-window.c:137 ../src/ephy-history-window.c:639
 msgid "Open in New _Tab"
 msgid_plural "Open in New _Tabs"
 msgstr[0] "在新的分頁中開啟(_T)"
@@ -1614,40 +1544,33 @@ msgid "Close the bookmarks window"
 msgstr "關閉書籤視窗"
 
 #. Edit Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:183
-#: ../src/ephy-history-window.c:148 ../src/ephy-window.c:124
+#: ../src/bookmarks/ephy-bookmarks-editor.c:183 ../src/ephy-window.c:124
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:184
-#: ../src/ephy-history-window.c:149
 msgid "Cut the selection"
 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:126
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1171 ../src/ephy-window.c:126
 msgid "_Copy"
 msgstr "複製(_C)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:187
-#: ../src/ephy-history-window.c:152
 msgid "Copy the selection"
 msgstr "複製選定的內容"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:189
-#: ../src/ephy-history-window.c:154 ../src/ephy-window.c:128
+#: ../src/bookmarks/ephy-bookmarks-editor.c:189 ../src/ephy-window.c:128
 msgid "_Paste"
 msgstr "貼上(_P)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:190
-#: ../src/ephy-history-window.c:155
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿中的內容"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:192
-#: ../src/ephy-history-window.c:157
+#: ../src/resources/history-dialog.ui.h:10
 msgid "_Delete"
 msgstr "刪除(_D)"
 
@@ -1655,8 +1578,7 @@ msgstr "刪除(_D)"
 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:132
+#: ../src/bookmarks/ephy-bookmarks-editor.c:195 ../src/ephy-window.c:132
 msgid "Select _All"
 msgstr "全部選取(_A)"
 
@@ -1666,7 +1588,6 @@ msgstr "選取所有書籤或文字"
 
 #. Help Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:200
-#: ../src/ephy-history-window.c:168
 msgid "_Contents"
 msgstr "內容(_C)"
 
@@ -1675,29 +1596,29 @@ msgid "Display bookmarks help"
 msgstr "顯示書籤說明文件"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:203
-#: ../src/resources/epiphany-application-menu.ui.h:8
-#: ../src/ephy-history-window.c:171 ../src/ephy-window.c:192
+#: ../src/resources/epiphany-application-menu.ui.h:8 ../src/ephy-window.c:192
 msgid "_About"
 msgstr "關於(_A)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:204
-#: ../src/ephy-history-window.c:172
 msgid "Display credits for the web browser creators"
 msgstr "鳴謝所有這個網頁瀏覽器的創作者"
 
 #. View Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:210
-#: ../src/ephy-history-window.c:186
 msgid "_Title"
 msgstr "標題(_T)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:211
-#: ../src/ephy-history-window.c:187
 msgid "Show the title column"
 msgstr "顯示標題欄位"
 
+#: ../src/bookmarks/ephy-bookmarks-editor.c:212
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1634
+msgid "Address"
+msgstr "地址"
+
 #: ../src/bookmarks/ephy-bookmarks-editor.c:213
-#: ../src/ephy-history-window.c:189
 msgid "Show the address column"
 msgstr "顯示位址欄位"
 
@@ -1814,7 +1735,6 @@ msgid "File"
 msgstr "檔案"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1167
-#: ../src/ephy-history-window.c:645
 msgid "_Copy Address"
 msgstr "複製位址(_C)"
 
@@ -1822,6 +1742,10 @@ msgstr "複製位址(_C)"
 msgid "Topics"
 msgstr "主題"
 
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1623
+msgid "Title"
+msgstr "標題"
+
 #. FIXME !!!!
 #: ../src/bookmarks/ephy-open-tabs-action.c:74
 msgid "Open in New _Tabs"
@@ -1840,7 +1764,7 @@ msgstr "建立主題“%s”"
 msgid "Clear Personal Data"
 msgstr "清除個人資料"
 
-#: ../src/resources/clear-data-dialog.ui.h:3
+#: ../src/resources/clear-data-dialog.ui.h:2
 msgid "C_lear"
 msgstr "清除(_L)"
 
@@ -1857,7 +1781,7 @@ msgstr ""
 
 #: ../src/resources/clear-data-dialog.ui.h:6
 #: ../src/resources/cookies-dialog.ui.h:1
-#: ../src/resources/prefs-dialog.ui.h:22
+#: ../src/resources/prefs-dialog.ui.h:21
 msgid "Cookies"
 msgstr "Cookie"
 
@@ -1880,16 +1804,17 @@ msgid ""
 msgstr "您不可以將這個動作復原。您選擇要清除的資料會永遠移除。"
 
 #: ../src/resources/cookies-dialog.ui.h:2
+#: ../src/resources/history-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
+#: ../src/resources/cookies-dialog.ui.h:3
+#: ../src/resources/passwords-dialog.ui.h:4
 msgid "Site"
 msgstr "網站"
 
-#: ../src/resources/cookies-dialog.ui.h:5
+#: ../src/resources/cookies-dialog.ui.h:4
 msgid "Remove"
 msgstr "移除"
 
@@ -1927,40 +1852,68 @@ msgstr "結束(_Q)"
 msgid "Text Encoding"
 msgstr "字元編碼"
 
-#: ../src/resources/epiphany.ui.h:3 ../src/ephy-encoding-menu.c:327
+#: ../src/resources/epiphany.ui.h:2 ../src/ephy-encoding-menu.c:327
 msgid "_Automatic"
 msgstr "自動(_A)"
 
-#: ../src/resources/epiphany.ui.h:4 ../src/ephy-encoding-menu.c:328
+#: ../src/resources/epiphany.ui.h:3 ../src/ephy-encoding-menu.c:328
 msgid "Use the encoding specified by the document"
 msgstr "使用文件指定的編碼方式"
 
-#: ../src/resources/epiphany.ui.h:5
+#: ../src/resources/epiphany.ui.h:4
 msgid "_Use a different encoding:"
 msgstr "使用不同的編碼方式(_U):"
 
+#: ../src/resources/history-dialog.ui.h:1
+msgid "History"
+msgstr "瀏覽記錄"
+
+#: ../src/resources/history-dialog.ui.h:3
+msgid "Search history"
+msgstr "搜尋歷史紀錄"
+
+#: ../src/resources/history-dialog.ui.h:4
+msgid "Date"
+msgstr "日期"
+
+#: ../src/resources/history-dialog.ui.h:5
+msgid "Name"
+msgstr "名稱"
+
+#: ../src/resources/history-dialog.ui.h:6
+msgid "Location"
+msgstr "位置"
+
+#: ../src/resources/history-dialog.ui.h:8
+msgid "_Copy Location"
+msgstr "複製位置(_C)"
+
+#: ../src/resources/history-dialog.ui.h:9
+msgid "Add _Bookmark"
+msgstr "加入書籤(_B)"
+
 #: ../src/resources/passwords-dialog.ui.h:1
-#: ../src/resources/prefs-dialog.ui.h:31
+#: ../src/resources/prefs-dialog.ui.h:30
 msgid "Passwords"
 msgstr "密碼"
 
-#: ../src/resources/passwords-dialog.ui.h:4
+#: ../src/resources/passwords-dialog.ui.h:3
 msgid "Search passwords"
 msgstr "搜尋密碼"
 
-#: ../src/resources/passwords-dialog.ui.h:6
+#: ../src/resources/passwords-dialog.ui.h:5
 msgid "User Name"
 msgstr "使用者名稱"
 
-#: ../src/resources/passwords-dialog.ui.h:7
+#: ../src/resources/passwords-dialog.ui.h:6
 msgid "Password"
 msgstr "密碼"
 
-#: ../src/resources/passwords-dialog.ui.h:8
+#: ../src/resources/passwords-dialog.ui.h:7
 msgid "_Copy Password"
 msgstr "複製密碼(_C)"
 
-#: ../src/resources/passwords-dialog.ui.h:9
+#: ../src/resources/passwords-dialog.ui.h:8
 msgid "C_opy Username"
 msgstr "複製使用者名稱(_O)"
 
@@ -1968,160 +1921,160 @@ msgstr "複製使用者名稱(_O)"
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../src/resources/prefs-dialog.ui.h:4
+#: ../src/resources/prefs-dialog.ui.h:3
 msgid "_Download folder:"
 msgstr "下載資料夾(_D)"
 
-#: ../src/resources/prefs-dialog.ui.h:5
+#: ../src/resources/prefs-dialog.ui.h:4
 msgid "A_utomatically open downloaded files"
 msgstr "自動下載並開啟檔案(_U)"
 
-#: ../src/resources/prefs-dialog.ui.h:6
+#: ../src/resources/prefs-dialog.ui.h:5
 msgid "Search"
 msgstr "搜尋"
 
-#: ../src/resources/prefs-dialog.ui.h:7
+#: ../src/resources/prefs-dialog.ui.h:6
 msgid "_Engine:"
 msgstr "引擎(_E):"
 
-#: ../src/resources/prefs-dialog.ui.h:8
+#: ../src/resources/prefs-dialog.ui.h:7
 msgid "Web Content"
 msgstr "網頁內容"
 
-#: ../src/resources/prefs-dialog.ui.h:9
+#: ../src/resources/prefs-dialog.ui.h:8
 msgid "Allow popup _windows"
 msgstr "允許彈出式視窗(_W)"
 
-#: ../src/resources/prefs-dialog.ui.h:10
+#: ../src/resources/prefs-dialog.ui.h:9
 msgid "Allow _advertisements"
 msgstr "允許廣告(_A)"
 
-#: ../src/resources/prefs-dialog.ui.h:11
+#: ../src/resources/prefs-dialog.ui.h:10
 msgid "Enable _plugins"
 msgstr "啟用外掛程式(_P)"
 
-#: ../src/resources/prefs-dialog.ui.h:12
+#: ../src/resources/prefs-dialog.ui.h:11
 msgid "General"
 msgstr "一般"
 
-#: ../src/resources/prefs-dialog.ui.h:13
+#: ../src/resources/prefs-dialog.ui.h:12
 msgid "Fonts"
 msgstr "字型"
 
-#: ../src/resources/prefs-dialog.ui.h:14
+#: ../src/resources/prefs-dialog.ui.h:13
 msgid "_Use system fonts"
 msgstr "使用系統字型(_U)"
 
-#: ../src/resources/prefs-dialog.ui.h:15
+#: ../src/resources/prefs-dialog.ui.h:14
 msgid "Sans serif font:"
 msgstr "無襯線字型："
 
-#: ../src/resources/prefs-dialog.ui.h:16
+#: ../src/resources/prefs-dialog.ui.h:15
 msgid "Serif font:"
 msgstr "襯線字型："
 
-#: ../src/resources/prefs-dialog.ui.h:17
+#: ../src/resources/prefs-dialog.ui.h:16
 msgid "Monospace font:"
 msgstr "等寬字型："
 
-#: ../src/resources/prefs-dialog.ui.h:18
+#: ../src/resources/prefs-dialog.ui.h:17
 msgid "Style"
 msgstr "樣式"
 
-#: ../src/resources/prefs-dialog.ui.h:19
+#: ../src/resources/prefs-dialog.ui.h:18
 msgid "Use custom _stylesheet"
 msgstr "使用自訂樣式表(_S)"
 
-#: ../src/resources/prefs-dialog.ui.h:20
+#: ../src/resources/prefs-dialog.ui.h:19
 msgid "_Edit Stylesheet…"
 msgstr "編輯樣式表(_E)…"
 
-#: ../src/resources/prefs-dialog.ui.h:21
+#: ../src/resources/prefs-dialog.ui.h:20
 msgid "Fonts & Style"
 msgstr "字型與樣式"
 
-#: ../src/resources/prefs-dialog.ui.h:23
+#: ../src/resources/prefs-dialog.ui.h:22
 msgid "Manage Cookies"
 msgstr "管理 Cookies"
 
-#: ../src/resources/prefs-dialog.ui.h:24
+#: ../src/resources/prefs-dialog.ui.h:23
 msgid "_Always accept"
 msgstr "總是接受(_A)"
 
-#: ../src/resources/prefs-dialog.ui.h:25
+#: ../src/resources/prefs-dialog.ui.h:24
 msgid "Only _from sites you visit"
 msgstr "只來自您瀏覽的網站(_F)"
 
 #. Refers to "Only from sites you visit" option under Cookies.
-#: ../src/resources/prefs-dialog.ui.h:27
+#: ../src/resources/prefs-dialog.ui.h:26
 msgid "<small>For example, not from advertisers on these sites</small>"
 msgstr "<small>例如，不要來自這些網站的廣告</small>"
 
-#: ../src/resources/prefs-dialog.ui.h:28
+#: ../src/resources/prefs-dialog.ui.h:27
 msgid "_Never accept"
 msgstr "永不接受(_N)"
 
-#: ../src/resources/prefs-dialog.ui.h:29
+#: ../src/resources/prefs-dialog.ui.h:28
 msgid "Tracking"
 msgstr "追蹤"
 
-#: ../src/resources/prefs-dialog.ui.h:30
+#: ../src/resources/prefs-dialog.ui.h:29
 msgid "_Tell web sites I do not want to be tracked"
 msgstr "告訴網站我不想被追蹤(_T)"
 
-#: ../src/resources/prefs-dialog.ui.h:32
+#: ../src/resources/prefs-dialog.ui.h:31
 msgid "Manage Passwords"
 msgstr "管理密碼"
 
-#: ../src/resources/prefs-dialog.ui.h:33
+#: ../src/resources/prefs-dialog.ui.h:32
 msgid "_Remember passwords"
 msgstr "記錄密碼(_R)"
 
-#: ../src/resources/prefs-dialog.ui.h:34
+#: ../src/resources/prefs-dialog.ui.h:33
 msgid "Temporary Files"
 msgstr "暫存檔"
 
-#: ../src/resources/prefs-dialog.ui.h:35
+#: ../src/resources/prefs-dialog.ui.h:34
 msgid "_Disk space:"
 msgstr "磁碟空間(_D)："
 
-#: ../src/resources/prefs-dialog.ui.h:36
+#: ../src/resources/prefs-dialog.ui.h:35
 msgid "MB"
 msgstr "MB"
 
-#: ../src/resources/prefs-dialog.ui.h:38
+#: ../src/resources/prefs-dialog.ui.h:37
 msgid "Privacy"
 msgstr "隱私"
 
-#: ../src/resources/prefs-dialog.ui.h:39 ../src/ephy-encoding-dialog.c:379
+#: ../src/resources/prefs-dialog.ui.h:38 ../src/ephy-encoding-dialog.c:379
 msgid "Encodings"
 msgstr "編碼"
 
-#: ../src/resources/prefs-dialog.ui.h:40
+#: ../src/resources/prefs-dialog.ui.h:39
 msgid "De_fault:"
 msgstr "預設(_F)："
 
-#: ../src/resources/prefs-dialog.ui.h:43
+#: ../src/resources/prefs-dialog.ui.h:42
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../src/resources/prefs-dialog.ui.h:44
+#: ../src/resources/prefs-dialog.ui.h:43
 msgid "_Up"
 msgstr "上(_U)"
 
-#: ../src/resources/prefs-dialog.ui.h:45
+#: ../src/resources/prefs-dialog.ui.h:44
 msgid "_Down"
 msgstr "下(_D)"
 
-#: ../src/resources/prefs-dialog.ui.h:46
+#: ../src/resources/prefs-dialog.ui.h:45
 msgid "Spell checking"
 msgstr "拼字檢查"
 
-#: ../src/resources/prefs-dialog.ui.h:47
+#: ../src/resources/prefs-dialog.ui.h:46
 msgid "_Enable spell checking"
 msgstr "啟用拼字檢查(_E)"
 
-#: ../src/resources/prefs-dialog.ui.h:48 ../src/prefs-dialog.c:835
+#: ../src/resources/prefs-dialog.ui.h:47 ../src/prefs-dialog.c:839
 msgid "Language"
 msgstr "語言"
 
@@ -2157,97 +2110,16 @@ msgstr "其它(_O)…"
 msgid "Other encodings"
 msgstr "其他字元編碼方式"
 
-#: ../src/ephy-history-window.c:135
-msgid "Open the selected history link in a new window"
-msgstr "在新的視窗中開啟已選的瀏覽記錄連結"
-
-#: ../src/ephy-history-window.c:138
-msgid "Open the selected history link in a new tab"
-msgstr "在新的分頁中開啟已選的瀏覽記錄連結"
-
-#: ../src/ephy-history-window.c:140
-msgid "Add _Bookmark…"
-msgstr "加入書籤(_B)…"
-
-#: ../src/ephy-history-window.c:141
-msgid "Bookmark the selected history link"
-msgstr "將已選的瀏覽記錄連結加入至書籤"
-
-#: ../src/ephy-history-window.c:144
-msgid "Close the history window"
-msgstr "關閉瀏覽記錄視窗"
-
-#: ../src/ephy-history-window.c:158
-msgid "Delete the selected history link"
-msgstr "刪除已選的瀏覽記錄連結"
-
-#: ../src/ephy-history-window.c:161
-msgid "Select all history links or text"
-msgstr "選取所有瀏覽記錄連結或文字"
-
-#: ../src/ephy-history-window.c:163
-msgid "Clear _History"
-msgstr "清除瀏覽記錄(_H)"
-
-#: ../src/ephy-history-window.c:164
-msgid "Clear your browsing history"
-msgstr "清除瀏覽記錄"
-
-#: ../src/ephy-history-window.c:169
-msgid "Display history help"
-msgstr "顯示瀏覽記錄說明文件"
-
-#: ../src/ephy-history-window.c:188
-msgid "_Address"
-msgstr "位址(_A)"
-
-#: ../src/ephy-history-window.c:190
-msgid "_Date and Time"
-msgstr "日期和時刻(_D)"
-
-#: ../src/ephy-history-window.c:191
-msgid "Show the date and time column"
-msgstr "顯示日期及時刻欄位"
-
-#: ../src/ephy-history-window.c:219
+#: ../src/ephy-history-window.c:179
 msgid "Clear browsing history?"
 msgstr "是否清除瀏覽記錄？"
 
-#: ../src/ephy-history-window.c:223
+#: ../src/ephy-history-window.c:183
 msgid ""
 "Clearing the browsing history will cause all history links to be permanently "
 "deleted."
 msgstr "清除瀏覽記錄將會使所有瀏覽記錄永遠被刪除。"
 
-#: ../src/ephy-history-window.c:235
-msgid "Clear History"
-msgstr "清除瀏覽記錄"
-
-#: ../src/ephy-history-window.c:799
-msgid "Last 30 minutes"
-msgstr "前 30 分鐘"
-
-#: ../src/ephy-history-window.c:800
-msgid "Today"
-msgstr "今日"
-
-#. keep this in sync with embed/ephy-history.c's
-#. * HISTORY_PAGE_OBSOLETE_DAYS
-#: ../src/ephy-history-window.c:802 ../src/ephy-history-window.c:806
-#: ../src/ephy-history-window.c:812
-#, c-format
-msgid "Last %d day"
-msgid_plural "Last %d days"
-msgstr[0] "最近 %d 日"
-
-#: ../src/ephy-history-window.c:816
-msgid "All history"
-msgstr "所有瀏覽記錄"
-
-#: ../src/ephy-history-window.c:1107
-msgid "History"
-msgstr "瀏覽記錄"
-
 #: ../src/ephy-main.c:76
 msgid "Open a new tab in an existing browser window"
 msgstr "在現有的瀏覽器視窗中開啟新的分頁"
@@ -2494,77 +2366,77 @@ msgstr "動畫開始(_A)"
 msgid "St_op Animation"
 msgstr "動畫停止(_O)"
 
-#: ../src/ephy-window.c:450
+#: ../src/ephy-window.c:448
 msgid "There are unsubmitted changes to form elements"
 msgstr "對表單的元素而言沒有經確認的改變"
 
-#: ../src/ephy-window.c:451
+#: ../src/ephy-window.c:449
 msgid "If you close the document anyway, you will lose that information."
 msgstr "如果您無論無何要關閉此文件，您將會失去未儲存的資訊。"
 
-#: ../src/ephy-window.c:453
+#: ../src/ephy-window.c:451
 msgid "Close _Document"
 msgstr "關閉文件(_D)"
 
-#: ../src/ephy-window.c:468
+#: ../src/ephy-window.c:466
 msgid "There are ongoing downloads in this window"
 msgstr "這個視窗還有進行中的下載"
 
-#: ../src/ephy-window.c:469
+#: ../src/ephy-window.c:467
 msgid "If you close this window, the downloads will be cancelled"
 msgstr "如果您關閉這個視窗，這個下載也會被取消"
 
-#: ../src/ephy-window.c:470
+#: ../src/ephy-window.c:468
 msgid "Close window and cancel downloads"
 msgstr "關閉視窗並取消下載"
 
-#: ../src/ephy-window.c:1172
+#: ../src/ephy-window.c:1137
 msgid "Save As"
 msgstr "另存新檔"
 
-#: ../src/ephy-window.c:1174
+#: ../src/ephy-window.c:1139
 msgid "Save As Application"
 msgstr "儲存為應用程式"
 
-#: ../src/ephy-window.c:1176
+#: ../src/ephy-window.c:1141
 msgid "Print"
 msgstr "列印"
 
-#: ../src/ephy-window.c:1178
+#: ../src/ephy-window.c:1143
 msgid "Bookmark"
 msgstr "加入書籤"
 
-#: ../src/ephy-window.c:1180
+#: ../src/ephy-window.c:1145
 msgid "Find"
 msgstr "尋找"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1189
+#: ../src/ephy-window.c:1154
 msgid "Larger"
 msgstr "放大"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1192
+#: ../src/ephy-window.c:1157
 msgid "Smaller"
 msgstr "縮小"
 
-#: ../src/ephy-window.c:1220
+#: ../src/ephy-window.c:1185
 msgid "Back"
 msgstr "上一頁"
 
-#: ../src/ephy-window.c:1232
+#: ../src/ephy-window.c:1197
 msgid "Forward"
 msgstr "下一頁"
 
-#: ../src/ephy-window.c:1244
+#: ../src/ephy-window.c:1209
 msgid "Zoom"
 msgstr "縮放"
 
-#: ../src/ephy-window.c:1253
+#: ../src/ephy-window.c:1218
 msgid "New _Tab"
 msgstr "新增分頁(_T)"
 
-#: ../src/ephy-window.c:1261
+#: ../src/ephy-window.c:1226
 msgid "Go to most visited"
 msgstr "移至最常瀏覽"
 
@@ -2580,7 +2452,7 @@ msgstr "另存圖片"
 #. * second %s is the locale name. Example:
 #. * "French (France)"
 #.
-#: ../src/prefs-dialog.c:549 ../src/prefs-dialog.c:555
+#: ../src/prefs-dialog.c:553 ../src/prefs-dialog.c:559
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -2589,24 +2461,24 @@ 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:564
+#: ../src/prefs-dialog.c:568
 #, c-format
 msgctxt "language"
 msgid "User defined (%s)"
 msgstr "使用者定義 (%s)"
 
-#: ../src/prefs-dialog.c:586
+#: ../src/prefs-dialog.c:590
 #, c-format
 msgid "System language (%s)"
 msgid_plural "System languages (%s)"
 msgstr[0] "系統語言 (%s)"
 
-#: ../src/prefs-dialog.c:918
+#: ../src/prefs-dialog.c:922
 msgid "Select a Directory"
 msgstr "選擇一個目錄"
 
 #. Search engine option in the preferences dialog
-#: ../src/prefs-dialog.c:1011
+#: ../src/prefs-dialog.c:1017
 msgid "DuckDuckGo"
 msgstr "DuckDuckGo"
 
@@ -2614,86 +2486,84 @@ msgstr "DuckDuckGo"
 #. * 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
+#: ../src/prefs-dialog.c:1022
 #, 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
+#: ../src/prefs-dialog.c:1024
 msgid "Google"
 msgstr "Google"
 
 #. For the preferences dialog. Consider a regional variant, like google.co.uk
-#: ../src/prefs-dialog.c:1020
+#: ../src/prefs-dialog.c:1026
 #, 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
+#: ../src/prefs-dialog.c:1028
 msgid "Bing"
 msgstr "Bing"
 
 #. For the preferences dialog. Consider a regional variant, like uk.bing.com
-#: ../src/prefs-dialog.c:1024
+#: ../src/prefs-dialog.c:1030
 #, c-format
 msgid "http://www.bing.com/search?q=%s";
 msgstr "http://www.bing.com/search?q=%s";
 
-#: ../src/window-commands.c:778
+#: ../src/window-commands.c:709
 #, c-format
 msgid "A web application named '%s' already exists. Do you want to replace it?"
 msgstr "已存在名為「%s」的網頁應用程式。您想要取代它嗎？"
 
-#: ../src/window-commands.c:783
+#: ../src/window-commands.c:714
 msgid "Replace"
 msgstr "取代"
 
-#: ../src/window-commands.c:787
+#: ../src/window-commands.c:718
 msgid ""
 "An application with the same name already exists. Replacing it will "
 "overwrite it."
 msgstr "以此為名的應用程式已經存在。取代它會將它覆蓋。"
 
-#: ../src/window-commands.c:823
+#: ../src/window-commands.c:754
 #, c-format
 msgid "The application '%s' is ready to be used"
 msgstr "應用程式「%s」已經準備好可以使用"
 
-#: ../src/window-commands.c:826
+#: ../src/window-commands.c:757
 #, c-format
 msgid "The application '%s' could not be created"
 msgstr "無法建立應用程式「%s」"
 
-#: ../src/window-commands.c:834
+#: ../src/window-commands.c:765
 msgid "Launch"
 msgstr "執行"
 
 #. Show dialog with icon, title.
-#: ../src/window-commands.c:874
+#: ../src/window-commands.c:805
 msgid "Create Web Application"
 msgstr "建立網頁應用程式"
 
-#: ../src/window-commands.c:879
+#: ../src/window-commands.c:810
 msgid "C_reate"
 msgstr "建立(_R)"
 
-#: ../src/window-commands.c:1535 ../src/window-commands.c:1558
+#: ../src/window-commands.c:1470 ../src/window-commands.c:1493
 msgid "Contact us at:"
 msgstr "聯絡我們於："
 
-#: ../src/window-commands.c:1538
+#: ../src/window-commands.c:1473
 msgid "Contributors:"
 msgstr "貢獻者："
 
-#: ../src/window-commands.c:1541
+#: ../src/window-commands.c:1476
 msgid "Past developers:"
 msgstr "前度開發人員："
 
-#: ../src/window-commands.c:1567
+#: ../src/window-commands.c:1502
 #, c-format
 msgid ""
 "A simple, clean, beautiful view of the web.\n"
@@ -2710,7 +2580,7 @@ msgstr ""
 #. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
 #.
-#: ../src/window-commands.c:1590
+#: ../src/window-commands.c:1525
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -2721,15 +2591,15 @@ msgstr ""
 "Ching-Hung Lin <billlin wshlab2 ee kuas edu tw>, 2004\n"
 "Abel Cheung <maddog linux org hk>, 2003"
 
-#: ../src/window-commands.c:1593
+#: ../src/window-commands.c:1528
 msgid "Web Website"
 msgstr "網頁網站"
 
-#: ../src/window-commands.c:1732
+#: ../src/window-commands.c:1667
 msgid "Enable caret browsing mode?"
 msgstr "是否啟用鍵盤瀏覽？"
 
-#: ../src/window-commands.c:1735
+#: ../src/window-commands.c:1670
 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 "
@@ -2738,10 +2608,91 @@ msgstr ""
 "按下 F7 會開啟或關閉鍵盤瀏覽。這個功能會在網頁中放置一個可移動的游標，讓您可"
 "以使用鍵盤隨處移動。您是否要啟用鍵盤瀏覽？"
 
-#: ../src/window-commands.c:1738
+#: ../src/window-commands.c:1673
 msgid "_Enable"
 msgstr "啟用(_E)"
 
+#~ msgid "Show toolbars by default"
+#~ msgstr "預設顯示工具列"
+
+#~ msgid "History pages time range"
+#~ msgstr "歷史紀錄時間範圍"
+
+#~ msgid "Whether to show the title column in the history window."
+#~ msgstr "是否在歷史紀錄視窗顯示標題欄。"
+
+#~ msgid "Whether to show the address column in the history window."
+#~ msgstr "是否在歷史紀錄視窗顯示位址欄。"
+
+#~ msgid "Whether to show the date-time column in the history window."
+#~ msgstr "是否在歷史紀錄視窗顯示日期-時刻欄。"
+
+#~ msgid "All sites"
+#~ msgstr "所有網站"
+
+#~ msgid "Sites"
+#~ msgstr "網站"
+
+#~ msgid "%d _Similar"
+#~ msgid_plural "%d _Similar"
+#~ msgstr[0] "%d 個相似(_S)"
+
+#~ msgid "_Unify With %d Identical Bookmark"
+#~ msgid_plural "_Unify With %d Identical Bookmarks"
+#~ msgstr[0] "與 %d 個相同的書籤合併(_U)"
+
+#~ msgid "Show “%s”"
+#~ msgstr "顯示“%s”"
+
+#~ msgid "Open the selected history link in a new window"
+#~ msgstr "在新的視窗中開啟已選的瀏覽記錄連結"
+
+#~ msgid "Open the selected history link in a new tab"
+#~ msgstr "在新的分頁中開啟已選的瀏覽記錄連結"
+
+#~ msgid "Bookmark the selected history link"
+#~ msgstr "將已選的瀏覽記錄連結加入至書籤"
+
+#~ msgid "Close the history window"
+#~ msgstr "關閉瀏覽記錄視窗"
+
+#~ msgid "Delete the selected history link"
+#~ msgstr "刪除已選的瀏覽記錄連結"
+
+#~ msgid "Select all history links or text"
+#~ msgstr "選取所有瀏覽記錄連結或文字"
+
+#~ msgid "Clear _History"
+#~ msgstr "清除瀏覽記錄(_H)"
+
+#~ msgid "Clear your browsing history"
+#~ msgstr "清除瀏覽記錄"
+
+#~ msgid "Display history help"
+#~ msgstr "顯示瀏覽記錄說明文件"
+
+#~ msgid "_Address"
+#~ msgstr "位址(_A)"
+
+#~ msgid "_Date and Time"
+#~ msgstr "日期和時刻(_D)"
+
+#~ msgid "Show the date and time column"
+#~ msgstr "顯示日期及時刻欄位"
+
+#~ msgid "Last 30 minutes"
+#~ msgstr "前 30 分鐘"
+
+#~ msgid "Today"
+#~ msgstr "今日"
+
+#~ msgid "Last %d day"
+#~ msgid_plural "Last %d days"
+#~ msgstr[0] "最近 %d 日"
+
+#~ msgid "All history"
+#~ msgstr "所有瀏覽記錄"
+
 #~ msgid "%u:%02u hour left"
 #~ msgid_plural "%u:%02u hours left"
 #~ msgstr[0] "剩餘 %u:%02u 小時"
@@ -2836,9 +2787,6 @@ msgstr "啟用(_E)"
 #~ msgid "Domain"
 #~ msgstr "網域"
 
-#~ msgid "Name"
-#~ msgstr "名稱"
-
 #~ msgid "Host"
 #~ msgstr "主機"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]