From 240d47eedb2b8fbaf236de5c9a39d91a08f56e80 Mon Sep 17 00:00:00 2001
From: Funda Wang <fwang@src.gnome.org>
Date: Sun, 2 Sep 2007 08:30:36 +0000
Subject: Updated epiphany trunk translation

svn path=/trunk/; revision=7330
---
 po/zh_CN.po | 742 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 396 insertions(+), 346 deletions(-)

(limited to 'po/zh_CN.po')

diff --git a/po/zh_CN.po b/po/zh_CN.po
index fea794753..862938c25 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: epiphany 2.14\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=epiphany\n"
-"POT-Creation-Date: 2007-01-27 16:11+0000\n"
-"PO-Revision-Date: 2007-02-19 16:43+0800\n"
+"POT-Creation-Date: 2007-08-29 03:33+0100\n"
+"PO-Revision-Date: 2007-09-02 16:29+0800\n"
 "Last-Translator: Funda Wang <fundawang@gmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -39,8 +39,8 @@ msgid "Epiphany Web Browser"
 msgstr "Epiphany Web 浏览器"
 
 #. sets the name to appear in the window list applet when grouping windows
-#: ../data/epiphany.desktop.in.in.h:3 ../src/ephy-main.c:523
-#: ../src/ephy-main.c:615
+#: ../data/epiphany.desktop.in.in.h:3 ../src/ephy-main.c:526
+#: ../src/ephy-main.c:618
 msgid "Web Browser"
 msgstr "Web 浏览器"
 
@@ -119,9 +119,8 @@ msgid "Hide menubar by default"
 msgstr "默认隐藏菜单栏"
 
 #: ../data/epiphany-lockdown.schemas.in.h:17
-msgid ""
-"Hide the menubar by default. The menubar can still be accessed using F10."
-msgstr "默认隐藏菜单栏。菜单栏仍可以使用 F10 访问。"
+msgid "Hide the menubar by default."
+msgstr "默认隐藏菜单栏。"
 
 #: ../data/epiphany-lockdown.schemas.in.h:18
 msgid "Lock in fullscreen mode"
@@ -230,78 +229,82 @@ msgid "Enable JavaScript"
 msgstr "允许 JavaScript"
 
 #: ../data/epiphany.schemas.in.h:16
+msgid "Enable smooth scrolling"
+msgstr "允许平滑滚动"
+
+#: ../data/epiphany.schemas.in.h:17
 msgid "History pages time range"
 msgstr "历史页面时间范围"
 
-#: ../data/epiphany.schemas.in.h:17
+#: ../data/epiphany.schemas.in.h:18
 msgid "Home page"
 msgstr "主页"
 
-#: ../data/epiphany.schemas.in.h:18
+#: ../data/epiphany.schemas.in.h:19
 msgid ""
 "How to present animated images. Possible values are \"normal\", \"once\" and "
 "\"disabled\"."
 msgstr "如何显示动画图像。可供选择的值有：“normal”、“once”和“disabled”。"
 
-#: ../data/epiphany.schemas.in.h:19
+#: ../data/epiphany.schemas.in.h:20
 msgid "How to print frames"
 msgstr "如何打印框架"
 
-#: ../data/epiphany.schemas.in.h:20
+#: ../data/epiphany.schemas.in.h:21
 msgid ""
 "How to print pages containing frames. Allowed values are \"normal\", "
 "\"separately\" and \"selected\"."
 msgstr ""
 "如何打印包含框架的页面。可供选择的值有：“normal”、“separately”和“selected”。"
 
-#: ../data/epiphany.schemas.in.h:21
+#: ../data/epiphany.schemas.in.h:22
 msgid "ISO-8859-1"
 msgstr "ISO-8859-1"
 
-#: ../data/epiphany.schemas.in.h:22
+#: ../data/epiphany.schemas.in.h:23
 msgid "Image animation mode"
 msgstr "图像动画模式"
 
-#: ../data/epiphany.schemas.in.h:23
+#: ../data/epiphany.schemas.in.h:24
 msgid "Languages"
 msgstr "语言"
 
-#: ../data/epiphany.schemas.in.h:24
+#: ../data/epiphany.schemas.in.h:25
 msgid "Lists the active extensions."
 msgstr "列出激活的扩展。"
 
-#: ../data/epiphany.schemas.in.h:25
+#: ../data/epiphany.schemas.in.h:26
 msgid ""
 "Middle click to open the web page pointed to by the currently selected text"
 msgstr "中键单击可打开当前选中文字指向的网页"
 
-#: ../data/epiphany.schemas.in.h:26
+#: ../data/epiphany.schemas.in.h:27
 msgid ""
 "Middle clicking on the main view pane will open the web page pointed to by "
 "the currently selected text."
 msgstr "中键单击主查看面板将打开当前选中文字指向的网页"
 
-#: ../data/epiphany.schemas.in.h:27
+#: ../data/epiphany.schemas.in.h:28
 msgid "Minimum font size"
 msgstr "最小字体大小"
 
-#: ../data/epiphany.schemas.in.h:28
+#: ../data/epiphany.schemas.in.h:29
 msgid "Preferred languages, two letter codes."
 msgstr "首选语言，两个字母的代码。"
 
-#: ../data/epiphany.schemas.in.h:29
+#: ../data/epiphany.schemas.in.h:30
 msgid "Remember passwords"
 msgstr "记住密码"
 
-#: ../data/epiphany.schemas.in.h:30
+#: ../data/epiphany.schemas.in.h:31
 msgid "Show bookmarks bar by default"
 msgstr "默认显示书签栏"
 
-#: ../data/epiphany.schemas.in.h:31
+#: ../data/epiphany.schemas.in.h:32
 msgid "Show statusbar by default"
 msgstr "默认显示状态栏"
 
-#: ../data/epiphany.schemas.in.h:32
+#: ../data/epiphany.schemas.in.h:33
 msgid ""
 "Show the history pages visited \"ever\", \"last_two_days\", \"last_three_days"
 "\", \"today\"."
@@ -309,37 +312,37 @@ msgstr ""
 "显示“曾经”访问过的、“近两天”访问过的、“近三天”访问过的、“今天”访问过的历史页"
 "面。"
 
-#: ../data/epiphany.schemas.in.h:33
+#: ../data/epiphany.schemas.in.h:34
 msgid "Show the tab bar also when there is only one tab open."
 msgstr "显示标签栏，即便只打开了一个标签。"
 
-#: ../data/epiphany.schemas.in.h:34
+#: ../data/epiphany.schemas.in.h:35
 msgid "Show toolbars by default"
 msgstr "默认显示工具栏"
 
-#: ../data/epiphany.schemas.in.h:35
+#: ../data/epiphany.schemas.in.h:36
 msgid "Size of disk cache"
 msgstr "磁盘缓存的大小"
 
-#: ../data/epiphany.schemas.in.h:36
+#: ../data/epiphany.schemas.in.h:37
 msgid "Size of disk cache, in MB."
 msgstr "磁盘缓存的大小，以 MB 为单位。"
 
-#: ../data/epiphany.schemas.in.h:37
+#: ../data/epiphany.schemas.in.h:38
 msgid "The bookmark information shown in the editor view"
 msgstr "显示在编辑器视图中的书签信息"
 
-#: ../data/epiphany.schemas.in.h:38
+#: ../data/epiphany.schemas.in.h:39
 msgid ""
 "The bookmark information shown in the editor view. Valid values in the list "
 "are \"address\" and \"title\"."
 msgstr "显示在编辑器视图里的书签信息。此列表的有效值是“地址”和“标题”。"
 
-#: ../data/epiphany.schemas.in.h:39
+#: ../data/epiphany.schemas.in.h:40
 msgid "The currently selected fonts language"
 msgstr "目前选中的字体语言"
 
-#: ../data/epiphany.schemas.in.h:40
+#: ../data/epiphany.schemas.in.h:41
 msgid ""
 "The currently selected fonts language. Valid values are \"ar\" (arabic), \"x-"
 "baltic\" (baltic languages), \"x-central-euro\" (central european "
@@ -356,15 +359,15 @@ msgstr ""
 "语)，“zh-TW”(繁体中文)，“tr”(土耳其语)，“x-unicode”(其它语言)，“x-western”(以"
 "拉丁语系书写的语言)，“x-tamil”(泰米尔语)和“x-devanagari”(梵文)。"
 
-#: ../data/epiphany.schemas.in.h:41
+#: ../data/epiphany.schemas.in.h:42
 msgid "The downloads folder"
 msgstr "下载文件夹"
 
-#: ../data/epiphany.schemas.in.h:42
+#: ../data/epiphany.schemas.in.h:43
 msgid "The encoding autodetector. Empty string means autodetect is off"
 msgstr "编码自动检测。空字符串意味着关闭自动检测"
 
-#: ../data/epiphany.schemas.in.h:43
+#: ../data/epiphany.schemas.in.h:44
 msgid ""
 "The encoding autodetector. Valid entries are \"\" (autodetectors off), "
 "\"cjk_parallel_state_machine\" (autodetect east asian encodings), "
@@ -384,17 +387,17 @@ msgstr ""
 "码)，“zhtw_parallel_state_machine”(自动检测繁体中文编码) 和 "
 "“universal_charset_detector”(自动检测所有编码)。"
 
