*** empty log message ***

2 files changed, 107 insertions, 203 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 2dac48702..dea8a7f94 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-03  Wang Jian  <lark@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation by
+	Funda Wang <fundawang@linux.net.cn>.
+
 2003-08-02  Christian Persch  <chpe@cvs.gnome.org>
 
 	* en_GB.po: Updated British English translation.
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cf842841f..dc83fa08d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: epiphany\n"
-"POT-Creation-Date: 2003-08-01 10:55+0800\n"
-"PO-Revision-Date: 2003-07-02 15:33+0800\n"
+"POT-Creation-Date: 2003-08-03 15:18+0800\n"
+"PO-Revision-Date: 2003-08-01 16:35+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -63,9 +63,8 @@ msgid "Web Browser"
 msgstr "Web 浏览器"
 
 #: data/epiphany.schemas.in.h:1
-#, fuzzy
 msgid "Address of the user's home page."
-msgstr "用户主页的地址"
+msgstr "用户主页的地址。"
 
 #: data/epiphany.schemas.in.h:2
 msgid "Allow popups"
@@ -97,7 +96,6 @@ msgid "Default encoding"
 msgstr "默认编码"
 
 #: data/epiphany.schemas.in.h:9
-#, fuzzy
 msgid ""
 "Default encoding. Accepted values are: \"armscii-8\", \"Big5\", \"Big5-HKSCS"
 "\", \"EUC-JP\", \"EUC-KR\", \"gb18030\", \"GB2312\", \"geostd8\", \"HZ-GB-"
@@ -117,30 +115,30 @@ msgid ""
 "\"x-mac-turkish\", \"x-mac-ukrainian\", \"x-user-defined\", \"x-viet-tcvn5712"
 "\", \"x-viet-vps\" and \"x-windows-949\"."
 msgstr ""
-"默认编码。可接受的值为：armscii-8, Big5, Big5-HKSCS, EUC-JP, EUC-KR, "
-"gb18030, GB2312, geostd8, HZ-GB-2312, IBM850, IBM852, IBM855, IBM857, "
-"IBM862, IBM864, IBM864i, IBM866, ISO-2022-CN, ISO-2022-JP, ISO-2022-KR, ISO-"
-"8859-1, ISO-8859-10, ISO-8859-13, ISO-8859-14, ISO-8859-15, ISO-8859-16, ISO-"
-"8859-2, ISO-8859-3, ISO-8859-4, ISO-8859-5, ISO-8859-6, ISO-8859-6-E, ISO-"
-"8859-6-I, ISO-8859-7, ISO-8859-8, ISO-8859-8-E, ISO-8859-8-I, ISO-8859-9, "
-"ISO-IR-111, KOI8-R, KOI8-U, Shift_JIS, T.61-8bit, TIS-620, us-ascii, UTF-"
-"16BE, UTF-16LE, UTF-32BE, UTF-32LE, UTF-7, UTF-8, VISCII, windows-1250, "
-"windows-1251, windows-1252, windows-1253, windows-1254, windows-1255, "
-"windows-1256, windows-1257, windows-1258, windows-936, x-euc-tw, x-gbk, x-"
-"imap4-modified-utf7, x-johab, x-mac-arabic, x-mac-ce, x-mac-croatian, x-mac-"
-"cyrillic, x-mac-devanagari, x-mac-farsi, x-mac-greek, x-mac-gujarati, x-mac-"
-"gurmukhi, x-mac-hebrew, x-mac-icelandic, x-mac-roman, x-mac-romanian, x-mac-"
-"turkish, x-mac-ukrainian, x-u-escaped, x-user-defined, x-viet-tcvn5712, x-"
-"viet-vps 和 x-windows-949。"
+"默认编码。可接受的值为：“armscii-8”，“Big5”，“Big5-HKSCS”，“EUC-JP”，“EUC-"
+"KR”，“gb18030”，“GB2312”，“geostd8”，“HZ-GB-"
+"2312”，“IBM850”，“IBM852”，“IBM855”，“IBM857”，“IBM862”，“IBM864”，“IBM866”，“ISO-"
+"2022-CN”，“ISO-2022-JP”，“ISO-2022-KR”，“ISO-8859-1”，“ISO-8859-2”，“ISO-"
+"8859-3”，“ISO-8859-4”，“ISO-8859-5”，“ISO-8859-6”，“ISO-8859-7”，“ISO-8859-"
+"8”，“ISO-8859-8-I”，“ISO-8859-9”，“ISO-8859-10”，“ISO-8859-11”，“ISO-8859-"
+"13”，“ISO-8859-14”，“ISO-8859-15”，“ISO-8859-16”，“ISO-IR-111”，“KOI8-"
+"R”，“KOI8-U”，“Shift_JIS”，“TIS-620”，“UTF-7”，“UTF-8”，“VISCII”，“windows-"
+"874”，“windows-1250”，“windows-1251”，“windows-1252”，“windows-"
+"1253”，“windows-1254”，“windows-1255”，“windows-1256”，“windows-"
+"1257”，“windows-1258”，“x-euc-tw”，“x-gbk”，“x-johab”，“x-mac-arabic”，“x-"
+"mac-ce”，“x-mac-croatian”，“x-mac-cyrillic”，“x-mac-devanagari”，“x-mac-"
+"farsi”，“x-mac-greek”，“x-mac-gujarati”，“x-mac-gurmukhi”，“x-mac-"
+"hebrew”，“x-mac-icelandic”，“x-mac-roman”，“x-mac-romanian”，“x-mac-"
+"turkish”，“x-mac-ukrainian”，“x-user-defined”，“x-viet-tcvn5712”，“x-viet-"
+"vps”和“x-windows-949”。"
 
 #: data/epiphany.schemas.in.h:10
 msgid "Default font type"
 msgstr "默认字体类型"
 
 #: data/epiphany.schemas.in.h:11
