Release 1.3.0Release130

1 files changed, 669 insertions, 627 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a0e531eec..33acc2823 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,40 +7,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: epiphany 2.6.0\n"
-"POT-Creation-Date: 2004-03-16 03:14+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-05-31 12:02+0200\n"
 "PO-Revision-Date: 2004-03-16 19:19+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: data/GNOME_Epiphany_Automation.server.in.h:1
 msgid "Epiphany automation"
 msgstr "Epiphany 自动化"
 
-#: data/GNOME_Epiphany_NautilusView.server.in.h:1
-msgid "Epiphany Nautilus view"
-msgstr "Epiphany Nautilus 查看"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:2
-msgid "Epiphany content view component"
-msgstr "Epiphany 内容查看组件"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:3
-msgid "View as Web Page"
-msgstr "按网页查看"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:4
-msgid "Web Page"
-msgstr "网页"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:5
-msgid "Web Page Viewer"
-msgstr "网页查看器"
-
 #: data/bme.desktop.in.h:1
 msgid "Browse and organize your bookmarks"
 msgstr "浏览并管理您的书签"
@@ -582,7 +562,7 @@ msgid "MD5 Fingerprint:"
 msgstr "MD5 指纹："
 
 #: data/glade/certificate-dialogs.glade.h:16
-#: embed/mozilla/GtkNSSDialogs.cpp:964
+#: embed/mozilla/GtkNSSDialogs.cpp:969
 msgid "Organization:"
 msgstr "组织："
 
@@ -627,8 +607,7 @@ msgstr "Cookies"
 msgid "Download Manager"
 msgstr "下载管理器"
 
-#: data/glade/epiphany.glade.h:8 data/ui/nautilus-epiphany-view.xml.h:11
-#: src/ephy-window.c:951
+#: data/glade/epiphany.glade.h:8 src/ephy-window.c:1023
 msgid "Find"
 msgstr "查找"
 
@@ -644,7 +623,7 @@ msgstr "个人数据管理器"
 msgid "Text Encoding"
 msgstr "文字编码"
 
-#: data/glade/epiphany.glade.h:12 src/ephy-encoding-menu.c:388
+#: data/glade/epiphany.glade.h:12 src/ephy-encoding-menu.c:368
 msgid "Use the encoding specified by the document"
 msgstr "使用文档指定的编码"
 
@@ -656,7 +635,7 @@ msgstr "查找(_F)："
 msgid "_Next"
 msgstr "下个(_N)"
 
-#: data/glade/epiphany.glade.h:15 embed/downloader-view.c:280
+#: data/glade/epiphany.glade.h:15 embed/downloader-view.c:279
 msgid "_Pause"
 msgstr "暂停(_P)"
 
@@ -753,7 +732,8 @@ msgid "Fonts and Colors"
 msgstr "字体和颜色"
 
 #: data/glade/prefs-dialog.glade.h:24
-msgid "For _Language:"
+#, fuzzy
+msgid "For l_anguage:"
 msgstr "为语言(_L)："
 
 #: data/glade/prefs-dialog.glade.h:26
@@ -789,7 +769,7 @@ msgid "_Add..."
 msgstr "添加(_A)..."
 
 #: data/glade/prefs-dialog.glade.h:34
-#: src/bookmarks/ephy-bookmark-properties.c:367
+#: src/bookmarks/ephy-bookmark-properties.c:371
 msgid "_Address:"
 msgstr "地址(_A)："
 
@@ -825,7 +805,7 @@ msgstr "从不接受(_N)"
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: data/glade/prefs-dialog.glade.h:43 src/ephy-window.c:191
+#: data/glade/prefs-dialog.glade.h:43 src/ephy-window.c:201
 msgid "_Up"
 msgstr "向上(_U)"
 
@@ -909,8 +889,7 @@ msgstr "页号(_N)"
 msgid "Paper"
 msgstr "纸张"
 
-#: data/glade/print.glade.h:23 data/ui/nautilus-epiphany-view.xml.h:23
-#: src/ephy-window.c:947
+#: data/glade/print.glade.h:23 src/ephy-window.c:1019
 msgid "Print"
 msgstr "打印"
 
@@ -978,209 +957,57 @@ msgstr "从(_O)："
 msgid "lpr"
 msgstr "lpr"
 
-#: data/ui/nautilus-epiphany-view.xml.h:1
-msgid "Add Bookmark for Frame"
-msgstr "添加框架的书签"
-
-#: data/ui/nautilus-epiphany-view.xml.h:2
-msgid "Copy"
-msgstr "复制"
-
-#: data/ui/nautilus-epiphany-view.xml.h:3
-msgid "Copy Email Address"
-msgstr "复制邮件地址"
-
-#: data/ui/nautilus-epiphany-view.xml.h:4
-msgid "Copy Image Address"
-msgstr "复制图像地址"
-
-#: data/ui/nautilus-epiphany-view.xml.h:5
-msgid "Copy Link Address"
-msgstr "复制链接地址"
-
-#: data/ui/nautilus-epiphany-view.xml.h:6
-msgid "Copy Page Address"
-msgstr "复制页面地址"
-
-#: data/ui/nautilus-epiphany-view.xml.h:7
-msgid "Copy the Selection"
-msgstr "复制选中范围"
-
-#: data/ui/nautilus-epiphany-view.xml.h:8
-msgid "Cut"
-msgstr "剪切"
-
-#: data/ui/nautilus-epiphany-view.xml.h:9
-msgid "Cut the Selection"
-msgstr "复制选中范围"
-
-#: data/ui/nautilus-epiphany-view.xml.h:10
-#: embed/ephy-embed-popup-control.c:551
-msgid "Download Link"
-msgstr "下载链接"
-
-#: data/ui/nautilus-epiphany-view.xml.h:12 src/ppview-toolbar.c:92
-msgid "First"
-msgstr "第一页"
-
-#: data/ui/nautilus-epiphany-view.xml.h:13 src/ppview-toolbar.c:96
-msgid "Last"
-msgstr "最后一页"
-
-#: data/ui/nautilus-epiphany-view.xml.h:14 src/ppview-toolbar.c:104
-msgid "Next"
-msgstr "下一页"
-
-#: data/ui/nautilus-epiphany-view.xml.h:15
-msgid "Open Frame"
-msgstr "打开框架"
-
-#: data/ui/nautilus-epiphany-view.xml.h:16
-msgid "Open Frame in New Window"
-msgstr "在新窗口中打开框架"
-
-#: data/ui/nautilus-epiphany-view.xml.h:17
-msgid "Open Image"
-msgstr "打开图像"
-
-#: data/ui/nautilus-epiphany-view.xml.h:18
-msgid "Open Image in New Window"
-msgstr "在新窗口中打开图像"
-
-#: data/ui/nautilus-epiphany-view.xml.h:19
-msgid "Open in New Window"
-msgstr "在新建窗口中打开"
-
-#: data/ui/nautilus-epiphany-view.xml.h:20
-msgid "Paste"
-msgstr "粘贴"
-
-#: data/ui/nautilus-epiphany-view.xml.h:21
-msgid "Paste the Clipboard"
-msgstr "粘贴剪贴板"
-
-#: data/ui/nautilus-epiphany-view.xml.h:22 src/ppview-toolbar.c:100
-msgid "Previous"
-msgstr "上一页"
-
-#: data/ui/nautilus-epiphany-view.xml.h:24
-msgid "Print the Current File"
-msgstr "打印当前文件"
-
-#: data/ui/nautilus-epiphany-view.xml.h:25
-msgid "Save Background As..."
-msgstr "背景另存为..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:26
-msgid "Save Image As..."
-msgstr "图像另存为..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:27
-msgid "Save Page As..."
-msgstr "页面另存为..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:28
-msgid "Search for a String"
-msgstr "搜索字符串"
-
-#: data/ui/nautilus-epiphany-view.xml.h:29
-msgid "Select All"
-msgstr "全部选中"
-
-#: data/ui/nautilus-epiphany-view.xml.h:30
-msgid "Select the Entire Document"
-msgstr "选中整个文档"
-
-#: data/ui/nautilus-epiphany-view.xml.h:31
-msgid "Text _Encoding..."
-msgstr "文字编码(_E)..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:32
-msgid "Use Image As Background"
-msgstr "使用图像作为背景"
-
-#: data/ui/nautilus-epiphany-view.xml.h:33
-#: src/bookmarks/ephy-bookmarks-editor.c:162 src/ephy-history-window.c:152
-#: src/ephy-window.c:77
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-#. Toplevel
-#: data/ui/nautilus-epiphany-view.xml.h:34
-#: src/bookmarks/ephy-bookmarks-editor.c:161 src/ephy-history-window.c:151
-#: src/ephy-window.c:76
-msgid "_File"
-msgstr "文件(_F)"
-
-#: data/ui/nautilus-epiphany-view.xml.h:35 src/ephy-window.c:134
-msgid "_Find..."
-msgstr "查找(_F)..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:36 src/ephy-window.c:105
-msgid "_Print..."
-msgstr "打印(_P)..."
-
-#: embed/downloader-view.c:225
+#: embed/downloader-view.c:224
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: embed/downloader-view.c:229
+#: embed/downloader-view.c:228
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: embed/downloader-view.c:280
+#: embed/downloader-view.c:279
 msgid "_Resume"
 msgstr "续传(_R)"
 
-#: embed/downloader-view.c:343 lib/widgets/ephy-cell-renderer-progress.c:35
-#: src/ephy-window.c:1132
+#. Translator hint: this is a label on progress bars inside a tree view.
+#.
+#: embed/downloader-view.c:342 lib/widgets/ephy-cell-renderer-progress.c:246
+#: lib/widgets/ephy-cell-renderer-progress.c:306 src/ephy-window.c:1204
 msgid "Unknown"
 msgstr "未知"
 
-#: embed/downloader-view.c:394
+#: embed/downloader-view.c:393
 #, c-format
 msgid "About %d second left"
 msgid_plural "About %d seconds left"
 msgstr[0] "大约还剩 %d 秒"
 
-#: embed/downloader-view.c:402
+#: embed/downloader-view.c:401
 #, c-format
 msgid "About %d minute left"
 msgid_plural "About %d minutes left"
 msgstr[0] "大约还剩 %d 分"
 
-#: embed/downloader-view.c:409
+#: embed/downloader-view.c:408
 #, c-format
 msgid "%d download"
 msgid_plural "%d downloads"
 msgstr[0] "%d 个下载"
 
-#: embed/downloader-view.c:515
+#: embed/downloader-view.c:514
 msgid "%"
 msgstr "%"
 
-#: embed/downloader-view.c:526
+#: embed/downloader-view.c:525 src/bookmarks/ephy-bookmarks-editor.c:668
 msgid "File"
 msgstr "文件"
 