-#: ../data/epiphany.schemas.in.h:44
+#: ../data/epiphany.schemas.in.h:45
 msgid "The page information shown in the history view"
 msgstr "显示在历史视图中的页面信息"
 
-#: ../data/epiphany.schemas.in.h:45
+#: ../data/epiphany.schemas.in.h:46
 msgid ""
 "The page information shown in the history view. Valid values in the list are "
 "\"address\", \"title\"."
 msgstr "显示在历史视图里的页面信息。此列表的有效值是“地址”和“标题”。"
 
-#: ../data/epiphany.schemas.in.h:46
+#: ../data/epiphany.schemas.in.h:47
 msgid ""
 "The path of the folder where to download files to; or \"Downloads\" to use "
 "the default downloads folder, or \"Desktop\" to use the desktop folder."
@@ -402,11 +405,11 @@ msgstr ""
 "存储下载文件的文件夹路径；“Downloads”代表使用默认下载文件夹，“Desktop”代表使"
 "用桌面文件夹。"
 
-#: ../data/epiphany.schemas.in.h:47
+#: ../data/epiphany.schemas.in.h:48
 msgid "Toolbar style"
 msgstr "工具栏样式"
 
-#: ../data/epiphany.schemas.in.h:48
+#: ../data/epiphany.schemas.in.h:49
 msgid ""
 "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both"
 "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and "
@@ -415,23 +418,23 @@ msgstr ""
 "工具栏样式。可供选择的值包括“”(使用 GNOME 默认样式)、“both”(文字和图"
 "标)、“both-horiz”(文字在图标旁)、“icons”和“text”。"
 
-#: ../data/epiphany.schemas.in.h:49
+#: ../data/epiphany.schemas.in.h:50
 msgid "Use own colors"
 msgstr "使用我自己的颜色"
 
-#: ../data/epiphany.schemas.in.h:50
+#: ../data/epiphany.schemas.in.h:51
 msgid "Use own fonts"
 msgstr "使用我自己的字体"
 
-#: ../data/epiphany.schemas.in.h:51
+#: ../data/epiphany.schemas.in.h:52
 msgid "Use your own colors instead of the colors the page requests."
 msgstr "使用您自己的颜色而不是页面请求的颜色。"
 
-#: ../data/epiphany.schemas.in.h:52
+#: ../data/epiphany.schemas.in.h:53
 msgid "Use your own fonts instead of the fonts the page requests."
 msgstr "使用您自己的字体而不是页面请求的字体。"
 
-#: ../data/epiphany.schemas.in.h:53
+#: ../data/epiphany.schemas.in.h:54
 msgid ""
 "When files cannot be opened by the browser they are automatically downloaded "
 "to the download folder and opened with the appropriate application."
@@ -439,41 +442,41 @@ msgstr ""
 "如果浏览器无法打开文件，则这些文件将会被自动下载到下载文件夹，并用相应的应用"
 "程序打开。"
 
-#: ../data/epiphany.schemas.in.h:54
+#: ../data/epiphany.schemas.in.h:55
 msgid ""
 "Where to accept cookies from. Possible values are \"anywhere\", \"current "
 "site\" and \"nowhere\"."
 msgstr "何时装入图像。可能的值是“总是”、“当前网站”、“从不”。"
 
-#: ../data/epiphany.schemas.in.h:55
+#: ../data/epiphany.schemas.in.h:56
 msgid "Whether to print the background color"
 msgstr "是否打印背景颜色"
 
-#: ../data/epiphany.schemas.in.h:56
+#: ../data/epiphany.schemas.in.h:57
 msgid "Whether to print the background images"
 msgstr "是否打印背景图像"
 
-#: ../data/epiphany.schemas.in.h:57
+#: ../data/epiphany.schemas.in.h:58
 msgid "Whether to print the date in the footer"
 msgstr "是否在页脚打印日期"
 
-#: ../data/epiphany.schemas.in.h:58
+#: ../data/epiphany.schemas.in.h:59
 msgid "Whether to print the page address in the header"
 msgstr "是否在页眉打印页面地址"
 
-#: ../data/epiphany.schemas.in.h:59
+#: ../data/epiphany.schemas.in.h:60
 msgid "Whether to print the page numbers (x of total) in the footer"
 msgstr "是否在页脚打印页号(第 x 页共 y 页)"
 
-#: ../data/epiphany.schemas.in.h:60
+#: ../data/epiphany.schemas.in.h:61
 msgid "Whether to print the page title in the header"
 msgstr "是否在页眉打印页面标题"
 
-#: ../data/epiphany.schemas.in.h:61
+#: ../data/epiphany.schemas.in.h:62
 msgid "Whether to store and prefill passwords in web sites."
 msgstr "是否存储并预填网站中的密码。"
 
-#: ../data/epiphany.schemas.in.h:62
+#: ../data/epiphany.schemas.in.h:63
 msgid "x-western"
 msgstr "zh-CN"
 
@@ -531,7 +534,7 @@ msgid "MD5 Fingerprint:"
 msgstr "MD5 指纹："
 
 #: ../data/glade/certificate-dialogs.glade.h:14
-#: ../embed/mozilla/GtkNSSDialogs.cpp:916
+#: ../embed/mozilla/GtkNSSDialogs.cpp:915
 msgid "Organization:"
 msgstr "组织："
 
@@ -560,7 +563,7 @@ msgid "Cookies"
 msgstr "Cookies"
 
 #. The name of the default downloads folder
-#: ../data/glade/epiphany.glade.h:4 ../lib/ephy-file-helpers.c:108
+#: ../data/glade/epiphany.glade.h:4 ../lib/ephy-file-helpers.c:114
 msgid "Downloads"
 msgstr "下载"
 
@@ -581,7 +584,7 @@ msgid "Use the encoding specified by the document"
 msgstr "使用文档指定的编码"
 
 #: ../data/glade/epiphany.glade.h:9
-msgid "_Show password"
+msgid "_Show passwords"
 msgstr "显示密码(_S)"
 
 #: ../data/glade/form-signing-dialog.glade.h:1
@@ -603,7 +606,7 @@ msgstr "证书(_C)："
 #: ../data/glade/form-signing-dialog.glade.h:4
 #: ../embed/mozilla/EphyPromptService.cpp:808
 #: ../embed/mozilla/EphyPromptService.cpp:835
-#: ../lib/ephy-password-dialog.c:427 ../lib/ephy-password-dialog.c:443
+#: ../lib/ephy-password-dialog.c:429 ../lib/ephy-password-dialog.c:445
 msgid "_Password:"
 msgstr "密码(_P)："
 
@@ -668,7 +671,7 @@ msgstr "选择语言(_A)："
 #. * Select All, Input Methods and Insert Unicode control character.)
 #.
 #: ../data/glade/prefs-dialog.glade.h:14
-#: ../lib/widgets/ephy-location-entry.c:641 ../src/ephy-history-window.c:266
+#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-history-window.c:266
 msgid "Cl_ear"
 msgstr "清除(_E)"
 
@@ -696,7 +699,7 @@ msgstr "字体和样式"
 msgid "For l_anguage:"
 msgstr "为语言(_A)："
 
-#: ../data/glade/prefs-dialog.glade.h:22 ../src/prefs-dialog.c:1309
+#: ../data/glade/prefs-dialog.glade.h:22 ../src/prefs-dialog.c:1310
 msgid "Language"
 msgstr "语言"
 
@@ -737,46 +740,50 @@ msgid "Use custom _stylesheet"
 msgstr "使用自定义样式表(_S)"
 
 #: ../data/glade/prefs-dialog.glade.h:32
+msgid "Use s_mooth scrolling"
+msgstr "使用平滑滚动(_M)"
+
+#: ../data/glade/prefs-dialog.glade.h:33
 msgid "_Address:"
 msgstr "地址(_A)："
 
-#: ../data/glade/prefs-dialog.glade.h:33
+#: ../data/glade/prefs-dialog.glade.h:34
 msgid "_Always accept"
 msgstr "总是接受(_A)"
 
-#: ../data/glade/prefs-dialog.glade.h:34
+#: ../data/glade/prefs-dialog.glade.h:35
 msgid "_Detailed Font Settings…"
 msgstr "字体细节设置(_D)..."
 
-#: ../data/glade/prefs-dialog.glade.h:35
+#: ../data/glade/prefs-dialog.glade.h:36
 msgid "_Disk space:"
 msgstr "磁盘空间(_D)："
 
-#: ../data/glade/prefs-dialog.glade.h:36
+#: ../data/glade/prefs-dialog.glade.h:37
 msgid "_Download folder:"
 msgstr "下载文件夹(_D)："
 
-#: ../data/glade/prefs-dialog.glade.h:37
+#: ../data/glade/prefs-dialog.glade.h:38
 msgid "_Edit Stylesheet…"
 msgstr "编辑样式表(_E)..."
 
-#: ../data/glade/prefs-dialog.glade.h:38
+#: ../data/glade/prefs-dialog.glade.h:39
 msgid "_Fixed width:"
 msgstr "固定宽度(_F)："
 
-#: ../data/glade/prefs-dialog.glade.h:39
+#: ../data/glade/prefs-dialog.glade.h:40
 msgid "_Minimum size:"
 msgstr "最小大小(_M)："
 
-#: ../data/glade/prefs-dialog.glade.h:40
+#: ../data/glade/prefs-dialog.glade.h:41
 msgid "_Never accept"
 msgstr "从不接受(_N)"
 
