Updated epiphany translation.

1 files changed, 303 insertions, 267 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 41245707c..398b8777c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: epiphany 2.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-17 22:01+0100\n"
-"PO-Revision-Date: 2006-01-18 08:08+0800\n"
+"POT-Creation-Date: 2006-01-26 06:26+0100\n"
+"PO-Revision-Date: 2006-01-26 16:21+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"
@@ -129,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:223
-#: ../src/ephy-main.c:234
+#: ../data/epiphany.desktop.in.in.h:3 ../src/ephy-main.c:533
+#: ../src/ephy-main.c:582 ../src/ephy-main.c:601
 msgid "Web Browser"
 msgstr "Web 浏览器"
 
@@ -160,8 +160,8 @@ msgid "Automatic downloads"
 msgstr "自动下载"
 
 #: ../data/epiphany.schemas.in.h:7
-msgid "Autowrap for find in page"
-msgstr "在页面中查找时自动回绕"
+msgid "Automatically manage offline status with NetworkManager"
+msgstr "用 NetworkManager 自动管理脱机状态"
 
 #: ../data/epiphany.schemas.in.h:8
 msgid "Browse with caret"
@@ -229,73 +229,63 @@ msgid "Enable JavaScript"
 msgstr "允许 JavaScript"
 
 #: ../data/epiphany.schemas.in.h:16
-msgid ""
-"For find in page, whether to start again at the beginning after reaching the "
-"end of the page."
-msgstr "若在页面内查找，是否要在搜索达到页面尾部时自动从头开始。"
-
-#: ../data/epiphany.schemas.in.h:17
 msgid "History pages time range"
 msgstr "历史页面时间范围"
 
-#: ../data/epiphany.schemas.in.h:18
+#: ../data/epiphany.schemas.in.h:17
 msgid "Home page"
 msgstr "主页"
 
-#: ../data/epiphany.schemas.in.h:19
+#: ../data/epiphany.schemas.in.h:18
 msgid ""
 "How to present animated images. Possible values are \"normal\", \"once\" and "
 "\"disabled\"."
 msgstr "如何显示动画图像。可供选择的值有：“normal”、“once”和“disabled”。"
 
-#: ../data/epiphany.schemas.in.h:20
+#: ../data/epiphany.schemas.in.h:19
 msgid "ISO-8859-1"
 msgstr "ISO-8859-1"
 
-#: ../data/epiphany.schemas.in.h:21
+#: ../data/epiphany.schemas.in.h:20
 msgid "Image animation mode"
 msgstr "图像动画模式"
 
-#: ../data/epiphany.schemas.in.h:22
+#: ../data/epiphany.schemas.in.h:21
 msgid "Languages"
 msgstr "语言"
 
-#: ../data/epiphany.schemas.in.h:23
+#: ../data/epiphany.schemas.in.h:22
 msgid "Lists the active extensions."
 msgstr "列出激活的扩展。"
 
-#: ../data/epiphany.schemas.in.h:24
-msgid "Match case for find in page"
-msgstr "在页面中查找时区分大小写"
-
-#: ../data/epiphany.schemas.in.h:25
+#: ../data/epiphany.schemas.in.h:23
 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:24
 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:25
 msgid "Minimum font size"
 msgstr "最小字体大小"
 
-#: ../data/epiphany.schemas.in.h:28
+#: ../data/epiphany.schemas.in.h:26
 msgid "Preferred languages, two letter codes."
 msgstr "首选语言，两个字母的代码。"
 
-#: ../data/epiphany.schemas.in.h:29
+#: ../data/epiphany.schemas.in.h:27
 msgid "Show bookmarks bar by default"
 msgstr "默认显示书签栏"
 
-#: ../data/epiphany.schemas.in.h:30
+#: ../data/epiphany.schemas.in.h:28
 msgid "Show statusbar by default"
 msgstr "默认显示状态栏"
 
-#: ../data/epiphany.schemas.in.h:31
+#: ../data/epiphany.schemas.in.h:29
 msgid ""
 "Show the history pages visited \"ever\", \"last_two_days\", \"last_three_days"
 "\", \"today\"."
@@ -303,37 +293,37 @@ msgstr ""
 "显示“曾经”访问过的、“近两天”访问过的、“近三天”访问过的、“今天”访问过的历史页"
 "面。"
 
-#: ../data/epiphany.schemas.in.h:32
+#: ../data/epiphany.schemas.in.h:30
 msgid "Show the tab bar also when there is only one tab open."
 msgstr "显示标签栏，即便只打开了一个标签。"
 
-#: ../data/epiphany.schemas.in.h:33
+#: ../data/epiphany.schemas.in.h:31
 msgid "Show toolbars by default"
 msgstr "默认显示工具栏"
 
-#: ../data/epiphany.schemas.in.h:34
+#: ../data/epiphany.schemas.in.h:32
 msgid "Size of disk cache"
 msgstr "磁盘缓存的大小"
 
-#: ../data/epiphany.schemas.in.h:35
+#: ../data/epiphany.schemas.in.h:33
 msgid "Size of disk cache, in MB."
 msgstr "磁盘缓存的大小，以 MB 为单位。"
 
-#: ../data/epiphany.schemas.in.h:36
+#: ../data/epiphany.schemas.in.h:34
 msgid "The bookmark information shown in the editor view"
 msgstr "显示在编辑器视图中的书签信息"
 
-#: ../data/epiphany.schemas.in.h:37
+#: ../data/epiphany.schemas.in.h:35
 msgid ""
 "The bookmark information shown in the editor view. Valid values in the list "
 "are \"address\" and \"title\"."
 msgstr "显示在编辑器视图里的书签信息。此列表的有效值是“地址”和“标题”。"
 
-#: ../data/epiphany.schemas.in.h:38
+#: ../data/epiphany.schemas.in.h:36
 msgid "The currently selected fonts language"
 msgstr "目前选中的字体语言"
 
