diff --git a/po/zh_TW.po b/po/zh_TW.po
index 429b2627..e6a806df 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,19 +3,19 @@
 # This file is distributed under the same license as the midori package.
 # Wei-Lun Chao <william.chao@ossii.com.tw>, 2009.
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2010.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: midori master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-17 01:36+0000\n"
+"POT-Creation-Date: 2012-08-09 11:21+0000\n"
 "PO-Revision-Date: 2012-07-17 14:22+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: chinese-l10n <chinese-l10n@googlegroups.com>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/midori.desktop.in.h:1
@@ -26,29 +26,28 @@ msgstr "瀏覽網頁"
 msgid "Internet;WWW;Explorer"
 msgstr "Internet;WWW;Explorer"
 
-#: ../data/midori.desktop.in.h:3
-#: ../midori/main.c:2024
-#: ../midori/main.c:2048
-#: ../midori/main.c:2062
-#: ../midori/midori-websettings.c:315
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:2025 ../midori/main.c:2049
+#: ../midori/main.c:2063 ../midori/midori-websettings.c:315
 msgid "Midori"
 msgstr "Midori"
 
 #: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Midori 網頁瀏覽器"
+
+#: ../data/midori.desktop.in.h:5
 msgid "New Private Browsing Window"
 msgstr "新增私人瀏覽視窗"
 
-#: ../data/midori.desktop.in.h:5
-#: ../midori/midori-browser.c:1409
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1479
 msgid "New Tab"
 msgstr "新分頁"
 
-#: ../data/midori.desktop.in.h:6
-#: ../midori/midori-browser.c:1406
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1476
 msgid "New Window"
 msgstr "新增視窗"
 
-#: ../data/midori.desktop.in.h:7
+#: ../data/midori.desktop.in.h:8
 msgid "Web Browser"
 msgstr "網頁瀏覽器"
 
@@ -60,13 +59,11 @@ msgstr "Midori 私密瀏覽"
 msgid "Open a new private browsing window"
 msgstr "開啟新的私密瀏覽視窗"
 
-#: ../data/midori-private.desktop.in.h:3
-#: ../midori/midori-view.c:4295
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4494
 msgid "Private Browsing"
 msgstr "私密瀏覽"
 
-#: ../midori/main.c:91
-#: ../midori/main.c:97
+#: ../midori/main.c:91 ../midori/main.c:97
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "無法載入組態：%s\n"
@@ -76,8 +73,7 @@ msgstr "無法載入組態：%s\n"
 msgid "Value '%s' is invalid for %s"
 msgstr "「%s」值對於 %s 無效"
 
-#: ../midori/main.c:150
-#: ../midori/main.c:254
+#: ../midori/main.c:150 ../midori/main.c:254
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "無效的組態值「%s」"
@@ -92,8 +88,7 @@ msgstr "無法載入搜尋引擎。%s\n"
 msgid "Failed to clear history: %s\n"
 msgstr "清空歷史時失敗：%s\n"
 
-#: ../midori/main.c:451
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531
 #, c-format
 msgid "Failed to open database: %s\n"
 msgstr "開啟資料庫時失敗：%s\n"
@@ -120,8 +115,7 @@ msgstr "無法儲存搜尋引擎。%s"
 msgid "The trash couldn't be saved. %s"
 msgstr "無法儲存回收筒。%s"
 
-#: ../midori/main.c:681
-#: ../panels/midori-extensions.c:90
+#: ../midori/main.c:681 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "擴充功能"
 
@@ -130,7 +124,9 @@ msgid "Privacy"
 msgstr "隱私"
 
 #: ../midori/main.c:707
-msgid "Cookies store login data, saved games, or user profiles for advertisement purposes."
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
 msgstr "訊餅用來儲藏登入資料、儲存的遊戲，或為廣告目的採集使用者個人資料。"
 
 #: ../midori/main.c:763
@@ -138,244 +134,244 @@ msgstr "訊餅用來儲藏登入資料、儲存的遊戲，或為廣告目的採
 msgid "The session couldn't be saved. %s"
 msgstr "無法儲存執行階段。%s"
 
-#: ../midori/main.c:997
-msgid "No root certificate file is available. SSL certificates cannot be verified."
+#: ../midori/main.c:1001
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
 msgstr "沒有可用的根憑證。SSL 憑證無法通過驗證。"
 
-#: ../midori/main.c:1089
-msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem."
-msgstr "Midori 似乎於上次開啟時發生當機。如果這種情況重複出現，請試著以下列選項之一來解決問題。"
+#: ../midori/main.c:1093
+msgid ""
+"Midori seems to have crashed the last time it was opened. If this happened "
+"repeatedly, try one of the following options to solve the problem."
+msgstr ""
+"Midori 似乎於上次開啟時發生當機。如果這種情況重複出現，請試著以下列選項之一來"
+"解決問題。"
 
-#: ../midori/main.c:1108
+#: ../midori/main.c:1112
 msgid "Modify _preferences"
 msgstr "修改偏好設定(_P)"
 
-#: ../midori/main.c:1112
+#: ../midori/main.c:1116
 msgid "Disable all _extensions"
 msgstr "停用所有擴充功能(_E)"
 
-#: ../midori/main.c:1125
+#: ../midori/main.c:1129
 msgid "Discard old tabs"
 msgstr "丟棄舊分頁"
 
-#: ../midori/main.c:1126
-#: ../midori/midori-websettings.c:223
+#: ../midori/main.c:1130 ../midori/midori-websettings.c:223
 msgid "Show last tabs without loading"
 msgstr "顯示上次的分頁但不要載入"
 
-#: ../midori/main.c:1127
-#: ../midori/midori-websettings.c:222
+#: ../midori/main.c:1131 ../midori/midori-websettings.c:222
 msgid "Show last open tabs"
 msgstr "顯示最近開啟的分頁"
 
-#: ../midori/main.c:1375
-#: ../midori/main.c:2432
+#: ../midori/main.c:1379 ../midori/main.c:2433
 #, c-format
 msgid "The session couldn't be loaded: %s\n"
 msgstr "無法載入執行階段：%s\n"
 
-#: ../midori/main.c:1513
+#: ../midori/main.c:1517
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "快照已儲存至：%s\n"
 
-#: ../midori/main.c:1929
+#: ../midori/main.c:1933
 msgid "Run ADDRESS as a web application"
 msgstr "將 ADDRESS 作為網頁應用程式執行"
 
-#: ../midori/main.c:1929
+#: ../midori/main.c:1933
 msgid "ADDRESS"
 msgstr "ADDRESS"
 
-#: ../midori/main.c:1932
+#: ../midori/main.c:1936
 msgid "Use FOLDER as configuration folder"
 msgstr "使用 FOLDER 作為組態資料夾"
 
-#: ../midori/main.c:1932
+#: ../midori/main.c:1936
 msgid "FOLDER"
 msgstr "FOLDER"
 
-#: ../midori/main.c:1935
+#: ../midori/main.c:1939
 msgid "Private browsing, no changes are saved"
 msgstr "私密瀏覽，不會儲存任何更動"
 
-#: ../midori/main.c:1937
+#: ../midori/main.c:1941
 msgid "Show a diagnostic dialog"
 msgstr "顯示診斷對話窗"
 
-#: ../midori/main.c:1939
+#: ../midori/main.c:1943
 msgid "Run the specified filename as javascript"
 msgstr "將指定檔名當做 javascript 來執行"
 
-#: ../midori/main.c:1941
+#: ../midori/main.c:1945
 msgid "Take a snapshot of the specified URI"
 msgstr "拍攝指定 URI 的快照"
 
-#: ../midori/main.c:1943
+#: ../midori/main.c:1947
 msgid "Execute the specified command"
 msgstr "執行指定的指令"
 
-#: ../midori/main.c:1945
+#: ../midori/main.c:1949
 msgid "List available commands to execute with -e/ --execute"
 msgstr "列出可透過 -e/ --execute 執行的指令"
 
-#: ../midori/main.c:1947
+#: ../midori/main.c:1951
 msgid "Display program version"
 msgstr "顯示程式版本"
 
-#: ../midori/main.c:1949
+#: ../midori/main.c:1953
 msgid "Addresses"
 msgstr "位址"
 
-#: ../midori/main.c:1951
+#: ../midori/main.c:1955
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "根據常規表示式 PATTERN 封鎖 URI"
 
-#: ../midori/main.c:1951
+#: ../midori/main.c:1955
 msgid "PATTERN"
 msgstr "PATTERN"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1955
+#: ../midori/main.c:1959
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "在 SECONDS 秒不活動後重設 Midori"
 
-#: ../midori/main.c:1955
+#: ../midori/main.c:1959
 msgid "SECONDS"
 msgstr "SECONDS"
 
-#: ../midori/main.c:1958
+#: ../midori/main.c:1962
 msgid "Redirects console warnings to the specified FILENAME"
 msgstr "將主控臺警告重新導向至指定的 FILENAME"
 
-#: ../midori/main.c:1958
+#: ../midori/main.c:1962
 msgid "FILENAME"
 msgstr "FILENAME"
 
-#: ../midori/main.c:2021
-msgid "[Addresses]"
-msgstr "[位址]"
-
-#: ../midori/main.c:2063
+#: ../midori/main.c:2064
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "請回報意見、建議和錯誤給："
 
-#: ../midori/main.c:2065
+#: ../midori/main.c:2066
 msgid "Check for new versions at:"
 msgstr "檢查看看新版本於："
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2160
+#: ../midori/main.c:2161
 msgid "Saved logins and _passwords"
 msgstr "儲存登入名稱與密碼(_P)"
 
-#: ../midori/main.c:2162
+#: ../midori/main.c:2163
 msgid "Cookies and Website data"
 msgstr "訊餅與網站資料"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2166
