Updated Traditional Chinese translation(Hong Kong and Taiwan)

2 files changed, 1772 insertions, 1006 deletions

diff --git a/po/zh_HK.po b/po/zh_HK.po
index 5df3b5f8b..b4b8f8b66 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: 2012-04-11 09:26+0800\n"
-"PO-Revision-Date: 2012-04-11 09:26+0800\n"
+"POT-Creation-Date: 2012-06-30 22:57+0800\n"
+"PO-Revision-Date: 2012-06-30 22:58+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "Language: \n"
@@ -42,29 +42,422 @@ msgstr "http://www.google.com.tw"
 msgid "http://www.google.com/search?q=%s&amp;ie=UTF-8&amp;oe=UTF-8"
 msgstr "http://www.google.com.tw/search?q=%s&amp;ie=UTF-8&amp;oe=UTF-8"
 
-#: ../data/epiphany.desktop.in.in.h:1
-msgid "Browse the web"
-msgstr "瀏覽網頁"
+#: ../data/epiphany.desktop.in.in.h:1 ../src/ephy-main.c:75
+#: ../src/ephy-main.c:324 ../src/ephy-main.c:476 ../src/window-commands.c:1331
+msgid "Web"
+msgstr "網頁"
 
 #: ../data/epiphany.desktop.in.in.h:2
+msgid "Web Browser"
+msgstr "網頁瀏覽器"
+
+#: ../data/epiphany.desktop.in.in.h:3
 msgid "Epiphany Web Browser"
 msgstr "Epiphany 網頁瀏覽器"
 
-#: ../data/epiphany.desktop.in.in.h:3 ../src/ephy-main.c:73
-#: ../src/ephy-main.c:321 ../src/ephy-main.c:466 ../src/window-commands.c:1212
-msgid "Web"
-msgstr "網頁"
-
 #: ../data/epiphany.desktop.in.in.h:4
-msgid "Web Browser"
-msgstr "網頁瀏覽器"
+msgid "Browse the web"
+msgstr "瀏覽網頁"
 
-#: ../embed/ephy-download.c:217
-msgctxt "file type"
-msgid "Unknown"
-msgstr "不明"
+#: ../data/org.gnome.epiphany.gschema.xml.h:1
+#, fuzzy
+#| msgid "Browse the web"
+msgid "Browse with caret"
+msgstr "瀏覽網頁"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:2
+msgid "URL Search"
+msgstr "URL 搜尋"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:3
+msgid "Search string for keywords entered in the URL bar."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:4
+#, fuzzy
+#| msgid "User Name"
+msgid "User agent"
+msgstr "使用者代理"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:5
+msgid ""
+"String that will be used as user agent, to identify the browser to the web "
+"servers."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:6
+msgid "Automatic downloads"
+msgstr "自動下載"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:7
+msgid ""
+"When files cannot be opened by the browser they are automatically downloaded "
+"to the download folder and opened with the appropriate application."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:8
+msgid ""
+"Middle click to open the web page pointed to by the currently selected text"
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:9
+msgid ""
+"Middle clicking on the main view pane will open the web page pointed to by "
+"the currently selected text."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:10
+msgid "Force new windows to be opened in tabs"
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:11
+msgid ""
+"Force new window requests to be opened in tabs instead of using a new window."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:12
+msgid "Remember passwords"
+msgstr "記錄密碼"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:13
+msgid "Whether to store and prefill passwords in web sites."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:14
+msgid "Automatically manage offline status with NetworkManager"
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:15
+msgid "Enable smooth scrolling"
+msgstr "啟用平滑捲動"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:16
+msgid "Active extensions"
+msgstr "使用中擴充功能"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:17
+#, fuzzy
+msgid "Lists the active extensions."
+msgstr "列出使用中"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:18
+msgid "Don't use an external application to view page source."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:19
+msgid "Whether to automatically restore the last session"
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:20
+msgid ""
+"Defines how the session will be restored during startup. Allowed values are "
+"'always' (the previous state of the application is always restored), "
+"'crashed' (the session is only restored if the application crashes) and "
+"'never' (the homepage is always shown)."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:21
+msgid "Show toolbars by default"
+msgstr "預設顯示工具列"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:22
+msgid "Toolbar style"
+msgstr "工具列樣式"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:23
+msgid ""
+"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both"
+"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and "
+"\"text\"."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:24
+msgid "[Deprecated]"
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:25
+msgid ""
+"[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' "
+"instead."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:26
+#, fuzzy
+#| msgid "Close the bookmarks window"
+msgid "Visibility of the downloads window"
+msgstr "關閉書籤視窗"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:27
+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:28
+msgid "The visibility policy for the tabs bar."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:29
+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 ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:30
+msgid "Minimum font size"
+msgstr "最小字型大小"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:31
+msgid "Use GNOME fonts"
+msgstr "使用 GNOME 字型"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:32
+msgid "Use GNOME desktop wide font configuration."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:33
+msgid "Custom sans-serif font"
+msgstr "自選無襯線字型"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:34
+msgid ""
+"A value to be used to override sans-serif desktop font when use-gnome-fonts "
+"is set."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:35
+msgid "Custom serif font"
+msgstr "自選有襯線字型"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:36
+msgid ""
+"A value to be used to override serif desktop font when use-gnome-fonts is "
+"set."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:37
+msgid "Custom monospace font"
+msgstr "自選等寬字型"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:38
+msgid ""
+"A value to be used to override monospace desktop font when use-gnome-fonts "
+"is set."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:39
+msgid "Use own colors"
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:40
+msgid "Use your own colors instead of the colors the page requests."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:41
+msgid "Use own fonts"
+msgstr "使用自用字型(_U)"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:42
+msgid "Use your own fonts instead of the fonts the page requests."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:43
+msgid "Use a custom CSS"
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:44
+msgid "Use a custom CSS file to modify websites own CSS."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:45
+msgid "Enable spell checking"
+msgstr "啟用拼字檢查"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:46
+msgid "Spell check any text typed in editable areas."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:47
+msgid "Default encoding"
+msgstr "預設編碼"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:48
+msgid ""
+"Default encoding. Accepted values are the ones WebKitGTK+ can understand."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:49
+msgid "Size of disk cache"
+msgstr "磁碟快取大小"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:50
+msgid "Size of disk cache, in MB."
+msgstr "磁碟快取大小，單位為 MB。"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:51
+#: ../src/resources/prefs-dialog.ui.h:38
+msgid "Languages"
+msgstr "語言"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:52
+msgid "Preferred languages, two letter codes."
+msgstr "偏好的語言，兩個英文字母的代碼。"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:53
+msgid "Cookie accept"
+msgstr "Cookie 接受"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:54
+msgid ""
+"Where to accept cookies from. Possible values are \"anywhere\", \"current "
+"site\" and \"nowhere\"."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:55
+msgid "Image animation mode"
+msgstr "影像動畫模式"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:56
+msgid ""
+"How to present animated images. Possible values are \"normal\", \"once\" and "
+"\"disabled\"."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:57
+msgid "Allow popups"
+msgstr "允許彈出式視窗"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:58
+msgid ""
+"Allow sites to open new windows using JavaScript (if JavaScript is enabled)."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:59
+msgid "Enable Plugins"
+msgstr "啟用外掛程式"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:60
+msgid "Enable JavaScript"
+msgstr "啟用 JavaScript"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:61
+msgid "Enable WebGL"
+msgstr "啟用 WebGL"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:62
+msgid "Whether to enable support for WebGL contexts."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:63
+#, fuzzy
+msgid "Do Not Track"
+msgstr "不要跟蹤"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:64
+msgid ""
+"Whether to tell websites that we do not wish to be tracked. Please note that "
+"web pages are not forced to follow this setting."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:65
+#, fuzzy
+#| msgid "_Download folder:"
+msgid "The downloads folder"
+msgstr "下載資料夾(_D)"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:66
+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 ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:67
+msgid "History pages time range"
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:68
+msgid "Whether to show the title column in the history window."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:69
+msgid "Whether to show the address column in the history window."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:70
+msgid "Whether to show the date-time column in the history window."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:71
+msgid "Whether to show the title column in the bookmarks window."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:72
+msgid "Whether to show the address column in the bookmarks window."
+msgstr ""
+
+#: ../embed/ephy-about-handler.c:64 ../embed/ephy-about-handler.c:67
+#: ../embed/ephy-about-handler.c:117 ../embed/ephy-about-handler.c:120
+msgid "Installed plugins"
+msgstr "已安裝的外掛程式"
+
+#: ../embed/ephy-about-handler.c:79 ../embed/ephy-about-handler.c:132
+msgid "Enabled"
+msgstr "已啟用"
 
-#: ../embed/ephy-embed.c:692
+#. webkit_plugin_get_enabled (plugin)
+#: ../embed/ephy-about-handler.c:79 ../embed/ephy-about-handler.c:132
+msgid "Yes"
+msgstr "是"
+
+#: ../embed/ephy-about-handler.c:79 ../embed/ephy-about-handler.c:132
+msgid "No"
+msgstr "否"
+
+#: ../embed/ephy-about-handler.c:80 ../embed/ephy-about-handler.c:133
+msgid "MIME type"
+msgstr "MIME 類型"
+
+#: ../embed/ephy-about-handler.c:80 ../embed/ephy-about-handler.c:133
+msgid "Description"
+msgstr "說明"
+
+#: ../embed/ephy-about-handler.c:80 ../embed/ephy-about-handler.c:133
+msgid "Suffixes"
+msgstr "後綴"
+
+#: ../embed/ephy-about-handler.c:172 ../embed/ephy-about-handler.c:175
+msgid "Memory usage"
+msgstr "記憶體使用量"
+
+#: ../embed/ephy-about-handler.c:208 ../embed/ephy-about-handler.c:210
+msgid "Applications"
+msgstr "應用程式"
+
+#: ../embed/ephy-about-handler.c:211
+msgid "List of installed web applications"
+msgstr "已安裝的網頁應用程式清單"
+
+#. Note for translators: this refers to the installation date.
+#: ../embed/ephy-about-handler.c:227
+msgid "Installed on:"
+msgstr "安裝於："
+
+#: ../embed/ephy-embed.c:585
+#, c-format
+msgid "Press %s to exit fullscreen"
+msgstr "按下 %s 離開全螢幕"
+
+#. Translators: 'ESC' and 'F11' are keyboard keys.
+#: ../embed/ephy-embed.c:588
+msgid "ESC"
+msgstr "ESC"
+
+#: ../embed/ephy-embed.c:588
+msgid "F11"
+msgstr "F11"
+
+#: ../embed/ephy-embed.c:889
 msgid "Web Inspector"
 msgstr "網頁檢查器"
 
@@ -72,7 +465,7 @@ msgstr "網頁檢查器"
 msgid "Epiphany can't be used now. Initialization failed."
 msgstr "Epiphany 目前無法使用。初始化程序失敗。"
 
-#: ../embed/ephy-embed-utils.c:61
+#: ../embed/ephy-embed-utils.c:62
 #, c-format
 msgid "Send an email message to “%s”"
 msgstr "傳送電子郵件至位址“%s”"
@@ -401,63 +794,16 @@ msgstr "萬國碼 (UTF-3_2BE)"
 msgid "Unknown (%s)"
 msgstr "不明 (%s)"
 
-#: ../embed/ephy-request-about.c:101 ../embed/ephy-request-about.c:104
-msgid "Installed plugins"
-msgstr "已安裝的外掛程式"
-
-#: ../embed/ephy-request-about.c:116
-msgid "Enabled"
-msgstr "已啟用"
-
-#: ../embed/ephy-request-about.c:116
-msgid "Yes"
-msgstr "是"
-
-#: ../embed/ephy-request-about.c:116
-msgid "No"
-msgstr "否"
-
-#: ../embed/ephy-request-about.c:117
-msgid "MIME type"
-msgstr "MIME 類型"
-
-#: ../embed/ephy-request-about.c:117
-msgid "Description"
-msgstr "說明"
-
-#: ../embed/ephy-request-about.c:117
-msgid "Suffixes"
-msgstr "後綴"
-
-#: ../embed/ephy-request-about.c:146 ../embed/ephy-request-about.c:149
-msgid "Memory usage"
-msgstr "記憶體使用量"
-
-#: ../embed/ephy-request-about.c:175 ../embed/ephy-request-about.c:177
-msgid "Applications"
-msgstr "應用程式"
-
-#: ../embed/ephy-request-about.c:178
-msgid "List of installed web applications"
-msgstr "已安裝的網頁應用程式清單"
-
-#. Note for translators: this refers to the installation date.
-#: ../embed/ephy-request-about.c:195
-msgid "Installed on:"
-msgstr "安裝於："
-
 #. characters
-#. ms
-#. RELOAD_DELAY * RELOAD_DELAY_MAX_TICKS = 10 s
-#: ../embed/ephy-web-view.c:70 ../embed/ephy-web-view.c:3441
+#: ../embed/ephy-web-view.c:64 ../embed/ephy-web-view.c:3703
 msgid "Blank page"
 msgstr "空白頁面"
 
-#: ../embed/ephy-web-view.c:770
+#: ../embed/ephy-web-view.c:745
 msgid "_Not now"
 msgstr "現在不要(_N)"
 
-#: ../embed/ephy-web-view.c:775
+#: ../embed/ephy-web-view.c:750
 msgid "_Store password"
 msgstr "儲存密碼(_S)"
 
@@ -465,45 +811,45 @@ msgstr "儲存密碼(_S)"
 #. * hostname where this is happening. Example: gnome@gmail.com and
 #. * mail.google.com.
 #.
-#: ../embed/ephy-web-view.c:786
+#: ../embed/ephy-web-view.c:761
 #, c-format
 msgid ""
 "<big>Would you like to store the password for <b>%s</b> in <b>%s</b>?</big>"
 msgstr "<big>是否要儲存 <b>%s</b> 在 <b>%s</b> 的密碼？</big>"
 
-#: ../embed/ephy-web-view.c:1133
+#: ../embed/ephy-web-view.c:1111
 msgid "Plugins"
 msgstr "外掛程式"
 
 #. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1784
+#: ../embed/ephy-web-view.c:1957
 msgid "Deny"
 msgstr "禁止"
 
 #. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1790
+#: ../embed/ephy-web-view.c:1963
 msgid "Allow"
 msgstr "允許"
 
-#: ../embed/ephy-web-view.c:1797
+#: ../embed/ephy-web-view.c:1974
 #, c-format
 msgid "The page at <b>%s</b> wants to know your location."
 msgstr "在 <b>%s</b> 的網頁想要知道你的位置。"
 
-#: ../embed/ephy-web-view.c:2118
+#: ../embed/ephy-web-view.c:2457
 msgid "None specified"
 msgstr "沒有指定"
 
-#: ../embed/ephy-web-view.c:2127 ../embed/ephy-web-view.c:2145
+#: ../embed/ephy-web-view.c:2466 ../embed/ephy-web-view.c:2484
 #, c-format
 msgid "Oops! Error loading %s"
 msgstr "噢！載入 %s 時發生錯誤"
 
-#: ../embed/ephy-web-view.c:2129
+#: ../embed/ephy-web-view.c:2468
 msgid "Oops! It was not possible to show this website"
 msgstr "噢！無法顯示這個網站"
 
-#: ../embed/ephy-web-view.c:2130
+#: ../embed/ephy-web-view.c:2469
 #, c-format
 msgid ""
 "<p>The website at <strong>%s</strong> seems to be unavailable. The precise "
@@ -512,15 +858,15 @@ msgid ""
 "is working correctly.</p>"
 msgstr "<p>網站 <strong>%s</strong> 可能無法使用，準確來說錯誤為：</p><p><em>%s</em></p><p>它可能被暫時關閉或移動到新的位址。不要忘了檢查互聯網連線是否正常運作。</p>"
 
-#: ../embed/ephy-web-view.c:2139
+#: ../embed/ephy-web-view.c:2478
 msgid "Try again"
 msgstr "再試一次"
 
-#: ../embed/ephy-web-view.c:2147
+#: ../embed/ephy-web-view.c:2486
 msgid "Oops! This site might have caused the web browser to close unexpectedly"
 msgstr "噢！這個網站可能已造成網頁瀏覽器未預期的關閉"
 
-#: ../embed/ephy-web-view.c:2149
+#: ../embed/ephy-web-view.c:2488
 #, c-format
 msgid ""
 "<p>This page was loading when the web browser closed unexpectedly.</"
@@ -528,29 +874,29 @@ msgid ""
 "report the problem to the <strong>%s</strong> developers.</p>"
 msgstr "<p>這個網頁尚在讀取但瀏覽器已異常關閉了。</p><p>如果你重新載入該頁面仍然可能再度發生這個狀況。如果真的這樣，請將問題匯報給 <strong>%s</strong> 開發隊伍。</p>"
 
-#: ../embed/ephy-web-view.c:2157
+#: ../embed/ephy-web-view.c:2496
 msgid "Load again anyway"
 msgstr "强制再次載入"
 
-#: ../embed/ephy-web-view.c:2428
+#: ../embed/ephy-web-view.c:2887
 #, c-format
 msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"
 msgstr "http://www.google.com.tw/search?q=%s&ie=UTF-8&oe=UTF-8"
 
 #. translators: %s here is the address of the web page
-#: ../embed/ephy-web-view.c:2773
+#: ../embed/ephy-web-view.c:3181
 #, c-format
 msgid "Loading “%s”…"
 msgstr "正在載入“%s”…"
 
-#: ../embed/ephy-web-view.c:2775
+#: ../embed/ephy-web-view.c:3183
 msgid "Loading…"
 msgstr "載入中…"
 
 #. Translators: this is the directory name to store auxilary files
 #. * when saving html files.
 #.
-#: ../embed/ephy-web-view.c:3645
+#: ../embed/ephy-web-view.c:3910
 #, c-format
 msgid "%s Files"
 msgstr "%s 個檔案"
@@ -607,26 +953,26 @@ msgid "All files"
 msgstr "所有檔案"
 
 #. If we don't have XDG user dirs info, return an educated guess.
-#: ../lib/ephy-file-helpers.c:116 ../src/prefs-dialog.ui.h:10
+#: ../lib/ephy-file-helpers.c:116 ../src/resources/prefs-dialog.ui.h:4
 msgid "Downloads"
 msgstr "下載"
 
 #. If we don't have XDG user dirs info, return an educated guess.
-#: ../lib/ephy-file-helpers.c:162
+#: ../lib/ephy-file-helpers.c:169
 msgid "Desktop"
 msgstr "桌面"
 
-#: ../lib/ephy-file-helpers.c:326
+#: ../lib/ephy-file-helpers.c:330
 #, c-format
 msgid "Could not create a temporary directory in “%s”."
 msgstr "無法在“%s”建立暫存目錄。"
 
-#: ../lib/ephy-file-helpers.c:422
+#: ../lib/ephy-file-helpers.c:430
 #, c-format
 msgid "The file “%s” exists. Please move it out of the way."
 msgstr "檔案“%s” 已經存在，請先將它移至其它位置。"
 