-#: embed/downloader-view.c:540
+#: embed/downloader-view.c:539
 msgid "Remaining"
 msgstr "剩余"
 
-#: embed/ephy-embed-popup-control.c:561 src/popup-commands.c:344
-msgid "Save Image As"
-msgstr "图像另存为"
-
-#: embed/ephy-embed-popup-control.c:647
-msgid "Save Page As"
-msgstr "页面另存为"
-
-#: embed/ephy-embed-popup-control.c:656 src/popup-commands.c:434
-msgid "Save Background As"
-msgstr "背景另存为"
-
 #: embed/ephy-encodings.c:63
 msgid "Arabic (_IBM-864)"
 msgstr "阿拉伯语(_IBM-864)"
@@ -1401,194 +1228,186 @@ msgstr "南欧(ISO-8859-3)(_E)"
 msgid "Thai (TIS-_620)"
 msgstr "泰语(TIS-_620)"
 
-#: embed/ephy-encodings.c:119
+#: embed/ephy-encodings.c:118
 msgid "Thai (IS_O-8859-11)"
 msgstr "泰语(IS_O-8859-11)"
 
-#: embed/ephy-encodings.c:120
+#: embed/ephy-encodings.c:119
 msgid "_Thai (Windows-874)"
 msgstr "泰语(Windows-874)(_T)"
 
-#: embed/ephy-encodings.c:122
+#: embed/ephy-encodings.c:120
 msgid "Turkish (_IBM-857)"
 msgstr "土耳其语(_IBM-857)"
 
-#: embed/ephy-encodings.c:123
+#: embed/ephy-encodings.c:121
 msgid "Turkish (I_SO-8859-9)"
 msgstr "土耳其语(I_SO-8859-9)"
 
-#: embed/ephy-encodings.c:124
+#: embed/ephy-encodings.c:122
 msgid "Turkish (_MacTurkish)"
 msgstr "土耳其语(_MacTurkish)"
 
-#: embed/ephy-encodings.c:125
+#: embed/ephy-encodings.c:123
 msgid "Turkish (_Windows-1254)"
 msgstr "土耳其语(_Windows-1254)"
 
-#: embed/ephy-encodings.c:126
+#: embed/ephy-encodings.c:124
 msgid "Unicode (UTF-_8)"
 msgstr "Unicode (UTF-_8)"
 
-#: embed/ephy-encodings.c:127
+#: embed/ephy-encodings.c:125
 msgid "Cyrillic/Ukrainian (_KOI8-U)"
 msgstr "斯拉夫语/乌克兰语(_KOI8-U)"
 
-#: embed/ephy-encodings.c:128
+#: embed/ephy-encodings.c:126
 msgid "Cyrillic/Ukrainian (Mac_Ukrainian)"
 msgstr "斯拉夫语/乌克兰语(Mac_Ukrainian)"
 
-#: embed/ephy-encodings.c:129
+#: embed/ephy-encodings.c:127
 msgid "Vietnamese (_TCVN)"
 msgstr "越南语(_TCVN)"
 
-#: embed/ephy-encodings.c:130
+#: embed/ephy-encodings.c:128
 msgid "Vietnamese (_VISCII)"
 msgstr "越南语(_VISCII)"
 
-#: embed/ephy-encodings.c:131
+#: embed/ephy-encodings.c:129
 msgid "Vietnamese (V_PS)"
 msgstr "越南语(V_PS)"
 
-#: embed/ephy-encodings.c:132
+#: embed/ephy-encodings.c:130
 msgid "Vietnamese (_Windows-1258)"
 msgstr "越南语(_Windows-1258)"
 
-#: embed/ephy-encodings.c:133
+#: embed/ephy-encodings.c:131
 msgid "Western (_IBM-850)"
 msgstr "西方(_IBM-850)"
 
-#: embed/ephy-encodings.c:134
+#: embed/ephy-encodings.c:132
 msgid "Western (_ISO-8859-1)"
 msgstr "西方(_ISO-8859-1)"
 
-#: embed/ephy-encodings.c:135
+#: embed/ephy-encodings.c:133
 msgid "Western (IS_O-8859-15)"
 msgstr "西方(IS_O-8859-15)"
 
-#: embed/ephy-encodings.c:136
+#: embed/ephy-encodings.c:134
 msgid "Western (_MacRoman)"
 msgstr "西方(_MacRoman)"
 
-#: embed/ephy-encodings.c:137
+#: embed/ephy-encodings.c:135
 msgid "Western (_Windows-1252)"
 msgstr "西方(_Windows-1252)"
 
 #. the following encodings are so rarely used that we don't want to pollute the "related"
 #. * part of the encodings menu with them, so we set the language group to 0 here
 #.
-#: embed/ephy-encodings.c:142
+#: embed/ephy-encodings.c:140
 msgid "English (_US-ASCII)"
 msgstr "英语(_US-ASCII)"
 
-#: embed/ephy-encodings.c:143
+#: embed/ephy-encodings.c:141
 msgid "Unicode (UTF-_16 BE)"
 msgstr "Unicode (UTF-_16 BE)"
 
-#: embed/ephy-encodings.c:144
+#: embed/ephy-encodings.c:142
 msgid "Unicode (UTF-1_6 LE)"
 msgstr "Unicode (UTF-1_6 LE)"
 
-#: embed/ephy-encodings.c:145
+#: embed/ephy-encodings.c:143
 msgid "Unicode (UTF-_32 BE)"
 msgstr "Unicode (UTF-_32 BE)"
 
-#: embed/ephy-encodings.c:146
+#: embed/ephy-encodings.c:144
 msgid "Unicode (UTF-3_2 LE)"
 msgstr "Unicode (UTF-3_2 LE)"
 
-#: embed/ephy-encodings.c:148
+#: embed/ephy-encodings.c:146
 msgid "Off"
 msgstr "关闭"
 
-#: embed/ephy-encodings.c:149 src/prefs-dialog.c:117
+#: embed/ephy-encodings.c:147 src/prefs-dialog.c:117
 msgid "Chinese"
 msgstr "中文"
 
-#: embed/ephy-encodings.c:150
+#: embed/ephy-encodings.c:148
 msgid "Chinese Simplified"
 msgstr "简体中文"
 
-#: embed/ephy-encodings.c:151
+#: embed/ephy-encodings.c:149
 msgid "Chinese Traditional"
 msgstr "繁体中文"
 
-#: embed/ephy-encodings.c:152
+#: embed/ephy-encodings.c:150
 msgid "East Asian"
 msgstr "东亚"
 
-#: embed/ephy-encodings.c:153 lib/ephy-langs.c:38 src/prefs-dialog.c:137
+#: embed/ephy-encodings.c:151 lib/ephy-langs.c:38 src/prefs-dialog.c:137
 msgid "Japanese"
 msgstr "日语"
 
-#: embed/ephy-encodings.c:154 lib/ephy-langs.c:39 src/prefs-dialog.c:138
+#: embed/ephy-encodings.c:152 lib/ephy-langs.c:39 src/prefs-dialog.c:138
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: embed/ephy-encodings.c:155 src/prefs-dialog.c:150
+#: embed/ephy-encodings.c:153 src/prefs-dialog.c:150
 msgid "Russian"
 msgstr "俄语"
 
-#: embed/ephy-encodings.c:156
+#: embed/ephy-encodings.c:154
 msgid "Universal"
 msgstr "全球"
 
-#: embed/ephy-encodings.c:157 src/prefs-dialog.c:159
+#: embed/ephy-encodings.c:155 src/prefs-dialog.c:159
 msgid "Ukrainian"
 msgstr "乌克兰语"
 
 #. translators: this is the title that an unknown encoding will
 #. * be displayed as.
 #.
-#: embed/ephy-encodings.c:320
+#: embed/ephy-encodings.c:318
 #, c-format
 msgid "Unknown (%s)"
 msgstr "未知(%s)"
 
-#: embed/ephy-history.c:487 src/bookmarks/ephy-bookmarks.c:645
+#: embed/ephy-history.c:486 src/bookmarks/ephy-bookmarks.c:644
 msgid "All"
 msgstr "全部"
 
-#: embed/ephy-history.c:662
+#: embed/ephy-history.c:660
 msgid "Others"
 msgstr "其它"
 
-#: embed/ephy-history.c:668
+#: embed/ephy-history.c:666
 msgid "Local files"
 msgstr "本地文件"
 
-#: embed/mozilla/ContentHandler.cpp:134
-#: embed/mozilla/EphyHeaderSniffer.cpp:362
+#: embed/mozilla/ContentHandler.cpp:141
+#: embed/mozilla/EphyHeaderSniffer.cpp:348
 msgid "Save"
 msgstr "保存"
 
-#: embed/mozilla/ContentHandler.cpp:265
-msgid "_Open"
-msgstr "打开(_O)"
-
-#: embed/mozilla/ContentHandler.cpp:265
-msgid "_Download"
-msgstr "下载(_D)"
-
-#: embed/mozilla/ContentHandler.cpp:269
+#: embed/mozilla/ContentHandler.cpp:264
 msgid "_Save As..."
 msgstr "另存为(_S)..."
 
-#: embed/mozilla/ContentHandler.cpp:286
+#: embed/mozilla/ContentHandler.cpp:281
 msgid "Download the unsafe file?"
 msgstr "下载不安全的文件吗？"
 
-#: embed/mozilla/ContentHandler.cpp:287
+#: embed/mozilla/ContentHandler.cpp:282
 msgid ""
 "This type of file could potentially damage your documents or invade your "
 "privacy. It's not safe to open it directly. You can save it instead."
 msgstr ""
 "此类型的文件可能损坏您的文档或暴露您的隐私。直接打开并不安全，您可以先保存。"
 
-#: embed/mozilla/ContentHandler.cpp:295
+#: embed/mozilla/ContentHandler.cpp:290
 msgid "Open the file in another application?"
 msgstr "在其它应用程序中打开文件吗？"
 
-#: embed/mozilla/ContentHandler.cpp:296
+#: embed/mozilla/ContentHandler.cpp:291
 msgid ""
 "It's not possible to view this file type directly in the browser. You can "
 "open it with another application or save it."
@@ -1596,91 +1415,76 @@ msgstr ""
 "无法在浏览器中直接查看此文件。您还可以在其它应用程序中打开此文件，或保存此文"
 "件。"
 
-#: embed/mozilla/ContentHandler.cpp:303
+#: embed/mozilla/ContentHandler.cpp:298
 msgid "Download the file?"
 msgstr "下载文件吗？"
 
-#: embed/mozilla/ContentHandler.cpp:304
+#: embed/mozilla/ContentHandler.cpp:299
 msgid ""
 "It's not possible to view this file because there is no application "
 "installed that can open it. You can save it instead."
 msgstr "无法查看此文件，因为没有安装可打开该文件的应用程序。您可以先保存它。"
 
