Updated Traditional Chinese translation.

2005-11-19  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>

	* zh_TW.po: Updated Traditional Chinese translation.

2 files changed, 684 insertions, 586 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 4ebf33e9c..2327af666 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-19  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+	* zh_TW.po: Updated Traditional Chinese translation.
+
 2005-11-18  Ales Nyakhaychy  <nab@mail.by>
 
 	* be.po: Updated Belarusian translation.
diff --git a/po/zh_TW.po b/po/zh_TW.po
index afadaa64b..ff17b8bce 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4,20 +4,20 @@
 # Abel Cheung <maddog@linuxhall.org>, 2003.
 # Ching-Hung Lin <billlin@wshlab2.ee.kuas.edu.tw>, 2004
 # Woodman Tuen <wmtuen@gmail.com>, 2005
-#  
-# 
+#
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: epiphany 1.9.0\n"
+"Project-Id-Version: epiphany 1.9.2.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-21 18:54+0800\n"
-"PO-Revision-Date: 2005-10-20 09:25+0800\n"
-"Last-Translator: Woodman Tuen <wmtuen@gmail.com>\n"
+"POT-Creation-Date: 2005-11-19 07:08+0800\n"
+"PO-Revision-Date: 2005-11-19 07:12+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=1; plural=0;"
 
 #: ../data/GNOME_Epiphany_Automation.server.in.h:1
 msgid "Epiphany automation"
@@ -523,7 +523,7 @@ msgid "MD5 Fingerprint:"
 msgstr "MD5 數位簽章："
 
 #: ../data/glade/certificate-dialogs.glade.h:15
-#: ../embed/mozilla/GtkNSSDialogs.cpp:995
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1015
 msgid "Organization:"
 msgstr "組織："
 
@@ -551,17 +551,18 @@ msgstr "使用不同的編碼(_U)："
 msgid "Cookies"
 msgstr "Cookie"
 
-#: ../data/glade/epiphany.glade.h:4
-msgid "Download Manager"
-msgstr "下載管理員"
+#. The name of the default downloads folder
+#: ../data/glade/epiphany.glade.h:4 ../lib/ephy-file-helpers.c:96
+msgid "Downloads"
+msgstr "下載"
 
 #: ../data/glade/epiphany.glade.h:5
 msgid "Passwords"
 msgstr "密碼"
 
 #: ../data/glade/epiphany.glade.h:6
-msgid "Personal Data Manager"
-msgstr "個人資料管理員"
+msgid "Personal Data"
+msgstr "個人資料"
 
 #: ../data/glade/epiphany.glade.h:7
 msgid "Text Encoding"
@@ -571,9 +572,9 @@ msgstr "字元編碼"
 msgid "Use the encoding specified by the document"
 msgstr "使用文件指定的編碼方式"
 
-#: ../data/glade/epiphany.glade.h:9 ../embed/downloader-view.c:368
-msgid "_Pause"
-msgstr "暫停(_P)"
+#: ../data/glade/epiphany.glade.h:9
+msgid "_Show password"
+msgstr "顯示密碼(_S)"
 
 #: ../data/glade/prefs-dialog.glade.h:1 ../data/glade/print.glade.h:1
 msgid "<b>Colors</b>"
@@ -668,7 +669,7 @@ msgstr "字型及色彩"
 msgid "For l_anguage:"
 msgstr "針對語言(_A)："
 
-#: ../data/glade/prefs-dialog.glade.h:24 ../src/prefs-dialog.c:1044
+#: ../data/glade/prefs-dialog.glade.h:24 ../src/prefs-dialog.c:1037
 msgid "Language"
 msgstr "語言"
 
@@ -774,26 +775,30 @@ msgid "_Page address"
 msgstr "網頁位址(_P)"
 
 #. this opens the downloader window, or brings it to the foreground if already open
-#: ../embed/downloader-view.c:184
-msgid "_Show Downloader..."
-msgstr "顯示下載程式(_S)..."
+#: ../embed/downloader-view.c:189
+msgid "_Show Downloads"
+msgstr "顯示下載(_S)"
 
-#: ../embed/downloader-view.c:313
+#: ../embed/downloader-view.c:318
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: ../embed/downloader-view.c:317
+#: ../embed/downloader-view.c:322
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../embed/downloader-view.c:368
+#: ../embed/downloader-view.c:374
+msgid "_Pause"
+msgstr "暫停(_P)"
+
+#: ../embed/downloader-view.c:374
 msgid "_Resume"
 msgstr "續傳(_R)"
 
 #. translators: first %s is filename, "%s of %s" is current/total file size
-#: ../embed/downloader-view.c:415
+#: ../embed/downloader-view.c:421
 #, c-format
 msgid ""
 "%s\n"
@@ -802,12 +807,12 @@ msgstr ""
 "%s\n"
 "%s (共 %s)"
 
-#: ../embed/downloader-view.c:425 ../embed/downloader-view.c:430
-#: ../src/ephy-window.c:1409
+#: ../embed/downloader-view.c:431 ../embed/downloader-view.c:436
+#: ../src/ephy-window.c:1441
 msgid "Unknown"
 msgstr "不詳"
 
-#: ../embed/downloader-view.c:464
+#: ../embed/downloader-view.c:470
 #, c-format
 msgid "%d download"
 msgid_plural "%d downloads"
@@ -815,25 +820,25 @@ msgstr[0] "下載 %d 個檔案"
 
 #. Translators: The text before the "|" is context to help you decide on
 #. * the correct translation. You MUST OMIT it in the translated string.
-#: ../embed/downloader-view.c:579 ../embed/downloader-view.c:592
+#: ../embed/downloader-view.c:585 ../embed/downloader-view.c:598
 msgid "download status|Unknown"
 msgstr "不詳"
 
 #. Translators: The text before the "|" is context to help you decide on
 #. * the correct translation. You MUST OMIT it in the translated string.
-#: ../embed/downloader-view.c:584
+#: ../embed/downloader-view.c:590
 msgid "download status|Failed"
 msgstr "失敗"
 
-#: ../embed/downloader-view.c:646 ../src/bookmarks/ephy-bookmarks-editor.c:809
+#: ../embed/downloader-view.c:657 ../src/bookmarks/ephy-bookmarks-editor.c:803
 msgid "File"
 msgstr "檔案"
 
-#: ../embed/downloader-view.c:668
+#: ../embed/downloader-view.c:679
 msgid "%"
 msgstr "%"
 
-#: ../embed/downloader-view.c:679
+#: ../embed/downloader-view.c:690
 msgid "Remaining"
 msgstr "剩餘"
 
@@ -1221,15 +1226,15 @@ msgstr "烏克蘭文"
 msgid "Unknown (%s)"
 msgstr "不明 (%s)"
 
-#: ../embed/ephy-history.c:542
+#: ../embed/ephy-history.c:550
 msgid "All"
 msgstr "全部"
 
-#: ../embed/ephy-history.c:705
+#: ../embed/ephy-history.c:713
 msgid "Others"
 msgstr "其它"
 
-#: ../embed/ephy-history.c:711
+#: ../embed/ephy-history.c:719
 msgid "Local files"
 msgstr "本機檔案"
 
@@ -1253,12 +1258,12 @@ msgstr "下載這個可能不安全的檔案？"
 #: ../embed/mozilla/ContentHandler.cpp:334
 #, c-format
 msgid ""
-"File Type: %s.\n"
+"File Type: “%s”.\n"
 "\n"
-"It is unsafe to open \"%s\" as it could potentially damage your documents or "
+"It is unsafe to open “%s” as it could potentially damage your documents or "
 "invade your privacy. You can download it instead."
 msgstr ""
-"檔案類型： %s。\n"
+"檔案類型：“%s”。\n"
 "\n"
 "開啟“%s”並不安全，它有可能會破壞您的文件或侵犯您的隱私權。您可以以下載來代"
 "替。"
@@ -1273,13 +1278,13 @@ msgstr "開啟此檔案？"
 #: ../embed/mozilla/ContentHandler.cpp:351
 #, c-format
 msgid ""
-"File Type: %s.\n"
+"File Type: “%s”.\n"
 "\n"
-"You can open \"%s\" using \"%s\" or save it."
+"You can open “%s” using “%s” or save it."
 msgstr ""
-"檔案類型 %1$s。\n"
+"檔案類型：“%s”。\n"
 "\n"
-"您可以使用“%3$s”開啟“%2$s”或將它儲存。"
+"您可以使用“%s”開啟“%s”或將它儲存。"
 
 #: ../embed/mozilla/ContentHandler.cpp:359
 msgid "Download this file?"
@@ -1290,151 +1295,214 @@ msgstr "下載此檔案？"
 #: ../embed/mozilla/ContentHandler.cpp:365
 #, c-format
 msgid ""
-"File Type: %s.\n"
+"File Type: “%s”.\n"
 "\n"
-"You have no application able to open \"%s\". You can download it instead."
+"You have no application able to open “%s”. You can download it instead."
 msgstr ""
-"檔案類型 %s。\n"
+"檔案類型：“%s”。\n"
 "\n"
-"沒有任何軟體能夠開啟“%s”，您可以以下載它來代替。"
+"您沒有任何軟體能夠開啟“%s”，您可以以下載它來代替。"
 
 #: ../embed/mozilla/ContentHandler.cpp:370
 msgid "_Save As..."
 msgstr "另存新檔(_S)..."
 
 #. Translators: %s is the name of a protocol, like "http" etc.
-#: ../embed/mozilla/EphyAboutModule.cpp:199
+#: ../embed/mozilla/EphyAboutModule.cpp:207
+#, c-format
+msgid "“%s” Protocol is not Supported"
+msgstr "不支援通訊協定“%s”"
+
+#. Translators: %s is the name of a protocol, like "http" etc.
+#: ../embed/mozilla/EphyAboutModule.cpp:209
 #, c-format
 msgid "“%s” protocol is not supported."
 msgstr "不支援通訊協定“%s”。"
 
 #. FIXME: get the list of supported protocols from necko
-#: ../embed/mozilla/EphyAboutModule.cpp:201
+#: ../embed/mozilla/EphyAboutModule.cpp:211
 msgid ""
 "Supported protocols are “http”, “https”, “ftp”, “file”, “smb” and “sftp”."
 msgstr "支援的通訊協定有：“http”，“https”，“ftp”，“file”，“smb”及“sftp”。"
 
 #. Translators: %s is the path and filename, for example "/home/user/test.html"
-#: ../embed/mozilla/EphyAboutModule.cpp:210
+#: ../embed/mozilla/EphyAboutModule.cpp:220
+#, c-format
+msgid "File “%s” not Found"
+msgstr "找不到檔案“%s”"
+
+#. Translators: %s is the path and filename, for example "/home/user/test.html"
+#: ../embed/mozilla/EphyAboutModule.cpp:222
 #, c-format
 msgid "File “%s” not found."
 msgstr "無法找到檔案“%s”。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:211
+#: ../embed/mozilla/EphyAboutModule.cpp:223
 msgid "Check the location of the file and try again."
 msgstr "檢查檔案的位置及再試多次。"
 
 #. Translators: %s is the hostname, like "www.example.com"
-#: ../embed/mozilla/EphyAboutModule.cpp:219
+#: ../embed/mozilla/EphyAboutModule.cpp:231
+#, c-format
+msgid "“%s” Could not be Found"
+msgstr "找不到“%s”"
+
+#. Translators: %s is the hostname, like "www.example.com"
+#: ../embed/mozilla/EphyAboutModule.cpp:234
 #, c-format
 msgid "“%s” could not be found."
 msgstr "無法找到“%s”。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:221
+#: ../embed/mozilla/EphyAboutModule.cpp:236
 msgid ""
 "Check that you are connected to the internet, and that the address is "
 "correct."
 msgstr "檢查您是否已連接網際網路，及該地址是否正確。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:223
+#: ../embed/mozilla/EphyAboutModule.cpp:238
 msgid "If this page used to exist, you may find an archived version:"
 msgstr "如果該網頁曾經存在，您可能會找到存檔的版本："
 
-#: ../embed/mozilla/EphyAboutModule.cpp:232
+#: ../embed/mozilla/EphyAboutModule.cpp:247
+#, c-format
+msgid "“%s” Refused the Connection"
+msgstr "“%s”拒絕此次連線"
+
+#: ../embed/mozilla/EphyAboutModule.cpp:251
 #, c-format
 msgid "“%s” refused the connection."
 msgstr "“%s”拒絕連接。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:234