-#: ../lib/ephy-file-helpers.c:433
+#: ../lib/ephy-file-helpers.c:441
 #, c-format
 msgid "Failed to create directory “%s”."
 msgstr "無法建立目錄“%s”。"
@@ -675,10 +1021,30 @@ msgid ""
 "password below."
 msgstr "在前一版本 (Gecko) 中所儲存的密碼都使用主控密碼鎖定了。如果你想要 Epiphany 匯入它們，請在下面輸入你的主控密碼。"
 
-#: ../lib/ephy-profile-migrator.c:82
+#: ../lib/ephy-profile-migrator.c:89
 msgid "Failed to copy cookies file from Mozilla."
 msgstr "從 Mozilla 複製 cookies 檔案失敗。"
 
+#: ../lib/ephy-profile-migrator.c:641
+msgid ""
+"Epiphany 3.6 deprecated this directory and tried migrating this "
+"configuration to ~/.config/epiphany"
+msgstr ""
+
+#: ../lib/ephy-profile-migrator.c:831
+msgid "Executes only the n-th migration step"
+msgstr ""
+
+#: ../lib/ephy-profile-migrator.c:845
+#, fuzzy
+#| msgid "Epiphany Web Browser"
+msgid "Epiphany profile migrator"
+msgstr "Epiphany 網頁瀏覽器"
+
+#: ../lib/ephy-profile-migrator.c:846
+msgid "Epiphany profile migrator options"
+msgstr ""
+
 #. Translators: "friendly time" string for the current day, strftime format. like "Today 12:34 am"
 #: ../lib/ephy-time-helpers.c:223
 msgid "Today %I:%M %p"
@@ -761,57 +1127,59 @@ msgstr "其它"
 msgid "Local files"
 msgstr "本機檔案"
 
-#: ../lib/widgets/ephy-download-widget.c:88
+#: ../lib/widgets/ephy-download-widget.c:119
 #, c-format
 msgid "%u:%02u hour left"
 msgid_plural "%u:%02u hours left"
 msgstr[0] "剩餘 %u:%02u 小時"
 
-#: ../lib/widgets/ephy-download-widget.c:90
+#: ../lib/widgets/ephy-download-widget.c:121
 #, c-format
 msgid "%u hour left"
 msgid_plural "%u hours left"
 msgstr[0] "剩餘 %u 小時"
 
-#: ../lib/widgets/ephy-download-widget.c:93
+#: ../lib/widgets/ephy-download-widget.c:124
 #, c-format
 msgid "%u:%02u minute left"
 msgid_plural "%u:%02u minutes left"
 msgstr[0] "剩餘 %u:%02u 分鐘"
 
-#: ../lib/widgets/ephy-download-widget.c:95
+#: ../lib/widgets/ephy-download-widget.c:126
 #, c-format
 msgid "%u second left"
 msgid_plural "%u seconds left"
 msgstr[0] "剩餘 %u 秒鐘"
 
-#: ../lib/widgets/ephy-download-widget.c:164
+#: ../lib/widgets/ephy-download-widget.c:296
+#: ../lib/widgets/ephy-download-widget.c:313
 msgid "Finished"
 msgstr "已完成"
 
-#: ../lib/widgets/ephy-download-widget.c:203
+#: ../lib/widgets/ephy-download-widget.c:328
+#: ../lib/widgets/ephy-download-widget.c:346
 #, c-format
 msgid "Error downloading: %s"
 msgstr "下載時發生錯誤：%s"
 
-#: ../lib/widgets/ephy-download-widget.c:271 ../src/window-commands.c:482
+#: ../lib/widgets/ephy-download-widget.c:414 ../src/window-commands.c:542
 msgid "Cancel"
 msgstr "取消"
 
-#: ../lib/widgets/ephy-download-widget.c:280 ../src/ephy-window.c:1311
-#: ../src/window-commands.c:263
+#: ../lib/widgets/ephy-download-widget.c:423 ../src/ephy-window.c:1348
+#: ../src/window-commands.c:268
 msgid "Open"
 msgstr "開啟"
 
-#: ../lib/widgets/ephy-download-widget.c:286
+#: ../lib/widgets/ephy-download-widget.c:429
 msgid "Show in folder"
 msgstr "在資料夾顯示"
 
-#: ../lib/widgets/ephy-download-widget.c:462
+#: ../lib/widgets/ephy-download-widget.c:628
 msgid "Starting…"
 msgstr "正在開始…"
 
-#: ../lib/widgets/ephy-hosts-store.c:230
+#: ../lib/widgets/ephy-hosts-store.c:262
 msgid "All sites"
 msgstr "所有網站"
 
@@ -823,12 +1191,13 @@ msgstr "網站"
 #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
 #. * Select All, Input Methods and Insert Unicode control character.)
 #.
-#: ../lib/widgets/ephy-location-entry.c:462 ../src/ephy-history-window.c:230
-#: ../src/pdm-dialog.c:352 ../src/prefs-dialog.ui.h:7
+#: ../lib/widgets/ephy-location-entry.c:594
+#: ../src/resources/prefs-dialog.ui.h:34 ../src/ephy-history-window.c:231
+#: ../src/pdm-dialog.c:365
 msgid "Cl_ear"
 msgstr "清除(_E)"
 
-#: ../lib/widgets/ephy-location-entry.c:742
+#: ../lib/widgets/ephy-location-entry.c:874
 msgid "Drag and drop this icon to create a link to this page"
 msgstr "拖放這個圖示來建立連至該網頁的連結"
 
@@ -837,13 +1206,13 @@ msgid "Clear"
 msgstr "清除"
 
 #: ../lib/widgets/ephy-urls-view.c:43
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1662
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1681
 msgid "Title"
 msgstr "標題"
 
 #: ../lib/widgets/ephy-urls-view.c:51
 #: ../src/bookmarks/ephy-bookmarks-editor.c:213
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1673
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1692
 msgid "Address"
 msgstr "地址"
 
@@ -918,26 +1287,26 @@ msgid "Work"
 msgstr "工作"
 
 #. Translators: this topic contains all bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:951
+#: ../src/bookmarks/ephy-bookmarks.c:960
 msgctxt "bookmarks"
 msgid "All"
 msgstr "全部"
 
 #. Translators: this topic contains the not categorized
 #. bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:955
+#: ../src/bookmarks/ephy-bookmarks.c:964
 msgctxt "bookmarks"
 msgid "Not Categorized"
 msgstr "未分類"
 
 #. Translators: this is an automatic topic containing local
 #. * websites bookmarks autodiscovered with zeroconf.
-#: ../src/bookmarks/ephy-bookmarks.c:960
+#: ../src/bookmarks/ephy-bookmarks.c:969
 msgctxt "bookmarks"
 msgid "Nearby Sites"
 msgstr "本地網站"
 
-#: ../src/bookmarks/ephy-bookmarks.c:1179
+#: ../src/bookmarks/ephy-bookmarks.c:1192
 #: ../src/bookmarks/ephy-bookmarks-import.c:271
 msgid "Untitled"
 msgstr "未命名"
@@ -956,22 +1325,22 @@ msgstr "從本主題中刪除"
 
 #. Toplevel
 #: ../src/bookmarks/ephy-bookmarks-editor.c:152
-#: ../src/ephy-history-window.c:128
+#: ../src/ephy-history-window.c:129
 msgid "_File"
 msgstr "檔案(_F)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:153
-#: ../src/ephy-history-window.c:129
+#: ../src/ephy-history-window.c:130
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:154
-#: ../src/ephy-history-window.c:130
+#: ../src/ephy-history-window.c:131
 msgid "_View"
 msgstr "顯示(_V)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:155
-#: ../src/ephy-history-window.c:131
+#: ../src/ephy-history-window.c:132
 msgid "_Help"
 msgstr "求助(_H)"
 
@@ -986,8 +1355,8 @@ msgstr "建立新的主題"
 
 #. File Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:162
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1161
-#: ../src/ephy-history-window.c:135 ../src/ephy-history-window.c:638
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1159
+#: ../src/ephy-history-window.c:136 ../src/ephy-history-window.c:639
 msgid "Open in New _Window"
 msgid_plural "Open in New _Windows"
 msgstr[0] "在新的視窗中開啟(_W)"
@@ -997,8 +1366,8 @@ msgid "Open the selected bookmark in a new window"
 msgstr "在新的視窗中開啟已選的書籤"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:165
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1164
-#: ../src/ephy-history-window.c:138 ../src/ephy-history-window.c:641
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1162
+#: ../src/ephy-history-window.c:139 ../src/ephy-history-window.c:642
 msgid "Open in New _Tab"
 msgid_plural "Open in New _Tabs"
 msgstr[0] "在新的分頁中開啟(_T)"
@@ -1040,7 +1409,7 @@ msgid "Export bookmarks to a file"
 msgstr "將書籤匯出到檔案"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:179
-#: ../src/ephy-history-window.c:144 ../src/ephy-window.c:106
+#: ../src/ephy-history-window.c:145 ../src/ephy-window.c:110
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -1050,39 +1419,39 @@ msgstr "關閉書籤視窗"
 
 #. Edit Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:184
-#: ../src/ephy-history-window.c:149 ../src/ephy-window.c:115
+#: ../src/ephy-history-window.c:150 ../src/ephy-window.c:119
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:185
-#: ../src/ephy-history-window.c:150
+#: ../src/ephy-history-window.c:151
 msgid "Cut the selection"
 msgstr "剪下選定的內容"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:187
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1174
-#: ../src/ephy-history-window.c:152 ../src/ephy-history-window.c:651
-#: ../src/ephy-window.c:117
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1172
+#: ../src/ephy-history-window.c:153 ../src/ephy-history-window.c:652
+#: ../src/ephy-window.c:121
 msgid "_Copy"
 msgstr "複製(_C)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:188
-#: ../src/ephy-history-window.c:153
+#: ../src/ephy-history-window.c:154
 msgid "Copy the selection"
 msgstr "複製選定的內容"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:190
-#: ../src/ephy-history-window.c:155 ../src/ephy-window.c:119
+#: ../src/ephy-history-window.c:156 ../src/ephy-window.c:123
 msgid "_Paste"
 msgstr "貼上(_P)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:191
-#: ../src/ephy-history-window.c:156
+#: ../src/ephy-history-window.c:157
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿中的內容"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:193
-#: ../src/ephy-history-window.c:158
+#: ../src/ephy-history-window.c:159
 msgid "_Delete"
 msgstr "刪除(_D)"
 
@@ -1091,7 +1460,7 @@ msgid "Delete the selected bookmark or topic"
 msgstr "刪除已選的書籤或主題"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:196
-#: ../src/ephy-history-window.c:161 ../src/ephy-window.c:123
+#: ../src/ephy-history-window.c:162 ../src/ephy-window.c:127
 msgid "Select _All"
 msgstr "全部選取(_A)"
 
@@ -1101,7 +1470,7 @@ msgstr "選取所有書籤或文字"
 
 #. Help Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:201
-#: ../src/ephy-history-window.c:169
+#: ../src/ephy-history-window.c:170
 msgid "_Contents"
 msgstr "內容(_C)"
 
@@ -1110,28 +1479,29 @@ msgid "Display bookmarks help"
 msgstr "顯示書籤說明文件"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:204
-#: ../src/ephy-history-window.c:172
+#: ../src/resources/epiphany-application-menu.ui.h:6
+#: ../src/ephy-history-window.c:173
 msgid "_About"
 msgstr "關於(_A)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:205
-#: ../src/ephy-history-window.c:173
+#: ../src/ephy-history-window.c:174
 msgid "Display credits for the web browser creators"
 msgstr "鳴謝所有這個網頁瀏覽器的創作者"
 
 #. View Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:211
-#: ../src/ephy-history-window.c:187
+#: ../src/ephy-history-window.c:188
 msgid "_Title"
 msgstr "標題(_T)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:212
-#: ../src/ephy-history-window.c:188
+#: ../src/ephy-history-window.c:189
 msgid "Show the title column"
 msgstr "顯示標題欄位"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:214
-#: ../src/ephy-history-window.c:190
+#: ../src/ephy-history-window.c:191
 msgid "Show the address column"
 msgstr "顯示位址欄位"
 
@@ -1219,7 +1589,7 @@ msgid "Export Bookmarks"
 msgstr "匯出書籤"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:763
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1536
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1555
 #: ../src/bookmarks/ephy-topic-action.c:217
 msgid "Bookmarks"
 msgstr "書籤"
@@ -1245,17 +1615,17 @@ msgstr "匯入書籤的來源："
 msgid "File"
 msgstr "檔案"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1170
-#: ../src/ephy-history-window.c:647
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1168
+#: ../src/ephy-history-window.c:648
 msgid "_Copy Address"
 msgstr "複製位址(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1411
-#: ../src/ephy-history-window.c:800
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1409
+#: ../src/ephy-history-window.c:801
 msgid "_Search:"
 msgstr "搜尋(_S)："
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1592
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1611
 msgid "Topics"
 msgstr "主題"
 
@@ -1273,6 +1643,220 @@ msgstr "在新的分頁中開啟本主日題的書籤"
 msgid "Create topic “%s”"
 msgstr "建立主題“%s”"
 
+#: ../src/resources/epiphany-application-menu.ui.h:1
+msgid "_New Window"
+msgstr "新視窗(_N)"
+
+#. Toplevel
+#: ../src/resources/epiphany-application-menu.ui.h:2 ../src/ephy-window.c:92
+msgid "_Bookmarks"
+msgstr "書籤(_B)"
+
+#: ../src/resources/epiphany-application-menu.ui.h:3
+msgid "_History"
+msgstr "瀏覽記錄(_H)"
+
+#: ../src/resources/epiphany-application-menu.ui.h:4
+#: ../src/resources/prefs-dialog.ui.h:3
+msgid "Preferences"
+msgstr "偏好設定"
+
+#: ../src/resources/epiphany-application-menu.ui.h:5
+#: ../src/resources/epiphany.ui.h:10
+msgid "Personal Data"
+msgstr "個人資料"
+
+#: ../src/resources/epiphany-application-menu.ui.h:7
+msgid "_Quit"
+msgstr "結束(_Q)"
+
+#: ../src/resources/epiphany.ui.h:1
+msgid "Cookie properties"
+msgstr "Cookie 屬性"
+
+#: ../src/resources/epiphany.ui.h:2
+msgid "Content:"
+msgstr "內容"
+
+#: ../src/resources/epiphany.ui.h:3
+msgid "Path:"
+msgstr "路徑："
+
+#: ../src/resources/epiphany.ui.h:4
+msgid "Send for:"
+msgstr "傳送給："
+
+#: ../src/resources/epiphany.ui.h:5
+msgid "Expires:"
+msgstr "時限："
+
+#: ../src/resources/epiphany.ui.h:6
+msgid "Text Encoding"
+msgstr "字符編碼"
+
+#: ../src/resources/epiphany.ui.h:7
+msgid "<b>_Automatic</b>"
+msgstr "<b>自動(_A)：</b>"
+
+#: ../src/resources/epiphany.ui.h:8 ../src/ephy-encoding-menu.c:355
+msgid "Use the encoding specified by the document"
+msgstr "使用文件指定的編碼方式"
+
+#: ../src/resources/epiphany.ui.h:9
+msgid "<b>_Use a different encoding:</b>"
+msgstr "使用不同的編碼(_U)："
+
+#: ../src/resources/epiphany.ui.h:11 ../src/resources/prefs-dialog.ui.h:21
+msgid "Cookies"
+msgstr "Cookie"
+
+#: ../src/resources/epiphany.ui.h:12
+msgid "_Show passwords"
+msgstr "顯示密碼(_S)"
+
+#: ../src/resources/epiphany.ui.h:13 ../src/resources/prefs-dialog.ui.h:29
+msgid "Passwords"
+msgstr "密碼"
+
+#: ../src/resources/prefs-dialog.ui.h:1
+msgid "Add Language"
+msgstr "增加語言"
+
+#: ../src/resources/prefs-dialog.ui.h:2
+msgid "Choose a l_anguage:"
+msgstr "選擇語言(_A)："
+
+#: ../src/resources/prefs-dialog.ui.h:5
+msgid "_Download folder:"
+msgstr "下載資料夾(_D)"
+
+#: ../src/resources/prefs-dialog.ui.h:6
+msgid "A_utomatically open downloaded files"
+msgstr "自動下載並開啟檔案(_U)"
+
+#: ../src/resources/prefs-dialog.ui.h:7
+msgid "General"
+msgstr "一般"
+
+#: ../src/resources/prefs-dialog.ui.h:8
+msgid "Fonts"
+msgstr "字型"
+
+#: ../src/resources/prefs-dialog.ui.h:9
+msgid "_Use system fonts"
+msgstr "使用系統字型(_U)"
+
+#: ../src/resources/prefs-dialog.ui.h:10
+msgid "Sans serif font:"
+msgstr "無襯線字型："
+
+#: ../src/resources/prefs-dialog.ui.h:11
+msgid "Serif font:"
+msgstr "襯線字型："
+
+#: ../src/resources/prefs-dialog.ui.h:12
+msgid "Monospace font:"
+msgstr "等寬字型："
+
+#: ../src/resources/prefs-dialog.ui.h:13
+msgid "Style"
+msgstr "樣式"
+
+#: ../src/resources/prefs-dialog.ui.h:14
+msgid "Use custom _stylesheet"
+msgstr "使用自選樣式表(_S)"
+
+#: ../src/resources/prefs-dialog.ui.h:15
+msgid "_Edit Stylesheet…"
+msgstr "編輯樣式表(_E)…"
+
+#: ../src/resources/prefs-dialog.ui.h:16
+msgid "Fonts & Style"
+msgstr "字型與樣式"
+
+#: ../src/resources/prefs-dialog.ui.h:17
+msgid "Web Content"
+msgstr "網頁內容"
+
+#: ../src/resources/prefs-dialog.ui.h:18
+msgid "Allow popup _windows"
+msgstr "允許彈出式視窗(_W)"
+
+#: ../src/resources/prefs-dialog.ui.h:19
+msgid "Enable _plugins"
+msgstr "啟用外掛程式(_P)"
+
+#: ../src/resources/prefs-dialog.ui.h:20
+msgid "Enable Java_Script"
+msgstr "啟用 Java_Script"
+
+#: ../src/resources/prefs-dialog.ui.h:22
+msgid "_Always accept"
+msgstr "總是接受(_A)"
+
+#: ../src/resources/prefs-dialog.ui.h:23
+msgid "Only _from sites you visit"
+msgstr "只來自你瀏覽的網站(_F)"
+
+#. Refers to "Only from sites you visit" option under Cookies.
+#: ../src/resources/prefs-dialog.ui.h:25
+msgid "<small>For example, not from advertisers on these sites</small>"
+msgstr "<small>例如，不要來自這些網站的廣告</small>"
+
+#: ../src/resources/prefs-dialog.ui.h:26
+msgid "_Never accept"
+msgstr "永不接受(_N)"
+
+#: ../src/resources/prefs-dialog.ui.h:27
+#, fuzzy
+msgid "Tracking"
+msgstr "跟蹤"
+
+#: ../src/resources/prefs-dialog.ui.h:28
+#, fuzzy
+msgid "_Tell web sites I do not want to be tracked"
+msgstr "告訴網站我不想被跟蹤(_T)"
+
+#: ../src/resources/prefs-dialog.ui.h:30
+msgid "_Remember passwords"
+msgstr "記錄密碼(_R)"
+
+#: ../src/resources/prefs-dialog.ui.h:31
+msgid "Temporary Files"
+msgstr "暫存檔"
+
+#: ../src/resources/prefs-dialog.ui.h:32
+msgid "_Disk space:"
+msgstr "磁碟空間(_D)："
+
+#: ../src/resources/prefs-dialog.ui.h:33
+msgid "MB"
+msgstr "MB"
+
+#: ../src/resources/prefs-dialog.ui.h:35
+msgid "Privacy"
+msgstr "私隱"
+
+#: ../src/resources/prefs-dialog.ui.h:36 ../src/ephy-encoding-dialog.c:318
+msgid "Encodings"
+msgstr "編碼"
+
+#: ../src/resources/prefs-dialog.ui.h:37
+msgid "De_fault:"
+msgstr "預設(_F)："
+
+#: ../src/resources/prefs-dialog.ui.h:39
+msgid "Spell checking"
+msgstr "拼字檢查"
+
+#: ../src/resources/prefs-dialog.ui.h:40
+msgid "_Enable spell checking"
+msgstr "啟用拼字檢查(_E)"
+
+#: ../src/resources/prefs-dialog.ui.h:41 ../src/prefs-dialog.c:773
+msgid "Language"
+msgstr "語言"
+
 #: ../src/ephy-combined-stop-reload-action.c:41
 msgid "Stop"
 msgstr "停止"