-#: ../midori/midori-websettings.c:1020
-#: ../extensions/web-cache.c:462
-#: ../extensions/web-cache.c:471
+#: ../midori/main.c:2167 ../midori/midori-websettings.c:1020
+#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
 msgid "Web Cache"
 msgstr "網頁快取"
 
-#: ../midori/main.c:2169
+#: ../midori/main.c:2170
 msgid "Website icons"
 msgstr "網站圖示"
 
-#: ../midori/main.c:2273
+#: ../midori/main.c:2274
 msgid "An unknown error occured"
 msgstr "遭遇未知錯誤"
 
-#: ../midori/main.c:2380
+#: ../midori/main.c:2381
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "Midori 的實體已經在執行中但沒有回應。\n"
 
-#: ../midori/main.c:2414
+#: ../midori/main.c:2415
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "無法載入書籤：%s\n"
 
-#: ../midori/main.c:2447
+#: ../midori/main.c:2448
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "無法載入回收筒：%s\n"
 
-#: ../midori/main.c:2460
+#: ../midori/main.c:2461
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "無法載入歷史：%s\n"
 
-#: ../midori/main.c:2475
+#: ../midori/main.c:2476
 msgid "The following errors occured:"
 msgstr "發生下列錯誤："
 
-#: ../midori/main.c:2491
+#: ../midori/main.c:2492
 msgid "_Ignore"
 msgstr "忽略(_I)"
 
-#: ../midori/midori-app.c:1441
-#: ../midori/midori-browser.c:6370
+#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:545
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "未預期的動作「%s」。"
+
+#: ../midori/midori-app.c:1457 ../midori/midori-browser.c:6435
 msgid "_Bookmarks"
 msgstr "書籤(_B)"
 
-#: ../midori/midori-app.c:1442
+#: ../midori/midori-app.c:1458
 msgid "Add Boo_kmark"
 msgstr "加入書籤(_K)"
 
-#: ../midori/midori-app.c:1443
+#: ../midori/midori-app.c:1459
 msgid "_Extensions"
 msgstr "擴充功能(_E)"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1444
-#: ../midori/midori-browser.c:4818
+#: ../midori/midori-app.c:1460 ../midori/midori-browser.c:4891
 msgid "_History"
 msgstr "歷史(_H)"
 
-#: ../midori/midori-app.c:1445
+#: ../midori/midori-app.c:1461
 msgid "_Userscripts"
 msgstr "使用者指令稿(_U)"
 
-#: ../midori/midori-app.c:1446
+#: ../midori/midori-app.c:1462
 msgid "User_styles"
 msgstr "使用者樣式(_S)"
 
-#: ../midori/midori-app.c:1447
+#: ../midori/midori-app.c:1463
 msgid "New _Tab"
 msgstr "新分頁(_T)"
 
-#: ../midori/midori-app.c:1448
+#: ../midori/midori-app.c:1464
 msgid "_Transfers"
 msgstr "傳輸(_T)"
 
-#: ../midori/midori-app.c:1449
+#: ../midori/midori-app.c:1465
 msgid "Netscape p_lugins"
 msgstr "Netscape 外掛程式(_L)"
 
-#: ../midori/midori-app.c:1450
+#: ../midori/midori-app.c:1466
 msgid "_Closed Tabs"
 msgstr "關閉的分頁(_C)"
 
-#: ../midori/midori-app.c:1451
-#: ../midori/midori-browser.c:5509
+#: ../midori/midori-app.c:1467 ../midori/midori-browser.c:5574
 msgid "New _Window"
 msgstr "開新視窗(_W)"
 
-#: ../midori/midori-app.c:1452
+#: ../midori/midori-app.c:1468
 msgid "New _Folder"
 msgstr "新資料夾(_F)"
 
+#: ../midori/midori-app.c:1497
+msgid "[Addresses]"
+msgstr "[位址]"
+
 #: ../midori/midori-array.c:522
 msgid "File not found."
 msgstr "找不到檔案。"
 
-#: ../midori/midori-array.c:547
-#: ../midori/midori-array.c:586
-#: ../midori/midori-array.c:609
-#: ../midori/midori-array.c:619
+#: ../midori/midori-array.c:547 ../midori/midori-array.c:586
+#: ../midori/midori-array.c:609 ../midori/midori-array.c:619
 msgid "Malformed document."
 msgstr "異常文件。"
 
@@ -387,678 +383,666 @@ msgstr "無法辨識的書籤格式。"
 msgid "Writing failed."
 msgstr "寫入失敗。"
 
-#: ../midori/midori-browser.c:355
-#: ../midori/midori-browser.c:5597
-#: ../midori/midori-browser.c:5606
+#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5662
+#: ../midori/midori-browser.c:5671
 msgid "Reload the current page"
 msgstr "重新載入目前頁面"
 
-#: ../midori/midori-browser.c:364
-#: ../midori/midori-browser.c:5603
+#: ../midori/midori-browser.c:373 ../midori/midori-browser.c:5668
 msgid "Stop loading the current page"
 msgstr "停止載入目前頁面"
 
-#: ../midori/midori-browser.c:481
+#: ../midori/midori-browser.c:530
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "更新標題失敗：%s\n"
 
-#: ../midori/midori-browser.c:494
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "未預期的動作「%s」。"
-
-#: ../midori/midori-browser.c:574
+#: ../midori/midori-browser.c:625
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (私密瀏覽)"
 
-#: ../midori/midori-browser.c:687
-#: ../midori/midori-browser.c:729
+#: ../midori/midori-browser.c:735 ../midori/midori-browser.c:777
 #: ../panels/midori-bookmarks.c:114
 msgid "Bookmarks"
 msgstr "書籤"
 
-#: ../midori/midori-browser.c:789
+#: ../midori/midori-browser.c:837
 msgid "New folder"
 msgstr "新資料夾"
 
-#: ../midori/midori-browser.c:789
+#: ../midori/midori-browser.c:837
 msgid "Edit folder"
 msgstr "編輯資料夾"
 
-#: ../midori/midori-browser.c:791
+#: ../midori/midori-browser.c:839
 msgid "New bookmark"
 msgstr "新書籤"
 
-#: ../midori/midori-browser.c:791
+#: ../midori/midori-browser.c:839
 msgid "Edit bookmark"
 msgstr "編輯書籤"
 
-#: ../midori/midori-browser.c:825
+#: ../midori/midori-browser.c:873
 msgid "Type a name for this bookmark and choose where to keep it."
 msgstr "請為此書籤輸入個名稱，並選擇您想將它保存在哪個地方。"
 
-#: ../midori/midori-browser.c:886
+#: ../midori/midori-browser.c:934
 msgid "Add to _Speed Dial"
 msgstr "加入至快速播號(_S)"
 
-#: ../midori/midori-browser.c:892
+#: ../midori/midori-browser.c:940
 msgid "Show in the tool_bar"
 msgstr "顯示於工具列內(_B)"
 
-#: ../midori/midori-browser.c:900
+#: ../midori/midori-browser.c:948
 msgid "Run as _web application"
 msgstr "以網頁應用程式執行(_W)"
 
-#: ../midori/midori-browser.c:970
+#: ../midori/midori-browser.c:1019
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
 msgstr "標題「%s」無法儲存於此資料夾。"
 
-#: ../midori/midori-browser.c:972
+#: ../midori/midori-browser.c:1021
 #, c-format
 msgid "You don't have permission to write in this location."
 msgstr "您尚未獲得寫入此位置的許可。"
 
-#: ../midori/midori-browser.c:979
+#: ../midori/midori-browser.c:1028
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "沒有足夠的空間可以讓您下載「%s」。"
 
-#: ../midori/midori-browser.c:982
+#: ../midori/midori-browser.c:1031
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "該檔案需要 %s，但僅剩 %s。"
 
-#: ../midori/midori-browser.c:1111
-#: ../midori/midori-browser.c:4619
+#: ../midori/midori-browser.c:1167 ../midori/midori-browser.c:4695
 msgid "Save file as"
 msgstr "檔案另存為"
 
-#: ../midori/midori-browser.c:1406
+#: ../midori/midori-browser.c:1173
+msgid "Save associated _resources"
+msgstr "儲存相關資源(_R)"
+
+#: ../midori/midori-browser.c:1476
 msgid "A new window has been opened"
 msgstr "新視窗已經開啟"
 
-#: ../midori/midori-browser.c:1409
+#: ../midori/midori-browser.c:1479
 msgid "A new tab has been opened"
 msgstr "新分頁已經開啟"
 
-#: ../midori/midori-browser.c:1426
+#: ../midori/midori-browser.c:1496
 msgid "Error opening the image!"
 msgstr "開啟影像時發生錯誤！"
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1497
 msgid "Can not open selected image in a default viewer."
 msgstr "無法在預設檢視器中開啟所選的影像。"
 
-#: ../midori/midori-browser.c:1433
+#: ../midori/midori-browser.c:1503
 msgid "Error downloading the image!"
 msgstr "下載影像流時發生錯誤！"
 
-#: ../midori/midori-browser.c:1434
+#: ../midori/midori-browser.c:1504
 msgid "Can not download selected image."
 msgstr "無法下載所選的影像。"
 
-#: ../midori/midori-browser.c:1555
+#: ../midori/midori-browser.c:1625
 msgid "Save file"
 msgstr "儲存檔案"
 
-#: ../midori/midori-browser.c:2451
+#: ../midori/midori-browser.c:2528
 msgid "Open file"
 msgstr "開啟檔案"
 
-#: ../midori/midori-browser.c:2583
+#: ../midori/midori-browser.c:2660
 msgid ""
-"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n"
-"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically."
+"To use the above URI open a news aggregator. There is usually a menu or "
+"button \"New Subscription\", \"New News Feed\" or similar.\n"
+"Alternatively go to Preferences, Applications in Midori, and select a News "
+"Aggregator. Next time you click the news feed icon, it will be added "
+"automatically."
 msgstr ""