-#: ../embed/mozilla/EphyAboutModule.cpp:247
-#: ../embed/mozilla/EphyAboutModule.cpp:262
-#: ../embed/mozilla/EphyAboutModule.cpp:306
-#: ../embed/mozilla/EphyAboutModule.cpp:331
+#: ../embed/mozilla/EphyAboutModule.cpp:253
+#: ../embed/mozilla/EphyAboutModule.cpp:270
+#: ../embed/mozilla/EphyAboutModule.cpp:289
+#: ../embed/mozilla/EphyAboutModule.cpp:346
+#: ../embed/mozilla/EphyAboutModule.cpp:377
 msgid ""
 "The server may be busy or you may have a network connection problem. Try "
 "again later."
 msgstr "可能是伺服器繁忙或是您的網路連線有問題，請稍後再試。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:236
-#: ../embed/mozilla/EphyAboutModule.cpp:249
-#: ../embed/mozilla/EphyAboutModule.cpp:264
-#: ../embed/mozilla/EphyAboutModule.cpp:281
-#: ../embed/mozilla/EphyAboutModule.cpp:308
-#: ../embed/mozilla/EphyAboutModule.cpp:333
+#: ../embed/mozilla/EphyAboutModule.cpp:255
+#: ../embed/mozilla/EphyAboutModule.cpp:272
+#: ../embed/mozilla/EphyAboutModule.cpp:291
+#: ../embed/mozilla/EphyAboutModule.cpp:313
+#: ../embed/mozilla/EphyAboutModule.cpp:348
+#: ../embed/mozilla/EphyAboutModule.cpp:379
 msgid "There may be an old version of the page you wanted:"
 msgstr "這裡可能有您想要的網頁的舊版本："
 
-#: ../embed/mozilla/EphyAboutModule.cpp:245
+#: ../embed/mozilla/EphyAboutModule.cpp:264
+#, c-format
+msgid "“%s” Interrupted the Connection"
+msgstr "“%s”中斷此次連線"
+
+#: ../embed/mozilla/EphyAboutModule.cpp:268
 #, c-format
 msgid "“%s” interrupted the connection."
 msgstr "“%s”已中斷連線。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:258
+#: ../embed/mozilla/EphyAboutModule.cpp:281
+#, c-format
+msgid "“%s” is not Responding"
+msgstr "“%s”沒有回應"
+
+#: ../embed/mozilla/EphyAboutModule.cpp:285
 #, c-format
 msgid "“%s” is not responding."
 msgstr "“%s” 沒有回應。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:260
+#: ../embed/mozilla/EphyAboutModule.cpp:287
 msgid "The connection was lost because the server took too long to respond."
 msgstr "由於伺服服回應時間過長，連線已經取消。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:268
+#: ../embed/mozilla/EphyAboutModule.cpp:295
+msgid "Invalid Address"
+msgstr "無效的位址"
+
+#: ../embed/mozilla/EphyAboutModule.cpp:296
 msgid "Invalid address."
 msgstr "無效的地址。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:269
+#: ../embed/mozilla/EphyAboutModule.cpp:297
 msgid "The address you entered is not valid."
 msgstr "您輸入的地址無效。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:278
+#: ../embed/mozilla/EphyAboutModule.cpp:306
+#, c-format
+msgid "“%s” Redirected Too Many Times"
+msgstr "“%s” 重新導向次數太多"
+
+#: ../embed/mozilla/EphyAboutModule.cpp:310
 #, c-format
 msgid "“%s” redirected too many times."
 msgstr "“%s” 重新導向次數太多。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:280
+#: ../embed/mozilla/EphyAboutModule.cpp:312
 msgid "The redirection has been stopped for security reasons."
 msgstr "基於安全理由，重新導向已被停止。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:290
+#: ../embed/mozilla/EphyAboutModule.cpp:322
+#, c-format
+msgid "“%s” Requires an Encrypted Connection"
+msgstr "“%s” 需要已加密的連線"
+
+#: ../embed/mozilla/EphyAboutModule.cpp:326
 #, c-format
 msgid "“%s” requires an encrypted connection."
 msgstr "“%s” 需要已加密的連線"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:292
+#: ../embed/mozilla/EphyAboutModule.cpp:328
 msgid ""
 "The document could not be loaded because encryption support is not installed."
 msgstr "文件無法載入，原因是並沒有安裝加密支援。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:302
+#: ../embed/mozilla/EphyAboutModule.cpp:338
+#, c-format
+msgid "“%s” Dropped the Connection"
+msgstr "“%s”放棄此連線"
+
+#: ../embed/mozilla/EphyAboutModule.cpp:342
 #, c-format
 msgid "“%s” dropped the connection."
 msgstr "“%s”已中斷連線。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:304
-#: ../embed/mozilla/EphyAboutModule.cpp:329
+#: ../embed/mozilla/EphyAboutModule.cpp:344
+#: ../embed/mozilla/EphyAboutModule.cpp:375
 msgid "The server dropped the connection before any data could be read."
 msgstr "在讀取任何資料前伺服器已將連線中斷。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:312
-msgid "Cannot load document in offline mode."
-msgstr "無法在離線模式中載入檔案。"
+#: ../embed/mozilla/EphyAboutModule.cpp:355
+msgid "Cannot Load Document Whilst Working Offline"
+msgstr "無法在離線模式中載入文件"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:313
-msgid ""
-"This document cannot be viewed in offline mode. Set Epiphany to “online” and "
-"try again."
-msgstr "本文件無法在離線模式下顯示，請將 Epiphany 設定為「線上」及再試多次。"
+#: ../embed/mozilla/EphyAboutModule.cpp:356
+msgid "Cannot load document whilst working offline."
+msgstr "無法在離線模式中載入文件。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:327
+#: ../embed/mozilla/EphyAboutModule.cpp:357
+msgid "To view this document, disable “Work Offline” and try again."
+msgstr "要檢視此文件，請停用「離線工作」並再試一次。"
+
+#: ../embed/mozilla/EphyAboutModule.cpp:369
+#, c-format
+msgid "“%s” Denied Access to Port “%d”"
+msgstr "“%s”禁止存取連接埠“%d”"
+
+#: ../embed/mozilla/EphyAboutModule.cpp:373
 #, c-format
 msgid "“%s” denied access to port “%d”."
 msgstr "“%s”禁止存取連接埠“%d”。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:338
+#: ../embed/mozilla/EphyAboutModule.cpp:384
+msgid "Could not Connect to Proxy Server"
+msgstr "無法連接代理伺服器"
+
+#: ../embed/mozilla/EphyAboutModule.cpp:385
 msgid "Could not connect to proxy server."
 msgstr "無法連接代理伺服器。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:339
+#: ../embed/mozilla/EphyAboutModule.cpp:386
 msgid ""
 "Check your proxy server settings. If the connection still fails, there may "
 "be a problem with your proxy server or your network connection."
@@ -1442,15 +1510,19 @@ msgstr ""
 "請檢查您的代理伺服器設定，如果連線仍然失敗，這樣可能是您的代理伺服器或是您的"
 "網路連線有問題。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:346
+#: ../embed/mozilla/EphyAboutModule.cpp:394
+msgid "Could not Display Content"
+msgstr "無法顯示內容"
+
+#: ../embed/mozilla/EphyAboutModule.cpp:395
 msgid "Could not display content."
 msgstr "無法顯示內容。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:347
+#: ../embed/mozilla/EphyAboutModule.cpp:396
 msgid "The page uses an unsupported or invalid form of compression."
 msgstr "此頁面使用了不支援或無效的壓縮格式。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:431
+#: ../embed/mozilla/EphyAboutModule.cpp:486
 #, c-format
 msgid ""
 "The page “%s” in this tab was not fully loaded yet when the web browser "
@@ -1460,24 +1532,24 @@ msgstr ""
 
 #. Translators: The text before the "|" is context to help you decide on
 #. * the correct translation. You MUST OMIT it in the translated string.
-#: ../embed/mozilla/EphyAboutModule.cpp:561
+#: ../embed/mozilla/EphyAboutModule.cpp:613
 msgid "You may find an old version:|in the Google Cache"
 msgstr "於 Google 的頁庫存檔"
 
 #. Translators: The text before the "|" is context to help you decide on
 #. * the correct translation. You MUST OMIT it in the translated string.
-#: ../embed/mozilla/EphyAboutModule.cpp:569
+#: ../embed/mozilla/EphyAboutModule.cpp:621
 msgid "You may find an old version:|in the Internet Archive"
 msgstr "於‘Internet Archive’"
 
 #: ../embed/mozilla/EphyHeaderSniffer.cpp:364
 #: ../src/bookmarks/ephy-bookmarks-import.c:245
-#: ../src/bookmarks/ephy-bookmarks-ui.c:481 ../src/ephy-session.c:776
+#: ../src/bookmarks/ephy-bookmarks-ui.c:481 ../src/ephy-session.c:774
 msgid "Untitled"
 msgstr "未命名"
 
 #: ../embed/mozilla/FilePicker.cpp:152 ../embed/mozilla/FilePicker.cpp:445
-#: ../lib/ephy-file-chooser.c:371 ../src/bookmarks/ephy-bookmarks-editor.c:648
+#: ../lib/ephy-file-chooser.c:371 ../src/bookmarks/ephy-bookmarks-editor.c:642
 msgid "All files"
 msgstr "所有檔案"
 
@@ -1507,8 +1579,8 @@ msgstr "選擇憑證(_S)"
 
 #: ../embed/mozilla/GtkNSSClientAuthDialogs.cpp:203
 #, c-format
-msgid "Choose a certificate to present as identification to \"%s\"."
-msgstr "選擇一個憑證作為“%s”的辨識。"
+msgid "Choose a certificate to present as identification to “%s”."
+msgstr "選擇一個憑證作為“%s”的辨識"
 
 #: ../embed/mozilla/GtkNSSClientAuthDialogs.cpp:206
 msgid "Select a certificate to identify yourself."
@@ -1519,225 +1591,225 @@ msgid "Certificate _Details"
 msgstr "憑證詳細資料(_D)"
 
 #. Add the buttons
-#: ../embed/mozilla/GtkNSSDialogs.cpp:235
-#: ../embed/mozilla/GtkNSSDialogs.cpp:545
+#: ../embed/mozilla/GtkNSSDialogs.cpp:236
+#: ../embed/mozilla/GtkNSSDialogs.cpp:548
 msgid "_View Certificate"
 msgstr "檢視憑證(_V)"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:243
+#: ../embed/mozilla/GtkNSSDialogs.cpp:244
 msgid "_Accept"
 msgstr "接受(_A)"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:310
+#: ../embed/mozilla/GtkNSSDialogs.cpp:311
 #, c-format
 msgid ""
-"The site \"%s\" returned security information for \"%s\". It is possible "
-"that someone is intercepting your communication to obtain your confidential "
+"The site “%s” returned security information for “%s”. It is possible that "
+"someone is intercepting your communication to obtain your confidential "
 "information."
 msgstr ""
 "“%s”這個站台所回傳對於“%s”的安全資訊。可能有人正在竊聽您的連線以獲得您的機密"
 "資料。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:316
+#: ../embed/mozilla/GtkNSSDialogs.cpp:317
 #, c-format
 msgid ""
-"You should only accept the security information if you trust \"%s\" and \"%s"
-"\"."
+"You should only accept the security information if you trust “%s” and “%s”."
 msgstr "您應當只接受該安全資訊，如果您信任“%s”與“%s”。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:321
+#: ../embed/mozilla/GtkNSSDialogs.cpp:322
 msgid "Accept incorrect security information?"
 msgstr "接受不正確的安全資訊？"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:352
+#: ../embed/mozilla/GtkNSSDialogs.cpp:353
 #, c-format
 msgid ""
-"It was not possible to automatically trust \"%s\". It is possible that "
-"someone is intercepting your communication to obtain your confidential "
-"information."
+"It was not possible to automatically trust “%s”. It is possible that someone "
+"is intercepting your communication to obtain your confidential information."
 msgstr "不可能會自動地信任“%s”。可能有人正在竊聽您的連線以獲得您的機密資料。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:358
+#: ../embed/mozilla/GtkNSSDialogs.cpp:359
 #, c-format
 msgid ""
 "You should only connect to the site if you are certain you are connected to "
-"\"%s\"."
+"“%s”."
 msgstr "您應當只連接該站台如果您確認您所要連接的站台是“%s”。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:363
+#: ../embed/mozilla/GtkNSSDialogs.cpp:364
 msgid "Connect to untrusted site?"
 msgstr "連接到不信任的站台？"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:367
