Updated epiphany zh_CN translation.

2 files changed, 451 insertions, 310 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 7be1987db..b139808f1 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-18  Funda Wang  <fundawang@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
 2006-01-17  Adam Weinberger  <adamw@gnome.org>
 
 	* en_CA.po: Updated Canadian English translation.
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0cca7f8a7..41245707c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,15 +1,15 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2003-2004 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the epiphany package.
-# Funda Wang <fundawang@linux.net.cn>, 2003-2005.
+# Funda Wang <fundawang@linux.net.cn>, 2003-2006.
 # Liu Songhe <jackliu9999@263.net>, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: epiphany 2.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-25 13:29+0100\n"
-"PO-Revision-Date: 2005-12-25 22:33+0800\n"
+"POT-Creation-Date: 2006-01-17 22:01+0100\n"
+"PO-Revision-Date: 2006-01-18 08:08+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/GNOME_Epiphany_Automation.server.in.h:1
-msgid "Epiphany automation"
-msgstr "Epiphany 自动化"
-
 #: ../data/epiphany-lockdown.schemas.in.h:1
 msgid ""
 "A list of protocols to be considered safe in addition to the default, when "
@@ -133,8 +129,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:222
-#: ../src/ephy-main.c:233
+#: ../data/epiphany.desktop.in.in.h:3 ../src/ephy-main.c:223
+#: ../src/ephy-main.c:234
 msgid "Web Browser"
 msgstr "Web 浏览器"
 
@@ -247,45 +243,59 @@ msgid "Home page"
 msgstr "主页"
 
 #: ../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:20
 msgid "ISO-8859-1"
 msgstr "ISO-8859-1"
 
-#: ../data/epiphany.schemas.in.h:20
+#: ../data/epiphany.schemas.in.h:21
+msgid "Image animation mode"
+msgstr "图像动画模式"
+
+#: ../data/epiphany.schemas.in.h:22
 msgid "Languages"
 msgstr "语言"
 
-#: ../data/epiphany.schemas.in.h:21
+#: ../data/epiphany.schemas.in.h:23
 msgid "Lists the active extensions."
 msgstr "列出激活的扩展。"
 
-#: ../data/epiphany.schemas.in.h:22
+#: ../data/epiphany.schemas.in.h:24
 msgid "Match case for find in page"
 msgstr "在页面中查找时区分大小写"
 
-#: ../data/epiphany.schemas.in.h:23
+#: ../data/epiphany.schemas.in.h:25
 msgid ""
 "Middle click to open the web page pointed to by the currently selected text"
 msgstr "中键单击可打开当前选中文字指向的网页"
 
-#: ../data/epiphany.schemas.in.h:24
+#: ../data/epiphany.schemas.in.h:26
 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:25
+#: ../data/epiphany.schemas.in.h:27
+msgid "Minimum font size"
+msgstr "最小字体大小"
+
+#: ../data/epiphany.schemas.in.h:28
 msgid "Preferred languages, two letter codes."
 msgstr "首选语言，两个字母的代码。"
 
-#: ../data/epiphany.schemas.in.h:26
+#: ../data/epiphany.schemas.in.h:29
 msgid "Show bookmarks bar by default"
 msgstr "默认显示书签栏"
 
-#: ../data/epiphany.schemas.in.h:27
+#: ../data/epiphany.schemas.in.h:30
 msgid "Show statusbar by default"
 msgstr "默认显示状态栏"
 
-#: ../data/epiphany.schemas.in.h:28
+#: ../data/epiphany.schemas.in.h:31
 msgid ""
 "Show the history pages visited \"ever\", \"last_two_days\", \"last_three_days"
 "\", \"today\"."
@@ -293,37 +303,37 @@ msgstr ""
 "显示“曾经”访问过的、“近两天”访问过的、“近三天”访问过的、“今天”访问过的历史页"
 "面。"
 
-#: ../data/epiphany.schemas.in.h:29
+#: ../data/epiphany.schemas.in.h:32
 msgid "Show the tab bar also when there is only one tab open."
 msgstr "显示标签栏，即便只打开了一个标签。"
 
-#: ../data/epiphany.schemas.in.h:30
+#: ../data/epiphany.schemas.in.h:33
 msgid "Show toolbars by default"
 msgstr "默认显示工具栏"
 
-#: ../data/epiphany.schemas.in.h:31
+#: ../data/epiphany.schemas.in.h:34
 msgid "Size of disk cache"
 msgstr "磁盘缓存的大小"
 
-#: ../data/epiphany.schemas.in.h:32
+#: ../data/epiphany.schemas.in.h:35
 msgid "Size of disk cache, in MB."
 msgstr "磁盘缓存的大小，以 MB 为单位。"
 
-#: ../data/epiphany.schemas.in.h:33
+#: ../data/epiphany.schemas.in.h:36
 msgid "The bookmark information shown in the editor view"
 msgstr "显示在编辑器视图中的书签信息"
 
-#: ../data/epiphany.schemas.in.h:34
+#: ../data/epiphany.schemas.in.h:37
 msgid ""
 "The bookmark information shown in the editor view. Valid values in the list "
 "are \"address\" and \"title\"."
 msgstr "显示在编辑器视图里的书签信息。此列表的有效值是“地址”和“标题”。"
 
-#: ../data/epiphany.schemas.in.h:35
+#: ../data/epiphany.schemas.in.h:38
 msgid "The currently selected fonts language"
 msgstr "目前选中的字体语言"
 
-#: ../data/epiphany.schemas.in.h:36
+#: ../data/epiphany.schemas.in.h:39
 msgid ""
 "The currently selected fonts language. Valid values are \"ar\" (arabic), \"x-"
 "baltic\" (baltic languages), \"x-central-euro\" (central european "
@@ -340,15 +350,15 @@ msgstr ""
 "语)，“zh-TW”(繁体中文)，“tr”(土耳其语)，“x-unicode”(其它语言)，“x-western”(以"
 "拉丁语系书写的语言)，“x-tamil”(泰米尔语)和“x-devanagari”(梵文)。"
 
-#: ../data/epiphany.schemas.in.h:37
+#: ../data/epiphany.schemas.in.h:40
 msgid "The downloads folder"
 msgstr "下载文件夹"
 
-#: ../data/epiphany.schemas.in.h:38
+#: ../data/epiphany.schemas.in.h:41
 msgid "The encoding autodetector. Empty string means autodetect is off"
 msgstr "编码自动检测。空字符串意味着关闭自动检测"
 
-#: ../data/epiphany.schemas.in.h:39
+#: ../data/epiphany.schemas.in.h:42
 msgid ""
 "The encoding autodetector. Valid entries are \"\" (autodetectors off), "
 "\"cjk_parallel_state_machine\" (autodetect east asian encodings), "
@@ -368,17 +378,17 @@ msgstr ""
 "码)，“zhtw_parallel_state_machine”(自动检测繁体中文编码) 和 "
 "“universal_charset_detector”(自动检测所有编码)。"
 
-#: ../data/epiphany.schemas.in.h:40
+#: ../data/epiphany.schemas.in.h:43
 msgid "The page information shown in the history view"
 msgstr "显示在历史视图中的页面信息"
 
-#: ../data/epiphany.schemas.in.h:41
+#: ../data/epiphany.schemas.in.h:44
 msgid ""
 "The page information shown in the history view. Valid values in the list are "
 "\"address\", \"title\"."
 msgstr "显示在历史视图里的页面信息。此列表的有效值是“地址”和“标题”。"
 
-#: ../data/epiphany.schemas.in.h:42
+#: ../data/epiphany.schemas.in.h:45
 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."