-#: ../data/epiphany.schemas.in.h:39
+#: ../data/epiphany.schemas.in.h:37
 msgid ""
 "The currently selected fonts language. Valid values are \"ar\" (arabic), \"x-"
 "baltic\" (baltic languages), \"x-central-euro\" (central european "
@@ -350,15 +340,15 @@ msgstr ""
 "语)，“zh-TW”(繁体中文)，“tr”(土耳其语)，“x-unicode”(其它语言)，“x-western”(以"
 "拉丁语系书写的语言)，“x-tamil”(泰米尔语)和“x-devanagari”(梵文)。"
 
-#: ../data/epiphany.schemas.in.h:40
+#: ../data/epiphany.schemas.in.h:38
 msgid "The downloads folder"
 msgstr "下载文件夹"
 
-#: ../data/epiphany.schemas.in.h:41
+#: ../data/epiphany.schemas.in.h:39
 msgid "The encoding autodetector. Empty string means autodetect is off"
 msgstr "编码自动检测。空字符串意味着关闭自动检测"
 
-#: ../data/epiphany.schemas.in.h:42
+#: ../data/epiphany.schemas.in.h:40
 msgid ""
 "The encoding autodetector. Valid entries are \"\" (autodetectors off), "
 "\"cjk_parallel_state_machine\" (autodetect east asian encodings), "
@@ -378,17 +368,17 @@ msgstr ""
 "码)，“zhtw_parallel_state_machine”(自动检测繁体中文编码) 和 "
 "“universal_charset_detector”(自动检测所有编码)。"
 
-#: ../data/epiphany.schemas.in.h:43
+#: ../data/epiphany.schemas.in.h:41
 msgid "The page information shown in the history view"
 msgstr "显示在历史视图中的页面信息"
 
-#: ../data/epiphany.schemas.in.h:44
+#: ../data/epiphany.schemas.in.h:42
 msgid ""
 "The page information shown in the history view. Valid values in the list are "
 "\"address\", \"title\"."
 msgstr "显示在历史视图里的页面信息。此列表的有效值是“地址”和“标题”。"
 
-#: ../data/epiphany.schemas.in.h:45
+#: ../data/epiphany.schemas.in.h:43
 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."
@@ -396,11 +386,11 @@ msgstr ""
 "存储下载文件的文件夹路径；“Downloads”代表使用默认下载文件夹，“Desktop”代表使"
 "用桌面文件夹。"
 
-#: ../data/epiphany.schemas.in.h:46
+#: ../data/epiphany.schemas.in.h:44
 msgid "Toolbar style"
 msgstr "工具栏样式"
 
-#: ../data/epiphany.schemas.in.h:47
+#: ../data/epiphany.schemas.in.h:45
 msgid ""
 "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both"
 "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and "
@@ -409,23 +399,23 @@ msgstr ""
 "工具栏样式。可供选择的值包括“”(使用 GNOME 默认样式)、“both”(文字和图"
 "标)、“both-horiz”(文字在图标旁)、“icons”和“text”。"
 
-#: ../data/epiphany.schemas.in.h:48
+#: ../data/epiphany.schemas.in.h:46
 msgid "Use own colors"
 msgstr "使用我自己的颜色"
 
-#: ../data/epiphany.schemas.in.h:49
+#: ../data/epiphany.schemas.in.h:47
 msgid "Use own fonts"
 msgstr "使用我自己的字体"
 
-#: ../data/epiphany.schemas.in.h:50
+#: ../data/epiphany.schemas.in.h:48
 msgid "Use your own colors instead of the colors the page requests."
 msgstr "使用您自己的颜色而不是页面请求的颜色。"
 
-#: ../data/epiphany.schemas.in.h:51
+#: ../data/epiphany.schemas.in.h:49
 msgid "Use your own fonts instead of the fonts the page requests."
 msgstr "使用您自己的字体而不是页面请求的字体。"
 
-#: ../data/epiphany.schemas.in.h:52
+#: ../data/epiphany.schemas.in.h:50
 msgid ""
 "When files cannot be opened by the browser they are automatically downloaded "
 "to the download folder and opened with the appropriate application."
@@ -433,29 +423,29 @@ msgstr ""
 "如果浏览器无法打开文件，则这些文件将会被自动下载到下载文件夹，并用相应的应用"
 "程序打开。"
 
-#: ../data/epiphany.schemas.in.h:53
+#: ../data/epiphany.schemas.in.h:51
 msgid ""
 "Where to accept cookies from. Possible values are \"anywhere\", \"current "
 "site\" and \"nowhere\"."
 msgstr "何时装入图像。可能的值是“总是”、“当前网站”、“从不”。"
 
-#: ../data/epiphany.schemas.in.h:54
+#: ../data/epiphany.schemas.in.h:52
 msgid "Whether to print the date in the footer"
 msgstr "是否在页脚打印日期"
 
-#: ../data/epiphany.schemas.in.h:55
+#: ../data/epiphany.schemas.in.h:53
 msgid "Whether to print the page address in the header"
 msgstr "是否在页眉打印页面地址"
 
-#: ../data/epiphany.schemas.in.h:56
+#: ../data/epiphany.schemas.in.h:54
 msgid "Whether to print the page numbers (x of total) in the footer"
 msgstr "是否在页脚打印页号(第 x 页共 y 页)"
 
-#: ../data/epiphany.schemas.in.h:57
+#: ../data/epiphany.schemas.in.h:55
 msgid "Whether to print the page title in the header"
 msgstr "是否在页眉打印页面标题"
 
-#: ../data/epiphany.schemas.in.h:58
+#: ../data/epiphany.schemas.in.h:56
 msgid "x-western"
 msgstr "zh-CN"
 
@@ -546,7 +536,7 @@ msgid "Cookies"
 msgstr "Cookies"
 
 #. The name of the default downloads folder
