aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFunda Wang <fwang@src.gnome.org>2004-05-23 04:56:54 +0800
committerFunda Wang <fwang@src.gnome.org>2004-05-23 04:56:54 +0800
commit124daefe8208682b62efc8c82076ba1f2db75d25 (patch)
treea4473dfb2b7dd33542d11f147e78a4d00f94851b
parentf3f19a97d77a28380183dab7eb0d842887289be4 (diff)
downloadgsoc2013-evolution-124daefe8208682b62efc8c82076ba1f2db75d25.tar.gz
gsoc2013-evolution-124daefe8208682b62efc8c82076ba1f2db75d25.tar.zst
gsoc2013-evolution-124daefe8208682b62efc8c82076ba1f2db75d25.zip
Updated Simplified Chinese translation
svn path=/trunk/; revision=26051
-rw-r--r--po/ChangeLog4
-rw-r--r--po/zh_CN.po1913
2 files changed, 889 insertions, 1028 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index f7959dd856..ac15aa63a8 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-23 Funda Wang <fundawang@linux.net.cn>
+
+ * zh_CN.po: Updated Simplified Chinese translation.
+
2004-05-22 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
* es.po: Updated Spanish translation
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ad75736263..0693034dcf 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,14 +8,14 @@
msgid ""
msgstr ""
"Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
-"PO-Revision-Date: 2004-05-01 16:00+0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-05-22 19:19+0200\n"
+"PO-Revision-Date: 2004-05-23 04:53+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"
"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"
#: a11y/addressbook/ea-addressbook-view.c:94
@@ -56,13 +56,13 @@ msgstr " 张卡片"
msgid "Default Sync Address:"
msgstr "默认的同步地址:"
-#: addressbook/conduit/address-conduit.c:1150
#: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
msgid "Could not load addressbook"
msgstr "无法装入地址簿"
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
msgid "Could not read pilot's Address application block"
msgstr "无法读入 Pilot 的地址应用程序块"
@@ -117,7 +117,7 @@ msgstr "联系人组(_C):"
msgid "Create a new contacts group"
msgstr "创建新联系人组"
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
msgid "Failed upgrading Addressbook settings or folders."
msgstr ""
@@ -150,47 +150,51 @@ msgid "Server did not respond with valid schema information"
msgstr "服务器没有响应有效的 schema 信息"
#: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
msgid "Migrating..."
msgstr "正在升迁..."
#: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
#, c-format
msgid "Migrating `%s':"
msgstr "升迁“%s”:"
#. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#. On This Computer is always first and VFolders is always last
+#: addressbook/gui/component/addressbook-migrate.c:508
#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:245 mail/mail-vfolder.c:218
+#: mail/mail-component.c:247 mail/mail-vfolder.c:218
msgid "On This Computer"
msgstr "在此计算机中"
#. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#. Create the default Person calendar
+#. Create the default Person task list
+#. orange
+#: addressbook/gui/component/addressbook-migrate.c:516
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
msgid "Personal"
msgstr "个人"
#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:524
msgid "On LDAP Servers"
msgstr "在 LDAP 服务器上"
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:652
msgid "LDAP Servers"
msgstr "LDAP 服务器"
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:772
msgid "Autocompletion Settings"
msgstr "自动完成设置"
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1148
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -201,7 +205,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1162
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -211,7 +215,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1171
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -221,7 +225,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1181
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -231,15 +235,20 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的 Pilot 同步数据..."
+#: addressbook/gui/component/addressbook-migrate.c:1194
+msgid ""
+"Some fields are no longer representable in the contact editor. Please wait "
+"while Evolution copies those fields to the 'Notes' field..."
+msgstr ""
+
#: addressbook/gui/component/addressbook-view.c:674
-#, fuzzy, c-format
+#, c-format
msgid "Address book '%s' will be removed. Are you sure you want to continue?"
msgstr "即将删除日历“%s”。您确定想要继续吗?"
#: addressbook/gui/component/addressbook-view.c:761
-#, fuzzy
msgid "New Address Book"
-msgstr "地址簿"
+msgstr "新地址簿"
#: addressbook/gui/component/addressbook-view.c:762
#: addressbook/gui/widgets/e-addressbook-view.c:1086
@@ -261,6 +270,7 @@ msgstr "属性..."
#. can not get name, should be a bug of e-book.Anyway, should set a default name.
#.
#. name = e_book_get_name (book);
+#. Create the contacts group
#: addressbook/gui/component/addressbook-view.c:1002
#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
@@ -295,9 +305,8 @@ msgid "Autocompletion"
msgstr "自动完成"
#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
msgid "C_ontacts"
-msgstr "联系人"
+msgstr "联系人(_O)"
#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
msgid "Certificates"
@@ -336,9 +345,8 @@ msgid "Evolution folder settings configuration control"
msgstr "Evolution 文件夹配置控件"
#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-#, fuzzy
msgid "Manage your S/MIME certificates here"
-msgstr "在此管理您的 S/Mime 证书"
+msgstr "在此管理您的 S/MIME 证书"
#: addressbook/gui/component/ldap-config.glade.h:1
msgid " S_how Supported Bases "
@@ -359,7 +367,7 @@ msgstr " 显示支持的基础(_H) "
#: calendar/gui/dialogs/new-task-list.glade.h:1
#: calendar/gui/dialogs/task-page.glade.h:1
#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
@@ -427,7 +435,7 @@ msgid "Address Book Properties"
msgstr "地址簿属性"
#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
msgid "Always"
msgstr "总是"
@@ -486,12 +494,12 @@ msgstr "查找可能的搜索基础"
#: addressbook/gui/component/ldap-config.glade.h:31
#: calendar/gui/dialogs/calendar-setup.glade.h:6
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
msgid "General"
msgstr "常规"
#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
msgid "Never"
msgstr "从不"
@@ -657,7 +665,7 @@ msgid "Using email address"
msgstr "使用电子邮件地址"
#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:156
msgid "Whenever Possible"
msgstr "可能时"
@@ -683,7 +691,7 @@ msgid "_Log in method:"
msgstr "登录方式(_L):"
#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:171
msgid "_Name:"
msgstr "名称(_N):"
@@ -730,7 +738,7 @@ msgstr "常规页"
#: addressbook/gui/component/ldap-config.glade.h:89
#: calendar/gui/dialogs/alarm-options.glade.h:14
#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:183
msgid "minutes"
msgstr "分钟"
@@ -848,7 +856,7 @@ msgid "<b>Work</b>"
msgstr "<b>工作</b>"
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
#: addressbook/gui/widgets/eab-contact-display.c:342
#: addressbook/gui/widgets/eab-contact-display.c:361
msgid "AIM"
@@ -884,7 +892,7 @@ msgid "Company:"
msgstr "公司:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: addressbook/gui/widgets/e-minicard.c:181
@@ -892,7 +900,7 @@ msgid "Contact"
msgstr "联系人"
#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:519
msgid "Contact Editor"
msgstr "联系人编辑器"
@@ -913,74 +921,72 @@ msgid "Full _Name..."
msgstr "全名(_N)..."
#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
msgid "Home"
msgstr "家庭"
#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#, fuzzy
msgid "Home Page:"
-msgstr "主页"
+msgstr "主页:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "Job title:"
-msgstr "职称:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:930
msgid "Location:"
msgstr "位置:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
msgid "MSN Messenger"
msgstr "MSN Messenger"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
msgid "Mailing Address"
msgstr "邮政地址"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
msgid "Manager:"
msgstr "经理:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
msgid "Ni_ckname:"
msgstr "昵称(_C):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
msgid "Notes:"
msgstr "注释:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
msgid "Novell Groupwise"
msgstr "Novell Groupwise"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
msgid "Other"
msgstr "其它"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-#, fuzzy
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "PO Box:"
-msgstr "邮政邮箱(_P):"
+msgstr "邮政邮箱:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
msgid "Personal Information"
msgstr "个人信息"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
msgid "Profession:"
msgstr "职业:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
msgid "State/Province:"
msgstr "州/省:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Title:"
+msgstr "头衔:"
+
#: addressbook/gui/contact-editor/contact-editor.glade.h:41
msgid "Wants to receive HTML mail"
msgstr "愿意接收 HTML 邮件"
@@ -991,10 +997,10 @@ msgstr "摄像头:"
#. red
#: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:194
#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
msgid "Work"
msgstr "工作"
@@ -1022,13 +1028,13 @@ msgstr "项目 7"
msgid "item8"
msgstr "项目 8"
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
msgid ""
"Are you sure you want\n"
"to delete these contacts?"
msgstr "您确定要删除这些联系人吗?"
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
msgid ""
"Are you sure you want\n"
"to delete this contact?"
@@ -1041,7 +1047,7 @@ msgid "Address"
msgstr "地址"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
@@ -2022,85 +2028,97 @@ msgstr "赞比亚"
msgid "Zimbabwe"
msgstr "津巴布韦"
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
#: addressbook/gui/widgets/eab-contact-display.c:345
#: addressbook/gui/widgets/eab-contact-display.c:364
msgid "Jabber"
msgstr "Jabber"
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
#: addressbook/gui/widgets/eab-contact-display.c:347
#: addressbook/gui/widgets/eab-contact-display.c:366
msgid "Yahoo"
msgstr "雅虎"
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
#: addressbook/gui/widgets/eab-contact-display.c:346
#: addressbook/gui/widgets/eab-contact-display.c:365
msgid "MSN"
msgstr "MSN"
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
#: addressbook/gui/widgets/eab-contact-display.c:344
#: addressbook/gui/widgets/eab-contact-display.c:363
msgid "ICQ"
msgstr "ICQ"
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
msgid "GroupWise"
msgstr "GroupWise"
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
msgid "Source Book"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
msgid "Target Book"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
msgid "Is New Contact"
msgstr "为新联系人"
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
msgid "Writable Fields"
msgstr "可写域"
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
msgid "Changed"
msgstr "已更改"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:2294
msgid "Category editor not available."
msgstr "类别编辑器不可用。"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2302
msgid "This contact belongs to these categories:"
msgstr "此联系人属于这些类别:"
#. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:2379
msgid "Please select an image for this contact"
-msgstr "请从以下选项中选择"
+msgstr "请选择此联系人的图像"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:2383
msgid "No image"
-msgstr "尼日尔"
+msgstr "无图像"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2560
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2607
msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
"\n"
+msgstr "联系人数据无效:\n\n"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2700
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "无法为域找到构件:“%s”"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2704
+#: addressbook/gui/contact-editor/e-contact-editor.c:2728
+#: addressbook/gui/widgets/eab-gui-util.c:208
+msgid "_Discard"
+msgstr "丢弃(_D)"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
msgid "AOL Instant Messenger"
@@ -2133,7 +2151,7 @@ msgid "_Edit Full"
msgstr "编辑全名(_E)"
#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
msgid "_Full Name:"
msgstr "全名(_F):"
@@ -2450,7 +2468,7 @@ msgstr "后台忙"
#. E_BOOK_ERROR_REPOSITORY_OFFLINE
#: addressbook/gui/widgets/eab-gui-util.c:53
msgid "Repository offline"
-msgstr "仓库离线"
+msgstr "仓库脱机"
#. E_BOOK_ERROR_NO_SUCH_BOOK
#: addressbook/gui/widgets/eab-gui-util.c:54
@@ -2601,10 +2619,6 @@ msgstr "此查询未成功完成。"
msgid "Do you want to save changes?"
msgstr "您希望保存修改吗?"
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "丢弃(_D)"
-
#: addressbook/gui/widgets/eab-gui-util.c:229
msgid "Error adding list"
msgstr "添加列表出错"
@@ -2821,7 +2835,7 @@ msgstr "高级..."
#: addressbook/gui/widgets/e-addressbook-view.c:236
#: calendar/gui/dialogs/meeting-page.etspec.h:11
#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:250
#: calendar/gui/e-meeting-time-sel.etspec.h:11
msgid "Type"
msgstr "类型"
@@ -2832,11 +2846,10 @@ msgstr "地址簿"
#: addressbook/gui/widgets/e-addressbook-view.c:850
#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
#: ui/evolution-addressbook.xml.h:19
-#, fuzzy
msgid "Save as VCard..."
-msgstr "保存为 VCard"
+msgstr "另存为 VCard..."
#: addressbook/gui/widgets/e-addressbook-view.c:1057
msgid "New Contact..."
@@ -3034,7 +3047,7 @@ msgstr "收音机"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:257
#: calendar/gui/e-meeting-time-sel.etspec.h:9
msgid "Role"
msgstr "角色"
@@ -3142,17 +3155,17 @@ msgstr "卡片视图"
msgid "GTK Tree View"
msgstr "GTK 树视图"
-#: addressbook/gui/widgets/test-reflow.c:106
+#: addressbook/gui/widgets/test-reflow.c:119
msgid "Reflow Test"
msgstr ""
-#: addressbook/gui/widgets/test-reflow.c:107
+#: addressbook/gui/widgets/test-reflow.c:120
#: addressbook/printing/test-contact-print-style-editor.c:54
#: addressbook/printing/test-print.c:53
msgid "Copyright (C) 2000, Ximian, Inc."
msgstr "版权 (C) 2000, Ximian, Inc."
-#: addressbook/gui/widgets/test-reflow.c:109
+#: addressbook/gui/widgets/test-reflow.c:122
msgid "This should test the reflow canvas item"
msgstr ""
@@ -3176,12 +3189,12 @@ msgstr "Evolution vCard 导入器"
msgid "VCard (.vcf, .gcrd)"
msgstr "VCard (.vfg, .gcrd)"
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
msgid "Print contacts"
msgstr "打印联系人"
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
msgid "Print contact"
msgstr "打印联系人"
@@ -3763,6 +3776,10 @@ msgstr "%Y年%m月%d日%A"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
#: calendar/gui/e-week-view-main-item.c:329
@@ -3800,9 +3817,8 @@ msgid "New Calendar"
msgstr "新建日历"
#: calendar/gui/calendar-component.c:623
-#, fuzzy
msgid "Failed upgrading calendars."
-msgstr "正在装入日历..."
+msgstr "升级日历失败。"
#: calendar/gui/calendar-component.c:917
#, c-format
@@ -3911,9 +3927,8 @@ msgid "Comment contains"
msgstr "注释含有"
#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
msgid "Location contains"
-msgstr "描述含有"
+msgstr "位置含有"
#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
msgid "Unmatched"
@@ -3934,7 +3949,7 @@ msgstr "没有权限打开日历"
#: calendar/gui/comp-editor-factory.c:474
#, c-format
msgid "open_client(): %s"
-msgstr ""
+msgstr "open_client(): %s"
#: calendar/gui/dialogs/alarm-options.c:466
msgid "Audio Alarm Options"
@@ -4026,10 +4041,9 @@ msgstr "播放声音"
#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
msgid "Pop up an alert"
-msgstr ""
+msgstr "弹出警告"
#: calendar/gui/dialogs/alarm-page.glade.h:6
-#, fuzzy
msgid "Reminders"
msgstr "提醒"
@@ -4044,7 +4058,7 @@ msgstr "发送电子邮件"
#: calendar/gui/dialogs/alarm-page.glade.h:9
#: calendar/gui/dialogs/recurrence-page.glade.h:8
#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "概要:"
@@ -4083,14 +4097,13 @@ msgid "start of appointment"
msgstr "约会开始"
#: calendar/gui/dialogs/calendar-setup.c:170
-#, fuzzy
msgid "You must specify a location to get the calendar from."
-msgstr "您必须指定文件名。"
+msgstr "您必须获取日历的位置。"
#: calendar/gui/dialogs/calendar-setup.c:178
-#, fuzzy, c-format
+#, c-format
msgid "The source location '%s' is not well-formed."
-msgstr "不支持装入“%s”必需的方法"
+msgstr "源位置“%s”不是规格的。"
#: calendar/gui/dialogs/calendar-setup.c:193
#, c-format
@@ -4125,7 +4138,7 @@ msgstr "颜色(_O):"
msgid "Calendar Properties"
msgstr "日历属性"
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:110
msgid "Pick a color"
msgstr "选取一种颜色"
@@ -4267,7 +4280,7 @@ msgid "Display"
msgstr "显示"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
msgid "E_nable"
msgstr "启用(_N)"
@@ -4277,7 +4290,7 @@ msgstr "忙/闲发布"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
#: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:557
msgid "Friday"
msgstr "星期五"
@@ -4291,7 +4304,7 @@ msgstr "分钟"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:553
msgid "Monday"
msgstr "星期一"
@@ -4301,7 +4314,7 @@ msgstr "周日(_U)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:558
msgid "Saturday"
msgstr "星期六"
@@ -4315,7 +4328,7 @@ msgstr "在日期浏览器中显示周数(_N)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:552
msgid "Sunday"
msgstr "星期日"
@@ -4329,7 +4342,7 @@ msgstr "周四(_H)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:556
msgid "Thursday"
msgstr "星期四"
@@ -4343,7 +4356,7 @@ msgstr "时间格式:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:554
msgid "Tuesday"
msgstr "星期二"
@@ -4353,7 +4366,7 @@ msgstr "一周开始(_E):"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:555
msgid "Wednesday"
msgstr "星期三"
@@ -4386,7 +4399,7 @@ msgid "_Day begins:"
msgstr "一天开始(_D):"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
#: ui/evolution-message-composer.xml.h:43
@@ -4815,12 +4828,17 @@ msgid "_Start time:"
msgstr "开始时间(_S):"
#. an empty string is the same as 'None'
+#. add a "None" option to the stores menu
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
#: calendar/gui/dialogs/meeting-page.c:311
#: calendar/gui/dialogs/meeting-page.glade.h:3
#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:103
#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4847,7 +4865,7 @@ msgstr "授权于(_D)..."
#: calendar/gui/dialogs/meeting-page.c:655
#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: mail/em-folder-tree.c:2562 mail/em-folder-view.c:919
#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4855,7 +4873,7 @@ msgid "_Delete"
msgstr "删除(_D)"
#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:241
#: calendar/gui/e-meeting-time-sel.etspec.h:1
msgid "Attendee"
msgstr "出席者"
@@ -4891,14 +4909,14 @@ msgid "Member"
msgstr "成员"
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:264
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
#: calendar/gui/dialogs/meeting-page.etspec.h:10
#: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
+#: calendar/gui/e-meeting-list-view.c:271
#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
#: mail/message-list.etspec.h:12
msgid "Status"
@@ -5119,19 +5137,16 @@ msgid "Save Event"
msgstr "保存事件"
#: calendar/gui/dialogs/select-source-dialog.c:65
-#, fuzzy
msgid "Select destination"
-msgstr "投递目的"
+msgstr "选择目的"
#: calendar/gui/dialogs/select-source-dialog.c:86
-#, fuzzy
msgid "_Destination"
-msgstr "草稿文件夹(_F):"
+msgstr "目的(_D)"
#: calendar/gui/dialogs/select-source-dialog.c:88
-#, fuzzy
msgid "Task List"
-msgstr "新建任务列表"
+msgstr "任务列表"
#: calendar/gui/dialogs/send-comp.c:57
msgid "The meeting information has been created. Send it?"
@@ -5168,7 +5183,7 @@ msgstr "已完成"
#: calendar/gui/dialogs/task-details-page.glade.h:5
#: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
msgid "High"
msgstr "高"
@@ -5182,14 +5197,14 @@ msgstr "正在进行中"
#: calendar/gui/dialogs/task-details-page.glade.h:7
#: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
msgid "Low"
msgstr "低"
#: calendar/gui/dialogs/task-details-page.glade.h:8
#: calendar/gui/e-cal-component-preview.c:251
#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
msgid "Normal"
msgstr "中"
@@ -5246,8 +5261,8 @@ msgstr "机密(_F)"
#: calendar/gui/dialogs/task-page.glade.h:6
#: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
msgid "Description:"
msgstr "描述:"
@@ -5396,30 +5411,26 @@ msgstr "无标题"
#: calendar/gui/e-cal-component-preview.c:194
#: calendar/gui/e-cal-component-preview.c:205
-#, fuzzy
msgid "Start Date:"
-msgstr "开始日期"
+msgstr "开始日期:"
#: calendar/gui/e-cal-component-preview.c:216
-#, fuzzy
msgid "Due Date:"
-msgstr "到期日期(_D):"
+msgstr "到期日期:"
#. write status
#: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:944
msgid "Status:"
msgstr "状态:"
#: calendar/gui/e-cal-component-preview.c:247
-#, fuzzy
msgid "Priority:"
-msgstr "优先级(_P):"
+msgstr "优先级:"
#: calendar/gui/e-cal-component-preview.c:300
-#, fuzzy
msgid "Web Page:"
-msgstr "网页(_W):"
+msgstr "网页:"
#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
@@ -5532,8 +5543,8 @@ msgstr "剪切(_U)"
#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2555
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
msgid "_Copy"
@@ -5681,9 +5692,9 @@ msgstr "开始日期"
#. This is the default filename used for temporary file creation
#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-meeting-list-view.c:145
+#: calendar/gui/e-meeting-list-view.c:159 calendar/gui/e-meeting-store.c:115
#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
#: camel/camel-tcp-stream-openssl.c:631
@@ -5709,13 +5720,13 @@ msgid "Assigned"
msgstr "已委派"
#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:159
#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
msgid "Yes"
msgstr "是"
#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:170 calendar/gui/e-meeting-store.c:171
msgid "No"
msgstr "否"
@@ -5746,12 +5757,20 @@ msgstr ""
"45.436845,125.862501"
#. strftime format of a weekday, a date and a time, 24-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
#: e-util/e-time-utils.c:393
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%Y年%m月%d日%A%H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
#: e-util/e-time-utils.c:402
msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5782,6 +5801,10 @@ msgstr "下午"
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
+#. strftime format %A = full weekday name, %d = day of
+#. month, %B = full month name. You can change the
+#. order but don't change the specifiers or add
+#. anything.
#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
msgid "%A %d %B"
@@ -5789,6 +5812,9 @@ msgstr "%B%d日%A"
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
#: calendar/gui/e-week-view-main-item.c:343
msgid "%d %b"
@@ -5799,396 +5825,396 @@ msgstr "%B%d日"
msgid "%02i minute divisions"
msgstr "%02i 分钟分割"
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:586
msgid "Yes. (Complex Recurrence)"
msgstr "是(复杂重现)"
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:597
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
msgstr[0] "每 %d 天"
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:602
#, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
msgstr[0] "每 %d 周"
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:604
#, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
msgstr[0] "每 %d 周的"
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:612
msgid " and "
msgstr " 和 "
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:619
#, c-format
msgid "The %s day of "
msgstr "第 %s 天属于"
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:632
#, c-format
msgid "The %s %s of "
msgstr "%s %s 属于"
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:639
#, c-format
msgid "every month"
msgid_plural "every %d months"
msgstr[0] "每 %d 月"
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:643
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
msgstr[0] "每 %d 年"
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:654
#, c-format
msgid "a total of %d time"
msgid_plural " a total of %d times"
msgstr[0] " 总计 %d 次"
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:663
msgid ", ending on "
msgstr ",结束于 "
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:687
msgid "<b>Starts:</b> "
msgstr "<b>开始:</b>"
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:697
msgid "<b>Ends:</b> "
msgstr "<b>结束:</b>"
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:717
msgid "<b>Completed:</b> "
msgstr "<b>已完成:</b> "
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:727
msgid "<b>Due:</b> "
msgstr "<b>到期:</b>"
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
msgid "iCalendar Information"
msgstr "iCalendar 信息"
#. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:782
msgid "iCalendar Error"
msgstr "iCalendar 错误"
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
msgid "An unknown person"
msgstr "未知的人"
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:904
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作。"
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:919
msgid "<i>None</i>"
msgstr "<i>无</i>"
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
#: calendar/gui/itip-utils.c:422
msgid "Accepted"
msgstr "接受"
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
msgid "Tentatively Accepted"
msgstr "暂时接受"
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:182
#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
msgid "Declined"
msgstr "拒绝"
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
msgid "Choose an action:"
msgstr "选择一项活动:"
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1017
msgid "Update"
msgstr "更新"
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
+#: shell/e-shell.c:1098 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "确定"
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1045
msgid "Accept"
msgstr "接受"
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1046
msgid "Tentatively accept"
msgstr "暂时接受"
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1047
msgid "Decline"
msgstr "拒绝"
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1071
msgid "Send Free/Busy Information"
msgstr "发送忙闲信息"
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1084
msgid "Update respondent status"
msgstr "更新应答者状态"
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1097
msgid "Send Latest Information"
msgstr "发送最新的信息"
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
#: ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1186
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> 发布了会议信息。"
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1187
msgid "Meeting Information"
msgstr "会议信息"
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1192
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr "<b>%s</b> 请求 %s 参加一个会议。"
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1194
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请求您参加一个会议。"
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1195
msgid "Meeting Proposal"
msgstr "会议建议"
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1199
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> 希望加入到已存的会议。"
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1200
msgid "Meeting Update"
msgstr "会议更新"
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1204
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> 想收到最新的会议信息。"
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1205
msgid "Meeting Update Request"
msgstr "会议更新请求"
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1212
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> 已回复一个会议请求。"
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1213
msgid "Meeting Reply"
msgstr "会议答复"
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1220
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1221
msgid "Meeting Cancellation"
msgstr "会议取消"
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> 发送了一个无法理解的信息。"
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1229
msgid "Bad Meeting Message"
msgstr "错误的会议信息"
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1254
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> 发布了任务信息。"
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1255
msgid "Task Information"
msgstr "任务信息"
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1260
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> 请求 %s 完成一个任务。"
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1262
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请求您完成一个任务。"
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1263
msgid "Task Proposal"
msgstr "任务建议"
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1267
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s<b> 希望加入到已存在的任务。"
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1268
msgid "Task Update"
msgstr "任务更新"
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1272
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> 希望获取最新的任务信息。"
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1273
msgid "Task Update Request"
msgstr "任务更新请求"
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1280
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> 已经回复了任务委派。"
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1281
msgid "Task Reply"
msgstr "任务回复"
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1288
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> 取消了任务。"
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1289
msgid "Task Cancellation"
msgstr "任务取消"
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1297
msgid "Bad Task Message"
msgstr "错误的任务邮件"
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1316
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> 发布了忙闲信息。"
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1317
msgid "Free/Busy Information"
msgstr "忙闲信息"
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1321
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请求您的忙闲信息。"
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1322
msgid "Free/Busy Request"
msgstr "忙/闲请求"
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1326
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> 应答了忙闲请求。"
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1327
msgid "Free/Busy Reply"
msgstr "忙闲应答"
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1332
msgid "Bad Free/Busy Message"
msgstr "错误的忙闲信息"
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1407
msgid "The message does not appear to be properly formed"
msgstr "邮件的格式可能不正确"
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1466
msgid "The message contains only unsupported requests."
msgstr "邮件只含有不支持的请求。"
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1497
msgid "The attachment does not contain a valid calendar message"
msgstr "附件中没有有效的日历信息"
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1529
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日历项目"
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1763
msgid "Update complete\n"
msgstr "更新完成\n"
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1865
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新参与者状态"
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1809 calendar/gui/e-itip-control.c:1847
msgid "Object is invalid and cannot be updated\n"
msgstr "对象无效,无法更新\n"
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1819
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "此响应并非来自当前参与者。将响应者加为参与者吗?"
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1831
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新参与者状态!\n"
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1850
msgid "There was an error on the CORBA system\n"
msgstr "CORBA 系统出错\n"
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1853
msgid "Object could not be found\n"
msgstr "找不到对象\n"
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1856
msgid "You don't have the right permissions to update the calendar\n"
msgstr "您没有适当的权限打开日历\n"
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1859
msgid "Attendee status updated\n"
msgstr "更新参与者状态\n"
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1862
msgid "Attendee status could not be updated!\n"
msgstr "无法更新参与者状态!\n"
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1893
msgid "Removal Complete"
msgstr "删除完成"
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
msgid "Item sent!\n"
msgstr "项目已发送!\n"
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1918 calendar/gui/e-itip-control.c:1968
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
@@ -6234,7 +6260,7 @@ msgid "Chair Persons"
msgstr "主席人员"
#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:480
msgid "Required Participants"
msgstr "必需的参与者"
@@ -6246,57 +6272,57 @@ msgstr "可选的参与者"
msgid "Resources"
msgstr "资源"
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:90
#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
msgid "Individual"
msgstr "个人"
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:92
#: calendar/gui/e-meeting-store.c:109
msgid "Group"
msgstr "组"
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:94
#: calendar/gui/e-meeting-store.c:111
msgid "Resource"
msgstr "资源"
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:144 calendar/gui/e-meeting-store.c:96
#: calendar/gui/e-meeting-store.c:113
msgid "Room"
msgstr "房间"
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:125
#: calendar/gui/e-meeting-store.c:142
msgid "Chair"
msgstr "主席"
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:127
#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
msgid "Required Participant"
msgstr "必需的参与者"
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:129
#: calendar/gui/e-meeting-store.c:146
msgid "Optional Participant"
msgstr "可选的参与者"
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:131
#: calendar/gui/e-meeting-store.c:148
msgid "Non-Participant"
msgstr "不参加"
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:180 calendar/gui/e-meeting-store.c:177
#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
msgid "Needs Action"
msgstr "需要动作"
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:183
#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
msgid "Tentative"
msgstr "暂时的"
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:184 calendar/gui/e-meeting-store.c:185
#: calendar/gui/e-meeting-store.c:208
msgid "Delegated"
msgstr "被委任的"
@@ -6374,6 +6400,10 @@ msgstr "%Y年%m月%d日%A"
#. This is a strftime() format string %a = abbreviated weekday name,
#. %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
#: calendar/gui/e-meeting-time-sel.c:2093
#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6382,13 +6412,17 @@ msgstr "%Y年%m月%d日%A"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#. This is a strftime() format for a short date. %m = month,
+#. %d = day of month, %Y = year (all digits).
#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
msgid "%m/%d/%Y"
msgstr "%Y-%m-%d"
#: calendar/gui/e-pub-utils.c:300
-#, fuzzy, c-format
+#, c-format
msgid "Enter the password for %s"
msgstr "为 %s 输入密码"
@@ -6448,14 +6482,14 @@ msgid "Tasks"
msgstr "任务"
#: calendar/gui/gnome-cal.c:1876
-#, fuzzy, c-format
+#, c-format
msgid "Loading appointments at %s"
-msgstr "约会 - %s"
+msgstr "装入位于 %s 的约会"
#: calendar/gui/gnome-cal.c:1895
-#, fuzzy, c-format
+#, c-format
msgid "Loading tasks at %s"
-msgstr "装入任务"
+msgstr "装入位于 %s 的任务"
#: calendar/gui/gnome-cal.c:1918
#, c-format
@@ -6468,17 +6502,16 @@ msgid "The calendar backend for '%s' has crashed."
msgstr ""
#: calendar/gui/gnome-cal.c:2894
-#, fuzzy
msgid "Purging"
-msgstr "都灵"
+msgstr ""
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
msgid "*Control*F3"
-msgstr ""
+msgstr "*Control*F3"
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
msgid "*Control*F4"
-msgstr ""
+msgstr "*Control*F4"
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
msgid "Calendar and Tasks"
@@ -6513,9 +6546,8 @@ msgid "Evolution's Tasks component"
msgstr "Evolution 任务组件"
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
msgid "_Calendars"
-msgstr "日历"
+msgstr "日历(_C)"
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
#: views/tasks/galview.xml.h:3
@@ -6633,32 +6665,30 @@ msgid "You must be an attendee of the event."
msgstr "您必须是事件的参与者。"
#: calendar/gui/migration.c:146
-#, fuzzy
msgid ""
"The location and hierarchy of the Evolution task folders has changed since "
"Evolution 1.x.\n"
"\n"
"Please be patient while Evolution migrates your folders..."
msgstr ""
-"Evolution 联系人文件夹的位置和层次与 Evolution 1.x 不同。\n"
+"Evolution 任务文件夹的位置和层次与 Evolution 1.x 不同。\n"
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
#: calendar/gui/migration.c:150
-#, fuzzy
msgid ""
"The location and hierarchy of the Evolution calendar folders has changed "
"since Evolution 1.x.\n"
"\n"
"Please be patient while Evolution migrates your folders..."
msgstr ""
-"Evolution 联系人文件夹的位置和层次与 Evolution 1.x 不同。\n"
+"Evolution 日历文件夹的位置和层次与 Evolution 1.x 不同。\n"
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
#: calendar/gui/migration.c:376
msgid "Birthdays & Anniversaries"
-msgstr ""
+msgstr "生日和纪念日"
#. Create the Webcal source group
#: calendar/gui/migration.c:462 calendar/gui/migration.c:544
@@ -6668,19 +6698,19 @@ msgstr "网上"
#. FIXME: set proper domain/code
#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
+msgstr "无法从 evolution/config.xmldb 中升迁旧设置"
#. FIXME: domain/code
#: calendar/gui/migration.c:737
-#, fuzzy, c-format
+#, c-format
msgid "Unable to migrate calendar `%s'"
-msgstr "无法打开日历“%s”。"
+msgstr "无法升迁日历“%s”"
#. FIXME: domain/code
#: calendar/gui/migration.c:869
-#, fuzzy, c-format
+#, c-format
msgid "Unable to migrate tasks `%s'"
-msgstr "无法打开“%s”中的任务。"
+msgstr "无法升迁任务“%s”"
#: calendar/gui/print.c:489
msgid "1st"
@@ -6923,21 +6953,20 @@ msgid "New Task List"
msgstr "新建任务列表"
#: calendar/gui/tasks-component.c:398
-#, fuzzy, c-format
+#, c-format
msgid "%d task"
msgid_plural "%d tasks"
-msgstr[0] "%d 个联系人"
+msgstr[0] "%d 个任务"
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
-#, fuzzy, c-format
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:502
+#, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
-msgstr[0] "已删除"
+msgstr[0] ",已选中 %d 个"
#: calendar/gui/tasks-component.c:447
-#, fuzzy
msgid "Failed upgrading tasks."
-msgstr "装入任务"
+msgstr "升级任务失败。"
#: calendar/gui/tasks-component.c:526
#, c-format
@@ -6967,19 +6996,16 @@ msgid "Create a new task"
msgstr "创建新任务"
#: calendar/gui/tasks-component.c:812
-#, fuzzy
msgid "New tasks group"
-msgstr "新建任务"
+msgstr "新建任务组"
#: calendar/gui/tasks-component.c:813
-#, fuzzy
msgid "_Tasks Group"
-msgstr "任务列表组"
+msgstr "任务组(_T)"
#: calendar/gui/tasks-component.c:814
-#, fuzzy
msgid "Create a new tasks group"
-msgstr "创建新任务"
+msgstr "创建新任务组"
#: calendar/gui/tasks-control.c:367
msgid ""
@@ -8742,12 +8768,12 @@ msgstr "执行过滤规则搜索错误:%s:%s"
msgid "Unsupported operation: append message: for %s"
msgstr "不支持的操作:附加邮件:附加 %s"
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr "不支持的操作:按表达式搜索:搜索 %s"
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
#, c-format
msgid "Unsupported operation: search by uids: for %s"
msgstr "不支持的操作:按 uid 搜索:搜索 %s"
@@ -8760,11 +8786,16 @@ msgstr "移动邮件"
msgid "Copying messages"
msgstr "复制邮件"
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "警告"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
msgstr ""
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
msgid "Filtering new message(s)"
msgstr "过滤新邮件"
@@ -8843,7 +8874,7 @@ msgstr ""
#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:705
#: mail/mail-send-recv.c:611
msgid "Cancelled."
msgstr "已取消。"
@@ -9207,7 +9238,7 @@ msgstr "引用的证书已过期。"
#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1243
msgid "Bad authentication response from server."
msgstr "来自服务器的无效认证应答。"
@@ -9588,40 +9619,40 @@ msgstr "命令尚未实现"
msgid "export keys: unimplemented"
msgstr ""
-#: camel/camel-store.c:214
+#: camel/camel-store.c:215
msgid "Cannot get folder: Invalid operation on this store"
msgstr "无法获取文件夹:对该存储的无效操作"
-#: camel/camel-store.c:244
+#: camel/camel-store.c:245
#, fuzzy, c-format
msgid "Cannot create folder `%s': folder exists"
msgstr "无法创建文件夹:%s:%s"
-#: camel/camel-store.c:295
+#: camel/camel-store.c:299
msgid "Cannot create folder: Invalid operation on this store"
msgstr "无法创建文件夹:对该存储的无效操作"
-#: camel/camel-store.c:323
+#: camel/camel-store.c:327
#, fuzzy, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "无法创建文件夹:%s:%s"
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:391 camel/camel-vee-store.c:354
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "无法删除文件夹:%s:无效操作"
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:441 camel/camel-vee-store.c:390
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "无法重命名文件夹:%s:无效操作"
-#: camel/camel-store.c:811
+#: camel/camel-store.c:813
msgid "Trash"
msgstr "回收站"
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:815 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "垃圾"
@@ -9915,7 +9946,7 @@ msgstr "访问 Novell GroupWise 服务器"
#: camel/providers/imap/camel-imap-provider.c:93
#: camel/providers/imapp/camel-imapp-provider.c:65
#: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
msgid "Password"
msgstr "密码"
@@ -10082,8 +10113,8 @@ msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
#: camel/providers/imap4/camel-imap4-store.c:208
#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
+#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:572
#: camel/providers/imapp/camel-imapp-store.c:231
#: camel/providers/nntp/camel-nntp-store.c:140
#: camel/providers/pop3/camel-pop3-store.c:175
@@ -10094,15 +10125,15 @@ msgid "Could not connect to %s (port %d): %s"
msgstr "无法连接到 %s (端口 %d):%s"
#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:554
#: camel/providers/pop3/camel-pop3-store.c:177
#: camel/providers/smtp/camel-smtp-transport.c:271
msgid "SSL unavailable"
msgstr "SSL 不可用"
#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:569
+#: camel/providers/imap/camel-imap-store.c:846
#: camel/providers/imapp/camel-imapp-store.c:228
#: camel/providers/nntp/camel-nntp-store.c:137
#: camel/providers/nntp/camel-nntp-store.c:155
@@ -10118,8 +10149,8 @@ msgid ""
msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:711
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
@@ -10128,7 +10159,7 @@ msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
#: camel/providers/imap/camel-imap-command.c:303
#: camel/providers/imap/camel-imap-command.c:400
#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1108
msgid "Unknown error"
msgstr "未知的错误"
@@ -10154,8 +10185,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
msgstr "无法获取文件夹:%s:%s"
#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1888
+#: camel/providers/imap/camel-imap-store.c:2266
#, fuzzy, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10233,12 +10264,12 @@ msgstr "服务器意外地中止了连接:%s"
#: camel/providers/imap/camel-imap-command.c:218
#: camel/providers/imap/camel-imap-command.c:257
#: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3199
msgid "Operation cancelled"
msgstr "操作已取消"
#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3202
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "服务器意外地中止了连接:%s"
@@ -10302,13 +10333,6 @@ msgid "Unable to retrieve message: %s"
msgstr "无法检索邮件:%s"
#: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -10318,14 +10342,14 @@ msgstr ""
" %s"
#: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
msgid "No such message"
msgstr "没有该邮件"
#: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/imap/camel-imap-folder.c:2622
#: camel/providers/nntp/camel-nntp-folder.c:238
msgid "This message is not currently available"
msgstr "该邮件目前不可用"
@@ -10335,7 +10359,23 @@ msgstr "该邮件目前不可用"
msgid "Fetching summary information for new messages"
msgstr "从新邮件中获取概要信息"
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
msgid "Could not find message body in FETCH response."
msgstr "无法在 FETCH 应答中找到邮件体。"
@@ -10396,43 +10436,43 @@ msgstr "IMAP"
msgid "For reading and storing mail on IMAP servers."
msgstr "IMAP 服务器上的邮件的读写。"
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:681
#: camel/providers/pop3/camel-pop3-store.c:228
msgid "SSL/TLS extension not supported."
msgstr "不支持 SSL/TLS 扩展。"
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:712
#: camel/providers/pop3/camel-pop3-store.c:269
msgid "SSL negotiations failed"
msgstr "SSL 协商失败"
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:849
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "无法使用命令“%s”连接:%s"
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1273
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1283
#: camel/providers/smtp/camel-smtp-transport.c:486
#, c-format
msgid "No support for authentication type %s"
msgstr "不支持验证类型 %s"
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1306
#: camel/providers/imapp/camel-imapp-store.c:344
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%s请为 %s@%s 输入 IMAP 密码"
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1320
msgid "You didn't enter a password."
msgstr "您没有输入密码。"
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1349
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -10443,18 +10483,18 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1870
+#: camel/providers/imap/camel-imap-store.c:2060
#, c-format
msgid "No such folder %s"
msgstr "没有文件夹 %s"
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1946
+#: camel/providers/imap/camel-imap-store.c:2327
msgid "The parent folder is not allowed to contain subfolders"
msgstr "父文件夹不允许含有子文件夹"
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:2001
#: camel/providers/local/camel-maildir-store.c:137
#: camel/providers/local/camel-mbox-store.c:212
#: camel/providers/local/camel-mh-store.c:236
@@ -10462,7 +10502,7 @@ msgstr "父文件夹不允许含有子文件夹"
msgid "Cannot create folder `%s': folder exists."
msgstr "无法创建文件夹:%s:%s"
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2277
#, c-format
msgid "Unknown parent folder: %s"
msgstr "未知的父文件夹:%s"
@@ -10641,8 +10681,25 @@ msgstr "邮件目录附加已放弃"
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "无法将邮件附加到邮件目录文件夹:%s:%s"
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+" %s"
+msgstr ""
+"无法从文件夹 %2$s 获取邮件:%1$s\n"
+" %3$s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
msgid "Invalid message contents"
msgstr "无效的邮件内容"
@@ -10732,23 +10789,14 @@ msgstr "邮件追加取消"
msgid "Cannot append message to mbox file: %s: %s"
msgstr "无法将邮件附加到邮件箱文件:%s:%s"
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-" %s"
-msgstr ""
-"无法从文件夹 %2$s 获取邮件:%1$s\n"
-" %3$s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
msgid "The folder appears to be irrecoverably corrupted."
msgstr "文件夹好像已经被不可恢复地破坏了。"
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
msgstr "邮件构造失败:邮件箱已损坏?"
#: camel/providers/local/camel-mbox-store.c:176
@@ -11270,7 +11318,7 @@ msgstr "%s 天之后删除"
msgid "Disable support for all POP3 extensions"
msgstr "禁用所有 POP3 扩展的支持"
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
msgid "POP"
msgstr "POP"
@@ -11356,7 +11404,7 @@ msgid "No such folder `%s'."
msgstr "没有文件夹“%s”。"
#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
msgid "Sendmail"
msgstr "Sendmail"
@@ -11408,7 +11456,7 @@ msgstr "sendmail"
msgid "Mail delivery via the sendmail program"
msgstr "通过 sendmail 程序发送邮件"
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
msgid "SMTP"
msgstr "SMTP"
@@ -12195,12 +12243,16 @@ msgstr "同步类别:"
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%Y-%m-%d %A %p %I:%M"
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
msgid "%a %m/%d/%Y %H:%M"
msgstr "%Y-%m-%d %A %H:%M"
@@ -12252,23 +12304,31 @@ msgid "%m/%d/%Y %H"
msgstr "%Y-%m-%d %H点"
#. strptime format for a time of day, in 12-hour format.
+#. strftime format of a time in 12-hour format.
#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
msgid "%I:%M:%S %p"
msgstr "%p %I:%M:%S"
#. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
#. strptime format for time of day, without seconds,
#. in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
msgid "%I:%M %p"
msgstr "%p %I:%M"
#. strptime format for time of day, without seconds 24-hour format.
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
msgid "%H:%M"
@@ -12358,6 +12418,7 @@ msgid "Missing file name."
msgstr "缺少文件名。"
#. filter:no-file secondary
+#. filter:bad-file secondary
#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
msgid "You must specify a file name."
msgstr "您必须指定文件名。"
@@ -12389,6 +12450,7 @@ msgid "Could not compile regular expression \"{1}\"."
msgstr ""
#. filter:no-name primary
+#. filter:no-name-vfolder primary
#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
msgid "Missing name."
msgstr "缺少名称。"
@@ -12440,7 +12502,7 @@ msgstr "<b>则</b>"
msgid "Select Folder"
msgstr "选择文件夹"
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
msgid " "
msgstr " "
@@ -12490,7 +12552,7 @@ msgstr "过去"
msgid "months"
msgstr "月"
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
msgid "seconds"
msgstr "秒"
@@ -12522,20 +12584,20 @@ msgstr "以所有本地文件夹"
msgid "years"
msgstr "年"
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
msgid "Important"
msgstr "重要"
#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
msgid "To Do"
msgstr "待办"
#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
msgid "Later"
msgstr "稍候"
@@ -12977,7 +13039,7 @@ msgid "Create New Folder"
msgstr "创建新文件夹"
#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/mail-component.c:706
#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
msgid "Specify where to create the folder:"
msgstr "指定在哪里创建文件夹:"
@@ -13002,12 +13064,12 @@ msgstr "正在移动文件夹“%s”"
msgid "Copying folder %s"
msgstr "正在复制文件夹 %s"
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:848 mail/message-list.c:1561
#, c-format
msgid "Moving messages into folder %s"
msgstr "正在把邮件移动到文件夹 %s"
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:850 mail/message-list.c:1563
#, c-format
msgid "Copying messages into folder %s"
msgstr "把邮件复制到文件夹 %s"
@@ -13025,12 +13087,12 @@ msgid "_Move to Folder"
msgstr "移动到文件夹(_M)"
#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:2556 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
msgid "_Move"
msgstr "移动(_M)"
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:961 mail/message-list.c:1653
#, fuzzy
msgid "Cancel _Drag"
msgstr "取消任务"
@@ -13051,44 +13113,44 @@ msgstr "复制"
msgid "Creating folder `%s'"
msgstr "正在存储文件夹“%s”"
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:706
msgid "Create folder"
msgstr "创建文件夹"
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2477
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "把文件夹“%s”重命名为:"
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2479
msgid "Rename Folder"
msgstr "重命名文件夹"
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2550 ui/evolution-addressbook.xml.h:44
#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
msgid "_View"
msgstr "查看(_V)"
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2551
msgid "Open in _New Window"
msgstr "在新窗口中打开(_N)"
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2560
msgid "_New Folder..."
msgstr "新建文件夹(_N)..."
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2563
msgid "_Rename"
msgstr "重命名(_R)"
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2566 ui/evolution-mail-list.xml.h:27
msgid "_Properties..."
msgstr "属性(_P)..."
#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
msgid "VFolders"
msgstr "虚拟文件夹"
@@ -13108,8 +13170,8 @@ msgstr "正在装入..."
#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:510
+#: mail/mail-component.c:556
msgid "Mail"
msgstr "邮件"
@@ -13240,7 +13302,7 @@ msgstr "基于邮件列表过滤(_M)"
#. default charset used in mail view
#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:68
msgid "Default"
msgstr "默认"
@@ -13538,7 +13600,7 @@ msgstr "每周"
msgid "Once per month"
msgstr "每月"
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
"since Evolution 1.x.\n"
@@ -13546,51 +13608,51 @@ msgid ""
"Please be patient while Evolution migrates your folders..."
msgstr ""
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
#, fuzzy, c-format
msgid "Unable to create new folder `%s': %s"
msgstr "无法创建文件夹:%s:%s"
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
#, fuzzy, c-format
msgid "Unable to copy folder `%s' to `%s': %s"
msgstr "无法将文件夹 %s 改名为 %s:%s"
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
#, fuzzy, c-format
msgid "Unable to scan for existing mailboxes at `%s': %s"
msgstr ""
"无法创建输出文件:%s\n"
" %s"
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
#, fuzzy, c-format
msgid "Unable to open old POP keep-on-server data `%s': %s"
msgstr "认证到 POP 服务器 %s 失败:%s"
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
#, fuzzy, c-format
msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
msgstr "创建到“%s”的管道失败:%s"
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
#, c-format
msgid "Unable to copy POP3 keep-on-server data `%s': %s"
msgstr ""
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
#, fuzzy, c-format
msgid "Failed to create local mail storage `%s': %s"
msgstr "创建到“%s”的管道失败:%s"
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
#, fuzzy, c-format
msgid "Unable to create local mail folders at `%s': %s"
msgstr ""
"无法创建输出文件:%s\n"
" %s"
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
@@ -14168,7 +14230,7 @@ msgstr "导入"
#: mail/GNOME_Evolution_Mail.server.in.in.h:1
msgid "*Control*F1"
-msgstr ""
+msgstr "*Control*F1"
#: mail/GNOME_Evolution_Mail.server.in.in.h:2
msgid "Composer Preferences"
@@ -14215,14 +14277,13 @@ msgstr "Evolution 邮件首选项控件"
msgid "Mail Accounts"
msgstr "邮件账户"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
msgid "Mail Preferences"
msgstr "邮件首选项"
#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
msgid "_Mail"
-msgstr "邮件"
+msgstr "邮件(_M)"
#: mail/importers/elm-importer.c:88
msgid "Evolution is importing your old Elm mail"
@@ -14243,9 +14304,8 @@ msgid "Please wait"
msgstr "请稍候"
#: mail/importers/elm-importer.c:244
-#, fuzzy
msgid "Importing Elm data"
-msgstr "正在导入文件"
+msgstr "导入 Elm 数据"
#: mail/importers/elm-importer.c:436
msgid ""
@@ -14260,27 +14320,24 @@ msgid "Elm"
msgstr "Elm"
#: mail/importers/evolution-mbox-importer.c:116
-#, fuzzy
msgid "Destination folder:"
-msgstr "草稿文件夹(_F):"
+msgstr "目的文件夹:"
#: mail/importers/evolution-mbox-importer.c:119
-#, fuzzy
msgid "Select folder to import into"
-msgstr "选择要导入的证书..."
+msgstr "选择要导入到哪个文件夹"
#: mail/importers/evolution-mbox-importer.c:219
#: mail/importers/evolution-outlook-importer.c:225
#: mail/importers/mail-importer.c:226
-#, fuzzy, c-format
+#, c-format
msgid "Importing `%s'"
-msgstr "正在导入"
+msgstr "导入“%s”"
#: mail/importers/evolution-outlook-importer.c:272
#: mail/importers/mail-importer.c:140
-#, fuzzy
msgid "Importing mailbox"
-msgstr "正在导入文件"
+msgstr "导入邮箱"
#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
msgid "Evolution Elm importer"
@@ -14433,17 +14490,17 @@ msgstr ""
#: mail/mail-account-gui.c:252
#, c-format
msgid "%s License Agreement"
-msgstr ""
+msgstr "%s 许可协议"
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:167
msgid "_Host:"
msgstr "主机(_H):"
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:151
msgid "User_name:"
msgstr "用户名(_N):"
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:173
msgid "_Path:"
msgstr "路径(_P):"
@@ -14471,69 +14528,66 @@ msgstr "%s 邮件列表"
msgid "Add Filter Rule"
msgstr "添加过滤规则"
-#: mail/mail-component.c:461
-#, fuzzy, c-format
+#: mail/mail-component.c:463
+#, c-format
msgid "%d deleted"
-msgstr "已删除"
+msgstr "%d 封已删除"
-#: mail/mail-component.c:463
+#: mail/mail-component.c:465
#, c-format
msgid "%d junk"
-msgstr ""
+msgstr "%d 封垃圾"
-#: mail/mail-component.c:486
-#, fuzzy, c-format
+#: mail/mail-component.c:488
+#, c-format
msgid "%d drafts"
-msgstr "%d 天"
+msgstr "%d 封草稿"
-#: mail/mail-component.c:488
-#, fuzzy, c-format
+#: mail/mail-component.c:490
+#, c-format
msgid "%d sent"
-msgstr "%d 秒"
+msgstr "%d 已发"
-#: mail/mail-component.c:490
-#, fuzzy, c-format
+#: mail/mail-component.c:492
+#, c-format
msgid "%d unsent"
-msgstr "%d 秒"
+msgstr "%d 封未发"
-#: mail/mail-component.c:494
-#, fuzzy, c-format
+#: mail/mail-component.c:496
+#, c-format
msgid "%d total"
-msgstr "%d 个联系人"
+msgstr "总共 %d 封"
-#: mail/mail-component.c:496
+#: mail/mail-component.c:498
#, c-format
msgid ", %d unread"
-msgstr ""
+msgstr ",%d 封未读"
-#: mail/mail-component.c:653
+#: mail/mail-component.c:658
msgid "New Mail Message"
msgstr "新建邮件"
-#: mail/mail-component.c:654
+#: mail/mail-component.c:659
msgid "_Mail Message"
msgstr "邮件(_M)"
-#: mail/mail-component.c:655
+#: mail/mail-component.c:660
msgid "Compose a new mail message"
msgstr "撰写一封新邮件"
-#: mail/mail-component.c:661
-#, fuzzy
+#: mail/mail-component.c:666
msgid "New Mail Folder"
-msgstr "新建虚拟文件夹"
+msgstr "新建邮件文件夹"
-#: mail/mail-component.c:662
-#, fuzzy
+#: mail/mail-component.c:667
msgid "Mail _Folder"
-msgstr "邮件过滤规则"
+msgstr "邮件文件夹(_F)"
-#: mail/mail-component.c:663
-#, fuzzy
+#: mail/mail-component.c:668
msgid "Create a new mail folder"
-msgstr "创建新日历"
+msgstr "创建新邮件文件夹"
-#: mail/mail-component.c:795
+#: mail/mail-component.c:800
msgid "Failed upgrading Mail settings or folders."
msgstr ""
@@ -14545,7 +14599,7 @@ msgstr "检查服务"
msgid "Connecting to server..."
msgstr "正在连接服务器..."
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
msgid "Identity"
msgstr "标识"
@@ -14559,7 +14613,7 @@ msgstr ""
"出的邮件中包含此信息。"
#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
msgid "Receiving Mail"
msgstr "接收邮件"
@@ -14569,13 +14623,13 @@ msgid ""
"not sure, ask your system administrator or Internet Service Provider."
msgstr ""
"请在下面输入您的收件服务器信息。如果您不太确定的话,请询问您的系统管理员或者"
-"互联网服务提供商ISP。"
+"互联网服务提供商 ISP。"
#: mail/mail-config-druid.c:379
msgid "Please select among the following options"
msgstr "请从以下选项中选择"
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
msgid "Sending Mail"
msgstr "发送邮件"
@@ -14587,7 +14641,7 @@ msgstr ""
"请在下面输入您的发件服务器信息。如果您不太确定的话,请询问您的系统管理员或者"
"互联网服务提供商ISP。"
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
msgid "Account Management"
msgstr "账户管理"
@@ -14602,250 +14656,239 @@ msgstr ""
"您即将完成邮件配置的过程了。您提供的用于收件服务器和发送方式将被组合在一起,"
"成为 Evolution 的邮件帐户。请在下面输入此帐户的名称。此名称只会用作显示。"
-#: mail/mail-config.glade.h:1
-#, fuzzy
+#: mail/mail-config.glade.h:2
msgid " Ch_eck for Supported Types "
-msgstr "检查支持的类型(_C) "
+msgstr "检查支持的类型(_E) "
-#: mail/mail-config.glade.h:3
-#, fuzzy
+#: mail/mail-config.glade.h:4
msgid "<b>Preview</b>"
-msgstr "预览"
+msgstr "<b>预览</b>"
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
#, fuzzy
msgid "<b>SSL is not supported in this build of evolution</b>"
msgstr "(在该版本的 evolution 中不支持SSL)"
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
#, fuzzy
msgid "<b>S_ignatures</b>"
msgstr "<b>状态:</b>"
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
#, fuzzy
msgid "<b>_Languages</b>"
msgstr "<b>状态:</b>"
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
msgid "<span weight=\"bold\">Account Information</span>"
msgstr ""
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
msgid "<span weight=\"bold\">Alerts</span>"
msgstr ""
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
msgid "<span weight=\"bold\">Authentication Type</span>"
msgstr ""
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
msgid "<span weight=\"bold\">Authentication</span>"
msgstr ""
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
#, fuzzy
msgid "<span weight=\"bold\">Checking for New Mail</span>"
msgstr "检查新邮件"
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
msgid "<span weight=\"bold\">Composing Messages</span>"
msgstr ""
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
msgid "<span weight=\"bold\">Configuration</span>"
msgstr ""
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
msgid "<span weight=\"bold\">Default Behavior</span>"
msgstr ""
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
msgid "<span weight=\"bold\">Delete Mail</span>"
msgstr ""
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
#, fuzzy
msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
msgstr "<b>显示的邮件头(_D)</b>"
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
msgid "<span weight=\"bold\">Filter Options</span>"
msgstr ""
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
msgid "<span weight=\"bold\">General</span>"
msgstr ""
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
msgid "<span weight=\"bold\">Labels and Colors</span>"
msgstr ""
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
msgid "<span weight=\"bold\">Loading Images</span>"
msgstr ""
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
msgid "<span weight=\"bold\">Message Display</span>"
msgstr ""
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
msgid "<span weight=\"bold\">Message Fonts</span>"
msgstr ""
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
#, fuzzy
msgid "<span weight=\"bold\">New Mail Notification</span>"
msgstr "新邮件提醒"
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
msgid "<span weight=\"bold\">Optional Information</span>"
msgstr ""
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
msgid "<span weight=\"bold\">Options</span>"
msgstr ""
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
#, fuzzy
msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
msgstr "Pretty Good Privacy (PGP/GPG)"
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
msgid "<span weight=\"bold\">Printed Fonts</span>"
msgstr ""
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
msgid "<span weight=\"bold\">Required Information</span>"
msgstr ""
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
msgstr ""
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
msgid "<span weight=\"bold\">Security</span>"
msgstr ""
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
#, fuzzy
msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
msgstr "已发送和草稿邮件"
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
msgid "<span weight=\"bold\">Server Configuration</span>"
msgstr ""
-#: mail/mail-config.glade.h:33
-#, fuzzy
+#: mail/mail-config.glade.h:35
msgid "A_lso encrypt to self when sending encrypted mail"
msgstr "当发送加密邮件时总是对自身加密(_L)"
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
msgid "Account Editor"
msgstr "账户编辑器"
-#: mail/mail-config.glade.h:36
-#, fuzzy
+#: mail/mail-config.glade.h:38
msgid "Add Ne_w Signature..."
-msgstr "添加新签名..."
+msgstr "添加新签名(_N)..."
-#: mail/mail-config.glade.h:37
-#, fuzzy
+#: mail/mail-config.glade.h:39
msgid "Add _Script"
-msgstr "添加脚本(_R)"
+msgstr "添加脚本(_S)"
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
msgid "Al_ways encrypt to myself when sending encrypted mail"
msgstr "当发送加密邮件时总是对自身加密(_W)"
-#: mail/mail-config.glade.h:39
-#, fuzzy
+#: mail/mail-config.glade.h:41
msgid "Alway_s carbon-copy (cc) to:"
-msgstr "总是抄送到(_C):"
+msgstr "总是抄送到(_S):"
-#: mail/mail-config.glade.h:41
-#, fuzzy
+#: mail/mail-config.glade.h:43
msgid "Always _blind carbon-copy (bcc) to:"
msgstr "总是暗送到(_B):"
-#: mail/mail-config.glade.h:42
-#, fuzzy
+#: mail/mail-config.glade.h:44
msgid "Always _sign outgoing messages when using this account"
-msgstr "当使用该账户时总是发送签名邮件(_A)"
+msgstr "当使用该账户时总是发送签名邮件(_S)"
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
msgid "Always _trust keys in my keyring when encrypting"
msgstr "加密时总是信任我的密钥环中的密钥(_T)"
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
msgid "Attach original message"
msgstr "附加原始消息"
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
msgid "Attachment"
msgstr "附件"
-#: mail/mail-config.glade.h:46
-#, fuzzy
+#: mail/mail-config.glade.h:48
msgid "Automatically _insert smiley images"
-msgstr "自动插入笑脸图像(_A)"
+msgstr "自动插入笑脸图像(_I)"
-#: mail/mail-config.glade.h:47
-#, fuzzy
+#: mail/mail-config.glade.h:49
msgid "Automatically check for _new mail every"
-msgstr "自动检查邮件的间隔(_A)"
+msgstr "自动检查新邮件的间隔(_N)"
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
msgid "Baltic (ISO-8859-13)"
msgstr "波罗的语(ISO-8859-13)"
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
msgid "Baltic (ISO-8859-4)"
msgstr "波罗的语(ISO-8859-4)"
-#: mail/mail-config.glade.h:50
-#, fuzzy
+#: mail/mail-config.glade.h:52
msgid "Beep w_hen new mail arrives"
-msgstr "新邮件到达时鸣笛(_B)"
+msgstr "新邮件到达时响铃(_H)"
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
msgid "C_haracter set:"
msgstr "字符集(_H)"
-#: mail/mail-config.glade.h:52
-#, fuzzy
+#: mail/mail-config.glade.h:54
msgid "Ch_eck for Supported Types "
-msgstr "检查支持的类型(_C) "
+msgstr "检查支持的类型(_E)"
-#: mail/mail-config.glade.h:53
-#, fuzzy
-msgid "Check _Incoming Mail"
-msgstr "检查新邮件"
+#: mail/mail-config.glade.h:55
+msgid "Check _incoming mail for junk"
+msgstr ""
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
msgid "Check spelling while I _type"
msgstr "在我输入时进行拼写检查(_T)"
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
msgid "Checks incoming mail messages to be Junk"
msgstr ""
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
msgid "Color for _misspelled words:"
msgstr "给错误拼写的单词上色(_M):"
-#: mail/mail-config.glade.h:57
-#, fuzzy
+#: mail/mail-config.glade.h:59
msgid "Colors"
-msgstr "颜色(_O)"
+msgstr "颜色"
-#: mail/mail-config.glade.h:58
-#, fuzzy
+#: mail/mail-config.glade.h:60
msgid "Confirm _when expunging a folder"
-msgstr "当销毁文件夹时进行提示(_C)"
+msgstr "销毁文件夹时确认(_W)"
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -14860,258 +14903,241 @@ msgstr ""
"\n"
"单击“应用”可保存您的设置。"
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
msgid "De_fault"
msgstr "默认(_F)"
-#: mail/mail-config.glade.h:67
-#, fuzzy
+#: mail/mail-config.glade.h:69
msgid "Default character e_ncoding:"
-msgstr "默认字符编码(_E):"
+msgstr "默认字符编码(_N):"
-#: mail/mail-config.glade.h:68
-#, fuzzy
+#: mail/mail-config.glade.h:70
msgid "Defaults"
-msgstr "默认(_D)"
+msgstr "默认"
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
msgid "Do not quote original message"
msgstr "无法引用原始消息"
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(_M)(同 Outlook 兼容)"
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Done"
msgstr "完成"
-#: mail/mail-config.glade.h:73
-#, fuzzy
+#: mail/mail-config.glade.h:75
msgid "Drafts _Folder:"
msgstr "草稿文件夹(_F):"
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
msgid "Email Accounts"
msgstr "电子邮件"
-#: mail/mail-config.glade.h:76
-#, fuzzy
+#: mail/mail-config.glade.h:78
msgid "Email _Address:"
msgstr "电子邮件地址(_A):"
-#: mail/mail-config.glade.h:77
-#, fuzzy
+#: mail/mail-config.glade.h:79
msgid "Empty trash folders on e_xit"
-msgstr "退出时清空已删除邮件(_T)"
+msgstr "退出时清空已删除邮件(_X)"
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
msgid "Encry_ption certificate:"
msgstr "加密证书(_P):"
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
msgid "Evolution Account Assistant"
msgstr "Evolution 账户助手"
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
msgid "Execute Command..."
msgstr "执行命令..."
-#: mail/mail-config.glade.h:81
-#, fuzzy
+#: mail/mail-config.glade.h:83
msgid "Fi_xed-width:"
msgstr "固定宽度(_X):"
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
msgid "Font Properties"
msgstr "字体属性"
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
msgid "Format messages in _HTML"
msgstr "用 HTML 格式化邮件(_H)"
-#: mail/mail-config.glade.h:85
-#, fuzzy
+#: mail/mail-config.glade.h:87
msgid "HTML Mail"
-msgstr "HTML 邮件(_H)"
+msgstr "HTML 邮件"
-#: mail/mail-config.glade.h:86
-#, fuzzy
+#: mail/mail-config.glade.h:88
msgid "Headers"
-msgstr "信头(_E)"
+msgstr "信头"
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
msgid "Highlight _quotations with"
msgstr "突出显示引用(_Q)"
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
msgid "IMAPv4 "
msgstr "IMAPv4"
#: mail/mail-config.glade.h:91
+msgid "I_nclude remote tests"
+msgstr "包含远程测试(_N)"
+
+#: mail/mail-config.glade.h:94
msgid "Inline"
msgstr "嵌入"
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
msgid "Kerberos "
msgstr "Kerberos"
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
msgid "Mail Configuration"
msgstr "邮件配置"
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
msgid "Mailbox location"
msgstr "邮件箱位置"
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
msgid "Message Composer"
msgstr "邮件撰写器"
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
msgstr "注意:直到您第一次连接的时候,才会询问密码。"
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
msgid "Or_ganization:"
msgstr "组织(_G):"
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG 键标识(_K):"
-#: mail/mail-config.glade.h:108
-#, fuzzy
+#: mail/mail-config.glade.h:111
msgid "Play sound file when new mail arri_ves"
-msgstr "新邮件到达时播放声音文件(_P)"
+msgstr "新邮件到达时播放声音文件(_V)"
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr "发送只有暗送收件人的邮件时提示(_O)"
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
msgid "Qmail maildir "
msgstr "Qmail maildir "
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
msgid "Quote original message"
msgstr "引用原始消息"
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
msgid "Quoted"
msgstr "引用"
-#: mail/mail-config.glade.h:113
-#, fuzzy
+#: mail/mail-config.glade.h:116
msgid "Re_member password"
-msgstr "记住密码"
+msgstr "记住密码(_M)"
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
msgid "Re_ply-To:"
msgstr "回复到(_P):"
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
msgid "Receiving Email"
msgstr "接收电子邮件"
-#: mail/mail-config.glade.h:117
-#, fuzzy
+#: mail/mail-config.glade.h:120
msgid "Receiving Options"
-msgstr "接收选项(_O)"
+msgstr "接收选项"
-#: mail/mail-config.glade.h:118
-#, fuzzy
+#: mail/mail-config.glade.h:121
msgid "Remember _password"
-msgstr "记住密码"
+msgstr "记住密码(_P)"
-#: mail/mail-config.glade.h:120
-#, fuzzy
+#: mail/mail-config.glade.h:123
msgid "S_tandard Font:"
-msgstr "标准字体(_S):"
+msgstr "标准字体(_T):"
-#: mail/mail-config.glade.h:121
-#, fuzzy
+#: mail/mail-config.glade.h:124
msgid "Security"
-msgstr "安全(_S)"
+msgstr "安全"
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
msgid "Select HTML fixed width font"
msgstr "选择 HTML 固定宽度字体"
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
msgid "Select HTML fixed width font for printing"
msgstr "选择用于打印的 HTML 固定宽度字体"
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
msgid "Select HTML variable width font"
msgstr "选择 HTML 变宽度字体"
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
msgid "Select HTML variable width font for printing"
msgstr "选择用于打印的 HTML 变宽度字体"
-#: mail/mail-config.glade.h:126
-#, fuzzy
+#: mail/mail-config.glade.h:129
msgid "Select..."
-msgstr "选择(_S)..."
+msgstr "选择..."
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
msgid "Sending Email"
msgstr "发送电子邮件"
-#: mail/mail-config.glade.h:130
-#, fuzzy
+#: mail/mail-config.glade.h:133
msgid "Sent _Messages Folder:"
msgstr "已发送邮件文件夹(_M):"
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
msgid "Ser_ver requires authentication"
msgstr "服务器需要认证(_V)"
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
msgid "Server _Type: "
msgstr "服务器类型(_T):"
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
msgid "Si_gning certificate:"
msgstr "签名证书(_G):"
-#: mail/mail-config.glade.h:134
-#, fuzzy
+#: mail/mail-config.glade.h:137
msgid "Signat_ure:"
-msgstr "签名:"
+msgstr "签名(_U):"
-#: mail/mail-config.glade.h:135
-#, fuzzy
+#: mail/mail-config.glade.h:138
msgid "Signatures"
-msgstr "签名(_S)"
+msgstr "签名"
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
msgid "Specify _filename:"
msgstr "指定文件名(_F):"
-#: mail/mail-config.glade.h:137
-#, fuzzy
+#: mail/mail-config.glade.h:140
msgid "Spell Checking"
-msgstr "拼写检查(_C)"
+msgstr "拼写检查"
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
msgid "Standard Unix mbox"
msgstr "标准 Unix mbox"
-#: mail/mail-config.glade.h:139
-#, fuzzy
+#: mail/mail-config.glade.h:142
msgid "T_erminal Font:"
-msgstr "终端字体(_T):"
+msgstr "终端字体(_E):"
-#: mail/mail-config.glade.h:140
-#, fuzzy
+#: mail/mail-config.glade.h:143
msgid "T_ype: "
-msgstr "类型:"
+msgstr "类型(_Y):"
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -15120,7 +15146,7 @@ msgstr ""
"此脚本的输出将用于您的签名。您指定的名称将只会\n"
"用于显示。"
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
msgid ""
"This page allows you to configure spell checking behavior and language. The "
"list of languages here reflects only the languages for which you have a "
@@ -15128,7 +15154,7 @@ msgid ""
msgstr ""
"此页面允许您配置拼写检查行为和语言。在此列出的语言反映了您所安装的字典。"
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -15136,15 +15162,11 @@ msgstr ""
"输入您想要给此帐户起的名字。\n"
"如:“工作”或“私人”"
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
msgid "V_ariable-width:"
msgstr "变宽(_A):"
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -15154,92 +15176,83 @@ msgstr ""
"\n"
"单击“前进”开始。"
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
msgid "_Add Signature"
msgstr "添加签名(_A)"
-#: mail/mail-config.glade.h:157
-#, fuzzy
+#: mail/mail-config.glade.h:159
msgid "_Always load images from the Internet"
-msgstr "总是离线装入图像(_A)"
+msgstr "总是从 Internet 上装入图像(_A)"
-#: mail/mail-config.glade.h:158
-#, fuzzy
+#: mail/mail-config.glade.h:160
msgid "_Digitally sign outgoing messages (by default)"
-msgstr "对寄出的邮件进行数字签名(默认)(_S)"
+msgstr "对寄出的邮件进行数字签名(默认)(_D)"
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
msgid "_Do not notify me when new mail arrives"
msgstr "新邮件到达时不要提醒我(_D)"
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
msgid "_Enable"
msgstr "启用(_E)"
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
msgid "_Encrypt outgoing messages (by default)"
msgstr "加密寄出的邮件(默认)(_E)"
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
msgid "_Forward style:"
msgstr "转发方式(_F):"
-#: mail/mail-config.glade.h:166
-#, fuzzy
+#: mail/mail-config.glade.h:168
msgid "_Load images if sender is in address book"
msgstr "如果发件人在地址簿中就装入图像(_L)"
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "只进行本地测试(_L)"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
msgid "_Make this my default account"
msgstr "使它成为我的默认账户(_M)"
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
msgid "_Mark messages as read after"
msgstr "把邮件标记为已读前等(_M)"
-#: mail/mail-config.glade.h:171
-#, fuzzy
+#: mail/mail-config.glade.h:172
msgid "_Never load images from the Internet"
-msgstr "从不离线装入图像(_N)"
+msgstr "绝不从 Internet 装入图像(_N)"
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
msgid "_Prompt when sending HTML messages to contacts that don't want them"
msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
msgid "_Prompt when sending messages with an empty subject line"
msgstr "发送空主题行的邮件时提示(_P)"
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
msgid "_Reply style:"
msgstr "回复风格(_R):"
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
msgid "_Script:"
msgstr "脚本(_S):"
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
msgid "_Show animated images"
msgstr "显示动画图像(_S)"
-#: mail/mail-config.glade.h:178
-#, fuzzy
+#: mail/mail-config.glade.h:179
msgid "_Use Secure Connection (SSL):"
-msgstr "使用安全连接 (SSL)(_U):"
+msgstr "使用安全连接(SSL)(_U):"
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
msgid "_Use the same fonts as other applications"
msgstr "使用与其它应用程序相同的字体(_U)"
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
msgid "color"
msgstr "颜色"
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
msgid "description"
msgstr "描述"
@@ -15287,9 +15300,8 @@ msgstr "您即将发送 HTML 格式的邮件。请确定下列收件人愿意接
#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
-#, fuzzy
msgid "_Send"
-msgstr "发送"
+msgstr "发送(_S)"
#. mail:ask-send-no-subject primary
#: mail/mail-errors.xml.h:17
@@ -15305,6 +15317,7 @@ msgid ""
msgstr ""
#. mail:ask-send-only-bcc-contact primary
+#. mail:ask-send-only-bcc primary
#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
#, fuzzy
msgid "Are you sure you want to send a message with only BCC recipients?"
@@ -15360,9 +15373,8 @@ msgstr ""
"您是否希望使用默认草稿文件夹?"
#: mail/mail-errors.xml.h:41
-#, fuzzy
msgid "Use _Default"
-msgstr "默认"
+msgstr "使用默认值(_D)"
#. mail:ask-expunge primary
#: mail/mail-errors.xml.h:43
@@ -15373,14 +15385,14 @@ msgid ""
msgstr "从该文件夹永久删除所有已删除的邮件"
#. mail:ask-expunge secondary
+#. mail:ask-empty-trash secondary
#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
msgid "If you continue, you will not be able to recover these messages."
msgstr ""
#: mail/mail-errors.xml.h:46
-#, fuzzy
msgid "_Expunge"
-msgstr "销毁(_X)"
+msgstr "销毁(_E)"
#. mail:ask-empty-trash primary
#: mail/mail-errors.xml.h:48
@@ -15391,9 +15403,8 @@ msgid ""
msgstr "永久删除所有文件夹中的所有已删除的邮件"
#: mail/mail-errors.xml.h:51
-#, fuzzy
msgid "_Empty Trash"
-msgstr "清空回收站(_T)"
+msgstr "清空回收站(_E)"
#. mail:exit-unsaved primary
#: mail/mail-errors.xml.h:53
@@ -15445,29 +15456,33 @@ msgstr ""
#. mail:async-error-nodescribe secondary
#: mail/mail-errors.xml.h:68
msgid "{0}."
-msgstr ""
+msgstr "{0}。"
#. mail:session-message-info secondary
+#. mail:session-message-info-cancel secondary
+#. mail:session-message-warning secondary
+#. mail:session-message-warning-cancel secondary
+#. mail:session-message-error secondary
+#. mail:session-message-error-cancel secondary
+#. mail:ask-session-password secondary
+#. mail:filter-load-error secondary
#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
msgid "{0}"
-msgstr ""
+msgstr "{0}"
#. mail:ask-session-password primary
#: mail/mail-errors.xml.h:82
-#, fuzzy
msgid "Enter password."
-msgstr "输入密码"
+msgstr "输入密码。"
#. mail:filter-load-error primary
#: mail/mail-errors.xml.h:86
-#, fuzzy
msgid "Error loading filter definitions."
msgstr ""
-"装入过滤规则信息错误:\n"
-"%s"
+"装入过滤规则信息错误。"
#. mail:no-save-path primary
#: mail/mail-errors.xml.h:90
@@ -15478,16 +15493,16 @@ msgstr "无法创建目录“%s”:%s"
#. mail:no-save-path secondary
#: mail/mail-errors.xml.h:92
msgid "{1}"
-msgstr ""
+msgstr "{1}"
#. mail:no-create-path primary
+#. mail:no-write-path-exists primary
+#. mail:no-write-path-notfile primary
#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
#: mail/mail-errors.xml.h:106
-#, fuzzy
msgid "Cannot save to file \"{0}\"."
msgstr ""
-"无法保存到“%s”\n"
-" %s"
+"无法保存到文件“{0}”。"
#. mail:no-create-path secondary
#: mail/mail-errors.xml.h:96
@@ -15502,10 +15517,13 @@ msgid "Cannot create temporary save directory."
msgstr "无法创建临时目录:%s"
#. mail:no-create-tmp-path secondary
+#. mail:no-delete-folder secondary
+#. system:no-save-file secondary
+#. system:no-load-file secondary
#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
msgid "Because \"{1}\"."
-msgstr ""
+msgstr "原因是“{1}”。"
#. mail:no-write-path-exists secondary
#: mail/mail-errors.xml.h:104
@@ -15534,6 +15552,7 @@ msgid "Cannot delete system folder \"{0}\"."
msgstr "无法删除文件夹:%s:没有该文件夹"
#. mail:no-delete-spethal-folder secondary
+#. mail:no-rename-spethal-folder secondary
#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
msgid ""
"System folders are required for Ximian Evolution to function correctly and "
@@ -15548,9 +15567,8 @@ msgstr "无法重命名文件夹:%s:没有该文件夹"
#. mail:ask-delete-folder title
#: mail/mail-errors.xml.h:122
-#, fuzzy
msgid "Delete \"{0}\"?"
-msgstr "删除“%s”"
+msgstr "删除“{0}”吗?"
#. mail:ask-delete-folder primary
#: mail/mail-errors.xml.h:124
@@ -15566,11 +15584,13 @@ msgid ""
msgstr ""
#. mail:no-rename-folder-exists primary
+#. mail:no-rename-folder primary
#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
msgid "Cannot rename \"{0}\" to \"{1}\"."
msgstr ""
#. mail:no-rename-folder-exists secondary
+#. mail:vfolder-notunique secondary
#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
#, fuzzy
msgid "A folder named \"{1}\" already exists. Please use a different name."
@@ -15579,27 +15599,31 @@ msgstr "已经存在名为“%s”的文件夹。请使用不同的名称。"
#. mail:no-rename-folder secondary
#: mail/mail-errors.xml.h:134
msgid "Because \"{2}\"."
-msgstr ""
+msgstr "原因是“{2}”。"
#. mail:no-move-folder-nostore primary
+#. mail:no-move-folder-to-nostore primary
#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
#, fuzzy
msgid "Cannot move folder \"{0}\" to \"{1}\"."
msgstr "无法移动文件夹:%s"
#. mail:no-move-folder-nostore secondary
+#. mail:no-copy-folder-nostore secondary
#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
#, fuzzy
msgid "Cannot open source \"{2}\"."
msgstr "无法打开“%s”:%s"
#. mail:no-move-folder-to-nostore secondary
+#. mail:no-copy-folder-to-nostore secondary
#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
#, fuzzy
msgid "Cannot open target \"{2}\"."
msgstr "无法打开消息"
#. mail:no-copy-folder-nostore primary
+#. mail:no-copy-folder-to-nostore primary
#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
#, fuzzy
msgid "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -15618,6 +15642,7 @@ msgid "Cannot open source \"{1}\""
msgstr "无法打开“%s”:%s"
#. mail:account-incomplete primary
+#. mail:account-notunique primary
#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
msgid "Cannot save changes to account."
msgstr ""
@@ -15634,9 +15659,8 @@ msgstr "您不能以相同的名字创建两个账户。"
#. mail:ask-delete-account title
#: mail/mail-errors.xml.h:164
-#, fuzzy
msgid "Delete account?"
-msgstr "删除选中的联系人"
+msgstr "删除账户吗?"
#. mail:ask-delete-account primary
#: mail/mail-errors.xml.h:166
@@ -15661,7 +15685,7 @@ msgstr "无法保存签名文件:%s"
#. mail:no-save-signature secondary
#: mail/mail-errors.xml.h:173
msgid "Because \"{0}\"."
-msgstr ""
+msgstr "原因是“{0}”。"
#. mail:signature-notscript primary
#: mail/mail-errors.xml.h:175
@@ -15676,15 +15700,13 @@ msgstr ""
#. mail:ask-signature-changed title
#: mail/mail-errors.xml.h:179
-#, fuzzy
msgid "Discard changed?"
-msgstr "丢弃更改(_D)"
+msgstr "丢弃更改吗?"
#. mail:ask-signature-changed primary
#: mail/mail-errors.xml.h:181
-#, fuzzy
msgid "Do you wish to save your changes?"
-msgstr "您希望保存修改吗?"
+msgstr "您希望保存更改吗?"
#. mail:ask-signature-changed secondary
#: mail/mail-errors.xml.h:183
@@ -15773,41 +15795,35 @@ msgstr ""
#: mail/mail-errors.xml.h:216
msgid "Ignore"
-msgstr ""
+msgstr "忽略"
#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
-#, fuzzy
msgid "_Overwrite"
-msgstr "覆盖"
+msgstr "覆盖(_O)"
#: mail/mail-errors.xml.h:218
-#, fuzzy
msgid "_Append"
-msgstr "发送"
+msgstr "追加(_A)"
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:791
#, c-format
msgid "Pinging %s"
msgstr "正在查验 %s"
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "工作"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
msgid "Filtering Folder"
msgstr "过滤文件夹"
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
msgid "Fetching Mail"
msgstr "收取邮件"
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "应用寄出过滤器失败:%s"
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -15816,113 +15832,113 @@ msgstr ""
"追加到 %s:%s 失败\n"
"转而追加到本地“已发”文件夹。"
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "追加到本地“已发”文件夹失败:%s"
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
#, c-format
msgid "Sending message %d of %d"
msgstr "发送第 %d 个邮件,共 %d 个"
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
#, fuzzy, c-format
msgid "Failed to send %d of %d messages"
msgstr "在第 %d 个消息失败,共 %d 个"
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
msgid "Complete."
msgstr "完成。"
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
msgid "Saving message to folder"
msgstr "把邮件保存到文件夹中"
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
#, c-format
msgid "Moving messages to %s"
msgstr "把邮件移动到 %s"
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
#, c-format
msgid "Copying messages to %s"
msgstr "把邮件复制到 %s"
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "正在“%s”中扫描文件夹"
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
msgid "Forwarded messages"
msgstr "转发的邮件"
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
#, c-format
msgid "Opening folder %s"
msgstr "正在打开文件夹 %s"
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
#, c-format
msgid "Opening store %s"
msgstr "正在打开存储 %s"
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
#, c-format
msgid "Removing folder %s"
msgstr "正在删除文件夹“%s”"
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
#, c-format
msgid "Storing folder '%s'"
msgstr "正在存储文件夹“%s”"
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
#, c-format
msgid "Expunging and storing account '%s'"
msgstr ""
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
#, fuzzy, c-format
msgid "Storing account '%s'"
msgstr "正在存储文件夹“%s”"
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
msgid "Refreshing folder"
msgstr "正在刷新文件夹"
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
msgid "Expunging folder"
msgstr "正在销毁文件夹"
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
#, c-format
msgid "Emptying trash in '%s'"
msgstr "正在清空“%s”中的已删除邮件"
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
msgid "Local Folders"
msgstr "本地文件夹"
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
#, c-format
msgid "Retrieving message %s"
msgstr "正在收取邮件 %s"
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
#, fuzzy, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "正在收取 %d 封邮件"
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
#, fuzzy, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messsages"
msgstr[0] "正在保存 %d 封邮件"
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -15931,7 +15947,7 @@ msgstr ""
"无法创建输出文件:%s\n"
" %s"
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -15940,11 +15956,11 @@ msgstr ""
"在将邮件保存到 %s 时发生错误:\n"
" %s"
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
msgid "Saving attachment"
msgstr "正在保存附件"
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -15953,17 +15969,17 @@ msgstr ""
"无法创建输出文件:%s:\n"
" %s"
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据:%s"
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
#, c-format
msgid "Disconnecting from %s"
msgstr "正在断开与 %s 的连接"
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
#, c-format
msgid "Reconnecting to %s"
msgstr "正在重新连接到 %s"
@@ -16027,24 +16043,24 @@ msgstr "正在更新..."
msgid "Waiting..."
msgstr "正在等待..."
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
msgid "User canceled operation."
msgstr "用户己取消操作。"
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
msgid "Enter Password"
msgstr "输入密码"
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
msgid "_Remember this password"
msgstr "记住该密码(_R)"
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
msgid "_Remember this password for the remainder of this session"
msgstr "在本会话中记住该密码(_R)"
@@ -16101,79 +16117,79 @@ msgstr "为 uri: %s 更新虚拟文件夹"
msgid "Updating vFolders for '%s'"
msgstr "为 uri: %s 更新虚拟文件夹"
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
msgid "vFolders"
msgstr "虚拟文件夹"
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
msgid "Edit VFolder"
msgstr "编辑虚拟文件夹"
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
msgid "New VFolder"
msgstr "新建虚拟文件夹"
-#: mail/message-list.c:946
+#: mail/message-list.c:948
msgid "Unseen"
msgstr "不可见"
-#: mail/message-list.c:947
+#: mail/message-list.c:949
msgid "Seen"
msgstr "可见"
-#: mail/message-list.c:948
+#: mail/message-list.c:950
msgid "Answered"
msgstr "已答复"
-#: mail/message-list.c:949
+#: mail/message-list.c:951
msgid "Multiple Unseen Messages"
msgstr "多封不可见邮件"
-#: mail/message-list.c:950
+#: mail/message-list.c:952
msgid "Multiple Messages"
msgstr "多封邮件"
-#: mail/message-list.c:954
+#: mail/message-list.c:956
msgid "Lowest"
msgstr "最低"
-#: mail/message-list.c:955
+#: mail/message-list.c:957
msgid "Lower"
msgstr "较低"
-#: mail/message-list.c:959
+#: mail/message-list.c:961
msgid "Higher"
msgstr "较高"
-#: mail/message-list.c:960
+#: mail/message-list.c:962
msgid "Highest"
msgstr "最高"
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
msgid "?"
msgstr "?"
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
msgid "Today %l:%M %p"
msgstr "今天 %H:%M"
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
msgid "Yesterday %l:%M %p"
msgstr "昨天 %H:%M"
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
msgid "%a %l:%M %p"
msgstr "%A %H:%M"
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
msgid "%b %d %l:%M %p"
msgstr "%m月%d日 %H:%M"
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
msgid "Generating message list"
msgstr "正在生成邮件列表"
@@ -16349,24 +16365,24 @@ msgstr "制作团队"
msgid "%ld KB"
msgstr "%m月%d日"
-#: shell/e-shell.c:744
+#: shell/e-shell.c:743
#, fuzzy
msgid "Uknown system error."
msgstr "未知的错误"
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1100
msgid "Invalid arguments"
msgstr "无效参数"
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1102
msgid "Cannot register on OAF"
msgstr "无法注册到 OAF"
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1104
msgid "Configuration Database not found"
msgstr "找不到配置数据库"
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1106
msgid "Generic error"
msgstr "通用错误"
@@ -16550,17 +16566,17 @@ msgstr "“.”和“..”是保留文件夹名。"
#: shell/e-shell-window.c:336
#, fuzzy
msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Ximian Evolution 目前在线。点击该按钮则离线工作。"
+msgstr "Ximian Evolution 目前在线。点击该按钮则脱机工作。"
#: shell/e-shell-window.c:343
#, fuzzy
msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution 正在离线过程中。"
+msgstr "Ximian Evolution 正在脱机过程中。"
#: shell/e-shell-window.c:349
#, fuzzy
msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "Ximian Evolution 目前离线。点击该按钮则在线工作。"
+msgstr "Ximian Evolution 目前脱机。点击该按钮则在线工作。"
#: shell/e-shell-window.c:621
#, fuzzy, c-format
@@ -16595,11 +16611,11 @@ msgstr "在线工作(_W)"
#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
msgid "_Work Offline"
-msgstr "离线工作(_W)"
+msgstr "脱机工作(_W)"
#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
msgid "Work Offline"
-msgstr "离线工作"
+msgstr "脱机工作"
#: shell/e-storage-set-view.etspec.h:1
msgid "Checkbox"
@@ -16609,43 +16625,6 @@ msgstr "复选框"
msgid "New"
msgstr "新建"
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"未知的错误。"
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"来自成员系统的错误为:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"来自激活系统的错误是:\n"
-"%s"
-
#: shell/evolution-test-component.c:140
msgid "New Test"
msgstr "新建测试"
@@ -16878,15 +16857,15 @@ msgstr "不要再问我"
#: shell/main.c:496
msgid "Start Evolution activating the specified component"
-msgstr ""
+msgstr "启动 Evolution 并激活指定组件"
#: shell/main.c:498
msgid "Start in offline mode"
-msgstr "以离线模式启动"
+msgstr "以脱机模式启动"
#: shell/main.c:500
msgid "Start in online mode"
-msgstr "以在线模式启动"
+msgstr "以联机模式启动"
#: shell/main.c:503
msgid "Forcibly shut down all evolution components"
@@ -16916,7 +16895,7 @@ msgstr ""
#. shell:upgrade-nospace primary
#: shell/shell-errors.xml.h:2
msgid "Insufficient disk space for upgrade."
-msgstr ""
+msgstr "磁盘空间不足以升级。"
#. shell:upgrade-nospace secondary
#: shell/shell-errors.xml.h:4
@@ -16945,21 +16924,20 @@ msgid ""
msgstr ""
#: shell/shell-errors.xml.h:15
-#, fuzzy
msgid "Continue"
-msgstr "连接"
+msgstr "继续"
#. shell:noshell title
+#. shell:noshell-reason title
#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
-#, fuzzy
msgid "Cannot start Evolution"
-msgstr "无法访问 Ximian Evolution shell。"
+msgstr "无法启动 Evolution"
#. shell:noshell primary
+#. shell:noshell-reason primary
#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
-#, fuzzy
msgid "Evolution can not start."
-msgstr "Evolution 账户助手"
+msgstr "Evolution 无法启动。"
#. shell:noshell secondary
#: shell/shell-errors.xml.h:21
@@ -16967,7 +16945,7 @@ msgid ""
"Your system configuration does not match your Evolution configuration.\n"
"\n"
"Click help for details"
-msgstr ""
+msgstr "您的系统配置与您的 Evolution 配置不相符。\n\n请单击帮助以查看细节"
#. shell:noshell-reason secondary
#: shell/shell-errors.xml.h:29
@@ -16999,36 +16977,31 @@ msgid "Serial Number"
msgstr "序列号"
#: smime/gui/certificate-manager.c:267
-#, fuzzy
msgid "Expires"
-msgstr "表达式"
+msgstr "到期"
#: smime/gui/certificate-manager.c:417
msgid "E-Mail Address"
msgstr "电子邮件地址"
#: smime/gui/certificate-viewer.c:334
-#, fuzzy, c-format
+#, c-format
msgid "Certificate Viewer: %s"
-msgstr ""
-"证书过期:%s\n"
-"发行者:%s"
+msgstr "证书查看器:%s"
#: smime/gui/component.c:45
-#, fuzzy, c-format
+#, c-format
msgid "Enter the password for `%s'"
-msgstr "为 %s 输入密码"
+msgstr "输入“%s”的密码"
#. we're setting the password initially
#: smime/gui/component.c:68
-#, fuzzy
msgid "Enter new password for certificate database"
-msgstr "输入 %s 的密码"
+msgstr "输入证书数据库的新密码"
#: smime/gui/component.c:70
-#, fuzzy
msgid "Enter new password"
-msgstr "输入密码"
+msgstr "输入新密码"
#. FIXME: add serial no, validity date, uses
#: smime/gui/e-cert-selector.c:121
@@ -17045,37 +17018,37 @@ msgid ""
" Subject: %s\n"
msgstr ""
+#: smime/gui/e-cert-selector.c:169
+msgid "Select certificate"
+msgstr "选择证书"
+
#: smime/gui/smime-ui.glade.h:1
msgid "<Not Part of Certificate>"
msgstr ""
#: smime/gui/smime-ui.glade.h:2
-#, fuzzy
msgid "<b>Certificate Fields</b>"
-msgstr "证书已撤销"
+msgstr "<b>证书域</b>"
#: smime/gui/smime-ui.glade.h:3
msgid "<b>Certificate Hierarchy</b>"
-msgstr ""
+msgstr "<b>证书层次</b>"
#: smime/gui/smime-ui.glade.h:4
-#, fuzzy
msgid "<b>Field Value</b>"
-msgstr "<b>发送电子邮件:</b>"
+msgstr "<b>域值</b>"
#: smime/gui/smime-ui.glade.h:5
msgid "<b>Fingerprints</b>"
msgstr "<b>指纹</b>"
#: smime/gui/smime-ui.glade.h:6
-#, fuzzy
msgid "<b>Issued By</b>"
-msgstr "<b>到期:</b>"
+msgstr "<b>颁发者</b>"
#: smime/gui/smime-ui.glade.h:7
-#, fuzzy
msgid "<b>Issued To</b>"
-msgstr "<b>到期:</b>"
+msgstr "<b>颁发给</b>"
#: smime/gui/smime-ui.glade.h:8
msgid "<b>This certificate has been verified for the following uses:</b>"
@@ -17087,9 +17060,8 @@ msgid "<b>Validity</b>"
msgstr "<b>状态:</b>"
#: smime/gui/smime-ui.glade.h:10
-#, fuzzy
msgid "Authorities"
-msgstr "波瓦第尔"
+msgstr "权威"
#: smime/gui/smime-ui.glade.h:11
msgid "Backup"
@@ -17119,14 +17091,12 @@ msgid "Certificate details"
msgstr "证书细节"
#: smime/gui/smime-ui.glade.h:17
-#, fuzzy
msgid "Common Name (CN)"
-msgstr "通用名"
+msgstr "通用名(CN)"
#: smime/gui/smime-ui.glade.h:18
-#, fuzzy
msgid "Contact Certificates"
-msgstr "证书 ID(_C):"
+msgstr "联系人证书"
#: smime/gui/smime-ui.glade.h:21
#, no-c-format
@@ -17309,9 +17279,8 @@ msgid "Certificate Authority Key Identifier"
msgstr "不信任的证书"
#: smime/lib/e-cert.c:626
-#, fuzzy
msgid "UID"
-msgstr "ID"
+msgstr "UID"
#: smime/lib/e-cert.c:635
#, c-format
@@ -17379,26 +17348,23 @@ msgstr "附件"
#: smime/lib/e-cert.c:830
msgid "Key Agreement"
-msgstr ""
+msgstr "密钥协议"
#: smime/lib/e-cert.c:834
-#, fuzzy
msgid "Certificate Signer"
-msgstr "证书 ID(_C):"
+msgstr "证书签名者"
#: smime/lib/e-cert.c:838
msgid "CRL Signer"
-msgstr ""
+msgstr "CRL 签名者"
#: smime/lib/e-cert.c:886
-#, fuzzy
msgid "Critical"
-msgstr "库里提巴"
+msgstr "关键"
#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
-#, fuzzy
msgid "Not Critical"
-msgstr "北卡罗莱纳州"
+msgstr "非关键"
#: smime/lib/e-cert.c:912
msgid "Extensions"
@@ -17419,37 +17385,32 @@ msgstr "发行者"
#: smime/lib/e-cert.c:1102
msgid "Issuer Unique ID"
-msgstr ""
+msgstr "发行者唯一 ID"
#: smime/lib/e-cert.c:1121
-#, fuzzy
msgid "Subject Unique ID"
-msgstr "主题是 %s"
+msgstr "主题唯一 ID"
#: smime/lib/e-cert.c:1164
-#, fuzzy
msgid "Certificate Signature Value"
-msgstr "证书签名失败"
+msgstr "证书签名值"
#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
+#: smime/lib/e-cert-db.c:608
msgid "Certificate already exists"
-msgstr "卡片 ID 已经存在"
+msgstr "证书已经存在"
#: smime/lib/e-pkcs12.c:266
msgid "PKCS12 File Password"
-msgstr ""
+msgstr "PKCS12 文件密码"
#: smime/lib/e-pkcs12.c:266
-#, fuzzy
msgid "Enter password for PKCS12 file:"
-msgstr "为 %s 输入密码"
+msgstr "输入 PKCS12 文件的密码:"
#: smime/lib/e-pkcs12.c:365
-#, fuzzy
msgid "Imported Certificate"
-msgstr "证书 ID(_C):"
+msgstr "导入的证书"
#: tools/evolution-launch-composer.c:324
msgid "An attachment to add."
@@ -17547,9 +17508,8 @@ msgid "Select all contacts"
msgstr "选中所有的联系人"
#: ui/evolution-addressbook.xml.h:23
-#, fuzzy
msgid "Send a message to the selected contacts."
-msgstr "给选定的联系人发邮件。"
+msgstr "给选中的联系人发邮件。"
#: ui/evolution-addressbook.xml.h:24
msgid "Send message to contact"
@@ -17598,9 +17558,8 @@ msgid "_Preview Pane"
msgstr "预览板(_P)"
#: ui/evolution-addressbook.xml.h:41
-#, fuzzy
msgid "_Save as VCard..."
-msgstr "另存为 VCard(_S)"
+msgstr "另存为 VCard(_S)..."
#: ui/evolution-addressbook.xml.h:42
msgid "_Select All"
@@ -17671,29 +17630,24 @@ msgid "Publish Free/Busy information for this calendar"
msgstr "为此日历发布忙闲信息"
#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
-#, fuzzy
msgid "Purg_e"
-msgstr "波治"
+msgstr "销毁(_E)"
#: ui/evolution-calendar.xml.h:24
-#, fuzzy
msgid "Purge old appointments and meetings"
-msgstr "含有约会和事件的公共文件夹"
+msgstr "销毁旧约会和会议"
#: ui/evolution-calendar.xml.h:25
-#, fuzzy
msgid "Select _Date"
-msgstr "选中所有文字"
+msgstr "选择日期(_D)"
#: ui/evolution-calendar.xml.h:27
-#, fuzzy
msgid "Select a specific date"
-msgstr "转到指定日期"
+msgstr "选择特定日期"
#: ui/evolution-calendar.xml.h:28
-#, fuzzy
msgid "Select today"
-msgstr "选择文件夹"
+msgstr "选择今天"
#: ui/evolution-calendar.xml.h:29
msgid "Show as list"
@@ -18198,9 +18152,8 @@ msgid "Filter on _Subject..."
msgstr "过滤标题(_S)..."
#: ui/evolution-mail-message.xml.h:38
-#, fuzzy
msgid "Filter the selected messages for junk status"
-msgstr "把选定的邮件标记为不重要邮件"
+msgstr "把选定的邮件标记为垃圾邮件"
#: ui/evolution-mail-message.xml.h:39
msgid "Flag selected message(s) for follow-up"
@@ -18259,14 +18212,12 @@ msgid "Mark the selected message(s) as important"
msgstr "把选定的邮件标记为重要邮件"
#: ui/evolution-mail-message.xml.h:58
-#, fuzzy
msgid "Mark the selected message(s) as junk"
-msgstr "把选定的邮件标记为不重要邮件"
+msgstr "把选定的邮件标记为垃圾邮件"
#: ui/evolution-mail-message.xml.h:59
-#, fuzzy
msgid "Mark the selected message(s) as not being junk"
-msgstr "把选定的邮件标记为未读"
+msgstr "把选定的邮件标记为非垃圾邮件"
#: ui/evolution-mail-message.xml.h:60
msgid "Mark the selected message(s) as not having been read"
@@ -18309,9 +18260,8 @@ msgid "Open the selected message in a new window"
msgstr "在新窗口中打开选中的邮件"
#: ui/evolution-mail-message.xml.h:71
-#, fuzzy
msgid "Open the selected message in the composer for editing"
-msgstr "在邮件撰写器中打开选中的邮件以便重发"
+msgstr "在撰写器中打开选中的邮件以便编辑"
#: ui/evolution-mail-message.xml.h:72
msgid "Original Si_ze"
@@ -18862,9 +18812,8 @@ msgid "_Send / Receive"
msgstr "发送/接收(_S)"
#: ui/evolution.xml.h:36
-#, fuzzy
msgid "_Window"
-msgstr "新建窗口(_W)"
+msgstr "窗口(_W)"
#: views/addressbook/galview.xml.h:1
msgid "By _Company"
@@ -18931,7 +18880,7 @@ msgid "With _Status"
msgstr "状态(_S)s"
#: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
msgid "UTC"
msgstr "UTC"
@@ -19084,53 +19033,46 @@ msgstr "其它..."
msgid "..."
msgstr "..."
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
-#, fuzzy
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
msgid "Evolution Error"
-msgstr "Evolution"
+msgstr "Evolution 错误"
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
-#, fuzzy
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
msgid "Evolution Warning"
-msgstr "Evolution 邮件"
+msgstr "Evolution 警告"
-#: widgets/misc/e-error.c:118
-#, fuzzy
+#: widgets/misc/e-error.c:119
msgid "Evolution Information"
-msgstr "会议信息"
+msgstr "Evolution 信息"
-#: widgets/misc/e-error.c:120
-#, fuzzy
+#: widgets/misc/e-error.c:121
msgid "Evolution Query"
-msgstr "Evolution 测试"
+msgstr "Evolution 查询"
#. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
#, fuzzy, c-format
msgid ""
"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
msgstr "已发送和草稿邮件"
#: widgets/misc/e-expander.c:181
-#, fuzzy
msgid "Expanded"
-msgstr "销毁(_E)"
+msgstr "已展开"
#: widgets/misc/e-expander.c:182
-#, fuzzy
msgid "Whether or not the expander is expanded"
-msgstr "删除项时要求确认(_A)"
+msgstr ""
#: widgets/misc/e-expander.c:190
msgid "Text of the expander's label"
msgstr ""
#: widgets/misc/e-expander.c:197
-#, fuzzy
msgid "Use underline"
-msgstr "未定义"
+msgstr "使用下划线"
#: widgets/misc/e-expander.c:198
msgid ""
@@ -19230,117 +19172,32 @@ msgstr "立即查找(_N)"
#. system:ask-save-file-exists-overwrite primary
#: widgets/misc/e-system-errors.xml.h:4
msgid "File exists \"{0}\"."
-msgstr ""
+msgstr "文件已存在“{0}”。"
#. system:ask-save-file-exists-overwrite secondary
#: widgets/misc/e-system-errors.xml.h:6
-#, fuzzy
msgid "Do you wish to overwrite it?"
-msgstr ""
-"%s 已经存在\n"
-"您打算覆盖它吗?"
+msgstr "您打算覆盖它吗?"
#. system:no-save-file primary
#: widgets/misc/e-system-errors.xml.h:9
-#, fuzzy
msgid "Cannot save file \"{0}\"."
msgstr ""
-"无法保存到“%s”\n"
-" %s"
+"无法保存文件“{0}”。"
#. system:no-load-file primary
#: widgets/misc/e-system-errors.xml.h:13
-#, fuzzy
msgid "Cannot open file \"{0}\"."
msgstr ""
-"无法保存到“%s”\n"
-" %s"
+"无法打开文件“{0}”。"
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
#, c-format
msgid "%s (...)"
msgstr "%s (...)"
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
-#~ msgid "Evolution Addressbook folder viewer"
-#~ msgstr "Evolution 地址簿文件夹查看器"
-
-#~ msgid "Address 2:"
-#~ msgstr "地址 2:"
-
-#~ msgid "Blog:"
-#~ msgstr "Blog:"
-
-#~ msgid "Evolution Calendar viewer"
-#~ msgstr "Evolution 日历查看器"
-
-#~ msgid "Evolution Tasks viewer"
-#~ msgstr "Evolution 任务查看器"
-
-#~ msgid "Could not initialize gnome-vfs"
-#~ msgstr "无法创始化 gnome-vfs"
-
-#~ msgid "Could not open the folder in '%s'"
-#~ msgstr "无法在“%s”中打开文件夹"
-
-#~ msgid "The URI that the calendar will display"
-#~ msgstr "日历将显示的 URI"
-
-#~ msgid "The type of view to show"
-#~ msgstr "要显示的视图"
-
-#~ msgid "Display a message"
-#~ msgstr "显示消息"
-
-#~ msgid "Select source"
-#~ msgstr "选择源"
-
-#~ msgid "calendar"
-#~ msgstr "日历"
-
-#~ msgid "task list"
-#~ msgstr "任务列表"
-
-#~ msgid "Calendar file could not be updated!\n"
-#~ msgstr "无法更新日历文件!\n"
-
-#~ msgid "The URI of the tasks folder to display"
-#~ msgstr "要显示的任务文件夹的 URI"
-
-#~ msgid "Could not load the tasks in `%s'"
-#~ msgstr "无法从“%s”中装入任务"
-
-#~ msgid "Evolution Mail folder viewer"
-#~ msgstr "Evolution 邮件文件夹查看器"
-
-#~ msgid "VFolder on Thread"
-#~ msgstr "基于线索的虚拟文件夹"
-
-#~ msgid "Filter on Thread"
-#~ msgstr "基于线索过滤"
-
-#, fuzzy
-#~ msgid "Failed to migrate pop3 uid caches: %s"
-#~ msgstr "缓冲 %s 失败:%s"
-
-#, fuzzy
-#~ msgid "Failed to migrate folder expand state: %s"
-#~ msgstr "缓冲 %s 失败:%s"
-
-#, fuzzy
-#~ msgid "Failed to open store for `%s': %s"
-#~ msgstr "解析主机“%s”:%s"
-
-#, fuzzy
-#~ msgid "URI of the mail source that the view will display"
-#~ msgstr "日历将显示的 URI"
-
-#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
-#~ msgstr "无法初始化 Ximian Evolution shell:%s"
-
-#~ msgid "_Resend..."
-#~ msgstr "重发(_R)..."