-#: embed/mozilla/EphyHeaderSniffer.cpp:331
-#: src/bookmarks/ephy-bookmarks-import.c:252 src/ephy-toolbars-model.c:201
-#: src/window-commands.c:342
+#: embed/mozilla/EphyHeaderSniffer.cpp:315
+#: src/bookmarks/ephy-bookmarks-import.c:253 src/ephy-toolbars-model.c:205
+#: src/window-commands.c:343
 msgid "Untitled"
 msgstr "无标题"
 
-#: embed/mozilla/ExternalProtocolService.cpp:121
-msgid ""
-"Epiphany cannot handle this protocol,\n"
-"and no GNOME default handler is set"
-msgstr ""
-"Epiphany 无法处理此协议，\n"
-"也没有设置默认的 GNOME 处理程序"
-
-#: embed/mozilla/ExternalProtocolService.cpp:135
-msgid ""
-"The protocol specified is not recognised.\n"
-"\n"
-"Would you like to try the GNOME default?"
-msgstr ""
-"无法识别指定协议。\n"
-"\n"
-"您是否想要试试 GNOME 默认值？"
-
-#: embed/mozilla/FilePicker.cpp:163
+#: embed/mozilla/FilePicker.cpp:164 embed/print-dialog.c:302
+#: lib/ephy-file-chooser.c:376 src/bookmarks/ephy-bookmarks-editor.c:578
 msgid "All files"
 msgstr "全部文件"
 
-#: embed/mozilla/FilePicker.cpp:168
-msgid "HTML files"
-msgstr "HTML 文件"
+#: embed/mozilla/FilePicker.cpp:169 lib/ephy-file-chooser.c:360
+#, fuzzy
+msgid "Web pages"
+msgstr "网页"
 
-#: embed/mozilla/FilePicker.cpp:173
+#: embed/mozilla/FilePicker.cpp:177
 msgid "Text files"
 msgstr "文本文件"
 
-#: embed/mozilla/FilePicker.cpp:178
-msgid "Image files"
+#: embed/mozilla/FilePicker.cpp:182 lib/ephy-file-chooser.c:368
+#, fuzzy
+msgid "Images"
 msgstr "图像文件"
 
-#: embed/mozilla/FilePicker.cpp:183
+#: embed/mozilla/FilePicker.cpp:190
 msgid "XML files"
 msgstr "XML 文件"
 
-#: embed/mozilla/FilePicker.cpp:188
+#: embed/mozilla/FilePicker.cpp:195
 msgid "XUL files"
 msgstr "XUL 文件"
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:185
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:156
 msgid "_Select Certificate"
 msgstr "选择证书(_S)"
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:224
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:195
 #, c-format
 msgid "Choose a certificate to present as identification to %s."
 msgstr "选择作为 %s 标识的证书。"
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:227
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:198
 msgid "Select a certificate to identify yourself."
 msgstr "选择标识您自己的证书。"
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:277
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:230
 msgid "Certificate _Details"
 msgstr "证书细节(_D)"
 
 #. Add the buttons
-#: embed/mozilla/GtkNSSDialogs.cpp:222 embed/mozilla/GtkNSSDialogs.cpp:533
+#: embed/mozilla/GtkNSSDialogs.cpp:227 embed/mozilla/GtkNSSDialogs.cpp:538
 msgid "_View Certificate"
 msgstr "查看证书(_V)"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:230
+#: embed/mozilla/GtkNSSDialogs.cpp:235
 msgid "_Accept"
 msgstr "接受(_A)"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:294
+#: embed/mozilla/GtkNSSDialogs.cpp:299
 #, c-format
 msgid ""
 "The site %s returned security information for %s. It is possible that "
@@ -1689,55 +1493,55 @@ msgid ""
 msgstr ""
 "站点 %s 针对 %s 返回的安全信息。可能某人正在截获您的通讯来获取您的机密信息。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:300
+#: embed/mozilla/GtkNSSDialogs.cpp:305
 #, c-format
 msgid "You should only accept the security information if you trust %s and %s."
 msgstr "请仅当您信任 %s 和 %s 时才接受安全信息。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:305
+#: embed/mozilla/GtkNSSDialogs.cpp:310
 msgid "Accept incorrect security information?"
 msgstr "接受不正确的安全信息吗？"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:337
+#: embed/mozilla/GtkNSSDialogs.cpp:342
 #, c-format
 msgid ""
 "Your browser was unable to trust %s. It is possible that someone is "
 "intercepting your communication to obtain your confidential information."
 msgstr "您的浏览器无法信任 %s。可能有人正在截获您的通讯以获取您的机密信息。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:343
+#: embed/mozilla/GtkNSSDialogs.cpp:348
 #, 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:348
+#: embed/mozilla/GtkNSSDialogs.cpp:353
 msgid "Connect to untrusted site?"
 msgstr "连接到不信任的站点吗？"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:352
+#: embed/mozilla/GtkNSSDialogs.cpp:357
 msgid "_Don't show this message again for this site"
 msgstr "不再为此站点显示此信息(_D)"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:353
+#: embed/mozilla/GtkNSSDialogs.cpp:358
 msgid "Co_nnect"
 msgstr "连接(_N)"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:414
+#: embed/mozilla/GtkNSSDialogs.cpp:419
 msgid "Accept expired security information?"
 msgstr "接受过期的安全信息吗？"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:415
+#: embed/mozilla/GtkNSSDialogs.cpp:420
 #, c-format
 msgid "The security information for %s expired on %s."
 msgstr "%s 的安全信息已在 %s 过期。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:421
+#: embed/mozilla/GtkNSSDialogs.cpp:426
 msgid "Accept not yet valid security information?"
 msgstr "接受尚未生效的安全信息吗？"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:422
+#: embed/mozilla/GtkNSSDialogs.cpp:427
 #, c-format
 msgid "The security information for %s isn't valid until %s."
 msgstr "%s 的安全信息直到 %s 才生效。"
@@ -1745,168 +1549,173 @@ 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:433
+#: embed/mozilla/GtkNSSDialogs.cpp:438
 msgid "%a %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:444
+#: embed/mozilla/GtkNSSDialogs.cpp:449
 msgid "You should ensure that your computer's time is correct."
 msgstr "您应该保证您计算机的时间是正确的。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:489
+#: embed/mozilla/GtkNSSDialogs.cpp:494
 #, c-format
 msgid "Cannot establish connection to %s."
 msgstr "无法建立到 %s 的连接。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:492
+#: embed/mozilla/GtkNSSDialogs.cpp:497
 #, c-format
 msgid "The certificate revocation list (CRL) from %s needs to be updated."
 msgstr "来自 %s 的证书吊销列表(CRL)需要更新。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:497
+#: embed/mozilla/GtkNSSDialogs.cpp:502
 msgid "Please ask your system administrator for assistance."
 msgstr "请请求您系统管理员的协助。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:536
+#: embed/mozilla/GtkNSSDialogs.cpp:541
 msgid "_Trust CA"
 msgstr "信任 CA(_T)"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:548
+#: embed/mozilla/GtkNSSDialogs.cpp:553
 #, c-format
 msgid "Trust %s to identify:"
 msgstr "信任 %s 来识别："
 
-#: embed/mozilla/GtkNSSDialogs.cpp:552
+#: embed/mozilla/GtkNSSDialogs.cpp:557
 msgid "Trust new Certificate Authority?"
 msgstr "信任新的证书颁发机构吗？"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:553
+#: embed/mozilla/GtkNSSDialogs.cpp:558
 msgid ""
 "Before trusting a Certificate Authority (CA) you should verify the "
 "certificate is authentic."
 msgstr "在信任一个证书颁发机构之前您应该验证该证书是可信的。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:563
+#: embed/mozilla/GtkNSSDialogs.cpp:568
 msgid "_Web sites"
 msgstr "网站(_W)"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:568
+#: embed/mozilla/GtkNSSDialogs.cpp:573
 msgid "_Software developers"
 msgstr "软件开发者(_S)"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:634
+#: embed/mozilla/GtkNSSDialogs.cpp:639
 msgid "Certificate already exists."
 msgstr "证书已存在。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:635
+#: embed/mozilla/GtkNSSDialogs.cpp:640
 msgid "The certificate has already been imported."
 msgstr "证书已经导入。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:754
+#: embed/mozilla/GtkNSSDialogs.cpp:759
 msgid "_Backup Certificate"
 msgstr "备份证书(_B)"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:761
+#: embed/mozilla/GtkNSSDialogs.cpp:766
 msgid "Select password."
 msgstr "选择密码。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:762
+#: embed/mozilla/GtkNSSDialogs.cpp:767
 msgid "Select a password to protect this certificate."
 msgstr "选择可保护此证书的密码。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:774 embed/mozilla/GtkNSSDialogs.cpp:876
+#: embed/mozilla/GtkNSSDialogs.cpp:779 embed/mozilla/GtkNSSDialogs.cpp:881
 msgid "_Password:"
 msgstr "密码(_P)："
 
-#: embed/mozilla/GtkNSSDialogs.cpp:788
+#: embed/mozilla/GtkNSSDialogs.cpp:793
 msgid "Con_firm password:"
 msgstr "确认密码(_F)："
 
 #. TODO: We need a better password quality meter
-#: embed/mozilla/GtkNSSDialogs.cpp:800
+#: embed/mozilla/GtkNSSDialogs.cpp:805
 msgid "Password quality:"
 msgstr "密码质量"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:857
+#: embed/mozilla/GtkNSSDialogs.cpp:862
 msgid "I_mport Certificate"
 msgstr "导入证书(_M)"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:865
+#: embed/mozilla/GtkNSSDialogs.cpp:870
 msgid "Password required."
 msgstr "需要密码。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:866
+#: embed/mozilla/GtkNSSDialogs.cpp:871
 msgid "Enter the password for this certificate."
 msgstr "输入此证书的密码。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:944
+#: embed/mozilla/GtkNSSDialogs.cpp:949
 msgid "Certificate Revocation list successfully imported."
 msgstr "证书吊销列表成功导入。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:945
+#: embed/mozilla/GtkNSSDialogs.cpp:950
 msgid "Certificate Revocation list (CRL) imported:"
 msgstr "证书吊销列表(CRL)已导入："
 
-#: embed/mozilla/GtkNSSDialogs.cpp:967
+#: embed/mozilla/GtkNSSDialogs.cpp:972
 msgid "Unit:"
 msgstr "单位："
 
-#: embed/mozilla/GtkNSSDialogs.cpp:970
+#: embed/mozilla/GtkNSSDialogs.cpp:975
 msgid "Next Update:"
 msgstr "下次更新："
 
-#: embed/mozilla/GtkNSSDialogs.cpp:997
+#: embed/mozilla/GtkNSSDialogs.cpp:1002
 msgid "Not part of certificate"
 msgstr "不是证书的一部分"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1265