@@ -386,11 +396,11 @@ msgstr ""
 "存储下载文件的文件夹路径；“Downloads”代表使用默认下载文件夹，“Desktop”代表使"
 "用桌面文件夹。"
 
-#: ../data/epiphany.schemas.in.h:43
+#: ../data/epiphany.schemas.in.h:46
 msgid "Toolbar style"
 msgstr "工具栏样式"
 
-#: ../data/epiphany.schemas.in.h:44
+#: ../data/epiphany.schemas.in.h:47
 msgid ""
 "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both"
 "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and "
@@ -399,23 +409,23 @@ msgstr ""
 "工具栏样式。可供选择的值包括“”(使用 GNOME 默认样式)、“both”(文字和图"
 "标)、“both-horiz”(文字在图标旁)、“icons”和“text”。"
 
-#: ../data/epiphany.schemas.in.h:45
+#: ../data/epiphany.schemas.in.h:48
 msgid "Use own colors"
 msgstr "使用我自己的颜色"
 
-#: ../data/epiphany.schemas.in.h:46
+#: ../data/epiphany.schemas.in.h:49
 msgid "Use own fonts"
 msgstr "使用我自己的字体"
 
-#: ../data/epiphany.schemas.in.h:47
+#: ../data/epiphany.schemas.in.h:50
 msgid "Use your own colors instead of the colors the page requests."
 msgstr "使用您自己的颜色而不是页面请求的颜色。"
 
-#: ../data/epiphany.schemas.in.h:48
+#: ../data/epiphany.schemas.in.h:51
 msgid "Use your own fonts instead of the fonts the page requests."
 msgstr "使用您自己的字体而不是页面请求的字体。"
 
-#: ../data/epiphany.schemas.in.h:49
+#: ../data/epiphany.schemas.in.h:52
 msgid ""
 "When files cannot be opened by the browser they are automatically downloaded "
 "to the download folder and opened with the appropriate application."
@@ -423,29 +433,29 @@ msgstr ""
 "如果浏览器无法打开文件，则这些文件将会被自动下载到下载文件夹，并用相应的应用"
 "程序打开。"
 
-#: ../data/epiphany.schemas.in.h:50
+#: ../data/epiphany.schemas.in.h:53
 msgid ""
 "Where to accept cookies from. Possible values are \"anywhere\", \"current "
 "site\" and \"nowhere\"."
 msgstr "何时装入图像。可能的值是“总是”、“当前网站”、“从不”。"
 
-#: ../data/epiphany.schemas.in.h:51
+#: ../data/epiphany.schemas.in.h:54
 msgid "Whether to print the date in the footer"
 msgstr "是否在页脚打印日期"
 
-#: ../data/epiphany.schemas.in.h:52
+#: ../data/epiphany.schemas.in.h:55
 msgid "Whether to print the page address in the header"
 msgstr "是否在页眉打印页面地址"
 
-#: ../data/epiphany.schemas.in.h:53
+#: ../data/epiphany.schemas.in.h:56
 msgid "Whether to print the page numbers (x of total) in the footer"
 msgstr "是否在页脚打印页号(第 x 页共 y 页)"
 
-#: ../data/epiphany.schemas.in.h:54
+#: ../data/epiphany.schemas.in.h:57
 msgid "Whether to print the page title in the header"
 msgstr "是否在页眉打印页面标题"
 
-#: ../data/epiphany.schemas.in.h:55
+#: ../data/epiphany.schemas.in.h:58
 msgid "x-western"
 msgstr "zh-CN"
 
@@ -494,7 +504,7 @@ msgid "Field _Value"
 msgstr "域值(_V)"
 
 #: ../data/glade/certificate-dialogs.glade.h:12
-#: ../data/glade/prefs-dialog.glade.h:23
+#: ../data/glade/prefs-dialog.glade.h:20
 msgid "General"
 msgstr "常规"
 
@@ -536,7 +546,7 @@ msgid "Cookies"
 msgstr "Cookies"
 
 #. The name of the default downloads folder
-#: ../data/glade/epiphany.glade.h:4 ../lib/ephy-file-helpers.c:96
+#: ../data/glade/epiphany.glade.h:4 ../lib/ephy-file-helpers.c:101
 msgid "Downloads"
 msgstr "下载"
 
@@ -560,67 +570,51 @@ msgstr "使用文档指定的编码"
 msgid "_Show password"
 msgstr "显示密码(_S)"
 
-#: ../data/glade/prefs-dialog.glade.h:1 ../data/glade/print.glade.h:1
-msgid "<b>Colors</b>"
-msgstr "<b>颜色</b>"
-
-#: ../data/glade/prefs-dialog.glade.h:2
+#: ../data/glade/prefs-dialog.glade.h:1
 msgid "<b>Cookies</b>"
 msgstr "<b>Cookies</b>"
 
-#: ../data/glade/prefs-dialog.glade.h:3
+#: ../data/glade/prefs-dialog.glade.h:2
 msgid "<b>Downloads</b>"
 msgstr "<b>下载</b>"
 
-#: ../data/glade/prefs-dialog.glade.h:4
+#: ../data/glade/prefs-dialog.glade.h:3
 msgid "<b>Encodings</b>"
 msgstr "<b>编码</b>"
 
-#: ../data/glade/prefs-dialog.glade.h:5
-msgid "<b>Fonts</b>"
-msgstr "<b>字体</b>"
-
-#: ../data/glade/prefs-dialog.glade.h:6
+#: ../data/glade/prefs-dialog.glade.h:4
 msgid "<b>Home page</b>"
 msgstr "<b>主页</b>"
 
-#: ../data/glade/prefs-dialog.glade.h:7
+#: ../data/glade/prefs-dialog.glade.h:5
 msgid "<b>Languages</b>"
 msgstr "<b>语言</b>"
 
-#: ../data/glade/prefs-dialog.glade.h:8
+#: ../data/glade/prefs-dialog.glade.h:6
 msgid "<b>Temporary Files</b>"
 msgstr "<b>临时文件</b>"
 
-#: ../data/glade/prefs-dialog.glade.h:9
+#: ../data/glade/prefs-dialog.glade.h:7
 msgid "<b>Web Content</b>"
 msgstr "<b>Web 内容</b>"
 
-#: ../data/glade/prefs-dialog.glade.h:10
+#: ../data/glade/prefs-dialog.glade.h:8
 msgid "A_utomatically download and open files"
 msgstr "自动下载并打开文件(_U)"
 
-#: ../data/glade/prefs-dialog.glade.h:11
+#: ../data/glade/prefs-dialog.glade.h:9
 msgid "Add Language"
 msgstr "添加语言"
 
-#: ../data/glade/prefs-dialog.glade.h:12
-msgid "Al_ways use the desktop theme colors"
-msgstr "总是使用桌面主题颜色(_W)"
-
-#: ../data/glade/prefs-dialog.glade.h:13
+#: ../data/glade/prefs-dialog.glade.h:10
 msgid "Allow popup _windows"
 msgstr "允许弹出窗口(_W)"
 
-#: ../data/glade/prefs-dialog.glade.h:14
-msgid "Always use _these fonts"
-msgstr "总是使用这些字体(_T)"
-
-#: ../data/glade/prefs-dialog.glade.h:15
+#: ../data/glade/prefs-dialog.glade.h:11
 msgid "Au_todetect:"
 msgstr "自动检测(_T)："
 
-#: ../data/glade/prefs-dialog.glade.h:16
+#: ../data/glade/prefs-dialog.glade.h:12
 msgid "Choose a l_anguage:"
 msgstr "选择语言(_A)："
 