-#, fuzzy
 msgid "Default font type. Possible values are \"serif\" and \"sans-serif\"."
-msgstr "默认字体类型。可能的值为 serif 和 sans-serif"
+msgstr "默认字体类型。可能的值为“serif”和“sans-serif”。"
 
 #: data/epiphany.schemas.in.h:12
 msgid "Enable Java"
@@ -167,11 +165,10 @@ msgid "Filename to print to."
 msgstr "打印文件名。"
 
 #: data/epiphany.schemas.in.h:18
-#, fuzzy
 msgid ""
 "For find in page, whether to start again at the beginning after reaching the "
 "end of the page."
-msgstr "若在页面内查找，是否要在搜索达到页面尾部时自动从头开始"
+msgstr "若在页面内查找，是否要在搜索达到页面尾部时自动从头开始。"
 
 #: data/epiphany.schemas.in.h:19
 msgid "Home page"
@@ -275,9 +272,8 @@ msgid "Show download details"
 msgstr "显示下载细节"
 
 #: data/epiphany.schemas.in.h:43
-#, fuzzy
 msgid "Show download details."
-msgstr "显示下载细节"
+msgstr "显示下载细节。"
 
 #: data/epiphany.schemas.in.h:44
 msgid "Show statusbar by default"
@@ -308,7 +304,6 @@ msgid "The currently selected fonts language"
 msgstr "目前选中的字体语言"
 
 #: data/epiphany.schemas.in.h:51
-#, fuzzy
 msgid ""
 "The currently selected fonts language. Valid values are \"ar\" (arabic), \"x-"
 "baltic\" (baltic languages), \"x-central-euro\" (central european "
@@ -319,17 +314,17 @@ msgid ""
 "written in latin script), \"x-tamil\" (tamil) and \"x-devanagari"
 "\" (devanagari)."
 msgstr ""
-"目前选中字体的语言。有效的值为 ar (阿拉伯语), x-baltic (baltic languages), x-"
-"central-euro (中欧语言), x-cyrillic (以斯拉夫字符表书写的语言), el (希腊语), "
-"he (希伯来语), ja (日语), ko (朝鲜语), zh-CN (简体中文), th (泰语), zh-TW (繁"
-"体中文), tr (土耳其语), x-unicode (其它语言) and x-western (拉丁语系的语言)。"
+"目前选中字体的语言。有效的值为“ar”(阿拉伯语)，“x-baltic”(巴拉克语)，“x-"
+"central-euro”(中欧语言)，“x-cyrillic”(以西里尔字符集书写的语言)，“el”(希腊"
+"语)，“he”(希伯来语)，“ja”(日语)，“ko”(朝鲜语)，“zh-CN”(简体中文)，“th”(泰"
+"语)，“zh-TW”(繁体中文)，“tr”(土耳其语)，“x-unicode”(其它语言)，“x-western”(以"
+"拉丁语系书写的语言)，“x-tamil”(泰米尔语)和“x-devanagari”(梵文)。"
 
 #: data/epiphany.schemas.in.h:52
 msgid "The encoding autodetector. Empty string means autodetect is off"
 msgstr "编码自动检测。空字符串意味着关闭自动检测"
 
 #: data/epiphany.schemas.in.h:53