+#: embed/mozilla/GtkNSSDialogs.cpp:1270
 msgid "Certificate Properties"
 msgstr "证书属性"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1287
+#: embed/mozilla/GtkNSSDialogs.cpp:1292
 msgid "This certificate has been verified for the following uses:"
 msgstr "此证书已在下列用途得到验证："
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1290
+#: embed/mozilla/GtkNSSDialogs.cpp:1295
 msgid "Could not verify this certificate because it has been revoked."
 msgstr "无法验证此证书因其已被撤消。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1293
+#: embed/mozilla/GtkNSSDialogs.cpp:1298
 msgid "Could not verify this certificate because it has expired."
 msgstr "无法验证此证书因其已过期。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1296
+#: embed/mozilla/GtkNSSDialogs.cpp:1301
 msgid "Could not verify this certificate because it is not trusted."
 msgstr "无法验证此证书因其不被信任。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1299
+#: embed/mozilla/GtkNSSDialogs.cpp:1304
 msgid "Could not verify this certificate because the issuer is not trusted."
 msgstr "无法验证此证书因其发行者不可信。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1302
+#: embed/mozilla/GtkNSSDialogs.cpp:1307
 msgid "Could not verify this certificate because the issuer is unknown."
 msgstr "无法验证此证书因其发行者未知。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1305
+#: embed/mozilla/GtkNSSDialogs.cpp:1310
 msgid ""
 "Could not verify this certificate because the CA certificate is invalid."
 msgstr "无法验证此证书因其 CA 证书无效。"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1310
+#: embed/mozilla/GtkNSSDialogs.cpp:1315
 msgid "Could not verify this certificate for unknown reasons."
 msgstr "无法验证此证书，原因未知。"
 
-#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:183
+#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:195
 msgid "Generating Private Key."
 msgstr "正在生成私钥。"
 
-#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:184
+#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:196
 msgid ""
 "Please wait while a new private key is generated. This process could take a "
 "few minutes."
 msgstr "当一个私钥生成的时候请稍等。此过程可能花费几分钟。"
 
-#: embed/mozilla/mozilla-embed-single.cpp:501
+#: embed/mozilla/MozDownload.cpp:591
+#, fuzzy
+msgid "Files"
+msgstr "文件"
+
+#: embed/mozilla/mozilla-embed-single.cpp:491
 msgid ""
 "Epiphany can't be used now. Mozilla initialization failed. Check your "
 "MOZILLA_FIVE_HOME environmental variable."
@@ -1925,86 +1734,83 @@ msgstr ""
 #. * "zh_CN" translation: "zh-cn,zh"
 #. * "zh_HK" translation: "zh-hk,zh" or maybe "zh-hk,zh-tw,zh"
 #.
-#: embed/mozilla/mozilla-notifiers.cpp:737
+#: embed/mozilla/mozilla-notifiers.cpp:736
 msgid "system-language"
 msgstr "zh-cn,zh,en"
 
-#: embed/print-dialog.c:289
+#: embed/print-dialog.c:294
 msgid "Print to"
 msgstr "打印到"
 
-#: lib/eel-gconf-extensions.c:82
-#, c-format
-msgid ""
-"GConf error:\n"
-"  %s"
+#: embed/print-dialog.c:299
+msgid "Postscript files"
 msgstr ""
-"GConf 错误：\n"
-"  %s"
 
-#: lib/eel-gconf-extensions.c:86
+#: lib/eel-gconf-extensions.c:81
 #, c-format
 msgid ""
 "GConf error:\n"
-"  %s\n"
-"All further errors shown only on terminal"
+"  %s"
 msgstr ""
 "GConf 错误：\n"
-"  %s\n"
-"所有进一步的错误仅显示在终端上"
-
-#: lib/eel-gconf-extensions.c:90
-msgid "GConf Error"
-msgstr "GConf 错误"
+"  %s"
 
 #: lib/egg/egg-editable-toolbar.c:512
 msgid "_Remove Toolbar"
 msgstr "删除工具栏(_R)"
 
-#: lib/egg/egg-toolbar-editor.c:559
+#: lib/egg/egg-toolbar-editor.c:563
 msgid "Separator"
 msgstr "分隔符"
 
-#: lib/egg/egg-toolbar-editor.c:589
+#: lib/egg/egg-toolbar-editor.c:593
 msgid ""
 "Drag an item onto the toolbars above to add it, from the toolbars in the "
 "items table to remove it."
 msgstr "将项目拖曳到工具栏上即可添加，从工具栏上拖出即可删除。"
 
+#: lib/ephy-file-chooser.c:349
+msgid "All supported types"
+msgstr ""
+
 #. The name of the default downloads folder
-#: lib/ephy-file-helpers.c:75 src/prefs-dialog.c:1107
+#: lib/ephy-file-helpers.c:79 src/prefs-dialog.c:1108
 msgid "Downloads"
 msgstr "下载"
 
-#: lib/ephy-file-helpers.c:164
+#: lib/ephy-file-helpers.c:168
 #, c-format
 msgid "Failed to find %s"
 msgstr "查找 %s 失败"
 
-#: lib/ephy-file-helpers.c:229
+#: lib/ephy-file-helpers.c:233
 #, c-format
 msgid "%s exists, please move it out of the way."
 msgstr "%s 存在，请将其移出。"
 
-#: lib/ephy-file-helpers.c:232
+#: lib/ephy-file-helpers.c:236
 #, c-format
 msgid "Failed to create directory %s."
 msgstr "创建目录 %s 失败。"
 
-#: lib/ephy-gui.c:90
-#, c-format
-msgid ""
-"File %s will be overwritten.\n"
-"If you choose yes, the contents will be lost.\n"
-"\n"
-"Do you want to continue?"
+#: lib/ephy-gui.c:96
+#, fuzzy, c-format
+msgid "A file %s already exists."
+msgstr "证书已存在。"
+
+#: lib/ephy-gui.c:100
+msgid "If you choose to overwrite this file, the contents will be lost."
+msgstr ""
+
+#: lib/ephy-gui.c:103
+msgid "Overwrite File"
+msgstr ""
+
+#: lib/ephy-gui.c:108
+msgid "_Overwrite"
 msgstr ""
-"文件 %s 将被覆盖。\n"
-"如果您选择“是”，其内容将会丢失。\n"
-"\n"
-"您是否想要继续？"
 
-#: lib/ephy-gui.c:121
+#: lib/ephy-gui.c:153
 #, c-format
 msgid "Could not display help: %s"
 msgstr "无法显示帮助：%s"
@@ -2053,22 +1859,48 @@ msgstr "泰国语"
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: lib/ephy-langs.c:45
+#: lib/ephy-langs.c:44
 msgid "Traditional Chinese (Hong Kong)"
 msgstr "繁体中文(香港)"
 
-#: lib/ephy-langs.c:47 src/prefs-dialog.c:158
+#: lib/ephy-langs.c:45 src/prefs-dialog.c:158
 msgid "Turkish"
 msgstr "土耳其语"
 
-#: lib/ephy-langs.c:48
+#: lib/ephy-langs.c:46
 msgid "Unicode"
 msgstr "Unicode"
 
-#: lib/ephy-langs.c:49
+#: lib/ephy-langs.c:47
 msgid "Western"
 msgstr "西方"
 
+#: lib/ephy-stock-icons.c:54
+#, fuzzy
+msgid "Secure"
+msgstr "安全："
+
+#: lib/ephy-stock-icons.c:55 src/ephy-window.c:1207
+msgid "Insecure"
+msgstr "不安全"
+
+#: lib/ephy-stock-icons.c:56 src/ephy-history-window.c:1192
+msgid "History"
+msgstr "历史"
+
+#: lib/ephy-stock-icons.c:57 src/bookmarks/ephy-bookmarks-editor.c:1394
+#: src/bookmarks/ephy-topic-action.c:597 src/ephy-window.c:1025
+msgid "Bookmarks"
+msgstr "书签"
+
+#: lib/ephy-stock-icons.c:58 src/toolbar.c:411
+msgid "Address Entry"
+msgstr "地址输入项"
+
+#: lib/ephy-stock-icons.c:59
+msgid "_Download"
+msgstr "下载(_D)"
+
 #: lib/ephy-zoom.h:41
 msgid "50%"
 msgstr "50%"
@@ -2105,41 +1937,62 @@ msgstr "300%"
 msgid "400%"
 msgstr "400%"
 
-#: lib/widgets/ephy-cell-renderer-progress.c:98
+#. Translator hint: this is a label on progress bars inside a tree view.
+#.
+#: lib/widgets/ephy-cell-renderer-progress.c:242
 msgid "Failed"
 msgstr "失败"
 
+#. Translator hint: this is the default label on progress bars
+#. * inside a tree view. %d will be replaced by the percentage
+#.
+#: lib/widgets/ephy-cell-renderer-progress.c:251
+#, fuzzy, c-format
+msgid "%d %%"
+msgstr "%Y年%-m月%-d日%A"
+
 #: src/bookmarks/ephy-bookmark-action.c:248
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: src/bookmarks/ephy-bookmark-properties.c:229
+#: src/bookmarks/ephy-bookmark-properties.c:230
 #, c-format
 msgid "%s Properties"
 msgstr "%s 属性"
 
-#: src/bookmarks/ephy-bookmark-properties.c:348
-#: src/bookmarks/ephy-new-bookmark.c:215
+#: src/bookmarks/ephy-bookmark-properties.c:352
+#: src/bookmarks/ephy-new-bookmark.c:216
 msgid "_Title:"
 msgstr "标题(_T)："
 
-#: src/bookmarks/ephy-bookmark-properties.c:390
-#: src/bookmarks/ephy-new-bookmark.c:238
+#: src/bookmarks/ephy-bookmark-properties.c:394
+#: src/bookmarks/ephy-new-bookmark.c:239
 msgid "To_pics:"
 msgstr "话题(_P)："
 
-#: src/bookmarks/ephy-bookmark-properties.c:399
+#: src/bookmarks/ephy-bookmark-properties.c:403
 msgid "_Show in bookmarks bar"
 msgstr "在书签栏中显示(_S)"
 
+#. Toplevel
+#: src/bookmarks/ephy-bookmarks-editor.c:161 src/ephy-history-window.c:151
+#: src/ephy-window.c:83
+msgid "_File"
+msgstr "文件(_F)"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:162 src/ephy-history-window.c:152
+#: src/ephy-window.c:84
+msgid "_Edit"
+msgstr "编辑(_E)"
+
 #: src/bookmarks/ephy-bookmarks-editor.c:163 src/ephy-history-window.c:153
-#: src/ephy-window.c:78
+#: src/ephy-window.c:85
 msgid "_View"
 msgstr "查看(_V)"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:164 src/ephy-history-window.c:154