@@ -1281,7 +1865,7 @@ msgstr "停止"
 msgid "Stop current data transfer"
 msgstr "停止傳送目前的資料"
 
-#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:138
+#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:142
 msgid "_Reload"
 msgstr "重新載入(_R)"
 
@@ -1289,217 +1873,204 @@ msgstr "重新載入(_R)"
 msgid "Display the latest content of the current page"
 msgstr "顯示本頁的最新內容"
 
-#: ../src/ephy-encoding-dialog.c:301 ../src/prefs-dialog.ui.h:13
-msgid "Encodings"
-msgstr "編碼"
-
-#: ../src/ephy-encoding-menu.c:330
+#: ../src/ephy-encoding-menu.c:347
 msgid "_Other…"
 msgstr "其它(_O)…"
 
-#: ../src/ephy-encoding-menu.c:331
+#: ../src/ephy-encoding-menu.c:348
 msgid "Other encodings"
 msgstr "其他字符編碼方式"
 
-#: ../src/ephy-encoding-menu.c:337
+#: ../src/ephy-encoding-menu.c:354
 msgid "_Automatic"
 msgstr "自動(_A)"
 
-#: ../src/ephy-encoding-menu.c:338 ../src/epiphany.ui.h:12
-msgid "Use the encoding specified by the document"
-msgstr "使用文件指定的編碼方式"
-
-#: ../src/ephy-find-toolbar.c:153
+#: ../src/ephy-find-toolbar.c:168
 msgid "Not found"
 msgstr "找不到字串"
 
-#: ../src/ephy-find-toolbar.c:165
+#: ../src/ephy-find-toolbar.c:180
 msgid "Wrapped"
 msgstr "回到檔案開始部份再搜尋"
 
-#: ../src/ephy-find-toolbar.c:185
+#: ../src/ephy-find-toolbar.c:200
 msgid "Find links:"
 msgstr "尋找連結："
 
-#: ../src/ephy-find-toolbar.c:185
+#: ../src/ephy-find-toolbar.c:200
 msgid "Find:"
 msgstr "尋找："
 
 #. Create a menu item, and sync it
 #. Case sensitivity
-#: ../src/ephy-find-toolbar.c:459 ../src/ephy-find-toolbar.c:582
+#: ../src/ephy-find-toolbar.c:540 ../src/ephy-find-toolbar.c:663
 msgid "_Case sensitive"
 msgstr "區分大小寫(_C)"
 
-#: ../src/ephy-find-toolbar.c:565
+#: ../src/ephy-find-toolbar.c:646
 msgid "Find Previous"
 msgstr "找上一個"
 
-#: ../src/ephy-find-toolbar.c:568
+#: ../src/ephy-find-toolbar.c:649
 msgid "Find previous occurrence of the search string"
 msgstr "尋找上一個出現搜尋字串的地方"
 
-#: ../src/ephy-find-toolbar.c:574
+#: ../src/ephy-find-toolbar.c:655
 msgid "Find Next"
 msgstr "找下一個"
 
-#: ../src/ephy-find-toolbar.c:577
+#: ../src/ephy-find-toolbar.c:658
 msgid "Find next occurrence of the search string"
 msgstr "尋找下一個出現搜尋字串的地方"
 
-#. exit button
-#: ../src/ephy-fullscreen-popup.c:232
-msgid "Leave Fullscreen"
-msgstr "離開全螢幕"
-
-#: ../src/ephy-history-window.c:136
+#: ../src/ephy-history-window.c:137
 msgid "Open the selected history link in a new window"
 msgstr "在新的視窗中開啟已選的瀏覽記錄連結"
 
-#: ../src/ephy-history-window.c:139
+#: ../src/ephy-history-window.c:140
 msgid "Open the selected history link in a new tab"
 msgstr "在新的分頁中開啟已選的瀏覽記錄連結"
 
-#: ../src/ephy-history-window.c:141
+#: ../src/ephy-history-window.c:142
 msgid "Add _Bookmark…"
 msgstr "加入書籤(_B)…"
 
-#: ../src/ephy-history-window.c:142
+#: ../src/ephy-history-window.c:143
 msgid "Bookmark the selected history link"
 msgstr "將已選的瀏覽記錄連結加入至書籤"
 
-#: ../src/ephy-history-window.c:145
+#: ../src/ephy-history-window.c:146
 msgid "Close the history window"
 msgstr "關閉瀏覽記錄視窗"
 
-#: ../src/ephy-history-window.c:159
+#: ../src/ephy-history-window.c:160
 msgid "Delete the selected history link"
 msgstr "刪除已選的瀏覽記錄連結"
 
-#: ../src/ephy-history-window.c:162
+#: ../src/ephy-history-window.c:163
 msgid "Select all history links or text"
 msgstr "選取所有瀏覽記錄連結或文字"
 
-#: ../src/ephy-history-window.c:164
+#: ../src/ephy-history-window.c:165
 msgid "Clear _History"
 msgstr "清除瀏覽記錄(_H)"
 
-#: ../src/ephy-history-window.c:165
+#: ../src/ephy-history-window.c:166
 msgid "Clear your browsing history"
 msgstr "清除瀏覽記錄"
 
-#: ../src/ephy-history-window.c:170
+#: ../src/ephy-history-window.c:171
 msgid "Display history help"
 msgstr "顯示瀏覽記錄說明文件"
 
-#: ../src/ephy-history-window.c:189
+#: ../src/ephy-history-window.c:190
 msgid "_Address"
 msgstr "位址(_A)"
 
-#: ../src/ephy-history-window.c:191
+#: ../src/ephy-history-window.c:192
 msgid "_Date and Time"
 msgstr "日期和時刻(_D)"
 
-#: ../src/ephy-history-window.c:192
+#: ../src/ephy-history-window.c:193
 msgid "Show the date and time column"
 msgstr "顯示日期及時刻欄位"
 
-#: ../src/ephy-history-window.c:220
+#: ../src/ephy-history-window.c:221
 msgid "Clear browsing history?"
 msgstr "是否清除瀏覽記錄？"
 
-#: ../src/ephy-history-window.c:224
+#: ../src/ephy-history-window.c:225
 msgid ""
 "Clearing the browsing history will cause all history links to be permanently "
 "deleted."
 msgstr "清除瀏覽記錄將會使所有瀏覽記錄永遠被刪除。"
 
-#: ../src/ephy-history-window.c:239
+#: ../src/ephy-history-window.c:240
 msgid "Clear History"
 msgstr "清除瀏覽記錄"
 
-#: ../src/ephy-history-window.c:809
+#: ../src/ephy-history-window.c:810
 msgid "Last 30 minutes"
 msgstr "前 30 分鐘"
 
-#: ../src/ephy-history-window.c:810
+#: ../src/ephy-history-window.c:811
 msgid "Today"
 msgstr "今日"
 
 #. keep this in sync with embed/ephy-history.c's
 #. * HISTORY_PAGE_OBSOLETE_DAYS
-#: ../src/ephy-history-window.c:812 ../src/ephy-history-window.c:816
-#: ../src/ephy-history-window.c:822
+#: ../src/ephy-history-window.c:813 ../src/ephy-history-window.c:817
+#: ../src/ephy-history-window.c:823
 #, c-format
 msgid "Last %d day"
 msgid_plural "Last %d days"
 msgstr[0] "最近 %d 日"
 
-#: ../src/ephy-history-window.c:826
+#: ../src/ephy-history-window.c:827
 msgid "All history"
 msgstr "所有瀏覽記錄"
 
-#: ../src/ephy-history-window.c:1123
+#: ../src/ephy-history-window.c:1128
 msgid "History"
 msgstr "瀏覽記錄"
 
-#: ../src/ephy-main.c:82
+#: ../src/ephy-main.c:84
 msgid "Open a new tab in an existing browser window"
 msgstr "在現有的瀏覽器視窗中開啟新的分頁"
 
-#: ../src/ephy-main.c:84
+#: ../src/ephy-main.c:86
 msgid "Open a new browser window"
 msgstr "開啟新的瀏覽器視窗"
 
-#: ../src/ephy-main.c:86
+#: ../src/ephy-main.c:88
 msgid "Launch the bookmarks editor"
 msgstr "啟動書籤編輯器"
 
-#: ../src/ephy-main.c:88
+#: ../src/ephy-main.c:90
 msgid "Import bookmarks from the given file"
 msgstr "從所指定的檔案匯入書籤"
 
-#: ../src/ephy-main.c:88 ../src/ephy-main.c:90
+#: ../src/ephy-main.c:90 ../src/ephy-main.c:92
 msgid "FILE"
 msgstr "檔案"
 
-#: ../src/ephy-main.c:90
+#: ../src/ephy-main.c:92
 msgid "Load the given session file"
 msgstr "載入指定的作業階段檔案"
 
-#: ../src/ephy-main.c:92
+#: ../src/ephy-main.c:94
 msgid "Add a bookmark"
 msgstr "加入書籤"
 
-#: ../src/ephy-main.c:92
+#: ../src/ephy-main.c:94
 msgid "URL"
 msgstr "URL"
 
-#: ../src/ephy-main.c:94
+#: ../src/ephy-main.c:96
 msgid "Start a private instance"
 msgstr "啟動私密實體"
 
-#: ../src/ephy-main.c:96
+#: ../src/ephy-main.c:98
 msgid "Start the browser in application mode"
 msgstr "以應用程式模式啟動瀏覽器"
 
-#: ../src/ephy-main.c:98
+#: ../src/ephy-main.c:100
 msgid "Profile directory to use in the private instance"
 msgstr "在私密實體中使用的設定組合目錄"
 
-#: ../src/ephy-main.c:98
+#: ../src/ephy-main.c:100
 msgid "DIR"
 msgstr "DIR"
 
-#: ../src/ephy-main.c:100
+#: ../src/ephy-main.c:102
 msgid "URL …"
 msgstr "URL…"
 
-#: ../src/ephy-main.c:208
+#: ../src/ephy-main.c:210
 msgid "Could not start Web"
 msgstr "無法啟動網頁"
 
-#: ../src/ephy-main.c:211
+#: ../src/ephy-main.c:213
 #, c-format
 msgid ""
 "Startup failed because of the following error:\n"
@@ -1508,408 +2079,355 @@ msgstr ""
 "由於以下原因，因此無法執行：\n"
 "%s"
 
-#: ../src/ephy-main.c:322
+#: ../src/ephy-main.c:325
 msgid "Web options"
 msgstr "網頁選項"
 
-#: ../src/ephy-notebook.c:592
+#: ../src/ephy-notebook.c:606
 msgid "Close tab"
 msgstr "關閉分頁"
 
-#. Toplevel
-#: ../src/ephy-window.c:88
-msgid "_Bookmarks"
-msgstr "書籤(_B)"
-
-#: ../src/ephy-window.c:92
+#: ../src/ephy-window.c:96
 msgid "_Extensions"
 msgstr "擴充功能(_E)"
 
 #. File actions.
-#: ../src/ephy-window.c:96
+#: ../src/ephy-window.c:100
 msgid "_Open…"
 msgstr "開啟(_O)…"
 
-#: ../src/ephy-window.c:98
+#: ../src/ephy-window.c:102
 msgid "Save _As…"
 msgstr "另存新檔(_A)…"
 
-#: ../src/ephy-window.c:100
+#: ../src/ephy-window.c:104
 msgid "Save As _Web Application…"
 msgstr "儲存為網頁應用程式(_W)…"
 
-#: ../src/ephy-window.c:102
+#: ../src/ephy-window.c:106
 msgid "_Print…"
 msgstr "打印(_P)…"
 
-#: ../src/ephy-window.c:104
+#: ../src/ephy-window.c:108
 msgid "S_end Link by Email…"
 msgstr "以電郵傳送連結(_E)…"
 
 #. Edit actions.
-#: ../src/ephy-window.c:111
+#: ../src/ephy-window.c:115
 msgid "_Undo"
 msgstr "復原(_U)"
 
-#: ../src/ephy-window.c:113
+#: ../src/ephy-window.c:117
 msgid "Re_do"
 msgstr "取消復原(_D)"
 
-#: ../src/ephy-window.c:125
+#: ../src/ephy-window.c:129
 msgid "_Find…"
 msgstr "尋找(_F)…"
 
-#: ../src/ephy-window.c:127
+#: ../src/ephy-window.c:131
 msgid "Find Ne_xt"
 msgstr "找下一個(_X)"
 
-#: ../src/ephy-window.c:129
+#: ../src/ephy-window.c:133
 msgid "Find Pre_vious"
 msgstr "找上一個(_V)"
 
 #. View actions.
-#: ../src/ephy-window.c:134 ../src/ephy-window.c:136
+#: ../src/ephy-window.c:138 ../src/ephy-window.c:140
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: ../src/ephy-window.c:140
+#: ../src/ephy-window.c:144
 msgid "_Larger Text"
 msgstr "放大字型(_L)"
 
-#: ../src/ephy-window.c:142
+#: ../src/ephy-window.c:146
 msgid "S_maller Text"
 msgstr "縮小字型(_M)"
 
-#: ../src/ephy-window.c:144
+#: ../src/ephy-window.c:148
 msgid "_Normal Size"
 msgstr "正常大小(_N)"
 
-#: ../src/ephy-window.c:146
+#: ../src/ephy-window.c:150
 msgid "Text _Encoding"
 msgstr "字符編碼(_E)"
 
-#: ../src/ephy-window.c:147
+#: ../src/ephy-window.c:151
 msgid "_Page Source"
 msgstr "網頁原始內容(_P)"
 
 #. Bookmarks actions.
-#: ../src/ephy-window.c:152
+#: ../src/ephy-window.c:156
 msgid "_Add Bookmark…"
 msgstr "加入書籤(_A)…"
 
 #. Go actions.
-#: ../src/ephy-window.c:157
+#: ../src/ephy-window.c:161
 msgid "_Location…"
 msgstr "位置(_L)…"
 
 #. Tabs actions.
-#: ../src/ephy-window.c:162
+#: ../src/ephy-window.c:166
 msgid "_Previous Tab"
 msgstr "上一個分頁(_P)"
 
-#: ../src/ephy-window.c:164
+#: ../src/ephy-window.c:168
 msgid "_Next Tab"
 msgstr "下一個分頁(_N)"
 
-#: ../src/ephy-window.c:166
+#: ../src/ephy-window.c:170
 msgid "Move Tab _Left"
 msgstr "分頁向左移(_L)"
 
-#: ../src/ephy-window.c:168
+#: ../src/ephy-window.c:172
 msgid "Move Tab _Right"
 msgstr "分頁向右移(_R)"
 
-#: ../src/ephy-window.c:170
+#: ../src/ephy-window.c:174
 msgid "_Detach Tab"
 msgstr "分離分頁(_D)"
 
 #. File actions.
-#: ../src/ephy-window.c:178
+#: ../src/ephy-window.c:182
 msgid "_Work Offline"
 msgstr "離線模式(_W)"
 
 #. View actions.
-#: ../src/ephy-window.c:183
+#: ../src/ephy-window.c:187
 msgid "_Downloads Bar"
 msgstr "下載列(_D)"
 
-#: ../src/ephy-window.c:186
+#: ../src/ephy-window.c:190
 msgid "_Fullscreen"
 msgstr "全螢幕(_F)"
 
-#: ../src/ephy-window.c:188
+#: ../src/ephy-window.c:192
 msgid "Popup _Windows"
 msgstr "彈出式視窗(_W)"
 
-#: ../src/ephy-window.c:190
+#: ../src/ephy-window.c:194
 msgid "Selection Caret"
 msgstr "選擇游標"
 
 #. Document.
-#: ../src/ephy-window.c:197
+#: ../src/ephy-window.c:201
 msgid "Add Boo_kmark…"
 msgstr "加入書籤(_K)…"
 
 #. Links.
-#: ../src/ephy-window.c:202
+#: ../src/ephy-window.c:206
 msgid "_Open Link"
 msgstr "開啟連結(_O)"
 
-#: ../src/ephy-window.c:204
+#: ../src/ephy-window.c:208
 msgid "Open Link in New _Window"
 msgstr "在新的視窗中開啟連結(_W)"
 
-#: ../src/ephy-window.c:206
+#: ../src/ephy-window.c:210
 msgid "Open Link in New _Tab"
 msgstr "在新的分頁中開啟連結(_T)"
 
-#: ../src/ephy-window.c:208
+#: ../src/ephy-window.c:212
 msgid "_Download Link"
 msgstr "下載連結(_D)"
 
-#: ../src/ephy-window.c:210
+#: ../src/ephy-window.c:214
 msgid "_Save Link As…"
 msgstr "另存連結(_S)…"
 
-#: ../src/ephy-window.c:212
+#: ../src/ephy-window.c:216
 msgid "_Bookmark Link…"
 msgstr "將連結加入書籤(_B)…"
 
-#: ../src/ephy-window.c:214
+#: ../src/ephy-window.c:218
 msgid "_Copy Link Address"
 msgstr "複製連結地址(_C)"
 
 #. Images.
-#: ../src/ephy-window.c:219
+#: ../src/ephy-window.c:223
 msgid "Open _Image"
 msgstr "開啟圖片(_I)"
 