-#, fuzzy
 msgid ""
 "The encoding autodetector. Valid entries are \"\" (autodetectors off), "
 "\"cjk_parallel_state_machine\" (autodetect east asian encodings), "
@@ -341,13 +336,13 @@ msgid ""
 "\"zhtw_parallel_state_machine\" (autodetect traditional chinese encodings) "
 "and \"universal_charset_detector\" (autodetect most encodings)."
 msgstr ""
-"编码自动检测。有效的值为 \"\" (关闭自动检测), \"cjk_parallel_state_machine"
-"\" (自动检测东亚编码), \"ja_parallel_state_machine\" (自动检测日语编码), "
-"\"ko_parallel_state_machine\" (自动检测朝鲜语编码), \"ruprob\" (自动检测俄语"
-"编码), \"ukprob\" (自动检测乌克兰语编码), \"zh_parallel_state_machine\" (自动"
-"检测中文编码), \"zhcn_parallel_state_machine\" (自动检测简体中文编码), "
-"\"zhtw_parallel_state_machine\" (自动检测繁体中文编码) 和 "
-"\"universal_charset_detector\" (自动检测所有编码)。"
+"编码自动检测。有效的值为“”(关闭自动检测)，“cjk_parallel_state_machine”(自动检"
+"测东亚编码)，“ja_parallel_state_machine”(自动检测日语编"
+"码)，“ko_parallel_state_machine”(自动检测朝鲜语编码)，“ruprob”(自动检测俄语编"
+"码)，“ukprob”(自动检测乌克兰语编码)，“zh_parallel_state_machine”(自动检测中文"
+"编码)，“zhcn_parallel_state_machine”(自动检测简体中文编"
+"码)，“zhtw_parallel_state_machine”(自动检测繁体中文编码) 和 "
+"“universal_charset_detector”(自动检测所有编码)。"
 
 #: data/epiphany.schemas.in.h:54
 msgid "Use own colors"
@@ -370,16 +365,14 @@ msgid "Use your own fonts instead of the fonts the page requests."
 msgstr "使用您自己的字体而不是页面请求的字体。"
 
 #: data/epiphany.schemas.in.h:59
-#, fuzzy
 msgid ""
 "Where to accept cookies from. Possible values are \"anywhere\", \"current "
 "site\" and \"nowhere\"."
-msgstr "何时装入图像。可能的值是总是，只从当前服务器，从不"
+msgstr "何时装入图像。可能的值是“总是”，“当前网站”，“从不”。"
 
 #: data/epiphany.schemas.in.h:60
-#, fuzzy
 msgid "Whether to print the date in the footer"
-msgstr "是否在页脚打印日期。"
+msgstr "是否在页脚打印日期"
 
 #: data/epiphany.schemas.in.h:61
 msgid "Whether to print the date in the footer."
@@ -390,23 +383,20 @@ msgid "Whether to print the page address in the header"
 msgstr "是否在页眉打印页面地址"
 
 #: data/epiphany.schemas.in.h:63
-#, fuzzy
 msgid "Whether to print the page address in the header."
-msgstr "是否在页眉打印页面地址"
+msgstr "是否在页眉打印页面地址。"
 
 #: data/epiphany.schemas.in.h:64
-#, fuzzy
 msgid "Whether to print the page numbers (x of total) in the footer"
-msgstr "是否在页脚打印页号(第 x 页共 y 页)。"
+msgstr "是否在页脚打印页号(第 x 页共 y 页)"
 
 #: data/epiphany.schemas.in.h:65
 msgid "Whether to print the page numbers (x of total) in the footer."
 msgstr "是否在页脚打印页号(第 x 页共 y 页)。"
 
 #: data/epiphany.schemas.in.h:66
-#, fuzzy
 msgid "Whether to print the page title in the header"