-#: ../data/glade/epiphany.glade.h:4 ../lib/ephy-file-helpers.c:101
+#: ../data/glade/epiphany.glade.h:4 ../lib/ephy-file-helpers.c:105
 msgid "Downloads"
 msgstr "下载"
 
@@ -692,7 +682,7 @@ msgid "Use custom _stylesheet"
 msgstr "使用自定义样式表(_S)"
 
 #: ../data/glade/prefs-dialog.glade.h:31
-#: ../src/bookmarks/ephy-bookmark-properties.c:602
+#: ../src/bookmarks/ephy-bookmark-properties.c:295
 msgid "_Address:"
 msgstr "地址(_A)："
 
@@ -806,7 +796,7 @@ msgstr ""
 "%s，共%s"
 
 #: ../embed/downloader-view.c:431 ../embed/downloader-view.c:436
-#: ../src/ephy-window.c:1469
+#: ../src/ephy-window.c:1467
 msgid "Unknown"
 msgstr "未知"
 
@@ -828,7 +818,7 @@ msgstr "未知"
 msgid "download status|Failed"
 msgstr "失败"
 
-#: ../embed/downloader-view.c:657 ../src/bookmarks/ephy-bookmarks-editor.c:803
+#: ../embed/downloader-view.c:657 ../src/bookmarks/ephy-bookmarks-editor.c:863
 msgid "File"
 msgstr "文件"
 
@@ -840,6 +830,10 @@ msgstr "%"
 msgid "Remaining"
 msgstr "剩余"
 
+#: ../embed/ephy-embed-shell.c:235
+msgid "Epiphany can't be used now. Mozilla initialization failed."
+msgstr "现在无法使用 Epiphany。Mozilla 初始化失败。"
+
 #: ../embed/ephy-encodings.c:60
 msgid "Arabic (_IBM-864)"
 msgstr "阿拉伯语(_IBM-864)"
@@ -1223,15 +1217,15 @@ msgstr "乌克兰语"
 msgid "Unknown (%s)"
 msgstr "未知(%s)"
 
-#: ../embed/ephy-history.c:550 ../src/bookmarks/ephy-bookmark-properties.c:623
+#: ../embed/ephy-history.c:558 ../src/bookmarks/ephy-bookmark-properties.c:304
 msgid "All"
 msgstr "全部"
 
-#: ../embed/ephy-history.c:713
+#: ../embed/ephy-history.c:721
 msgid "Others"
 msgstr "其它"
 
-#: ../embed/ephy-history.c:719
+#: ../embed/ephy-history.c:727
 msgid "Local files"
 msgstr "本地文件"
 
@@ -1545,27 +1539,27 @@ msgstr "于 Internet 存档"
 msgid "Untitled"
 msgstr "无标题"
 
-#: ../embed/mozilla/EphyPromptService.cpp:193
+#: ../embed/mozilla/EphyPromptService.cpp:195
 msgid "_Abort Script"
 msgstr "中止脚本(_A)"
 
-#: ../embed/mozilla/EphyPromptService.cpp:261
+#: ../embed/mozilla/EphyPromptService.cpp:263
 msgid "Don't Save"
 msgstr "不保存"
 
-#: ../embed/mozilla/EphyPromptService.cpp:742
+#: ../embed/mozilla/EphyPromptService.cpp:762
 msgid "_User:"
 msgstr "用户(_U)："
 
-#: ../embed/mozilla/EphyPromptService.cpp:743
-#: ../embed/mozilla/EphyPromptService.cpp:770
+#: ../embed/mozilla/EphyPromptService.cpp:763
+#: ../embed/mozilla/EphyPromptService.cpp:790
 #: ../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
+#: ../lib/ephy-file-chooser.c:371 ../src/bookmarks/ephy-bookmarks-editor.c:646
 msgid "All files"
 msgstr "全部文件"
 
@@ -1912,14 +1906,10 @@ 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:293
+#: ../embed/mozilla/mozilla-embed-single.cpp:287
 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:876
-msgid "Epiphany can't be used now. Mozilla initialization failed."
-msgstr "现在无法使用 Epiphany。Mozilla 初始化失败。"
-
 #: ../embed/print-dialog.c:258
 msgid "Generating PDF is not supported"
 msgstr "不支持生成 PDF"
@@ -1953,7 +1943,7 @@ msgstr "到(_T)："
 msgid "Sets the end of the range of pages to be printed"
 msgstr "设定要打印的页面范围结束值"
 
-#: ../embed/print-dialog.c:407 ../src/ephy-window.c:1289
+#: ../embed/print-dialog.c:407 ../src/ephy-window.c:1287
 msgid "Print"
 msgstr "打印"
 
@@ -2002,14 +1992,19 @@ msgstr "分隔符"
 msgid "All supported types"
 msgstr "支持的全部类型"
 
-#: ../lib/ephy-file-helpers.c:330
+#: ../lib/ephy-file-helpers.c:292
 #, c-format
-msgid "\"%s\" exists, please move it out of the way."
+msgid "Could not create a temporary directory in “%s”."
+msgstr "无法在“%s”中创建临时目录。"
+
+#: ../lib/ephy-file-helpers.c:360
+#, c-format
+msgid "“%s” exists, please move it out of the way."
 msgstr "“%s”已存在，请将其移出。"
 
-#: ../lib/ephy-file-helpers.c:336
+#: ../lib/ephy-file-helpers.c:371
 #, c-format
-msgid "Failed to create directory \"%s\"."
+msgid "Failed to create directory “%s”."
 msgstr "创建目录“%s”失败。"
 
 #: ../lib/ephy-gui.c:328
@@ -2209,9 +2204,9 @@ msgstr "弹出窗口"
 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:402 ../src/ephy-window.c:1295
+#: ../lib/ephy-stock-icons.c:57 ../src/bookmarks/ephy-bookmarks-editor.c:777
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1596
+#: ../src/bookmarks/ephy-topic-action.c:405 ../src/ephy-window.c:1293
 msgid "Bookmarks"
 msgstr "书签"
 