-#: ../src/ephy-window.c:221
+#: ../src/ephy-window.c:225
 msgid "_Save Image As…"
 msgstr "另存圖片(_S)…"
 
-#: ../src/ephy-window.c:223
+#: ../src/ephy-window.c:227
 msgid "_Use Image As Background"
 msgstr "使用圖片作為桌面背景(_U)"
 
-#: ../src/ephy-window.c:225
+#: ../src/ephy-window.c:229
 msgid "Copy I_mage Address"
 msgstr "複製圖片地址(_M)"
 
-#: ../src/ephy-window.c:227
+#: ../src/ephy-window.c:231
 msgid "St_art Animation"
 msgstr "動畫開始(_A)"
 
-#: ../src/ephy-window.c:229
+#: ../src/ephy-window.c:233
 msgid "St_op Animation"
 msgstr "動畫停止(_O)"
 
 #. Inspector.
-#: ../src/ephy-window.c:245
+#: ../src/ephy-window.c:249
 msgid "Inspect _Element"
 msgstr "檢查元素(_E)"
 
-#: ../src/ephy-window.c:450
+#: ../src/ephy-window.c:454
 msgid "There are unsubmitted changes to form elements"
 msgstr "對表單的元素而言沒有經確認的改變"
 
-#: ../src/ephy-window.c:451
+#: ../src/ephy-window.c:455
 msgid "If you close the document anyway, you will lose that information."
 msgstr "如果你無論無何要關閉此文件，你將會失去未儲存的資訊。"
 
-#: ../src/ephy-window.c:453
+#: ../src/ephy-window.c:457
 msgid "Close _Document"
 msgstr "關閉文件(_D)"
 
-#: ../src/ephy-window.c:471
+#: ../src/ephy-window.c:475
 msgid "There are ongoing downloads in this window"
 msgstr "這個視窗還有進行中的下載"
 
-#: ../src/ephy-window.c:472
+#: ../src/ephy-window.c:476
 msgid "If you close this window, the downloads will be cancelled"
 msgstr "如果你關閉這個視窗，這個下載也會被取消"
 
-#: ../src/ephy-window.c:473
+#: ../src/ephy-window.c:477
 msgid "Close window and cancel downloads"
 msgstr "關閉視窗並取消下載"
 
-#: ../src/ephy-window.c:1313
+#: ../src/ephy-window.c:1350
 msgid "Save As"
 msgstr "另存新檔"
 
-#: ../src/ephy-window.c:1315
+#: ../src/ephy-window.c:1352
 msgid "Save As Application"
 msgstr "儲存為應用程式"
 
-#: ../src/ephy-window.c:1317
+#: ../src/ephy-window.c:1354
 msgid "Print"
 msgstr "列印"
 
-#: ../src/ephy-window.c:1319
+#: ../src/ephy-window.c:1356
 msgid "Bookmark"
 msgstr "加入書籤"
 
-#: ../src/ephy-window.c:1321
+#: ../src/ephy-window.c:1358
 msgid "Find"
 msgstr "尋找"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1330
+#: ../src/ephy-window.c:1367
 msgid "Larger"
 msgstr "放大"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1333
+#: ../src/ephy-window.c:1370
 msgid "Smaller"
 msgstr "縮小"
 
-#: ../src/ephy-window.c:1353
+#: ../src/ephy-window.c:1390
 msgid "Back"
 msgstr "上一頁"
 
-#: ../src/ephy-window.c:1365
+#: ../src/ephy-window.c:1402
 msgid "Forward"
 msgstr "下一頁"
 
-#: ../src/ephy-window.c:1377
+#: ../src/ephy-window.c:1414
 msgid "Zoom"
 msgstr "縮放"
 
-#: ../src/ephy-window.c:1385
+#: ../src/ephy-window.c:1422
 msgid "New _Tab"
 msgstr "新增分頁(_T)"
 
-#: ../src/epiphany.ui.h:1
-msgid "<b>_Automatic</b>"
-msgstr "<b>自動(_A)：</b>"
-
-#: ../src/epiphany.ui.h:2
-msgid "<b>_Use a different encoding:</b>"
-msgstr "使用不同的編碼(_U)："
-
-#: ../src/epiphany.ui.h:3
-msgid "Content:"
-msgstr "內容"
-
-#: ../src/epiphany.ui.h:4
-msgid "Cookie properties"
-msgstr "Cookie 屬性"
-
-#: ../src/epiphany.ui.h:5 ../src/prefs-dialog.ui.h:8
-msgid "Cookies"
-msgstr "Cookie"
-
-#: ../src/epiphany.ui.h:6
-msgid "Expires:"
-msgstr "時限："
-
-#: ../src/epiphany.ui.h:7 ../src/prefs-dialog.ui.h:22
-msgid "Passwords"
-msgstr "密碼"
-
-#: ../src/epiphany.ui.h:8
-msgid "Path:"
-msgstr "路徑："
-
-#: ../src/epiphany.ui.h:9
-msgid "Personal Data"
-msgstr "個人資料"
-
-#: ../src/epiphany.ui.h:10
-msgid "Send for:"
-msgstr "傳送給："
-
-#: ../src/epiphany.ui.h:11
-msgid "Text Encoding"
-msgstr "字符編碼"
-
-#: ../src/epiphany.ui.h:13
-msgid "_Show passwords"
-msgstr "顯示密碼(_S)"
-
-#: ../src/pdm-dialog.c:333
+#: ../src/pdm-dialog.c:346
 msgid "<b>Select the personal data you want to clear</b>"
 msgstr "<b>選擇想要清除的個人資料</b>"
 
-#: ../src/pdm-dialog.c:336
+#: ../src/pdm-dialog.c:349
 msgid ""
 "You are about to clear personal data that is stored about the web pages you "
 "have visited. Before proceeding, check the types of information that you "
 "want to remove:"
 msgstr "你想要清除的個人資料儲存了你所參訪過的網頁。在開始清除之前，請確定要移除哪些類型的資訊："
 
-#: ../src/pdm-dialog.c:341
+#: ../src/pdm-dialog.c:354
 msgid "Clear All Personal Data"
 msgstr "清除所有的個人資料"
 
 #. Cookies
-#: ../src/pdm-dialog.c:375
+#: ../src/pdm-dialog.c:388
 msgid "C_ookies"
 msgstr "C_ookies"
 
 #. Passwords
-#: ../src/pdm-dialog.c:387
+#: ../src/pdm-dialog.c:400
 msgid "Saved _passwords"
 msgstr "儲存的密碼(_P)"
 
 #. History
-#: ../src/pdm-dialog.c:399
+#: ../src/pdm-dialog.c:412
 msgid "Hi_story"
 msgstr "歷史記錄(_S)"
 
 #. Cache
-#: ../src/pdm-dialog.c:411
+#: ../src/pdm-dialog.c:424
 msgid "_Temporary files"
 msgstr "暫存檔案(_T)"
 
-#: ../src/pdm-dialog.c:427
+#: ../src/pdm-dialog.c:440
 msgid ""
 "<small><i><b>Note:</b> You cannot undo this action. The data you are "
 "choosing to clear will be deleted forever.</i></small>"
 msgstr "<small><i><b>注意：</b>你不能復原這個動作。你所選擇的資料將被永遠刪除。</i></small>"
 
-#: ../src/pdm-dialog.c:646
+#: ../src/pdm-dialog.c:659
 msgid "Encrypted connections only"
 msgstr "只限加密後的連線"
 
-#: ../src/pdm-dialog.c:647
+#: ../src/pdm-dialog.c:660
 msgid "Any type of connection"
 msgstr "任何類型的連線"
 
 #. Session cookie
-#: ../src/pdm-dialog.c:652
+#: ../src/pdm-dialog.c:665
 msgid "End of current session"
 msgstr "結束目前的作業階段"
 
-#: ../src/pdm-dialog.c:771
+#: ../src/pdm-dialog.c:784
 msgid "Domain"
 msgstr "網域"
 
-#: ../src/pdm-dialog.c:783
+#: ../src/pdm-dialog.c:796
 msgid "Name"
 msgstr "名稱"
 
-#: ../src/pdm-dialog.c:1197
+#: ../src/pdm-dialog.c:1210
 msgid "Host"
 msgstr "主機"
 
-#: ../src/pdm-dialog.c:1210
+#: ../src/pdm-dialog.c:1223
 msgid "User Name"
 msgstr "使用者名稱"
 
-#: ../src/pdm-dialog.c:1223
+#: ../src/pdm-dialog.c:1236
 msgid "User Password"
 msgstr "使用者密碼"
 
-#: ../src/popup-commands.c:279
+#: ../src/popup-commands.c:287
 msgid "Download Link"
 msgstr "下載連結"
 
-#: ../src/popup-commands.c:287
+#: ../src/popup-commands.c:295
 msgid "Save Link As"
 msgstr "另存連結(_A)…"
 
-#: ../src/popup-commands.c:294
+#: ../src/popup-commands.c:302
 msgid "Save Image As"
 msgstr "另存圖片"
 
@@ -1938,186 +2456,53 @@ msgid "System language (%s)"
 msgid_plural "System languages (%s)"
 msgstr[0] "系統語言 (%s)"
 
-#: ../src/prefs-dialog.c:773 ../src/prefs-dialog.ui.h:17
-msgid "Language"
-msgstr "語言"
-
 #: ../src/prefs-dialog.c:862
 msgid "Select a Directory"
 msgstr "選擇一個目錄"
 
-#. Refers to "Only from sites you visit" option under Cookies.
-#: ../src/prefs-dialog.ui.h:2
-msgid "<small>For example, not from advertisers on these sites</small>"
-msgstr "<small>例如，不要來自這些網站的廣告</small>"
-
-#: ../src/prefs-dialog.ui.h:3
-msgid "A_utomatically open downloaded files"
-msgstr "自動下載並開啟檔案(_U)"
-
-#: ../src/prefs-dialog.ui.h:4
-msgid "Add Language"
-msgstr "增加語言"
-
-#: ../src/prefs-dialog.ui.h:5
-msgid "Allow popup _windows"
-msgstr "允許彈出式視窗(_W)"
-
-#: ../src/prefs-dialog.ui.h:6
-msgid "Choose a l_anguage:"
-msgstr "選擇語言(_A)："
-
-#: ../src/prefs-dialog.ui.h:9
-msgid "De_fault:"
-msgstr "預設(_F)："
-
-#: ../src/prefs-dialog.ui.h:11
-msgid "Enable Java_Script"
-msgstr "啟用 Java_Script"
-
-#: ../src/prefs-dialog.ui.h:12
-msgid "Enable _plugins"
-msgstr "啟用外掛程式(_P)"
-
-#: ../src/prefs-dialog.ui.h:14
-msgid "Fonts"
-msgstr "字型"
-
-#: ../src/prefs-dialog.ui.h:15
-msgid "Fonts & Style"
-msgstr "字型與樣式"
-
-#: ../src/prefs-dialog.ui.h:16
-msgid "General"
-msgstr "一般"
-
-#: ../src/prefs-dialog.ui.h:18
-msgid "Languages"
-msgstr "語言"
-
-#: ../src/prefs-dialog.ui.h:19
-msgid "MB"
-msgstr "MB"
-
-#: ../src/prefs-dialog.ui.h:20
-msgid "Monospace font:"
-msgstr "等寬字型："
-
-#: ../src/prefs-dialog.ui.h:21
-msgid "Only _from sites you visit"
-msgstr "只來自你瀏覽的網站(_F)"
-
-#: ../src/prefs-dialog.ui.h:23
-msgid "Preferences"
-msgstr "偏好設定"
-
-#: ../src/prefs-dialog.ui.h:24
-msgid "Privacy"
-msgstr "私隱"
-
-#: ../src/prefs-dialog.ui.h:25
-msgid "Sans serif font:"
-msgstr "無襯線字型："
-
-#: ../src/prefs-dialog.ui.h:26
-msgid "Serif font:"
-msgstr "襯線字型："
-
-#: ../src/prefs-dialog.ui.h:27
-msgid "Spell checking"
-msgstr "拼字檢查"
-
-#: ../src/prefs-dialog.ui.h:28
-msgid "Style"
-msgstr "樣式"
-
-#: ../src/prefs-dialog.ui.h:29
-msgid "Temporary Files"
-msgstr "暫存檔"
-
-#: ../src/prefs-dialog.ui.h:30
-msgid "Use custom _stylesheet"
-msgstr "使用自選樣式表(_S)"
-
-#: ../src/prefs-dialog.ui.h:31
-msgid "Web Content"
-msgstr "網頁內容"
-
-#: ../src/prefs-dialog.ui.h:32
-msgid "_Always accept"
-msgstr "總是接受(_A)"
-
-#: ../src/prefs-dialog.ui.h:33
-msgid "_Disk space:"
-msgstr "磁碟空間(_D)："
-
-#: ../src/prefs-dialog.ui.h:34
-msgid "_Download folder:"
-msgstr "下載資料夾(_D)"
-
-#: ../src/prefs-dialog.ui.h:35
-msgid "_Edit Stylesheet…"
-msgstr "編輯樣式表(_E)…"
-
-#: ../src/prefs-dialog.ui.h:36
-msgid "_Enable spell checking"
-msgstr "啟用拼字檢查(_E)"
-
-#: ../src/prefs-dialog.ui.h:37
-msgid "_Never accept"
-msgstr "永不接受(_N)"
-
-#: ../src/prefs-dialog.ui.h:38
-msgid "_Remember passwords"
-msgstr "記錄密碼(_R)"
-
-#: ../src/prefs-dialog.ui.h:39
-msgid "_Use system fonts"
-msgstr "使用系統字型(_U)"
-
-#: ../src/window-commands.c:316
+#: ../src/window-commands.c:331
 msgid "Save"
 msgstr "儲存"
 
-#: ../src/window-commands.c:479
+#: ../src/window-commands.c:539
 #, c-format
 msgid "A web application named '%s' already exists. Do you want to replace it?"
 msgstr "已存在名為「%s」的網頁應用程式。你想要取代它嗎？"
 
-#: ../src/window-commands.c:484
+#: ../src/window-commands.c:544
 msgid "Replace"
 msgstr "取代"
 
-#: ../src/window-commands.c:488
+#: ../src/window-commands.c:548
 msgid ""
 "An application with the same name already exists. Replacing it will "
 "overwrite it."
 msgstr "以此為名的應用程式已經存在。取代它會將它覆蓋。"
 
-#: ../src/window-commands.c:524
+#: ../src/window-commands.c:584
 #, c-format
 msgid "The application '%s' is ready to be used"
 msgstr "應用程式「%s」已經準備好可以使用"
 
-#: ../src/window-commands.c:527
+#: ../src/window-commands.c:587
 #, c-format
 msgid "The application '%s' could not be created"
 msgstr "無法建立應用程式「%s」"
 
-#: ../src/window-commands.c:535
+#: ../src/window-commands.c:595
 msgid "Launch"
 msgstr "執行"
 
 #. Show dialog with icon, title.
-#: ../src/window-commands.c:568
+#: ../src/window-commands.c:628
 msgid "Create Web Application"
 msgstr "建立網頁應用程式"
 
-#: ../src/window-commands.c:573
+#: ../src/window-commands.c:633
 msgid "C_reate"
 msgstr "建立(_R)"
 
-#: ../src/window-commands.c:1109
+#: ../src/window-commands.c:1224
 msgid ""
 "Web is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -2125,7 +2510,7 @@ msgid ""
 "version."
 msgstr "Web (譯名「網頁」) 為自由軟件；你可根據據自由軟件基金會所發表的 GNU 通用公共授權條款規定，就本程式再為散布與／或修改；無論你根據據的是本授權的第二版或（你自行選擇的）任一日後發行的版本。"
 
-#: ../src/window-commands.c:1113
+#: ../src/window-commands.c:1228
 msgid ""
 "The GNOME Web Browser is distributed in the hope that it will be useful, but "
 "WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY "
@@ -2133,27 +2518,27 @@ msgid ""
 "more details."
 msgstr "GNOME 網頁瀏覽器係基於使用目的而加以散布，然而不負任何擔保責任；亦無對適售性或特定目的適用性所為的默示性擔保。詳情請參照 GNU 通用公共授權。"
 
-#: ../src/window-commands.c:1117
+#: ../src/window-commands.c:1232
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "the GNOME Web Browser; if not, write to the Free Software Foundation, Inc., "
 "51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
 msgstr "你應已收到附隨於本程式的 GNU 通用公共授權的副本；如無，請寫信至自由軟件基金會：51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA"
 
-#: ../src/window-commands.c:1163 ../src/window-commands.c:1179
-#: ../src/window-commands.c:1190
+#: ../src/window-commands.c:1278 ../src/window-commands.c:1294
+#: ../src/window-commands.c:1305
 msgid "Contact us at:"
 msgstr "聯絡我們於："
 
-#: ../src/window-commands.c:1166
+#: ../src/window-commands.c:1281
 msgid "Contributors:"
 msgstr "貢獻者："
 
-#: ../src/window-commands.c:1169
+#: ../src/window-commands.c:1284
 msgid "Past developers:"
 msgstr "前度開發人員："
 
-#: ../src/window-commands.c:1199
+#: ../src/window-commands.c:1317
 #, c-format
 msgid ""
 "Lets you view web pages and find information on the internet.\n"
@@ -2170,7 +2555,7 @@ msgstr ""
 #. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
 #.
-#: ../src/window-commands.c:1228
+#: ../src/window-commands.c:1347
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -2181,33 +2566,31 @@ msgstr ""
 "Ching-Hung Lin <billlin@wshlab2.ee.kuas.edu.tw>, 2004\n"
 "Abel Cheung <maddog@linux.org.hk>, 2003"
 
-#: ../src/window-commands.c:1231
+#: ../src/window-commands.c:1350
 msgid "Web Website"
 msgstr "網頁網站"
 
-#: ../src/window-commands.c:1373
+#: ../src/window-commands.c:1490
 msgid "Enable caret browsing mode?"
 msgstr "是否啟用鍵盤瀏覽？"
 
-#: ../src/window-commands.c:1376
+#: ../src/window-commands.c:1493
 msgid ""
 "Pressing F7 turns caret browsing on or off. This feature places a moveable "
 "cursor in web pages, allowing you to move around with your keyboard. Do you "
 "want to enable caret browsing on?"
 msgstr "按下 F7 會開啟或關閉鍵盤瀏覽。這個功能會在網頁中放置一個可移動的游標，讓你可以使用鍵盤隨處移動。你是否要啟用鍵盤瀏覽？"
 
-#: ../src/window-commands.c:1379
+#: ../src/window-commands.c:1496
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#~ msgid "_New Window"
-#~ msgstr "新視窗(_N)"
-
-#~ msgid "_History"
-#~ msgstr "瀏覽記錄(_H)"
+#~ msgctxt "file type"
+#~ msgid "Unknown"
+#~ msgstr "不明"
 