@@ -628,61 +622,77 @@ msgstr "选择语言(_A)："
 #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
 #. * Select All, Input Methods and Insert Unicode control character.)
 #.
-#: ../data/glade/prefs-dialog.glade.h:17
+#: ../data/glade/prefs-dialog.glade.h:13
 #: ../lib/widgets/ephy-location-entry.c:580 ../src/ephy-history-window.c:261
 msgid "Cl_ear"
 msgstr "清除(_E)"
 
-#: ../data/glade/prefs-dialog.glade.h:18
+#: ../data/glade/prefs-dialog.glade.h:14
 msgid "De_fault:"
 msgstr "默认(_F)："
 
-#: ../data/glade/prefs-dialog.glade.h:19
+#: ../data/glade/prefs-dialog.glade.h:15
 msgid "Enable Java_Script"
 msgstr "允许 Java_Script"
 
-#: ../data/glade/prefs-dialog.glade.h:20
+#: ../data/glade/prefs-dialog.glade.h:16
 msgid "Enable _Java"
 msgstr "允许 _Java"
 
-#: ../data/glade/prefs-dialog.glade.h:21
-msgid "Fonts and Colors"
-msgstr "字体和颜色"
+#: ../data/glade/prefs-dialog.glade.h:17
+msgid "Fonts"
+msgstr "字体"
 
-#: ../data/glade/prefs-dialog.glade.h:22
+#: ../data/glade/prefs-dialog.glade.h:18
+msgid "Fonts & Style"
+msgstr "字体和样式"
+
+#: ../data/glade/prefs-dialog.glade.h:19
 msgid "For l_anguage:"
 msgstr "为语言(_A)："
 
-#: ../data/glade/prefs-dialog.glade.h:24 ../src/prefs-dialog.c:1037
+#: ../data/glade/prefs-dialog.glade.h:21 ../src/prefs-dialog.c:1301
 msgid "Language"
 msgstr "语言"
 
-#: ../data/glade/prefs-dialog.glade.h:25
+#: ../data/glade/prefs-dialog.glade.h:22
+msgid "Let web pages specify their own _colors"
+msgstr "让网页指定自己的颜色(_C)"
+
+#: ../data/glade/prefs-dialog.glade.h:23
+msgid "Let web pages specify their own _fonts"
+msgstr "让网页指定自己的字体(_F)"
+
+#: ../data/glade/prefs-dialog.glade.h:24
 msgid "MB"
 msgstr "MB"
 
-#: ../data/glade/prefs-dialog.glade.h:26
+#: ../data/glade/prefs-dialog.glade.h:25
 msgid "Only _from sites you visit"
 msgstr "仅来自您浏览的网站(_F)"
 
-#: ../data/glade/prefs-dialog.glade.h:27
+#: ../data/glade/prefs-dialog.glade.h:26
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../data/glade/prefs-dialog.glade.h:28
+#: ../data/glade/prefs-dialog.glade.h:27
 msgid "Privacy"
 msgstr "隐私"
 
-#: ../data/glade/prefs-dialog.glade.h:29
+#: ../data/glade/prefs-dialog.glade.h:28
 msgid "Set to Current _Page"
 msgstr "设为当前页(_P)"
 
-#: ../data/glade/prefs-dialog.glade.h:30
+#: ../data/glade/prefs-dialog.glade.h:29
 msgid "Set to _Blank Page"
 msgstr "设为空白页(_B)"
 
+#: ../data/glade/prefs-dialog.glade.h:30
+msgid "Use custom _stylesheet"
+msgstr "使用自定义样式表(_S)"
+
 #: ../data/glade/prefs-dialog.glade.h:31
-#: ../src/bookmarks/ephy-bookmark-properties.c:340
+#: ../src/bookmarks/ephy-bookmark-properties.c:602
 msgid "_Address:"
 msgstr "地址(_A)："
 
@@ -691,29 +701,41 @@ msgid "_Always accept"
 msgstr "总是接受(_A)"
 
 #: ../data/glade/prefs-dialog.glade.h:33
+msgid "_Detailed Font Settings..."
+msgstr "字体细节设置(_D)..."
+
+#: ../data/glade/prefs-dialog.glade.h:34
 msgid "_Disk space:"
 msgstr "磁盘空间(_D)："
 
-#: ../data/glade/prefs-dialog.glade.h:34
+#: ../data/glade/prefs-dialog.glade.h:35
 msgid "_Download folder:"
 msgstr "下载文件夹(_D)："
 
-#: ../data/glade/prefs-dialog.glade.h:35
+#: ../data/glade/prefs-dialog.glade.h:36
+msgid "_Edit Stylesheet..."
+msgstr "编辑样式表(_E)..."
+
+#: ../data/glade/prefs-dialog.glade.h:37
 msgid "_Fixed width:"
 msgstr "固定宽度(_F)："
 
-#: ../data/glade/prefs-dialog.glade.h:36
+#: ../data/glade/prefs-dialog.glade.h:38
 msgid "_Minimum size:"
 msgstr "最小大小(_M)："
 
-#: ../data/glade/prefs-dialog.glade.h:37
+#: ../data/glade/prefs-dialog.glade.h:39
 msgid "_Never accept"
 msgstr "从不接受(_N)"
 
-#: ../data/glade/prefs-dialog.glade.h:38
+#: ../data/glade/prefs-dialog.glade.h:40
 msgid "_Variable width:"
 msgstr "可变宽度(_V)："
 
+#: ../data/glade/print.glade.h:1
+msgid "<b>Colors</b>"
+msgstr "<b>颜色</b>"
+
 #: ../data/glade/print.glade.h:2
 msgid "<b>Footers</b>"
 msgstr "<b>页脚</b>"
@@ -784,7 +806,7 @@ msgstr ""
 "%s，共%s"
 
 #: ../embed/downloader-view.c:431 ../embed/downloader-view.c:436
-#: ../src/ephy-window.c:1451
+#: ../src/ephy-window.c:1469
 msgid "Unknown"
 msgstr "未知"
 
@@ -1201,7 +1223,7 @@ msgstr "乌克兰语"
 msgid "Unknown (%s)"
 msgstr "未知(%s)"
 
-#: ../embed/ephy-history.c:550
+#: ../embed/ephy-history.c:550 ../src/bookmarks/ephy-bookmark-properties.c:623
 msgid "All"
 msgstr "全部"
 
@@ -1519,10 +1541,29 @@ msgstr "于 Internet 存档"
 
 #: ../embed/mozilla/EphyHeaderSniffer.cpp:364
 #: ../src/bookmarks/ephy-bookmarks-import.c:245
-#: ../src/bookmarks/ephy-bookmarks-ui.c:481 ../src/ephy-session.c:775
+#: ../src/bookmarks/ephy-bookmarks.c:1111 ../src/ephy-session.c:775
 msgid "Untitled"
 msgstr "无标题"
 
+#: ../embed/mozilla/EphyPromptService.cpp:193
+msgid "_Abort Script"
+msgstr "中止脚本(_A)"
+
+#: ../embed/mozilla/EphyPromptService.cpp:261
+msgid "Don't Save"
+msgstr "不保存"
+
+#: ../embed/mozilla/EphyPromptService.cpp:742
+msgid "_User:"
+msgstr "用户(_U)："
+
+#: ../embed/mozilla/EphyPromptService.cpp:743
+#: ../embed/mozilla/EphyPromptService.cpp:770
+#: ../embed/mozilla/GtkNSSDialogs.cpp:795
+#: ../embed/mozilla/GtkNSSDialogs.cpp:905
+msgid "_Password:"
+msgstr "密码(_P)："
+
 #: ../embed/mozilla/FilePicker.cpp:152 ../embed/mozilla/FilePicker.cpp:445
 #: ../lib/ephy-file-chooser.c:371 ../src/bookmarks/ephy-bookmarks-editor.c:642
 msgid "All files"