@@ -2291,257 +2286,247 @@ msgstr "Epiphany 桌面文件插件"
 msgid "This plugin handles “.desktop” files containing web links."
 msgstr "此插件将处理包含 Web 链接的“.desktop”文件。"
 
-#: ../src/bookmarks/ephy-bookmark-action.c:287
+#: ../src/bookmarks/ephy-bookmark-action.c:285
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:294
+#: ../src/bookmarks/ephy-bookmark-properties.c:180
 #, c-format
 msgid "“%s” Properties"
 msgstr "“%s”属性"
 
-#: ../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
+#: ../src/bookmarks/ephy-bookmark-properties.c:280
 msgid "_Title:"
 msgstr "标题(_T)："
 
-#: ../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
+#: ../src/bookmarks/ephy-bookmark-properties.c:305
+#: ../src/bookmarks/ephy-topics-palette.c:276
 msgid "Subtopics"
 msgstr "次主题"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:627
+#: ../src/bookmarks/ephy-bookmark-properties.c:306
 msgid "T_opics:"
 msgstr "主题(_O)："
 
 #. File Menu
-#: ../src/bookmarks/ephy-bookmark-properties.c:663
-#: ../src/bookmarks/ephy-bookmarks-editor.c:171
+#: ../src/bookmarks/ephy-bookmark-properties.c:340
+#: ../src/bookmarks/ephy-bookmarks-editor.c:182
 msgid "_New Topic"
 msgstr "新建主题(_N)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:135
+#: ../src/bookmarks/ephy-bookmarks-editor.c:95
+msgid "Mozilla (HTML)"
+msgstr "Mozilla (HTML)"
+
+#: ../src/bookmarks/ephy-bookmarks-editor.c:96
+msgid "Epiphany (RDF)"
+msgstr "Epiphany (RDF)"
+
+#: ../src/bookmarks/ephy-bookmarks-editor.c:146
 msgid "Remove from this topic"
 msgstr "从此主题删除"
 
 #. Toplevel
-#: ../src/bookmarks/ephy-bookmarks-editor.c:164
+#: ../src/bookmarks/ephy-bookmarks-editor.c:175
 #: ../src/ephy-history-window.c:163 ../src/ephy-window.c:115
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:165
+#: ../src/bookmarks/ephy-bookmarks-editor.c:176
 #: ../src/ephy-history-window.c:164 ../src/ephy-window.c:116
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:166
+#: ../src/bookmarks/ephy-bookmarks-editor.c:177
 #: ../src/ephy-history-window.c:165 ../src/ephy-window.c:117
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:167
+#: ../src/bookmarks/ephy-bookmarks-editor.c:178
 #: ../src/ephy-history-window.c:166 ../src/ephy-window.c:122
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:172
+#: ../src/bookmarks/ephy-bookmarks-editor.c:183
 msgid "Create a new topic"
 msgstr "创建新主题"
 
+#. FIXME ngettext
 #. 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/bookmarks/ephy-bookmarks-editor.c:185
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1220
+#: ../src/bookmarks/ephy-bookmarks-ui.c:314 ../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
+#: ../src/bookmarks/ephy-bookmarks-editor.c:186
 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
+#. FIXME ngettext
+#: ../src/bookmarks/ephy-bookmarks-editor.c:188
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1223
+#: ../src/bookmarks/ephy-bookmarks-ui.c:302 ../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
+#: ../src/bookmarks/ephy-bookmarks-editor.c:189
 msgid "Open the selected bookmark in a new tab"
 msgstr "在新标签中打开选中书签"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:180
+#: ../src/bookmarks/ephy-bookmarks-editor.c:191
 msgid "_Rename..."
 msgstr "重命名(_R)..."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:181
+#: ../src/bookmarks/ephy-bookmarks-editor.c:192
 msgid "Rename the selected bookmark or topic"
 msgstr "重命名选中书签或主题"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:182
+#: ../src/bookmarks/ephy-bookmarks-editor.c:193
 #: ../src/ephy-history-window.c:176
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:183
+#: ../src/bookmarks/ephy-bookmarks-editor.c:194
 msgid "Delete the selected bookmark or topic"
 msgstr "删除选中书签或主题"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:185
+#: ../src/bookmarks/ephy-bookmarks-editor.c:196
 msgid "_Properties"
 msgstr "属性(_P)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:186
+#: ../src/bookmarks/ephy-bookmarks-editor.c:197
 msgid "View or modify the properties of the selected bookmark"
 msgstr "查看或修改选中书签的属性"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:188
+#: ../src/bookmarks/ephy-bookmarks-editor.c:199
 msgid "_Import Bookmarks..."
 msgstr "导入书签(_I)..."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:189
+#: ../src/bookmarks/ephy-bookmarks-editor.c:200
 msgid "Import bookmarks from another browser or a bookmarks file"
 msgstr "从其它浏览器或书签文件中导入书签"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:191
+#: ../src/bookmarks/ephy-bookmarks-editor.c:202
 msgid "_Export Bookmarks..."
 msgstr "导出书签(_E)..."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:192
+#: ../src/bookmarks/ephy-bookmarks-editor.c:203
 msgid "Export bookmarks to a file"
 msgstr "将书签导出至文件"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:194
+#: ../src/bookmarks/ephy-bookmarks-editor.c:205
 #: ../src/ephy-history-window.c:182 ../src/ephy-window.c:152
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:195
+#: ../src/bookmarks/ephy-bookmarks-editor.c:206
 msgid "Close the bookmarks window"
 msgstr "关闭书签窗口"
 
 #. Edit Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:199
+#: ../src/bookmarks/ephy-bookmarks-editor.c:210
 #: ../src/ephy-history-window.c:187 ../src/ephy-window.c:164
 msgid "Cu_t"
 msgstr "剪切(_T)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:200