-#: src/ephy-window.c:83
+#: src/ephy-window.c:90
 msgid "_Help"
 msgstr "帮助(_H)"
 
@@ -2154,7 +2007,7 @@ msgstr "创建新话题"
 
 #. File Menu
 #: src/bookmarks/ephy-bookmarks-editor.c:171
-#: src/bookmarks/ephy-bookmarks-editor.c:977 src/ephy-history-window.c:158
+#: src/bookmarks/ephy-bookmarks-editor.c:1017 src/ephy-history-window.c:158
 #: src/ephy-history-window.c:738
 msgid "_Open in New Window"
 msgstr "在新建窗口中打开(_O)"
@@ -2164,7 +2017,7 @@ msgid "Open the selected bookmark in a new window"
 msgstr "在新窗口中打开选中书签"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:174
-#: src/bookmarks/ephy-bookmarks-editor.c:978 src/ephy-history-window.c:161
+#: src/bookmarks/ephy-bookmarks-editor.c:1018 src/ephy-history-window.c:161
 #: src/ephy-history-window.c:739
 msgid "Open in New _Tab"
 msgstr "在新标签中打开(_T)"
@@ -2206,7 +2059,7 @@ msgid "Import bookmarks from another browser or a bookmarks file"
 msgstr "从其它浏览器或书签文件中导入书签"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:188 src/ephy-history-window.c:170
-#: src/ephy-window.c:111
+#: src/ephy-window.c:121
 msgid "_Close"
 msgstr "关闭(_C)"
 
@@ -2216,28 +2069,28 @@ msgstr "关闭书签窗口"
 
 #. Edit Menu
 #: src/bookmarks/ephy-bookmarks-editor.c:193 src/ephy-history-window.c:175
-#: src/ephy-window.c:122
+#: src/ephy-window.c:132
 msgid "Cu_t"
 msgstr "剪切(_T)"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:194 src/ephy-history-window.c:176
-#: src/ephy-window.c:123
+#: src/ephy-window.c:133
 msgid "Cut the selection"
 msgstr "剪切选中范围"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:196
-#: src/bookmarks/ephy-bookmarks-editor.c:987 src/ephy-history-window.c:178
-#: src/ephy-history-window.c:748 src/ephy-window.c:125
+#: src/bookmarks/ephy-bookmarks-editor.c:1027 src/ephy-history-window.c:178
+#: src/ephy-history-window.c:748 src/ephy-window.c:135
 msgid "_Copy"
 msgstr "复制(_C)"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:197 src/ephy-history-window.c:179
-#: src/ephy-window.c:126
+#: src/ephy-window.c:136
 msgid "Copy the selection"
 msgstr "复制选中范围"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:199 src/ephy-history-window.c:181
-#: src/ephy-window.c:128
+#: src/ephy-window.c:138
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
@@ -2246,7 +2099,7 @@ msgid "Paste the clipboard"
 msgstr "粘贴剪贴板"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:202 src/ephy-history-window.c:184
-#: src/ephy-window.c:131
+#: src/ephy-window.c:141
 msgid "Select _All"
 msgstr "全选(_A)"
 
@@ -2255,9 +2108,8 @@ msgid "Select all bookmarks or text"
 msgstr "选中全部书签或文字"
 
 #. Help Menu
-#. Help menu
 #: src/bookmarks/ephy-bookmarks-editor.c:207 src/ephy-history-window.c:192
-#: src/ephy-window.c:222
+#: src/ephy-window.c:232
 msgid "_Contents"
 msgstr "目录(_C)"
 
@@ -2266,12 +2118,12 @@ msgid "Display bookmarks help"
 msgstr "显示书签帮助"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:210 src/ephy-history-window.c:195
-#: src/ephy-window.c:225
+#: src/ephy-window.c:235
 msgid "_About"
 msgstr "关于(_A)"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:211 src/ephy-history-window.c:196
-#: src/ephy-window.c:226
+#: src/ephy-window.c:236
 msgid "Display credits for the web browser creators"
 msgstr "显示 Web 浏览器创建者的资料"
 
@@ -2305,68 +2157,87 @@ msgstr "同时显示标题和地址列"
 msgid "Type a topic"
 msgstr "输入话题"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:547
+#: src/bookmarks/ephy-bookmarks-editor.c:559
 msgid "Import bookmarks from file"
 msgstr "从文件导入书签"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:580
+#: src/bookmarks/ephy-bookmarks-editor.c:566
+#, fuzzy
+msgid "Firefox/Firebird/Mozilla bookmarks"
+msgstr "Firebird 书签"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:570
+#, fuzzy
+msgid "Galeon/Konqueror bookmarks"
+msgstr "Konqueror 书签"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:574
+#, fuzzy
+msgid "Epiphany bookmarks"
+msgstr "Galeon 书签"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:613
 msgid "Import Bookmarks"
 msgstr "导入书签"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:600
-msgid "Choose the bookmarks source:"
-msgstr "选择书签来源："
+#: src/bookmarks/ephy-bookmarks-editor.c:619
+#, fuzzy
+msgid "I_mport"
+msgstr "运动"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:618
-msgid "Mozilla bookmarks"
-msgstr "Mozilla 书签"
+#: src/bookmarks/ephy-bookmarks-editor.c:633
+#, fuzzy
+msgid "Import bookmarks from:"
+msgstr "从文件导入书签"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:620
-msgid "Firebird bookmarks"
+#: src/bookmarks/ephy-bookmarks-editor.c:656
+#, fuzzy
+msgid "Firebird"
 msgstr "Firebird 书签"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:622
-msgid "Galeon bookmarks"
-msgstr "Galeon 书签"
+#: src/bookmarks/ephy-bookmarks-editor.c:658
+msgid "Firefox"
+msgstr ""
+
+#: src/bookmarks/ephy-bookmarks-editor.c:660
+#, fuzzy
+msgid "Galeon"
+msgstr "瓦龙语"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:624
-msgid "Konqueror bookmarks"
+#: src/bookmarks/ephy-bookmarks-editor.c:662
+#, fuzzy
+msgid "Konqueror"
 msgstr "Konqueror 书签"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:628
-msgid "Import from a file"
-msgstr "从文件导入"
+#: src/bookmarks/ephy-bookmarks-editor.c:664
+msgid "Mozilla"
+msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:972 src/ephy-history-window.c:733
+#: src/bookmarks/ephy-bookmarks-editor.c:1012 src/ephy-history-window.c:733
 msgid "_Open in New Windows"
 msgstr "在新窗口中打开(_O)"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:973 src/ephy-history-window.c:734
+#: src/bookmarks/ephy-bookmarks-editor.c:1013 src/ephy-history-window.c:734
 msgid "Open in New _Tabs"
 msgstr "在新标签中打开(_T)"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:983 src/ephy-history-window.c:744
+#: src/bookmarks/ephy-bookmarks-editor.c:1023 src/ephy-history-window.c:744
 msgid "_Copy Address"
 msgstr "复制地址(_C)"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1224 src/ephy-history-window.c:1038
+#: src/bookmarks/ephy-bookmarks-editor.c:1264 src/ephy-history-window.c:1038
 msgid "_Search:"
 msgstr "搜索(_S)："
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1354
-#: src/bookmarks/ephy-topic-action.c:597 src/ephy-window.c:953
-msgid "Bookmarks"
-msgstr "书签"
-
-#: src/bookmarks/ephy-bookmarks-editor.c:1437
+#: src/bookmarks/ephy-bookmarks-editor.c:1477
 msgid "Topics"
 msgstr "话题"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1499 src/ephy-history-window.c:1318
+#: src/bookmarks/ephy-bookmarks-editor.c:1539 src/ephy-history-window.c:1318
 msgid "Title"
 msgstr "标题"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1506 src/ephy-history-window.c:1324
+#: src/bookmarks/ephy-bookmarks-editor.c:1546 src/ephy-history-window.c:1324
 msgid "Address"
 msgstr "地址"
 
@@ -2407,15 +2278,15 @@ msgstr "旅行"
 msgid "Work"
 msgstr "工作"
 
-#: src/bookmarks/ephy-bookmarks.c:680
+#: src/bookmarks/ephy-bookmarks.c:677
 msgid "Most Visited"
 msgstr "最常访问"
 
-#: src/bookmarks/ephy-bookmarks.c:697
+#: src/bookmarks/ephy-bookmarks.c:693
 msgid "Not Categorized"
 msgstr "未分类"
 
-#: src/bookmarks/ephy-new-bookmark.c:261
+#: src/bookmarks/ephy-new-bookmark.c:262
 msgid "Add Bookmark"
 msgstr "添加书签"
 
@@ -2423,11 +2294,11 @@ msgstr "添加书签"
 #. * but it doesn't support markup of text yet
 #. * so we build our own. See bug 65501.
 #.
-#: src/bookmarks/ephy-new-bookmark.c:306
+#: src/bookmarks/ephy-new-bookmark.c:307
 msgid "Duplicated Bookmark"
 msgstr "重复的书签"
 
-#: src/bookmarks/ephy-new-bookmark.c:336
+#: src/bookmarks/ephy-new-bookmark.c:337
 #, c-format
 msgid "A bookmark titled %s already exists for this page."
 msgstr "此页面已经存在标题为 %s 的书签。"
@@ -2437,23 +2308,23 @@ msgstr "此页面已经存在标题为 %s 的书签。"
 msgid "Empty"
 msgstr "空"
 
-#: src/ephy-encoding-dialog.c:330
+#: src/ephy-encoding-dialog.c:315
 msgid "Encodings"
 msgstr "编码"
 
-#: src/ephy-encoding-menu.c:379
+#: src/ephy-encoding-menu.c:359
 msgid "_Other..."
 msgstr "其它(_O)..."
 
-#: src/ephy-encoding-menu.c:380
+#: src/ephy-encoding-menu.c:360
 msgid "Other encodings"
 msgstr "其它编码"
 
-#: src/ephy-encoding-menu.c:387
+#: src/ephy-encoding-menu.c:367
 msgid "_Automatic"
 msgstr "自动(_A)"
 
-#: src/ephy-go-action.c:73 src/toolbar.c:409
+#: src/ephy-go-action.c:73 src/toolbar.c:445
 msgid "Go"
 msgstr "转到"
 
@@ -2509,15 +2380,15 @@ msgstr "只显示地址列"
 msgid "Clear History"
 msgstr "清除历史"
 
-#: src/ephy-history-window.c:278
+#: src/ephy-history-window.c:276
 msgid "C_lear"
 msgstr "清除(_L)"
 
-#: src/ephy-history-window.c:301
+#: src/ephy-history-window.c:300
 msgid "Clear browsing history?"
 msgstr "清除浏览历史吗？"
 