@@ -1705,11 +1746,6 @@ msgstr "选择密码。"
 msgid "Select a password to protect this certificate."
 msgstr "选择可保护此证书的密码。"
 
-#: ../embed/mozilla/GtkNSSDialogs.cpp:795
-#: ../embed/mozilla/GtkNSSDialogs.cpp:905
-msgid "_Password:"
-msgstr "密码(_P)："
-
 #: ../embed/mozilla/GtkNSSDialogs.cpp:809
 msgid "Con_firm password:"
 msgstr "确认密码(_F)："
@@ -1876,11 +1912,11 @@ 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:263
+#: ../embed/mozilla/mozilla-embed-single.cpp:293
 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="
 
-#: ../embed/mozilla/mozilla-embed-single.cpp:595
+#: ../embed/mozilla/mozilla-embed-single.cpp:876
 msgid "Epiphany can't be used now. Mozilla initialization failed."
 msgstr "现在无法使用 Epiphany。Mozilla 初始化失败。"
 
@@ -1901,27 +1937,27 @@ msgstr ""
 "您正在尝试使用“%s”驱动程序打印到打印机。此程序需要 PostScript 打印机驱动程"
 "序。"
 
-#: ../embed/print-dialog.c:365
+#: ../embed/print-dialog.c:364
 msgid "_From:"
 msgstr "从(_O)："
 
-#: ../embed/print-dialog.c:378
+#: ../embed/print-dialog.c:377
 msgid "Sets the start of the range of pages to be printed"
 msgstr "设定要打印的页面范围起始值"
 
-#: ../embed/print-dialog.c:380
+#: ../embed/print-dialog.c:379
 msgid "_To:"
 msgstr "到(_T)："
 
-#: ../embed/print-dialog.c:393
+#: ../embed/print-dialog.c:392
 msgid "Sets the end of the range of pages to be printed"
 msgstr "设定要打印的页面范围结束值"
 
-#: ../embed/print-dialog.c:408 ../src/ephy-window.c:1277
+#: ../embed/print-dialog.c:407 ../src/ephy-window.c:1289
 msgid "Print"
 msgstr "打印"
 
-#: ../embed/print-dialog.c:416
+#: ../embed/print-dialog.c:415
 msgid "Pages"
 msgstr "页数"
 
@@ -1934,18 +1970,30 @@ msgstr ""
 "GConf 错误：\n"
 "  %s"
 
-#: ../lib/egg/egg-editable-toolbar.c:487
+#: ../lib/egg/egg-editable-toolbar.c:1060
 msgid "_Move on Toolbar"
 msgstr "在工具栏上移动(_M)"
 
-#: ../lib/egg/egg-editable-toolbar.c:495
+#: ../lib/egg/egg-editable-toolbar.c:1061
+msgid "Move the selected item on the toolbar"
+msgstr "在工具栏上移动选中项"
+
+#: ../lib/egg/egg-editable-toolbar.c:1062
 msgid "_Remove from Toolbar"
 msgstr "从工具栏删除(_R)"
 
-#: ../lib/egg/egg-editable-toolbar.c:524
+#: ../lib/egg/egg-editable-toolbar.c:1063
+msgid "Remove the selected item from the toolbar"
+msgstr "删除工具栏上的选中项"
+
+#: ../lib/egg/egg-editable-toolbar.c:1064
 msgid "_Remove Toolbar"
 msgstr "删除工具栏(_R)"
 
+#: ../lib/egg/egg-editable-toolbar.c:1065
+msgid "Remove the selected toolbar"
+msgstr "删除选中工具栏"
+
 #: ../lib/egg/egg-toolbar-editor.c:439
 msgid "Separator"
 msgstr "分隔符"
@@ -1954,12 +2002,12 @@ msgstr "分隔符"
 msgid "All supported types"
 msgstr "支持的全部类型"
 
-#: ../lib/ephy-file-helpers.c:312
+#: ../lib/ephy-file-helpers.c:330
 #, c-format
 msgid "\"%s\" exists, please move it out of the way."
 msgstr "“%s”已存在，请将其移出。"
 
-#: ../lib/ephy-file-helpers.c:318
+#: ../lib/ephy-file-helpers.c:336
 #, c-format
 msgid "Failed to create directory \"%s\"."
 msgstr "创建目录“%s”失败。"
@@ -2153,21 +2201,17 @@ msgstr "西欧"
 msgid "select fonts for|Other Scripts"
 msgstr "其它语言"
 
-#: ../lib/ephy-stock-icons.c:54
-msgid "Close Tab"
-msgstr "关闭标签"
-
 #: ../lib/ephy-stock-icons.c:55
 msgid "Popup Windows"
 msgstr "弹出窗口"
 
-#: ../lib/ephy-stock-icons.c:56 ../src/ephy-history-window.c:1191
+#: ../lib/ephy-stock-icons.c:56 ../src/ephy-history-window.c:1179
 msgid "History"
 msgstr "历史"
 
 #: ../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:1283
+#: ../src/bookmarks/ephy-topic-action.c:402 ../src/ephy-window.c:1295
 msgid "Bookmarks"
 msgstr "书签"
 
@@ -2247,235 +2291,257 @@ msgstr "Epiphany 桌面文件插件"
 msgid "This plugin handles “.desktop” files containing web links."
 msgstr "此插件将处理包含 Web 链接的“.desktop”文件。"
 
-#: ../src/bookmarks/ephy-bookmark-action.c:284
+#: ../src/bookmarks/ephy-bookmark-action.c:287
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../src/bookmarks/ephy-bookmark-action.c:395
-#: ../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"
-msgstr[0] "在新建标签中打开(_T)"
-
-#. File Menu
-#: ../src/bookmarks/ephy-bookmark-action.c:401
-#: ../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"
-msgstr[0] "在新建窗口中打开(_W)"
-
-#: ../src/bookmarks/ephy-bookmark-properties.c:225
+#: ../src/bookmarks/ephy-bookmark-properties.c:294
 #, c-format
 msgid "“%s” Properties"
 msgstr "“%s”属性"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:321
-#: ../src/bookmarks/ephy-new-bookmark.c:231
+#: ../src/bookmarks/ephy-bookmark-properties.c:433
+msgid "Open Icon"
+msgstr "打开图标"
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:506
+msgid "From file..."
+msgstr "从文件..."
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:508
+msgid "None"
+msgstr "无"
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:509 ../src/prefs-dialog.c:412
+msgid "Default"
+msgstr "默认"
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:584
 msgid "_Title:"
 msgstr "标题(_T)："
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:363
-#: ../src/bookmarks/ephy-new-bookmark.c:254
-msgid "To_pics:"
-msgstr "主题(_P)："
+#: ../src/bookmarks/ephy-bookmark-properties.c:613
+msgid "_Icon:"
+msgstr "图标(_I)："
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:624
+#: ../src/bookmarks/ephy-topics-palette.c:274
+msgid "Subtopics"
+msgstr "次主题"
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:627
+msgid "T_opics:"
+msgstr "主题(_O)："
+
+#. File Menu
+#: ../src/bookmarks/ephy-bookmark-properties.c:663
+#: ../src/bookmarks/ephy-bookmarks-editor.c:171
+msgid "_New Topic"
+msgstr "新建主题(_N)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:134
+#: ../src/bookmarks/ephy-bookmarks-editor.c:135
 msgid "Remove from this topic"
 msgstr "从此主题删除"
 
 #. Toplevel