+#: ../embed/mozilla/GtkNSSDialogs.cpp:368
 msgid "_Trust this security information from now on"
 msgstr "現在開始信任此安全資訊(_T)"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:368
+#: ../embed/mozilla/GtkNSSDialogs.cpp:369
 msgid "Co_nnect"
 msgstr "連接(_N)"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:427
+#: ../embed/mozilla/GtkNSSDialogs.cpp:428
 msgid "Accept expired security information?"
 msgstr "接受過期的安全資訊？"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:428
+#. Translators: first %s is a hostname, second %s is a time/date
+#: ../embed/mozilla/GtkNSSDialogs.cpp:430
 #, c-format
-msgid "The security information for \"%s\" expired on %s."
+msgid "The security information for “%s” expired on %s."
 msgstr "“%s”的安全資訊已在 %s 過期。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:434
+#: ../embed/mozilla/GtkNSSDialogs.cpp:436
 msgid "Accept not yet valid security information?"
 msgstr "接受還不是有效的安全資訊？"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:435
+#. Translators: first %s is a hostname, second %s is a time/date
+#: ../embed/mozilla/GtkNSSDialogs.cpp:438
 #, c-format
-msgid "The security information for \"%s\" isn't valid until %s."
+msgid "The security information for “%s” isn't valid until %s."
 msgstr "“%s” 的安全資訊在 %s 後才有效 。"
 
 #. To translators: this a time format that is used while displaying the
 #. * expiry or start date of an SSL certificate, for the format see
 #. * strftime(3)
-#: ../embed/mozilla/GtkNSSDialogs.cpp:451
+#: ../embed/mozilla/GtkNSSDialogs.cpp:454
 msgid "%a %d %b %Y"
 msgstr "%Y年%-m月%-d日 (%a)"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:459
+#: ../embed/mozilla/GtkNSSDialogs.cpp:462
 msgid "You should ensure that your computer's time is correct."
 msgstr "您應該確保電腦的時間正確。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:505
+#: ../embed/mozilla/GtkNSSDialogs.cpp:508
 #, c-format
-msgid "Cannot establish connection to \"%s\"."
+msgid "Cannot establish connection to “%s”."
 msgstr "無法建立連線到“%s”。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:508
+#: ../embed/mozilla/GtkNSSDialogs.cpp:511
 #, c-format
-msgid "The certificate revocation list (CRL) from \"%s\" needs to be updated."
+msgid "The certificate revocation list (CRL) from “%s” needs to be updated."
 msgstr "“%s” 的憑證廢止清冊 (CRL) 需要更新。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:513
+#: ../embed/mozilla/GtkNSSDialogs.cpp:516
 msgid "Please ask your system administrator for assistance."
 msgstr "請要求您的系統管理員以獲得協助。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:543
+#: ../embed/mozilla/GtkNSSDialogs.cpp:546
 msgid "Trust new Certificate Authority?"
 msgstr "信任新的憑證管理中心(CA)？"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:548
+#: ../embed/mozilla/GtkNSSDialogs.cpp:551
 msgid "_Trust CA"
 msgstr "信任該憑證管理中心(_CA)"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:570
+#: ../embed/mozilla/GtkNSSDialogs.cpp:573
 #, c-format
-msgid "Trust new Certificate Authority \"%s\" to identify web sites?"
+msgid "Trust new Certificate Authority “%s” to identify web sites?"
 msgstr "信任新的憑證管理中心“%s”來辨識網站？"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:575
+#: ../embed/mozilla/GtkNSSDialogs.cpp:578
 msgid ""
 "Before trusting a Certificate Authority (CA) you should verify the "
 "certificate is authentic."
 msgstr "在信任一個憑證管理中心 (CA) 前，您應該驗證該憑證是可信的。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:646
+#: ../embed/mozilla/GtkNSSDialogs.cpp:649
 msgid "Certificate already exists."
 msgstr "憑證已經存在。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:647
+#: ../embed/mozilla/GtkNSSDialogs.cpp:650
 msgid "The certificate has already been imported."
 msgstr "憑證已經匯入。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:772
+#: ../embed/mozilla/GtkNSSDialogs.cpp:775
 msgid "_Backup Certificate"
 msgstr "備份憑證(_B)"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:779
+#: ../embed/mozilla/GtkNSSDialogs.cpp:782
 msgid "Select password."
 msgstr "輸入密碼。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:780
+#: ../embed/mozilla/GtkNSSDialogs.cpp:783
 msgid "Select a password to protect this certificate."
 msgstr "輸入一個密碼來保護此憑證。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:792
-#: ../embed/mozilla/GtkNSSDialogs.cpp:902
+#: ../embed/mozilla/GtkNSSDialogs.cpp:795
+#: ../embed/mozilla/GtkNSSDialogs.cpp:905
 msgid "_Password:"
 msgstr "密碼(_P)："
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:806
+#: ../embed/mozilla/GtkNSSDialogs.cpp:809
 msgid "Con_firm password:"
 msgstr "確認密碼(_F)："
 
 #. TODO: We need a better password quality meter
-#: ../embed/mozilla/GtkNSSDialogs.cpp:818
+#: ../embed/mozilla/GtkNSSDialogs.cpp:821
 msgid "Password quality:"
 msgstr "密碼品質："
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:875
+#: ../embed/mozilla/GtkNSSDialogs.cpp:878
 msgid "I_mport Certificate"
 msgstr "匯入憑證(_M)"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:891
+#: ../embed/mozilla/GtkNSSDialogs.cpp:894
 msgid "Password required."
 msgstr "須要密碼。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:892
+#: ../embed/mozilla/GtkNSSDialogs.cpp:895
 msgid "Enter the password for this certificate."
 msgstr "輸入此憑證的密碼。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:973
-msgid "Certificate Revocation list successfully imported."
-msgstr "憑證廢止清冊 (CRL) 匯入成功。"
+#: ../embed/mozilla/GtkNSSDialogs.cpp:984
+msgid "Certificate Revocation List Imported"
+msgstr "已匯入憑證廢止清冊 (CRL)"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:974
-msgid "Certificate Revocation list (CRL) imported:"
-msgstr "匯入憑證廢止清冊 (CRL)："
+#: ../embed/mozilla/GtkNSSDialogs.cpp:994
+msgid "Certificate Revocation List (CRL) successfully imported"
+msgstr "憑證廢止清冊 (CRL) 已匯入成功"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1000
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1019
 msgid "Unit:"
 msgstr "單位："
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1005
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1023
 msgid "Next Update:"
 msgstr "更新下一個："
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1032
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1050
 msgid "Not part of certificate"
 msgstr "非憑證的一部份"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1318
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1340
 msgid "Certificate Properties"
 msgstr "憑證屬性"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1340
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1362
 msgid "This certificate has been verified for the following uses:"
 msgstr "此憑證已經被驗證，可以使用於以下目的："
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1343
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1365
 msgid "Could not verify this certificate because it has been revoked."
 msgstr "因為此憑證已經被廢止所以無法驗證。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1346
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1368
 msgid "Could not verify this certificate because it has expired."
 msgstr "因為此憑證已過期所以無法驗證。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1349
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1371
 msgid "Could not verify this certificate because it is not trusted."
 msgstr "因為此憑證為不可信任所以無法驗證。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1352
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1374
 msgid "Could not verify this certificate because the issuer is not trusted."
 msgstr "因為發行者為不可信任的所以無法驗證此憑證。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1355
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1377
 msgid "Could not verify this certificate because the issuer is unknown."
 msgstr "因為發行者為不明所以無法驗證此憑證。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1358
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1380
 msgid ""
 "Could not verify this certificate because the CA certificate is invalid."
 msgstr "無法驗證此憑證，因為 CA 憑證無效。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1363
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1385
 msgid "Could not verify this certificate for unknown reasons."
 msgstr "因為不明原因無法驗證此憑證。"
 
@@ -1816,7 +1888,7 @@ msgstr ""
 "雖然這頁是以安全連線載入，但您輸入的資料會以不安全的連線送出，這會很容易被第"
 "三者竊聽。"
 
-#: ../embed/mozilla/MozDownload.cpp:759
+#: ../embed/mozilla/MozDownload.cpp:758
 msgid "Files"
 msgstr "檔案"
 
@@ -1838,44 +1910,44 @@ msgstr "http://www.google.com.tw/webhp?ie=UTF-8&oe=UTF-8&q="
 msgid "Epiphany can't be used now. Mozilla initialization failed."
 msgstr "Epiphany 目前無法使用，因為 Mozilla 初始化程序失敗。"
 
-#: ../embed/print-dialog.c:276
+#: ../embed/print-dialog.c:268
 msgid "Generating PDF is not supported"
 msgstr "不支援產生 PDF 文件"
 
-#: ../embed/print-dialog.c:283
+#: ../embed/print-dialog.c:275
 msgid "Printing is not supported on this printer"
 msgstr "本印表機不支援列印"
 
-#: ../embed/print-dialog.c:286
+#: ../embed/print-dialog.c:278
 #, c-format
 msgid ""
-"You were trying to print to a printer using the \"%s\" driver. This program "
+"You were trying to print to a printer using the “%s” driver. This program "
 "requires a PostScript printer driver."
 msgstr ""
 "您嘗試使用驅動程式“%s”來列印至印表機。這軟體需要 PostScript 的印表機驅動程"
 "式。"
 
-#: ../embed/print-dialog.c:400
+#: ../embed/print-dialog.c:392
 msgid "_From:"
 msgstr "從(_F)："
 
-#: ../embed/print-dialog.c:413
+#: ../embed/print-dialog.c:405
 msgid "Sets the start of the range of pages to be printed"
 msgstr "設定列印範圍的第一頁"
 
-#: ../embed/print-dialog.c:415
+#: ../embed/print-dialog.c:407
 msgid "_To:"
 msgstr "至(_T)："
 
-#: ../embed/print-dialog.c:428
+#: ../embed/print-dialog.c:420
 msgid "Sets the end of the range of pages to be printed"
 msgstr "設定列印範圍的最後一頁"
 
-#: ../embed/print-dialog.c:443 ../src/ephy-window.c:1226
+#: ../embed/print-dialog.c:435 ../src/ephy-window.c:1272
 msgid "Print"
 msgstr "列印"
 
-#: ../embed/print-dialog.c:451
+#: ../embed/print-dialog.c:443
 msgid "Pages"
 msgstr "頁"
 
@@ -1900,7 +1972,7 @@ msgstr "從工具列中移除(_R)"
 msgid "_Remove Toolbar"
 msgstr "移除工具列(_R)"
 
-#: ../lib/egg/egg-toolbar-editor.c:440
+#: ../lib/egg/egg-toolbar-editor.c:439
 msgid "Separator"
 msgstr "分隔線"
 
@@ -1908,48 +1980,45 @@ msgstr "分隔線"
 msgid "All supported types"
 msgstr "所有支援的類型"
 
-#. The name of the default downloads folder
-#: ../lib/ephy-file-helpers.c:96
-msgid "Downloads"
-msgstr "下載"
-
-#: ../lib/ephy-file-helpers.c:270
+#: ../lib/ephy-file-helpers.c:312
 #, c-format
 msgid "%s exists, please move it out of the way."
 msgstr "%s 已經存在，請先將它移至其它位置。"
 
-#: ../lib/ephy-file-helpers.c:276
+#: ../lib/ephy-file-helpers.c:318
 #, c-format
 msgid "Failed to create directory %s."
 msgstr "無法建立目錄 %s 。"
 
 #: ../lib/ephy-gui.c:328
 #, c-format
-msgid "Directory %s is not writable"
-msgstr "目錄 %s 是不能寫入"
+msgid "Directory “%s” is not writable"
+msgstr "目錄“%s”是不能寫入的"
 
 #: ../lib/ephy-gui.c:332
 msgid "You do not have permission to create files in this directory."
 msgstr "您沒有在該目錄建立檔案的權限。"
 
 #: ../lib/ephy-gui.c:335
-msgid "Directory not writable"
-msgstr "目錄不能寫入"
+msgid "Directory not Writable"
+msgstr "目錄無法寫入"
 
 #: ../lib/ephy-gui.c:365
 #, c-format
-msgid "File %s is not writable"
-msgstr "檔案 %s 是不能寫入"
+msgid "Cannot overwrite existing file “%s”"
+msgstr "不能覆寫既存檔案「%s」"
 
 #: ../lib/ephy-gui.c:369
-msgid "You do not have permission to overwrite this file."
-msgstr "您沒有複寫該檔案的權限。"
+msgid ""
+"A file with this name alreay exists and you don't have permission to "
+"overwrite it."
+msgstr "以此為名的檔案已經存在而您沒有權限可以覆寫它。"
 