-#: ../data/glade/prefs-dialog.glade.h:41
+#: ../data/glade/prefs-dialog.glade.h:42
 msgid "_Remember passwords"
 msgstr "记住密码(_R)"
 
-#: ../data/glade/prefs-dialog.glade.h:42
+#: ../data/glade/prefs-dialog.glade.h:43
 msgid "_Variable width:"
 msgstr "可变宽度(_V)："
 
@@ -833,30 +840,30 @@ msgid "_Page address"
 msgstr "页面地址(_P)"
 
 #. this opens the downloader window, or brings it to the foreground if already open
-#: ../embed/downloader-view.c:190
+#: ../embed/downloader-view.c:197
 msgid "_Show Downloads"
 msgstr "显示下载(_S)"
 
-#: ../embed/downloader-view.c:323
+#: ../embed/downloader-view.c:330
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: ../embed/downloader-view.c:327
+#: ../embed/downloader-view.c:334
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../embed/downloader-view.c:379
+#: ../embed/downloader-view.c:386
 msgid "_Pause"
 msgstr "暂停(_P)"
 
-#: ../embed/downloader-view.c:379
+#: ../embed/downloader-view.c:386
 msgid "_Resume"
 msgstr "续传(_R)"
 
 #. translators: first %s is filename, "%s of %s" is current/total file size
-#: ../embed/downloader-view.c:426
+#: ../embed/downloader-view.c:433
 #, c-format
 msgid ""
 "%s\n"
@@ -865,12 +872,12 @@ msgstr ""
 "%s\n"
 "%s，共%s"
 
-#: ../embed/downloader-view.c:436 ../embed/downloader-view.c:441
-#: ../src/ephy-window.c:1519
+#: ../embed/downloader-view.c:443 ../embed/downloader-view.c:448
+#: ../src/ephy-window.c:1523
 msgid "Unknown"
 msgstr "未知"
 
-#: ../embed/downloader-view.c:475
+#: ../embed/downloader-view.c:480
 #, c-format
 msgid "%d download"
 msgid_plural "%d downloads"
@@ -878,30 +885,30 @@ 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:589 ../embed/downloader-view.c:602
+#: ../embed/downloader-view.c:602 ../embed/downloader-view.c:615
 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:594
+#: ../embed/downloader-view.c:607
 msgid "download status|Failed"
 msgstr "失败"
 
-#: ../embed/downloader-view.c:661
+#: ../embed/downloader-view.c:674
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1007
 msgid "File"
 msgstr "文件"
 
-#: ../embed/downloader-view.c:684
+#: ../embed/downloader-view.c:697
 msgid "%"
 msgstr "%"
 
-#: ../embed/downloader-view.c:695
+#: ../embed/downloader-view.c:708
 msgid "Remaining"
 msgstr "剩余"
 
-#: ../embed/ephy-embed-shell.c:264
+#: ../embed/ephy-embed-shell.c:271
 msgid "Epiphany can't be used now. Mozilla initialization failed."
 msgstr "现在无法使用 Epiphany。Mozilla 初始化失败。"
 
@@ -1288,36 +1295,36 @@ msgstr "乌克兰语"
 msgid "Unknown (%s)"
 msgstr "未知(%s)"
 
-#: ../embed/ephy-history.c:521
+#: ../embed/ephy-history.c:505
 msgid "All"
 msgstr "全部"
 
-#: ../embed/ephy-history.c:692
+#: ../embed/ephy-history.c:676
 msgid "Others"
 msgstr "其它"
 
-#: ../embed/ephy-history.c:698
+#: ../embed/ephy-history.c:682
 msgid "Local files"
 msgstr "本地文件"
 
-#: ../embed/mozilla/ContentHandler.cpp:147
-#: ../embed/mozilla/EphyHeaderSniffer.cpp:406
+#: ../embed/mozilla/ContentHandler.cpp:159
+#: ../embed/mozilla/EphyHeaderSniffer.cpp:408
 msgid "Save"
 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/ContentHandler.cpp:260
+#: ../embed/mozilla/ContentHandler.cpp:272
 msgid "File Type:|Unknown"
 msgstr "未知"
 
-#: ../embed/mozilla/ContentHandler.cpp:276
+#: ../embed/mozilla/ContentHandler.cpp:288
 msgid "Download this potentially unsafe file?"
 msgstr "下载可能不安全的文件吗？"
 
 #. translators: First %s is the file type description,
 #. Second %s is the file name
-#: ../embed/mozilla/ContentHandler.cpp:282
+#: ../embed/mozilla/ContentHandler.cpp:294
 #, c-format
 msgid ""
 "File Type: “%s”.\n"
@@ -1329,14 +1336,14 @@ msgstr ""
 "\n"
 "打开“%s”可能不安全，因为它可能损坏您的文档或暴露您的隐私。您可以下载它。"
 
-#: ../embed/mozilla/ContentHandler.cpp:292
+#: ../embed/mozilla/ContentHandler.cpp:304
 msgid "Open this file?"
 msgstr "打开此文件吗？"
 
 #. translators: First %s is the file type description,
 #. Second %s is the file name,
 #. Third %s is the application used to open the file
-#: ../embed/mozilla/ContentHandler.cpp:299
+#: ../embed/mozilla/ContentHandler.cpp:311
 #, c-format
 msgid ""
 "File Type: “%s”.\n"
@@ -1347,13 +1354,13 @@ msgstr ""
 "\n"
 "您可以使用“%3$s”打开“%2$s”或保存它。"
 
-#: ../embed/mozilla/ContentHandler.cpp:307
+#: ../embed/mozilla/ContentHandler.cpp:319
 msgid "Download this file?"
 msgstr "下载此文件吗？"
 
 #. translators: First %s is the file type description,
 #. Second %s is the file name
-#: ../embed/mozilla/ContentHandler.cpp:313
+#: ../embed/mozilla/ContentHandler.cpp:325
 #, c-format
 msgid ""
 "File Type: “%s”.\n"
@@ -1364,7 +1371,7 @@ msgstr ""
 "\n"
 "您没有可打开“%s”的应用程序。您可以下载它。"
 
-#: ../embed/mozilla/ContentHandler.cpp:318
+#: ../embed/mozilla/ContentHandler.cpp:330
 msgid "_Save As..."
 msgstr "另存为(_S)..."
 
@@ -1445,8 +1452,8 @@ msgid ""
 "Configuration Tool in System > Control Center, or</ul><ul><li>the port "
 "number %d is wrong.</li></ul>"
 msgstr ""
-"<ul><li>服务 %s 未启动。</li>请试着使用 桌面 > 控制中心 中的"
-"服务配置工具启动该服务。要不然就是</ul><ul><li>端口号 %d 有错。</li></ul>"
+"<ul><li>服务 %s 未启动。</li>请试着使用 桌面 > 控制中心 中的服务配置工具启动"
+"该服务。要不然就是</ul><ul><li>端口号 %d 有错。</li></ul>"
 
 #: ../embed/mozilla/EphyAboutModule.cpp:287
 #, c-format
@@ -1465,7 +1472,6 @@ msgstr "<ul><li>某些服务未启动。</li><li>您填错了端口号。</li></
 #: ../embed/mozilla/EphyAboutModule.cpp:322
 #: ../embed/mozilla/EphyAboutModule.cpp:341
 #: ../embed/mozilla/EphyAboutModule.cpp:399
-#: ../embed/mozilla/EphyAboutModule.cpp:430
 msgid ""
 "The server may be busy or you may have a network connection problem. Try "
 "again later."
@@ -1476,7 +1482,6 @@ msgstr "服务器可能正忙，或者您的网络连接有问题。请稍后再
 #: ../embed/mozilla/EphyAboutModule.cpp:343
 #: ../embed/mozilla/EphyAboutModule.cpp:366
 #: ../embed/mozilla/EphyAboutModule.cpp:401
-#: ../embed/mozilla/EphyAboutModule.cpp:432
 msgid "There may be an old version of the page you wanted:"
 msgstr "您想要查看的页面可能有旧版本："
 
@@ -1557,7 +1562,6 @@ msgid "“%s” dropped the connection."
 msgstr "“%s”断开了连接。"
 
 #: ../embed/mozilla/EphyAboutModule.cpp:397
-#: ../embed/mozilla/EphyAboutModule.cpp:428
 msgid "The server dropped the connection before any data could be read."
 msgstr "在读取数据之前服务器断开了连接。"
 
@@ -1575,23 +1579,34 @@ msgstr "要查看此文档，请禁用“脱机工作”然后再试一次。"
 
 #: ../embed/mozilla/EphyAboutModule.cpp:422
 #, c-format
-msgid "“%s” Denied Access to Port “%d”"
-msgstr "“%s”禁止访问端口“%d”"
+msgid "Access Denied to Port “%d” of “%s”"
+msgstr "禁止访问“%2$s”的端口“%1$d”"
 
 #: ../embed/mozilla/EphyAboutModule.cpp:426
 #, c-format