-#: ../src/bookmarks/ephy-bookmarks-editor.c:163
+#: ../src/bookmarks/ephy-bookmarks-editor.c:164
 #: ../src/ephy-history-window.c:163 ../src/ephy-window.c:115
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:164
+#: ../src/bookmarks/ephy-bookmarks-editor.c:165
 #: ../src/ephy-history-window.c:164 ../src/ephy-window.c:116
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:165
+#: ../src/bookmarks/ephy-bookmarks-editor.c:166
 #: ../src/ephy-history-window.c:165 ../src/ephy-window.c:117
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:166
+#: ../src/bookmarks/ephy-bookmarks-editor.c:167
 #: ../src/ephy-history-window.c:166 ../src/ephy-window.c:122
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#. File Menu
-#: ../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:171
+#: ../src/bookmarks/ephy-bookmarks-editor.c:172
 msgid "Create a new topic"
 msgstr "创建新主题"
 
+#. File Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:174
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1159
+#: ../src/bookmarks/ephy-bookmarks-ui.c:268 ../src/ephy-history-window.c:170
+#: ../src/ephy-history-window.c:696
+msgid "Open in New _Window"
+msgid_plural "Open in New _Windows"
+msgstr[0] "在新建窗口中打开(_W)"
+
+#: ../src/bookmarks/ephy-bookmarks-editor.c:175
 msgid "Open the selected bookmark in a new window"
 msgstr "在新窗口中打开选中书签"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:177
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1162
+#: ../src/bookmarks/ephy-bookmarks-ui.c:257 ../src/ephy-history-window.c:173
+#: ../src/ephy-history-window.c:699
+msgid "Open in New _Tab"
+msgid_plural "Open in New _Tabs"
+msgstr[0] "在新建标签中打开(_T)"
+
+#: ../src/bookmarks/ephy-bookmarks-editor.c:178
 msgid "Open the selected bookmark in a new tab"
 msgstr "在新标签中打开选中书签"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:179
+#: ../src/bookmarks/ephy-bookmarks-editor.c:180
 msgid "_Rename..."
 msgstr "重命名(_R)..."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:180
+#: ../src/bookmarks/ephy-bookmarks-editor.c:181
 msgid "Rename the selected bookmark or topic"
 msgstr "重命名选中书签或主题"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:181
+#: ../src/bookmarks/ephy-bookmarks-editor.c:182
 #: ../src/ephy-history-window.c:176
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:182
+#: ../src/bookmarks/ephy-bookmarks-editor.c:183
 msgid "Delete the selected bookmark or topic"
 msgstr "删除选中书签或主题"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:184
+#: ../src/bookmarks/ephy-bookmarks-editor.c:185
 msgid "_Properties"
 msgstr "属性(_P)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:185
+#: ../src/bookmarks/ephy-bookmarks-editor.c:186
 msgid "View or modify the properties of the selected bookmark"
 msgstr "查看或修改选中书签的属性"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:187
+#: ../src/bookmarks/ephy-bookmarks-editor.c:188
 msgid "_Import Bookmarks..."
 msgstr "导入书签(_I)..."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:188
+#: ../src/bookmarks/ephy-bookmarks-editor.c:189
 msgid "Import bookmarks from another browser or a bookmarks file"
 msgstr "从其它浏览器或书签文件中导入书签"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:190
+#: ../src/bookmarks/ephy-bookmarks-editor.c:191
 msgid "_Export Bookmarks..."
 msgstr "导出书签(_E)..."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:191
+#: ../src/bookmarks/ephy-bookmarks-editor.c:192
 msgid "Export bookmarks to a file"
 msgstr "将书签导出至文件"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:193
+#: ../src/bookmarks/ephy-bookmarks-editor.c:194
 #: ../src/ephy-history-window.c:182 ../src/ephy-window.c:152
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:194
+#: ../src/bookmarks/ephy-bookmarks-editor.c:195
 msgid "Close the bookmarks window"
 msgstr "关闭书签窗口"
 
 #. Edit Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:198
+#: ../src/bookmarks/ephy-bookmarks-editor.c:199
 #: ../src/ephy-history-window.c:187 ../src/ephy-window.c:164
 msgid "Cu_t"
 msgstr "剪切(_T)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:199
+#: ../src/bookmarks/ephy-bookmarks-editor.c:200
 #: ../src/ephy-history-window.c:188 ../src/ephy-window.c:165
 msgid "Cut the selection"
 msgstr "剪切选中范围"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:201
+#: ../src/bookmarks/ephy-bookmarks-editor.c:202
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1172
-#: ../src/ephy-history-window.c:190 ../src/ephy-history-window.c:721
+#: ../src/ephy-history-window.c:190 ../src/ephy-history-window.c:709
 #: ../src/ephy-window.c:167
 msgid "_Copy"
 msgstr "复制(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:202
+#: ../src/bookmarks/ephy-bookmarks-editor.c:203
 #: ../src/ephy-history-window.c:191 ../src/ephy-window.c:168
 msgid "Copy the selection"
 msgstr "复制选中范围"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:204
+#: ../src/bookmarks/ephy-bookmarks-editor.c:205
 #: ../src/ephy-history-window.c:193 ../src/ephy-window.c:170
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:205
+#: ../src/bookmarks/ephy-bookmarks-editor.c:206
 #: ../src/ephy-history-window.c:194
 msgid "Paste the clipboard"
 msgstr "粘贴剪贴板"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:207
+#: ../src/bookmarks/ephy-bookmarks-editor.c:208
 #: ../src/ephy-history-window.c:196 ../src/ephy-window.c:173
 msgid "Select _All"
 msgstr "全选(_A)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:208
+#: ../src/bookmarks/ephy-bookmarks-editor.c:209
 msgid "Select all bookmarks or text"
 msgstr "选中全部书签或文字"
 
 #. Help Menu
 #. Help menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:212
+#: ../src/bookmarks/ephy-bookmarks-editor.c:213
 #: ../src/ephy-history-window.c:204 ../src/ephy-window.c:264
 msgid "_Contents"
 msgstr "目录(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:213
+#: ../src/bookmarks/ephy-bookmarks-editor.c:214
 msgid "Display bookmarks help"
 msgstr "显示书签帮助"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:215
+#: ../src/bookmarks/ephy-bookmarks-editor.c:216
 #: ../src/ephy-history-window.c:207 ../src/ephy-window.c:267
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:216
+#: ../src/bookmarks/ephy-bookmarks-editor.c:217
 #: ../src/ephy-history-window.c:208 ../src/ephy-window.c:268
 msgid "Display credits for the web browser creators"
 msgstr "显示 Web 浏览器创建者的资料"
 
 #. View Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:229
+#: ../src/bookmarks/ephy-bookmarks-editor.c:230
 #: ../src/ephy-history-window.c:222
 msgid "_Title"
 msgstr "标题(_T)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:230
+#: ../src/bookmarks/ephy-bookmarks-editor.c:231
 #: ../src/ephy-history-window.c:223
 msgid "Show only the title column"
 msgstr "只显示标题列"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:231
+#: ../src/bookmarks/ephy-bookmarks-editor.c:232
 #: ../src/ephy-history-window.c:226
 msgid "T_itle and Address"
 msgstr "标题和地址(_I)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:232