-"若要使用上方的 URI，請開啟新聞匯流器。通常都會有個名為「新聞訂閱」、「新聞 Feed」等類似的選單或按鈕。\n"
-"或者前往 Midori 中「偏好設定」的「應用程式」內，並選取一個新聞匯流器。下一次您按下新聞饋流按鈕時，它就會被自動加入。"
+"若要使用上方的 URI，請開啟新聞匯流器。通常都會有個名為「新聞訂閱」、「新聞 "
+"Feed」等類似的選單或按鈕。\n"
+"或者前往 Midori 中「偏好設定」的「應用程式」內，並選取一個新聞匯流器。下一次"
+"您按下新聞饋流按鈕時，它就會被自動加入。"
 
-#: ../midori/midori-browser.c:2589
-#: ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2666 ../extensions/feed-panel/main.c:365
 msgid "New feed"
 msgstr "新饋流"
 
-#: ../midori/midori-browser.c:2632
-#: ../midori/midori-browser.c:5669
+#: ../midori/midori-browser.c:2709 ../midori/midori-browser.c:5734
 #: ../panels/midori-bookmarks.c:527
 msgid "Add a new bookmark"
 msgstr "加入新的書籤"
 
-#: ../midori/midori-browser.c:3180
-#: ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3253 ../midori/midori-searchaction.c:487
 msgid "Empty"
 msgstr "清空"
 
-#: ../midori/midori-browser.c:3623
-#: ../midori/midori-browser.c:3624
+#: ../midori/midori-browser.c:3699 ../midori/midori-browser.c:3700
 msgid "Toggle text cursor navigation"
 msgstr "切換文字游標導覽"
 
-#: ../midori/midori-browser.c:3626
-msgid "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in all websites."
+#: ../midori/midori-browser.c:3702
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
 msgstr "請按下 F7 來切換鍵盤瀏覽功能。啟用時，所有的網站都會出現文字游標。"
 
-#: ../midori/midori-browser.c:3629
+#: ../midori/midori-browser.c:3705
 msgid "_Enable Caret Browsing"
 msgstr "啟用鍵盤瀏覽(_E)"
 
-#: ../midori/midori-browser.c:4019
-#: ../midori/midori-browser.c:6063
+#: ../midori/midori-browser.c:4095 ../midori/midori-browser.c:6128
 #, c-format
 msgid "Failed to insert new history item: %s\n"
 msgstr "無法插入新歷史項目：%s\n"
 
-#: ../midori/midori-browser.c:4345
-#: ../panels/midori-bookmarks.c:847
-#: ../panels/midori-history.c:803
+#: ../midori/midori-browser.c:4421 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
 msgid "Open all in _Tabs"
 msgstr "以分頁開啟全部(_T)"
 
-#: ../midori/midori-browser.c:4352
-#: ../panels/midori-bookmarks.c:853
-#: ../panels/midori-history.c:809
-#: ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4428 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
 msgid "Open in New _Tab"
 msgstr "在新分頁中開啟(_T)"
 
-#: ../midori/midori-browser.c:4355
-#: ../midori/midori-view.c:2752
-#: ../midori/midori-view.c:4851
-#: ../panels/midori-bookmarks.c:855
-#: ../panels/midori-history.c:811
-#: ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4431 ../midori/midori-view.c:2940
+#: ../midori/midori-view.c:5071 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
 msgid "Open in New _Window"
 msgstr "在新視窗中開啟(_W)"
 
-#: ../midori/midori-browser.c:4444
+#: ../midori/midori-browser.c:4520
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4445
+#: ../midori/midori-browser.c:4521
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4446
+#: ../midori/midori-browser.c:4522
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4447
+#: ../midori/midori-browser.c:4523
 msgid "Konqueror"
 msgstr "征服家"
 
-#: ../midori/midori-browser.c:4448
+#: ../midori/midori-browser.c:4524
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4449
+#: ../midori/midori-browser.c:4525
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4450
+#: ../midori/midori-browser.c:4526
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4471
+#: ../midori/midori-browser.c:4547
 msgid "Import bookmarks…"
 msgstr "匯入書籤…"
 
-#: ../midori/midori-browser.c:4474
-#: ../midori/midori-browser.c:5674
+#: ../midori/midori-browser.c:4550 ../midori/midori-browser.c:5739
 msgid "_Import bookmarks"
 msgstr "匯入書籤(_I)"
 
-#: ../midori/midori-browser.c:4485
+#: ../midori/midori-browser.c:4561
 msgid "_Application:"
 msgstr "應用程式(_A)："
 
-#: ../midori/midori-browser.c:4550
+#: ../midori/midori-browser.c:4626
 msgid "Import from XBEL or HTML file"
 msgstr "從 XBEL 或 HTML 檔案匯入"
 
-#: ../midori/midori-browser.c:4578
+#: ../midori/midori-browser.c:4654
 msgid "Import from a file"
 msgstr "從檔案匯入"
 
-#: ../midori/midori-browser.c:4590
+#: ../midori/midori-browser.c:4666
 msgid "Failed to import bookmarks"
 msgstr "匯入書籤失敗"
 
-#: ../midori/midori-browser.c:4624
+#: ../midori/midori-browser.c:4700
 msgid "XBEL Bookmarks"
 msgstr "XBEL 書籤"
 
-#: ../midori/midori-browser.c:4629
+#: ../midori/midori-browser.c:4705
 msgid "Netscape Bookmarks"
 msgstr "Netscape 書籤"
 
-#: ../midori/midori-browser.c:4643
+#: ../midori/midori-browser.c:4719
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr "Midori 僅能匯出為 XBEL (*.xbel) 與 Netscape (*.html)"
 
-#: ../midori/midori-browser.c:4658
+#: ../midori/midori-browser.c:4734
 msgid "Failed to export bookmarks"
 msgstr "無法匯出書籤"
 
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4780
+#: ../midori/midori-browser.c:4856
 msgid "Clear Private Data"
 msgstr "清除隱私資料"
 
-#: ../midori/midori-browser.c:4784
+#: ../midori/midori-browser.c:4860
 msgid "_Clear private data"
 msgstr "清除隱私資料(_C)"
 
-#: ../midori/midori-browser.c:4802
+#: ../midori/midori-browser.c:4875
 msgid "Clear the following data:"
 msgstr "清除下列資料："
 
-#: ../midori/midori-browser.c:4812
+#: ../midori/midori-browser.c:4885
 msgid "Last open _tabs"
 msgstr "上次開啟頁面(_T)"
 
-#: ../midori/midori-browser.c:4838
+#: ../midori/midori-browser.c:4911
 msgid "Clear private data when _quitting Midori"
 msgstr "當退出 Midori 時清除隱私資料(_Q)"
 
-#: ../midori/midori-browser.c:5053
+#: ../midori/midori-browser.c:5126
 msgid "A lightweight web browser."
 msgstr "輕量網頁瀏覽器。"
 
-#: ../midori/midori-browser.c:5054
+#: ../midori/midori-browser.c:5127
 msgid "See about:version for version info."
 msgstr "查看 about:version 來取得版本資訊。"
 
-#: ../midori/midori-browser.c:5056
-msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version."
-msgstr "這個函式庫為自由軟體；基於 Free Software Foundation 所發布的 GNU Lesser General Public License 授權條款，不管是該條款的 2.1 版，或是 (您可自由選擇) 任意後續版本；您可以將它再次散布出去，與/或修改它。"
+#: ../midori/midori-browser.c:5129
+msgid ""
+"This library is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU Lesser General Public License as published by the "
+"Free Software Foundation; either version 2.1 of the License, or (at your "
+"option) any later version."
+msgstr ""
+"這個函式庫為自由軟體；基於 Free Software Foundation 所發布的 GNU Lesser "
+"General Public License 授權條款，不管是該條款的 2.1 版，或是 (您可自由選擇) "
+"任意後續版本；您可以將它再次散布出去，與/或修改它。"
 
-#: ../midori/midori-browser.c:5097
+#: ../midori/midori-browser.c:5159
 msgid "translator-credits"
 msgstr ""
 "趙惟倫 <william.chao@ossii.com.tw>, 2009.\n"
 "曾政嘉 <pswo10680@gmailcom>, 2010."
 
-#: ../midori/midori-browser.c:5507
+#: ../midori/midori-browser.c:5572
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../midori/midori-browser.c:5510
+#: ../midori/midori-browser.c:5575
 msgid "Open a new window"
 msgstr "開啟新視窗"
 
-#: ../midori/midori-browser.c:5513
+#: ../midori/midori-browser.c:5578
 msgid "Open a new tab"
 msgstr "開啟新分頁"
 
-#: ../midori/midori-browser.c:5515
+#: ../midori/midori-browser.c:5580
 msgid "New P_rivate Browsing Window"
 msgstr "新增私人瀏覽視窗(_R)"
 
-#: ../midori/midori-browser.c:5519
+#: ../midori/midori-browser.c:5584
 msgid "Open a file"
 msgstr "開啟檔案"
 
-#: ../midori/midori-browser.c:5521
+#: ../midori/midori-browser.c:5586
 msgid "_Save Page As…"
 msgstr "另存網頁為(_S)…"
 
-#: ../midori/midori-browser.c:5522
+#: ../midori/midori-browser.c:5587
 msgid "Save to a file"
 msgstr "儲存到檔案"
 
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5589
 msgid "Add to Speed _dial"
 msgstr "加入快速播號(_D)"
 
-#: ../midori/midori-browser.c:5528
+#: ../midori/midori-browser.c:5593
 msgid "Add Shortcut to the _desktop"
 msgstr "將捷徑加入至桌面(_D)"
 
-#: ../midori/midori-browser.c:5530
+#: ../midori/midori-browser.c:5595
 msgid "Create _Launcher"
 msgstr "建立啟動器(_L)"
 