-msgid "“%s” denied access to port “%d”."
-msgstr "“%s”禁止访问端口“%d”。"
+msgid "Access denied to port “%d” of “%s”."
+msgstr "禁止访问“%2$s”的端口“%1$d”。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:437
+#: ../embed/mozilla/EphyAboutModule.cpp:428
+msgid ""
+"This address uses a network port which is normally used for purposes other "
+"than Web browsing."
+msgstr ""
+"此地址所使用的网络端口通常不用做 Web 浏览。"
+
+#: ../embed/mozilla/EphyAboutModule.cpp:430
+msgid "The request has been cancelled for your protection."
+msgstr "为了保护您，请求已被取消。"
+
+#: ../embed/mozilla/EphyAboutModule.cpp:435
 msgid "Could not Connect to Proxy Server"
 msgstr "无法连接到代理服务器"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:438
+#: ../embed/mozilla/EphyAboutModule.cpp:436
 msgid "Could not connect to proxy server."
 msgstr "无法连接到代理服务器。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:439
+#: ../embed/mozilla/EphyAboutModule.cpp:437
 msgid ""
 "Check your proxy server settings. If the connection still fails, there may "
 "be a problem with your proxy server or your network connection."
@@ -1599,19 +1614,19 @@ msgstr ""
 "请检查控制中心中的代理服务器设置。如果连接仍旧失败的话，您的代理服务器可能有"
 "问题，不然就是您的网络连接有问题。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:447
+#: ../embed/mozilla/EphyAboutModule.cpp:445
 msgid "Could not Display Content"
 msgstr "无法显示内容"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:448
+#: ../embed/mozilla/EphyAboutModule.cpp:446
 msgid "Could not display content."
 msgstr "无法显示内容。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:449
+#: ../embed/mozilla/EphyAboutModule.cpp:447
 msgid "The page uses an unsupported or invalid form of compression."
 msgstr "页面使用不支持的压缩格式，或者所使用的压缩格式非法。"
 
-#: ../embed/mozilla/EphyAboutModule.cpp:538
+#: ../embed/mozilla/EphyAboutModule.cpp:537
 #, c-format
 msgid ""
 "The page “%s” in this tab was not fully loaded yet when the web browser "
@@ -1622,17 +1637,17 @@ 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:665
+#: ../embed/mozilla/EphyAboutModule.cpp:664
 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:673
+#: ../embed/mozilla/EphyAboutModule.cpp:672
 msgid "You may find an old version:|in the Internet Archive"
 msgstr "于 Internet 存档"
 
-#: ../embed/mozilla/EphyHeaderSniffer.cpp:362
+#: ../embed/mozilla/EphyHeaderSniffer.cpp:364
 #: ../src/bookmarks/ephy-bookmarks.c:1312
 #: ../src/bookmarks/ephy-bookmarks-import.c:261 ../src/ephy-session.c:1315
 msgid "Untitled"
@@ -1647,7 +1662,7 @@ msgid "Don't Save"
 msgstr "不保存"
 
 #: ../embed/mozilla/EphyPromptService.cpp:807
-#: ../lib/ephy-password-dialog.c:399
+#: ../lib/ephy-password-dialog.c:401
 msgid "_Username:"
 msgstr "用户名(_U)："
 
@@ -1676,6 +1691,47 @@ msgstr "XML 文件"
 msgid "XUL files"
 msgstr "XUL 文件"
 
+#: ../embed/mozilla/GeckoCookiePromptService.cpp:93
+#, c-format
+msgid "Accept cookie from %s?"
+msgstr "接受 %s 的 cookie 吗？"
+
+#: ../embed/mozilla/GeckoCookiePromptService.cpp:100
+msgid "Accept Cookie?"
+msgstr "接受 Cookie 吗？"
+
+#: ../embed/mozilla/GeckoCookiePromptService.cpp:105
+msgid "The site wants to modify an existing cookie."
+msgstr "站点想要修改已有 cookie。"
+
+#: ../embed/mozilla/GeckoCookiePromptService.cpp:109
+msgid "The site wants to set a cookie."
+msgstr "站点想要设定 cookie。"
+
+#: ../embed/mozilla/GeckoCookiePromptService.cpp:113
+msgid "The site wants to set a second cookie."
+msgstr "站点想要设定第二个 cookie。"
+
+#: ../embed/mozilla/GeckoCookiePromptService.cpp:116
+#, c-format
+msgid "You already have %d cookie from this site."
+msgid_plural "You already have %d cookies from this site."
+msgstr[0] "您已经有来自此站点的 %d 个 cookie。"
+
+#: ../embed/mozilla/GeckoCookiePromptService.cpp:130
+msgid "Apply this _decision to all cookies from this site"
+msgstr "对此站点的全部 cookie 都应用此决定(_D)"
+
+#: ../embed/mozilla/GeckoCookiePromptService.cpp:138
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1677
+msgid "_Reject"
+msgstr "拒绝(_R)"
+
+#: ../embed/mozilla/GeckoCookiePromptService.cpp:140
+#: ../embed/mozilla/GtkNSSDialogs.cpp:271
+msgid "_Accept"
+msgstr "接受(_A)"
+
 #: ../embed/mozilla/GeckoFormSigningDialog.cpp:108
 #, c-format
 msgid "The web site “%s” requests that you sign the following text:"
@@ -1685,37 +1741,37 @@ msgstr "网站“%s”请求您对下列文本签名："
 msgid "_Sign text"
 msgstr "对文本签名(_S)"
 
-#: ../embed/mozilla/GeckoPrintService.cpp:178
+#: ../embed/mozilla/GeckoPrintService.cpp:197
 msgid "Options"
 msgstr "选项"
 
-#: ../embed/mozilla/GeckoPrintService.cpp:431
+#: ../embed/mozilla/GeckoPrintService.cpp:461
 msgid "Print this page?"
 msgstr "打印此页吗？"
 
-#: ../embed/mozilla/GeckoPrintService.cpp:439
+#: ../embed/mozilla/GeckoPrintService.cpp:469
 msgid "Preparing to print"
 msgstr "正在准备打印"
 
-#: ../embed/mozilla/GeckoPrintSession.cpp:228
+#: ../embed/mozilla/GeckoPrintSession.cpp:232
 #, c-format
 msgid "Page %d of %d"
 msgstr "第%d页，共%d页"
 
-#: ../embed/mozilla/GeckoPrintSession.cpp:256
+#: ../embed/mozilla/GeckoPrintSession.cpp:260
 msgid "Cancelling print"
 msgstr "正在取消打印"
 
 #. FIXME text!
-#: ../embed/mozilla/GeckoPrintSession.cpp:318
+#: ../embed/mozilla/GeckoPrintSession.cpp:322
 msgid "Spooling..."
 msgstr "正在执行假脱机...."
 
-#: ../embed/mozilla/GeckoPrintSession.cpp:332
+#: ../embed/mozilla/GeckoPrintSession.cpp:336
 msgid "Print error"
 msgstr "打印错误"
 
-#: ../embed/mozilla/GeckoPrintSession.cpp:591
+#: ../embed/mozilla/GeckoPrintSession.cpp:600
 #, c-format
 msgid "Printing “%s”"
 msgstr "正在打印“%s”"
@@ -1739,15 +1795,11 @@ msgstr "证书细节(_D)"
 
 #. Add the buttons
 #: ../embed/mozilla/GtkNSSDialogs.cpp:263
-#: ../embed/mozilla/GtkNSSDialogs.cpp:625
+#: ../embed/mozilla/GtkNSSDialogs.cpp:624
 msgid "_View Certificate"
 msgstr "查看证书(_V)"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:271
-msgid "_Accept"
-msgstr "接受(_A)"
-
-#: ../embed/mozilla/GtkNSSDialogs.cpp:404
+#: ../embed/mozilla/GtkNSSDialogs.cpp:403
 #, c-format
 msgid ""
 "The site “%s” returned security information for “%s”. It is possible that "
@@ -1756,58 +1808,58 @@ msgid ""
 msgstr ""
 "站点“%s”针对“%s”返回的安全信息。可能某人正在截获您的通讯来获取您的机密信息。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:410
+#: ../embed/mozilla/GtkNSSDialogs.cpp:409
 #, c-format
 msgid ""
 "You should only accept the security information if you trust “%s” and “%s”."
 msgstr "请仅当您信任“%s”和“%s”时才接受安全信息。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:415
+#: ../embed/mozilla/GtkNSSDialogs.cpp:414
 msgid "Accept incorrect security information?"
 msgstr "接受不正确的安全信息吗？"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:444
+#: ../embed/mozilla/GtkNSSDialogs.cpp:443
 #, 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."
 msgstr "无法自动信任“%s”。可能有人正在截获您的通讯以获取您的机密信息。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:450
+#: ../embed/mozilla/GtkNSSDialogs.cpp:449
 #, c-format
 msgid ""
 "You should only connect to the site if you are certain you are connected to "
 "“%s”."
 msgstr "您应该仅仅连接到您确信无疑被连接到了的站点“%s”。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:455
+#: ../embed/mozilla/GtkNSSDialogs.cpp:454
 msgid "Connect to untrusted site?"
 msgstr "连接到不信任的站点吗？"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:459
+#: ../embed/mozilla/GtkNSSDialogs.cpp:458
 msgid "_Trust this security information from now on"
 msgstr "从现在起信任此安全信息(_T)"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:460
+#: ../embed/mozilla/GtkNSSDialogs.cpp:459
 msgid "Co_nnect"
 msgstr "连接(_N)"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:519
+#: ../embed/mozilla/GtkNSSDialogs.cpp:518
 msgid "Accept expired security information?"
 msgstr "接受过期的安全信息吗？"
 
 #. Translators: first %s is a hostname, second %s is a time/date