+#: ../src/bookmarks/ephy-bookmarks-editor.c:233
 #: ../src/ephy-history-window.c:227
 msgid "Show both the title and address columns"
 msgstr "同时显示标题和地址列"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:273
-#: ../src/bookmarks/ephy-topics-selector.c:319
+#: ../src/bookmarks/ephy-bookmarks-editor.c:274
 msgid "Type a topic"
 msgstr "输入主题"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:391
+#: ../src/bookmarks/ephy-bookmarks-editor.c:392
 #, c-format
 msgid "Delete topic “%s”?"
 msgstr "删除主题“%s”吗？"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:394
+#: ../src/bookmarks/ephy-bookmarks-editor.c:395
 msgid "Delete this topic?"
 msgstr "删除此主题吗？"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:396
+#: ../src/bookmarks/ephy-bookmarks-editor.c:397
 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."
@@ -2483,7 +2549,7 @@ msgstr ""
 "删除此主题将使得该主题下的全部书签变为未分类，除非这些书签属于其它主题。书签"
 "本身不会被删除。"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:399
+#: ../src/bookmarks/ephy-bookmarks-editor.c:400
 msgid "_Delete Topic"
 msgstr "删除主题(_D)"
 
@@ -2571,27 +2637,26 @@ msgid "Import bookmarks from:"
 msgstr "导入书签的来源："
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1168
-#: ../src/ephy-history-window.c:717
+#: ../src/ephy-history-window.c:705
 msgid "_Copy Address"
 msgstr "复制地址(_C)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1402
-#: ../src/ephy-history-window.c:1033
+#: ../src/ephy-history-window.c:1021
 msgid "_Search:"
 msgstr "搜索(_S)："
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1597
-#: ../src/bookmarks/ephy-topics-selector.c:198
 msgid "Topics"
 msgstr "主题"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1667
-#: ../src/ephy-history-window.c:1316
+#: ../src/ephy-history-window.c:1304
 msgid "Title"
 msgstr "标题"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1673
-#: ../src/ephy-history-window.c:1322
+#: ../src/ephy-history-window.c:1310
 msgid "Address"
 msgstr "地址"
 
@@ -2599,81 +2664,81 @@ msgstr "地址"
 #. * For instance in .nl these should be
 #. * "http://www.google.nl" and "http://www.google.nl/search?q=%s"
 #.
-#: ../src/bookmarks/ephy-bookmarks.c:96
+#: ../src/bookmarks/ephy-bookmarks.c:95
 msgid "Search the web"
 msgstr "搜索 Web"
 
-#: ../src/bookmarks/ephy-bookmarks.c:96
+#: ../src/bookmarks/ephy-bookmarks.c:95
 #, c-format
 msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"
 msgstr "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"
 
-#: ../src/bookmarks/ephy-bookmarks.c:101
+#: ../src/bookmarks/ephy-bookmarks.c:100
 msgid "Entertainment"
 msgstr "娱乐"
 
-#: ../src/bookmarks/ephy-bookmarks.c:102
+#: ../src/bookmarks/ephy-bookmarks.c:101
 msgid "News"
 msgstr "新闻"
 
-#: ../src/bookmarks/ephy-bookmarks.c:103
+#: ../src/bookmarks/ephy-bookmarks.c:102
 msgid "Shopping"
 msgstr "购物"
 
-#: ../src/bookmarks/ephy-bookmarks.c:104
+#: ../src/bookmarks/ephy-bookmarks.c:103
 msgid "Sports"
 msgstr "运动"
 
-#: ../src/bookmarks/ephy-bookmarks.c:105
+#: ../src/bookmarks/ephy-bookmarks.c:104
 msgid "Travel"
 msgstr "旅行"
 
-#: ../src/bookmarks/ephy-bookmarks.c:106
+#: ../src/bookmarks/ephy-bookmarks.c:105
 msgid "Work"
 msgstr "工作"
 
 #. translators: the %s is the title of the bookmark
-#: ../src/bookmarks/ephy-bookmarks.c:471
+#: ../src/bookmarks/ephy-bookmarks.c:470
 #, c-format
 msgid "Update bookmark “%s”?"
 msgstr "更新书签“%s”吗？"
 
 #. translators: the %s is a URL
-#: ../src/bookmarks/ephy-bookmarks.c:476
+#: ../src/bookmarks/ephy-bookmarks.c:475
 #, c-format
 msgid "The bookmarked page has moved to “%s”."
 msgstr "书签中的页面已经移动到“%s”。"
 
-#: ../src/bookmarks/ephy-bookmarks.c:480
+#: ../src/bookmarks/ephy-bookmarks.c:479
 msgid "_Don't Update"
 msgstr "不更新(_D)"
 
-#: ../src/bookmarks/ephy-bookmarks.c:482
+#: ../src/bookmarks/ephy-bookmarks.c:481
 msgid "_Update"
 msgstr "更新(_U)"
 
-#: ../src/bookmarks/ephy-bookmarks.c:485
+#: ../src/bookmarks/ephy-bookmarks.c:484
 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:873
+#: ../src/bookmarks/ephy-bookmarks.c:869
 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:909
+#: ../src/bookmarks/ephy-bookmarks.c:905
 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:928
+#: ../src/bookmarks/ephy-bookmarks.c:924
 msgid "bookmarks|Not Categorized"
 msgstr "未分类"
 
@@ -2681,30 +2746,79 @@ 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:953
+#: ../src/bookmarks/ephy-bookmarks.c:949
 msgid "bookmarks|Local Sites"
 msgstr "本地网站"
 
-#: ../src/bookmarks/ephy-new-bookmark.c:275
-msgid "Add Bookmark"
-msgstr "添加书签"
+#: ../src/bookmarks/ephy-bookmark-factory-action.c:316
+msgid "Quick Bookmark"
+msgstr "快速书签"
+
+#. Add popup menu actions that are specific to the bookmark widgets
+#: ../src/bookmarks/ephy-bookmarks-ui.c:246
+msgid "Properties"
+msgstr "属性"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:247
+msgid "Show properties for this bookmark"
+msgstr "显示此书签的属性"
 
-#: ../src/bookmarks/ephy-new-bookmark.c:312
+#: ../src/bookmarks/ephy-bookmarks-ui.c:258
+msgid "Open this bookmark in a new tab"
+msgstr "在新标签中打开此书签"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:269
+msgid "Open this bookmark in a new window"
+msgstr "在新窗口中打开此书签"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:453
+msgid "Bookmark exists"
+msgstr "书签已存在"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:456
 #, c-format
 msgid "You already have a bookmark titled “%s” for this page."
 msgstr "此页面已经存在标题为“%s”的书签。"
 
-#: ../src/bookmarks/ephy-new-bookmark.c:324
+#: ../src/bookmarks/ephy-bookmarks-ui.c:466
+msgid "_Create New"
+msgstr "新建(_C)"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:472
 msgid "_View Properties"
 msgstr "查看属性(_V)"
 
-#: ../src/bookmarks/ephy-new-bookmark.c:329
-msgid "Duplicated Bookmark"
-msgstr "重复的书签"
+#: ../src/bookmarks/ephy-bookmarks-ui.c:481
+msgid "Bookmark Exists"
+msgstr "书签已存在"
 