-#: ../lib/ephy-gui.c:371
-msgid "File not writable"
-msgstr "檔案不能寫入"
+#: ../lib/ephy-gui.c:372
+msgid "Cannot Overwrite File"
+msgstr "無法覆寫檔案"
 
-#: ../lib/ephy-gui.c:408
+#: ../lib/ephy-gui.c:409
 #, c-format
 msgid "Could not display help: %s"
 msgstr "無法顯示說明文件：%s"
@@ -2122,13 +2191,13 @@ msgstr "彈出式視窗"
 msgid "History"
 msgstr "瀏覽紀錄"
 
-#: ../lib/ephy-stock-icons.c:57 ../src/bookmarks/ephy-bookmarks-editor.c:690
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1541
-#: ../src/bookmarks/ephy-topic-action.c:344 ../src/ephy-window.c:1232
+#: ../lib/ephy-stock-icons.c:57 ../src/bookmarks/ephy-bookmarks-editor.c:684
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1535
+#: ../src/bookmarks/ephy-topic-action.c:344 ../src/ephy-window.c:1278
 msgid "Bookmarks"
 msgstr "書籤"
 
-#: ../lib/ephy-stock-icons.c:58 ../src/ephy-toolbar.c:309
+#: ../lib/ephy-stock-icons.c:58 ../src/ephy-toolbar.c:312
 msgid "Address Entry"
 msgstr "網址輸入欄"
 
@@ -2172,15 +2241,15 @@ msgstr "300%"
 msgid "400%"
 msgstr "400%"
 
-#: ../lib/widgets/ephy-location-entry.c:672
+#: ../lib/widgets/ephy-location-entry.c:818
 msgid "Drag and drop this icon to create a link to this page"
 msgstr "拖放這個圖示來建立連至該網頁的連結"
 
-#: ../plugins/desktop-file/plugin.cpp:260
+#: ../plugins/desktop-file/plugin.cpp:263
 msgid "Unsafe protocol."
 msgstr "不安全的協定。"
 
-#: ../plugins/desktop-file/plugin.cpp:261
+#: ../plugins/desktop-file/plugin.cpp:264
 msgid ""
 "The address has not been loaded, because it refers to an unsafe protocol and "
 "thereby presents a security risk to your system."
@@ -2188,20 +2257,20 @@ msgstr ""
 "這個位址尚未被載入，因為他指向一個不安全的通訊協定並且可能對您的系統造成安全"
 "性的風險。"
 
-#: ../plugins/desktop-file/plugin.cpp:287
+#: ../plugins/desktop-file/plugin.cpp:290
 msgid "No address found."
 msgstr "找不到位址"
 
-#: ../plugins/desktop-file/plugin.cpp:288
+#: ../plugins/desktop-file/plugin.cpp:291
 msgid "No web address could be found in this file."
 msgstr "在這個檔案中找不到任何網頁位址。"
 
 #. Translators: "Desktop File" refers to .desktop files containing a link
-#: ../plugins/desktop-file/plugin.cpp:323
+#: ../plugins/desktop-file/plugin.cpp:326
 msgid "Epiphany Desktop File Plugin"
 msgstr "Epiphany 桌面檔案外掛程式"
 
-#: ../plugins/desktop-file/plugin.cpp:327
+#: ../plugins/desktop-file/plugin.cpp:330
 msgid "This plugin handles “.desktop” files containing web links."
 msgstr "這個外掛程式可以處理包含網頁連結的“.desktop”檔案。"
 
@@ -2211,8 +2280,8 @@ msgid "%s:"
 msgstr "%s："
 
 #: ../src/bookmarks/ephy-bookmark-action.c:395
-#: ../src/bookmarks/ephy-bookmarks-editor.c:180
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1168
+#: ../src/bookmarks/ephy-bookmarks-editor.c:176
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1162
 #: ../src/ephy-history-window.c:173 ../src/ephy-history-window.c:711
 msgid "Open in New _Tab"
 msgid_plural "Open in New _Tabs"
@@ -2220,8 +2289,8 @@ msgstr[0] "在新的分頁中開啟(_T)"
 
 #. File Menu
 #: ../src/bookmarks/ephy-bookmark-action.c:401
-#: ../src/bookmarks/ephy-bookmarks-editor.c:177
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1165
+#: ../src/bookmarks/ephy-bookmarks-editor.c:173
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1159
 #: ../src/ephy-history-window.c:170 ../src/ephy-history-window.c:708
 msgid "Open in New _Window"
 msgid_plural "Open in New _Windows"
@@ -2229,8 +2298,8 @@ msgstr[0] "在新的視窗中開啟(_W)"
 
 #: ../src/bookmarks/ephy-bookmark-properties.c:225
 #, c-format
-msgid "%s Properties"
-msgstr "%s 屬性"
+msgid "“%s” Properties"
+msgstr "“%s”屬性"
 
 #: ../src/bookmarks/ephy-bookmark-properties.c:321
 #: ../src/bookmarks/ephy-new-bookmark.c:231
@@ -2242,198 +2311,198 @@ msgstr "標題(_T)："
 msgid "To_pics:"
 msgstr "主題(_P)："
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:138
+#: ../src/bookmarks/ephy-bookmarks-editor.c:134
 msgid "Remove from this topic"
 msgstr "從本主題中刪除"
 
 #. Toplevel
-#: ../src/bookmarks/ephy-bookmarks-editor.c:167
-#: ../src/ephy-history-window.c:163 ../src/ephy-window.c:114
+#: ../src/bookmarks/ephy-bookmarks-editor.c:163
+#: ../src/ephy-history-window.c:163 ../src/ephy-window.c:115
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:168
-#: ../src/ephy-history-window.c:164 ../src/ephy-window.c:115
+#: ../src/bookmarks/ephy-bookmarks-editor.c:164
+#: ../src/ephy-history-window.c:164 ../src/ephy-window.c:116
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:169
-#: ../src/ephy-history-window.c:165 ../src/ephy-window.c:116
+#: ../src/bookmarks/ephy-bookmarks-editor.c:165
+#: ../src/ephy-history-window.c:165 ../src/ephy-window.c:117
 msgid "_View"
 msgstr "顯示(_V)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:170
-#: ../src/ephy-history-window.c:166 ../src/ephy-window.c:121
+#: ../src/bookmarks/ephy-bookmarks-editor.c:166
+#: ../src/ephy-history-window.c:166 ../src/ephy-window.c:122
 msgid "_Help"
 msgstr "求助(_H)"
 
 #. File Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:174
-#: ../src/bookmarks/ephy-new-bookmark.c:305
+#: ../src/bookmarks/ephy-bookmarks-editor.c:170
+#: ../src/bookmarks/ephy-new-bookmark.c:294
 msgid "_New Topic"
 msgstr "新增主題(_N)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:175
+#: ../src/bookmarks/ephy-bookmarks-editor.c:171
 msgid "Create a new topic"
 msgstr "建立新的主題"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:178
+#: ../src/bookmarks/ephy-bookmarks-editor.c:174
 msgid "Open the selected bookmark in a new window"
 msgstr "在新的視窗中開啟已選的書籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:181
+#: ../src/bookmarks/ephy-bookmarks-editor.c:177
 msgid "Open the selected bookmark in a new tab"
 msgstr "在新的分頁中開啟已選的書籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:183
+#: ../src/bookmarks/ephy-bookmarks-editor.c:179
 msgid "_Rename..."
 msgstr "重新命名(_R)..."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:184
+#: ../src/bookmarks/ephy-bookmarks-editor.c:180
 msgid "Rename the selected bookmark or topic"
 msgstr "更改已選的書籤或主題的名稱"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:185
+#: ../src/bookmarks/ephy-bookmarks-editor.c:181
 #: ../src/ephy-history-window.c:176
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:186
+#: ../src/bookmarks/ephy-bookmarks-editor.c:182
 msgid "Delete the selected bookmark or topic"
 msgstr "刪除已選的書籤或主題"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:188
+#: ../src/bookmarks/ephy-bookmarks-editor.c:184
 msgid "_Properties"
 msgstr "屬性(_P)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:189
+#: ../src/bookmarks/ephy-bookmarks-editor.c:185
 msgid "View or modify the properties of the selected bookmark"
 msgstr "顯示或修改已選書籤的屬性"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:191
+#: ../src/bookmarks/ephy-bookmarks-editor.c:187
 msgid "_Import Bookmarks..."
 msgstr "匯入書籤(_I)..."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:192
+#: ../src/bookmarks/ephy-bookmarks-editor.c:188
 msgid "Import bookmarks from another browser or a bookmarks file"
 msgstr "從其它瀏覽器或書籤檔匯入書籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:194
+#: ../src/bookmarks/ephy-bookmarks-editor.c:190
 msgid "_Export Bookmarks..."
 msgstr "匯出書籤(_E)..."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:195
+#: ../src/bookmarks/ephy-bookmarks-editor.c:191
 msgid "Export bookmarks to a file"
 msgstr "將書籤匯出到檔案"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:197
-#: ../src/ephy-history-window.c:182 ../src/ephy-window.c:154
+#: ../src/bookmarks/ephy-bookmarks-editor.c:193
+#: ../src/ephy-history-window.c:182 ../src/ephy-window.c:152
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:198
+#: ../src/bookmarks/ephy-bookmarks-editor.c:194
 msgid "Close the bookmarks window"
 msgstr "關閉書籤視窗"
 
 #. Edit Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:202
-#: ../src/ephy-history-window.c:187 ../src/ephy-window.c:166
+#: ../src/bookmarks/ephy-bookmarks-editor.c:198
+#: ../src/ephy-history-window.c:187 ../src/ephy-window.c:164
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:203
-#: ../src/ephy-history-window.c:188 ../src/ephy-window.c:167
+#: ../src/bookmarks/ephy-bookmarks-editor.c:199
+#: ../src/ephy-history-window.c:188 ../src/ephy-window.c:165
 msgid "Cut the selection"
 msgstr "剪下選定的內容"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:205
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1178
+#: ../src/bookmarks/ephy-bookmarks-editor.c:201
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1172
 #: ../src/ephy-history-window.c:190 ../src/ephy-history-window.c:721
-#: ../src/ephy-window.c:169
+#: ../src/ephy-window.c:167
 msgid "_Copy"
 msgstr "複製(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:206
-#: ../src/ephy-history-window.c:191 ../src/ephy-window.c:170
+#: ../src/bookmarks/ephy-bookmarks-editor.c:202
+#: ../src/ephy-history-window.c:191 ../src/ephy-window.c:168
 msgid "Copy the selection"
 msgstr "複製選定的內容"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:208
-#: ../src/ephy-history-window.c:193 ../src/ephy-window.c:172
+#: ../src/bookmarks/ephy-bookmarks-editor.c:204
+#: ../src/ephy-history-window.c:193 ../src/ephy-window.c:170
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:209
+#: ../src/bookmarks/ephy-bookmarks-editor.c:205
 #: ../src/ephy-history-window.c:194
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿中的內容"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:211
-#: ../src/ephy-history-window.c:196 ../src/ephy-window.c:175
+#: ../src/bookmarks/ephy-bookmarks-editor.c:207
+#: ../src/ephy-history-window.c:196 ../src/ephy-window.c:173
 msgid "Select _All"
 msgstr "全部選取(_A)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:212
+#: ../src/bookmarks/ephy-bookmarks-editor.c:208
 msgid "Select all bookmarks or text"
 msgstr "選取所有書籤或文字"
 
 #. Help Menu
 #. Help menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:216
-#: ../src/ephy-history-window.c:204 ../src/ephy-window.c:273
+#: ../src/bookmarks/ephy-bookmarks-editor.c:212
+#: ../src/ephy-history-window.c:204 ../src/ephy-window.c:259
 msgid "_Contents"
 msgstr "內容(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:217
+#: ../src/bookmarks/ephy-bookmarks-editor.c:213
 msgid "Display bookmarks help"
 msgstr "顯示書籤說明文件"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:219
-#: ../src/ephy-history-window.c:207 ../src/ephy-window.c:276
+#: ../src/bookmarks/ephy-bookmarks-editor.c:215
+#: ../src/ephy-history-window.c:207 ../src/ephy-window.c:262
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:220
-#: ../src/ephy-history-window.c:208 ../src/ephy-window.c:277
+#: ../src/bookmarks/ephy-bookmarks-editor.c:216
+#: ../src/ephy-history-window.c:208 ../src/ephy-window.c:263
 msgid "Display credits for the web browser creators"
 msgstr "鳴謝所有這個網頁瀏覽器的創作者"
 
 #. View Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:234