-#~ msgid "_Quit"
-#~ msgstr "結束(_Q)"
+#~ msgid "Leave Fullscreen"
+#~ msgstr "離開全螢幕"
 
 #~ msgid "Disable connection to session manager"
 #~ msgstr "停用到作業階段管理程式的連線"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d630386f9..ac8b92a1a 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: 2012-04-11 09:26+0800\n"
-"PO-Revision-Date: 2012-04-08 21:43+0800\n"
+"POT-Creation-Date: 2012-06-30 22:57+0800\n"
+"PO-Revision-Date: 2012-06-30 13:51+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n@lists.linux.org.tw>\n"
 "Language: \n"
@@ -42,29 +42,422 @@ msgstr "http://www.google.com.tw"
 msgid "http://www.google.com/search?q=%s&amp;ie=UTF-8&amp;oe=UTF-8"
 msgstr "http://www.google.com.tw/search?q=%s&amp;ie=UTF-8&amp;oe=UTF-8"
 
-#: ../data/epiphany.desktop.in.in.h:1
-msgid "Browse the web"
-msgstr "瀏覽網頁"
+#: ../data/epiphany.desktop.in.in.h:1 ../src/ephy-main.c:75
+#: ../src/ephy-main.c:324 ../src/ephy-main.c:476 ../src/window-commands.c:1331
+msgid "Web"
+msgstr "網頁"
 
 #: ../data/epiphany.desktop.in.in.h:2
+msgid "Web Browser"
+msgstr "網頁瀏覽器"
+
+#: ../data/epiphany.desktop.in.in.h:3
 msgid "Epiphany Web Browser"
 msgstr "Epiphany 網頁瀏覽器"
 
-#: ../data/epiphany.desktop.in.in.h:3 ../src/ephy-main.c:73
-#: ../src/ephy-main.c:321 ../src/ephy-main.c:466 ../src/window-commands.c:1212
-msgid "Web"
-msgstr "網頁"
-
 #: ../data/epiphany.desktop.in.in.h:4
-msgid "Web Browser"
-msgstr "網頁瀏覽器"
+msgid "Browse the web"
+msgstr "瀏覽網頁"
 
-#: ../embed/ephy-download.c:217
-msgctxt "file type"
-msgid "Unknown"
-msgstr "不明"
+#: ../data/org.gnome.epiphany.gschema.xml.h:1
+#, fuzzy
+#| msgid "Browse the web"
+msgid "Browse with caret"
+msgstr "瀏覽網頁"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:2
+msgid "URL Search"
+msgstr "URL 搜尋"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:3
+msgid "Search string for keywords entered in the URL bar."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:4
+#, fuzzy
+#| msgid "User Name"
+msgid "User agent"
+msgstr "使用者代理"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:5
+msgid ""
+"String that will be used as user agent, to identify the browser to the web "
+"servers."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:6
+msgid "Automatic downloads"
+msgstr "自動下載"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:7
+msgid ""
+"When files cannot be opened by the browser they are automatically downloaded "
+"to the download folder and opened with the appropriate application."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:8
+msgid ""
+"Middle click to open the web page pointed to by the currently selected text"
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:9
+msgid ""
+"Middle clicking on the main view pane will open the web page pointed to by "
+"the currently selected text."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:10
+msgid "Force new windows to be opened in tabs"
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:11
+msgid ""
+"Force new window requests to be opened in tabs instead of using a new window."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:12
+msgid "Remember passwords"
+msgstr "記錄密碼"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:13
+msgid "Whether to store and prefill passwords in web sites."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:14
+msgid "Automatically manage offline status with NetworkManager"
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:15
+msgid "Enable smooth scrolling"
+msgstr "啟用平滑捲動"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:16
+msgid "Active extensions"
+msgstr "使用中擴充功能"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:17
+#, fuzzy
+msgid "Lists the active extensions."
+msgstr "列出使用中"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:18
+msgid "Don't use an external application to view page source."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:19
+msgid "Whether to automatically restore the last session"
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:20
+msgid ""
+"Defines how the session will be restored during startup. Allowed values are "
+"'always' (the previous state of the application is always restored), "
+"'crashed' (the session is only restored if the application crashes) and "
+"'never' (the homepage is always shown)."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:21
+msgid "Show toolbars by default"
+msgstr "預設顯示工具列"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:22
+msgid "Toolbar style"
+msgstr "工具列樣式"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:23
+msgid ""
+"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both"
+"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and "
+"\"text\"."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:24
+msgid "[Deprecated]"
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:25
+msgid ""
+"[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' "
+"instead."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:26
+#, fuzzy
+#| msgid "Close the bookmarks window"
+msgid "Visibility of the downloads window"
+msgstr "關閉書籤視窗"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:27
+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:28
+msgid "The visibility policy for the tabs bar."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:29
+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 ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:30
+msgid "Minimum font size"
+msgstr "最小字型大小"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:31
+msgid "Use GNOME fonts"
+msgstr "使用 GNOME 字型"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:32
+msgid "Use GNOME desktop wide font configuration."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:33
+msgid "Custom sans-serif font"
+msgstr "自訂無襯線字型"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:34
+msgid ""
+"A value to be used to override sans-serif desktop font when use-gnome-fonts "
+"is set."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:35
+msgid "Custom serif font"
+msgstr "自訂有襯線字型"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:36
+msgid ""
+"A value to be used to override serif desktop font when use-gnome-fonts is "
+"set."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:37
+msgid "Custom monospace font"
+msgstr "自訂等寬字型"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:38
+msgid ""
+"A value to be used to override monospace desktop font when use-gnome-fonts "
+"is set."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:39
+msgid "Use own colors"
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:40
+msgid "Use your own colors instead of the colors the page requests."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:41
+msgid "Use own fonts"
+msgstr "使用自用字型(_U)"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:42
+msgid "Use your own fonts instead of the fonts the page requests."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:43
+msgid "Use a custom CSS"
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:44
+msgid "Use a custom CSS file to modify websites own CSS."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:45
+msgid "Enable spell checking"
+msgstr "啟用拼字檢查"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:46
+msgid "Spell check any text typed in editable areas."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:47
+msgid "Default encoding"
+msgstr "預設編碼"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:48
+msgid ""
+"Default encoding. Accepted values are the ones WebKitGTK+ can understand."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:49
+msgid "Size of disk cache"
+msgstr "磁碟快取大小"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:50
+msgid "Size of disk cache, in MB."
+msgstr "磁碟快取大小，單位為 MB。"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:51
+#: ../src/resources/prefs-dialog.ui.h:38
+msgid "Languages"
+msgstr "語言"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:52
+msgid "Preferred languages, two letter codes."
+msgstr "偏好的語言，兩個英文字母的代碼。"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:53
+msgid "Cookie accept"
+msgstr "Cookie 接受"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:54
+msgid ""
+"Where to accept cookies from. Possible values are \"anywhere\", \"current "
+"site\" and \"nowhere\"."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:55
+msgid "Image animation mode"
+msgstr "影像動畫模式"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:56
+msgid ""
+"How to present animated images. Possible values are \"normal\", \"once\" and "
+"\"disabled\"."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:57
+msgid "Allow popups"
+msgstr "允許彈出式視窗"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:58
+msgid ""
+"Allow sites to open new windows using JavaScript (if JavaScript is enabled)."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:59
+msgid "Enable Plugins"
+msgstr "啟用外掛程式"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:60
+msgid "Enable JavaScript"
+msgstr "啟用 JavaScript"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:61
+msgid "Enable WebGL"
+msgstr "啟用 WebGL"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:62
+msgid "Whether to enable support for WebGL contexts."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:63
+#, fuzzy
+msgid "Do Not Track"
+msgstr "不要跟蹤"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:64
+msgid ""
+"Whether to tell websites that we do not wish to be tracked. Please note that "
+"web pages are not forced to follow this setting."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:65
+#, fuzzy
+#| msgid "_Download folder:"
+msgid "The downloads folder"
+msgstr "下載資料夾(_D)"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:66
+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 ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:67
+msgid "History pages time range"
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:68
+msgid "Whether to show the title column in the history window."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:69
+msgid "Whether to show the address column in the history window."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:70
+msgid "Whether to show the date-time column in the history window."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:71
+msgid "Whether to show the title column in the bookmarks window."
+msgstr ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:72
+msgid "Whether to show the address column in the bookmarks window."
+msgstr ""
+
+#: ../embed/ephy-about-handler.c:64 ../embed/ephy-about-handler.c:67
+#: ../embed/ephy-about-handler.c:117 ../embed/ephy-about-handler.c:120
+msgid "Installed plugins"
+msgstr "已安裝的外掛程式"
+
+#: ../embed/ephy-about-handler.c:79 ../embed/ephy-about-handler.c:132
+msgid "Enabled"
+msgstr "已啟用"
 
-#: ../embed/ephy-embed.c:692
+#. webkit_plugin_get_enabled (plugin)
+#: ../embed/ephy-about-handler.c:79 ../embed/ephy-about-handler.c:132
+msgid "Yes"
+msgstr "是"
+
+#: ../embed/ephy-about-handler.c:79 ../embed/ephy-about-handler.c:132
+msgid "No"
+msgstr "否"
+
+#: ../embed/ephy-about-handler.c:80 ../embed/ephy-about-handler.c:133
+msgid "MIME type"
+msgstr "MIME 類型"
+
+#: ../embed/ephy-about-handler.c:80 ../embed/ephy-about-handler.c:133
+msgid "Description"
+msgstr "說明"
+
+#: ../embed/ephy-about-handler.c:80 ../embed/ephy-about-handler.c:133
+msgid "Suffixes"
+msgstr "後綴"
+
+#: ../embed/ephy-about-handler.c:172 ../embed/ephy-about-handler.c:175
+msgid "Memory usage"
+msgstr "記憶體使用量"
+
+#: ../embed/ephy-about-handler.c:208 ../embed/ephy-about-handler.c:210
+msgid "Applications"
+msgstr "應用程式"
+
+#: ../embed/ephy-about-handler.c:211
+msgid "List of installed web applications"
+msgstr "已安裝的網頁應用程式清單"
+
+#. Note for translators: this refers to the installation date.
+#: ../embed/ephy-about-handler.c:227
+msgid "Installed on:"
+msgstr "安裝於："
+
+#: ../embed/ephy-embed.c:585
+#, c-format
+msgid "Press %s to exit fullscreen"
+msgstr "按下 %s 離開全螢幕"
+
+#. Translators: 'ESC' and 'F11' are keyboard keys.
+#: ../embed/ephy-embed.c:588
+msgid "ESC"
+msgstr "ESC"
+
+#: ../embed/ephy-embed.c:588
+msgid "F11"
+msgstr "F11"
+
+#: ../embed/ephy-embed.c:889
 msgid "Web Inspector"
 msgstr "網頁檢查器"
 
@@ -72,7 +465,7 @@ msgstr "網頁檢查器"
 msgid "Epiphany can't be used now. Initialization failed."
 msgstr "Epiphany 目前無法使用。初始化程序失敗。"
 
-#: ../embed/ephy-embed-utils.c:61
+#: ../embed/ephy-embed-utils.c:62
 #, c-format
 msgid "Send an email message to “%s”"
 msgstr "傳送電子郵件至位址“%s”"
@@ -401,63 +794,16 @@ msgstr "萬國碼 (UTF-3_2BE)"
 msgid "Unknown (%s)"
 msgstr "不明 (%s)"
 
-#: ../embed/ephy-request-about.c:101 ../embed/ephy-request-about.c:104
-msgid "Installed plugins"
-msgstr "已安裝的外掛程式"
-
-#: ../embed/ephy-request-about.c:116
-msgid "Enabled"
-msgstr "已啟用"
-
-#: ../embed/ephy-request-about.c:116
-msgid "Yes"
-msgstr "是"
-
-#: ../embed/ephy-request-about.c:116
-msgid "No"
-msgstr "否"
-
-#: ../embed/ephy-request-about.c:117
-msgid "MIME type"
-msgstr "MIME 類型"
-
-#: ../embed/ephy-request-about.c:117
-msgid "Description"
-msgstr "說明"
-
-#: ../embed/ephy-request-about.c:117
-msgid "Suffixes"
-msgstr "後綴"
-
-#: ../embed/ephy-request-about.c:146 ../embed/ephy-request-about.c:149
-msgid "Memory usage"
-msgstr "記憶體使用量"
-
-#: ../embed/ephy-request-about.c:175 ../embed/ephy-request-about.c:177
-msgid "Applications"
-msgstr "應用程式"
-
-#: ../embed/ephy-request-about.c:178
-msgid "List of installed web applications"
-msgstr "已安裝的網頁應用程式清單"
-
-#. Note for translators: this refers to the installation date.
-#: ../embed/ephy-request-about.c:195
-msgid "Installed on:"
-msgstr "安裝於："
-
 #. characters
-#. ms
-#. RELOAD_DELAY * RELOAD_DELAY_MAX_TICKS = 10 s
-#: ../embed/ephy-web-view.c:70 ../embed/ephy-web-view.c:3441
+#: ../embed/ephy-web-view.c:64 ../embed/ephy-web-view.c:3703
 msgid "Blank page"
 msgstr "空白頁面"
 
-#: ../embed/ephy-web-view.c:770
+#: ../embed/ephy-web-view.c:745
 msgid "_Not now"
 msgstr "現在不要(_N)"
 
-#: ../embed/ephy-web-view.c:775
+#: ../embed/ephy-web-view.c:750
 msgid "_Store password"
 msgstr "儲存密碼(_S)"
 
@@ -465,45 +811,45 @@ msgstr "儲存密碼(_S)"
 #. * hostname where this is happening. Example: gnome@gmail.com and
 #. * mail.google.com.
 #.
-#: ../embed/ephy-web-view.c:786
+#: ../embed/ephy-web-view.c:761
 #, c-format
 msgid ""
 "<big>Would you like to store the password for <b>%s</b> in <b>%s</b>?</big>"
 msgstr "<big>是否要儲存 <b>%s</b> 在 <b>%s</b> 的密碼？</big>"
 
-#: ../embed/ephy-web-view.c:1133
+#: ../embed/ephy-web-view.c:1111
 msgid "Plugins"
 msgstr "外掛程式"
 
 #. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1784
+#: ../embed/ephy-web-view.c:1957
 msgid "Deny"
 msgstr "禁止"
 
 #. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1790
+#: ../embed/ephy-web-view.c:1963
 msgid "Allow"
 msgstr "允許"
 
-#: ../embed/ephy-web-view.c:1797
+#: ../embed/ephy-web-view.c:1974
 #, c-format
 msgid "The page at <b>%s</b> wants to know your location."
 msgstr "在 <b>%s</b> 的網頁想要知道您的位置。"
 
-#: ../embed/ephy-web-view.c:2118
+#: ../embed/ephy-web-view.c:2457
 msgid "None specified"
 msgstr "沒有指定"
 
-#: ../embed/ephy-web-view.c:2127 ../embed/ephy-web-view.c:2145
+#: ../embed/ephy-web-view.c:2466 ../embed/ephy-web-view.c:2484
 #, c-format
 msgid "Oops! Error loading %s"
 msgstr "噢！載入 %s 時發生錯誤"
 
-#: ../embed/ephy-web-view.c:2129
+#: ../embed/ephy-web-view.c:2468
 msgid "Oops! It was not possible to show this website"
 msgstr "噢！無法顯示這個網站"
 
-#: ../embed/ephy-web-view.c:2130
+#: ../embed/ephy-web-view.c:2469
 #, c-format
 msgid ""
 "<p>The website at <strong>%s</strong> seems to be unavailable. The precise "
@@ -515,15 +861,15 @@ msgstr ""
 "em></p><p>它可能被暫時關閉或移動到新的位址。不要忘了檢查網際網路連線是否正常"
 "運作。</p>"
 
-#: ../embed/ephy-web-view.c:2139
+#: ../embed/ephy-web-view.c:2478
 msgid "Try again"
 msgstr "再試一次"
 
-#: ../embed/ephy-web-view.c:2147
+#: ../embed/ephy-web-view.c:2486
 msgid "Oops! This site might have caused the web browser to close unexpectedly"
 msgstr "噢！這個網站可能已造成網頁瀏覽器未預期的關閉"
 
-#: ../embed/ephy-web-view.c:2149
+#: ../embed/ephy-web-view.c:2488
 #, c-format
 msgid ""
 "<p>This page was loading when the web browser closed unexpectedly.</"
@@ -534,29 +880,29 @@ msgstr ""
 "再度發生這個狀況。如果真的這樣，請將問題回報給 <strong>%s</strong> 開發團隊。"
 "</p>"
 
-#: ../embed/ephy-web-view.c:2157
+#: ../embed/ephy-web-view.c:2496
 msgid "Load again anyway"
 msgstr "强制再次載入"
 
-#: ../embed/ephy-web-view.c:2428
+#: ../embed/ephy-web-view.c:2887
 #, c-format
 msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"
 msgstr "http://www.google.com.tw/search?q=%s&ie=UTF-8&oe=UTF-8"
 
 #. translators: %s here is the address of the web page
-#: ../embed/ephy-web-view.c:2773
+#: ../embed/ephy-web-view.c:3181
 #, c-format
 msgid "Loading “%s”…"
 msgstr "正在載入“%s”…"
 
-#: ../embed/ephy-web-view.c:2775
+#: ../embed/ephy-web-view.c:3183
 msgid "Loading…"
 msgstr "載入中…"
 
 #. Translators: this is the directory name to store auxilary files
 #. * when saving html files.
 #.
-#: ../embed/ephy-web-view.c:3645
+#: ../embed/ephy-web-view.c:3910
 #, c-format
 msgid "%s Files"
 msgstr "%s 個檔案"
@@ -613,26 +959,26 @@ msgid "All files"
 msgstr "所有檔案"
 
 #. If we don't have XDG user dirs info, return an educated guess.
-#: ../lib/ephy-file-helpers.c:116 ../src/prefs-dialog.ui.h:10
+#: ../lib/ephy-file-helpers.c:116 ../src/resources/prefs-dialog.ui.h:4
 msgid "Downloads"
 msgstr "下載"
 
 #. If we don't have XDG user dirs info, return an educated guess.
-#: ../lib/ephy-file-helpers.c:162
+#: ../lib/ephy-file-helpers.c:169
 msgid "Desktop"
 msgstr "桌面"
 
-#: ../lib/ephy-file-helpers.c:326
+#: ../lib/ephy-file-helpers.c:330
 #, c-format
 msgid "Could not create a temporary directory in “%s”."
 msgstr "無法在“%s”建立暫存目錄。"
 
-#: ../lib/ephy-file-helpers.c:422
+#: ../lib/ephy-file-helpers.c:430
 #, c-format
 msgid "The file “%s” exists. Please move it out of the way."
 msgstr "檔案“%s” 已經存在，請先將它移至其它位置。"
 