-#: src/ephy-history-window.c:308
+#: src/ephy-history-window.c:307
 msgid ""
 "Clearing the browsing history will cause all history links to be permanently "
 "deleted."
@@ -2535,10 +2406,6 @@ msgid "Last %d day"
 msgid_plural "Last %d days"
 msgstr[0] "上 %d 天"
 
-#: src/ephy-history-window.c:1192
-msgid "History"
-msgstr "历史"
-
 #: src/ephy-history-window.c:1264
 msgid "Sites"
 msgstr "站点"
@@ -2587,28 +2454,28 @@ msgstr "Epiphany Web 浏览器"
 msgid "Ephy"
 msgstr "Ephy"
 
-#: src/ephy-session.c:301
+#: src/ephy-session.c:367
 msgid "Crash Recovery"
 msgstr "崩溃复原"
 
-#: src/ephy-session.c:303
+#: src/ephy-session.c:369
 msgid "_Don't Recover"
 msgstr "不复原(_R)"
 
-#: src/ephy-session.c:304
+#: src/ephy-session.c:370
 msgid "_Recover"
 msgstr "复原(_R)"
 
-#: src/ephy-session.c:335
+#: src/ephy-session.c:401
 msgid ""
 "Epiphany appears to have crashed or been killed the last time it was run."
 msgstr "Epiphany 好像上次崩溃，或者上次运行时被杀死。"
 
-#: src/ephy-session.c:341
+#: src/ephy-session.c:407
 msgid "You can recover the opened tabs and windows."
 msgstr "您可以复原打开的标签和窗口。"
 
-#: src/ephy-shell.c:357
+#: src/ephy-shell.c:345
 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 "
@@ -2617,524 +2484,513 @@ msgstr ""
 "Bonobo 无法定位 GNOME_Epiphany_Automation.server 文件。您可以使用 bonobo-"
 "activation-sysconf 配置 bonobo 服务器文件的搜索路径。"
 
-#: src/ephy-shell.c:364
+#: src/ephy-shell.c:352
 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:387
+#: src/ephy-shell.c:375
 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:367 src/ephy-tab.c:1200 src/ephy-tab.c:1370
+#: src/ephy-tab.c:358 src/ephy-tab.c:1243 src/ephy-tab.c:1452
 msgid "Blank page"
 msgstr "空白页"
 
-#: src/ephy-tab.c:772
+#: src/ephy-tab.c:798
 msgid "site"
 msgstr "站点"
 
-#: src/ephy-tab.c:796
+#: src/ephy-tab.c:822
 #, c-format
 msgid "Redirecting to %s..."
 msgstr "正在重定向到 %s..."
 
-#: src/ephy-tab.c:800
+#: src/ephy-tab.c:826
 #, c-format
 msgid "Transferring data from %s..."
 msgstr "正在从 %s 传送数据..."
 
-#: src/ephy-tab.c:804
+#: src/ephy-tab.c:830
 #, c-format
 msgid "Waiting for authorization from %s..."
 msgstr "正在等待来自 %s 的认证..."
 
-#: src/ephy-tab.c:812
+#: src/ephy-tab.c:838
 #, c-format
 msgid "Loading %s..."
 msgstr "正在装入 %s...."
 
-#: src/ephy-window.c:79
+#: src/ephy-window.c:86
 msgid "_Bookmarks"
 msgstr "书签(_B)"
 
-#: src/ephy-window.c:80
+#: src/ephy-window.c:87
 msgid "_Go"
 msgstr "转到(_G)"
 
-#: src/ephy-window.c:81
+#: src/ephy-window.c:88
 msgid "T_ools"
 msgstr "工具(_O)"
 
-#: src/ephy-window.c:82
+#: src/ephy-window.c:89
 msgid "_Tabs"
 msgstr "标签(_T)"
 
 #. File menu
-#: src/ephy-window.c:87
+#: src/ephy-window.c:94
 msgid "_New Window"
 msgstr "新建窗口(_N)"
 
-#: src/ephy-window.c:88
+#: src/ephy-window.c:95
 msgid "Open a new window"
 msgstr "在新建窗口中打开"
 
-#: src/ephy-window.c:90
+#: src/ephy-window.c:97
 msgid "New _Tab"
 msgstr "新建标签(_T)"
 
-#: src/ephy-window.c:91
+#: src/ephy-window.c:98
 msgid "Open a new tab"
 msgstr "打开新标签"
 
-#: src/ephy-window.c:93
+#: src/ephy-window.c:100
 msgid "_Open..."
 msgstr "打开(_O)..."
 
-#: src/ephy-window.c:94
+#: src/ephy-window.c:101
 msgid "Open a file"
 msgstr "打开文件"
 
-#: src/ephy-window.c:96
+#: src/ephy-window.c:103 src/ephy-window.c:106
 msgid "Save _As..."
 msgstr "另存为(_A)..."
 
-#: src/ephy-window.c:97
+#: src/ephy-window.c:104 src/ephy-window.c:107
 msgid "Save the current page"
 msgstr "保存当前页面"
 
-#: src/ephy-window.c:99
+#: src/ephy-window.c:109
 msgid "Print Set_up..."
 msgstr "打印设置(_U)..."
 
-#: src/ephy-window.c:100
+#: src/ephy-window.c:110
 msgid "Setup the page settings for printing"
 msgstr "设置打印的页面设置"
 
-#: src/ephy-window.c:102
+#: src/ephy-window.c:112
 msgid "Print Pre_view"
 msgstr "打印预览(_V)"
 
-#: src/ephy-window.c:103
+#: src/ephy-window.c:113
 msgid "Print preview"
 msgstr "打印预览"
 
-#: src/ephy-window.c:106
+#: src/ephy-window.c:115
+msgid "_Print..."
+msgstr "打印(_P)..."
+
+#: src/ephy-window.c:116
 msgid "Print the current page"
 msgstr "打印当前页面"
 
-#: src/ephy-window.c:108
+#: src/ephy-window.c:118
 msgid "S_end To..."
 msgstr "发送到(_E)..."
 
-#: src/ephy-window.c:109
+#: src/ephy-window.c:119
 msgid "Send a link of the current page"
 msgstr "发送当前页面的链接"
 
-#: src/ephy-window.c:112
+#: src/ephy-window.c:122
 msgid "Close this window"
 msgstr "关闭此窗口"
 
 #. Edit menu
-#: src/ephy-window.c:116
+#: src/ephy-window.c:126
 msgid "_Undo"
 msgstr "撤消(_U)"
 
-#: src/ephy-window.c:117
+#: src/ephy-window.c:127
 msgid "Undo the last action"
 msgstr "撤消上次操作"
 
-#: src/ephy-window.c:119
+#: src/ephy-window.c:129
 msgid "Re_do"
 msgstr "重做(_D)"
 
-#: src/ephy-window.c:120
+#: src/ephy-window.c:130
 msgid "Redo the last undone action"
 msgstr "重做上次撤消的操作"
 
-#: src/ephy-window.c:129
+#: src/ephy-window.c:139
 msgid "Paste clipboard"
 msgstr "粘贴剪贴板"
 
-#: src/ephy-window.c:132
+#: src/ephy-window.c:142
 msgid "Select the entire page"
 msgstr "选中整个页面"
 
-#: src/ephy-window.c:135
+#: src/ephy-window.c:144
+msgid "_Find..."
+msgstr "查找(_F)..."
+
+#: src/ephy-window.c:145
 msgid "Find a word or phrase in the page"
 msgstr "在页面中查找单词或短语"
 
-#: src/ephy-window.c:137
+#: src/ephy-window.c:147
 msgid "Find Ne_xt"
 msgstr "查找下一个(_X)"
 
-#: src/ephy-window.c:138
+#: src/ephy-window.c:148
 msgid "Find next occurrence of the word or phrase"
 msgstr "查找单词或短语的下次出现"
 
-#: src/ephy-window.c:140
+#: src/ephy-window.c:150
 msgid "Find Pre_vious"
 msgstr "查找上一个(_V)"
 
-#: src/ephy-window.c:141
+#: src/ephy-window.c:151
 msgid "Find previous occurrence of the word or phrase"
 msgstr "查找单词或短语的上次出现"
 
-#: src/ephy-window.c:143
+#: src/ephy-window.c:153
 msgid "P_ersonal Data"
 msgstr "个人数据(_E)"
 
-#: src/ephy-window.c:144
+#: src/ephy-window.c:154
 msgid "View and remove cookies and passwords"
 msgstr "查看或删除 cookies 和密码"
 
-#: src/ephy-window.c:146
+#: src/ephy-window.c:156
 msgid "T_oolbars"
 msgstr "工具栏(_O)"
 
-#: src/ephy-window.c:147
+#: src/ephy-window.c:157
 msgid "Customize toolbars"
 msgstr "自定义工具栏"
 
-#: src/ephy-window.c:149
+#: src/ephy-window.c:159
 msgid "P_references"
 msgstr "首选项(_R)"
 
-#: src/ephy-window.c:150
+#: src/ephy-window.c:160
 msgid "Configure the web browser"
 msgstr "配置 Web 浏览器"
 
 #. View menu
-#: src/ephy-window.c:154
+#: src/ephy-window.c:164
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/ephy-window.c:155
+#: src/ephy-window.c:165
 msgid "Stop current data transfer"
 msgstr "停止当前数据传送"
 
-#: src/ephy-window.c:157
+#: src/ephy-window.c:167
 msgid "_Reload"
 msgstr "重新装入(_R)"
 
-#: src/ephy-window.c:158
+#: src/ephy-window.c:168
 msgid "Display the latest content of the current page"
 msgstr "显示当前页面的最新内容"
 
-#: src/ephy-window.c:160
+#: src/ephy-window.c:170
 msgid "Zoom _In"
 msgstr "放大(_I)"
 
-#: src/ephy-window.c:161
+#: src/ephy-window.c:171
 msgid "Increase the text size"
 msgstr "增加文字大小"
 
-#: src/ephy-window.c:163
+#: src/ephy-window.c:173
 msgid "Zoom _Out"
 msgstr "缩小(_O)"
 
-#: src/ephy-window.c:164
+#: src/ephy-window.c:174
 msgid "Decrease the text size"
 msgstr "减少文字大小"
 
-#: src/ephy-window.c:166
+#: src/ephy-window.c:176
 msgid "_Normal Size"
 msgstr "普通大小(_N)"
 
-#: src/ephy-window.c:167
+#: src/ephy-window.c:177
 msgid "Use the normal text size"
 msgstr "使用普通文字大小"
 
-#: src/ephy-window.c:169
+#: src/ephy-window.c:179
 msgid "Text _Encoding"
 msgstr "文字编码(_E)"
 
-#: src/ephy-window.c:170
+#: src/ephy-window.c:180
 msgid "Change the text encoding"
 msgstr "更改文字编码"
 