+#: ../src/bookmarks/ephy-bookmarks-editor.c:229
 #: ../src/ephy-history-window.c:222
 msgid "_Title"
 msgstr "標題(_T)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:235
+#: ../src/bookmarks/ephy-bookmarks-editor.c:230
 #: ../src/ephy-history-window.c:223
 msgid "Show only the title column"
 msgstr "只顯示標題欄位"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:236
+#: ../src/bookmarks/ephy-bookmarks-editor.c:231
 #: ../src/ephy-history-window.c:226
 msgid "T_itle and Address"
 msgstr "標題及網址(_I)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:237
+#: ../src/bookmarks/ephy-bookmarks-editor.c:232
 #: ../src/ephy-history-window.c:227
 msgid "Show both the title and address columns"
 msgstr "同時顯示標題及網址欄位"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:279
+#: ../src/bookmarks/ephy-bookmarks-editor.c:273
 #: ../src/bookmarks/ephy-topics-selector.c:319
 msgid "Type a topic"
 msgstr "請輸入主題名稱"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:397
+#: ../src/bookmarks/ephy-bookmarks-editor.c:391
 #, c-format
-msgid "Delete topic \"%s\"?"
+msgid "Delete topic “%s”?"
 msgstr "刪除主題“%s”？"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:400
+#: ../src/bookmarks/ephy-bookmarks-editor.c:394
 msgid "Delete this topic?"
 msgstr "刪除本主題？"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:402
+#: ../src/bookmarks/ephy-bookmarks-editor.c:396
 msgid ""
 "Deleting this topic will cause all its bookmarks to become uncategorized, "
 "unless they also belong to other topics. The bookmarks will not be deleted."
@@ -2441,114 +2510,114 @@ msgstr ""
 "刪除本主題會使得所有在它之下而且不隸於其它主題的書籤變成沒有分類，但書籤不會"
 "被刪除。"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:405
+#: ../src/bookmarks/ephy-bookmarks-editor.c:399
 msgid "_Delete Topic"
 msgstr "刪除主題(_D)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:511
+#: ../src/bookmarks/ephy-bookmarks-editor.c:505
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:515
-#: ../src/bookmarks/ephy-bookmarks-editor.c:519
+#: ../src/bookmarks/ephy-bookmarks-editor.c:509
+#: ../src/bookmarks/ephy-bookmarks-editor.c:513
 msgid "Firebird"
 msgstr "Firebird"
 
 #. Translators: The %s is the name of a Mozilla profile.
-#: ../src/bookmarks/ephy-bookmarks-editor.c:524
+#: ../src/bookmarks/ephy-bookmarks-editor.c:518
 #, c-format
-msgid "Mozilla \"%s\" profile"
-msgstr "Mozilla “%s” profile"
+msgid "Mozilla “%s” profile"
+msgstr "Mozilla“%s”設定組合"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:528
+#: ../src/bookmarks/ephy-bookmarks-editor.c:522
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:532
+#: ../src/bookmarks/ephy-bookmarks-editor.c:526
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:561
+#: ../src/bookmarks/ephy-bookmarks-editor.c:555
 msgid "Import failed"
 msgstr "匯入失敗"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:563
+#: ../src/bookmarks/ephy-bookmarks-editor.c:557
 msgid "Import Failed"
 msgstr "匯入失敗"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:566
+#: ../src/bookmarks/ephy-bookmarks-editor.c:560
 #, c-format
 msgid ""
-"The bookmarks from \"%s\" could not be imported because the file is "
-"corrupted or of an unsupported type."
+"The bookmarks from “%s” could not be imported because the file is corrupted "
+"or of an unsupported type."
 msgstr "無法從“%s”匯入書籤，原因是該檔可能已經受損或是不支援的格式。"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:629
+#: ../src/bookmarks/ephy-bookmarks-editor.c:623
 msgid "Import bookmarks from file"
 msgstr "從檔案匯入書籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:636
+#: ../src/bookmarks/ephy-bookmarks-editor.c:630
 msgid "Firefox/Mozilla bookmarks"
 msgstr "Firefox/Mozilla 書籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:640
+#: ../src/bookmarks/ephy-bookmarks-editor.c:634
 msgid "Galeon/Konqueror bookmarks"
 msgstr "Galeon/Konqueror 書籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:644
+#: ../src/bookmarks/ephy-bookmarks-editor.c:638
 msgid "Epiphany bookmarks"
 msgstr "Epiphany 書籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:678
+#: ../src/bookmarks/ephy-bookmarks-editor.c:672
 msgid "Export Bookmarks"
 msgstr "匯出書籤"
 
 #. Make a format selection combo & label
-#: ../src/bookmarks/ephy-bookmarks-editor.c:693
+#: ../src/bookmarks/ephy-bookmarks-editor.c:687
 msgid "File format:"
 msgstr "檔案格式："
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:696
+#: ../src/bookmarks/ephy-bookmarks-editor.c:690
 msgid "Epiphany (RDF)"
 msgstr "Epiphany (RDF)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:697
+#: ../src/bookmarks/ephy-bookmarks-editor.c:691
 msgid "Mozilla (HTML)"
 msgstr "Mozilla (HTML)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:769
+#: ../src/bookmarks/ephy-bookmarks-editor.c:763
 msgid "Import Bookmarks"
 msgstr "匯入書籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:775
+#: ../src/bookmarks/ephy-bookmarks-editor.c:769
 msgid "I_mport"
 msgstr "匯入(_M)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:789
+#: ../src/bookmarks/ephy-bookmarks-editor.c:783
 msgid "Import bookmarks from:"
 msgstr "匯入書籤的來源："
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1174
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1168
 #: ../src/ephy-history-window.c:717
 msgid "_Copy Address"
 msgstr "複製網址(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1408
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1402
 #: ../src/ephy-history-window.c:1033
 msgid "_Search:"
 msgstr "搜尋(_S)："
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1603
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1597
 #: ../src/bookmarks/ephy-topics-selector.c:198
 msgid "Topics"
 msgstr "主題"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1673
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1667
 #: ../src/ephy-history-window.c:1316
 msgid "Title"
 msgstr "標題"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1679
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1673
 #: ../src/ephy-history-window.c:1322
 msgid "Address"
 msgstr "網址"
@@ -2568,72 +2637,72 @@ msgstr ""
 "http://www.google.com.hk/search?ie=UTF-8&oe=UTF-8&hl=zh-TW&lr=lang_zh-TW%%"
 "7Clang_zh-CN&q=%s"
 
-#: ../src/bookmarks/ephy-bookmarks.c:102
+#: ../src/bookmarks/ephy-bookmarks.c:101
 msgid "Entertainment"
 msgstr "娛樂"
 
-#: ../src/bookmarks/ephy-bookmarks.c:103
+#: ../src/bookmarks/ephy-bookmarks.c:102
 msgid "News"
 msgstr "新聞"
 
-#: ../src/bookmarks/ephy-bookmarks.c:104
+#: ../src/bookmarks/ephy-bookmarks.c:103
 msgid "Shopping"
 msgstr "購物"
 
-#: ../src/bookmarks/ephy-bookmarks.c:105
+#: ../src/bookmarks/ephy-bookmarks.c:104
 msgid "Sports"
 msgstr "運動"
 
-#: ../src/bookmarks/ephy-bookmarks.c:106
+#: ../src/bookmarks/ephy-bookmarks.c:105
 msgid "Travel"
 msgstr "旅遊"
 
-#: ../src/bookmarks/ephy-bookmarks.c:107
+#: ../src/bookmarks/ephy-bookmarks.c:106
 msgid "Work"
 msgstr "工作"
 
 #. translators: the %s is the title of the bookmark
-#: ../src/bookmarks/ephy-bookmarks.c:473
+#: ../src/bookmarks/ephy-bookmarks.c:471
 #, c-format
-msgid "Update bookmark \"%s\"?"
+msgid "Update bookmark “%s”?"
 msgstr "更新書籤“%s”？"
 
 #. translators: the %s is a URL
-#: ../src/bookmarks/ephy-bookmarks.c:478
+#: ../src/bookmarks/ephy-bookmarks.c:476
 #, c-format
-msgid "The bookmarked page has moved to \"%s\"."
+msgid "The bookmarked page has moved to “%s”."
 msgstr "書籤中的網頁已移至“%s”。"
 
-#: ../src/bookmarks/ephy-bookmarks.c:482
+#: ../src/bookmarks/ephy-bookmarks.c:480
 msgid "_Don't Update"
 msgstr "不要更新(_D)"
 
-#: ../src/bookmarks/ephy-bookmarks.c:484
+#: ../src/bookmarks/ephy-bookmarks.c:482
 msgid "_Update"
 msgstr "更新(_U)"
 
-#: ../src/bookmarks/ephy-bookmarks.c:487
+#: ../src/bookmarks/ephy-bookmarks.c:485
 msgid "Update Bookmark?"
 msgstr "更新書籤？"
 
 #. Translators: The text before the "|" is context to help you decide on
 #. * the correct translation. You MUST OMIT it in the translated string.
 #. Translators: this topic contains all bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:875
+#: ../src/bookmarks/ephy-bookmarks.c:873
 msgid "bookmarks|All"
 msgstr "全部"
 
 #. Translators: The text before the "|" is context to help you decide on
 #. * the correct translation. You MUST OMIT it in the translated string.
 #. Translators: this topic contains the most used bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:911
+#: ../src/bookmarks/ephy-bookmarks.c:909
 msgid "bookmarks|Most Visited"
 msgstr "最常瀏覽"
 
 #. Translators: The text before the "|" is context to help you decide on
 #. * the correct translation. You MUST OMIT it in the translated string.
 #. Translators: this topic contains the not categorized bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:930
+#: ../src/bookmarks/ephy-bookmarks.c:928
 msgid "bookmarks|Not Categorized"
 msgstr "未分類"
 
@@ -2641,31 +2710,24 @@ msgstr "未分類"
 #. * the correct translation. You MUST OMIT it in the translated string.
 #. Translators: this is an automatic topic containing local websites bookmarks
 #. * autodiscovered with zeroconf.
-#: ../src/bookmarks/ephy-bookmarks.c:955
+#: ../src/bookmarks/ephy-bookmarks.c:953
 msgid "bookmarks|Local Sites"
 msgstr "本地網站"
 
-#: ../src/bookmarks/ephy-new-bookmark.c:268
-msgid ""
-"Each • highlights a topic to consider, derived from your current selections "
-"and existing bookmarks."
-msgstr ""
-"每個• 都突顯的一個要考慮的主題，它是從你目前的選擇區與既存的書籤中所取得的。"
-
-#: ../src/bookmarks/ephy-new-bookmark.c:286
+#: ../src/bookmarks/ephy-new-bookmark.c:275
 msgid "Add Bookmark"
 msgstr "加入書籤"
 
-#: ../src/bookmarks/ephy-new-bookmark.c:323
+#: ../src/bookmarks/ephy-new-bookmark.c:312
 #, c-format
-msgid "You already have a bookmark titled \"%s\" for this page."
+msgid "You already have a bookmark titled “%s” for this page."
 msgstr "該頁已經有一個書籤，它的標題為“%s”。"
 
-#: ../src/bookmarks/ephy-new-bookmark.c:335
+#: ../src/bookmarks/ephy-new-bookmark.c:324
 msgid "_View Properties"
 msgstr "顯示屬性(_V)"
 
-#: ../src/bookmarks/ephy-new-bookmark.c:340
+#: ../src/bookmarks/ephy-new-bookmark.c:329
 msgid "Duplicated Bookmark"
 msgstr "重複的書籤"
 
@@ -2685,7 +2747,7 @@ msgstr "相關的"
 msgid "Quick Topic"
 msgstr "快速主題"
 
-#: ../src/ephy-encoding-dialog.c:310
+#: ../src/ephy-encoding-dialog.c:313
 msgid "Encodings"
 msgstr "編碼(_E)"
 
@@ -2701,32 +2763,40 @@ msgstr "其他字元編碼方式"
 msgid "_Automatic"
 msgstr "自動(_A)"
 
-#: ../src/ephy-find-toolbar.c:438
-msgid "Find:"
-msgstr "尋找："
+#: ../src/ephy-find-toolbar.c:130
+msgid "Phrase not found"
+msgstr "找不到詞語"
 
-#: ../src/ephy-find-toolbar.c:454 ../src/ephy-find-toolbar.c:455
-msgid "Find Next"
-msgstr "找下一個"
+#: ../src/ephy-find-toolbar.c:133
+msgid "Find wrapped"
+msgstr "折返尋找"
 