-msgstr "是否在页眉打印页面标题。"
+msgstr "是否在页眉打印页面标题"
 
 #: data/epiphany.schemas.in.h:67
 msgid "Whether to print the page title in the header."
@@ -477,13 +467,13 @@ msgid "Download _Details"
 msgstr "下载细节(_D)"
 
 #: data/glade/epiphany.glade.h:16 data/ui/nautilus-epiphany-view.xml.in.h:11
-#: src/ephy-window.c:670
+#: src/ephy-window.c:686
 msgid "Find"
 msgstr "查找"
 
 #: data/glade/epiphany.glade.h:17
 msgid "Passwords"
-msgstr "口令"
+msgstr "密码"
 
 #: data/glade/epiphany.glade.h:18
 msgid "Personal Data Manager"
@@ -526,9 +516,8 @@ msgid "<b>Cookies</b>"
 msgstr "<b>Cookies</b>"
 
 #: data/glade/prefs-dialog.glade.h:5
-#, fuzzy
 msgid "<b>Encodings</b>"
-msgstr "<b>字体</b>"
+msgstr "<b>编码</b>"
 
 #: data/glade/prefs-dialog.glade.h:6
 msgid "<b>Fonts</b>"
@@ -539,7 +528,6 @@ msgid "<b>Home page</b>"
 msgstr "<b>主页</b>"
 
 #: data/glade/prefs-dialog.glade.h:8
-#, fuzzy
 msgid "<b>Languages</b>"
 msgstr "<b>语言</b>"
 
@@ -548,9 +536,8 @@ msgid "<b>Tabs</b>"
 msgstr "<b>标签</b>"
 
 #: data/glade/prefs-dialog.glade.h:10
-#, fuzzy
 msgid "<b>Temporary Files</b>"
-msgstr "<b>Cookies</b>"
+msgstr "<b>临时文件</b>"
 
 #: data/glade/prefs-dialog.glade.h:11
 msgid "<b>Web Content</b>"
@@ -569,14 +556,12 @@ msgid "Always use _these fonts"
 msgstr "总是使用这些字体(_T)"
 
 #: data/glade/prefs-dialog.glade.h:15
-#, fuzzy
 msgid "Autodetec_t:"
-msgstr "自动检测编码(_T)："
+msgstr "自动检测(_T)："
 
 #: data/glade/prefs-dialog.glade.h:16
-#, fuzzy
 msgid "Cl_ear"
-msgstr "清除(_L)"
+msgstr "清除(_E)"
 
 #: data/glade/prefs-dialog.glade.h:17
 msgid "Enable Java_Script"
@@ -595,7 +580,6 @@ msgid "General"
 msgstr "常规"
 
 #: data/glade/prefs-dialog.glade.h:21
-#, fuzzy
 msgid "Language"
 msgstr "语言"
 
@@ -629,7 +613,7 @@ msgstr "首选项"
 
 #: data/glade/prefs-dialog.glade.h:29
 msgid "Privacy"
-msgstr ""
+msgstr "隐私"
 
 #: data/glade/prefs-dialog.glade.h:30
 msgid "S_ans serif:"
@@ -669,14 +653,12 @@ msgid "_Always accept"
 msgstr "总是接受(_A)"
 
 #: data/glade/prefs-dialog.glade.h:39
-#, fuzzy
 msgid "_Default:"
-msgstr "左(_L)："
+msgstr "默认(_D)："
 
 #: data/glade/prefs-dialog.glade.h:40
-#, fuzzy
 msgid "_Disk space:"
-msgstr "等宽字体(_M)："
+msgstr "磁盘空间(_D)："
 
 #: data/glade/prefs-dialog.glade.h:41
 msgid "_Language:"
@@ -783,7 +765,7 @@ msgid "Paper"
 msgstr "纸张"
 
 #: data/glade/print.glade.h:26 data/ui/nautilus-epiphany-view.xml.in.h:23
-#: src/ephy-window.c:666
+#: src/ephy-window.c:682
 msgid "Print"
 msgstr "打印"
 
@@ -1014,7 +996,7 @@ msgid "%s at %.1f KB/s"
 msgstr "%s 速度为 %.1f KB/s"
 
 #: embed/downloader-view.c:524 embed/downloader-view.c:542