-#: ../src/bookmarks/ephy-bookmark-factory-action.c:316
-msgid "Quick Bookmark"
-msgstr "快速书签"
+#: ../src/bookmarks/ephy-bookmarks-ui.c:569
+#, c-format
+msgid ""
+"You already have a topic named “%s”.\n"
+"Please use a new topic name."
+msgstr "您已经有名为“%s”的主题。\n请使用新的主题名称。"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:610
+#, c-format
+msgid "New topic for “%s”"
+msgstr "为“%s”新建主题"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:624
+msgid "New topic"
+msgstr "新主题"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:628
+msgid "Enter a unique name for the topic."
+msgstr "输入主题的唯一名称。"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:660
+msgid "Create"
+msgstr "创建"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:663
+msgid "New Topic"
+msgstr "新建主题"
 
 #: ../src/bookmarks/ephy-open-tabs-action.c:64
 msgid "Open in New _Tabs"
@@ -2718,7 +2832,31 @@ msgstr "相关"
 msgid "Quick Topic"
 msgstr "快速主题"
 
-#: ../src/ephy-encoding-dialog.c:313
+#: ../src/bookmarks/ephy-topics-palette.c:203
+msgid "No topics"
+msgstr "无主题"
+
+#: ../src/bookmarks/ephy-topics-palette.c:273
+msgid "Selection"
+msgstr "选中内容"
+
+#: ../src/bookmarks/ephy-topics-palette.c:273
+msgid "No selected topics"
+msgstr "无选中的主题"
+
+#: ../src/bookmarks/ephy-topics-palette.c:274
+msgid "No more subtopics"
+msgstr "无更多的次主题"
+
+#: ../src/bookmarks/ephy-topics-palette.c:275
+msgid "Other"
+msgstr "其它"
+
+#: ../src/bookmarks/ephy-topics-palette.c:275
+msgid "No other topics"
+msgstr "无其它主题"
+
+#: ../src/ephy-encoding-dialog.c:340
 msgid "Encodings"
 msgstr "编码"
 
@@ -2742,23 +2880,27 @@ msgstr "未找到"
 msgid "Wrapped"
 msgstr "往返"
 
-#: ../src/ephy-find-toolbar.c:388
+#: ../src/ephy-find-toolbar.c:151
+msgid "Find links:"
+msgstr "查找链接："
+
+#: ../src/ephy-find-toolbar.c:151
 msgid "Find:"
 msgstr "查找："
 
-#: ../src/ephy-find-toolbar.c:404 ../src/ephy-find-toolbar.c:405
+#: ../src/ephy-find-toolbar.c:399
 msgid "Find Previous"
 msgstr "查找上一个"
 
-#: ../src/ephy-find-toolbar.c:408
+#: ../src/ephy-find-toolbar.c:402
 msgid "Find previous occurrence of the search string"
 msgstr "查找搜索字符串的上次出现"
 
-#: ../src/ephy-find-toolbar.c:415 ../src/ephy-find-toolbar.c:416
+#: ../src/ephy-find-toolbar.c:409
 msgid "Find Next"
 msgstr "查找下一个"
 
-#: ../src/ephy-find-toolbar.c:419
+#: ../src/ephy-find-toolbar.c:412
 msgid "Find next occurrence of the search string"
 msgstr "查找搜索字符串的下次出现"
 
@@ -2833,59 +2975,59 @@ msgstr "清除浏览历史将导致所有的历史链接被永久删除。"
 msgid "Clear History"
 msgstr "清除历史"
 
-#: ../src/ephy-history-window.c:1042
+#: ../src/ephy-history-window.c:1030
 msgid "Last 30 minutes"
 msgstr "上半个小时"
 
-#: ../src/ephy-history-window.c:1043
+#: ../src/ephy-history-window.c:1031
 msgid "Today"
 msgstr "今天"
 
 #. keep this in sync with embed/ephy-history.c's HISTORY_PAGE_OBSOLETE_DAYS
-#: ../src/ephy-history-window.c:1044 ../src/ephy-history-window.c:1047
-#: ../src/ephy-history-window.c:1051
+#: ../src/ephy-history-window.c:1032 ../src/ephy-history-window.c:1035
+#: ../src/ephy-history-window.c:1039
 #, c-format
 msgid "Last %d day"
 msgid_plural "Last %d days"
 msgstr[0] "上 %d 天"
 
-#: ../src/ephy-history-window.c:1253
+#: ../src/ephy-history-window.c:1241
 msgid "Sites"
 msgstr "站点"
 
-#: ../src/ephy-main.c:59
+#: ../src/ephy-main.c:60
 msgid "Open a new tab in an existing window"
 msgstr "在已有窗口中打开新标签"
 
-#: ../src/ephy-main.c:62
+#: ../src/ephy-main.c:63
 msgid "Run in full screen mode"
 msgstr "以全屏模式运行"
 
-#: ../src/ephy-main.c:65
+#: ../src/ephy-main.c:66
 msgid "Load the given session file"
 msgstr "装入给定的会话文件"
 
-#: ../src/ephy-main.c:66 ../src/ephy-main.c:72
+#: ../src/ephy-main.c:67 ../src/ephy-main.c:73
 msgid "FILE"
 msgstr "文件"
 
-#: ../src/ephy-main.c:68
+#: ../src/ephy-main.c:69
 msgid "Add a bookmark (don't open any window)"
 msgstr "添加书签(不打开任何窗口)"
 
-#: ../src/ephy-main.c:69
+#: ../src/ephy-main.c:70
 msgid "URL"
 msgstr "URL"
 
-#: ../src/ephy-main.c:71
+#: ../src/ephy-main.c:72
 msgid "Import bookmarks from the given file"
 msgstr "从给定文件中导入书签"
 
-#: ../src/ephy-main.c:74
+#: ../src/ephy-main.c:75
 msgid "Launch the bookmarks editor"
 msgstr "调用书签编辑器"
 
-#: ../src/ephy-notebook.c:1086
+#: ../src/ephy-notebook.c:1092
 msgid "Close tab"
 msgstr "关闭标签"
 
@@ -2911,41 +3053,18 @@ msgstr "复原(_R)"
 msgid "Crash Recovery"
 msgstr "崩溃复原"
 
-#: ../src/ephy-shell.c:217
+#: ../src/ephy-shell.c:216
 msgid "Sidebar extension required"
 msgstr "需要侧边栏扩展"
 
-#: ../src/ephy-shell.c:219
+#: ../src/ephy-shell.c:218
 msgid "Sidebar Extension Required"
 msgstr "需要侧边栏扩展"
 
-#: ../src/ephy-shell.c:223
+#: ../src/ephy-shell.c:222
 msgid "The link you clicked needs the sidebar extension to be installed."
 msgstr "您单击的链接需要安装侧边栏扩展。"
 
-#: ../src/ephy-shell.c:453
-msgid ""
-"Bonobo couldn't locate the GNOME_Epiphany_Automation.server file. You can "
-"use bonobo-activation-sysconf to configure the search path for bonobo server "
-"files."
-msgstr ""
-"Bonobo 无法定位 GNOME_Epiphany_Automation.server 文件。您可以使用 bonobo-"
-"activation-sysconf 配置 bonobo 服务器文件的搜索路径。"
-
-#: ../src/ephy-shell.c:460
-msgid ""
-"Epiphany can't be used now, due to an unexpected error from Bonobo when "
-"attempting to register the automation server"
-msgstr ""
-"Epiphany 目前不可用，这是由于试图注册自动化服务器时一个 Bonobo 的意外错误。"
-
-#: ../src/ephy-shell.c:477
-msgid ""
-"Epiphany can't be used now, due to an unexpected error from Bonobo when "
-"attempting to locate the automation object."
-msgstr ""
-"Epiphany 现在不可用，这是由于试图定位自动化对象时一个 Bonobo 的意外错误。"
-
 #: ../src/ephy-tab.c:481 ../src/ephy-tab.c:2264 ../src/ephy-tab.c:2299
 msgid "Blank page"
 msgstr "空白页"