-#: ../embed/mozilla/GtkNSSDialogs.cpp:521
+#: ../embed/mozilla/GtkNSSDialogs.cpp:520
 #, c-format
 msgid "The security information for “%s” expired on %s."
 msgstr "“%s”的安全信息已在 %s 过期。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:527
+#: ../embed/mozilla/GtkNSSDialogs.cpp:526
 msgid "Accept not yet valid security information?"
 msgstr "接受尚未生效的安全信息吗？"
 
 #. Translators: first %s is a hostname, second %s is a time/date
-#: ../embed/mozilla/GtkNSSDialogs.cpp:529
+#: ../embed/mozilla/GtkNSSDialogs.cpp:528
 #, c-format
 msgid "The security information for “%s” isn't valid until %s."
 msgstr "“%s”的安全信息直到 %s 才生效。"
@@ -1815,20 +1867,20 @@ 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:543
+#: ../embed/mozilla/GtkNSSDialogs.cpp:542
 msgid "%a %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:552
+#: ../embed/mozilla/GtkNSSDialogs.cpp:551
 msgid "You should ensure that your computer's time is correct."
 msgstr "您应该保证您计算机的时间是正确的。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:586
+#: ../embed/mozilla/GtkNSSDialogs.cpp:585
 #, c-format
 msgid "Cannot establish connection to “%s”"
 msgstr "无法建立到“%s”的连接"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:591
+#: ../embed/mozilla/GtkNSSDialogs.cpp:590
 #, c-format
 msgid ""
 "The certificate revocation list (CRL) from “%s” needs to be updated.\n"
@@ -1838,142 +1890,146 @@ msgstr ""
 "来自“%s”的证书吊销列表(CRL)需要更新。\n"
 "请请求系统管理员的协助。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:623
+#: ../embed/mozilla/GtkNSSDialogs.cpp:622
 msgid "Trust new Certificate Authority?"
 msgstr "信任新的证书颁发机构吗？"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:628
+#: ../embed/mozilla/GtkNSSDialogs.cpp:627
 msgid "_Trust CA"
 msgstr "信任 CA(_T)"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:648
+#: ../embed/mozilla/GtkNSSDialogs.cpp:647
 #, c-format
 msgid "Trust new Certificate Authority “%s” to identify web sites?"
 msgstr "信任新的证书颁发机构“%s”标识网站吗？"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:653
+#: ../embed/mozilla/GtkNSSDialogs.cpp:652
 msgid ""
 "Before trusting a Certificate Authority (CA) you should verify the "
 "certificate is authentic."
 msgstr "在信任一个证书颁发机构之前您应该验证该证书是可信的。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:724
+#: ../embed/mozilla/GtkNSSDialogs.cpp:723
 msgid "Certificate already exists."
 msgstr "证书已存在。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:725
+#: ../embed/mozilla/GtkNSSDialogs.cpp:724
 msgid "The certificate has already been imported."
 msgstr "证书已经导入。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:757
+#: ../embed/mozilla/GtkNSSDialogs.cpp:756
 msgid "Select Password"
 msgstr "选择密码"
 
 #. FIXME: set accept button text to (_("_Back Up Certificate") ?
 #. * That's not actually correct, since this function is also called from other places!
 #.
-#: ../embed/mozilla/GtkNSSDialogs.cpp:767
+#: ../embed/mozilla/GtkNSSDialogs.cpp:766
 msgid "Select a password to protect this certificate"
 msgstr "选择可保护此证书的密码"
 
 #. FIXME: mozilla sucks, no way to get the name of the certificate / cert file!
-#: ../embed/mozilla/GtkNSSDialogs.cpp:816
+#: ../embed/mozilla/GtkNSSDialogs.cpp:815
 msgid "Enter the password for this certificate"
 msgstr "输入此证书的密码"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:887
+#: ../embed/mozilla/GtkNSSDialogs.cpp:886
 msgid "Certificate Revocation List Imported"
 msgstr "证书吊销列表已导入"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:897
+#: ../embed/mozilla/GtkNSSDialogs.cpp:896
 msgid "Certificate Revocation List (CRL) successfully imported"
 msgstr "证书吊销列表(CRL)已成功导入"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:918
+#: ../embed/mozilla/GtkNSSDialogs.cpp:917
 msgid "Unit:"
 msgstr "单位："
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:920
+#: ../embed/mozilla/GtkNSSDialogs.cpp:919
 msgid "Next Update:"
 msgstr "下次更新："
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:947
+#: ../embed/mozilla/GtkNSSDialogs.cpp:946
 msgid "Not part of certificate"
 msgstr "不是证书的一部分"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1235
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1234
 msgid "Certificate Properties"
 msgstr "证书属性"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1257
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1256
 msgid "This certificate has been verified for the following uses:"
 msgstr "此证书已在下列用途得到验证："
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1260
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1259
 msgid "Could not verify this certificate because it has been revoked."
 msgstr "无法验证此证书因其已被撤消。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1263
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1262
 msgid "Could not verify this certificate because it has expired."
 msgstr "无法验证此证书因其已过期。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1266
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1265
 msgid "Could not verify this certificate because it is not trusted."
 msgstr "无法验证此证书因其不被信任。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1269
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1268
 msgid "Could not verify this certificate because the issuer is not trusted."
 msgstr "无法验证此证书因其发行者不可信。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1272
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1271
 msgid "Could not verify this certificate because the issuer is unknown."
 msgstr "无法验证此证书因其发行者未知。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1275
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1274
 msgid ""
 "Could not verify this certificate because the CA certificate is invalid."
 msgstr "无法验证此证书因其 CA 证书无效。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1280
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1279
 msgid "Could not verify this certificate for unknown reasons."
 msgstr "无法验证此证书，原因未知。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1419
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1418
 msgid "Change Token Password"
 msgstr "更改令牌密码"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1425
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1424
 #, c-format
 msgid "Choose a password for the “%s” token"
 msgstr "选择“%s”令牌的密码"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1428
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1427
 #, c-format
 msgid "Change the password for the “%s” token"
 msgstr "更改“%s”令牌的密码"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1512
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1511
 msgid "Get Token Password"
 msgstr "获得令牌密码"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1516
+#. Translators: A "token" is something that enables the user to authenticate himself or
+#. * prove his credentials. This can be either a hardware device (e.g. a smart-card), or
+#. * a data file (e.g. a cryptographic certificate).
+#.
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1519
 #, c-format
 msgid "Please enter the password for the “%s” token"
 msgstr "请输入“%s”令牌的密码"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1582
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1585
 msgid "Please select a token:"
 msgstr "请选择令牌："
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1601
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1604
 msgid "_Select"
 msgstr "选择(_S)"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1654
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1657
 msgid "Escrow the secret key?"
 msgstr "送出密钥吗？"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1663
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1666
 #, c-format
 msgid ""
 "The certificate authority “%s” requests that you give it a copy of the newly "
@@ -1990,11 +2046,7 @@ msgstr ""
 "\n"
 "强烈建议您不要将密钥发送给它。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1674
-msgid "_Reject"
-msgstr "拒绝(_R)"
-
-#: ../embed/mozilla/GtkNSSDialogs.cpp:1677
+#: ../embed/mozilla/GtkNSSDialogs.cpp:1680
 msgid "_Allow"
 msgstr "允许(_A)"
 
@@ -2017,53 +2069,59 @@ msgid "This page is loaded over a secure connection"
 msgstr "页面通过安全连接装入"
 
 #: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:97
-msgid "The padlock icon in the statusbar indicates whether a page is secure."
-msgstr "状态栏中的锁形图标表明页面是否安全。"
+msgid ""
+"For secure pages, the address entry has a distinct color and a locked "
+"padlock icon is displayed.\n"
+"\n"
+"The padlock icon in the statusbar also indicates whether a page is secure."
+msgstr ""
+"对于安全页面，地址输入框的颜色将发生变化，并且还会显示锁形图标。\n\n"
+"状态栏中的锁形图标也同时表明页面是否安全。"
 
-#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:113
-#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:141
-#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:160
-#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:180
+#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:116
+#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:144
+#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:163
+#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:183
 msgid "Security Warning"
 msgstr "安全警告"
 
-#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:114
+#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:117
 msgid "This page is loaded over a low security connection"
 msgstr "此页面通过低安全连接装入"
 
-#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:115
+#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:118
 msgid ""
 "Any information you see or enter on this page could easily be intercepted by "
 "a third party."
 msgstr "您在此页面看到或输入的任何信息都可能被第三方轻易截取。"
 
-#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:142
+#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:145
 msgid "Some parts of this page are loaded over an insecure connection"
 msgstr "此页面的某些部分是通过不安全连接装入的"
 
-#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:143
+#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:146
 msgid ""
 "Some information you see or enter will be sent over an insecure connection, "
 "and could easily be intercepted by a third party."
 msgstr "您看到或输入的某些信息是通过不安全的连接传送的，可被第三方轻易截取。"
 
-#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:161
-#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:181
+#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:164
+#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:184
 msgid "Send this information over an insecure connection?"
 msgstr "通过不安全连接发送此信息吗？"
 
-#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:162
+#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:165
 msgid ""
 "The information you have entered will be sent over an insecure connection, "
 "and could easily be intercepted by a third party."
 msgstr "您输入的信息是通过不安全的连接传送的，可被第三方轻易截取。"
 