-#: src/ephy-window.c:870
+#: src/ephy-window.c:886
 msgid "Unknown"
 msgstr "未知"
 
@@ -1043,23 +1025,20 @@ msgid "Cancel all pending downloads?"
 msgstr "取消所有推后的下载吗？"
 
 #: embed/ephy-embed-popup-control.c:554 src/popup-commands.c:325
-#, fuzzy
 msgid "Save Image As"
-msgstr "图像另存为..."
+msgstr "图像另存为"
 
 #: embed/ephy-embed-popup-control.c:668
-#, fuzzy
 msgid "Save Page As"
-msgstr "页面另存为..."
+msgstr "页面另存为"
 
 #: embed/ephy-embed-popup-control.c:677 src/popup-commands.c:413
-#, fuzzy
 msgid "Save Background As"
-msgstr "背景另存为..."
+msgstr "背景另存为"
 
 #: embed/ephy-embed-utils.c:167
 msgid "The file has not been saved."
-msgstr ""
+msgstr "文件尚未保存。"
 
 #: embed/ephy-embed-utils.c:299
 msgid "No available applications to open the specified file."
@@ -1097,7 +1076,7 @@ msgid ""
 msgstr ""
 "无法识别指定协议。\n"
 "\n"
-"您是否想要试试 GNOME 默认的？"
+"您是否想要试试 GNOME 默认值？"
 
 #: embed/mozilla/FilePicker.cpp:356
 msgid "The specified path does not exist."
@@ -1445,33 +1424,28 @@ msgid "_Nordic (ISO-8859-10)"
 msgstr "日耳曼语(ISO-8859-10)(_N)"
 
 #: embed/mozilla/mozilla-embed-single.cpp:176
-#, fuzzy
 msgid "_Romanian (MacRomanian)"
-msgstr "罗马尼亚语(_MacRomanian)"
+msgstr "罗马尼亚语(Mac_Romanian)"
 
 #: embed/mozilla/mozilla-embed-single.cpp:177
 msgid "R_omanian (ISO-8859-16)"
 msgstr "罗马尼亚语(IS_O-8859-16)"
 
 #: embed/mozilla/mozilla-embed-single.cpp:178
-#, fuzzy
 msgid "South _European (ISO-8859-3)"
-msgstr "南欧(_ISO-8859-3)"
+msgstr "南欧(ISO-8859-3)(_E)"
 
 #: embed/mozilla/mozilla-embed-single.cpp:179
-#, fuzzy
 msgid "Thai (TIS-_620)"
-msgstr "泰语(_TIS-620)"
+msgstr "泰语(TIS-_620)"
 
 #: embed/mozilla/mozilla-embed-single.cpp:181
-#, fuzzy
 msgid "Thai (IS_O-8859-11)"
-msgstr "波罗的海语(_ISO-8859-13)"
+msgstr "泰语(IS_O-8859-11)"
 
 #: embed/mozilla/mozilla-embed-single.cpp:182
-#, fuzzy
 msgid "_Thai (Windows-874)"
-msgstr "波罗的海语言(_Windows-1257)"
+msgstr "泰语(Windows-874)(_T)"
 
 #: embed/mozilla/mozilla-embed-single.cpp:184
 msgid "_User Defined"
@@ -1761,7 +1735,6 @@ msgid "View or modify the properties of the selected bookmark"
 msgstr "查看或修改选中书签的属性"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:179
-#, fuzzy
 msgid "_Import Bookmarks..."
 msgstr "导入书签(_I)..."
 
@@ -1903,7 +1876,7 @@ msgstr "复制地址(_C)"
 msgid "_Search:"
 msgstr "搜索(_S)："
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1215 src/ephy-window.c:672
+#: src/bookmarks/ephy-bookmarks-editor.c:1215 src/ephy-window.c:688
 msgid "Bookmarks"
 msgstr "书签"
 
@@ -1915,8 +1888,9 @@ msgstr "话题"
 msgid "Title"
 msgstr "标题"
 
-#: src/bookmarks/ephy-bookmarks-menu.c:268
-#: src/bookmarks/ephy-topic-action.c:208
+#. This is the adjective, not the verb
+#: src/bookmarks/ephy-bookmarks-menu.c:269
+#: src/bookmarks/ephy-topic-action.c:209
 msgid "Empty"
 msgstr "空"
 