-#: ../midori/midori-browser.c:5534
+#: ../midori/midori-browser.c:5599
 msgid "Subscribe to News _feed"
 msgstr "訂閱新聞饋流(_F)"
 
-#: ../midori/midori-browser.c:5540
+#: ../midori/midori-browser.c:5605
 msgid "_Close Tab"
 msgstr "關閉分頁(_C)"
 
-#: ../midori/midori-browser.c:5541
+#: ../midori/midori-browser.c:5606
 msgid "Close the current tab"
 msgstr "關閉目前分頁"
 
-#: ../midori/midori-browser.c:5543
+#: ../midori/midori-browser.c:5608
 msgid "C_lose Window"
 msgstr "關閉視窗(_L)"
 
-#: ../midori/midori-browser.c:5547
+#: ../midori/midori-browser.c:5612
 msgid "_Share"
 msgstr "分享(_S)"
 
-#: ../midori/midori-browser.c:5552
+#: ../midori/midori-browser.c:5617
 msgid "Print the current page"
 msgstr "列印目前頁面"
 
-#: ../midori/midori-browser.c:5555
+#: ../midori/midori-browser.c:5620
 msgid "Close a_ll Windows"
 msgstr "關閉所有視窗(_L)"
 
-#: ../midori/midori-browser.c:5558
+#: ../midori/midori-browser.c:5623
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../midori/midori-browser.c:5581
+#: ../midori/midori-browser.c:5646
 msgid "_Find…"
 msgstr "尋找(_F)…"
 
-#: ../midori/midori-browser.c:5582
+#: ../midori/midori-browser.c:5647
 msgid "Find a word or phrase in the page"
 msgstr "在頁面中尋找字詞或片語"
 
-#: ../midori/midori-browser.c:5584
+#: ../midori/midori-browser.c:5649
 msgid "Find _Next"
 msgstr "找下一個(_N)"
 
-#: ../midori/midori-browser.c:5587
+#: ../midori/midori-browser.c:5652
 msgid "Find _Previous"
 msgstr "找上一個(_P)"
 
-#: ../midori/midori-browser.c:5591
+#: ../midori/midori-browser.c:5656
 msgid "Configure the application preferences"
 msgstr "組配應用程式偏好設定"
 
-#: ../midori/midori-browser.c:5593
+#: ../midori/midori-browser.c:5658
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../midori/midori-browser.c:5594
+#: ../midori/midori-browser.c:5659
 msgid "_Toolbars"
 msgstr "工具列(_T)"
 
-#: ../midori/midori-browser.c:5599
+#: ../midori/midori-browser.c:5664
 msgid "Reload page without caching"
 msgstr "重新載入頁面而不使用快取功能"
 
-#: ../midori/midori-browser.c:5609
+#: ../midori/midori-browser.c:5674
 msgid "Increase the zoom level"
 msgstr "增加縮放等級"
 
-#: ../midori/midori-browser.c:5612
+#: ../midori/midori-browser.c:5677
 msgid "Decrease the zoom level"
 msgstr "減少縮放等級"
 
-#: ../midori/midori-browser.c:5616
+#: ../midori/midori-browser.c:5681
 msgid "_Encoding"
 msgstr "編碼(_E)"
 
-#: ../midori/midori-browser.c:5618
+#: ../midori/midori-browser.c:5683
 msgid "View So_urce"
 msgstr "檢視源碼(_U)"
 
-#: ../midori/midori-browser.c:5621
+#: ../midori/midori-browser.c:5686
 msgid "Ca_ret Browsing"
 msgstr "鍵盤瀏覽(_R)"
 
-#: ../midori/midori-browser.c:5625
+#: ../midori/midori-browser.c:5690
 msgid "Toggle fullscreen view"
 msgstr "切換全螢幕檢視"
 
-#: ../midori/midori-browser.c:5627
+#: ../midori/midori-browser.c:5692
 msgid "Scroll _Left"
 msgstr "向左捲(_L)"
 
-#: ../midori/midori-browser.c:5630
+#: ../midori/midori-browser.c:5695
 msgid "Scroll _Down"
 msgstr "向下捲(_D)"
 
-#: ../midori/midori-browser.c:5633
+#: ../midori/midori-browser.c:5698
 msgid "Scroll _Up"
 msgstr "向上捲(_U)"
 
-#: ../midori/midori-browser.c:5636
+#: ../midori/midori-browser.c:5701
 msgid "Scroll _Right"
 msgstr "向右捲(_R)"
 
-#: ../midori/midori-browser.c:5639
+#: ../midori/midori-browser.c:5704
 msgid "_Readable"
 msgstr "可讀(_E)"
 
-#: ../midori/midori-browser.c:5642
+#: ../midori/midori-browser.c:5707
 msgid "_Go"
 msgstr "前往(_G)"
 
-#: ../midori/midori-browser.c:5645
+#: ../midori/midori-browser.c:5710
 msgid "Go back to the previous page"
 msgstr "回到上一頁"
 
-#: ../midori/midori-browser.c:5648
+#: ../midori/midori-browser.c:5713
 msgid "Go forward to the next page"
 msgstr "前往下一頁"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5652
+#: ../midori/midori-browser.c:5717
 msgid "Go to the previous sub-page"
 msgstr "回到上一子頁"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5656
+#: ../midori/midori-browser.c:5721
 msgid "Go to the next sub-page"
 msgstr "前往下一子頁"
 
-#: ../midori/midori-browser.c:5658
+#: ../midori/midori-browser.c:5723
 msgid "_Homepage"
 msgstr "首頁(_H)"
 
-#: ../midori/midori-browser.c:5659
+#: ../midori/midori-browser.c:5724
 msgid "Go to your homepage"
 msgstr "前往您的首頁"
 
-#: ../midori/midori-browser.c:5661
+#: ../midori/midori-browser.c:5726
 msgid "Empty Trash"
 msgstr "清空回收筒"
 
-#: ../midori/midori-browser.c:5664
+#: ../midori/midori-browser.c:5729
 msgid "Undo _Close Tab"
 msgstr "復原關閉分頁(_C)"
 
-#: ../midori/midori-browser.c:5671
+#: ../midori/midori-browser.c:5736
 msgid "Add a new _folder"
 msgstr "加入新的資料夾(_F)"
 
-#: ../midori/midori-browser.c:5677
+#: ../midori/midori-browser.c:5742
 msgid "_Export bookmarks"
 msgstr "匯出書籤(_E)"
 
-#: ../midori/midori-browser.c:5680
-#: ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5745 ../midori/midori-searchaction.c:496
 msgid "_Manage Search Engines"
 msgstr "管理搜尋引擎(_M)"
 
-#: ../midori/midori-browser.c:5683
+#: ../midori/midori-browser.c:5748
 msgid "_Clear Private Data"
 msgstr "清除隱私資料(_C)"
 
-#: ../midori/midori-browser.c:5686
+#: ../midori/midori-browser.c:5751
 msgid "_Inspect Page"
 msgstr "審閱頁面(_I)"
 
-#: ../midori/midori-browser.c:5690
+#: ../midori/midori-browser.c:5755
 msgid "_Previous Tab"
 msgstr "上一個分頁(_P)"
 
-#: ../midori/midori-browser.c:5693
+#: ../midori/midori-browser.c:5758
 msgid "_Next Tab"
 msgstr "下一個分頁(_N)"
 
-#: ../midori/midori-browser.c:5695
+#: ../midori/midori-browser.c:5760
 msgid "Move Tab _Backward"
 msgstr "將分頁往後移(_B)"
 
-#: ../midori/midori-browser.c:5697
+#: ../midori/midori-browser.c:5762
 msgid "_Move Tab Forward"
 msgstr "將分頁往前移(_M)"
 
-#: ../midori/midori-browser.c:5700
+#: ../midori/midori-browser.c:5765
 msgid "Focus _Current Tab"
 msgstr "專注於目前分頁(_C)"
 
-#: ../midori/midori-browser.c:5703
+#: ../midori/midori-browser.c:5768
 msgid "Focus _Next view"
 msgstr "聚焦下個檢視點(_N)"
 
-#: ../midori/midori-browser.c:5706
+#: ../midori/midori-browser.c:5771
 msgid "Only show the Icon of the _Current Tab"
 msgstr "只顯示目前分頁的圖示(_C)"
 
-#: ../midori/midori-browser.c:5709
+#: ../midori/midori-browser.c:5774
 msgid "_Duplicate Current Tab"
 msgstr "製作目前分頁的複本(_D)"
 
-#: ../midori/midori-browser.c:5712
+#: ../midori/midori-browser.c:5777
 msgid "Close Ot_her Tabs"
 msgstr "關閉其它分頁(_H)"
 
-#: ../midori/midori-browser.c:5715
+#: ../midori/midori-browser.c:5780
 msgid "Open last _session"
 msgstr "開啟上次工作階段(_S)"
 
-#: ../midori/midori-browser.c:5718
+#: ../midori/midori-browser.c:5783
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../midori/midori-browser.c:5720
+#: ../midori/midori-browser.c:5785
 msgid "_Frequent Questions"
 msgstr "常見問題(_F)"
 
-#: ../midori/midori-browser.c:5723
+#: ../midori/midori-browser.c:5788
 msgid "_Report a Problem…"
 msgstr "回報問題(_R)…"
 
-#: ../midori/midori-browser.c:5728
-#: ../midori/midori-browser.c:6389
+#: ../midori/midori-browser.c:5793 ../midori/midori-browser.c:6454
 msgid "_Tools"
 msgstr "工具(_T)"
 
-#: ../midori/midori-browser.c:5735
+#: ../midori/midori-browser.c:5800
 msgid "_Menubar"
 msgstr "選單列(_M)"
 