-#: src/ephy-window.c:172
+#: src/ephy-window.c:182
 msgid "_Page Source"
 msgstr "页面源代码(_P)"
 
-#: src/ephy-window.c:173
+#: src/ephy-window.c:183
 msgid "View the source code of the page"
 msgstr "查看页面的源代码"
 
 #. Bookmarks menu
-#: src/ephy-window.c:177
+#: src/ephy-window.c:187
 msgid "_Add Bookmark..."
 msgstr "添加书签(_A)..."
 
-#: src/ephy-window.c:178 src/ephy-window.c:257
+#: src/ephy-window.c:188 src/ephy-window.c:267
 msgid "Add a bookmark for the current page"
 msgstr "将当前页面添加为书签"
 
-#: src/ephy-window.c:180
+#: src/ephy-window.c:190
 msgid "_Edit Bookmarks"
 msgstr "编辑书签(_E)"
 
-#: src/ephy-window.c:181
+#: src/ephy-window.c:191
 msgid "Open the bookmarks window"
 msgstr "打开书签窗口"
 
 #. Go menu
-#: src/ephy-window.c:185
+#: src/ephy-window.c:195
 msgid "_Back"
 msgstr "后退(_B)"
 
-#: src/ephy-window.c:186
+#: src/ephy-window.c:196
 msgid "Go to the previous visited page"
 msgstr "转到上个浏览过的网页"
 
-#: src/ephy-window.c:188
+#: src/ephy-window.c:198
 msgid "_Forward"
 msgstr "前进(_F)"
 
-#: src/ephy-window.c:189
+#: src/ephy-window.c:199
 msgid "Go to the next visited page"
 msgstr "转到下个浏览过的网页"
 
-#: src/ephy-window.c:192
+#: src/ephy-window.c:202
 msgid "Go up one level"
 msgstr "向上一级"
 
-#: src/ephy-window.c:194
+#: src/ephy-window.c:204
 msgid "_Home"
 msgstr "主页(_H)"
 
-#: src/ephy-window.c:195
+#: src/ephy-window.c:205
 msgid "Go to the home page"
 msgstr "转到主页"
 
-#: src/ephy-window.c:197
+#: src/ephy-window.c:207
 msgid "_Location..."
 msgstr "位置(_L)..."
 
-#: src/ephy-window.c:198
+#: src/ephy-window.c:208
 msgid "Go to a specified location"
 msgstr "转到指定位置"
 
-#: src/ephy-window.c:200
+#: src/ephy-window.c:210
 msgid "H_istory"
 msgstr "历史(_I)"
 
-#: src/ephy-window.c:201
+#: src/ephy-window.c:211
 msgid "Open the history window"
 msgstr "打开历史窗口"
 
 #. Tabs menu
-#: src/ephy-window.c:205
+#: src/ephy-window.c:215
 msgid "_Previous Tab"
 msgstr "上个标签(_P)"
 
-#: src/ephy-window.c:206
+#: src/ephy-window.c:216
 msgid "Activate previous tab"
 msgstr "激活上个标签"
 
-#: src/ephy-window.c:208
+#: src/ephy-window.c:218
 msgid "_Next Tab"
 msgstr "下个标签(_N)"
 
-#: src/ephy-window.c:209
+#: src/ephy-window.c:219
 msgid "Activate next tab"
 msgstr "激活下个标签"
 
-#: src/ephy-window.c:211
+#: src/ephy-window.c:221
 msgid "Move Tab _Left"
 msgstr "将标签左移(_L)"
 
-#: src/ephy-window.c:212
+#: src/ephy-window.c:222
 msgid "Move current tab to left"
 msgstr "将当前标签向左移"
 
-#: src/ephy-window.c:214
+#: src/ephy-window.c:224
 msgid "Move Tab _Right"
 msgstr "将标签右移(_R)"
 
-#: src/ephy-window.c:215
+#: src/ephy-window.c:225
 msgid "Move current tab to right"
 msgstr "将当前标签向右移"
 
-#: src/ephy-window.c:217
+#: src/ephy-window.c:227
 msgid "_Detach Tab"
 msgstr "漂移标签(_D)"
 
-#: src/ephy-window.c:218
+#: src/ephy-window.c:228
 msgid "Detach current tab"
 msgstr "漂移当前标签"
 
-#: src/ephy-window.c:223
+#: src/ephy-window.c:233
 msgid "Display web browser help"
 msgstr "显示 Web 浏览器"
 
 #. View Menu
-#: src/ephy-window.c:234
+#: src/ephy-window.c:244
 msgid "_Toolbar"
 msgstr "工具栏(_T)"
 
-#: src/ephy-window.c:235
+#: src/ephy-window.c:245
 msgid "Show or hide toolbar"
 msgstr "显示或隐藏工具栏"
 
-#: src/ephy-window.c:237
+#: src/ephy-window.c:247
 msgid "_Bookmarks Bar"
 msgstr "书签栏(_B)"
 
-#: src/ephy-window.c:238
+#: src/ephy-window.c:248
 msgid "Show or hide bookmarks bar"
 msgstr "显示或隐藏书签栏"
 
-#: src/ephy-window.c:240
+#: src/ephy-window.c:250
 msgid "St_atusbar"
 msgstr "状态栏(_A)"
 
-#: src/ephy-window.c:241
+#: src/ephy-window.c:251
 msgid "Show or hide statusbar"
 msgstr "显示或隐藏状态栏"
 
-#: src/ephy-window.c:243
+#: src/ephy-window.c:253
 msgid "_Fullscreen"
 msgstr "全屏(_F)"
 
-#: src/ephy-window.c:244
+#: src/ephy-window.c:254
 msgid "Browse at full screen"
 msgstr "在全屏模式中浏览"
 
-#: src/ephy-window.c:246
+#: src/ephy-window.c:256
 msgid "Selection Caret"
 msgstr "选择光标"
 
 #. Document
-#: src/ephy-window.c:254
+#: src/ephy-window.c:264
 msgid "_Save Background As..."
 msgstr "背景另存为(_S)..."
 
-#: src/ephy-window.c:256
+#: src/ephy-window.c:266
 msgid "Add Boo_kmark..."
 msgstr "添加书签(_K)..."
 
 #. Framed document
-#: src/ephy-window.c:261
+#: src/ephy-window.c:271
 msgid "_Open Frame"
 msgstr "打开框架(_O)"
 
-#: src/ephy-window.c:263
-msgid "Open Frame in _New Window"
-msgstr "在新窗口中打开框架(_N)"
-
-#: src/ephy-window.c:265
-msgid "Open Frame in New _Tab"
-msgstr "在新标签中打开框架(_T)"
-
 #. Links
-#: src/ephy-window.c:269
+#: src/ephy-window.c:275
 msgid "_Open Link"
 msgstr "打开链接(_O)"
 
-#: src/ephy-window.c:271
+#: src/ephy-window.c:277
 msgid "Open Link in _New Window"
 msgstr "在新建窗口中打开链接(_N)"
 
-#: src/ephy-window.c:273
+#: src/ephy-window.c:279
 msgid "Open Link in New _Tab"
 msgstr "在新标签中打开链接(_T)"
 
-#: src/ephy-window.c:275
+#: src/ephy-window.c:281
 msgid "_Download Link"
 msgstr "下载链接(_D)"
 
-#: src/ephy-window.c:277
+#: src/ephy-window.c:283
 msgid "_Save Link As..."
 msgstr "链接另存为(_S)..."
 
-#: src/ephy-window.c:279
+#: src/ephy-window.c:285
 msgid "_Bookmark Link..."
 msgstr "将链接加为书签(_B)..."
 
-#: src/ephy-window.c:281
+#: src/ephy-window.c:287
 msgid "_Copy Link Address"
 msgstr "复制链接地址(_C)"
 
 #. Images
-#: src/ephy-window.c:285
+#: src/ephy-window.c:291
 msgid "Open _Image"
 msgstr "打开图像(_I)"
 
-#: src/ephy-window.c:287
-msgid "Open Image in New _Window"
-msgstr "在新窗口中打开图像(_W)"
-
-#: src/ephy-window.c:289
-msgid "Open Image in New T_ab"
-msgstr "在新标签中打开图像(_A)"
-
-#: src/ephy-window.c:291
+#: src/ephy-window.c:293
 msgid "_Save Image As..."
 msgstr "图像另存为(_S)..."
 
-#: src/ephy-window.c:293
+#: src/ephy-window.c:295
 msgid "_Use Image As Background"
 msgstr "使用图像作为背景(_U)"
 
-#: src/ephy-window.c:295
+#: src/ephy-window.c:297
 msgid "Copy I_mage Address"
 msgstr "复制图像地址(_M)"
 
-#: src/ephy-window.c:584
+#: src/ephy-window.c:542
 msgid "Exit Fullscreen"
 msgstr "退出全屏"
 
-#: src/ephy-window.c:658
-msgid "_Close document"
+#: src/ephy-window.c:616
+#, fuzzy
+msgid "Close _Document"
 msgstr "关闭文档(_C)"
 
-#: src/ephy-window.c:685
+#: src/ephy-window.c:644
 msgid "There are unsubmitted changes to form elements."
 msgstr "对窗体元素而言有未提交的改变。"
 
-#: src/ephy-window.c:686
+#: src/ephy-window.c:645
 msgid "If you close the document anyway, you will lose that information."
 msgstr "如果您无论如何都要关闭该文档，您将丢失那些信息。"
 
-#: src/ephy-window.c:943 src/window-commands.c:395
+#: src/ephy-window.c:1015 src/window-commands.c:396
 msgid "Open"
 msgstr "打开"
 
-#: src/ephy-window.c:945 src/window-commands.c:420
+#: src/ephy-window.c:1017 src/window-commands.c:422
 msgid "Save As"
 msgstr "另存为"
 
-#: src/ephy-window.c:949
+#: src/ephy-window.c:1021
 msgid "Bookmark"
 msgstr "书签"
 
-#: src/ephy-window.c:1135
-msgid "Insecure"
-msgstr "不安全"
-
-#: src/ephy-window.c:1138
+#: src/ephy-window.c:1210
 msgid "Broken"
 msgstr "破碎"
 
-#: src/ephy-window.c:1141
+#: src/ephy-window.c:1213
 msgid "Medium"
 msgstr "中"
 
-#: src/ephy-window.c:1145
+#: src/ephy-window.c:1217
 msgid "Low"
 msgstr "低"
 
-#: src/ephy-window.c:1149
+#: src/ephy-window.c:1221
 msgid "High"
 msgstr "高"
 
-#: src/ephy-window.c:1159
+#: src/ephy-window.c:1231
 #, c-format
 msgid ""
 "Security level: %s\n"
@@ -3143,7 +2999,7 @@ msgstr ""
 "安全级别：%s\n"
 "%s"
 