@@ -2123,7 +2097,7 @@ msgstr "Epiphany Web 浏览器"
 msgid "Ephy"
 msgstr "Ephy"
 
-#: src/ephy-main.c:201
+#: src/ephy-main.c:203
 msgid ""
 "Epiphany can't be used now. Running the command \"bonobo-slay\" from the "
 "console may fix the problem. If not, you can try rebooting the computer or "
@@ -2141,6 +2115,8 @@ msgid ""
 "Epiphany can't be used now. Mozilla initialization failed. Check your "
 "MOZILLA_FIVE_HOME environmental variable."
 msgstr ""
+"现在无法使用 Epiphany。Mozilla 初始化失败。请检查您的 MOZILLA_FIVE_HOME 环境"
+"变量。"
 
 #: src/ephy-tab.c:314 src/ephy-tab.c:1004 src/ephy-tab.c:1187
 msgid "Blank page"
@@ -2192,7 +2168,6 @@ msgid "_New Window"
 msgstr "新建窗口(_N)"
 
 #: src/ephy-window.c:75
-#, fuzzy
 msgid "Open a new window"
 msgstr "在新建窗口中打开"
 
@@ -2201,9 +2176,8 @@ msgid "New _Tab"
 msgstr "新建标签(_T)"
 
 #: src/ephy-window.c:78
-#, fuzzy
 msgid "Open a new tab"
-msgstr "创建新标签"
+msgstr "打开新标签"
 
 #: src/ephy-window.c:80
 msgid "_Open..."
@@ -2247,25 +2221,23 @@ msgstr "选中整个页面"
 
 #: src/ephy-window.c:110
 msgid "Find a word or phrase in the page"
-msgstr ""
+msgstr "在页面中查找单词或短语"
 
 #: src/ephy-window.c:112
 msgid "Find Ne_xt"
 msgstr "查找下一个(_X)"
 
 #: src/ephy-window.c:113
-#, fuzzy
 msgid "Find next occurrence of the word or phrase"
-msgstr "查找字符串的下次出现"
+msgstr "查找单词或短语的下次出现"
 
 #: src/ephy-window.c:115
 msgid "Find Pre_vious"
 msgstr "查找上一个(_V)"
 
 #: src/ephy-window.c:116
-#, fuzzy
 msgid "Find previous occurrence of the word or phrase"
-msgstr "查找字符串的上次出现"
+msgstr "查找单词或短语的上次出现"
 
 #: src/ephy-window.c:118
 msgid "P_ersonal Data"
@@ -2346,7 +2318,7 @@ msgstr "放大(_I)"
 
 #: src/ephy-window.c:148
 msgid "Increase the text size"
-msgstr ""
+msgstr "增加文字大小"
 
 #: src/ephy-window.c:150
 msgid "Zoom _Out"
@@ -2354,7 +2326,7 @@ msgstr "缩小(_O)"
 
 #: src/ephy-window.c:151
 msgid "Decrease the text size"
-msgstr ""
+msgstr "减少文字大小"
 
 #: src/ephy-window.c:153
 msgid "_Normal Size"
@@ -2362,7 +2334,7 @@ msgstr "普通大小(_N)"
 
 #: src/ephy-window.c:154
 msgid "Use the normal text size"
-msgstr ""
+msgstr "使用普通文字大小"
 
 #: src/ephy-window.c:156
 msgid "_Encoding"
@@ -2378,9 +2350,8 @@ msgstr "查看页面的源代码"
 
 #. Bookmarks menu
 #: src/ephy-window.c:162
-#, fuzzy
 msgid "_Add Bookmark..."
-msgstr "添加书签(_A)"
+msgstr "添加书签(_A)..."
 
 #: src/ephy-window.c:163 src/ephy-window.c:224
 msgid "Add a bookmark for the current page"
@@ -2391,9 +2362,8 @@ msgid "_Edit Bookmarks"
 msgstr "编辑书签(_E)"
 
 #: src/ephy-window.c:166
-#, fuzzy
 msgid "Open the bookmarks window"
-msgstr "关闭书签窗口"
+msgstr "打开书签窗口"
 
 #. Go menu
 #: src/ephy-window.c:170
@@ -2441,9 +2411,8 @@ msgid "H_istory"
 msgstr "历史(_I)"
 
 #: src/ephy-window.c:186