-#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:165
-#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:186
+#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:168
+#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:189
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:182
+#: ../embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:185
 msgid ""
 "Although this page was loaded over a secure connection, the information you "
 "have entered will be sent over an insecure connection, and could easily be "
@@ -2072,9 +2130,11 @@ msgstr ""
 "尽管此页面是通过安全连接装入的，但您输入的信息是通过不安全的连接传送的，可被"
 "第三方轻易截取。"
 
-#: ../embed/mozilla/MozDownload.cpp:629
-msgid "Files"
-msgstr "文件"
+#. translators: this is the directory name to store auxilary files when saving html files
+#: ../embed/mozilla/MozDownload.cpp:677
+#, c-format
+msgid "%s Files"
+msgstr "%s 的文件"
 
 #. We do this before reading the user pref file so that the user
 #. * still can overwrite this pref.
@@ -2086,7 +2146,7 @@ msgstr "文件"
 #. * in url-escaped UTF-8; that means that if you're choosing google,
 #. * the 'q=' part needs to come last.
 #.
-#: ../embed/mozilla/mozilla-embed-single.cpp:262
+#: ../embed/mozilla/mozilla-embed-single.cpp:203
 msgid "http://www.google.com/search?ie=UTF-8&oe=UTF-8&q="
 msgstr "http://www.google.com/search?ie=UTF-8&oe=UTF-8&q="
 
@@ -2106,36 +2166,36 @@ msgstr ""
 #. * produce duplicates, but don't worry about it. If your language
 #. * normally has a mnemonic at the start, please use the _. If not,
 #. * please remove.
-#: ../lib/egg/egg-editable-toolbar.c:904
+#: ../lib/egg/egg-editable-toolbar.c:938
 #, c-format
 msgid "Show “_%s”"
 msgstr "显示“%s”"
 
-#: ../lib/egg/egg-editable-toolbar.c:1364
+#: ../lib/egg/egg-editable-toolbar.c:1401
 msgid "_Move on Toolbar"
 msgstr "在工具栏上移动(_M)"
 
-#: ../lib/egg/egg-editable-toolbar.c:1365
+#: ../lib/egg/egg-editable-toolbar.c:1402
 msgid "Move the selected item on the toolbar"
 msgstr "在工具栏上移动选中项"
 
-#: ../lib/egg/egg-editable-toolbar.c:1366
+#: ../lib/egg/egg-editable-toolbar.c:1403
 msgid "_Remove from Toolbar"
 msgstr "从工具栏删除(_R)"
 
-#: ../lib/egg/egg-editable-toolbar.c:1367
+#: ../lib/egg/egg-editable-toolbar.c:1404
 msgid "Remove the selected item from the toolbar"
 msgstr "删除工具栏上的选中项"
 
-#: ../lib/egg/egg-editable-toolbar.c:1368
+#: ../lib/egg/egg-editable-toolbar.c:1405
 msgid "_Delete Toolbar"
 msgstr "删除工具栏(_D)"
 
-#: ../lib/egg/egg-editable-toolbar.c:1369
+#: ../lib/egg/egg-editable-toolbar.c:1406
 msgid "Remove the selected toolbar"
 msgstr "删除选中工具栏"
 
-#: ../lib/egg/egg-toolbar-editor.c:439
+#: ../lib/egg/egg-toolbar-editor.c:441
 msgid "Separator"
 msgstr "分隔符"
 
@@ -2143,17 +2203,17 @@ msgstr "分隔符"
 msgid "All supported types"
 msgstr "支持的全部类型"
 
-#: ../lib/ephy-file-helpers.c:302
+#: ../lib/ephy-file-helpers.c:299
 #, c-format
 msgid "Could not create a temporary directory in “%s”."
 msgstr "无法在“%s”中创建临时目录。"
 
-#: ../lib/ephy-file-helpers.c:378
+#: ../lib/ephy-file-helpers.c:375
 #, c-format
 msgid "The file “%s” exists. Please move it out of the way."
 msgstr "文件“%s”已存在，请将其移出。"
 
-#: ../lib/ephy-file-helpers.c:389
+#: ../lib/ephy-file-helpers.c:386
 #, c-format
 msgid "Failed to create directory “%s”."
 msgstr "创建目录“%s”失败。"
@@ -2347,57 +2407,59 @@ msgstr "西欧"
 msgid "select fonts for|Other Scripts"
 msgstr "其它语言"
 
-#: ../lib/ephy-password-dialog.c:413
+#: ../lib/ephy-password-dialog.c:415
 msgid "_Domain:"
 msgstr "域(_D)："
 
-#: ../lib/ephy-password-dialog.c:442
+#: ../lib/ephy-password-dialog.c:444
 msgid "_New password:"
 msgstr "新密码(_N)："
 
-#: ../lib/ephy-password-dialog.c:452
+#: ../lib/ephy-password-dialog.c:454
 msgid "Con_firm password:"
 msgstr "确认密码(_F)："
 
-#: ../lib/ephy-password-dialog.c:478
+#: ../lib/ephy-password-dialog.c:482
 msgid "Password quality:"
 msgstr "密码质量"
 
-#: ../lib/ephy-password-dialog.c:494
+#: ../lib/ephy-password-dialog.c:499
 msgid "Do not remember this password"
 msgstr "不记住此密码"
 
-#: ../lib/ephy-password-dialog.c:498
+#: ../lib/ephy-password-dialog.c:503
 msgid "_Remember password for this session"
 msgstr "记住此会话的密码(_R)"
 
-#: ../lib/ephy-password-dialog.c:502
+#: ../lib/ephy-password-dialog.c:507
 msgid "Save password in _keyring"
 msgstr "在密钥环中保存密码(_K)"
 
-#: ../lib/ephy-stock-icons.c:54
+#: ../lib/ephy-stock-icons.c:52
 msgid "Popup Windows"
 msgstr "弹出窗口"
 
-#: ../lib/ephy-stock-icons.c:55 ../src/ephy-history-window.c:1195
+#: ../lib/ephy-stock-icons.c:53 ../src/ephy-history-window.c:1195
 msgid "History"
 msgstr "历史"
 
-#: ../lib/ephy-stock-icons.c:56 ../src/ephy-window.c:1337
+#: ../lib/ephy-stock-icons.c:54
+#: ../src/bookmarks/ephy-bookmark-factory-action.c:323
+#: ../src/ephy-window.c:1341
 msgid "Bookmark"
 msgstr "书签"
 
-#: ../lib/ephy-stock-icons.c:57 ../src/bookmarks/ephy-bookmarks-editor.c:917
+#: ../lib/ephy-stock-icons.c:55 ../src/bookmarks/ephy-bookmarks-editor.c:917
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1765
-#: ../src/bookmarks/ephy-topic-action.c:411 ../src/ephy-window.c:1341
+#: ../src/bookmarks/ephy-topic-action.c:455 ../src/ephy-window.c:1345
 msgid "Bookmarks"
 msgstr "书签"
 
-#: ../lib/ephy-stock-icons.c:58 ../src/ephy-toolbar.c:283
+#: ../lib/ephy-stock-icons.c:56 ../src/ephy-toolbar.c:283
 msgid "Address Entry"
 msgstr "地址输入项"
 
-#: ../lib/ephy-stock-icons.c:59
+#: ../lib/ephy-stock-icons.c:57
 msgid "_Download"
 msgstr "下载(_D)"
 
@@ -2437,7 +2499,7 @@ msgstr "300%"
 msgid "400%"
 msgstr "400%"
 
-#: ../lib/widgets/ephy-location-entry.c:908
+#: ../lib/widgets/ephy-location-entry.c:892
 msgid "Drag and drop this icon to create a link to this page"
 msgstr "拖曳此图标可创建到此页面的链接"
 
@@ -2473,10 +2535,6 @@ msgstr "此插件将处理包含 Web 链接的“.desktop”和“.url”文件
 msgid "%s:"
 msgstr "%s："
 
-#: ../src/bookmarks/ephy-bookmark-factory-action.c:323
-msgid "Quick Bookmark"
-msgstr "快速书签"
-
 #. Translators: This string is used when counting bookmarks that
 #. * are similar to each other
 #: ../src/bookmarks/ephy-bookmark-properties.c:96
@@ -2611,7 +2669,7 @@ msgstr "未分类"
 #. Translators: this is an automatic topic containing local
 #. * websites bookmarks autodiscovered with zeroconf.
 #: ../src/bookmarks/ephy-bookmarks.c:1077
-msgid "bookmarks|Local Sites"
+msgid "bookmarks|Nearby Sites"
 msgstr "本地网站"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:99
@@ -2691,83 +2749,83 @@ msgstr "重命名(_R)..."
 msgid "Rename the selected bookmark or topic"
 msgstr "重命名选中书签或主题"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:199
-#: ../src/ephy-history-window.c:178
-msgid "_Delete"
-msgstr "删除(_D)"
-
-#: ../src/bookmarks/ephy-bookmarks-editor.c:200
-msgid "Delete the selected bookmark or topic"
-msgstr "删除选中书签或主题"
-
 #. Add popup menu actions that are specific to the bookmark widgets
-#: ../src/bookmarks/ephy-bookmarks-editor.c:202
+#: ../src/bookmarks/ephy-bookmarks-editor.c:199
 #: ../src/bookmarks/ephy-bookmarks-ui.c:300
 msgid "_Properties"
 msgstr "属性(_P)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:203