-#: ../midori/midori-browser.c:5739
+#: ../midori/midori-browser.c:5804
 msgid "_Navigationbar"
 msgstr "導覽列(_N)"
 
-#: ../midori/midori-browser.c:5743
+#: ../midori/midori-browser.c:5808
 msgid "Side_panel"
 msgstr "側邊面板(_P)"
 
-#: ../midori/midori-browser.c:5744
+#: ../midori/midori-browser.c:5809
 msgid "Sidepanel"
 msgstr "側邊面板"
 
-#: ../midori/midori-browser.c:5747
+#: ../midori/midori-browser.c:5812
 msgid "_Bookmarkbar"
 msgstr "書籤列(_B)"
 
-#: ../midori/midori-browser.c:5751
+#: ../midori/midori-browser.c:5816
 msgid "_Statusbar"
 msgstr "狀態列(_S)"
 
-#: ../midori/midori-browser.c:5760
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-browser.c:5825 ../midori/midori-websettings.c:314
 msgid "_Automatic"
 msgstr "自動(_A)"
 
-#: ../midori/midori-browser.c:5763
-#: ../midori/midori-websettings.c:238
+#: ../midori/midori-browser.c:5828 ../midori/midori-websettings.c:238
 msgid "Chinese Traditional (BIG5)"
 msgstr "正體中文 (BIG5)"
 
-#: ../midori/midori-browser.c:5766
-#: ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5831 ../midori/midori-websettings.c:239
 msgid "Chinese Simplified (GB18030)"
 msgstr "簡體中文 (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5770
+#: ../midori/midori-browser.c:5835
 msgid "Japanese (SHIFT__JIS)"
 msgstr "日文 (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5773
-#: ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5838 ../midori/midori-websettings.c:241
 msgid "Korean (EUC-KR)"
 msgstr "韓文 (EUC-KR)"
 
-#: ../midori/midori-browser.c:5776
-#: ../midori/midori-websettings.c:242
+#: ../midori/midori-browser.c:5841 ../midori/midori-websettings.c:242
 msgid "Russian (KOI8-R)"
 msgstr "俄文 (KOI8-R)"
 
-#: ../midori/midori-browser.c:5779
-#: ../midori/midori-websettings.c:243
+#: ../midori/midori-browser.c:5844 ../midori/midori-websettings.c:243
 msgid "Unicode (UTF-8)"
 msgstr "統一碼 (UTF-8)"
 
-#: ../midori/midori-browser.c:5782
-#: ../midori/midori-websettings.c:244
+#: ../midori/midori-browser.c:5847 ../midori/midori-websettings.c:244
 msgid "Western (ISO-8859-1)"
 msgstr "西歐 (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5785
+#: ../midori/midori-browser.c:5850
 msgid "Custom…"
 msgstr "自訂…"
 
-#: ../midori/midori-browser.c:6295
+#: ../midori/midori-browser.c:6360
 msgid "_Separator"
 msgstr "分隔符號(_S)"
 
-#: ../midori/midori-browser.c:6302
+#: ../midori/midori-browser.c:6367
 msgid "_Location…"
 msgstr "位置(_L)…"
 
-#: ../midori/midori-browser.c:6304
+#: ../midori/midori-browser.c:6369
 msgid "Open a particular location"
 msgstr "開啟特定位置"
 
-#: ../midori/midori-browser.c:6326
+#: ../midori/midori-browser.c:6391
 msgid "_Web Search…"
 msgstr "網頁搜尋(_W)…"
 
-#: ../midori/midori-browser.c:6328
+#: ../midori/midori-browser.c:6393
 msgid "Run a web search"
 msgstr "執行網頁搜尋"
 
-#: ../midori/midori-browser.c:6355
+#: ../midori/midori-browser.c:6420
 msgid "Reopen a previously closed tab or window"
 msgstr "重新開啟之前關閉的分頁或視窗"
 
-#: ../midori/midori-browser.c:6372
+#: ../midori/midori-browser.c:6437
 msgid "Show the saved bookmarks"
 msgstr "顯示已儲存書籤"
 
-#: ../midori/midori-browser.c:6405
+#: ../midori/midori-browser.c:6470
 msgid "_Window"
 msgstr "視窗(_W)"
 
-#: ../midori/midori-browser.c:6407
+#: ../midori/midori-browser.c:6472
 msgid "Show a list of all open tabs"
 msgstr "顯示所有開啟分頁的清單"
 
-#: ../midori/midori-browser.c:6421
+#: ../midori/midori-browser.c:6486
 msgid "_Menu"
 msgstr "選單(_M)"
 
-#: ../midori/midori-browser.c:6423
+#: ../midori/midori-browser.c:6488
 msgid "Menu"
 msgstr "選單"
 
-#: ../midori/midori-browser.c:7253
+#: ../midori/midori-browser.c:7313
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "未預期的設定「%s」"
@@ -1068,11 +1052,9 @@ msgstr "未預期的設定「%s」"
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
 msgstr "無法載入「%s」擴充功能的組態：%s\n"
 
-#: ../midori/midori-extension.c:747
-#: ../midori/midori-extension.c:844
-#: ../midori/midori-extension.c:941
-#: ../midori/midori-extension.c:1053
-#: ../extensions/addons.c:1698
+#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
+#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
+#: ../extensions/addons.c:1688
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
 msgstr "無法儲存「%s」擴充功能的組態：%s\n"
@@ -1096,73 +1078,81 @@ msgstr "從歷史選取時失敗\n"
 msgid "Search for %s"
 msgstr "搜尋 %s"
 
-#: ../midori/midori-locationaction.c:1189
+#: ../midori/midori-locationaction.c:1223
+msgid "Export certificate"
+msgstr "匯出憑證"
+
+#: ../midori/midori-locationaction.c:1255
 msgid "The signing certificate authority is not known."
 msgstr "簽署憑證的授權機構未知。"
 
-#: ../midori/midori-locationaction.c:1191
-msgid "The certificate does not match the expected identity of the site that it was retrieved from."
+#: ../midori/midori-locationaction.c:1257
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
 msgstr "憑證不符合其由來網站的預期身份。"
 
-#: ../midori/midori-locationaction.c:1193
+#: ../midori/midori-locationaction.c:1259
 msgid "The certificate's activation time is still in the future."
 msgstr "憑證的啟用時間仍在未來。"
 
-#: ../midori/midori-locationaction.c:1195
+#: ../midori/midori-locationaction.c:1261
 msgid "The certificate has expired"
 msgstr "憑證已過期"
 
-#: ../midori/midori-locationaction.c:1197
-msgid "The certificate has been revoked according to the GTlsConnection's certificate revocation list."
+#: ../midori/midori-locationaction.c:1263
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
 msgstr "憑證已根據 GTlsConnection 的憑證撤銷清單而被撤銷。"
 
-#: ../midori/midori-locationaction.c:1199
+#: ../midori/midori-locationaction.c:1265
 msgid "The certificate's algorithm is considered insecure."
 msgstr "憑證的演算法被認為是不安全的。"
 
-#: ../midori/midori-locationaction.c:1201
+#: ../midori/midori-locationaction.c:1267
 msgid "Some other error occurred validating the certificate."
 msgstr "驗證平證實遭遇一些其他錯誤。"
 
-#: ../midori/midori-locationaction.c:1255
+#: ../midori/midori-locationaction.c:1314
+msgid "_Export certificate"
+msgstr "匯出憑證(_E)"
+
+#: ../midori/midori-locationaction.c:1329
 msgid "Self-signed"
 msgstr "自我簽署"
 
-#: ../midori/midori-locationaction.c:1272
+#: ../midori/midori-locationaction.c:1363
 msgid "Security details"
 msgstr "安全性細節"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1555
+#: ../midori/midori-locationaction.c:1646
 msgid "Paste and p_roceed"
 msgstr "貼上並處理(_R)"
 
-#: ../midori/midori-locationaction.c:1883
+#: ../midori/midori-locationaction.c:1970
 msgid "Not verified"
 msgstr "尚未驗證"
 
-#: ../midori/midori-locationaction.c:1895
+#: ../midori/midori-locationaction.c:1978
 msgid "Verified and encrypted connection"
 msgstr "通過驗證且經過加密的連線"
 
-#: ../midori/midori-locationaction.c:1906
+#: ../midori/midori-locationaction.c:1985
 msgid "Open, unencrypted connection"
 msgstr "開放、未加密的連線"
 
-#: ../midori/midori-panel.c:316
-#: ../midori/midori-panel.c:318
-#: ../midori/midori-panel.c:481
-#: ../midori/midori-panel.c:484
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
 msgid "Align sidepanel to the right"
 msgstr "側面板靠右對齊"
 
-#: ../midori/midori-panel.c:328
-#: ../midori/midori-panel.c:329
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
 msgid "Close panel"
 msgstr "關閉面板"
 
-#: ../midori/midori-panel.c:482
-#: ../midori/midori-panel.c:485
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
 msgid "Align sidepanel to the left"
 msgstr "側面板靠左對齊"
 
@@ -1178,9 +1168,8 @@ msgstr "顯示首頁"
 msgid "Japanese (SHIFT_JIS)"
 msgstr "日文 (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:245
-#: ../midori/midori-websettings.c:321
-#: ../katze/katze-utils.c:641
+#: ../midori/midori-websettings.c:245 ../midori/midori-websettings.c:321
+#: ../katze/katze-utils.c:633
 msgid "Custom..."
 msgstr "自訂..."
 
@@ -1501,8 +1490,7 @@ msgstr "在分頁中開啟對話框"
 msgid "Whether to open popup windows in tabs"
 msgstr "是否要在分頁中開啟彈出視窗"
 
-#: ../midori/midori-websettings.c:776
-#: ../extensions/statusbar-features.c:155
+#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "自動載入圖像"
 
@@ -1510,8 +1498,7 @@ msgstr "自動載入圖像"
 msgid "Load and display images automatically"
 msgstr "自動載入與顯示圖像"
 