-#: src/ephy-window.c:1165
+#: src/ephy-window.c:1237
 #, c-format
 msgid "Security level: %s"
 msgstr "安全级别：%s"
@@ -3177,16 +3033,17 @@ msgid "Path:"
 msgstr "路径："
 
 #: src/pdm-dialog.c:914
-msgid "Secure:"
-msgstr "安全："
+#, fuzzy
+msgid "Send for:"
+msgstr "发送到(_E)..."
 
 #: src/pdm-dialog.c:923
-msgid "Yes"
-msgstr "是"
+msgid "Encrypted connections only"
+msgstr ""
 
 #: src/pdm-dialog.c:923
-msgid "No"
-msgstr "否"
+msgid "Any type of connection"
+msgstr ""
 
 #: src/pdm-dialog.c:929
 msgid "Expires:"
@@ -3196,22 +3053,46 @@ msgstr "过期："
 msgid "End of current session"
 msgstr "当前会话结束"
 
-#: src/popup-commands.c:329 src/popup-commands.c:337
+#: src/popup-commands.c:245 src/popup-commands.c:253
 msgid "Download link"
 msgstr "下载链接"
 
+#: src/popup-commands.c:260
+msgid "Save Image As"
+msgstr "图像另存为"
+
+#: src/popup-commands.c:350
+msgid "Save Background As"
+msgstr "背景另存为"
+
+#: src/ppview-toolbar.c:92
+msgid "First"
+msgstr "第一页"
+
 #: src/ppview-toolbar.c:93
 msgid "Go to the first page"
 msgstr "转到第一页"
 
+#: src/ppview-toolbar.c:96
+msgid "Last"
+msgstr "最后一页"
+
 #: src/ppview-toolbar.c:97
 msgid "Go to the last page"
 msgstr "转到最后一页"
 
+#: src/ppview-toolbar.c:100
+msgid "Previous"
+msgstr "上一页"
+
 #: src/ppview-toolbar.c:101
 msgid "Go to the previous page"
 msgstr "转到上一页"
 
+#: src/ppview-toolbar.c:104
+msgid "Next"
+msgstr "下一页"
+
 #: src/ppview-toolbar.c:105
 msgid "Go to next page"
 msgstr "转到下页"
@@ -3411,7 +3292,7 @@ msgstr "越南语"
 msgid "Walloon"
 msgstr "瓦龙语"
 
-#: src/prefs-dialog.c:1057
+#: src/prefs-dialog.c:1058
 #, c-format
 msgid "Custom [%s]"
 msgstr "自定义 [%s]"
@@ -3420,83 +3301,244 @@ msgstr "自定义 [%s]"
 #. * user's home folder. It should be translated by the same
 #. * term as GTK+'s "Home" string to be consistent with the
 #. * filechooser
-#: src/prefs-dialog.c:1102
+#: src/prefs-dialog.c:1103
 msgid "Home"
 msgstr "主文件夹"
 
-#: src/prefs-dialog.c:1111
+#: src/prefs-dialog.c:1112
 msgid "Desktop"
 msgstr "桌面"
 
-#: src/prefs-dialog.c:1322
+#: src/prefs-dialog.c:1321
 msgid "Select a directory"
 msgstr "选择目录"
 
-#: src/toolbar.c:332
+#: src/toolbar.c:368
 msgid "Back"
 msgstr "后退"
 
-#: src/toolbar.c:334
+#: src/toolbar.c:370
 msgid "Go back"
 msgstr "后退"
 
-#: src/toolbar.c:346
+#: src/toolbar.c:382
 msgid "Forward"
 msgstr "前进"
 
-#: src/toolbar.c:348
+#: src/toolbar.c:384
 msgid "Go forward"
 msgstr "前进"
 
-#: src/toolbar.c:359
+#: src/toolbar.c:395
 msgid "Up"
 msgstr "向上"
 
-#: src/toolbar.c:361
+#: src/toolbar.c:397
 msgid "Go up"
 msgstr "向上"
 
-#: src/toolbar.c:375
-msgid "Address Entry"
-msgstr "地址输入项"
-
-#: src/toolbar.c:377
+#: src/toolbar.c:413
 msgid "Enter a web address to open, or a phrase to search for on the web"
 msgstr "输入要打开的网址，或者要在网上搜索的短语"
 
-#: src/toolbar.c:389
+#: src/toolbar.c:425
 msgid "Zoom"
 msgstr "缩放"
 
-#: src/toolbar.c:391
+#: src/toolbar.c:427
 msgid "Adjust the text size"
 msgstr "调整文本大小"
 
-#: src/toolbar.c:401
+#: src/toolbar.c:437
 msgid "Favicon"
 msgstr "收藏图标"
 
-#: src/toolbar.c:411
+#: src/toolbar.c:447
 msgid "Go to the address entered in the address entry"
 msgstr "转到在地址输入项中输入的地址"
 
-#: src/window-commands.c:168
+#: src/window-commands.c:169
 msgid "Check this out!"
 msgstr "看看这个！"
 
-#: src/window-commands.c:881
+#: src/window-commands.c:855
 msgid "Toolbar Editor"
 msgstr "工具栏编辑器"
 
-#: src/window-commands.c:903
+#: src/window-commands.c:877
 msgid "_Add a New Toolbar"
 msgstr "添加新工具栏(_A)"
 
 #. Translator credits
-#: src/window-commands.c:954
+#: src/window-commands.c:928
 msgid "translator-credits"
 msgstr "开源软件国际化简体中文组(http://i18n.linux.net.cn),Funda Wang"
 
-#: src/window-commands.c:984
+#: src/window-commands.c:958
 msgid "A GNOME browser based on Mozilla"
 msgstr "基于 Mozilla 的 GNOME 浏览器"
+
+#~ msgid "Epiphany Nautilus view"
+#~ msgstr "Epiphany Nautilus 查看"
+
+#~ msgid "Epiphany content view component"
+#~ msgstr "Epiphany 内容查看组件"
+
+#~ msgid "View as Web Page"
+#~ msgstr "按网页查看"
+
+#~ msgid "Web Page Viewer"
+#~ msgstr "网页查看器"
+
+#~ msgid "Add Bookmark for Frame"
+#~ msgstr "添加框架的书签"
+
+#~ msgid "Copy"
+#~ msgstr "复制"
+
+#~ msgid "Copy Email Address"
+#~ msgstr "复制邮件地址"
+
+#~ msgid "Copy Image Address"
+#~ msgstr "复制图像地址"
+
+#~ msgid "Copy Link Address"
+#~ msgstr "复制链接地址"
+
+#~ msgid "Copy Page Address"
+#~ msgstr "复制页面地址"
+
+#~ msgid "Copy the Selection"
+#~ msgstr "复制选中范围"
+
+#~ msgid "Cut"
+#~ msgstr "剪切"
+
+#~ msgid "Cut the Selection"
+#~ msgstr "复制选中范围"
+
+#~ msgid "Download Link"
+#~ msgstr "下载链接"
+
+#~ msgid "Open Frame"
+#~ msgstr "打开框架"
+
+#~ msgid "Open Frame in New Window"
+#~ msgstr "在新窗口中打开框架"
+
+#~ msgid "Open Image"
+#~ msgstr "打开图像"
+
+#~ msgid "Open Image in New Window"
+#~ msgstr "在新窗口中打开图像"
+
+#~ msgid "Open in New Window"
+#~ msgstr "在新建窗口中打开"
+
+#~ msgid "Paste"
+#~ msgstr "粘贴"
+
+#~ msgid "Paste the Clipboard"
+#~ msgstr "粘贴剪贴板"
+
+#~ msgid "Print the Current File"
+#~ msgstr "打印当前文件"
+
+#~ msgid "Save Background As..."
+#~ msgstr "背景另存为..."
+
+#~ msgid "Save Image As..."
+#~ msgstr "图像另存为..."
+
+#~ msgid "Save Page As..."
+#~ msgstr "页面另存为..."
+
+#~ msgid "Search for a String"
+#~ msgstr "搜索字符串"
+
+#~ msgid "Select All"
+#~ msgstr "全部选中"
+
+#~ msgid "Select the Entire Document"
+#~ msgstr "选中整个文档"
+
+#~ msgid "Text _Encoding..."
+#~ msgstr "文字编码(_E)..."
+
+#~ msgid "Use Image As Background"
+#~ msgstr "使用图像作为背景"
+
+#~ msgid "Save Page As"
+#~ msgstr "页面另存为"
+
+#~ msgid "_Open"
+#~ msgstr "打开(_O)"
+
+#~ msgid ""
+#~ "Epiphany cannot handle this protocol,\n"
+#~ "and no GNOME default handler is set"
+#~ msgstr ""
+#~ "Epiphany 无法处理此协议，\n"
+#~ "也没有设置默认的 GNOME 处理程序"
+
+#~ msgid ""
+#~ "The protocol specified is not recognised.\n"
+#~ "\n"
+#~ "Would you like to try the GNOME default?"
+#~ msgstr ""
+#~ "无法识别指定协议。\n"
+#~ "\n"
+#~ "您是否想要试试 GNOME 默认值？"
+
+#~ msgid "HTML files"
+#~ msgstr "HTML 文件"
+
+#~ msgid ""
+#~ "GConf error:\n"
+#~ "  %s\n"
+#~ "All further errors shown only on terminal"
+#~ msgstr ""
+#~ "GConf 错误：\n"
+#~ "  %s\n"
+#~ "所有进一步的错误仅显示在终端上"
+
+#~ msgid "GConf Error"
+#~ msgstr "GConf 错误"
+
+#~ msgid ""
+#~ "File %s will be overwritten.\n"
+#~ "If you choose yes, the contents will be lost.\n"
+#~ "\n"
+#~ "Do you want to continue?"
+#~ msgstr ""
+#~ "文件 %s 将被覆盖。\n"
+#~ "如果您选择“是”，其内容将会丢失。\n"
+#~ "\n"
+#~ "您是否想要继续？"
+
+#~ msgid "Choose the bookmarks source:"
+#~ msgstr "选择书签来源："
+
+#~ msgid "Mozilla bookmarks"
+#~ msgstr "Mozilla 书签"
+
+#~ msgid "Import from a file"
+#~ msgstr "从文件导入"
+
+#~ msgid "Open Frame in _New Window"
+#~ msgstr "在新窗口中打开框架(_N)"
+
+#~ msgid "Open Frame in New _Tab"
+#~ msgstr "在新标签中打开框架(_T)"
+
+#~ msgid "Open Image in New _Window"
+#~ msgstr "在新窗口中打开图像(_W)"
+
+#~ msgid "Open Image in New T_ab"
+#~ msgstr "在新标签中打开图像(_A)"
+
+#~ msgid "Yes"
+#~ msgstr "是"
+
+#~ msgid "No"
+#~ msgstr "否"