-#: ../lib/ephy-file-helpers.c:433
+#: ../lib/ephy-file-helpers.c:441
 #, c-format
 msgid "Failed to create directory “%s”."
 msgstr "無法建立目錄“%s”。"
@@ -683,10 +1029,30 @@ msgstr ""
 "在前一版本 (Gecko) 中所儲存的密碼都使用主控密碼鎖定了。如果您想要 Epiphany 匯"
 "入它們，請在下面輸入您的主控密碼。"
 
-#: ../lib/ephy-profile-migrator.c:82
+#: ../lib/ephy-profile-migrator.c:89
 msgid "Failed to copy cookies file from Mozilla."
 msgstr "從 Mozilla 複製 cookies 檔案失敗。"
 
+#: ../lib/ephy-profile-migrator.c:641
+msgid ""
+"Epiphany 3.6 deprecated this directory and tried migrating this "
+"configuration to ~/.config/epiphany"
+msgstr ""
+
+#: ../lib/ephy-profile-migrator.c:831
+msgid "Executes only the n-th migration step"
+msgstr ""
+
+#: ../lib/ephy-profile-migrator.c:845
+#, fuzzy
+#| msgid "Epiphany Web Browser"
+msgid "Epiphany profile migrator"
+msgstr "Epiphany 網頁瀏覽器"
+
+#: ../lib/ephy-profile-migrator.c:846
+msgid "Epiphany profile migrator options"
+msgstr ""
+
 #. Translators: "friendly time" string for the current day, strftime format. like "Today 12:34 am"
 #: ../lib/ephy-time-helpers.c:223
 msgid "Today %I:%M %p"
@@ -769,57 +1135,59 @@ msgstr "其它"
 msgid "Local files"
 msgstr "本機檔案"
 
-#: ../lib/widgets/ephy-download-widget.c:88
+#: ../lib/widgets/ephy-download-widget.c:119
 #, c-format
 msgid "%u:%02u hour left"
 msgid_plural "%u:%02u hours left"
 msgstr[0] "剩餘 %u:%02u 小時"
 
-#: ../lib/widgets/ephy-download-widget.c:90
+#: ../lib/widgets/ephy-download-widget.c:121
 #, c-format
 msgid "%u hour left"
 msgid_plural "%u hours left"
 msgstr[0] "剩餘 %u 小時"
 
-#: ../lib/widgets/ephy-download-widget.c:93
+#: ../lib/widgets/ephy-download-widget.c:124
 #, c-format
 msgid "%u:%02u minute left"
 msgid_plural "%u:%02u minutes left"
 msgstr[0] "剩餘 %u:%02u 分鐘"
 
-#: ../lib/widgets/ephy-download-widget.c:95
+#: ../lib/widgets/ephy-download-widget.c:126
 #, c-format
 msgid "%u second left"
 msgid_plural "%u seconds left"
 msgstr[0] "剩餘 %u 秒鐘"
 
-#: ../lib/widgets/ephy-download-widget.c:164
+#: ../lib/widgets/ephy-download-widget.c:296
+#: ../lib/widgets/ephy-download-widget.c:313
 msgid "Finished"
 msgstr "已完成"
 
-#: ../lib/widgets/ephy-download-widget.c:203
+#: ../lib/widgets/ephy-download-widget.c:328
+#: ../lib/widgets/ephy-download-widget.c:346
 #, c-format
 msgid "Error downloading: %s"
 msgstr "下載時發生錯誤：%s"
 
-#: ../lib/widgets/ephy-download-widget.c:271 ../src/window-commands.c:482
+#: ../lib/widgets/ephy-download-widget.c:414 ../src/window-commands.c:542
 msgid "Cancel"
 msgstr "取消"
 
-#: ../lib/widgets/ephy-download-widget.c:280 ../src/ephy-window.c:1311
-#: ../src/window-commands.c:263
+#: ../lib/widgets/ephy-download-widget.c:423 ../src/ephy-window.c:1348
+#: ../src/window-commands.c:268
 msgid "Open"
 msgstr "開啟"
 
-#: ../lib/widgets/ephy-download-widget.c:286
+#: ../lib/widgets/ephy-download-widget.c:429
 msgid "Show in folder"
 msgstr "在資料夾顯示"
 
-#: ../lib/widgets/ephy-download-widget.c:462
+#: ../lib/widgets/ephy-download-widget.c:628
 msgid "Starting…"
 msgstr "正在開始…"
 
-#: ../lib/widgets/ephy-hosts-store.c:230
+#: ../lib/widgets/ephy-hosts-store.c:262
 msgid "All sites"
 msgstr "所有網站"
 
@@ -831,12 +1199,13 @@ msgstr "網站"
 #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
 #. * Select All, Input Methods and Insert Unicode control character.)
 #.
-#: ../lib/widgets/ephy-location-entry.c:462 ../src/ephy-history-window.c:230
-#: ../src/pdm-dialog.c:352 ../src/prefs-dialog.ui.h:7
+#: ../lib/widgets/ephy-location-entry.c:594
+#: ../src/resources/prefs-dialog.ui.h:34 ../src/ephy-history-window.c:231
+#: ../src/pdm-dialog.c:365
 msgid "Cl_ear"
 msgstr "清除(_E)"
 
-#: ../lib/widgets/ephy-location-entry.c:742
+#: ../lib/widgets/ephy-location-entry.c:874
 msgid "Drag and drop this icon to create a link to this page"
 msgstr "拖放這個圖示來建立連至該網頁的連結"
 
@@ -845,13 +1214,13 @@ msgid "Clear"
 msgstr "清除"
 
 #: ../lib/widgets/ephy-urls-view.c:43
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1662
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1681
 msgid "Title"
 msgstr "標題"
 
 #: ../lib/widgets/ephy-urls-view.c:51
 #: ../src/bookmarks/ephy-bookmarks-editor.c:213
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1673
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1692
 msgid "Address"
 msgstr "地址"
 
@@ -926,26 +1295,26 @@ msgid "Work"
 msgstr "工作"
 
 #. Translators: this topic contains all bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:951
+#: ../src/bookmarks/ephy-bookmarks.c:960
 msgctxt "bookmarks"
 msgid "All"
 msgstr "全部"
 
 #. Translators: this topic contains the not categorized
 #. bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:955
+#: ../src/bookmarks/ephy-bookmarks.c:964
 msgctxt "bookmarks"
 msgid "Not Categorized"
 msgstr "未分類"
 
 #. Translators: this is an automatic topic containing local
 #. * websites bookmarks autodiscovered with zeroconf.
-#: ../src/bookmarks/ephy-bookmarks.c:960
+#: ../src/bookmarks/ephy-bookmarks.c:969
 msgctxt "bookmarks"
 msgid "Nearby Sites"
 msgstr "本地網站"
 
-#: ../src/bookmarks/ephy-bookmarks.c:1179
+#: ../src/bookmarks/ephy-bookmarks.c:1192
 #: ../src/bookmarks/ephy-bookmarks-import.c:271
 msgid "Untitled"
 msgstr "未命名"
@@ -964,22 +1333,22 @@ msgstr "從本主題中刪除"
 
 #. Toplevel
 #: ../src/bookmarks/ephy-bookmarks-editor.c:152
-#: ../src/ephy-history-window.c:128
+#: ../src/ephy-history-window.c:129
 msgid "_File"
 msgstr "檔案(_F)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:153
-#: ../src/ephy-history-window.c:129
+#: ../src/ephy-history-window.c:130
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:154
-#: ../src/ephy-history-window.c:130
+#: ../src/ephy-history-window.c:131
 msgid "_View"
 msgstr "顯示(_V)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:155
-#: ../src/ephy-history-window.c:131
+#: ../src/ephy-history-window.c:132
 msgid "_Help"
 msgstr "求助(_H)"
 
@@ -994,8 +1363,8 @@ msgstr "建立新的主題"
 
 #. File Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:162
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1161
-#: ../src/ephy-history-window.c:135 ../src/ephy-history-window.c:638
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1159
+#: ../src/ephy-history-window.c:136 ../src/ephy-history-window.c:639
 msgid "Open in New _Window"
 msgid_plural "Open in New _Windows"
 msgstr[0] "在新的視窗中開啟(_W)"
@@ -1005,8 +1374,8 @@ msgid "Open the selected bookmark in a new window"
 msgstr "在新的視窗中開啟已選的書籤"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:165
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1164
-#: ../src/ephy-history-window.c:138 ../src/ephy-history-window.c:641
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1162
+#: ../src/ephy-history-window.c:139 ../src/ephy-history-window.c:642
 msgid "Open in New _Tab"
 msgid_plural "Open in New _Tabs"
 msgstr[0] "在新的分頁中開啟(_T)"
@@ -1048,7 +1417,7 @@ msgid "Export bookmarks to a file"
 msgstr "將書籤匯出到檔案"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:179
-#: ../src/ephy-history-window.c:144 ../src/ephy-window.c:106
+#: ../src/ephy-history-window.c:145 ../src/ephy-window.c:110
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -1058,39 +1427,39 @@ msgstr "關閉書籤視窗"
 
 #. Edit Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:184
-#: ../src/ephy-history-window.c:149 ../src/ephy-window.c:115
+#: ../src/ephy-history-window.c:150 ../src/ephy-window.c:119
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:185
-#: ../src/ephy-history-window.c:150
+#: ../src/ephy-history-window.c:151
 msgid "Cut the selection"
 msgstr "剪下選定的內容"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:187
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1174
-#: ../src/ephy-history-window.c:152 ../src/ephy-history-window.c:651
-#: ../src/ephy-window.c:117
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1172
+#: ../src/ephy-history-window.c:153 ../src/ephy-history-window.c:652
+#: ../src/ephy-window.c:121
 msgid "_Copy"
 msgstr "複製(_C)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:188
-#: ../src/ephy-history-window.c:153
+#: ../src/ephy-history-window.c:154
 msgid "Copy the selection"
 msgstr "複製選定的內容"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:190
-#: ../src/ephy-history-window.c:155 ../src/ephy-window.c:119
+#: ../src/ephy-history-window.c:156 ../src/ephy-window.c:123
 msgid "_Paste"
 msgstr "貼上(_P)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:191
-#: ../src/ephy-history-window.c:156
+#: ../src/ephy-history-window.c:157
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿中的內容"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:193
-#: ../src/ephy-history-window.c:158
+#: ../src/ephy-history-window.c:159
 msgid "_Delete"
 msgstr "刪除(_D)"
 
@@ -1099,7 +1468,7 @@ msgid "Delete the selected bookmark or topic"
 msgstr "刪除已選的書籤或主題"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:196
-#: ../src/ephy-history-window.c:161 ../src/ephy-window.c:123
+#: ../src/ephy-history-window.c:162 ../src/ephy-window.c:127
 msgid "Select _All"
 msgstr "全部選取(_A)"
 
@@ -1109,7 +1478,7 @@ msgstr "選取所有書籤或文字"
 
 #. Help Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:201
-#: ../src/ephy-history-window.c:169
+#: ../src/ephy-history-window.c:170
 msgid "_Contents"
 msgstr "內容(_C)"
 
@@ -1118,28 +1487,29 @@ msgid "Display bookmarks help"
 msgstr "顯示書籤說明文件"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:204
-#: ../src/ephy-history-window.c:172
+#: ../src/resources/epiphany-application-menu.ui.h:6
+#: ../src/ephy-history-window.c:173
 msgid "_About"
 msgstr "關於(_A)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:205
-#: ../src/ephy-history-window.c:173
+#: ../src/ephy-history-window.c:174
 msgid "Display credits for the web browser creators"
 msgstr "鳴謝所有這個網頁瀏覽器的創作者"
 
 #. View Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:211
-#: ../src/ephy-history-window.c:187
+#: ../src/ephy-history-window.c:188
 msgid "_Title"
 msgstr "標題(_T)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:212
-#: ../src/ephy-history-window.c:188
+#: ../src/ephy-history-window.c:189
 msgid "Show the title column"
 msgstr "顯示標題欄位"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:214
-#: ../src/ephy-history-window.c:190
+#: ../src/ephy-history-window.c:191
 msgid "Show the address column"
 msgstr "顯示位址欄位"
 
@@ -1229,7 +1599,7 @@ msgid "Export Bookmarks"
 msgstr "匯出書籤"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:763
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1536
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1555
 #: ../src/bookmarks/ephy-topic-action.c:217
 msgid "Bookmarks"
 msgstr "書籤"
@@ -1255,17 +1625,17 @@ msgstr "匯入書籤的來源："
 msgid "File"
 msgstr "檔案"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1170
-#: ../src/ephy-history-window.c:647
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1168
+#: ../src/ephy-history-window.c:648
 msgid "_Copy Address"
 msgstr "複製位址(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1411
-#: ../src/ephy-history-window.c:800
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1409
+#: ../src/ephy-history-window.c:801
 msgid "_Search:"
 msgstr "搜尋(_S)："
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1592
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1611
 msgid "Topics"
 msgstr "主題"
 
@@ -1283,6 +1653,220 @@ msgstr "在新的分頁中開啟本主日題的書籤"
 msgid "Create topic “%s”"
 msgstr "建立主題“%s”"
 
+#: ../src/resources/epiphany-application-menu.ui.h:1
+msgid "_New Window"
+msgstr "新視窗(_N)"
+
+#. Toplevel
+#: ../src/resources/epiphany-application-menu.ui.h:2 ../src/ephy-window.c:92
+msgid "_Bookmarks"
+msgstr "書籤(_B)"
+
+#: ../src/resources/epiphany-application-menu.ui.h:3
+msgid "_History"
+msgstr "瀏覽記錄(_H)"
+
+#: ../src/resources/epiphany-application-menu.ui.h:4
+#: ../src/resources/prefs-dialog.ui.h:3
+msgid "Preferences"
+msgstr "偏好設定"
+
+#: ../src/resources/epiphany-application-menu.ui.h:5
+#: ../src/resources/epiphany.ui.h:10
+msgid "Personal Data"
+msgstr "個人資料"
+
+#: ../src/resources/epiphany-application-menu.ui.h:7
+msgid "_Quit"
+msgstr "結束(_Q)"
+
+#: ../src/resources/epiphany.ui.h:1
+msgid "Cookie properties"
+msgstr "Cookie 屬性"
+
+#: ../src/resources/epiphany.ui.h:2
+msgid "Content:"
+msgstr "內容"
+
+#: ../src/resources/epiphany.ui.h:3
+msgid "Path:"
+msgstr "路徑："
+
+#: ../src/resources/epiphany.ui.h:4
+msgid "Send for:"
+msgstr "傳送給："
+
+#: ../src/resources/epiphany.ui.h:5
+msgid "Expires:"
+msgstr "時限："
+
+#: ../src/resources/epiphany.ui.h:6
+msgid "Text Encoding"
+msgstr "字元編碼"
+
+#: ../src/resources/epiphany.ui.h:7
+msgid "<b>_Automatic</b>"
+msgstr "<b>自動(_A)：</b>"
+
+#: ../src/resources/epiphany.ui.h:8 ../src/ephy-encoding-menu.c:355
+msgid "Use the encoding specified by the document"
+msgstr "使用文件指定的編碼方式"
+
+#: ../src/resources/epiphany.ui.h:9
+msgid "<b>_Use a different encoding:</b>"
+msgstr "使用不同的編碼(_U)："
+
+#: ../src/resources/epiphany.ui.h:11 ../src/resources/prefs-dialog.ui.h:21
+msgid "Cookies"
+msgstr "Cookie"
+
+#: ../src/resources/epiphany.ui.h:12
+msgid "_Show passwords"
+msgstr "顯示密碼(_S)"
+
+#: ../src/resources/epiphany.ui.h:13 ../src/resources/prefs-dialog.ui.h:29
+msgid "Passwords"
+msgstr "密碼"
+
+#: ../src/resources/prefs-dialog.ui.h:1
+msgid "Add Language"
+msgstr "增加語言"
+
+#: ../src/resources/prefs-dialog.ui.h:2
+msgid "Choose a l_anguage:"
+msgstr "選擇語言(_A)："
+
+#: ../src/resources/prefs-dialog.ui.h:5
+msgid "_Download folder:"
+msgstr "下載資料夾(_D)"
+
+#: ../src/resources/prefs-dialog.ui.h:6
+msgid "A_utomatically open downloaded files"
+msgstr "自動下載並開啟檔案(_U)"
+
+#: ../src/resources/prefs-dialog.ui.h:7
+msgid "General"
+msgstr "一般"
+
+#: ../src/resources/prefs-dialog.ui.h:8
+msgid "Fonts"
+msgstr "字型"
+
+#: ../src/resources/prefs-dialog.ui.h:9
+msgid "_Use system fonts"
+msgstr "使用系統字型(_U)"
+
+#: ../src/resources/prefs-dialog.ui.h:10
+msgid "Sans serif font:"
+msgstr "無襯線字型："
+
+#: ../src/resources/prefs-dialog.ui.h:11
+msgid "Serif font:"
+msgstr "襯線字型："
+
+#: ../src/resources/prefs-dialog.ui.h:12
+msgid "Monospace font:"
+msgstr "等寬字型："
+
+#: ../src/resources/prefs-dialog.ui.h:13
+msgid "Style"
+msgstr "樣式"
+
+#: ../src/resources/prefs-dialog.ui.h:14
+msgid "Use custom _stylesheet"
+msgstr "使用自訂樣式表(_S)"
+
+#: ../src/resources/prefs-dialog.ui.h:15
+msgid "_Edit Stylesheet…"
+msgstr "編輯樣式表(_E)…"
+
+#: ../src/resources/prefs-dialog.ui.h:16
+msgid "Fonts & Style"
+msgstr "字型與樣式"
+
+#: ../src/resources/prefs-dialog.ui.h:17
+msgid "Web Content"
+msgstr "網頁內容"
+
+#: ../src/resources/prefs-dialog.ui.h:18
+msgid "Allow popup _windows"
+msgstr "允許彈出式視窗(_W)"
+
+#: ../src/resources/prefs-dialog.ui.h:19
+msgid "Enable _plugins"
+msgstr "啟用外掛程式(_P)"
+
+#: ../src/resources/prefs-dialog.ui.h:20
+msgid "Enable Java_Script"
+msgstr "啟用 Java_Script"
+
+#: ../src/resources/prefs-dialog.ui.h:22
+msgid "_Always accept"
+msgstr "總是接受(_A)"
+
+#: ../src/resources/prefs-dialog.ui.h:23
+msgid "Only _from sites you visit"
+msgstr "只來自您瀏覽的網站(_F)"
+
+#. Refers to "Only from sites you visit" option under Cookies.
+#: ../src/resources/prefs-dialog.ui.h:25
+msgid "<small>For example, not from advertisers on these sites</small>"
+msgstr "<small>例如，不要來自這些網站的廣告</small>"
+
+#: ../src/resources/prefs-dialog.ui.h:26
+msgid "_Never accept"
+msgstr "永不接受(_N)"
+
+#: ../src/resources/prefs-dialog.ui.h:27
+#, fuzzy
+msgid "Tracking"
+msgstr "跟蹤"
+
+#: ../src/resources/prefs-dialog.ui.h:28
+#, fuzzy
+msgid "_Tell web sites I do not want to be tracked"
+msgstr "告訴網站我不想被跟蹤(_T)"
+
+#: ../src/resources/prefs-dialog.ui.h:30
+msgid "_Remember passwords"
+msgstr "記錄密碼(_R)"
+
+#: ../src/resources/prefs-dialog.ui.h:31
+msgid "Temporary Files"
+msgstr "暫存檔"
+
+#: ../src/resources/prefs-dialog.ui.h:32
+msgid "_Disk space:"
+msgstr "磁碟空間(_D)："
+
+#: ../src/resources/prefs-dialog.ui.h:33
+msgid "MB"
+msgstr "MB"
+
+#: ../src/resources/prefs-dialog.ui.h:35
+msgid "Privacy"
+msgstr "隱私"
+
+#: ../src/resources/prefs-dialog.ui.h:36 ../src/ephy-encoding-dialog.c:318
+msgid "Encodings"
+msgstr "編碼"
+
+#: ../src/resources/prefs-dialog.ui.h:37
+msgid "De_fault:"
+msgstr "預設(_F)："
+
+#: ../src/resources/prefs-dialog.ui.h:39
+msgid "Spell checking"
+msgstr "拼字檢查"
+
+#: ../src/resources/prefs-dialog.ui.h:40
+msgid "_Enable spell checking"
+msgstr "啟用拼字檢查(_E)"
+
+#: ../src/resources/prefs-dialog.ui.h:41 ../src/prefs-dialog.c:773
+msgid "Language"
+msgstr "語言"
+
 #: ../src/ephy-combined-stop-reload-action.c:41
 msgid "Stop"
 msgstr "停止"