@@ -3501,102 +3620,120 @@ msgstr "使用图像作为背景(_U)"
 msgid "Copy I_mage Address"
 msgstr "复制图像地址(_M)"
 
-#: ../src/ephy-window.c:698
+#: ../src/ephy-window.c:351
+msgid "St_art Animation"
+msgstr "开始动画(_A)"
+
+#: ../src/ephy-window.c:353
+msgid "St_op Animation"
+msgstr "停止动画(_O)"
+
+#: ../src/ephy-window.c:707
 msgid "There are unsubmitted changes to form elements"
 msgstr "对窗体元素而言有未提交的改变"
 
-#: ../src/ephy-window.c:702
+#: ../src/ephy-window.c:711
 msgid "If you close the document anyway, you will lose that information."
 msgstr "如果您无论如何都要关闭该文档，您将丢失那些信息。"
 
-#: ../src/ephy-window.c:706
+#: ../src/ephy-window.c:715
 msgid "Close _Document"
 msgstr "关闭文档(_D)"
 
-#: ../src/ephy-window.c:1273 ../src/window-commands.c:295
+#: ../src/ephy-window.c:1285 ../src/window-commands.c:279
 msgid "Open"
 msgstr "打开"
 
-#: ../src/ephy-window.c:1275 ../src/window-commands.c:321
+#: ../src/ephy-window.c:1287 ../src/window-commands.c:305
 msgid "Save As"
 msgstr "另存为"
 
-#: ../src/ephy-window.c:1279
+#: ../src/ephy-window.c:1291
 msgid "Bookmark"
 msgstr "书签"
 
-#: ../src/ephy-window.c:1281
+#: ../src/ephy-window.c:1293
 msgid "Find"
 msgstr "查找"
 
-#: ../src/ephy-window.c:1454
+#. Translators: This refers to text size
+#: ../src/ephy-window.c:1306
+msgid "Larger"
+msgstr "更大"
+
+#. Translators: This refers to text size
+#: ../src/ephy-window.c:1309
+msgid "Smaller"
+msgstr "更小"
+
+#: ../src/ephy-window.c:1472
 msgid "Insecure"
 msgstr "不安全"
 
-#: ../src/ephy-window.c:1459
+#: ../src/ephy-window.c:1477
 msgid "Broken"
 msgstr "破碎"
 
-#: ../src/ephy-window.c:1472
+#: ../src/ephy-window.c:1490
 msgid "Low"
 msgstr "低"
 
-#: ../src/ephy-window.c:1479
+#: ../src/ephy-window.c:1497
 msgid "High"
 msgstr "高"
 
-#: ../src/ephy-window.c:1489
+#: ../src/ephy-window.c:1507
 #, c-format
 msgid "Security level: %s"
 msgstr "安全级别：%s"
 
-#: ../src/ephy-window.c:1529
+#: ../src/ephy-window.c:1547
 #, c-format
 msgid "%d hidden popup window"
 msgid_plural "%d hidden popup windows"
 msgstr[0] "%d 个隐藏的弹出窗口"
 
-#: ../src/ephy-window.c:1824
+#: ../src/ephy-window.c:1842
 #, c-format
 msgid "Open image “%s”"
 msgstr "打开图像“%s”"
 
-#: ../src/ephy-window.c:1829
+#: ../src/ephy-window.c:1847
 #, c-format
 msgid "Use as desktop background “%s”"
 msgstr "用作桌面背景“%s”"
 
-#: ../src/ephy-window.c:1834
+#: ../src/ephy-window.c:1852
 #, c-format
 msgid "Save image “%s”"
 msgstr "保存图像“%s”"
 
-#: ../src/ephy-window.c:1839
+#: ../src/ephy-window.c:1857
 #, c-format
 msgid "Copy image address “%s”"
 msgstr "复制图像地址“%s”"
 
-#: ../src/ephy-window.c:1852
+#: ../src/ephy-window.c:1870
 #, c-format
 msgid "Send email to address “%s”"
 msgstr "给地址“%s”发送电子邮件"
 
-#: ../src/ephy-window.c:1858
+#: ../src/ephy-window.c:1876
 #, c-format
 msgid "Copy email address “%s”"
 msgstr "复制电子邮件地址“%s”"
 
-#: ../src/ephy-window.c:1870
+#: ../src/ephy-window.c:1888
 #, c-format
 msgid "Save link “%s”"
 msgstr "保存链接“%s”"
 
-#: ../src/ephy-window.c:1876
+#: ../src/ephy-window.c:1894
 #, c-format
 msgid "Bookmark link “%s”"
 msgstr "将链接“%s”加为书签"
 
-#: ../src/ephy-window.c:1882
+#: ../src/ephy-window.c:1900
 #, c-format
 msgid "Copy link's address “%s”"
 msgstr "复制链接地址“%s”"
@@ -3653,15 +3790,15 @@ msgstr "用户名"
 msgid "User Password"
 msgstr "用户密码密码"
 
-#: ../src/popup-commands.c:239
+#: ../src/popup-commands.c:232
 msgid "Download Link"
 msgstr "下载链接"
 
-#: ../src/popup-commands.c:247
+#: ../src/popup-commands.c:240
 msgid "Save Link As"
 msgstr "链接另存为"
 
-#: ../src/popup-commands.c:254
+#: ../src/popup-commands.c:247
 msgid "Save Image As"
 msgstr "图像另存为"
 
@@ -3713,7 +3850,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:729 ../src/prefs-dialog.c:737
+#: ../src/prefs-dialog.c:993 ../src/prefs-dialog.c:1001
 #, c-format
 msgid "language|%s (%s)"
 msgstr "%s (%s)"
@@ -3723,38 +3860,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:748
+#: ../src/prefs-dialog.c:1012
 #, c-format
 msgid "language|User defined (%s)"
 msgstr "用户自定义(%s)"
 
-#: ../src/prefs-dialog.c:770
+#: ../src/prefs-dialog.c:1034
 #, c-format
 msgid "System language (%s)"
 msgid_plural "System languages (%s)"
 msgstr[0] "系统语言(%s)"
 
-#: ../src/prefs-dialog.c:1157
+#: ../src/prefs-dialog.c:1421
 msgid "Select a Directory"
 msgstr "选择目录"
 
-#: ../src/window-commands.c:726 ../src/window-commands.c:743
+#: ../src/window-commands.c:710 ../src/window-commands.c:727
 msgid "Contact us at:"
 msgstr "联系我们："
 
-#: ../src/window-commands.c:729
+#: ../src/window-commands.c:713
 msgid "Contributors:"
 msgstr "志愿者："
 
-#: ../src/window-commands.c:734
+#: ../src/window-commands.c:718
 msgid "Past developers:"
 msgstr "先前的开发者："
 
-#: ../src/window-commands.c:744
+#: ../src/window-commands.c:728
 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:749
+#: ../src/window-commands.c:733
 msgid "GNOME Web Browser"
 msgstr "GNOME Web 浏览器"
 
@@ -3766,11 +3903,11 @@ msgstr "GNOME Web 浏览器"
 #. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
 #.
-#: ../src/window-commands.c:763
+#: ../src/window-commands.c:747
 msgid "translator-credits"
 msgstr "开源软件国际化简体中文组(http://i18n.linux.net.cn),Funda Wang"
 
-#: ../src/window-commands.c:766
+#: ../src/window-commands.c:750
 msgid "GNOME Web Browser Website"
 msgstr "GNOME Web 浏览器网站"