+#: ../src/bookmarks/ephy-bookmarks-editor.c:211
 #: ../src/ephy-history-window.c:188 ../src/ephy-window.c:165
 msgid "Cut the selection"
 msgstr "剪切选中范围"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:202
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1172
+#: ../src/bookmarks/ephy-bookmarks-editor.c:213
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1233
 #: ../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:203
+#: ../src/bookmarks/ephy-bookmarks-editor.c:214
 #: ../src/ephy-history-window.c:191 ../src/ephy-window.c:168
 msgid "Copy the selection"
 msgstr "复制选中范围"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:205
+#: ../src/bookmarks/ephy-bookmarks-editor.c:216
 #: ../src/ephy-history-window.c:193 ../src/ephy-window.c:170
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:206
+#: ../src/bookmarks/ephy-bookmarks-editor.c:217
 #: ../src/ephy-history-window.c:194
 msgid "Paste the clipboard"
 msgstr "粘贴剪贴板"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:208
+#: ../src/bookmarks/ephy-bookmarks-editor.c:219
 #: ../src/ephy-history-window.c:196 ../src/ephy-window.c:173
 msgid "Select _All"
 msgstr "全选(_A)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:209
+#: ../src/bookmarks/ephy-bookmarks-editor.c:220
 msgid "Select all bookmarks or text"
 msgstr "选中全部书签或文字"
 
 #. Help Menu
 #. Help menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:213
+#: ../src/bookmarks/ephy-bookmarks-editor.c:224
 #: ../src/ephy-history-window.c:204 ../src/ephy-window.c:264
 msgid "_Contents"
 msgstr "目录(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:214
+#: ../src/bookmarks/ephy-bookmarks-editor.c:225
 msgid "Display bookmarks help"
 msgstr "显示书签帮助"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:216
+#: ../src/bookmarks/ephy-bookmarks-editor.c:227
 #: ../src/ephy-history-window.c:207 ../src/ephy-window.c:267
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:217
+#: ../src/bookmarks/ephy-bookmarks-editor.c:228
 #: ../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:230
+#: ../src/bookmarks/ephy-bookmarks-editor.c:241
 #: ../src/ephy-history-window.c:222
 msgid "_Title"
 msgstr "标题(_T)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:231
+#: ../src/bookmarks/ephy-bookmarks-editor.c:242
 #: ../src/ephy-history-window.c:223
 msgid "Show only the title column"
 msgstr "只显示标题列"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:232
+#: ../src/bookmarks/ephy-bookmarks-editor.c:243
 #: ../src/ephy-history-window.c:226
 msgid "T_itle and Address"
 msgstr "标题和地址(_I)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:233
+#: ../src/bookmarks/ephy-bookmarks-editor.c:244
 #: ../src/ephy-history-window.c:227
 msgid "Show both the title and address columns"
 msgstr "同时显示标题和地址列"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:274
+#: ../src/bookmarks/ephy-bookmarks-editor.c:285
 msgid "Type a topic"
 msgstr "输入主题"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:392
+#: ../src/bookmarks/ephy-bookmarks-editor.c:403
 #, c-format
 msgid "Delete topic “%s”?"
 msgstr "删除主题“%s”吗？"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:395
+#: ../src/bookmarks/ephy-bookmarks-editor.c:406
 msgid "Delete this topic?"
 msgstr "删除此主题吗？"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:397
+#: ../src/bookmarks/ephy-bookmarks-editor.c:408
 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."
@@ -2549,113 +2534,105 @@ msgstr ""
 "删除此主题将使得该主题下的全部书签变为未分类，除非这些书签属于其它主题。书签"
 "本身不会被删除。"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:400
+#: ../src/bookmarks/ephy-bookmarks-editor.c:411
 msgid "_Delete Topic"
 msgstr "删除主题(_D)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:505
+#: ../src/bookmarks/ephy-bookmarks-editor.c:509
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:509
 #: ../src/bookmarks/ephy-bookmarks-editor.c:513
+#: ../src/bookmarks/ephy-bookmarks-editor.c:517
 msgid "Firebird"
 msgstr "Firebird"
 
 #. Translators: The %s is the name of a Mozilla profile.
-#: ../src/bookmarks/ephy-bookmarks-editor.c:518
+#: ../src/bookmarks/ephy-bookmarks-editor.c:522
 #, c-format
 msgid "Mozilla “%s” profile"
 msgstr "Mozilla“%s”配置文件"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:522
+#: ../src/bookmarks/ephy-bookmarks-editor.c:526
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:526
+#: ../src/bookmarks/ephy-bookmarks-editor.c:530
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:555
+#: ../src/bookmarks/ephy-bookmarks-editor.c:559
 msgid "Import failed"
 msgstr "导入失败"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:557
+#: ../src/bookmarks/ephy-bookmarks-editor.c:561
 msgid "Import Failed"
 msgstr "导入失败"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:560
+#: ../src/bookmarks/ephy-bookmarks-editor.c:564
 #, c-format
 msgid ""
 "The bookmarks from “%s” could not be imported because the file is corrupted "
 "or of an unsupported type."
 msgstr "来自“%s”的书签无法导入，因为文件已损坏，或者类型不支持。"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:623
+#: ../src/bookmarks/ephy-bookmarks-editor.c:627
 msgid "Import bookmarks from file"
 msgstr "从文件导入书签"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:630
+#: ../src/bookmarks/ephy-bookmarks-editor.c:634
 msgid "Firefox/Mozilla bookmarks"
 msgstr "Firefox/Mozilla 书签"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:634
+#: ../src/bookmarks/ephy-bookmarks-editor.c:638
 msgid "Galeon/Konqueror bookmarks"
 msgstr "Galeon/Konqueror 书签"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:638
+#: ../src/bookmarks/ephy-bookmarks-editor.c:642
 msgid "Epiphany bookmarks"
 msgstr "Epiphany 书签"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:672
+#: ../src/bookmarks/ephy-bookmarks-editor.c:765
 msgid "Export Bookmarks"
 msgstr "导出书签"
 
 #. Make a format selection combo & label