-#, fuzzy
 msgid "Open the history window"
-msgstr "关闭历史窗口"
+msgstr "打开历史窗口"
 
 #. Tabs menu
 #: src/ephy-window.c:190
@@ -2496,9 +2465,8 @@ msgid "_Save Background As..."
 msgstr "背景另存为(_S)..."
 
 #: src/ephy-window.c:223
-#, fuzzy
 msgid "Add Boo_kmark..."
-msgstr "添加书签(_K)"
+msgstr "添加书签(_K)..."
 
 #. Framed document
 #: src/ephy-window.c:228
@@ -2527,9 +2495,8 @@ msgid "Open Link in New _Tab"
 msgstr "在新标签中打开链接(_T)"
 
 #: src/ephy-window.c:242
-#, fuzzy
 msgid "_Download Link..."
-msgstr "下载链接(_D)"
+msgstr "下载链接(_D)..."
 
 #: src/ephy-window.c:244
 msgid "_Bookmark Link..."
@@ -2564,43 +2531,43 @@ msgstr "使用图像作为背景(_U)"
 msgid "Copy I_mage Address"
 msgstr "复制图像地址(_M)"
 
-#: src/ephy-window.c:561
+#: src/ephy-window.c:577
 msgid "Exit Fullscreen"
 msgstr "退出全屏"
 
-#: src/ephy-window.c:662 src/window-commands.c:324
+#: src/ephy-window.c:678 src/window-commands.c:324
 msgid "Open"
 msgstr "打开"
 
-#: src/ephy-window.c:664 src/window-commands.c:365
+#: src/ephy-window.c:680 src/window-commands.c:365
 msgid "Save As"
 msgstr "另存为"
 
-#: src/ephy-window.c:668
+#: src/ephy-window.c:684
 msgid "Bookmark"
 msgstr "书签"
 
-#: src/ephy-window.c:873
+#: src/ephy-window.c:889
 msgid "Insecure"
 msgstr "不安全"
 
-#: src/ephy-window.c:876
+#: src/ephy-window.c:892
 msgid "Broken"
 msgstr "破碎"
 
-#: src/ephy-window.c:879
+#: src/ephy-window.c:895
 msgid "Medium"
 msgstr "中"
 
-#: src/ephy-window.c:883
+#: src/ephy-window.c:899
 msgid "Low"
 msgstr "低"
 
-#: src/ephy-window.c:887
+#: src/ephy-window.c:903
 msgid "High"
 msgstr "高"
 
-#: src/ephy-window.c:897
+#: src/ephy-window.c:913
 #, c-format
 msgid ""
 "Security level: %s\n"
@@ -2609,7 +2576,7 @@ msgstr ""
 "安全级别：%s\n"
 "%s"
 
-#: src/ephy-window.c:903
+#: src/ephy-window.c:919
 #, c-format
 msgid "Security level: %s"
 msgstr "安全级别：%s"
@@ -2651,7 +2618,6 @@ msgid "Expire:"
 msgstr "过期："
 
 #: src/popup-commands.c:315
-#, fuzzy
 msgid "Download link"
 msgstr "下载链接"
 
@@ -2815,9 +2781,8 @@ msgid "Norwegian/Nynorsk"
 msgstr "挪威语/尼诺斯克语"
 
 #: src/prefs-dialog.c:127
-#, fuzzy
 msgid "Norwegian/Bokmal"
-msgstr "挪威语/Bokmaal"
+msgstr "挪威语/Bokmal"
 
 #: src/prefs-dialog.c:128
 msgid "Norwegian"
@@ -2896,24 +2861,24 @@ msgstr "全球"
 msgid "Custom [%s]"
 msgstr "自定义 [%s]"
 
-#: src/session.c:194
+#: src/session.c:195
 msgid "Crash Recovery"
 msgstr "崩溃复原"
 
-#: src/session.c:196
+#: src/session.c:197
 msgid "_Don't Recover"
 msgstr "不复原(_R)"
 
-#: src/session.c:197
+#: src/session.c:198
 msgid "_Recover"
 msgstr "复原(_R)"
 
-#: src/session.c:226
+#: src/session.c:227
 msgid ""
 "Epiphany appears to have crashed or been killed the last time it was run."
 msgstr "Epiphany 好像上次崩溃，或者上次运行时被杀死。"
 