@@ -1291,7 +1875,7 @@ msgstr "停止"
 msgid "Stop current data transfer"
 msgstr "停止傳送目前的資料"
 
-#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:138
+#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:142
 msgid "_Reload"
 msgstr "重新載入(_R)"
 
@@ -1299,217 +1883,204 @@ msgstr "重新載入(_R)"
 msgid "Display the latest content of the current page"
 msgstr "顯示本頁的最新內容"
 
-#: ../src/ephy-encoding-dialog.c:301 ../src/prefs-dialog.ui.h:13
-msgid "Encodings"
-msgstr "編碼"
-
-#: ../src/ephy-encoding-menu.c:330
+#: ../src/ephy-encoding-menu.c:347
 msgid "_Other…"
 msgstr "其它(_O)…"
 
-#: ../src/ephy-encoding-menu.c:331
+#: ../src/ephy-encoding-menu.c:348
 msgid "Other encodings"
 msgstr "其他字元編碼方式"
 
-#: ../src/ephy-encoding-menu.c:337
+#: ../src/ephy-encoding-menu.c:354
 msgid "_Automatic"
 msgstr "自動(_A)"
 
-#: ../src/ephy-encoding-menu.c:338 ../src/epiphany.ui.h:12
-msgid "Use the encoding specified by the document"
-msgstr "使用文件指定的編碼方式"
-
-#: ../src/ephy-find-toolbar.c:153
+#: ../src/ephy-find-toolbar.c:168
 msgid "Not found"
 msgstr "找不到字串"
 
-#: ../src/ephy-find-toolbar.c:165
+#: ../src/ephy-find-toolbar.c:180
 msgid "Wrapped"
 msgstr "回到檔案開始部份再搜尋"
 
-#: ../src/ephy-find-toolbar.c:185
+#: ../src/ephy-find-toolbar.c:200
 msgid "Find links:"
 msgstr "尋找連結："
 
-#: ../src/ephy-find-toolbar.c:185
+#: ../src/ephy-find-toolbar.c:200
 msgid "Find:"
 msgstr "尋找："
 
 #. Create a menu item, and sync it
 #. Case sensitivity
-#: ../src/ephy-find-toolbar.c:459 ../src/ephy-find-toolbar.c:582
+#: ../src/ephy-find-toolbar.c:540 ../src/ephy-find-toolbar.c:663
 msgid "_Case sensitive"
 msgstr "區分大小寫(_C)"
 
-#: ../src/ephy-find-toolbar.c:565
+#: ../src/ephy-find-toolbar.c:646
 msgid "Find Previous"
 msgstr "找上一個"
 
-#: ../src/ephy-find-toolbar.c:568
+#: ../src/ephy-find-toolbar.c:649
 msgid "Find previous occurrence of the search string"
 msgstr "尋找上一個出現搜尋字串的地方"
 
-#: ../src/ephy-find-toolbar.c:574
+#: ../src/ephy-find-toolbar.c:655
 msgid "Find Next"
 msgstr "找下一個"
 
-#: ../src/ephy-find-toolbar.c:577
+#: ../src/ephy-find-toolbar.c:658
 msgid "Find next occurrence of the search string"
 msgstr "尋找下一個出現搜尋字串的地方"
 
-#. exit button
-#: ../src/ephy-fullscreen-popup.c:232
-msgid "Leave Fullscreen"
-msgstr "離開全螢幕"
-
-#: ../src/ephy-history-window.c:136
+#: ../src/ephy-history-window.c:137
 msgid "Open the selected history link in a new window"
 msgstr "在新的視窗中開啟已選的瀏覽記錄連結"
 
-#: ../src/ephy-history-window.c:139
+#: ../src/ephy-history-window.c:140
 msgid "Open the selected history link in a new tab"
 msgstr "在新的分頁中開啟已選的瀏覽記錄連結"
 
-#: ../src/ephy-history-window.c:141
+#: ../src/ephy-history-window.c:142
 msgid "Add _Bookmark…"
 msgstr "加入書籤(_B)…"
 
-#: ../src/ephy-history-window.c:142
+#: ../src/ephy-history-window.c:143
 msgid "Bookmark the selected history link"
 msgstr "將已選的瀏覽記錄連結加入至書籤"
 
-#: ../src/ephy-history-window.c:145
+#: ../src/ephy-history-window.c:146
 msgid "Close the history window"
 msgstr "關閉瀏覽記錄視窗"
 
-#: ../src/ephy-history-window.c:159
+#: ../src/ephy-history-window.c:160
 msgid "Delete the selected history link"
 msgstr "刪除已選的瀏覽記錄連結"
 
-#: ../src/ephy-history-window.c:162
+#: ../src/ephy-history-window.c:163
 msgid "Select all history links or text"
 msgstr "選取所有瀏覽記錄連結或文字"
 
-#: ../src/ephy-history-window.c:164
+#: ../src/ephy-history-window.c:165
 msgid "Clear _History"
 msgstr "清除瀏覽記錄(_H)"
 
-#: ../src/ephy-history-window.c:165
+#: ../src/ephy-history-window.c:166
 msgid "Clear your browsing history"
 msgstr "清除瀏覽記錄"
 
-#: ../src/ephy-history-window.c:170
+#: ../src/ephy-history-window.c:171
 msgid "Display history help"
 msgstr "顯示瀏覽記錄說明文件"
 
-#: ../src/ephy-history-window.c:189
+#: ../src/ephy-history-window.c:190
 msgid "_Address"
 msgstr "位址(_A)"
 
-#: ../src/ephy-history-window.c:191
+#: ../src/ephy-history-window.c:192
 msgid "_Date and Time"
 msgstr "日期和時刻(_D)"
 
-#: ../src/ephy-history-window.c:192
+#: ../src/ephy-history-window.c:193
 msgid "Show the date and time column"
 msgstr "顯示日期及時刻欄位"
 
-#: ../src/ephy-history-window.c:220
+#: ../src/ephy-history-window.c:221
 msgid "Clear browsing history?"
 msgstr "是否清除瀏覽記錄？"
 
-#: ../src/ephy-history-window.c:224
+#: ../src/ephy-history-window.c:225
 msgid ""
 "Clearing the browsing history will cause all history links to be permanently "
 "deleted."
 msgstr "清除瀏覽記錄將會使所有瀏覽記錄永遠被刪除。"
 
-#: ../src/ephy-history-window.c:239
+#: ../src/ephy-history-window.c:240
 msgid "Clear History"
 msgstr "清除瀏覽記錄"
 
-#: ../src/ephy-history-window.c:809
+#: ../src/ephy-history-window.c:810
 msgid "Last 30 minutes"
 msgstr "前 30 分鐘"
 
-#: ../src/ephy-history-window.c:810
+#: ../src/ephy-history-window.c:811
 msgid "Today"
 msgstr "今日"
 
 #. keep this in sync with embed/ephy-history.c's
 #. * HISTORY_PAGE_OBSOLETE_DAYS
-#: ../src/ephy-history-window.c:812 ../src/ephy-history-window.c:816
-#: ../src/ephy-history-window.c:822
+#: ../src/ephy-history-window.c:813 ../src/ephy-history-window.c:817
+#: ../src/ephy-history-window.c:823
 #, c-format
 msgid "Last %d day"
 msgid_plural "Last %d days"
 msgstr[0] "最近 %d 日"
 
-#: ../src/ephy-history-window.c:826
+#: ../src/ephy-history-window.c:827
 msgid "All history"
 msgstr "所有瀏覽記錄"
 
-#: ../src/ephy-history-window.c:1123
+#: ../src/ephy-history-window.c:1128
 msgid "History"
 msgstr "瀏覽記錄"
 
-#: ../src/ephy-main.c:82
+#: ../src/ephy-main.c:84
 msgid "Open a new tab in an existing browser window"
 msgstr "在現有的瀏覽器視窗中開啟新的分頁"
 
-#: ../src/ephy-main.c:84
+#: ../src/ephy-main.c:86
 msgid "Open a new browser window"
 msgstr "開啟新的瀏覽器視窗"
 
-#: ../src/ephy-main.c:86
+#: ../src/ephy-main.c:88
 msgid "Launch the bookmarks editor"
 msgstr "啟動書籤編輯器"
 
-#: ../src/ephy-main.c:88
+#: ../src/ephy-main.c:90
 msgid "Import bookmarks from the given file"
 msgstr "從所指定的檔案匯入書籤"
 
-#: ../src/ephy-main.c:88 ../src/ephy-main.c:90
+#: ../src/ephy-main.c:90 ../src/ephy-main.c:92
 msgid "FILE"
 msgstr "檔案"
 
-#: ../src/ephy-main.c:90
+#: ../src/ephy-main.c:92
 msgid "Load the given session file"
 msgstr "載入指定的作業階段檔案"
 
-#: ../src/ephy-main.c:92
+#: ../src/ephy-main.c:94
 msgid "Add a bookmark"
 msgstr "加入書籤"
 
-#: ../src/ephy-main.c:92
+#: ../src/ephy-main.c:94
 msgid "URL"
 msgstr "URL"
 
-#: ../src/ephy-main.c:94
+#: ../src/ephy-main.c:96
 msgid "Start a private instance"
 msgstr "啟動私密實體"
 
-#: ../src/ephy-main.c:96
+#: ../src/ephy-main.c:98
 msgid "Start the browser in application mode"
 msgstr "以應用程式模式啟動瀏覽器"
 
-#: ../src/ephy-main.c:98
+#: ../src/ephy-main.c:100
 msgid "Profile directory to use in the private instance"
 msgstr "在私密實體中使用的設定組合目錄"
 
-#: ../src/ephy-main.c:98
+#: ../src/ephy-main.c:100
 msgid "DIR"
 msgstr "DIR"
 
-#: ../src/ephy-main.c:100
+#: ../src/ephy-main.c:102
 msgid "URL …"
 msgstr "URL…"
 
-#: ../src/ephy-main.c:208
+#: ../src/ephy-main.c:210
 msgid "Could not start Web"
 msgstr "無法啟動網頁"
 
-#: ../src/ephy-main.c:211
+#: ../src/ephy-main.c:213
 #, c-format
 msgid ""
 "Startup failed because of the following error:\n"
@@ -1518,330 +2089,277 @@ msgstr ""
 "由於以下原因，因此無法執行：\n"
 "%s"
 
-#: ../src/ephy-main.c:322
+#: ../src/ephy-main.c:325
 msgid "Web options"
 msgstr "網頁選項"
 
-#: ../src/ephy-notebook.c:592
+#: ../src/ephy-notebook.c:606
 msgid "Close tab"
 msgstr "關閉分頁"
 
-#. Toplevel
-#: ../src/ephy-window.c:88
-msgid "_Bookmarks"
-msgstr "書籤(_B)"
-
-#: ../src/ephy-window.c:92
+#: ../src/ephy-window.c:96
 msgid "_Extensions"
 msgstr "擴充功能(_E)"
 
 #. File actions.
-#: ../src/ephy-window.c:96
+#: ../src/ephy-window.c:100
 msgid "_Open…"
 msgstr "開啟(_O)…"
 
-#: ../src/ephy-window.c:98
+#: ../src/ephy-window.c:102
 msgid "Save _As…"
 msgstr "另存新檔(_A)…"
 
-#: ../src/ephy-window.c:100
+#: ../src/ephy-window.c:104
 msgid "Save As _Web Application…"
 msgstr "儲存為網頁應用程式(_W)…"
 
-#: ../src/ephy-window.c:102
+#: ../src/ephy-window.c:106
 msgid "_Print…"
 msgstr "列印(_P)…"
 
-#: ../src/ephy-window.c:104
+#: ../src/ephy-window.c:108
 msgid "S_end Link by Email…"
 msgstr "以電郵傳送連結(_E)…"
 
 #. Edit actions.
-#: ../src/ephy-window.c:111
+#: ../src/ephy-window.c:115
 msgid "_Undo"
 msgstr "復原(_U)"
 
-#: ../src/ephy-window.c:113
+#: ../src/ephy-window.c:117
 msgid "Re_do"
 msgstr "取消復原(_D)"
 
-#: ../src/ephy-window.c:125
+#: ../src/ephy-window.c:129
 msgid "_Find…"
 msgstr "尋找(_F)…"
 
-#: ../src/ephy-window.c:127
+#: ../src/ephy-window.c:131
 msgid "Find Ne_xt"
 msgstr "找下一個(_X)"
 
-#: ../src/ephy-window.c:129
+#: ../src/ephy-window.c:133
 msgid "Find Pre_vious"
 msgstr "找上一個(_V)"
 
 #. View actions.
-#: ../src/ephy-window.c:134 ../src/ephy-window.c:136
+#: ../src/ephy-window.c:138 ../src/ephy-window.c:140
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: ../src/ephy-window.c:140
+#: ../src/ephy-window.c:144
 msgid "_Larger Text"
 msgstr "放大字型(_L)"
 
-#: ../src/ephy-window.c:142
+#: ../src/ephy-window.c:146
 msgid "S_maller Text"
 msgstr "縮小字型(_M)"
 
-#: ../src/ephy-window.c:144
+#: ../src/ephy-window.c:148
 msgid "_Normal Size"
 msgstr "正常大小(_N)"
 
-#: ../src/ephy-window.c:146
+#: ../src/ephy-window.c:150
 msgid "Text _Encoding"
 msgstr "字元編碼(_E)"
 
-#: ../src/ephy-window.c:147
+#: ../src/ephy-window.c:151
 msgid "_Page Source"
 msgstr "網頁原始內容(_P)"
 
 #. Bookmarks actions.
-#: ../src/ephy-window.c:152
+#: ../src/ephy-window.c:156
 msgid "_Add Bookmark…"
 msgstr "加入書籤(_A)…"
 
 #. Go actions.
-#: ../src/ephy-window.c:157
+#: ../src/ephy-window.c:161
 msgid "_Location…"
 msgstr "位置(_L)…"
 
 #. Tabs actions.
-#: ../src/ephy-window.c:162
+#: ../src/ephy-window.c:166
 msgid "_Previous Tab"
 msgstr "上一個分頁(_P)"
 
-#: ../src/ephy-window.c:164
+#: ../src/ephy-window.c:168
 msgid "_Next Tab"
 msgstr "下一個分頁(_N)"
 
-#: ../src/ephy-window.c:166
+#: ../src/ephy-window.c:170
 msgid "Move Tab _Left"
 msgstr "分頁向左移(_L)"
 
-#: ../src/ephy-window.c:168
+#: ../src/ephy-window.c:172
 msgid "Move Tab _Right"
 msgstr "分頁向右移(_R)"
 
-#: ../src/ephy-window.c:170
+#: ../src/ephy-window.c:174
 msgid "_Detach Tab"
 msgstr "分離分頁(_D)"
 
 #. File actions.
-#: ../src/ephy-window.c:178
+#: ../src/ephy-window.c:182
 msgid "_Work Offline"
 msgstr "離線模式(_W)"
 
 #. View actions.
-#: ../src/ephy-window.c:183
+#: ../src/ephy-window.c:187
 msgid "_Downloads Bar"
 msgstr "下載列(_D)"
 
-#: ../src/ephy-window.c:186
+#: ../src/ephy-window.c:190
 msgid "_Fullscreen"
 msgstr "全螢幕(_F)"
 
-#: ../src/ephy-window.c:188
+#: ../src/ephy-window.c:192
 msgid "Popup _Windows"
 msgstr "彈出式視窗(_W)"
 
-#: ../src/ephy-window.c:190
+#: ../src/ephy-window.c:194
 msgid "Selection Caret"
 msgstr "選擇游標"
 
 #. Document.
-#: ../src/ephy-window.c:197
+#: ../src/ephy-window.c:201
 msgid "Add Boo_kmark…"
 msgstr "加入書籤(_K)…"
 
 #. Links.
-#: ../src/ephy-window.c:202
+#: ../src/ephy-window.c:206
 msgid "_Open Link"
 msgstr "開啟連結(_O)"
 
-#: ../src/ephy-window.c:204
+#: ../src/ephy-window.c:208
 msgid "Open Link in New _Window"
 msgstr "在新的視窗中開啟連結(_W)"
 
-#: ../src/ephy-window.c:206
+#: ../src/ephy-window.c:210
 msgid "Open Link in New _Tab"
 msgstr "在新的分頁中開啟連結(_T)"
 
-#: ../src/ephy-window.c:208
+#: ../src/ephy-window.c:212
 msgid "_Download Link"
 msgstr "下載連結(_D)"
 
-#: ../src/ephy-window.c:210
+#: ../src/ephy-window.c:214
 msgid "_Save Link As…"
 msgstr "另存連結(_S)…"
 
-#: ../src/ephy-window.c:212
+#: ../src/ephy-window.c:216
 msgid "_Bookmark Link…"
 msgstr "將連結加入書籤(_B)…"
 
-#: ../src/ephy-window.c:214
+#: ../src/ephy-window.c:218
 msgid "_Copy Link Address"
 msgstr "複製連結地址(_C)"
 
 #. Images.
-#: ../src/ephy-window.c:219
+#: ../src/ephy-window.c:223
 msgid "Open _Image"
 msgstr "開啟圖片(_I)"
 
-#: ../src/ephy-window.c:221
+#: ../src/ephy-window.c:225
 msgid "_Save Image As…"
 msgstr "另存圖片(_S)…"
 