-#: ../midori/midori-websettings.c:784
-#: ../extensions/statusbar-features.c:165
+#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "啟用命令稿"
 
@@ -1519,8 +1506,7 @@ msgstr "啟用命令稿"
 msgid "Enable embedded scripting languages"
 msgstr "啟用嵌入式命令稿語言"
 
-#: ../midori/midori-websettings.c:792
-#: ../extensions/statusbar-features.c:177
+#: ../midori/midori-websettings.c:792 ../extensions/statusbar-features.c:177
 msgid "Enable Netscape plugins"
 msgstr "啟用 Netscape 外掛程式"
 
@@ -1674,8 +1660,12 @@ msgid "Preferred languages"
 msgstr "偏好的語言"
 
 #: ../midori/midori-websettings.c:1073
-msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
-msgstr "用於繪製多語網頁時所偏好的語言清單，請用半形逗號 (,) 隔開語言。例：「de」，「ru,nl」或「en-us;q=1.0, fr-fr;q=0.667」"
+msgid ""
+"A comma separated list of languages preferred for rendering multilingual "
+"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
+msgstr ""
+"用於繪製多語網頁時所偏好的語言清單，請用半形逗號 (,) 隔開語言。例：「de」，"
+"「ru,nl」或「en-us;q=1.0, fr-fr;q=0.667」"
 
 #: ../midori/midori-websettings.c:1088
 msgid "Clear private data"
@@ -1711,278 +1701,279 @@ msgstr "總是使用我的字型選擇"
 msgid "Override fonts picked by websites with user preferences"
 msgstr "用使用者的偏好設定凌駕網站挑選的字型"
 
-#: ../midori/midori-view.c:1088
+#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140
+msgid "Trust this website"
+msgstr "信任此網站"
+
+#: ../midori/midori-view.c:1138
 msgid "Security unknown"
 msgstr "安全性未知"
 
-#: ../midori/midori-view.c:1090
-msgid "Load page"
-msgstr "載入頁面"
-
-#: ../midori/midori-view.c:1386
+#: ../midori/midori-view.c:1436
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s 想要儲存一門 HTML 資料庫。"
 
-#: ../midori/midori-view.c:1390
-#: ../midori/midori-view.c:1424
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
 msgid "_Deny"
 msgstr "拒絕(_D)"
 
-#: ../midori/midori-view.c:1390
-#: ../midori/midori-view.c:1424
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
 msgid "_Allow"
 msgstr "允許(_A)"
 
-#: ../midori/midori-view.c:1419
+#: ../midori/midori-view.c:1469
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s 想要知道您的所在位置。"
 
-#: ../midori/midori-view.c:1515
+#: ../midori/midori-view.c:1565
 #, c-format
 msgid "Error - %s"
 msgstr "錯誤 - %s"
 
-#: ../midori/midori-view.c:1516
+#: ../midori/midori-view.c:1566
 #, c-format
 msgid "The page '%s' couldn't be loaded."
 msgstr "無法載入「%s」頁面。"
 
-#: ../midori/midori-view.c:1518
+#: ../midori/midori-view.c:1568
 msgid "Try again"
 msgstr "重試"
 
-#: ../midori/midori-view.c:1716
-#: ../midori/midori-view.c:2687
+#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2875
 #, c-format
 msgid "Send a message to %s"
 msgstr "傳送訊息至 %s"
 
-#: ../midori/midori-view.c:2517
-#: ../midori/midori-view.c:2843
+#: ../midori/midori-view.c:2661
+msgid "Add _search engine..."
+msgstr "加入搜尋引擎(_S)..."
+
+#: ../midori/midori-view.c:2705 ../midori/midori-view.c:3031
 msgid "Inspect _Element"
 msgstr "審閱元素(_E)"
 
-#: ../midori/midori-view.c:2569
+#: ../midori/midori-view.c:2757
 msgid "Open Link in New _Tab"
 msgstr "在新分頁中開啟鏈結(_T)"
 
-#: ../midori/midori-view.c:2573
+#: ../midori/midori-view.c:2761
 msgid "Open Link in _Foreground Tab"
 msgstr "在前景分頁中開啟鏈結(_F)"
 
-#: ../midori/midori-view.c:2574
+#: ../midori/midori-view.c:2762
 msgid "Open Link in _Background Tab"
 msgstr "在背景分頁中開啟鏈結(_B)"
 
-#: ../midori/midori-view.c:2577
+#: ../midori/midori-view.c:2765
 msgid "Open Link in New _Window"
 msgstr "在開新視窗中開啟鏈結(_W)"
 
-#: ../midori/midori-view.c:2580
+#: ../midori/midori-view.c:2768
 msgid "Open Link as Web A_pplication"
 msgstr "開啟鏈結為網頁應用程式(_P)"
 
-#: ../midori/midori-view.c:2585
+#: ../midori/midori-view.c:2773
 msgid "Copy Link de_stination"
 msgstr "複製鏈結目的地(_S)"
 
-#: ../midori/midori-view.c:2601
+#: ../midori/midori-view.c:2789
 msgid "Open _Image in New Tab"
 msgstr "於新分頁中開啟影像(_I)"
 
-#: ../midori/midori-view.c:2604
+#: ../midori/midori-view.c:2792
 msgid "Copy Image _Address"
 msgstr "複製影像位址(_A)"
 
-#: ../midori/midori-view.c:2607
+#: ../midori/midori-view.c:2795
 msgid "Save I_mage"
 msgstr "儲存影像(_M)"
 
-#: ../midori/midori-view.c:2610
+#: ../midori/midori-view.c:2798
 msgid "Open in Image _Viewer"
 msgstr "於影像檢視器中開啟(_V)"
 
-#: ../midori/midori-view.c:2617
+#: ../midori/midori-view.c:2805
 msgid "Copy Video _Address"
 msgstr "複製視訊位址(_A)"
 
-#: ../midori/midori-view.c:2620
+#: ../midori/midori-view.c:2808
 msgid "Save _Video"
 msgstr "儲存視訊(_V)"
 
-#: ../midori/midori-view.c:2620
+#: ../midori/midori-view.c:2808
 msgid "Download _Video"
 msgstr "下載視訊(_V)"
 
-#: ../midori/midori-view.c:2646
+#: ../midori/midori-view.c:2834
 msgid "Search _with"
 msgstr "以此搜尋(_S)"
 
-#: ../midori/midori-view.c:2678
+#: ../midori/midori-view.c:2866
 msgid "_Search the Web"
 msgstr "搜尋網頁(_S)"
 
-#: ../midori/midori-view.c:2695
+#: ../midori/midori-view.c:2883
 msgid "Open Address in New _Tab"
 msgstr "在新分頁中開啟位址(_T)"
 
-#: ../midori/midori-view.c:2748
+#: ../midori/midori-view.c:2936
 msgid "Open _Frame in New Tab"
 msgstr "於新分頁中開啟框架(_F)"
 
-#: ../midori/midori-view.c:3005
+#: ../midori/midori-view.c:3190
 msgid "Open or download file"
 msgstr "開啟或下載檔案"
 
-#: ../midori/midori-view.c:3030
+#: ../midori/midori-view.c:3214
 #, c-format
 msgid "File Name: %s"
 msgstr "檔案名稱：%s"
 
-#: ../midori/midori-view.c:3035
+#: ../midori/midori-view.c:3219
 #, c-format
 msgid "File Type: '%s'"
 msgstr "檔案類型：'%s'"
 
-#: ../midori/midori-view.c:3037
+#: ../midori/midori-view.c:3221
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "檔案類型：%s ('%s')"
 
-#: ../midori/midori-view.c:3067
+#: ../midori/midori-view.c:3256
 #, c-format
 msgid "Size: %s"
 msgstr "大小：%s"
 
-#: ../midori/midori-view.c:3079
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:3267
 #, c-format
 msgid "Open %s"
 msgstr "開啟 %s"
 
-#: ../midori/midori-view.c:3701
+#: ../midori/midori-view.c:3886
 #, c-format
 msgid "Inspect page - %s"
 msgstr "審閱頁面 - %s"
 
-#: ../midori/midori-view.c:4054
+#: ../midori/midori-view.c:4241
 msgid "Speed Dial"
 msgstr "快速播號"
 
-#: ../midori/midori-view.c:4055
-#: ../midori/midori-view.c:4151
+#: ../midori/midori-view.c:4242 ../midori/midori-view.c:4348
 msgid "Click to add a shortcut"
 msgstr "按一下以加入捷徑"
 
-#: ../midori/midori-view.c:4056
+#: ../midori/midori-view.c:4243
 msgid "Enter shortcut address"
 msgstr "輸入捷徑位址"
 
-#: ../midori/midori-view.c:4057
+#: ../midori/midori-view.c:4244
 msgid "Enter shortcut title"
 msgstr "輸入捷徑標題"
 
-#: ../midori/midori-view.c:4058
+#: ../midori/midori-view.c:4245
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "確定要刪除這個捷徑？"
 
-#: ../midori/midori-view.c:4220
+#: ../midori/midori-view.c:4418
 #, c-format
 msgid "No documentation installed"
 msgstr "沒有已安裝文件"
 
-#: ../midori/midori-view.c:4296
+#: ../midori/midori-view.c:4495
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori 不會儲存任何個人資料；"
 
-#: ../midori/midori-view.c:4297
+#: ../midori/midori-view.c:4496
 msgid "No history or web cookies are being saved."
 msgstr "沒有歷史或網頁訊餅將被儲存。"
 
-#: ../midori/midori-view.c:4298
+#: ../midori/midori-view.c:4497
 msgid "Extensions are disabled."
 msgstr "擴充套件已停用。"
 
-#: ../midori/midori-view.c:4299
+#: ../midori/midori-view.c:4498
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr "HTML 5 儲存、本地端資料庫、應用程式快取等皆已停用。"
 