-#: ../src/ephy-find-toolbar.c:458
-msgid "Find next occurrence of the search string"
-msgstr "尋找下一個出現搜尋字串的地方"
+#: ../src/ephy-find-toolbar.c:481
+msgid "Find:"
+msgstr "尋找："
 
-#: ../src/ephy-find-toolbar.c:465 ../src/ephy-find-toolbar.c:466
+#: ../src/ephy-find-toolbar.c:497 ../src/ephy-find-toolbar.c:498
 msgid "Find Previous"
 msgstr "找上一個"
 
-#: ../src/ephy-find-toolbar.c:469
+#: ../src/ephy-find-toolbar.c:501
 msgid "Find previous occurrence of the search string"
 msgstr "尋找上一個出現搜尋字串的地方"
 
+#: ../src/ephy-find-toolbar.c:508 ../src/ephy-find-toolbar.c:509
+msgid "Find Next"
+msgstr "找下一個"
+
+#: ../src/ephy-find-toolbar.c:512
+msgid "Find next occurrence of the search string"
+msgstr "尋找下一個出現搜尋字串的地方"
+
 #. exit button
-#: ../src/ephy-fullscreen-popup.c:277 ../src/ephy-toolbar.c:574
+#: ../src/ephy-fullscreen-popup.c:277 ../src/ephy-toolbar.c:583
 msgid "Leave Fullscreen"
 msgstr "離開全螢幕"
 
-#: ../src/ephy-go-action.c:71 ../src/ephy-toolbar.c:339
+#: ../src/ephy-go-action.c:71 ../src/ephy-toolbar.c:342
 msgid "Go"
 msgstr "前往"
 
@@ -2793,8 +2863,8 @@ msgid "Clear History"
 msgstr "清除瀏覽紀錄"
 
 #: ../src/ephy-history-window.c:1042
-msgid "Last 30 Minutes"
-msgstr "最近 30 分鐘"
+msgid "Last 30 minutes"
+msgstr "前 30 分鐘"
 
 #: ../src/ephy-history-window.c:1043
 msgid "Today"
@@ -2905,39 +2975,34 @@ msgid ""
 msgstr ""
 "Epiphany 現在無法使用，因為 Bonobo 試圖定位自動化物件時發生意外的錯誤。"
 
-#: ../src/ephy-tab.c:489 ../src/ephy-tab.c:2240 ../src/ephy-tab.c:2275
+#: ../src/ephy-tab.c:481 ../src/ephy-tab.c:2264 ../src/ephy-tab.c:2299
 msgid "Blank page"
 msgstr "空白頁面"
 
 #. translators: %s here is the address of the web page
-#: ../src/ephy-tab.c:921
+#: ../src/ephy-tab.c:916 ../src/ephy-tab.c:1667
 #, c-format
 msgid "Loading “%s”..."
 msgstr "正在載入“%s”..."
 
-#: ../src/ephy-tab.c:925
+#: ../src/ephy-tab.c:920
 msgid "Loading..."
 msgstr "載入中..."
 
-#: ../src/ephy-tab.c:1627
+#: ../src/ephy-tab.c:1651
 #, c-format
-msgid "Redirecting to %s..."
-msgstr "重新導向至 %s..."
+msgid "Redirecting to “%s”..."
+msgstr "重新導向至“%s”..."
 
-#: ../src/ephy-tab.c:1631
+#: ../src/ephy-tab.c:1655
 #, c-format
-msgid "Transferring data from %s..."
-msgstr "正在從 %s 傳送資料..."
+msgid "Transferring data from “%s”..."
+msgstr "正在從“%s”傳送資料..."
 
-#: ../src/ephy-tab.c:1635
+#: ../src/ephy-tab.c:1659
 #, c-format
-msgid "Waiting for authorization from %s..."
-msgstr "正在等待 %s 發出授權..."
-
-#: ../src/ephy-tab.c:1643
-#, c-format
-msgid "Loading %s..."
-msgstr "正在載入 %s..."
+msgid "Waiting for authorization from “%s”..."
+msgstr "正在等待“%s”發出授權..."
 
 #: ../src/ephy-tabs-menu.c:148
 msgid "Switch to this tab"
@@ -2963,12 +3028,12 @@ msgid "_Add a New Toolbar"
 msgstr "新增工具列(_A)"
 
 #: ../src/ephy-toolbar.c:251
-msgid "Back"
-msgstr "上一頁"
+msgid "_Back"
+msgstr "上一頁(_B)"
 
 #: ../src/ephy-toolbar.c:253
-msgid "Go back"
-msgstr "回上一頁"
+msgid "Go to the previous visited page"
+msgstr "前往上一個瀏覽的頁面"
 
 #. this is the tooltip on the Back button's drop-down arrow, which will show
 #. * a menu with all sites you can go 'back' to
@@ -2977,656 +3042,638 @@ msgstr "回上一頁"
 msgid "Back history"
 msgstr "上一頁的紀錄"
 
-#: ../src/ephy-toolbar.c:270
-msgid "Forward"
-msgstr "下一頁"
+#: ../src/ephy-toolbar.c:271
+msgid "_Forward"
+msgstr "下一頁(_F)"
 
-#: ../src/ephy-toolbar.c:272
-msgid "Go forward"
-msgstr "往下一頁"
+#: ../src/ephy-toolbar.c:273
+msgid "Go to the next visited page"
+msgstr "前往下一個瀏覽的頁面"
 
 #. this is the tooltip on the Forward button's drop-down arrow, which will show
 #. * a menu with all sites you can go 'forward' to
 #.
-#: ../src/ephy-toolbar.c:276
+#: ../src/ephy-toolbar.c:277
 msgid "Forward history"
 msgstr "下一頁的紀錄"
 
-# (Abel) 當 http server 沒有顯示網頁時，會將所有檔案列出來，類似 ftp。這時會
-# 啟用這個按鈕。
-#: ../src/ephy-toolbar.c:288
-msgid "Up"
-msgstr "上層"
+#: ../src/ephy-toolbar.c:290
+msgid "_Up"
+msgstr "上一層(_U)"
 
-#: ../src/ephy-toolbar.c:290 ../src/ephy-window.c:244
+#: ../src/ephy-toolbar.c:292
 msgid "Go up one level"
 msgstr "前往上一層的頁面"
 
 #. this is the tooltip on the Up button's drop-down arrow, which will show
 #. * a menu with al sites you can go 'up' to
 #.
-#: ../src/ephy-toolbar.c:294
+#: ../src/ephy-toolbar.c:296
 msgid "List of upper levels"
 msgstr "所有上層目錄"
 
-#: ../src/ephy-toolbar.c:311
+#: ../src/ephy-toolbar.c:314
 msgid "Enter a web address to open, or a phrase to search for"
 msgstr "輸入想開啟的網址，或者想搜尋的片語"
 
-#: ../src/ephy-toolbar.c:327
+#: ../src/ephy-toolbar.c:330
 msgid "Zoom"
 msgstr "縮放"
 
-#: ../src/ephy-toolbar.c:329
+#: ../src/ephy-toolbar.c:332
 msgid "Adjust the text size"
 msgstr "調整文字大小"
 
-#: ../src/ephy-toolbar.c:341
+#: ../src/ephy-toolbar.c:344
 msgid "Go to the address entered in the address entry"
 msgstr "前往網址輸入欄位中指定的網址"
 
-#: ../src/ephy-toolbar.c:350
+#: ../src/ephy-toolbar.c:353
 msgid "_Home"
 msgstr "首頁(_H)"
 
-#: ../src/ephy-toolbar.c:352
+#: ../src/ephy-toolbar.c:355
 msgid "Go to the home page"
 msgstr "前往首頁"
 
-#: ../src/ephy-window.c:117
+#: ../src/ephy-window.c:118
 msgid "_Bookmarks"
 msgstr "書籤(_B)"
 
-#: ../src/ephy-window.c:118
+#: ../src/ephy-window.c:119
 msgid "_Go"
 msgstr "前往(_G)"
 
-#: ../src/ephy-window.c:119
+#: ../src/ephy-window.c:120
 msgid "T_ools"
 msgstr "工具列(_O)"
 
-#: ../src/ephy-window.c:120
+#: ../src/ephy-window.c:121
 msgid "_Tabs"
 msgstr "分頁(_T)"
 
 #. File menu
-#: ../src/ephy-window.c:127
+#: ../src/ephy-window.c:128
 msgid "_New Window"
 msgstr "新增視窗(_N)"
 
-#: ../src/ephy-window.c:128
+#: ../src/ephy-window.c:129
 msgid "Open a new window"
 msgstr "開啟新的視窗"
 
-#: ../src/ephy-window.c:130
+#: ../src/ephy-window.c:131
 msgid "New _Tab"
 msgstr "新增分頁(_T)"
 
-#: ../src/ephy-window.c:131
+#: ../src/ephy-window.c:132
 msgid "Open a new tab"
 msgstr "開啟新的分頁"
 
-#: ../src/ephy-window.c:133
+#: ../src/ephy-window.c:134
 msgid "_Open..."
 msgstr "開啟(_O)..."
 
-#: ../src/ephy-window.c:134
+#: ../src/ephy-window.c:135
 msgid "Open a file"
 msgstr "開啟檔案"
 
-#: ../src/ephy-window.c:136 ../src/ephy-window.c:139
+#: ../src/ephy-window.c:137
 msgid "Save _As..."
 msgstr "另存新檔(_A)..."
 
-#: ../src/ephy-window.c:137 ../src/ephy-window.c:140
+#: ../src/ephy-window.c:138
 msgid "Save the current page"
 msgstr "儲存目前的頁面內容"
 
-#: ../src/ephy-window.c:142
+#: ../src/ephy-window.c:140
 msgid "Print Set_up..."
 msgstr "列印設定(_U)..."
 
-#: ../src/ephy-window.c:143
+#: ../src/ephy-window.c:141
 msgid "Setup the page settings for printing"
 msgstr "設定列印時的頁面設定"
 
-#: ../src/ephy-window.c:145
+#: ../src/ephy-window.c:143
 msgid "Print Pre_view"
 msgstr "預覽列印(_V)"
 
-#: ../src/ephy-window.c:146
+#: ../src/ephy-window.c:144
 msgid "Print preview"
 msgstr "預覽列印"
 
-#: ../src/ephy-window.c:148
+#: ../src/ephy-window.c:146
 msgid "_Print..."
 msgstr "列印(_P)..."
 
-#: ../src/ephy-window.c:149
+#: ../src/ephy-window.c:147
 msgid "Print the current page"
 msgstr "列印目前的頁面內容"
 
-#: ../src/ephy-window.c:151
+#: ../src/ephy-window.c:149
 msgid "S_end Link by Email..."
 msgstr "以電郵傳送連結(_E)..."
 
-#: ../src/ephy-window.c:152
+#: ../src/ephy-window.c:150
 msgid "Send a link of the current page"
 msgstr "傳送本頁面的網址"
 
-#: ../src/ephy-window.c:155
+#: ../src/ephy-window.c:153
 msgid "Close this tab"
 msgstr "關閉此分頁"
 
 #. Edit menu
-#: ../src/ephy-window.c:160
+#: ../src/ephy-window.c:158
 msgid "_Undo"
 msgstr "復原(_U)"
 
-#: ../src/ephy-window.c:161
+#: ../src/ephy-window.c:159
 msgid "Undo the last action"
 msgstr "復原上一個動作"
 
-#: ../src/ephy-window.c:163
+#: ../src/ephy-window.c:161
 msgid "Re_do"
 msgstr "取消復原(_D)"
 
-#: ../src/ephy-window.c:164
+#: ../src/ephy-window.c:162
 msgid "Redo the last undone action"
 msgstr "取消上一個的復原動作"
 
-#: ../src/ephy-window.c:173
+#: ../src/ephy-window.c:171
 msgid "Paste clipboard"
 msgstr "貼上剪貼簿的內容"
 
-#: ../src/ephy-window.c:176
+#: ../src/ephy-window.c:174
 msgid "Select the entire page"
 msgstr "選取整個頁面的內容"
 
-#: ../src/ephy-window.c:178
+#: ../src/ephy-window.c:176
 msgid "_Find..."
 msgstr "尋找(_F)..."
 
-#: ../src/ephy-window.c:179
+#: ../src/ephy-window.c:177
 msgid "Find a word or phrase in the page"
 msgstr "在頁面中尋找一個字詞或字串"
 