-#: ../src/ephy-window.c:223
+#: ../src/ephy-window.c:227
 msgid "_Use Image As Background"
 msgstr "使用圖片作為桌面背景(_U)"
 
-#: ../src/ephy-window.c:225
+#: ../src/ephy-window.c:229
 msgid "Copy I_mage Address"
 msgstr "複製圖片地址(_M)"
 
-#: ../src/ephy-window.c:227
+#: ../src/ephy-window.c:231
 msgid "St_art Animation"
 msgstr "動畫開始(_A)"
 
-#: ../src/ephy-window.c:229
+#: ../src/ephy-window.c:233
 msgid "St_op Animation"
 msgstr "動畫停止(_O)"
 
 #. Inspector.
-#: ../src/ephy-window.c:245
+#: ../src/ephy-window.c:249
 msgid "Inspect _Element"
 msgstr "檢查元素(_E)"
 
-#: ../src/ephy-window.c:450
+#: ../src/ephy-window.c:454
 msgid "There are unsubmitted changes to form elements"
 msgstr "對表單的元素而言沒有經確認的改變"
 
-#: ../src/ephy-window.c:451
+#: ../src/ephy-window.c:455
 msgid "If you close the document anyway, you will lose that information."
 msgstr "如果您無論無何要關閉此文件，您將會失去未儲存的資訊。"
 
-#: ../src/ephy-window.c:453
+#: ../src/ephy-window.c:457
 msgid "Close _Document"
 msgstr "關閉文件(_D)"
 
-#: ../src/ephy-window.c:471
+#: ../src/ephy-window.c:475
 msgid "There are ongoing downloads in this window"
 msgstr "這個視窗還有進行中的下載"
 
-#: ../src/ephy-window.c:472
+#: ../src/ephy-window.c:476
 msgid "If you close this window, the downloads will be cancelled"
 msgstr "如果您關閉這個視窗，這個下載也會被取消"
 
-#: ../src/ephy-window.c:473
+#: ../src/ephy-window.c:477
 msgid "Close window and cancel downloads"
 msgstr "關閉視窗並取消下載"
 
-#: ../src/ephy-window.c:1313
+#: ../src/ephy-window.c:1350
 msgid "Save As"
 msgstr "另存新檔"
 
-#: ../src/ephy-window.c:1315
+#: ../src/ephy-window.c:1352
 msgid "Save As Application"
 msgstr "儲存為應用程式"
 
-#: ../src/ephy-window.c:1317
+#: ../src/ephy-window.c:1354
 msgid "Print"
 msgstr "列印"
 
-#: ../src/ephy-window.c:1319
+#: ../src/ephy-window.c:1356
 msgid "Bookmark"
 msgstr "加入書籤"
 
-#: ../src/ephy-window.c:1321
+#: ../src/ephy-window.c:1358
 msgid "Find"
 msgstr "尋找"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1330
+#: ../src/ephy-window.c:1367
 msgid "Larger"
 msgstr "放大"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1333
+#: ../src/ephy-window.c:1370
 msgid "Smaller"
 msgstr "縮小"
 
-#: ../src/ephy-window.c:1353
+#: ../src/ephy-window.c:1390
 msgid "Back"
 msgstr "上一頁"
 
-#: ../src/ephy-window.c:1365
+#: ../src/ephy-window.c:1402
 msgid "Forward"
 msgstr "下一頁"
 
-#: ../src/ephy-window.c:1377
+#: ../src/ephy-window.c:1414
 msgid "Zoom"
 msgstr "縮放"
 
-#: ../src/ephy-window.c:1385
+#: ../src/ephy-window.c:1422
 msgid "New _Tab"
 msgstr "新增分頁(_T)"
 
-#: ../src/epiphany.ui.h:1
-msgid "<b>_Automatic</b>"
-msgstr "<b>自動(_A)：</b>"
-
-#: ../src/epiphany.ui.h:2
-msgid "<b>_Use a different encoding:</b>"
-msgstr "使用不同的編碼(_U)："
-
-#: ../src/epiphany.ui.h:3
-msgid "Content:"
-msgstr "內容"
-
-#: ../src/epiphany.ui.h:4
-msgid "Cookie properties"
-msgstr "Cookie 屬性"
-
-#: ../src/epiphany.ui.h:5 ../src/prefs-dialog.ui.h:8
-msgid "Cookies"
-msgstr "Cookie"
-
-#: ../src/epiphany.ui.h:6
-msgid "Expires:"
-msgstr "時限："
-
-#: ../src/epiphany.ui.h:7 ../src/prefs-dialog.ui.h:22
-msgid "Passwords"
-msgstr "密碼"
-
-#: ../src/epiphany.ui.h:8
-msgid "Path:"
-msgstr "路徑："
-
-#: ../src/epiphany.ui.h:9
-msgid "Personal Data"
-msgstr "個人資料"
-
-#: ../src/epiphany.ui.h:10
-msgid "Send for:"
-msgstr "傳送給："
-
-#: ../src/epiphany.ui.h:11
-msgid "Text Encoding"
-msgstr "字元編碼"
-
-#: ../src/epiphany.ui.h:13
-msgid "_Show passwords"
-msgstr "顯示密碼(_S)"
-
-#: ../src/pdm-dialog.c:333
+#: ../src/pdm-dialog.c:346
 msgid "<b>Select the personal data you want to clear</b>"
 msgstr "<b>選擇想要清除的個人資料</b>"
 
-#: ../src/pdm-dialog.c:336
+#: ../src/pdm-dialog.c:349
 msgid ""
 "You are about to clear personal data that is stored about the web pages you "
 "have visited. Before proceeding, check the types of information that you "
@@ -1850,31 +2368,31 @@ msgstr ""
 "您想要清除的個人資料儲存了您所參訪過的網頁。在開始清除之前，請確定要移除哪些"
 "類型的資訊："
 
-#: ../src/pdm-dialog.c:341
+#: ../src/pdm-dialog.c:354
 msgid "Clear All Personal Data"
 msgstr "清除所有的個人資料"
 
 #. Cookies
-#: ../src/pdm-dialog.c:375
+#: ../src/pdm-dialog.c:388
 msgid "C_ookies"
 msgstr "C_ookies"
 
 #. Passwords
-#: ../src/pdm-dialog.c:387
+#: ../src/pdm-dialog.c:400
 msgid "Saved _passwords"
 msgstr "儲存的密碼(_P)"
 
 #. History
-#: ../src/pdm-dialog.c:399
+#: ../src/pdm-dialog.c:412
 msgid "Hi_story"
 msgstr "歷史記錄(_S)"
 
 #. Cache
-#: ../src/pdm-dialog.c:411
+#: ../src/pdm-dialog.c:424
 msgid "_Temporary files"
 msgstr "暫存檔案(_T)"
 
-#: ../src/pdm-dialog.c:427
+#: ../src/pdm-dialog.c:440
 msgid ""
 "<small><i><b>Note:</b> You cannot undo this action. The data you are "
 "choosing to clear will be deleted forever.</i></small>"
@@ -1882,48 +2400,48 @@ msgstr ""
 "<small><i><b>注意：</b>您不能復原這個動作。您所選擇的資料將被永遠刪除。</i></"
 "small>"
 
-#: ../src/pdm-dialog.c:646
+#: ../src/pdm-dialog.c:659
 msgid "Encrypted connections only"
 msgstr "只限加密後的連線"
 
-#: ../src/pdm-dialog.c:647
+#: ../src/pdm-dialog.c:660
 msgid "Any type of connection"
 msgstr "任何類型的連線"
 
 #. Session cookie
-#: ../src/pdm-dialog.c:652
+#: ../src/pdm-dialog.c:665
 msgid "End of current session"
 msgstr "結束目前的作業階段"
 
-#: ../src/pdm-dialog.c:771
+#: ../src/pdm-dialog.c:784
 msgid "Domain"
 msgstr "網域"
 
-#: ../src/pdm-dialog.c:783
+#: ../src/pdm-dialog.c:796
 msgid "Name"
 msgstr "名稱"
 
-#: ../src/pdm-dialog.c:1197
+#: ../src/pdm-dialog.c:1210
 msgid "Host"
 msgstr "主機"
 
-#: ../src/pdm-dialog.c:1210
+#: ../src/pdm-dialog.c:1223
 msgid "User Name"
 msgstr "使用者名稱"
 
-#: ../src/pdm-dialog.c:1223
+#: ../src/pdm-dialog.c:1236
 msgid "User Password"
 msgstr "使用者密碼"
 
-#: ../src/popup-commands.c:279
+#: ../src/popup-commands.c:287
 msgid "Download Link"
 msgstr "下載連結"
 
-#: ../src/popup-commands.c:287
+#: ../src/popup-commands.c:295
 msgid "Save Link As"
 msgstr "另存連結(_A)…"
 
-#: ../src/popup-commands.c:294
+#: ../src/popup-commands.c:302
 msgid "Save Image As"
 msgstr "另存圖片"
 
@@ -1952,186 +2470,53 @@ msgid "System language (%s)"
 msgid_plural "System languages (%s)"
 msgstr[0] "系統語言 (%s)"
 
-#: ../src/prefs-dialog.c:773 ../src/prefs-dialog.ui.h:17
-msgid "Language"
-msgstr "語言"
-
 #: ../src/prefs-dialog.c:862
 msgid "Select a Directory"
 msgstr "選擇一個目錄"
 
-#. Refers to "Only from sites you visit" option under Cookies.
-#: ../src/prefs-dialog.ui.h:2
-msgid "<small>For example, not from advertisers on these sites</small>"
-msgstr "<small>例如，不要來自這些網站的廣告</small>"
-
-#: ../src/prefs-dialog.ui.h:3
-msgid "A_utomatically open downloaded files"
-msgstr "自動下載並開啟檔案(_U)"
-
-#: ../src/prefs-dialog.ui.h:4
-msgid "Add Language"
-msgstr "增加語言"
-
-#: ../src/prefs-dialog.ui.h:5
-msgid "Allow popup _windows"
-msgstr "允許彈出式視窗(_W)"
-
-#: ../src/prefs-dialog.ui.h:6
-msgid "Choose a l_anguage:"
-msgstr "選擇語言(_A)："
-
-#: ../src/prefs-dialog.ui.h:9
-msgid "De_fault:"
-msgstr "預設(_F)："
-
-#: ../src/prefs-dialog.ui.h:11
-msgid "Enable Java_Script"
-msgstr "啟用 Java_Script"
-
-#: ../src/prefs-dialog.ui.h:12
-msgid "Enable _plugins"
-msgstr "啟用外掛程式(_P)"
-
-#: ../src/prefs-dialog.ui.h:14
-msgid "Fonts"
-msgstr "字型"
-
-#: ../src/prefs-dialog.ui.h:15
-msgid "Fonts & Style"
-msgstr "字型與樣式"
-
-#: ../src/prefs-dialog.ui.h:16
-msgid "General"
-msgstr "一般"
-
-#: ../src/prefs-dialog.ui.h:18
-msgid "Languages"
-msgstr "語言"
-
-#: ../src/prefs-dialog.ui.h:19
-msgid "MB"
-msgstr "MB"
-
-#: ../src/prefs-dialog.ui.h:20
-msgid "Monospace font:"
-msgstr "等寬字型："
-
-#: ../src/prefs-dialog.ui.h:21
-msgid "Only _from sites you visit"
-msgstr "只來自您瀏覽的網站(_F)"
-
-#: ../src/prefs-dialog.ui.h:23
-msgid "Preferences"
-msgstr "偏好設定"
-
-#: ../src/prefs-dialog.ui.h:24
-msgid "Privacy"
-msgstr "隱私"
-
-#: ../src/prefs-dialog.ui.h:25
-msgid "Sans serif font:"
-msgstr "無襯線字型："
-
-#: ../src/prefs-dialog.ui.h:26
-msgid "Serif font:"
-msgstr "襯線字型："
-
-#: ../src/prefs-dialog.ui.h:27
-msgid "Spell checking"
-msgstr "拼字檢查"
-
-#: ../src/prefs-dialog.ui.h:28
-msgid "Style"
-msgstr "樣式"
-
-#: ../src/prefs-dialog.ui.h:29
-msgid "Temporary Files"
-msgstr "暫存檔"
-
-#: ../src/prefs-dialog.ui.h:30
-msgid "Use custom _stylesheet"
-msgstr "使用自訂樣式表(_S)"
-
-#: ../src/prefs-dialog.ui.h:31
-msgid "Web Content"
-msgstr "網頁內容"
-
-#: ../src/prefs-dialog.ui.h:32
-msgid "_Always accept"
-msgstr "總是接受(_A)"
-
-#: ../src/prefs-dialog.ui.h:33
-msgid "_Disk space:"
-msgstr "磁碟空間(_D)："
-
-#: ../src/prefs-dialog.ui.h:34
-msgid "_Download folder:"
-msgstr "下載資料夾(_D)"
-
-#: ../src/prefs-dialog.ui.h:35
-msgid "_Edit Stylesheet…"
-msgstr "編輯樣式表(_E)…"
-
-#: ../src/prefs-dialog.ui.h:36
-msgid "_Enable spell checking"
-msgstr "啟用拼字檢查(_E)"
-
-#: ../src/prefs-dialog.ui.h:37
-msgid "_Never accept"
-msgstr "永不接受(_N)"
-
-#: ../src/prefs-dialog.ui.h:38
-msgid "_Remember passwords"
-msgstr "記錄密碼(_R)"
-
-#: ../src/prefs-dialog.ui.h:39
-msgid "_Use system fonts"
-msgstr "使用系統字型(_U)"
-
-#: ../src/window-commands.c:316
+#: ../src/window-commands.c:331
 msgid "Save"
 msgstr "儲存"
 
-#: ../src/window-commands.c:479
+#: ../src/window-commands.c:539
 #, c-format
 msgid "A web application named '%s' already exists. Do you want to replace it?"
 msgstr "已存在名為「%s」的網頁應用程式。您想要取代它嗎？"
 
-#: ../src/window-commands.c:484
+#: ../src/window-commands.c:544
 msgid "Replace"
 msgstr "取代"
 
-#: ../src/window-commands.c:488
+#: ../src/window-commands.c:548
 msgid ""
 "An application with the same name already exists. Replacing it will "
 "overwrite it."
 msgstr "以此為名的應用程式已經存在。取代它會將它覆蓋。"
 
-#: ../src/window-commands.c:524
+#: ../src/window-commands.c:584
 #, c-format
 msgid "The application '%s' is ready to be used"
 msgstr "應用程式「%s」已經準備好可以使用"
 
-#: ../src/window-commands.c:527
+#: ../src/window-commands.c:587
 #, c-format
 msgid "The application '%s' could not be created"
 msgstr "無法建立應用程式「%s」"
 
-#: ../src/window-commands.c:535
+#: ../src/window-commands.c:595
 msgid "Launch"
 msgstr "執行"
 
 #. Show dialog with icon, title.
-#: ../src/window-commands.c:568
+#: ../src/window-commands.c:628
 msgid "Create Web Application"
 msgstr "建立網頁應用程式"
 
-#: ../src/window-commands.c:573
+#: ../src/window-commands.c:633
 msgid "C_reate"
 msgstr "建立(_R)"
 
-#: ../src/window-commands.c:1109
+#: ../src/window-commands.c:1224
 msgid ""
 "Web is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -2142,7 +2527,7 @@ msgstr ""
 "權條款規定，就本程式再為散布與／或修改；無論您依據的是本授權的第二版或（您自"
 "行選擇的）任一日後發行的版本。"
 
-#: ../src/window-commands.c:1113
+#: ../src/window-commands.c:1228
 msgid ""
 "The GNOME Web Browser is distributed in the hope that it will be useful, but "
 "WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY "
@@ -2152,7 +2537,7 @@ msgstr ""
 "GNOME 網頁瀏覽器係基於使用目的而加以散布，然而不負任何擔保責任；亦無對適售性"
 "或特定目的適用性所為的默示性擔保。詳情請參照 GNU 通用公共授權。"
 
-#: ../src/window-commands.c:1117
+#: ../src/window-commands.c:1232
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "the GNOME Web Browser; if not, write to the Free Software Foundation, Inc., "
@@ -2161,20 +2546,20 @@ msgstr ""
 "您應已收到附隨於本程式的 GNU 通用公共授權的副本；如無，請寫信至自由軟體基金"
 "會：51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA"
 
-#: ../src/window-commands.c:1163 ../src/window-commands.c:1179
-#: ../src/window-commands.c:1190
+#: ../src/window-commands.c:1278 ../src/window-commands.c:1294
+#: ../src/window-commands.c:1305
 msgid "Contact us at:"
 msgstr "聯絡我們於："
 
-#: ../src/window-commands.c:1166
+#: ../src/window-commands.c:1281
 msgid "Contributors:"
 msgstr "貢獻者："
 
-#: ../src/window-commands.c:1169
+#: ../src/window-commands.c:1284
 msgid "Past developers:"
 msgstr "前度開發人員："
 
-#: ../src/window-commands.c:1199
+#: ../src/window-commands.c:1317
 #, c-format
 msgid ""
 "Lets you view web pages and find information on the internet.\n"
@@ -2191,7 +2576,7 @@ msgstr ""
 #. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
 #.
-#: ../src/window-commands.c:1228
+#: ../src/window-commands.c:1347
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -2202,15 +2587,15 @@ msgstr ""
 "Ching-Hung Lin <billlin@wshlab2.ee.kuas.edu.tw>, 2004\n"
 "Abel Cheung <maddog@linux.org.hk>, 2003"
 
-#: ../src/window-commands.c:1231
+#: ../src/window-commands.c:1350
 msgid "Web Website"
 msgstr "網頁網站"
 
-#: ../src/window-commands.c:1373
+#: ../src/window-commands.c:1490
 msgid "Enable caret browsing mode?"
 msgstr "是否啟用鍵盤瀏覽？"
 
-#: ../src/window-commands.c:1376
+#: ../src/window-commands.c:1493
 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 "
@@ -2219,18 +2604,16 @@ msgstr ""
 "按下 F7 會開啟或關閉鍵盤瀏覽。這個功能會在網頁中放置一個可移動的游標，讓您可"
 "以使用鍵盤隨處移動。您是否要啟用鍵盤瀏覽？"
 
-#: ../src/window-commands.c:1379
+#: ../src/window-commands.c:1496
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#~ msgid "_New Window"
-#~ msgstr "新視窗(_N)"
-
-#~ msgid "_History"
-#~ msgstr "瀏覽記錄(_H)"
+#~ msgctxt "file type"
+#~ msgid "Unknown"
+#~ msgstr "不明"
 
-#~ msgid "_Quit"
-#~ msgstr "結束(_Q)"
+#~ msgid "Leave Fullscreen"
+#~ msgstr "離開全螢幕"
 
 #~ msgid "Disable connection to session manager"
 #~ msgstr "停用到作業階段管理程式的連線"