-#: ../midori/midori-view.c:4300
+#: ../midori/midori-view.c:4499
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midori 防止下列網站追蹤使用者："
 
-#: ../midori/midori-view.c:4301
+#: ../midori/midori-view.c:4500
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "Referrer URL 被截短成主機名稱。"
 
-#: ../midori/midori-view.c:4302
+#: ../midori/midori-view.c:4501
 msgid "DNS prefetching is disabled."
 msgstr "DNS 預擷取已停用。"
 
-#: ../midori/midori-view.c:4303
+#: ../midori/midori-view.c:4502
 msgid "The language and timezone are not revealed to websites."
 msgstr "語言與時區不顯露給這些網站。"
 
-#: ../midori/midori-view.c:4304
+#: ../midori/midori-view.c:4503
 msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr "Flash 與其他 Netscape 插件無法被這些網站列出。"
 
-#: ../midori/midori-view.c:4374
+#: ../midori/midori-view.c:4592
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr "中括號內的版本編號顯示執行時期使用的版本。"
 
-#: ../midori/midori-view.c:4424
+#: ../midori/midori-view.c:4642
 msgid "Page loading delayed"
 msgstr "頁面載入延遲"
 
-#: ../midori/midori-view.c:4425
+#: ../midori/midori-view.c:4643
 msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr "載入延遲，可能是因為最近的當掉或啟動偏好設定之故。"
 
-#: ../midori/midori-view.c:4426
+#: ../midori/midori-view.c:4644
 msgid "Load Page"
 msgstr "載入頁面"
 
-#: ../midori/midori-view.c:4593
+#: ../midori/midori-view.c:4811
 msgid "Blank page"
 msgstr "空白頁面"
 
-#: ../midori/midori-view.c:4855
+#: ../midori/midori-view.c:5075
 msgid "_Duplicate Tab"
 msgstr "製作頁面複本(_E)"
 
-#: ../midori/midori-view.c:4860
+#: ../midori/midori-view.c:5080
 msgid "Show Tab _Label"
 msgstr "顯示分頁標籤(_L)"
 
-#: ../midori/midori-view.c:4860
+#: ../midori/midori-view.c:5080
 msgid "Show Tab _Icon Only"
 msgstr "只顯示分頁圖示(_I)"
 
-#: ../midori/midori-view.c:4866
-msgid "Close ot_her Tabs"
-msgstr "關閉其它分頁(_H)"
+#: ../midori/midori-view.c:5087
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "關閉其他分頁(_H)"
 
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5702
+#: ../midori/midori-view.c:5923
 msgid "previous"
 msgstr "上一頁"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5721
+#: ../midori/midori-view.c:5942
 msgid "next"
 msgstr "下一頁"
 
-#: ../midori/midori-view.c:5734
+#: ../midori/midori-view.c:5955
 msgid "Print background images"
 msgstr "列印背景圖像"
 
-#: ../midori/midori-view.c:5735
+#: ../midori/midori-view.c:5956
 msgid "Whether background images should be printed"
 msgstr "是否應該列印背景圖像"
 
-#: ../midori/midori-view.c:5767
+#: ../midori/midori-view.c:5988
 msgid "Features"
 msgstr "特色"
 
@@ -2066,121 +2057,114 @@ msgstr "主機名稱"
 msgid "MB"
 msgstr "MB"
 
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
 msgid "Add search engine"
 msgstr "加入搜尋引擎"
 
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
 msgid "Edit search engine"
 msgstr "編輯搜尋引擎"
 
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:985
 msgid "_Name:"
 msgstr "名稱(_N)："
 
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1000
 msgid "_Description:"
 msgstr "描述(_D)："
 
-#: ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
+#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
 msgid "_Address:"
 msgstr "位址(_A)："
 
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "圖示(_I)："
-
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1032
 msgid "_Token:"
 msgstr "符記(_T)："
 
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1330
 msgid "Manage Search Engines"
 msgstr "管理搜尋引擎"
 
-#: ../midori/midori-searchaction.c:1400
+#: ../midori/midori-searchaction.c:1432
 msgid "Use as _default"
 msgstr "作為預設使用(_D)"
 
-#: ../midori/sokoke.c:355
+#: ../midori/sokoke.c:346
 msgid "Open with"
 msgstr "以此開啟"
 
-#: ../midori/sokoke.c:363
+#: ../midori/sokoke.c:354
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "選擇開啟「%s」用的應用程式或指令："
 
-#: ../midori/sokoke.c:477
-#: ../midori/sokoke.c:491
+#: ../midori/sokoke.c:468 ../midori/sokoke.c:482
 msgid "Could not run external program."
 msgstr "無法執行外部程式。"
 
-#: ../midori/sokoke.c:1538
+#: ../midori/sokoke.c:1529
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 
-#: ../midori/sokoke.c:1539
+#: ../midori/sokoke.c:1530
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分鐘"
 
-#: ../midori/sokoke.c:1540
+#: ../midori/sokoke.c:1531
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1548
-#: ../panels/midori-transfers.c:269
+#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:269
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1557
+#: ../midori/sokoke.c:1548
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1560
+#: ../midori/sokoke.c:1551
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1577
+#: ../midori/sokoke.c:1568
 #, c-format
 msgid " - %s remaining"
 msgstr " - 還要 %s"
 
 #. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:285
+#: ../toolbars/midori-findbar.c:265
 msgid "_Inline Find:"
 msgstr "列內尋找(_I)："
 
-#: ../toolbars/midori-findbar.c:311
+#: ../toolbars/midori-findbar.c:287
 msgid "Previous"
 msgstr "上一個"
 
-#: ../toolbars/midori-findbar.c:317
+#: ../toolbars/midori-findbar.c:293
 msgid "Next"
 msgstr "下一個"
 
-#: ../toolbars/midori-findbar.c:321
+#: ../toolbars/midori-findbar.c:297
 msgid "Match Case"
 msgstr "符合大小寫"
 
-#: ../toolbars/midori-findbar.c:330
+#: ../toolbars/midori-findbar.c:306
 msgid "Highlight Matches"
 msgstr "突顯相符者"
 
-#: ../toolbars/midori-findbar.c:341
+#: ../toolbars/midori-findbar.c:317
 msgid "Close Findbar"
 msgstr "關閉尋找列"
 
@@ -2189,33 +2173,33 @@ msgstr "關閉尋找列"
 msgid "The file '<b>%s</b>' has been downloaded."
 msgstr "已下載「<b>%s</b>」檔案。"
 
-#: ../toolbars/midori-transferbar.c:127
+#: ../toolbars/midori-transferbar.c:129
 msgid "Transfer completed"
 msgstr "傳輸完成"
 
-#: ../toolbars/midori-transferbar.c:195
+#: ../toolbars/midori-transferbar.c:201
 msgid "The downloaded file is erroneous."
 msgstr "下載的檔案有錯誤。"
 
-#: ../toolbars/midori-transferbar.c:196
-msgid "The checksum provided with the link did not match. This means the file is probably incomplete or was modified afterwards."
+#: ../toolbars/midori-transferbar.c:202
+msgid ""
+"The checksum provided with the link did not match. This means the file is "
+"probably incomplete or was modified afterwards."
 msgstr "連結所提供的檢驗計算碼不相符。這代表檔案可能不完整或之後有被修改過。"
 
-#: ../toolbars/midori-transferbar.c:339
-#: ../panels/midori-transfers.c:142
+#: ../toolbars/midori-transferbar.c:345 ../panels/midori-transfers.c:142
 msgid "Clear All"
 msgstr "清除全部"
 
-#: ../toolbars/midori-transferbar.c:376
-#: ../toolbars/midori-transferbar.c:378
+#: ../toolbars/midori-transferbar.c:382 ../toolbars/midori-transferbar.c:384
 msgid "Some files are being downloaded"
 msgstr "有些檔案正在下載中"
 
-#: ../toolbars/midori-transferbar.c:382
+#: ../toolbars/midori-transferbar.c:388
 msgid "_Quit Midori"
 msgstr "退出 Midori(_Q)"
 
-#: ../toolbars/midori-transferbar.c:384
+#: ../toolbars/midori-transferbar.c:390
 msgid "The transfers will be cancelled if Midori quits."
 msgstr "若退出 Midori，將會取消傳輸作業。"
 
@@ -2241,34 +2225,34 @@ msgstr "刪除所選書籤"
 msgid "Add a new folder"
 msgstr "加入新的資料夾"
 
-#: ../panels/midori-bookmarks.c:694
-#: ../panels/midori-history.c:635
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
 msgid "<i>Separator</i>"
 msgstr "<i>分隔符號</i>"
 
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "搜尋書籤"
+
 #: ../panels/midori-history.c:111
 msgid "History"
 msgstr "歷史"
 
-#: ../panels/midori-history.c:158
-#: ../panels/midori-history.c:189
+#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
 msgid "Today"
 msgstr "今天"
 
-#: ../panels/midori-history.c:160
-#: ../panels/midori-history.c:191
+#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
 msgid "Yesterday"
 msgstr "昨天"
 
-#: ../panels/midori-history.c:162
-#: ../panels/midori-history.c:186
+#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"
 
-#: ../panels/midori-history.c:165
-#: ../panels/midori-history.c:184
+#: ../panels/midori-history.c:165 ../panels/midori-history.c:184
 msgid "A week ago"
 msgstr "一週前"
 
@@ -2293,6 +2277,11 @@ msgstr "刪除所選歷史項目"
 msgid "Clear the entire history"
 msgstr "清空整個歷史"
 
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "搜尋歷史"
+
 #: ../panels/midori-transfers.c:87
 msgid "Transfers"
 msgstr "傳輸"