-#: ../src/ephy-window.c:181
+#: ../src/ephy-window.c:179
 msgid "Find Ne_xt"
 msgstr "找下一個(_X)"
 
-#: ../src/ephy-window.c:182
+#: ../src/ephy-window.c:180
 msgid "Find next occurrence of the word or phrase"
 msgstr "尋找下一次出現指定字詞或字串的地方"
 
-#: ../src/ephy-window.c:184
+#: ../src/ephy-window.c:182
 msgid "Find Pre_vious"
 msgstr "找上一個(_V)"
 
-#: ../src/ephy-window.c:185
+#: ../src/ephy-window.c:183
 msgid "Find previous occurrence of the word or phrase"
 msgstr "尋找上一次出現指定字詞或字串的地方"
 
-#: ../src/ephy-window.c:187
+#: ../src/ephy-window.c:185
 msgid "P_ersonal Data"
 msgstr "個人資料(_E)"
 
-#: ../src/ephy-window.c:188
+#: ../src/ephy-window.c:186
 msgid "View and remove cookies and passwords"
 msgstr "顯示和移除所有 cookie 及密碼"
 
-#: ../src/ephy-window.c:190
+#: ../src/ephy-window.c:188
 msgid "T_oolbars"
 msgstr "工具列(_O)"
 
-#: ../src/ephy-window.c:191
+#: ../src/ephy-window.c:189
 msgid "Customize toolbars"
 msgstr "自訂工具列"
 
-#: ../src/ephy-window.c:193
+#: ../src/ephy-window.c:191
 msgid "P_references"
 msgstr "偏好設定(_R)"
 
-#: ../src/ephy-window.c:194
+#: ../src/ephy-window.c:192
 msgid "Configure the web browser"
 msgstr "網頁瀏覽器設置"
 
 #. View menu
-#: ../src/ephy-window.c:199 ../src/ephy-window.c:202
+#: ../src/ephy-window.c:197 ../src/ephy-window.c:200
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: ../src/ephy-window.c:200
+#: ../src/ephy-window.c:198
 msgid "Stop current data transfer"
 msgstr "停止傳送目前的資料"
 
-#: ../src/ephy-window.c:204
+#: ../src/ephy-window.c:202
 msgid "_Reload"
 msgstr "重新載入(_R)"
 
-#: ../src/ephy-window.c:205
+#: ../src/ephy-window.c:203
 msgid "Display the latest content of the current page"
 msgstr "顯示本頁的最新內容"
 
-#: ../src/ephy-window.c:210
+#: ../src/ephy-window.c:205
 msgid "Zoom _In"
 msgstr "拉近(_I)"
 
-#: ../src/ephy-window.c:211
+#: ../src/ephy-window.c:206
 msgid "Increase the text size"
 msgstr "將文字放大"
 
-#: ../src/ephy-window.c:213
+#: ../src/ephy-window.c:208
 msgid "Zoom _Out"
 msgstr "拉遠(_O)"
 
-#: ../src/ephy-window.c:214
+#: ../src/ephy-window.c:209
 msgid "Decrease the text size"
 msgstr "將文字縮小"
 
-#: ../src/ephy-window.c:216
+#: ../src/ephy-window.c:211
 msgid "_Normal Size"
 msgstr "正常大小(_N)"
 
-#: ../src/ephy-window.c:217
+#: ../src/ephy-window.c:212
 msgid "Use the normal text size"
 msgstr "將文字還原為正常大小"
 
-#: ../src/ephy-window.c:219
+#: ../src/ephy-window.c:214
 msgid "Text _Encoding"
 msgstr "字元編碼(_E)"
 
-#: ../src/ephy-window.c:220
+#: ../src/ephy-window.c:215
 msgid "Change the text encoding"
 msgstr "改變字元編碼方式"
 
-#: ../src/ephy-window.c:222
+#: ../src/ephy-window.c:217
 msgid "_Page Source"
 msgstr "網頁原始內容(_P)"
 
-#: ../src/ephy-window.c:223
+#: ../src/ephy-window.c:218
 msgid "View the source code of the page"
 msgstr "顯示該頁面的原始內容"
 
 #. Bookmarks menu
-#: ../src/ephy-window.c:228
+#: ../src/ephy-window.c:223
 msgid "_Add Bookmark..."
 msgstr "加入書籤(_A)..."
 
-#: ../src/ephy-window.c:229 ../src/ephy-window.c:312
+#: ../src/ephy-window.c:224 ../src/ephy-window.c:298
 msgid "Add a bookmark for the current page"
 msgstr "新增有關本頁面的書籤"
 
-#: ../src/ephy-window.c:231
+#: ../src/ephy-window.c:226
 msgid "_Edit Bookmarks"
 msgstr "修改書籤(_E)"
 
-#: ../src/ephy-window.c:232
+#: ../src/ephy-window.c:227
 msgid "Open the bookmarks window"
 msgstr "開啟書籤視窗"
 
 #. Go menu
-#: ../src/ephy-window.c:237
-msgid "_Back"
-msgstr "上一頁(_B)"
-
-#: ../src/ephy-window.c:238
-msgid "Go to the previous visited page"
-msgstr "前往上一個瀏覽的頁面"
-
-#: ../src/ephy-window.c:240
-msgid "_Forward"
-msgstr "下一頁(_F)"
-
-#: ../src/ephy-window.c:241
-msgid "Go to the next visited page"
-msgstr "前往下一個瀏覽的頁面"
-
-#: ../src/ephy-window.c:243
-msgid "_Up"
-msgstr "上一層(_U)"
-
-#: ../src/ephy-window.c:246
+#: ../src/ephy-window.c:232
 msgid "_Location..."
 msgstr "位置(_L)..."
 
-#: ../src/ephy-window.c:247
+#: ../src/ephy-window.c:233
 msgid "Go to a specified location"
 msgstr "前往指定的位置"
 
-#: ../src/ephy-window.c:249
+#: ../src/ephy-window.c:235
 msgid "H_istory"
 msgstr "瀏覽紀錄(_I)"
 
-#: ../src/ephy-window.c:250
+#: ../src/ephy-window.c:236
 msgid "Open the history window"
 msgstr "開啟瀏覽紀錄視窗"
 
 #. Tabs menu
-#: ../src/ephy-window.c:255
+#: ../src/ephy-window.c:241
 msgid "_Previous Tab"
 msgstr "上一個分頁(_P)"
 
-#: ../src/ephy-window.c:256
+#: ../src/ephy-window.c:242
 msgid "Activate previous tab"
 msgstr "啟用上一個分頁"
 
-#: ../src/ephy-window.c:258
+#: ../src/ephy-window.c:244
 msgid "_Next Tab"
 msgstr "下一個分頁(_N)"
 
-#: ../src/ephy-window.c:259
+#: ../src/ephy-window.c:245
 msgid "Activate next tab"
 msgstr "啟用下一個分頁"
 
-#: ../src/ephy-window.c:261
+#: ../src/ephy-window.c:247
 msgid "Move Tab _Left"
 msgstr "分頁向左移(_L)"
 
-#: ../src/ephy-window.c:262
+#: ../src/ephy-window.c:248
 msgid "Move current tab to left"
 msgstr "將目前的分頁向左移動"
 
-#: ../src/ephy-window.c:264
+#: ../src/ephy-window.c:250
 msgid "Move Tab _Right"
 msgstr "分頁向右移(_R)"
 
-#: ../src/ephy-window.c:265
+#: ../src/ephy-window.c:251
 msgid "Move current tab to right"
 msgstr "將目前的分頁向右移動"
 
-#: ../src/ephy-window.c:267
+#: ../src/ephy-window.c:253
 msgid "_Detach Tab"
 msgstr "轉為獨立視窗(_D)"
 
-#: ../src/ephy-window.c:268
+#: ../src/ephy-window.c:254
 msgid "Detach current tab"
 msgstr "將目前的分頁轉為獨立視窗"
 
-#: ../src/ephy-window.c:274
+#: ../src/ephy-window.c:260
 msgid "Display web browser help"
 msgstr "顯示網頁瀏覽器的說明文件"
 
 #. File Menu
-#: ../src/ephy-window.c:285
+#: ../src/ephy-window.c:271
 msgid "_Work Offline"
 msgstr "離線模式(_W)"
 
-#: ../src/ephy-window.c:286
+#: ../src/ephy-window.c:272
 msgid "Switch to offline mode"
 msgstr "切換至離線模式"
 
 #. View Menu
-#: ../src/ephy-window.c:291
+#: ../src/ephy-window.c:277
 msgid "_Toolbar"
 msgstr "工具列(_T)"
 
-#: ../src/ephy-window.c:292
+#: ../src/ephy-window.c:278
 msgid "Show or hide toolbar"
 msgstr "顯示或隱藏工具列"
 
-#: ../src/ephy-window.c:294
+#: ../src/ephy-window.c:280
 msgid "St_atusbar"
 msgstr "狀態列(_A)"
 
-#: ../src/ephy-window.c:295
+#: ../src/ephy-window.c:281
 msgid "Show or hide statusbar"
 msgstr "顯示或隱藏狀態列"
 
-#: ../src/ephy-window.c:297
+#: ../src/ephy-window.c:283
 msgid "_Fullscreen"
 msgstr "全螢幕(_F)"
 
-#: ../src/ephy-window.c:298
+#: ../src/ephy-window.c:284
 msgid "Browse at full screen"
 msgstr "以全螢幕模式瀏覽"
 
-#: ../src/ephy-window.c:300
+#: ../src/ephy-window.c:286
 msgid "Popup _Windows"
 msgstr "彈出式視窗(_W)"
 
-#: ../src/ephy-window.c:301
+#: ../src/ephy-window.c:287
 msgid "Show or hide unrequested popup windows from this site"
 msgstr "顯示或隱藏這個站台未要求的彈出式視窗"
 
-#: ../src/ephy-window.c:303
+#: ../src/ephy-window.c:289
 msgid "Selection Caret"
 msgstr "選擇游標"
 
 #. Document
-#: ../src/ephy-window.c:311
+#: ../src/ephy-window.c:297
 msgid "Add Boo_kmark..."
 msgstr "加入書籤(_K)..."
 
 #. Framed document
-#: ../src/ephy-window.c:317
-msgid "Show Only This _Frame"
-msgstr "只顯示本頁框部份(_F)"
+#: ../src/ephy-window.c:303
+msgid "Show Only _This Frame"
+msgstr "只顯示這個框架(_T)"
 
-#: ../src/ephy-window.c:318
+#: ../src/ephy-window.c:304
 msgid "Show only this frame in this window"
 msgstr "只在本視窗中顯示本頁框部份"
 
 #. Links
-#: ../src/ephy-window.c:323
+#: ../src/ephy-window.c:309
 msgid "_Open Link"
 msgstr "開啟連結(_O)"
 
-#: ../src/ephy-window.c:324
+#: ../src/ephy-window.c:310
 msgid "Open link in this window"
 msgstr "在這視窗中開啟連結"
 
-#: ../src/ephy-window.c:326
+#: ../src/ephy-window.c:312
 msgid "Open Link in New _Window"
 msgstr "在新的視窗中開啟連結(_W)"
 
-#: ../src/ephy-window.c:327
+#: ../src/ephy-window.c:313
 msgid "Open link in a new window"
 msgstr "在新的視窗中開啟連結"
 
-#: ../src/ephy-window.c:329
+#: ../src/ephy-window.c:315
 msgid "Open Link in New _Tab"
 msgstr "在新的分頁中開啟連結(_T)"
 
-#: ../src/ephy-window.c:330
+#: ../src/ephy-window.c:316
 msgid "Open link in a new tab"
 msgstr "在新的分頁中開啟連結"
 
-#: ../src/ephy-window.c:332
+#: ../src/ephy-window.c:318
 msgid "_Download Link"
 msgstr "下載連結(_D)"
 
-#: ../src/ephy-window.c:334
+#: ../src/ephy-window.c:320
 msgid "_Save Link As..."
 msgstr "另存新檔(_S)..."
 
-#: ../src/ephy-window.c:335
+#: ../src/ephy-window.c:321
 msgid "Save link with a different name"
 msgstr "以另一個名稱儲存連結"
 
-#: ../src/ephy-window.c:337
+#: ../src/ephy-window.c:323
 msgid "_Bookmark Link..."
 msgstr "將連結加入書籤(_B)..."
 
-#: ../src/ephy-window.c:339
+#: ../src/ephy-window.c:325
 msgid "_Copy Link Address"
 msgstr "複製連結地址(_C)"
 
 #. Email links
 #. This is on the context menu on a mailto: link and opens the mail program