-#: ../src/bookmarks/ephy-bookmarks-editor.c:687
+#: ../src/bookmarks/ephy-bookmarks-editor.c:780
 msgid "File format:"
 msgstr "文件格式："
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:690
-msgid "Epiphany (RDF)"
-msgstr "Epiphany (RDF)"
-
-#: ../src/bookmarks/ephy-bookmarks-editor.c:691
-msgid "Mozilla (HTML)"
-msgstr "Mozilla (HTML)"
-
-#: ../src/bookmarks/ephy-bookmarks-editor.c:763
+#: ../src/bookmarks/ephy-bookmarks-editor.c:823
 msgid "Import Bookmarks"
 msgstr "导入书签"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:769
+#: ../src/bookmarks/ephy-bookmarks-editor.c:829
 msgid "I_mport"
 msgstr "导入(_M)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:783
+#: ../src/bookmarks/ephy-bookmarks-editor.c:843
 msgid "Import bookmarks from:"
 msgstr "导入书签的来源："
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1168
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1229
 #: ../src/ephy-history-window.c:705
 msgid "_Copy Address"
 msgstr "复制地址(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1402
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1463
 #: ../src/ephy-history-window.c:1021
 msgid "_Search:"
 msgstr "搜索(_S)："
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1597
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1658
 msgid "Topics"
 msgstr "主题"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1667
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1728
 #: ../src/ephy-history-window.c:1304
 msgid "Title"
 msgstr "标题"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1673
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1734
 #: ../src/ephy-history-window.c:1310
 msgid "Address"
 msgstr "地址"
@@ -2750,109 +2727,112 @@ msgstr "未分类"
 msgid "bookmarks|Local Sites"
 msgstr "本地网站"
 
-#: ../src/bookmarks/ephy-bookmark-factory-action.c:316
+#: ../src/bookmarks/ephy-bookmark-factory-action.c:317
 msgid "Quick Bookmark"
 msgstr "快速书签"
 
 #. Add popup menu actions that are specific to the bookmark widgets
-#: ../src/bookmarks/ephy-bookmarks-ui.c:246
+#: ../src/bookmarks/ephy-bookmarks-ui.c:290
 msgid "Properties"
 msgstr "属性"
 
-#: ../src/bookmarks/ephy-bookmarks-ui.c:247
+#: ../src/bookmarks/ephy-bookmarks-ui.c:291
 msgid "Show properties for this bookmark"
 msgstr "显示此书签的属性"
 
-#: ../src/bookmarks/ephy-bookmarks-ui.c:258
+#: ../src/bookmarks/ephy-bookmarks-ui.c:303
 msgid "Open this bookmark in a new tab"
 msgstr "在新标签中打开此书签"
 
-#: ../src/bookmarks/ephy-bookmarks-ui.c:269
+#: ../src/bookmarks/ephy-bookmarks-ui.c:315
 msgid "Open this bookmark in a new window"
 msgstr "在新窗口中打开此书签"
 
-#: ../src/bookmarks/ephy-bookmarks-ui.c:453
+#: ../src/bookmarks/ephy-bookmarks-ui.c:497
 msgid "Bookmark exists"
 msgstr "书签已存在"
 
-#: ../src/bookmarks/ephy-bookmarks-ui.c:456
+#: ../src/bookmarks/ephy-bookmarks-ui.c:501
 #, c-format
 msgid "You already have a bookmark titled “%s” for this page."
 msgstr "此页面已经存在标题为“%s”的书签。"
 
-#: ../src/bookmarks/ephy-bookmarks-ui.c:466
+#: ../src/bookmarks/ephy-bookmarks-ui.c:511
 msgid "_Create New"
 msgstr "新建(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-ui.c:472
+#: ../src/bookmarks/ephy-bookmarks-ui.c:518
 msgid "_View Properties"
 msgstr "查看属性(_V)"
 
-#: ../src/bookmarks/ephy-bookmarks-ui.c:481
+#: ../src/bookmarks/ephy-bookmarks-ui.c:529
 msgid "Bookmark Exists"
 msgstr "书签已存在"
 
-#: ../src/bookmarks/ephy-bookmarks-ui.c:569
+#: ../src/bookmarks/ephy-bookmarks-ui.c:622
 #, c-format
-msgid ""
-"You already have a topic named “%s”.\n"
-"Please use a new topic name."
-msgstr "您已经有名为“%s”的主题。\n请使用新的主题名称。"
+msgid "You already have a topic named “%s”"
+msgstr ""
+"您已经有名为“%s”的主题。。"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:626
+msgid "Please use a different topic name."
+msgstr "请使用不同的主题名称。"
 
-#: ../src/bookmarks/ephy-bookmarks-ui.c:610
+#: ../src/bookmarks/ephy-bookmarks-ui.c:666
 #, c-format
 msgid "New topic for “%s”"
 msgstr "为“%s”新建主题"
 
-#: ../src/bookmarks/ephy-bookmarks-ui.c:624
+#: ../src/bookmarks/ephy-bookmarks-ui.c:676
 msgid "New topic"
 msgstr "新主题"
 
-#: ../src/bookmarks/ephy-bookmarks-ui.c:628
+#: ../src/bookmarks/ephy-bookmarks-ui.c:681
 msgid "Enter a unique name for the topic."
 msgstr "输入主题的唯一名称。"
 
-#: ../src/bookmarks/ephy-bookmarks-ui.c:660
+#: ../src/bookmarks/ephy-bookmarks-ui.c:713
 msgid "Create"
 msgstr "创建"
 
-#: ../src/bookmarks/ephy-bookmarks-ui.c:663
+#: ../src/bookmarks/ephy-bookmarks-ui.c:716
 msgid "New Topic"
 msgstr "新建主题"
 