+#: ../src/bookmarks/ephy-bookmarks-editor.c:200
 msgid "View or modify the properties of the selected bookmark"
 msgstr "查看或修改选中书签的属性"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:205
+#: ../src/bookmarks/ephy-bookmarks-editor.c:202
 msgid "_Import Bookmarks…"
 msgstr "导入书签(_I)..."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:206
+#: ../src/bookmarks/ephy-bookmarks-editor.c:203
 msgid "Import bookmarks from another browser or a bookmarks file"
 msgstr "从其它浏览器或书签文件中导入书签"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:208
+#: ../src/bookmarks/ephy-bookmarks-editor.c:205
 msgid "_Export Bookmarks…"
 msgstr "导出书签(_E)..."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:209
+#: ../src/bookmarks/ephy-bookmarks-editor.c:206
 msgid "Export bookmarks to a file"
 msgstr "将书签导出至文件"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:211
-#: ../src/ephy-history-window.c:184 ../src/ephy-window.c:147
+#: ../src/bookmarks/ephy-bookmarks-editor.c:208
+#: ../src/ephy-history-window.c:181 ../src/ephy-window.c:147
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:212
+#: ../src/bookmarks/ephy-bookmarks-editor.c:209
 msgid "Close the bookmarks window"
 msgstr "关闭书签窗口"
 
 #. Edit Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:216
-#: ../src/ephy-history-window.c:189 ../src/ephy-window.c:159
+#: ../src/bookmarks/ephy-bookmarks-editor.c:213
+#: ../src/ephy-history-window.c:186 ../src/ephy-window.c:159
 msgid "Cu_t"
 msgstr "剪切(_T)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:217
-#: ../src/ephy-history-window.c:190 ../src/ephy-window.c:160
+#: ../src/bookmarks/ephy-bookmarks-editor.c:214
+#: ../src/ephy-history-window.c:187 ../src/ephy-window.c:160
 msgid "Cut the selection"
 msgstr "剪切选中范围"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:219
+#: ../src/bookmarks/ephy-bookmarks-editor.c:216
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1394
-#: ../src/ephy-history-window.c:192 ../src/ephy-history-window.c:721
+#: ../src/ephy-history-window.c:189 ../src/ephy-history-window.c:721
 #: ../src/ephy-window.c:162
 msgid "_Copy"
 msgstr "复制(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:220
-#: ../src/ephy-history-window.c:193 ../src/ephy-window.c:163
+#: ../src/bookmarks/ephy-bookmarks-editor.c:217
+#: ../src/ephy-history-window.c:190 ../src/ephy-window.c:163
 msgid "Copy the selection"
 msgstr "复制选中范围"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:222
-#: ../src/ephy-history-window.c:195 ../src/ephy-window.c:165
+#: ../src/bookmarks/ephy-bookmarks-editor.c:219
+#: ../src/ephy-history-window.c:192 ../src/ephy-window.c:165
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:223
-#: ../src/ephy-history-window.c:196
+#: ../src/bookmarks/ephy-bookmarks-editor.c:220
+#: ../src/ephy-history-window.c:193
 msgid "Paste the clipboard"
 msgstr "粘贴剪贴板"
 
+#: ../src/bookmarks/ephy-bookmarks-editor.c:222
+#: ../src/ephy-history-window.c:195
+msgid "_Delete"
+msgstr "删除(_D)"
+
+#: ../src/bookmarks/ephy-bookmarks-editor.c:223
+msgid "Delete the selected bookmark or topic"
+msgstr "删除选中书签或主题"
+
 #: ../src/bookmarks/ephy-bookmarks-editor.c:225
 #: ../src/ephy-history-window.c:198 ../src/ephy-window.c:171
 msgid "Select _All"
@@ -2978,8 +3036,8 @@ msgid "Related"
 msgstr "相关"
 
 #: ../src/bookmarks/ephy-topic-factory-action.c:322
-msgid "Quick Topic"
-msgstr "快速主题"
+msgid "Topic"
+msgstr "主题"
 
 #: ../src/bookmarks/ephy-topics-entry.c:359
 #, c-format
@@ -3018,24 +3076,24 @@ msgstr "查找链接："
 msgid "Find:"
 msgstr "查找："
 
-#: ../src/ephy-find-toolbar.c:370
+#: ../src/ephy-find-toolbar.c:378
 msgid "Find Previous"
 msgstr "查找上一个"
 
-#: ../src/ephy-find-toolbar.c:373
+#: ../src/ephy-find-toolbar.c:381
 msgid "Find previous occurrence of the search string"
 msgstr "查找搜索字符串的上次出现"
 
-#: ../src/ephy-find-toolbar.c:380
+#: ../src/ephy-find-toolbar.c:388
 msgid "Find Next"
 msgstr "查找下一个"
 
-#: ../src/ephy-find-toolbar.c:383
+#: ../src/ephy-find-toolbar.c:391
 msgid "Find next occurrence of the search string"
 msgstr "查找搜索字符串的下次出现"
 
 #. exit button
-#: ../src/ephy-fullscreen-popup.c:276 ../src/ephy-toolbar.c:571
+#: ../src/ephy-fullscreen-popup.c:271 ../src/ephy-toolbar.c:571
 msgid "Leave Fullscreen"
 msgstr "离开全屏"
 
@@ -3051,22 +3109,22 @@ msgstr "在新窗口中打开选中历史链接"
 msgid "Open the selected history link in a new tab"
 msgstr "在新标签中打开选中历史链接"
 
-#: ../src/ephy-history-window.c:179
-msgid "Delete the selected history link"
-msgstr "删除选中历史链接"
-
-#: ../src/ephy-history-window.c:181
+#: ../src/ephy-history-window.c:178
 msgid "Add _Bookmark…"
 msgstr "添加书签(_B)..."
 
-#: ../src/ephy-history-window.c:182
+#: ../src/ephy-history-window.c:179
 msgid "Bookmark the selected history link"
 msgstr "将选中历史链接加为书签"
 
-#: ../src/ephy-history-window.c:185
+#: ../src/ephy-history-window.c:182
 msgid "Close the history window"
 msgstr "关闭历史窗口"
 
+#: ../src/ephy-history-window.c:196
+msgid "Delete the selected history link"
+msgstr "删除选中历史链接"
+
 #: ../src/ephy-history-window.c:199
 msgid "Select all history links or text"
 msgstr "选中全部历史链接或文字"
@@ -3198,7 +3256,7 @@ msgstr "GNOME Web 浏览器"
 msgid "GNOME Web Browser options"
 msgstr "GNOME Web 浏览器选项"
 
-#: ../src/ephy-notebook.c:673
+#: ../src/ephy-notebook.c:656
 msgid "Close tab"
 msgstr "关闭标签"
 
@@ -3260,21 +3318,18 @@ msgstr "需要侧边栏扩展"
 msgid "The link you clicked needs the sidebar extension to be installed."
 msgstr "您单击的链接需要安装侧边栏扩展。"
 
-#. Translators: this is displayed in the statusbar; choose a short word
-#. * or even an abbreviation.
-#.
-#: ../src/ephy-statusbar.c:158
+#: ../src/ephy-statusbar.c:120
 msgid "Caret"
 msgstr "光标"
 
 #. Translators: this is the tooltip on the "Caret" icon
 #. * in the statusbar.
 #.
-#: ../src/ephy-statusbar.c:166
+#: ../src/ephy-statusbar.c:127
 msgid "In keyboard selection mode, press F7 to exit"
 msgstr "在键盘选择模式中，按 F7 可退出"
 
-#: ../src/ephy-tab.c:493 ../src/ephy-tab.c:2345 ../src/ephy-tab.c:2380
+#: ../src/ephy-tab.c:493 ../src/ephy-tab.c:2348 ../src/ephy-tab.c:2383
 msgid "Blank page"
 msgstr "空白页"
 
@@ -3639,7 +3694,7 @@ msgstr "显示网页的安全信息"
 msgid "_Add Bookmark…"
 msgstr "添加书签(_A)..."
 
-#: ../src/ephy-window.c:230 ../src/ephy-window.c:301
+#: ../src/ephy-window.c:230
 msgid "Add a bookmark for the current page"
 msgstr "将当前页面添加为书签"
 
@@ -3751,206 +3806,201 @@ msgstr "显示或隐藏此站点的未请求弹出窗口"
 msgid "Selection Caret"
 msgstr "选择光标"
 
-#. Document
-#: ../src/ephy-window.c:300
-msgid "Add Boo_kmark…"
-msgstr "添加书签(_K)..."
-
 #. Framed document
-#: ../src/ephy-window.c:306
+#: ../src/ephy-window.c:301
 msgid "Show Only _This Frame"
 msgstr "只显示此框架(_T)"
 
-#: ../src/ephy-window.c:307
+#: ../src/ephy-window.c:302
 msgid "Show only this frame in this window"
 msgstr "只在此窗口中显示此框架"
 
 #. Links
-#: ../src/ephy-window.c:312
+#: ../src/ephy-window.c:307
 msgid "_Open Link"
 msgstr "打开链接(_O)"
 
-#: ../src/ephy-window.c:313
+#: ../src/ephy-window.c:308
 msgid "Open link in this window"
 msgstr "在此窗口中打开链接"
 
-#: ../src/ephy-window.c:315
+#: ../src/ephy-window.c:310
 msgid "Open Link in New _Window"
 msgstr "在新建窗口中打开链接(_W)"
 