-#: src/session.c:232
+#: src/session.c:233
 msgid "You can recover the opened tabs and windows."
 msgstr "您可以复原打开的标签和窗口。"
 
@@ -2923,14 +2888,13 @@ msgstr "后退"
 
 #: src/toolbar.c:270
 msgid "Go back"
-msgstr ""
+msgstr "后退"
 
 #: src/toolbar.c:281
 msgid "Forward"
 msgstr "前进"
 
 #: src/toolbar.c:283
-#, fuzzy
 msgid "Go forward"
 msgstr "前进"
 
@@ -2940,7 +2904,7 @@ msgstr "向上"
 
 #: src/toolbar.c:296
 msgid "Go up"
-msgstr ""
+msgstr "向上"
 
 #: src/toolbar.c:307
 msgid "Spinner"
@@ -2948,11 +2912,11 @@ msgstr "微调器"
 
 #: src/toolbar.c:317
 msgid "Address Entry"
-msgstr "地址项"
+msgstr "地址输入项"
 
 #: src/toolbar.c:319
 msgid "Enter a web address to open, or a phrase to search for on the web"
-msgstr ""
+msgstr "输入要打开的网址，或者要在网上搜索的短语"
 
 #: src/toolbar.c:328
 msgid "Zoom"
@@ -2960,7 +2924,7 @@ msgstr "缩放"
 
 #: src/toolbar.c:329
 msgid "Adjust the text size"
-msgstr ""
+msgstr "调整文本大小"
 
 #: src/toolbar.c:339
 msgid "Favicon"
@@ -2968,7 +2932,7 @@ msgstr "收藏图标"
 
 #: src/toolbar.c:349
 msgid "Go to the address entered in the address entry"
-msgstr ""
+msgstr "转到在地址输入项中输入的地址"
 
 #: src/window-commands.c:126
 msgid "Check this out!"
@@ -2994,68 +2958,3 @@ msgstr "Gnome 中文翻译组 <i18n-translation@lists.linux.net.cn>"
 #: src/window-commands.c:775
 msgid "A GNOME browser based on Mozilla"
 msgstr "基于 Mozilla 的 GNOME 浏览器"
-
-#~ msgid "When to compare cached copy"
-#~ msgstr "何时比较缓存副本"
-
-#~ msgid ""
-#~ "When to compare cached copy to web copy. Possible values are once per "
-#~ "session, every time, never, automatic."
-#~ msgstr "何时比较缓存副本与 Web 副本。可能的值是每次会话、每次、从不、自动。"
-
-#~ msgid "<b>Caches</b>"
-#~ msgstr "<b>缓存</b>"
-
-#~ msgid "Advanced"
-#~ msgstr "高级"
-
-#~ msgid "Cl_ear Cache"
-#~ msgstr "清除缓存(_E)"
-
-#~ msgid "Compare page:"
-#~ msgstr "比较页面："
-
-#~ msgid "E_very time"
-#~ msgstr "每次(_V)"
-
-#~ msgid "Once per _session"
-#~ msgstr "每会话一次(_S)"
-
-#~ msgid "Security"
-#~ msgstr "安全"
-
-#~ msgid "_Automatically"
-#~ msgstr "自动(_A)"
-
-#~ msgid "_Default encoding:"
-#~ msgstr "默认编码(_D)："
-
-#~ msgid "_Language encoding:"
-#~ msgstr "语言编码(_L)："
-
-#~ msgid "_Never"
-#~ msgstr "从不(_N)"
-
-#~ msgid "Create a new window"
-#~ msgstr "创建新窗口"
-
-#~ msgid "Find a string"
-#~ msgstr "查找字符串"
-
-#~ msgid "Show the contents in more detail"
-#~ msgstr "以更多的细节显示内容"
-
-#~ msgid "Show the contents in less detail"
-#~ msgstr "以更少的细节显示内容"
-
-#~ msgid "Show the contents at the normal size"
-#~ msgstr "以正常大小显示窗口内容"
-
-#~ msgid "Go to a bookmark"
-#~ msgstr "转到书签"
-
-#~ msgid "Go to an already visited page"
-#~ msgstr "转到已经浏览过的页面"
-
-#~ msgid "Select the file to open"
-#~ msgstr "选择要打开的文件"