-#: ../src/bookmarks/ephy-open-tabs-action.c:64
+#: ../src/bookmarks/ephy-open-tabs-action.c:65
 msgid "Open in New _Tabs"
 msgstr "在新建标签中打开(_T)"
 
-#: ../src/bookmarks/ephy-related-action.c:161
+#: ../src/bookmarks/ephy-related-action.c:163
 msgid "Related"
 msgstr "相关"
 
-#: ../src/bookmarks/ephy-topic-factory-action.c:315
+#: ../src/bookmarks/ephy-topic-factory-action.c:316
 msgid "Quick Topic"
 msgstr "快速主题"
 
-#: ../src/bookmarks/ephy-topics-palette.c:203
+#: ../src/bookmarks/ephy-topics-palette.c:205
 msgid "No topics"
 msgstr "无主题"
 
-#: ../src/bookmarks/ephy-topics-palette.c:273
+#: ../src/bookmarks/ephy-topics-palette.c:275
 msgid "Selection"
 msgstr "选中内容"
 
-#: ../src/bookmarks/ephy-topics-palette.c:273
+#: ../src/bookmarks/ephy-topics-palette.c:275
 msgid "No selected topics"
 msgstr "无选中的主题"
 
-#: ../src/bookmarks/ephy-topics-palette.c:274
+#: ../src/bookmarks/ephy-topics-palette.c:276
 msgid "No more subtopics"
 msgstr "无更多的次主题"
 
-#: ../src/bookmarks/ephy-topics-palette.c:275
+#: ../src/bookmarks/ephy-topics-palette.c:277
 msgid "Other"
 msgstr "其它"
 
-#: ../src/bookmarks/ephy-topics-palette.c:275
+#: ../src/bookmarks/ephy-topics-palette.c:277
 msgid "No other topics"
 msgstr "无其它主题"
 
@@ -2995,37 +2975,56 @@ msgstr[0] "上 %d 天"
 msgid "Sites"
 msgstr "站点"
 
-#: ../src/ephy-main.c:60
-msgid "Open a new tab in an existing window"
-msgstr "在已有窗口中打开新标签"
+#: ../src/ephy-main.c:74 ../src/ephy-main.c:76
+msgid "Open a new tab in an existing Epiphany window"
+msgstr "在已有的 Epiphany 窗口中打开新标签"
 
-#: ../src/ephy-main.c:63
-msgid "Run in full screen mode"
-msgstr "以全屏模式运行"
+#: ../src/ephy-main.c:78
+msgid "Launch the bookmarks editor"
+msgstr "调用书签编辑器"
 
-#: ../src/ephy-main.c:66
-msgid "Load the given session file"
-msgstr "装入给定的会话文件"
+#: ../src/ephy-main.c:80
+msgid "Import bookmarks from the given file"
+msgstr "从给定文件中导入书签"
 
-#: ../src/ephy-main.c:67 ../src/ephy-main.c:73
+#: ../src/ephy-main.c:80 ../src/ephy-main.c:82
 msgid "FILE"
 msgstr "文件"
 
-#: ../src/ephy-main.c:69
-msgid "Add a bookmark (don't open any window)"
-msgstr "添加书签(不打开任何窗口)"
+#: ../src/ephy-main.c:82
+msgid "Load the given session file"
+msgstr "装入给定的会话文件"
+
+#: ../src/ephy-main.c:84
+msgid "Add a bookmark"
+msgstr "添加书签"
 
-#: ../src/ephy-main.c:70
+#: ../src/ephy-main.c:84
 msgid "URL"
 msgstr "URL"
 
-#: ../src/ephy-main.c:72
-msgid "Import bookmarks from the given file"
-msgstr "从给定文件中导入书签"
+#: ../src/ephy-main.c:86 ../src/ephy-main.c:117
+msgid "Start a private instance"
+msgstr "启动私人实例"
 
-#: ../src/ephy-main.c:75
-msgid "Launch the bookmarks editor"
-msgstr "调用书签编辑器"
+#: ../src/ephy-main.c:469
+msgid "Could not start GNOME Web Browser"
+msgstr "无法启动 GNOME Web 浏览器"
+
+#: ../src/ephy-main.c:472
+#, c-format
+msgid ""
+"Startup failed because of the following error:\n"
+"%s"
+msgstr "启动失败，原因是下列错误：\n%s"
+
+#: ../src/ephy-main.c:511 ../src/ephy-main.c:513 ../src/window-commands.c:752
+msgid "GNOME Web Browser"
+msgstr "GNOME Web 浏览器"
+
+#: ../src/ephy-main.c:514
+msgid "GNOME Web Browser options"
+msgstr "GNOME Web 浏览器选项"
 
 #: ../src/ephy-notebook.c:1092
 msgid "Close tab"
@@ -3053,18 +3052,32 @@ msgstr "复原(_R)"
 msgid "Crash Recovery"
 msgstr "崩溃复原"
 
-#: ../src/ephy-shell.c:216
+#: ../src/ephy-shell.c:201
 msgid "Sidebar extension required"
 msgstr "需要侧边栏扩展"
 
-#: ../src/ephy-shell.c:218
+#: ../src/ephy-shell.c:203
 msgid "Sidebar Extension Required"
 msgstr "需要侧边栏扩展"
 
-#: ../src/ephy-shell.c:222
+#: ../src/ephy-shell.c:207
 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:114
+msgid "Caret"
+msgstr "光标"
+
+#. Translators: this is the tooltip on the "Caret" icon
+#. * in the statusbar.
+#.
+#: ../src/ephy-statusbar.c:122
+msgid "In keyboard selection mode, press F7 to exit"
+msgstr "在键盘选择模式中，按 F7 可退出"
+
 #: ../src/ephy-tab.c:481 ../src/ephy-tab.c:2264 ../src/ephy-tab.c:2299
 msgid "Blank page"
 msgstr "空白页"
@@ -3109,11 +3122,11 @@ msgid "Toolbar Editor"
 msgstr "工具栏编辑器"
 
 #. translators: translate the same as in gnome-control-center