-#: ../src/ephy-window.c:316
+#: ../src/ephy-window.c:311
 msgid "Open link in a new window"
 msgstr "在新建窗口中打开链接"
 
-#: ../src/ephy-window.c:318
+#: ../src/ephy-window.c:313
 msgid "Open Link in New _Tab"
 msgstr "在新标签中打开链接(_T)"
 
-#: ../src/ephy-window.c:319
+#: ../src/ephy-window.c:314
 msgid "Open link in a new tab"
 msgstr "在新标签中打开链接"
 
-#: ../src/ephy-window.c:321
+#: ../src/ephy-window.c:316
 msgid "_Download Link"
 msgstr "下载链接(_D)"
 
-#: ../src/ephy-window.c:323
+#: ../src/ephy-window.c:318
 msgid "_Save Link As…"
 msgstr "链接另存为(_S)..."
 
-#: ../src/ephy-window.c:324
+#: ../src/ephy-window.c:319
 msgid "Save link with a different name"
 msgstr "将链接以不同的名称保存"
 
-#: ../src/ephy-window.c:326
+#: ../src/ephy-window.c:321
 msgid "_Bookmark Link…"
 msgstr "将链接加为书签(_B)..."
 
-#: ../src/ephy-window.c:328
+#: ../src/ephy-window.c:323
 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:334
+#: ../src/ephy-window.c:329
 msgid "_Send Email…"
 msgstr "发送电子邮件(_S)..."
 
-#: ../src/ephy-window.c:336
+#: ../src/ephy-window.c:331
 msgid "_Copy Email Address"
 msgstr "复制电子邮件地址(_C)"
 
 #. Images
-#: ../src/ephy-window.c:341
+#: ../src/ephy-window.c:336
 msgid "Open _Image"
 msgstr "打开图像(_I)"
 
-#: ../src/ephy-window.c:343
+#: ../src/ephy-window.c:338
 msgid "_Save Image As…"
 msgstr "图像另存为(_S)..."
 
-#: ../src/ephy-window.c:345
+#: ../src/ephy-window.c:340
 msgid "_Use Image As Background"
 msgstr "使用图像作为背景(_U)"
 
-#: ../src/ephy-window.c:347
+#: ../src/ephy-window.c:342
 msgid "Copy I_mage Address"
 msgstr "复制图像地址(_M)"
 
-#: ../src/ephy-window.c:349
+#: ../src/ephy-window.c:344
 msgid "St_art Animation"
 msgstr "开始动画(_A)"
 
-#: ../src/ephy-window.c:351
+#: ../src/ephy-window.c:346
 msgid "St_op Animation"
 msgstr "停止动画(_O)"
 
-#: ../src/ephy-window.c:746
+#: ../src/ephy-window.c:750
 msgid "There are unsubmitted changes to form elements"
 msgstr "对窗体元素而言有未提交的改变"
 
-#: ../src/ephy-window.c:750
+#: ../src/ephy-window.c:754
 msgid "If you close the document anyway, you will lose that information."
 msgstr "如果您无论如何都要关闭该文档，您将丢失那些信息。"
 
-#: ../src/ephy-window.c:754
+#: ../src/ephy-window.c:758
 msgid "Close _Document"
 msgstr "关闭文档(_D)"
 
-#: ../src/ephy-window.c:1331 ../src/window-commands.c:267
+#: ../src/ephy-window.c:1335 ../src/window-commands.c:267
 msgid "Open"
 msgstr "打开"
 
-#: ../src/ephy-window.c:1333 ../src/window-commands.c:293
+#: ../src/ephy-window.c:1337 ../src/window-commands.c:293
 msgid "Save As"
 msgstr "另存为"
 
-#: ../src/ephy-window.c:1335
+#: ../src/ephy-window.c:1339
 msgid "Print"
 msgstr "打印"
 
-#: ../src/ephy-window.c:1339
+#: ../src/ephy-window.c:1343
 msgid "Find"
 msgstr "查找"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1352
+#: ../src/ephy-window.c:1356
 msgid "Larger"
 msgstr "更大"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1355
+#: ../src/ephy-window.c:1359
 msgid "Smaller"
 msgstr "更小"
 
-#: ../src/ephy-window.c:1522
+#: ../src/ephy-window.c:1526
 msgid "Insecure"
 msgstr "不安全"
 
-#: ../src/ephy-window.c:1527
+#: ../src/ephy-window.c:1531
 msgid "Broken"
 msgstr "破碎"
 
-#: ../src/ephy-window.c:1539
+#: ../src/ephy-window.c:1543
 msgid "Low"
 msgstr "低"
 
-#: ../src/ephy-window.c:1546
+#: ../src/ephy-window.c:1550
 msgid "High"
 msgstr "高"
 
-#: ../src/ephy-window.c:1556
+#: ../src/ephy-window.c:1560
 #, c-format
 msgid "Security level: %s"
 msgstr "安全级别：%s"
 
-#: ../src/ephy-window.c:1599
+#: ../src/ephy-window.c:1603
 #, c-format
 msgid "%d hidden popup window"
 msgid_plural "%d hidden popup windows"
 msgstr[0] "%d 个隐藏的弹出窗口"
 
-#: ../src/ephy-window.c:1894
+#: ../src/ephy-window.c:1898
 #, c-format
 msgid "Open image “%s”"
 msgstr "打开图像“%s”"
 
-#: ../src/ephy-window.c:1899
+#: ../src/ephy-window.c:1903
 #, c-format
 msgid "Use as desktop background “%s”"
 msgstr "用作桌面背景“%s”"
 
-#: ../src/ephy-window.c:1904
+#: ../src/ephy-window.c:1908
 #, c-format
 msgid "Save image “%s”"
 msgstr "保存图像“%s”"
 
-#: ../src/ephy-window.c:1909
+#: ../src/ephy-window.c:1913
 #, c-format
 msgid "Copy image address “%s”"
 msgstr "复制图像地址“%s”"
 
-#: ../src/ephy-window.c:1922
+#: ../src/ephy-window.c:1926
 #, c-format
 msgid "Send email to address “%s”"
 msgstr "给地址“%s”发送电子邮件"
 
-#: ../src/ephy-window.c:1928
+#: ../src/ephy-window.c:1932
 #, c-format
 msgid "Copy email address “%s”"
 msgstr "复制电子邮件地址“%s”"
 
-#: ../src/ephy-window.c:1940
+#: ../src/ephy-window.c:1944
 #, c-format
 msgid "Save link “%s”"
 msgstr "保存链接“%s”"
 
-#: ../src/ephy-window.c:1946
+#: ../src/ephy-window.c:1950
 #, c-format
 msgid "Bookmark link “%s”"
 msgstr "将链接“%s”加为书签"
 
-#: ../src/ephy-window.c:1952
+#: ../src/ephy-window.c:1956
 #, c-format
 msgid "Copy link's address “%s”"
 msgstr "复制链接地址“%s”"
@@ -4007,15 +4057,15 @@ msgstr "用户名"
 msgid "User Password"
 msgstr "用户密码密码"
 
-#: ../src/popup-commands.c:272
+#: ../src/popup-commands.c:256
 msgid "Download Link"
 msgstr "下载链接"
 
-#: ../src/popup-commands.c:280
+#: ../src/popup-commands.c:264
 msgid "Save Link As"
 msgstr "链接另存为"
 
-#: ../src/popup-commands.c:287
+#: ../src/popup-commands.c:271
 msgid "Save Image As"
 msgstr "图像另存为"
 
@@ -4059,7 +4109,7 @@ msgstr "关闭"
 msgid "Close print preview"
 msgstr "关闭打印预览"
 
-#: ../src/prefs-dialog.c:416
+#: ../src/prefs-dialog.c:417
 msgid "Default"
 msgstr "默认"
 
@@ -4071,7 +4121,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:997 ../src/prefs-dialog.c:1005
+#: ../src/prefs-dialog.c:998 ../src/prefs-dialog.c:1006
 #, c-format
 msgid "language|%s (%s)"
 msgstr "%s(%s)"
@@ -4081,18 +4131,18 @@ 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:1016
+#: ../src/prefs-dialog.c:1017
 #, c-format
 msgid "language|User defined (%s)"
 msgstr "用户定义的(%s)"
 
-#: ../src/prefs-dialog.c:1038
+#: ../src/prefs-dialog.c:1039
 #, c-format
 msgid "System language (%s)"
 msgid_plural "System languages (%s)"
 msgstr[0] "系统语言(%s)"
 
-#: ../src/prefs-dialog.c:1430
+#: ../src/prefs-dialog.c:1431
 msgid "Select a Directory"
 msgstr "选择目录"
 
@@ -4124,8 +4174,8 @@ msgid ""
 "51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
 msgstr ""
 "您应该在收到 GNOME Web 浏览器的同时收到了 GNU GPL 协议的副本；如果您没有收到"
-"的话，请给自由软件基金会写信，地址是 51 Franklin Street, Fifth Floor, Boston, MA  "
-"02110-1301  USA"
+"的话，请给自由软件基金会写信，地址是 51 Franklin Street, Fifth Floor, "
+"Boston, MA  02110-1301  USA"
 
 #: ../src/window-commands.c:787 ../src/window-commands.c:803
 #: ../src/window-commands.c:814
-- 
cgit