@@ -2343,82 +2332,83 @@ msgstr "無法載入庫存圖示「%s」"
 msgid "Animation frames are broken"
 msgstr "動畫訊框損壞"
 
-#: ../katze/katze-utils.c:445
-#: ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "屬性「%s」對於 %s 無效"
 
-#: ../katze/katze-utils.c:491
-#: ../katze/katze-utils.c:520
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "選擇檔案"
 
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:504
 msgid "Choose folder"
 msgstr "選擇資料夾"
 
-#: ../katze/katze-utils.c:610
+#: ../katze/katze-utils.c:602
 msgid "None"
 msgstr "無"
 
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:717
 msgid "1 hour"
 msgstr "一小時"
 
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:718
 msgid "1 day"
 msgstr "一天"
 
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:719
 msgid "1 week"
 msgstr "一週"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:720
 msgid "1 month"
 msgstr "一個月"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:721
 msgid "1 year"
 msgstr "一年"
 
-#: ../katze/katze-preferences.c:98
-#: ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
 #, c-format
 msgid "Preferences for %s"
 msgstr "偏好設定用於 %s"
 
-#: ../extensions/adblock.c:473
+#: ../extensions/adblock.c:470
 msgid "Configure Advertisement filters"
 msgstr "設定廣告過濾條件"
 
-#: ../extensions/adblock.c:509
+#: ../extensions/adblock.c:503
 #, c-format
-msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s."
-msgstr "於文字輸入區輸入預先設定好的過濾清單位址，按下「加入」以將它加入清單內。您可以在 %s 找到更多清單。"
+msgid ""
+"Type the address of a preconfigured filter list in the text entry and click "
+"\"Add\" to add it to the list. You can find more lists at %s."
+msgstr ""
+"於文字輸入區輸入預先設定好的過濾清單位址，按下「加入」以將它加入清單內。您可"
+"以在 %s 找到更多清單。"
 
-#: ../extensions/adblock.c:923
+#: ../extensions/adblock.c:917
 msgid "Edit rule"
 msgstr "編輯規則"
 
-#: ../extensions/adblock.c:937
+#: ../extensions/adblock.c:931
 msgid "_Rule:"
 msgstr "規則(_R)："
 
-#: ../extensions/adblock.c:991
+#: ../extensions/adblock.c:985
 msgid "Bl_ock image"
 msgstr "阻擋影像(_O)"
 
-#: ../extensions/adblock.c:996
+#: ../extensions/adblock.c:990
 msgid "Bl_ock link"
 msgstr "阻擋鏈結(_O)"
 
-#: ../extensions/adblock.c:1711
+#: ../extensions/adblock.c:1689
 msgid "Advertisement blocker"
 msgstr "廣告阻擋器"
 
-#: ../extensions/adblock.c:1712
+#: ../extensions/adblock.c:1690
 msgid "Block advertisements according to a filter list"
 msgstr "根據過濾清單阻擋廣告"
 
@@ -2444,69 +2434,63 @@ msgstr "安裝使用者樣式(_I)"
 msgid "Don't install"
 msgstr "不要安裝"
 
-#: ../extensions/addons.c:319
-#: ../extensions/addons.c:687
+#: ../extensions/addons.c:319 ../extensions/addons.c:677
 msgid "Userscripts"
 msgstr "使用者指令稿"
 
-#: ../extensions/addons.c:324
-#: ../extensions/addons.c:689
+#: ../extensions/addons.c:324 ../extensions/addons.c:679
 msgid "Userstyles"
 msgstr "使用者樣式"
 
-#: ../extensions/addons.c:380
-#: ../extensions/addons.c:459
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
 #: ../extensions/feed-panel/main.c:129
 msgid "Error"
 msgstr "錯誤"
 
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
 msgstr "您想要刪除「%s」嗎？"
 
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:417
 msgid "Delete user script"
 msgstr "刪除使用者指令稿"
 
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:418
 msgid "Delete user style"
 msgstr "刪除使用者樣式"
 
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "將永遠刪除 <b>%s</b> 檔案。"
 
-#: ../extensions/addons.c:576
-#: ../extensions/addons.c:653
+#: ../extensions/addons.c:566 ../extensions/addons.c:643
 msgid "Open in Text Editor"
 msgstr "以文字編輯器開啟"
 
-#: ../extensions/addons.c:578
-#: ../extensions/addons.c:662
+#: ../extensions/addons.c:568 ../extensions/addons.c:652
 msgid "Open Target Folder"
 msgstr "開啟目標資料夾"
 
-#: ../extensions/addons.c:644
+#: ../extensions/addons.c:634
 msgid "Add new addon"
 msgstr "加入新的附加元件"
 
-#: ../extensions/addons.c:670
+#: ../extensions/addons.c:660
 msgid "Remove selected addon"
 msgstr "移除所選的附加元件"
 
-#: ../extensions/addons.c:1699
-#: ../extensions/addons.c:1917
+#: ../extensions/addons.c:1689 ../extensions/addons.c:1907
 msgid "User addons"
 msgstr "使用者附加元件"
 
-#: ../extensions/addons.c:1829
+#: ../extensions/addons.c:1819
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "無法監控「%s」資料夾：%s"
 
-#: ../extensions/addons.c:1918
+#: ../extensions/addons.c:1908
 msgid "Support for userscripts and userstyles"
 msgstr "支援使用者指令稿與使用者樣式"
 
@@ -2528,8 +2512,11 @@ msgid "Delete All"
 msgstr "刪除全部"
 
 #: ../extensions/cookie-manager/cookie-manager-page.c:105
-msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter."
-msgstr "刪除所有顯示的訊餅。若有設定過濾條件，只有那些符合過濾條件的訊餅會被刪除。"
+msgid ""
+"Deletes all shown cookies. If a filter is set, only those cookies are "
+"deleted which match the filter."
+msgstr ""
+"刪除所有顯示的訊餅。若有設定過濾條件，只有那些符合過濾條件的訊餅會被刪除。"
 
 #: ../extensions/cookie-manager/cookie-manager-page.c:120
 msgid "Expand All"
@@ -2589,25 +2576,21 @@ msgstr ""
 "<b>網域</b>：%s\n"
 "<b>訊餅</b>：%d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
 msgid "Name"
 msgstr "名稱"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
 msgid "_Expand All"
 msgstr "全部擴展(_E)"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
 msgid "_Collapse All"
 msgstr "全部折疊(_C)"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "過濾條件："
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter"
-msgstr "輸入過濾條件字串，只會顯示名稱或網域符合輸入的過濾字串的訊餅"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "按名稱或網域搜尋 Cookies"
 
 #: ../extensions/cookie-manager/main.c:36
 msgid "List, view and delete cookies"
@@ -2883,16 +2866,15 @@ msgstr "狀態列特色"
 msgid "Easily toggle features on web pages on and off"
 msgstr "輕鬆開啟或關閉網頁上的功能"
 
-#: ../extensions/tab-panel.c:593
-#: ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
 msgid "Tab Panel"
 msgstr "分頁面板"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
 msgid "T_ab Panel"
 msgstr "分頁面板(_A)"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
 msgid "Show tabs in a vertical panel"
 msgstr "以垂直面板顯示分頁"
 
@@ -2904,31 +2886,33 @@ msgstr "分頁預設只使用圖示表示"
 msgid "New tabs have no label by default"
 msgstr "新分頁預設情況下沒有分頁標籤"
 
-#: ../extensions/toolbar-editor.c:390
+#: ../extensions/toolbar-editor.c:395
 msgid "Customize Toolbar"
 msgstr "自訂工具列"
 
-#: ../extensions/toolbar-editor.c:406
-msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop."
+#: ../extensions/toolbar-editor.c:411
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
 msgstr "選取工具列上要顯示的項目。這些項目可以利用拖曳方式來重新調整位置。"
 
-#: ../extensions/toolbar-editor.c:422
+#: ../extensions/toolbar-editor.c:427
 msgid "Available Items"
 msgstr "可用項目"
 
-#: ../extensions/toolbar-editor.c:443
+#: ../extensions/toolbar-editor.c:448
 msgid "Displayed Items"
 msgstr "顯示的項目"
 
-#: ../extensions/toolbar-editor.c:583
+#: ../extensions/toolbar-editor.c:588
 msgid "_Customize Toolbar…"
 msgstr "自訂工具列(_C)…"
 
-#: ../extensions/toolbar-editor.c:612
+#: ../extensions/toolbar-editor.c:617
 msgid "Toolbar Editor"
 msgstr "工具列編輯器"
 
-#: ../extensions/toolbar-editor.c:613
+#: ../extensions/toolbar-editor.c:618
 msgid "Easily edit the toolbar layout"
 msgstr "輕鬆編輯工具列配置"
 
@@ -2936,6 +2920,23 @@ msgstr "輕鬆編輯工具列配置"
 msgid "Cache HTTP communication on disk"
 msgstr "對 HTTP 通訊製作一份硬碟快取"
 
+#~ msgid "Load page"
+#~ msgstr "載入頁面"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "關閉其它分頁(_H)"
+
+#~ msgid "_Icon:"
+#~ msgstr "圖示(_I)："
+
+#~ msgid "Filter:"
+#~ msgstr "過濾條件："
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr "輸入過濾條件字串，只會顯示名稱或網域符合輸入的過濾字串的訊餅"
+
 #~ msgid "_Bookmark"
 #~ msgstr "書籤(_B)"
 
@@ -3179,11 +3180,9 @@ msgstr "對 HTTP 通訊製作一份硬碟快取"
 #~ msgid "Whether to show the transferbar"
 #~ msgstr "是否要顯示傳輸列"
 
-#, fuzzy
 #~ msgid "Search engines in location completion"
 #~ msgstr "在位置欄中顯示進度"
 
-#, fuzzy
 #~ msgid "Whether to show search engines in the location completion"
 #~ msgstr "是否要在位置欄中顯示載入進度"