-#: ../src/ephy-window.c:345
+#: ../src/ephy-window.c:331
 msgid "_Send Email..."
 msgstr "傳送電郵(_S)..."
 
-#: ../src/ephy-window.c:347
+#: ../src/ephy-window.c:333
 msgid "_Copy Email Address"
 msgstr "複製郵件地址(_C)"
 
 #. Images
-#: ../src/ephy-window.c:352
+#: ../src/ephy-window.c:338
 msgid "Open _Image"
 msgstr "開啟圖片(_I)"
 
-#: ../src/ephy-window.c:354
+#: ../src/ephy-window.c:340
 msgid "_Save Image As..."
 msgstr "另存圖片為(_S)..."
 
-#: ../src/ephy-window.c:356
+#: ../src/ephy-window.c:342
 msgid "_Use Image As Background"
 msgstr "使用圖片作為桌面背景(_U)"
 
-#: ../src/ephy-window.c:358
+#: ../src/ephy-window.c:344
 msgid "Copy I_mage Address"
 msgstr "複製圖片地址(_M)"
 
-#: ../src/ephy-window.c:650
+#: ../src/ephy-window.c:693
 msgid "There are unsubmitted changes to form elements"
 msgstr "對表單的元素而言沒有經確認的改變"
 
-#: ../src/ephy-window.c:654
+#: ../src/ephy-window.c:697
 msgid "If you close the document anyway, you will lose that information."
 msgstr "如果您無論無何要關閉此文件，您將會失去未儲存的資訊。"
 
-#: ../src/ephy-window.c:658
+#: ../src/ephy-window.c:701
 msgid "Close _Document"
 msgstr "關閉文件(_D)"
 
-#: ../src/ephy-window.c:1222 ../src/window-commands.c:336
+#: ../src/ephy-window.c:1268 ../src/window-commands.c:294
 msgid "Open"
 msgstr "開啟"
 
-#: ../src/ephy-window.c:1224 ../src/window-commands.c:362
+#: ../src/ephy-window.c:1270 ../src/window-commands.c:320
 msgid "Save As"
 msgstr "另存新檔"
 
-#: ../src/ephy-window.c:1228
+#: ../src/ephy-window.c:1274
 msgid "Bookmark"
 msgstr "加入書籤"
 
-#: ../src/ephy-window.c:1230
+#: ../src/ephy-window.c:1276
 msgid "Find"
 msgstr "尋找"
 
-#: ../src/ephy-window.c:1412
+#: ../src/ephy-window.c:1444
 msgid "Insecure"
 msgstr "不安全"
 
-#: ../src/ephy-window.c:1417
+#: ../src/ephy-window.c:1449
 msgid "Broken"
 msgstr "中斷"
 
-#: ../src/ephy-window.c:1425
+#: ../src/ephy-window.c:1457
 msgid "Low"
 msgstr "低"
 
-#: ../src/ephy-window.c:1432
+#: ../src/ephy-window.c:1464
 msgid "High"
 msgstr "高"
 
-#: ../src/ephy-window.c:1442
+#: ../src/ephy-window.c:1474
 #, c-format
 msgid "Security level: %s"
 msgstr "安全等級：%s"
 
-#: ../src/ephy-window.c:1482
+#: ../src/ephy-window.c:1514
 #, c-format
 msgid "%d hidden popup window"
 msgid_plural "%d hidden popup windows"
 msgstr[0] "%d 個隱藏彈出式視窗"
 
-#: ../src/ephy-window.c:1777
+#: ../src/ephy-window.c:1809
 #, c-format
-msgid "Open image '%s'"
-msgstr "開啟圖片‘%s’"
+msgid "Open image “%s”"
+msgstr "開啟圖片“%s”"
 
-#: ../src/ephy-window.c:1782
+#: ../src/ephy-window.c:1814
 #, c-format
-msgid "Use as desktop background '%s'"
+msgid "Use as desktop background “%s”"
 msgstr "使用圖片作為桌面背景‘%s’"
 
-#: ../src/ephy-window.c:1787
+#: ../src/ephy-window.c:1819
 #, c-format
-msgid "Save image '%s'"
-msgstr "儲存圖片‘%s’"
+msgid "Save image “%s”"
+msgstr "儲存圖片“%s”"
 
-#: ../src/ephy-window.c:1792
+#: ../src/ephy-window.c:1824
 #, c-format
-msgid "Copy image address '%s'"
-msgstr "複製圖片地址‘%s’"
+msgid "Copy image address “%s”"
+msgstr "複製圖片位址“%s”"
 
-#: ../src/ephy-window.c:1805
+#: ../src/ephy-window.c:1837
 #, c-format
-msgid "Send email to address '%s'"
-msgstr "傳送電郵到地址‘%s’"
+msgid "Send email to address “%s”"
+msgstr "傳送電郵到位址“%s”"
 
-#: ../src/ephy-window.c:1811
+#: ../src/ephy-window.c:1843
 #, c-format
-msgid "Copy email address '%s'"
-msgstr "複製電郵地址‘%s’"
+msgid "Copy email address “%s”"
+msgstr "複製電子郵件位址“%s”"
 
-#: ../src/ephy-window.c:1823
+#: ../src/ephy-window.c:1855
 #, c-format
-msgid "Save link '%s'"
-msgstr "儲存連結‘%s’"
+msgid "Save link “%s”"
+msgstr "儲存連結“%s”"
 
-#: ../src/ephy-window.c:1829
+#: ../src/ephy-window.c:1861
 #, c-format
-msgid "Bookmark link '%s'"
-msgstr "將連結‘%s’加入書籤"
+msgid "Bookmark link “%s”"
+msgstr "書籤連結“%s”"
 
-#: ../src/ephy-window.c:1835
+#: ../src/ephy-window.c:1867
 #, c-format
-msgid "Copy link's address '%s'"
-msgstr "複製連結地址 ‘%s’"
+msgid "Copy link's address “%s”"
+msgstr "複製連結位址 “%s”"
 
-#: ../src/pdm-dialog.c:414
-msgid "Domain"
-msgstr "網域"
-
-#: ../src/pdm-dialog.c:426
-msgid "Name"
-msgstr "名稱"
-
-#: ../src/pdm-dialog.c:658
-msgid "Host"
-msgstr "主機"
-
-#: ../src/pdm-dialog.c:670
-msgid "User Name"
-msgstr "使用者名稱"
-
-#: ../src/pdm-dialog.c:902
+#: ../src/pdm-dialog.c:367
 msgid "Cookie Properties"
 msgstr "Cookie 屬性"
 
-#: ../src/pdm-dialog.c:919
+#: ../src/pdm-dialog.c:384
 msgid "Content:"
 msgstr "內容"
 
-#: ../src/pdm-dialog.c:935
+#: ../src/pdm-dialog.c:400
 msgid "Path:"
 msgstr "路徑："
 
-#: ../src/pdm-dialog.c:951
+#: ../src/pdm-dialog.c:416
 msgid "Send for:"
 msgstr "傳送給："
 
-#: ../src/pdm-dialog.c:960
+#: ../src/pdm-dialog.c:425
 msgid "Encrypted connections only"
 msgstr "只限加密後的連線"
 
-#: ../src/pdm-dialog.c:960
+#: ../src/pdm-dialog.c:425
 msgid "Any type of connection"
 msgstr "任何類型的連線"
 
-#: ../src/pdm-dialog.c:966
+#: ../src/pdm-dialog.c:431
 msgid "Expires:"
 msgstr "時限："
 
-#: ../src/pdm-dialog.c:977
+#: ../src/pdm-dialog.c:442
 msgid "End of current session"
 msgstr "結束目前的作業階段"
 
+#: ../src/pdm-dialog.c:559
+msgid "Domain"
+msgstr "網域"
+
+#: ../src/pdm-dialog.c:571
+msgid "Name"
+msgstr "名稱"
+
+#: ../src/pdm-dialog.c:830
+msgid "Host"
+msgstr "主機"
+
+#: ../src/pdm-dialog.c:842
+msgid "User Name"
+msgstr "使用者名稱"
+
+#: ../src/pdm-dialog.c:854
+msgid "User Password"
+msgstr "使用者密碼"
+
 #: ../src/popup-commands.c:239
 msgid "Download Link"
 msgstr "下載連結"
@@ -3687,7 +3734,7 @@ msgstr "關閉預覽列印視窗"
 #.
 #. Translators: The text before the "|" is context to help you decide on
 #. * the correct translation. You MUST OMIT it in the translated string.
-#: ../src/prefs-dialog.c:748 ../src/prefs-dialog.c:756
+#: ../src/prefs-dialog.c:729 ../src/prefs-dialog.c:737
 #, c-format
 msgid "language|%s (%s)"
 msgstr "%s (%s)"
@@ -3697,34 +3744,38 @@ msgstr "%s (%s)"
 #. * Translators: this refers to a user-define language code
 #. * (one which isn't in our built-in list).
 #.
-#: ../src/prefs-dialog.c:767
+#: ../src/prefs-dialog.c:748
 #, c-format
 msgid "language|User defined (%s)"
 msgstr "使用者自訂 (%s)"
 
-#: ../src/prefs-dialog.c:789
+#: ../src/prefs-dialog.c:770
 #, c-format
 msgid "System language (%s)"
 msgid_plural "System languages (%s)"
 msgstr[0] "系統語言 (%s)"
 
-#: ../src/prefs-dialog.c:1147
-msgid "Select a directory"
-msgstr "選擇一個資料夾"
+#: ../src/prefs-dialog.c:1157
+msgid "Select a Directory"
+msgstr "選擇一個目錄"
 
-#: ../src/window-commands.c:736 ../src/window-commands.c:753
+#: ../src/window-commands.c:694 ../src/window-commands.c:711
 msgid "Contact us at:"
 msgstr "聯絡我們於："
 
-#: ../src/window-commands.c:739
+#: ../src/window-commands.c:697
 msgid "Contributors:"
 msgstr "貢獻者："
 
-#: ../src/window-commands.c:744
+#: ../src/window-commands.c:702
 msgid "Past developers:"
 msgstr "前度開發人員："
 
-#: ../src/window-commands.c:759
+#: ../src/window-commands.c:712
+msgid "<epiphany-list@gnome.org> or <gnome-doc-list@gnome.org>"
+msgstr "<epiphany-list@gnome.org> 或 <gnome-doc-list@gnome.org>"
+
+#: ../src/window-commands.c:717
 msgid "GNOME Web Browser"
 msgstr "GNOME 網頁瀏覽器"
 
@@ -3736,7 +3787,7 @@ msgstr "GNOME 網頁瀏覽器"
 #. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
 #.
-#: ../src/window-commands.c:773
+#: ../src/window-commands.c:731
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -3747,6 +3798,49 @@ msgstr ""
 "Ching-Hung Lin <billlin@wshlab2.ee.kuas.edu.tw>, 2004\n"
 "Abel Cheung <maddog@linux.org.hk>, 2003"
 
-#: ../src/window-commands.c:776
+#: ../src/window-commands.c:734
 msgid "GNOME Web Browser Website"
 msgstr "GNOME 網頁瀏覽器網站"
+
+#~ msgid "Download Manager"
+#~ msgstr "下載管理員"
+
+#~ msgid "Personal Data Manager"
+#~ msgstr "個人資料管理員"
+
+#~ msgid ""
+#~ "This document cannot be viewed in offline mode. Set Epiphany to “online” "
+#~ "and try again."
+#~ msgstr ""
+#~ "本文件無法在離線模式下顯示，請將 Epiphany 設定為「線上」及再試多次。"
+
+#~ msgid "File %s is not writable"
+#~ msgstr "檔案 %s 是不能寫入"
+
+#~ msgid "You do not have permission to overwrite this file."
+#~ msgstr "您沒有複寫該檔案的權限。"
+
+#~ msgid "File not writable"
+#~ msgstr "檔案不能寫入"
+
+#~ msgid ""
+#~ "Each • highlights a topic to consider, derived from your current "
+#~ "selections and existing bookmarks."
+#~ msgstr ""
+#~ "每個• 都突顯的一個要考慮的主題，它是從你目前的選擇區與既存的書籤中所取得"
+#~ "的。"
+
+#~ msgid "Loading %s..."
+#~ msgstr "正在載入 %s..."
+
+#~ msgid "Back"
+#~ msgstr "上一頁"
+
+#~ msgid "Go back"
+#~ msgstr "回上一頁"
+
+#~ msgid "Forward"
+#~ msgstr "下一頁"
+
+#~ msgid "Go forward"
+#~ msgstr "往下一頁"