-#: ../src/ephy-toolbar-editor.c:217
+#: ../src/ephy-toolbar-editor.c:220
 msgid "Toolbar _button labels:"
 msgstr "工具栏按钮标签(_B)："
 
-#: ../src/ephy-toolbar-editor.c:285
+#: ../src/ephy-toolbar-editor.c:288
 msgid "_Add a New Toolbar"
 msgstr "添加新工具栏(_A)"
 
@@ -3640,100 +3653,100 @@ msgstr "如果您无论如何都要关闭该文档，您将丢失那些信息。
 msgid "Close _Document"
 msgstr "关闭文档(_D)"
 
-#: ../src/ephy-window.c:1285 ../src/window-commands.c:279
+#: ../src/ephy-window.c:1283 ../src/window-commands.c:279
 msgid "Open"
 msgstr "打开"
 
-#: ../src/ephy-window.c:1287 ../src/window-commands.c:305
+#: ../src/ephy-window.c:1285 ../src/window-commands.c:305
 msgid "Save As"
 msgstr "另存为"
 
-#: ../src/ephy-window.c:1291
+#: ../src/ephy-window.c:1289
 msgid "Bookmark"
 msgstr "书签"
 
-#: ../src/ephy-window.c:1293
+#: ../src/ephy-window.c:1291
 msgid "Find"
 msgstr "查找"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1306
+#: ../src/ephy-window.c:1304
 msgid "Larger"
 msgstr "更大"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1309
+#: ../src/ephy-window.c:1307
 msgid "Smaller"
 msgstr "更小"
 
-#: ../src/ephy-window.c:1472
+#: ../src/ephy-window.c:1470
 msgid "Insecure"
 msgstr "不安全"
 
-#: ../src/ephy-window.c:1477
+#: ../src/ephy-window.c:1475
 msgid "Broken"
 msgstr "破碎"
 
-#: ../src/ephy-window.c:1490
+#: ../src/ephy-window.c:1488
 msgid "Low"
 msgstr "低"
 
-#: ../src/ephy-window.c:1497
+#: ../src/ephy-window.c:1495
 msgid "High"
 msgstr "高"
 
-#: ../src/ephy-window.c:1507
+#: ../src/ephy-window.c:1505
 #, c-format
 msgid "Security level: %s"
 msgstr "安全级别：%s"
 
-#: ../src/ephy-window.c:1547
+#: ../src/ephy-window.c:1545
 #, c-format
 msgid "%d hidden popup window"
 msgid_plural "%d hidden popup windows"
 msgstr[0] "%d 个隐藏的弹出窗口"
 
-#: ../src/ephy-window.c:1842
+#: ../src/ephy-window.c:1840
 #, c-format
 msgid "Open image “%s”"
 msgstr "打开图像“%s”"
 
-#: ../src/ephy-window.c:1847
+#: ../src/ephy-window.c:1845
 #, c-format
 msgid "Use as desktop background “%s”"
 msgstr "用作桌面背景“%s”"
 
-#: ../src/ephy-window.c:1852
+#: ../src/ephy-window.c:1850
 #, c-format
 msgid "Save image “%s”"
 msgstr "保存图像“%s”"
 
-#: ../src/ephy-window.c:1857
+#: ../src/ephy-window.c:1855
 #, c-format
 msgid "Copy image address “%s”"
 msgstr "复制图像地址“%s”"
 
-#: ../src/ephy-window.c:1870
+#: ../src/ephy-window.c:1868
 #, c-format
 msgid "Send email to address “%s”"
 msgstr "给地址“%s”发送电子邮件"
 
-#: ../src/ephy-window.c:1876
+#: ../src/ephy-window.c:1874
 #, c-format
 msgid "Copy email address “%s”"
 msgstr "复制电子邮件地址“%s”"
 
-#: ../src/ephy-window.c:1888
+#: ../src/ephy-window.c:1886
 #, c-format
 msgid "Save link “%s”"
 msgstr "保存链接“%s”"
 
-#: ../src/ephy-window.c:1894
+#: ../src/ephy-window.c:1892
 #, c-format
 msgid "Bookmark link “%s”"
 msgstr "将链接“%s”加为书签"
 
-#: ../src/ephy-window.c:1900
+#: ../src/ephy-window.c:1898
 #, c-format
 msgid "Copy link's address “%s”"
 msgstr "复制链接地址“%s”"
@@ -3842,6 +3855,10 @@ msgstr "关闭"
 msgid "Close print preview"
 msgstr "关闭打印预览"
 
+#: ../src/prefs-dialog.c:412
+msgid "Default"
+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: the first %s is the language name, and the
@@ -3892,8 +3909,27 @@ 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:733
-msgid "GNOME Web Browser"
-msgstr "GNOME Web 浏览器"
+msgid ""
+"The GNOME Web Browser is free software; you can redistribute it and/or "
+"modify it under the terms of the GNU General Public License as published by "
+"the Free Software Foundation; either version 2 of the License, or (at your "
+"option) any later version."
+msgstr ""
+
+#: ../src/window-commands.c:737
+msgid ""
+"The GNOME Web Browser is distributed in the hope that it will be useful, but "
+"WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY "
+"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
+msgstr ""
+
+#: ../src/window-commands.c:741
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"the GNOME Web Browser; if not, write to the Free Software Foundation, Inc., "
+"59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
+msgstr ""
 
 #. Translators: This is a special message that shouldn't be translated
 #. * literally. It is used in the about box to give credits to
@@ -3903,11 +3939,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:747
+#: ../src/window-commands.c:766
 msgid "translator-credits"
 msgstr "开源软件国际化简体中文组(http://i18n.linux.net.cn),Funda Wang"
 
-#: ../src/window-commands.c:750
+#: ../src/window-commands.c:769
 msgid "GNOME Web Browser Website"
 msgstr "GNOME Web 浏览器网站"