aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2003-12-08 09:52:00 +0800
committerJP Rosevear <jpr@src.gnome.org>2003-12-08 09:52:00 +0800
commitf41f003b62ed1307bc2ccc80466b51cae848c02e (patch)
tree56562654c9d3ff146f649d5b9a15b0e20a97e6b8 /po/zh_CN.po
parentaaa2bb33507ee09cfe5387a270f5712f4618fc0e (diff)
downloadgsoc2013-evolution-f41f003b62ed1307bc2ccc80466b51cae848c02e.tar.gz
gsoc2013-evolution-f41f003b62ed1307bc2ccc80466b51cae848c02e.tar.zst
gsoc2013-evolution-f41f003b62ed1307bc2ccc80466b51cae848c02e.zip
update version reliance
2003-12-07 JP Rosevear <jpr@ximian.com> * configure.in: update version reliance svn path=/trunk/; revision=23667
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po5754
1 files changed, 3531 insertions, 2223 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 701e3854cb..9c100f4a1c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
"PO-Revision-Date: 2003-09-07 11:09+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -32,51 +32,184 @@ msgstr "无法装入 %s:%s"
msgid "Could not read pilot's Address application block"
msgstr "无法读入 Pilot 的地址应用程序块"
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "自动完成文件夹"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "证书 ID(_C):"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "在这里配置您的电子邮件账号"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "联系人"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Evolution 地址簿"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution 地址簿地址弹出框"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution 地址簿地址查看器"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution 地址簿卡片查看器"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Evolution 地址簿组件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution 地址簿文件夹查看器"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution 邮件首选项控件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution 文件夹配置控件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "地址簿"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "属性..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "删除"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "重命名(_R)"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "新联系人:"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "联系人(_C)"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "创建一个新联系人"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "新建联系人列表"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "新建联系人列表"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "创建一个新的联系人列表"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "个人"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "工作"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP 服务器"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "无法创建目录 %s:%s"
+
+#: addressbook/gui/component/addressbook-config.c:416
msgid "Failed to connect to LDAP server"
msgstr "连接 LDAP 服务器失败"
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
msgid "Failed to authenticate with LDAP server"
msgstr "LDAP 服务器认证失败"
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
msgid "Could not perform query on Root DSE"
msgstr "无法在根 DSE 上执行查询"
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
msgid "The server responded with no supported search bases"
msgstr "服务器响应为没有支持的搜索起点"
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
msgid "This server does not support LDAPv3 schema information"
msgstr "此服务器不支持 LDAPv3 schema 信息"
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
msgid "Error retrieving schema information"
msgstr "检索 schema 信息错误"
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
msgid "Server did not respond with valid schema information"
msgstr "服务器没有响应有效的 schema 信息"
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "帐号名"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "服务器名"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "在本次 Evolution 创建中未打开 LDAP 支持"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "其他联系人"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
msgid ""
"We were unable to open this addressbook. Please check that the\n"
"path exists and that you have permission to access it."
@@ -84,7 +217,7 @@ msgstr ""
"我们无法打开此地址簿。请检查路径是否存在\n"
"以及您是否有足够的权限访问它。"
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the LDAP server\n"
@@ -94,7 +227,7 @@ msgstr ""
"您输入了错误的 URI,也可能是因为\n"
"LDAP 服务器已经关闭。"
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
msgid ""
"This version of Evolution does not have LDAP support\n"
"compiled in to it. If you want to use LDAP in Evolution\n"
@@ -106,7 +239,7 @@ msgstr ""
"以下链接获取 OpenLDAP,然后从程序的 CVS 源代码\n"
"重新编译程序。\n"
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the server\n"
@@ -120,44 +253,43 @@ msgstr ""
msgid "Unable to open addressbook"
msgstr "无法打开地址簿"
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
msgid "Accessing LDAP Server anonymously"
msgstr "匿名访问 LDAP 服务器"
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
msgid "Failed to authenticate.\n"
msgstr "认证失败。\n"
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%s为 %s 输入口令 (用户 %s)"
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
msgid "Name begins with"
msgstr "姓名以此开头"
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
msgid "Email begins with"
msgstr "邮件以此开头"
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
msgid "Category is"
msgstr "类别为"
#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
msgid "Any field contains"
msgstr "任何域含有"
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
msgid "Advanced..."
msgstr "高级..."
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -168,7 +300,7 @@ msgstr ""
"Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
"搜索条件,或者在此地址簿的目录服务器参数中将结果限制调高。"
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
"you have configured for this addressbook. Please make your search\n"
@@ -179,88 +311,41 @@ msgstr ""
"请在搜索的时候指定更加严格的搜索条件,或者在此地址簿的目录服务器参数\n"
"中将时间限制调高。"
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
msgid "The backend for this addressbook was unable to parse this query."
msgstr "此地址簿的后端无法解析此查询。"
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
msgid "The backend for this addressbook refused to perform this query."
msgstr "此地址簿的后端拒绝执行此查询。"
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
msgid "This query did not complete successfully."
msgstr "此查询未成功完成。"
#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
msgid "Any Category"
msgstr "任何类别"
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
#, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
msgstr "日历将显示的 URI"
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "证书 ID(_C):"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "在此配置对 LDAP 目录服务器的访问"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "联系人"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "目录服务器"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution 地址簿"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution 的地址簿 LDAP 配置控件"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution 地址簿地址弹出框"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution 地址簿地址查看器"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution 地址簿卡片查看器"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Evolution 地址簿组件"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution 地址簿文件夹查看器"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution 邮件首选项控件"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:1
@@ -283,6 +368,7 @@ msgstr " 显示支持的基础(_H) "
#: calendar/gui/dialogs/event-page.glade.h:1
#: calendar/gui/dialogs/meeting-page.glade.h:1
#: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
#: calendar/gui/dialogs/task-page.glade.h:1
#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -316,8 +402,9 @@ msgid "636"
msgstr "636"
#: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "添加 LDAP 服务器"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "LDAP 配置助手"
#: addressbook/gui/component/ldap-config.glade.h:12
msgid "Addressbook Sources"
@@ -333,9 +420,9 @@ msgid "Anonymously"
msgstr "匿名"
#: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
"\n"
"Please click the \"Finish\" button to save the settings you have entered "
"here."
@@ -344,47 +431,48 @@ msgstr ""
"\n"
"请单击“完成”按钮保存您在此输入的设置。"
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
msgid "Connecting"
msgstr "连接"
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
msgid "Distinguished _name:"
msgstr "已识别的姓名(_D):"
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
msgid "Edit LDAP Server"
msgstr "编辑 LDAP 服务器"
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
msgid "Email address:"
msgstr "电子邮件地址:"
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
msgid "Evolution will use this DN to authenticate you with the server"
msgstr "Evolution 将使用此已识别的名字在服务器上对您进行认证"
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
msgid ""
"Evolution will use this email address to authenticate you with the server"
msgstr "Evolution 将使用此电子邮件地址在服务器上对您进行认证"
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
msgid "Finished"
msgstr "已完成"
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
msgid "General"
msgstr "常规"
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "LDAP 配置助手"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "组"
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
msgid "Never"
msgstr "从不"
@@ -410,8 +498,8 @@ msgid "S_earch scope: "
msgstr "搜索范围(_E):"
#: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
msgid "Searching"
msgstr "搜索"
@@ -462,26 +550,30 @@ msgstr ""
"选择此选项可让您更改 Evolution 对 LDAP 搜索及创建和编辑联系人所用的默认设置。"
#: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
msgstr "指定显示名称是配置 LDAP 服务器所需的最后一个步骤。"
#: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "第一步:服务器信息"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "第二步:连接服务器"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "第一步:服务器信息"
#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "第三步:搜索目录"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "第二步:连接服务器"
#: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "第四步:显示姓名"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "第三步:搜索目录"
#: addressbook/gui/component/ldap-config.glade.h:52
msgid "Sub"
@@ -493,16 +585,6 @@ msgstr "支持的搜索起点"
#: addressbook/gui/component/ldap-config.glade.h:54
msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"配置 LDAP 服务器的第一个步骤是提供其名称,以及您的登录信息。\n"
-"如果您对这些信息不太了解,请询问您的系统管理员。"
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
"The options on this page control how many entries should be included in "
"your\n"
"searches, and how long a search should take. Ask your system administrator "
@@ -512,7 +594,7 @@ msgstr ""
"本页中的选项控制了在您的搜索中应当包含多少项,以及搜索将花费的时间。\n"
"如果您需要更改这些选项,请询问您的系统管理员。"
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
"searches will \n"
@@ -522,7 +604,7 @@ msgstr ""
"搜索基础是您搜索开始项的可识别名称(DN)。如果您将此处留空,搜索将从目\n"
"录树的根开始。"
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the \n"
@@ -535,27 +617,27 @@ msgstr ""
"指定的搜索基础下所属的全部项。搜索范围若为“一级”,则只会包含您指定的搜\n"
"索基础之下一级的项目。\n"
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
"\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
msgstr ""
"此助手将帮助您使用 LDAP(轻量级目录访问协议)服务器访问在线目录服务。\n"
"\n"
"添加新的 LDAP 服务器需要关于服务器的一些专业化信息。如果您对这些信\n"
"息不太了解的话,请询问您的系统管理员。"
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr "这是您的 LDAP 服务器的完整名字。例如,“ldap.mycompany.com”。"
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
msgid ""
"This is the maximum number of entries to download. Setting this number to "
"be \n"
@@ -564,7 +646,7 @@ msgstr ""
"这是可下载条目的最大数量。将此数值设定\n"
"得太大将导致地址簿变慢。"
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
msgid ""
"This is the method evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -573,7 +655,7 @@ msgstr ""
"这是 evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
"对 ldap 服务器的匿名访问权限。"
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
msgid ""
"This is the name for this server that will appear in your Evolution folder "
"list.\n"
@@ -582,6 +664,15 @@ msgstr ""
"这是此服务器在 Evolution 文件夹列表中显示的名称。\n"
"它只用于显示。"
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"这是此服务器在 Evolution 文件夹列表中显示的名称。\n"
+"它只用于显示。"
+
#: addressbook/gui/component/ldap-config.glade.h:75
msgid ""
"This is the port on the LDAP server that Evolution will try to connect to. "
@@ -609,21 +700,32 @@ msgid "Using email address"
msgstr "使用电子邮件地址"
#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
msgid "Whenever Possible"
msgstr "可能时"
#: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"配置 LDAP 服务器的第一个步骤是提供其名称,以及您的登录信息。\n"
+"如果您对这些信息不太了解,请询问您的系统管理员。"
+
+#: addressbook/gui/component/ldap-config.glade.h:85
msgid "_Display name:"
msgstr "显示名称(_D):"
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
msgid "_Download limit:"
msgstr "下载上限(_D):"
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 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:41
#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -631,54 +733,52 @@ msgstr "下载上限(_D):"
msgid "_Edit"
msgstr "编辑(_E)"
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
msgid "_Log in method:"
msgstr "登录方式(_L):"
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
msgid "_Port number:"
msgstr "端口号(_P):"
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
msgid "_Search base:"
msgstr "搜索起点(_S):"
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
msgid "_Server name:"
msgstr "服务器名(_S):"
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
msgid "_Timeout (minutes):"
msgstr "超时(分钟)(_T):"
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
msgid "cards"
msgstr "卡片"
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
msgid "connecting-tab"
msgstr "连接-页"
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
msgid "general-tab"
msgstr "常规-页"
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
msgid "searching-tab"
msgstr "搜索-页"
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "姓名"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution 的地址簿名称选择界面"
#: addressbook/gui/component/select-names/e-select-names-popup.c:205
msgid "Remove All"
msgstr "全部删除"
#: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
#: composer/e-msg-composer-attachment-bar.c:444
msgid "Remove"
msgstr "删除"
@@ -705,23 +805,21 @@ msgstr "添加到联系人"
msgid "Unnamed Contact"
msgstr "未命名的联系人"
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "姓名"
+
#: addressbook/gui/component/select-names/e-select-names-table-model.c:351
#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
msgid "Source"
msgstr "来源"
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
msgid "Select Contacts from Addressbook"
msgstr "从地址簿中选择联系人"
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "在其中查找联系人"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution 的地址簿名称选择界面"
-
#: addressbook/gui/component/select-names/select-names.glade.h:2
msgid "Find"
msgstr "查找"
@@ -798,7 +896,8 @@ msgid "D_epartment:"
msgstr "部门(_E):"
#: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
msgid "Details"
msgstr "细节"
@@ -862,12 +961,12 @@ msgid "_Categories..."
msgstr "类别(_C)..."
#: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
#: ui/evolution-tasks.xml.h:18
msgid "_Delete"
msgstr "删除(_D)"
@@ -1986,7 +2085,7 @@ msgid "Esq."
msgstr "先生"
#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
msgid "Full Name"
msgstr "全名"
@@ -2079,11 +2178,27 @@ msgstr "联系人列表编辑器"
msgid "Save List as VCard"
msgstr "将列表保存为 VCard"
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "被改变的联系人:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "冲突的联系人:"
+
#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
msgid "Duplicate Contact Detected"
msgstr "复制检测到的联系人"
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder. Would you like to add it anyway?"
+msgstr ""
+"改变后的电子邮件或姓名已经在本文件夹中存在了。\n"
+"您一定要添加吗?"
+
#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
msgid "New Contact:"
msgstr "新联系人:"
@@ -2100,22 +2215,6 @@ msgstr ""
"此联系人的姓名或地址已经在本文件夹中存在了。\n"
"您一定要添加吗?"
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "被改变的联系人:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "冲突的联系人:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder. Would you like to add it anyway?"
-msgstr ""
-"改变后的电子邮件或姓名已经在本文件夹中存在了。\n"
-"您一定要添加吗?"
-
#. FIXME: get the toplevel window...
#: addressbook/gui/search/e-addressbook-search-dialog.c:116
#: widgets/misc/e-filter-bar.c:148
@@ -2214,9 +2313,9 @@ msgstr "转发联系人"
msgid "Send Message to Contact"
msgstr "给联系人发邮件"
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
#: ui/my-evolution.xml.h:1
msgid "Print"
msgstr "打印"
@@ -2238,9 +2337,12 @@ msgstr "移动到文件夹..."
msgid "Cut"
msgstr "剪切"
+#. create the dialog
#: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr "复制"
@@ -2249,16 +2351,8 @@ msgstr "复制"
msgid "Paste"
msgstr "粘贴"
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "删除"
-
#: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
msgid "Current View"
msgstr "当前视图"
@@ -2273,166 +2367,170 @@ msgstr ""
"的地址簿后端已经崩溃。您需要重新启动 Evolution 才能再次使用该后端"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "* Click here to add a contact *"
-msgstr "* 点击此处以便添加联系人 *"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
msgid "Assistant"
msgstr "助手"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
msgid "Assistant Phone"
msgstr "助手电话"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Address"
-msgstr "商务地址"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
msgid "Business Fax"
msgstr "商务传真"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
msgid "Business Phone"
msgstr "商务电话"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
msgid "Business Phone 2"
msgstr "商务电话 2"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
msgid "Callback Phone"
msgstr "回拨电话"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
msgid "Car Phone"
msgstr "车载电话"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "类别"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
msgid "Company Phone"
msgstr "公司电话"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "部门"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
#: addressbook/gui/widgets/eab-contact-display.c:216
#: addressbook/gui/widgets/eab-contact-display.c:217
#: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
msgid "Email"
msgstr "电子邮件"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
#: addressbook/gui/widgets/eab-popup-control.c:460
msgid "Email 2"
msgstr "电子邮件 2"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
#: addressbook/gui/widgets/eab-popup-control.c:470
msgid "Email 3"
msgstr "电子邮件 3"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "姓"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
msgid "File As"
msgstr "存档为"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "忙闲 URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "家庭地址"
+#, fuzzy
+msgid "Given Name"
+msgstr "域名"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
msgid "Home Fax"
msgstr "家庭传真"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
msgid "Home Phone"
msgstr "家庭电话"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
msgid "Home Phone 2"
msgstr "家庭电话 2"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "电话"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "约旦"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
msgid "Manager"
msgstr "经理"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
msgid "Mobile Phone"
msgstr "移动电话"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
msgid "Nickname"
msgstr "昵称"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
msgid "Note"
msgstr "注释"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
msgid "Office"
msgstr "办公室"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
msgid "Organization"
msgstr "组织"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "其它地址"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
msgid "Other Fax"
msgstr "其它传真"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
msgid "Other Phone"
msgstr "其它电话"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
msgid "Pager"
msgstr "寻呼机"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
msgid "Primary Phone"
msgstr "主要电话"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "职业"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
msgid "Radio"
msgstr "收音机"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: 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-time-sel.etspec.h:9
+msgid "Role"
+msgstr "角色"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
msgid "Spouse"
msgstr "配偶"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
msgid "Telex"
msgstr "电传"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
msgid "Title"
msgstr "头衔"
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
msgid "Web Site"
msgstr "网站"
@@ -2525,11 +2623,19 @@ msgstr "成员"
msgid "Job Title"
msgstr "职称(_J):"
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "家庭地址"
+
#: addressbook/gui/widgets/eab-contact-display.c:222
#, fuzzy
msgid "Work Address"
msgstr "家庭地址"
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "其它地址"
+
#: addressbook/gui/widgets/eab-contact-display.c:227
#: addressbook/gui/widgets/eab-contact-display.c:375
#, fuzzy
@@ -2542,112 +2648,109 @@ msgstr "家庭传真"
msgid "Blog"
msgstr "博罗尼亚"
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
msgid "Success"
msgstr "成功"
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
#: camel/providers/imap/camel-imap-command.c:306
#: camel/providers/imap/camel-imap-command.c:403
#: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
msgid "Unknown error"
msgstr "未知的错误"
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
msgid "Repository offline"
msgstr "仓库离线"
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
msgid "Permission denied"
msgstr "没有权限"
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
#, fuzzy
msgid "Contact not found"
msgstr "找不到卡片"
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
#, fuzzy
msgid "Contact ID already exists"
msgstr "卡片 ID 已经存在"
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
msgid "Protocol not supported"
msgstr "不支持的协议"
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
#: camel/camel-service.c:772 camel/camel-service.c:856
#: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
#: camel/providers/pop3/camel-pop3-store.c:530
msgid "Cancelled"
msgstr "已经取消"
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
msgid "Authentication Failed"
msgstr "认证失败"
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
msgid "Authentication Required"
msgstr "必须认证"
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
msgid "TLS not Available"
msgstr "TLS 不可用"
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
msgid "Addressbook does not exist"
msgstr "地址簿不存在"
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
msgid "Other error"
msgstr "其它错误"
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
msgid "Do you want to save changes?"
msgstr "您希望保存修改吗?"
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
msgid "_Discard"
msgstr "丢弃(_D)"
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
msgid "Error adding list"
msgstr "添加列表错误"
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
#, fuzzy
msgid "Error adding contact"
msgstr "添加卡片错误"
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
msgid "Error modifying list"
msgstr "修改列表错误"
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
#, fuzzy
msgid "Error modifying contact"
msgstr "修改卡片错误"
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
msgid "Error removing list"
msgstr "删除列表错误"
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
#, fuzzy
msgid "Error removing contact"
msgstr "删除卡片错误"
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
#, fuzzy, c-format
msgid ""
"Opening %d contacts will open %d new windows as well.\n"
@@ -2656,7 +2759,7 @@ msgstr ""
"打开 %d 张卡片将同时打开 %d 个新窗口。\n"
"您真的想要显示所有卡片吗?"
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
#, c-format
msgid ""
"%s already exists\n"
@@ -2665,49 +2768,49 @@ msgstr ""
"%s 已经存在\n"
"您打算覆盖它吗?"
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
msgid "Overwrite"
msgstr "覆盖"
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
#, c-format
msgid "Error saving %s: %s"
msgstr "保存 %s 出错:%s"
#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
msgid "card.vcf"
msgstr "card.vcf"
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
msgid "list"
msgstr "列表"
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
#, fuzzy
msgid "Move contact to"
msgstr "将卡片移动到"
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
#, fuzzy
msgid "Copy contact to"
msgstr "将卡片复制到"
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
#, fuzzy
msgid "Move contacts to"
msgstr "将卡片移动到"
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
#, fuzzy
msgid "Copy contacts to"
msgstr "将卡片复制到"
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
msgid "Multiple VCards"
msgstr "多个 VCard"
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
#, c-format
msgid "VCard for %s"
msgstr "%s 的 VCard"
@@ -2902,7 +3005,7 @@ msgstr "边界"
msgid "Number of columns:"
msgstr "列数:"
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
msgid "Options"
msgstr "选项"
@@ -3089,18 +3192,18 @@ msgstr "未命名的列表"
msgid "Split Multi-Day Events:"
msgstr "分割多日事件:"
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
msgid "Could not start wombat server"
msgstr "无法启动 wombat 服务器"
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
msgid "Could not start wombat"
msgstr "无法启动 wombat"
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
msgid "Could not read pilot's Calendar application block"
msgstr "无法读入 Pilot 日历应用程序块"
@@ -3108,24 +3211,83 @@ msgstr "无法读入 Pilot 日历应用程序块"
msgid "Default Priority:"
msgstr "默认优先级:"
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
msgid "Could not read pilot's ToDo application block"
msgstr "无法读入 Pilot ToDo 应用程序块"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "日历和任务"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "日历"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "在此配置您的时区、日历和任务列表 "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution 日历和任务"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution 日历配置控件"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution 日历调度邮件查看器"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolution 日历查看器"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution 日历/任务新闻编辑器"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Evolution 任务查看器"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution 日历和任务组件"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution 测试组件"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "任务"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution 日历提醒通知服务"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
msgid "Starting:"
msgstr "开始:"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
msgid "Ending:"
msgstr "结束:"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
msgid "Evolution Alarm"
msgstr "Evolution 提醒"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
#, c-format
msgid "Alarm on %s"
msgstr "在 %s 时提醒"
@@ -3199,43 +3361,172 @@ msgstr ""
msgid "Do not ask me about this program again."
msgstr "不要再次询问此问题。"
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution 日历提醒通知服务"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
msgid "Could not initialize Bonobo"
msgstr "无法初始化 Bonobo"
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
msgid "Could not initialize gnome-vfs"
msgstr "无法创始化 gnome-vfs"
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
msgid "Could not create the alarm notify service factory"
msgstr "无法创建提醒服务车间"
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
msgid "invalid time"
msgstr "无效时间"
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalendar 错误"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "今天到期任务的颜色"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "今天到期任务的颜色"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "在周视图和月视图中显示约会结束时间(_S)"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "预览将要打印的日历"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "删除项时要求确认(_A)"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "删除项时要求确认(_A)"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "删除已完成的任务"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "在日期浏览器中显示周数(_N)"
+
+#: calendar/gui/cal-search-bar.c:49
msgid "Summary contains"
msgstr "概要含有"
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
msgid "Description contains"
msgstr "描述含有"
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
msgid "Comment contains"
msgstr "注释含有"
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
msgid "Unmatched"
msgstr "无匹配"
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
#, fuzzy
msgid ""
"This operation will permanently erase all events older than the selected "
@@ -3246,81 +3537,110 @@ msgstr ""
"\n"
"确实删除这些任务吗?"
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
#, fuzzy
msgid "Purge events older than"
msgstr "返回小于"
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
msgid "days"
msgstr "天数"
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
msgid "%A %d %B %Y"
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.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
#: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
msgid "%a %d %b"
msgstr "%m月%d日%A"
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
msgid "%a %d %b %Y"
msgstr "%Y年%m月%d日%A"
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
msgid "%d %B %Y"
msgstr "%Y年%m月%d日"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
msgid "%d %B"
msgstr "%m月%d日"
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
#, c-format
msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
msgstr ""
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "打印此日历"
+
+#: calendar/gui/calendar-component.c:428
#, fuzzy
msgid "New Calendar"
msgstr "新喀里多尼亚"
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "新建约会"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "约会(_A)"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "创建新约会"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "新闻会议"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "会议(_E)"
+
+#: calendar/gui/calendar-component.c:641
#, fuzzy
-msgid "Rename"
-msgstr "重命名(_R)"
+msgid "Create a new meeting request"
+msgstr "创建一条新任务请求"
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:646
+#, fuzzy
+msgid "New all day appointment"
+msgstr "新建全天约会"
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "个人"
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "全天约会(_D)"
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "工作"
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "创建新约会"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
#. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
msgid "On The Web"
msgstr ""
@@ -3437,7 +3757,7 @@ msgstr "发送给:"
msgid "With these arguments:"
msgstr "使用这些参数:"
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
msgid "dialog1"
msgstr "dialog1"
@@ -3453,6 +3773,10 @@ msgstr "小时"
msgid "minutes"
msgstr "分钟"
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
#: calendar/gui/dialogs/alarm-page.glade.h:1
#: calendar/gui/dialogs/recurrence-page.glade.h:2
msgid "Basics"
@@ -3485,8 +3809,8 @@ msgstr "发送电子邮件"
#: calendar/gui/dialogs/alarm-page.glade.h:8
#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
msgid "Summary:"
msgstr "概要:"
@@ -3515,7 +3839,7 @@ msgstr "约会结束"
msgid "hour(s)"
msgstr "小时"
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
msgid "minute(s)"
msgstr "分钟"
@@ -3569,7 +3893,7 @@ msgstr "天数"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
#: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
msgid "Friday"
msgstr "星期五"
@@ -3583,7 +3907,7 @@ msgstr "分钟"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
msgid "Monday"
msgstr "星期一"
@@ -3593,7 +3917,7 @@ msgstr "周日(_U)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
msgid "Saturday"
msgstr "星期六"
@@ -3607,7 +3931,7 @@ msgstr "在日期浏览器中显示周数(_N)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
msgid "Sunday"
msgstr "星期日"
@@ -3625,7 +3949,7 @@ msgstr "任务列表"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
msgid "Thursday"
msgstr "星期四"
@@ -3643,7 +3967,7 @@ msgstr "时间格式:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
msgid "Tuesday"
msgstr "星期二"
@@ -3653,12 +3977,12 @@ msgstr "一周开始(_E):"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
msgid "Wednesday"
msgstr "星期三"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
msgid "Work Week"
msgstr "一周工作日"
@@ -3695,7 +4019,7 @@ msgid "_Fri"
msgstr "周五(_F)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
msgid "_General"
msgstr "常规(_G)"
@@ -3735,76 +4059,76 @@ msgstr "周三(_W)"
msgid "before every appointment"
msgstr "在每次约会前"
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
msgid ""
"The event being deleted is a meeting, would you like to send a cancellation "
"notice?"
msgstr "即将删除的事件是一个会议,您是否想要发送一条取消通告?"
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
msgid "Are you sure you want to cancel and delete this meeting?"
msgstr "您真的要取消并删除此会议吗?"
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
msgid ""
"The task being deleted is assigned, would you like to send a cancellation "
"notice?"
msgstr "即将删除的任务已被指派,您是否想要要发送一条取消通告?"
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
msgid "Are you sure you want to cancel and delete this task?"
msgstr "您真的要取消并删除此任务吗?"
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
msgid ""
"The journal entry being deleted is published, would you like to send a "
"cancellation notice?"
msgstr "即将删除的日历项已公布,您是否想要发送一条取消通告?"
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
msgid "Are you sure you want to cancel and delete this journal entry?"
msgstr "您真的想要取消并删除该日志条目吗?"
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
msgid "This event has been deleted."
msgstr "该事件已经被删除。"
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
msgid "This task has been deleted."
msgstr "该任务已经被删除。"
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
msgid "This journal entry has been deleted."
msgstr "该日志条目已经被删除。"
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
#, c-format
msgid "%s You have made changes. Forget those changes and close the editor?"
msgstr "%s 您已经做了修改。放弃这些修改并关闭编辑器吗?"
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
#, c-format
msgid "%s You have made no changes, close the editor?"
msgstr "%s 您还没有进行修改,关闭编辑器吗?"
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
msgid "This event has been changed."
msgstr "该事件已经被更改。"
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
msgid "This task has been changed."
msgstr "该任务已经被更改。"
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
msgid "This journal entry has been changed."
msgstr "该日志条目已经被更改。"
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
#, c-format
msgid "%s You have made changes. Forget those changes and update the editor?"
msgstr "%s 您已经做出了修改。放弃这些修改并更新编辑器吗?"
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
#, c-format
msgid "%s You have made no changes, update the editor?"
msgstr "%s 您还没有进行修改,更新编辑器吗?"
@@ -3814,164 +4138,169 @@ msgstr "%s 您还没有进行修改,更新编辑器吗?"
msgid "Validation error: %s"
msgstr "校验错误:%s"
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
msgid " to "
msgstr " 到 "
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
msgid " (Completed "
msgstr " (完成 "
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
msgid "Completed "
msgstr "已完成 "
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
msgid " (Due "
msgstr " (预定 "
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
msgid "Due "
msgstr "预定 "
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
msgid "Could not update object"
msgstr "无法更新对象"
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
msgid "Edit Appointment"
msgstr "编辑约会"
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
#, c-format
msgid "Journal entry - %s"
msgstr "日志条目 - %s"
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
msgid "No summary"
msgstr "没有概要"
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
msgid "Save as..."
msgstr "另存为..."
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "如果更新到达的话,对此项目的更改将被丢弃"
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
msgid "Unable to obtain current version!"
msgstr "无法获取当前版本!"
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "为导入的数据选择目标文件夹"
+
+#: calendar/gui/dialogs/delete-comp.c:95
#, c-format
msgid "Are you sure you want to delete the appointment `%s'?"
msgstr "您真的想要删除约会“%s”吗?"
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
msgid "Are you sure you want to delete this untitled appointment?"
msgstr "您真的想要删除此无标题约会吗?"
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
#, c-format
msgid "Are you sure you want to delete the task `%s'?"
msgstr "您真的想要删除任务“%s”吗?"
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
msgid "Are you sure you want to delete this untitled task?"
msgstr "您真的想要删除此无标题任务吗?"
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
#, c-format
msgid "Are you sure you want to delete the journal entry `%s'?"
msgstr "您真的想要删除日志条目“%s”吗?"
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
msgid "Are you sure want to delete this untitled journal entry?"
msgstr "您真的想要删除此无标题日志条目吗?"
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
#, c-format
msgid "Are you sure you want to delete %d appointments?"
msgstr "您真的想要删除 %d 个约会吗?"
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
#, c-format
msgid "Are you sure you want to delete %d tasks?"
msgstr "您真的想要删除 %d 个任务吗?"
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
#, c-format
msgid "Are you sure you want to delete %d journal entries?"
msgstr "您真的想要删除 %d 个日志条目吗?"
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
msgid "The event could not be deleted due to a corba error"
msgstr "无法删除事件,原因是 corbat 错误"
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
msgid "The task could not be deleted due to a corba error"
msgstr "无法删除任务,原因是 corbat 错误"
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
msgid "The journal entry could not be deleted due to a corba error"
msgstr "无法删除日记条目,原因是 corbat 错误"
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
msgid "The item could not be deleted due to a corba error"
msgstr "无法删除项目,原因是 corbat 错误"
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
msgid "The event could not be deleted because permission was denied"
msgstr "无法删除事件,原因是权限被禁止"
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
msgid "The task could not be deleted because permission was denied"
msgstr "无法删除任务,原因是权限被禁止"
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
msgid "The journal entry could not be deleted because permission was denied"
msgstr "无法删除日记条目,原因是权限被禁止"
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
msgid "The item could not be deleted because permission was denied"
msgstr "无法删除项目,原因是权限被禁止"
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
#, fuzzy
msgid "The event could not be deleted due to an error"
msgstr "无法删除事件,原因是 corbat 错误"
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
#, fuzzy
msgid "The task could not be deleted due to an error"
msgstr "无法删除任务,原因是 corbat 错误"
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
#, fuzzy
msgid "The journal entry could not be deleted due to an error"
msgstr "无法删除日记条目,原因是 corbat 错误"
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
#, fuzzy
msgid "The item could not be deleted due to an error"
msgstr "无法删除项目,原因是 corbat 错误"
@@ -3988,43 +4317,43 @@ msgstr "授权给:"
msgid "Enter Delegate"
msgstr "输入代表"
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
msgid "Appointment"
msgstr "约会"
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
msgid "Reminder"
msgstr "提醒"
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
msgid "Recurrence"
msgstr "再现"
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
msgid "Scheduling"
msgstr "调度"
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
msgid "Meeting"
msgstr "会议"
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
msgid "Start date is wrong"
msgstr "开始日期有错"
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
msgid "End date is wrong"
msgstr "结束日期有错"
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
msgid "Start time is wrong"
msgstr "开始时间有错"
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
msgid "End time is wrong"
msgstr "结束时间有错"
@@ -4093,31 +4422,31 @@ msgid "_Start time:"
msgstr "开始时间(_S):"
#. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
msgid "None"
msgstr "无"
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
msgid "The organizer selected no longer has an account."
msgstr "选中的组织者没有帐户了。"
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
msgid "An organizer is required."
msgstr "需要一名组织者。"
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
msgid "At least one attendee is required."
msgstr "需要至少一个参加者。"
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
msgid "_Delegate To..."
msgstr "授权于(_D)..."
@@ -4158,21 +4487,15 @@ msgid "Member"
msgstr "成员"
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "角色"
-
#: calendar/gui/dialogs/meeting-page.etspec.h:10
#: calendar/gui/e-calendar-table.etspec.h:14
#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
#: mail/message-list.etspec.h:12
msgid "Status"
msgstr "状态"
@@ -4192,6 +4515,7 @@ msgid "_Invite Others..."
msgstr "邀请其他人(_I)..."
#: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
#, c-format
msgid "Source with name '%s' already exists in the selected group"
msgstr ""
@@ -4224,6 +4548,7 @@ msgid "Could not create directory for new calendar"
msgstr "无法创建目录 %s:%s"
#: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
#, fuzzy
msgid "A group must be selected"
msgstr "必须设定组织者。"
@@ -4253,33 +4578,58 @@ msgstr "日历信息"
msgid "Calendar Name"
msgstr "日历"
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "无法创建目录 %s:%s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "日历信息"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "任务列表"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "任务列表"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "任务列表"
+
+#: calendar/gui/dialogs/recur-comp.c:50
msgid "You are modifying a recurring event, what would you like to modify?"
msgstr "您即将修改再现事件,请指定您想要修改的具体内容。"
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
msgid "You are modifying a recurring task, what would you like to modify?"
msgstr "您即将修改再现任务,请指定您想要修改的具体内容。"
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
msgid ""
"You are modifying a recurring journal entry, what would you like to modify?"
msgstr "您即将修改再现日记项,请指定您想要修改的具体内容。"
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
msgid "This Instance Only"
msgstr "只是本次"
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
#, fuzzy
msgid "This and Prior Instances"
msgstr "本次和以后各次"
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
msgid "This and Future Instances"
msgstr "本次和以后各次"
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
msgid "All Instances"
msgstr "所有各次"
@@ -4327,10 +4677,15 @@ msgstr "天"
msgid "on the"
msgstr "在"
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
msgid "occurrences"
msgstr "循环"
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "日期/时间:"
+
#: calendar/gui/dialogs/recurrence-page.glade.h:1
msgid "A_dd"
msgstr "添加(_D)"
@@ -4395,7 +4750,7 @@ msgstr "周"
msgid "year(s)"
msgstr "年"
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
msgid ""
"This event has been changed, but has not been saved.\n"
"\n"
@@ -4405,31 +4760,31 @@ msgstr ""
"\n"
"您希望保存改动吗?"
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
msgid "_Discard Changes"
msgstr "丢弃修改(_D)"
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
msgid "Save Event"
msgstr "保存事件"
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
msgid "The meeting information has been created. Send it?"
msgstr "会议信息已创建。发送此信息吗?"
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
msgid "The meeting information has changed. Send an updated version?"
msgstr "会议信息已经改变。发送更新版本吗?"
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
msgid "The task assignment information has been created. Send it?"
msgstr "任务分配信息已创建。发送此信息吗?"
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
msgid "The task information has changed. Send an updated version?"
msgstr "任务信息已经改变。发送更新版本?"
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
msgid "Completed date is wrong"
msgstr "完成日期有错"
@@ -4439,43 +4794,43 @@ msgid "% _Complete"
msgstr "% 完成"
#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
msgid "Completed"
msgstr "已完成"
#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
msgid "High"
msgstr "高"
#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
msgid "In Progress"
msgstr "正在进行中"
#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
msgid "Low"
msgstr "低"
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
msgid "Normal"
msgstr "中"
#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
msgid "Not Started"
msgstr "尚未开始"
@@ -4484,7 +4839,7 @@ msgid "Progress"
msgstr "进度"
#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
msgid "Undefined"
msgstr "未定义"
@@ -4506,21 +4861,21 @@ msgstr "状态(_S):"
msgid "_Web Page:"
msgstr "网页地址(_W):"
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
msgid "Basic"
msgstr "基本"
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
msgid "Assignment"
msgstr "指派"
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
msgid "Due date is wrong"
msgstr "到期日期错误"
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
msgid "Due date is before start date!"
msgstr "到期日期先于开始日期!"
@@ -4528,9 +4883,9 @@ msgstr "到期日期先于开始日期!"
msgid "Con_fidential"
msgstr "机密(_F)"
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
msgid "Description:"
msgstr "描述:"
@@ -4635,26 +4990,21 @@ msgstr "在 %2$s 时 %1$s"
msgid "%s for an unknown trigger type"
msgstr "%s 为未知触发类型"
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
msgid "Public"
msgstr "公开"
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
msgid "Private"
msgstr "保密"
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
msgid "Confidential"
msgstr "机密"
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "类别"
-
#: calendar/gui/e-cal-list-view.etspec.h:3
#: calendar/gui/e-calendar-table.etspec.h:9
#, fuzzy
@@ -4667,28 +5017,26 @@ msgid "Start Date"
msgstr "开始日期"
#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
msgid "Summary"
msgstr "概要"
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
msgid "color"
msgstr "颜色"
#: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
#, fuzzy
msgid "component"
msgstr "约会"
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
msgid "Free"
msgstr "空闲"
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
#: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
msgid "Busy"
msgstr "繁忙"
@@ -4700,7 +5048,7 @@ msgstr "北"
msgid "S"
msgstr "南"
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
msgid "E"
msgstr "东"
@@ -4708,7 +5056,7 @@ msgstr "东"
msgid "W"
msgstr "西"
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -4718,7 +5066,7 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
#: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4726,7 +5074,7 @@ msgstr ""
msgid "Yes"
msgstr "是"
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
#: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
msgid "No"
@@ -4734,17 +5082,17 @@ msgstr "否"
#. This is the default filename used for temporary file creation
#: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
#: calendar/gui/e-meeting-list-view.c:144
#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
#: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
#: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
#: 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:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
msgid "Unknown"
msgstr "未知"
@@ -4756,181 +5104,179 @@ msgstr "重复"
msgid "Assigned"
msgstr "已委派"
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "更新对象"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
msgid "Deleting selected objects"
msgstr "删除选中的对象"
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "更新对象"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
msgid "New Meeting"
msgstr "新会议"
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
msgid "New Task"
msgstr "新建任务"
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
msgid "_Print..."
msgstr "打印(_P)..."
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
msgid "_Paste"
msgstr "粘贴(_P)"
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
msgid "Go to _Today"
msgstr "转到今天(_T)"
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
msgid "_Go to Date..."
msgstr "转到日期(_G)..."
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
msgid "_Publish Free/Busy Information"
msgstr "发布忙闲信息(_P)"
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "设置(_S)..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
#: ui/evolution-addressbook.xml.h:36
msgid "_Open"
msgstr "打开(_O)"
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
msgid "_Save As..."
msgstr "另存为(_S)..."
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
#: ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "剪切(_U)"
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
msgid "_Copy"
msgstr "复制(_C)"
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_F)..."
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
msgid "Delete this _Occurrence"
msgstr "删除此次出现(_O)"
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
msgid "Delete _All Occurrences"
msgstr "删除所有出现(_A)"
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "设置(_S)..."
+
+#: calendar/gui/e-calendar-table.c:424
msgid "0%"
msgstr "0%"
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
msgid "10%"
msgstr "10%"
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
msgid "20%"
msgstr "20%"
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
msgid "30%"
msgstr "30%"
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
msgid "40%"
msgstr "40%"
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
msgid "50%"
msgstr "50%"
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
msgid "60%"
msgstr "60%"
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
msgid "70%"
msgstr "70%"
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
msgid "80%"
msgstr "80%"
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
msgid "90%"
msgstr "90%"
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
msgid "100%"
msgstr "100%"
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
#, fuzzy
msgid "Open _Web Page"
msgstr "打开邮件(_O)"
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
msgid "_Assign Task"
msgstr "委派任务(_A)"
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
msgid "_Forward as iCalendar"
msgstr "作为 iCalendar 转发(_F)"
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
msgid "_Mark Selected Tasks as Complete"
msgstr "把任务标记为完成(_M)"
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
msgid "_Delete Selected Tasks"
msgstr "删除选定的任务(_D)"
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
#: calendar/gui/e-calendar-table.etspec.h:6
msgid "Click to add a task"
msgstr "点击以添加任务"
@@ -4944,8 +5290,8 @@ msgstr "% 完成"
msgid "Alarms"
msgstr "提醒"
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
msgid "Complete"
msgstr "完成"
@@ -4974,18 +5320,18 @@ msgid "URL"
msgstr "URL"
#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: 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.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: 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"
msgstr "%Y/%m/%d %A %p%H:%M:%S"
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -5004,7 +5350,7 @@ msgstr "%02i 分钟分割"
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
msgid "%A %d %B"
msgstr "%B%d日%A"
@@ -5017,442 +5363,441 @@ msgstr "%B%d日"
#. String to use in 12-hour time format for times in the morning.
#: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
msgid "am"
msgstr "上午"
#. String to use in 12-hour time format for times in the afternoon.
#: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
msgid "pm"
msgstr "下午"
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
#, c-format
msgid "start_calendar_server(): %s"
msgstr ""
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
msgid "Yes. (Complex Recurrence)"
msgstr "是(复杂重现)"
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
msgid "Every day"
msgstr "每天"
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
#, c-format
msgid "Every %d days"
msgstr "每 %d 天"
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
msgid "Every week"
msgstr "每周"
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
#, c-format
msgid "Every %d weeks"
msgstr "每 %d 周"
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
msgid "Every week on "
msgstr "每周的"
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
#, c-format
msgid "Every %d weeks on "
msgstr "每 %d 周的"
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
msgid " and "
msgstr " 和 "
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
#, c-format
msgid "The %s day of "
msgstr "第 %s 天属于"
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
#, c-format
msgid "The %s %s of "
msgstr "%s %s 属于"
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
msgid "every month"
msgstr "每月"
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
#, c-format
msgid "every %d months"
msgstr "每 %d 个月"
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
msgid "Every year"
msgstr "每年"
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
#, c-format
msgid "Every %d years"
msgstr "每 %d 年"
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
#, c-format
msgid " a total of %d times"
msgstr " 总计 %d 次"
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
msgid ", ending on "
msgstr ",结束于 "
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
msgid "<b>Starts:</b> "
msgstr "<b>开始:</b>"
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
msgid "<b>Ends:</b> "
msgstr "<b>结束:</b>"
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
msgid "<b>Completed:</b> "
msgstr "<b>已完成:</b> "
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
msgid "<b>Due:</b> "
msgstr "<b>到期:</b>"
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
msgid "iCalendar Information"
msgstr "iCalendar 信息"
#. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
msgid "iCalendar Error"
msgstr "iCalendar 错误"
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
msgid "An unknown person"
msgstr "未知的人"
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作。"
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
msgid "<i>None</i>"
msgstr "<i>无</i>"
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
msgid "Location:"
msgstr "位置:"
#. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
msgid "Status:"
msgstr "状态:"
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
#: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
#: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
msgid "Accepted"
msgstr "接受"
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
msgid "Tentatively Accepted"
msgstr "暂时接受"
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
#: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
#: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
msgid "Declined"
msgstr "拒绝"
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
msgid "Choose an action:"
msgstr "选择一项活动:"
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
msgid "Update"
msgstr "更新"
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "确定"
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
msgid "Accept"
msgstr "接受"
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
msgid "Tentatively accept"
msgstr "暂时接受"
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
msgid "Decline"
msgstr "拒绝"
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
msgid "Send Free/Busy Information"
msgstr "发送忙闲信息"
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
msgid "Update respondent status"
msgstr "更新应答者状态"
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
msgid "Send Latest Information"
msgstr "发送最新的信息"
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> 发布了会议信息。"
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
msgid "Meeting Information"
msgstr "会议信息"
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
#, 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:1271
+#: calendar/gui/e-itip-control.c:1269
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请求您参加一个会议。"
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
msgid "Meeting Proposal"
msgstr "会议建议"
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> 希望加入到已存的会议。"
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
msgid "Meeting Update"
msgstr "会议更新"
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> 想收到最新的会议信息。"
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
msgid "Meeting Update Request"
msgstr "会议更新请求"
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> 已回复一个会议请求。"
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
msgid "Meeting Reply"
msgstr "会议答复"
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
msgid "Meeting Cancellation"
msgstr "会议取消"
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> 发送了一个无法理解的信息。"
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
msgid "Bad Meeting Message"
msgstr "错误的会议信息"
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> 发布了任务信息。"
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
msgid "Task Information"
msgstr "任务信息"
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> 请求 %s 完成一个任务。"
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请求您完成一个任务。"
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
msgid "Task Proposal"
msgstr "任务建议"
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s<b> 希望加入到已存在的任务。"
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
msgid "Task Update"
msgstr "任务更新"
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> 希望获取最新的任务信息。"
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
msgid "Task Update Request"
msgstr "任务更新请求"
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> 已经回复了任务委派。"
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
msgid "Task Reply"
msgstr "任务回复"
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> 取消了任务。"
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
msgid "Task Cancellation"
msgstr "任务取消"
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
msgid "Bad Task Message"
msgstr "错误的任务邮件"
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> 发布了忙闲信息。"
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
msgid "Free/Busy Information"
msgstr "忙闲信息"
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请求您的忙闲信息。"
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
msgid "Free/Busy Request"
msgstr "忙/闲请求"
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> 应答了忙闲请求。"
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
msgid "Free/Busy Reply"
msgstr "忙闲应答"
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
msgid "Bad Free/Busy Message"
msgstr "错误的忙闲信息"
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
msgid "The message does not appear to be properly formed"
msgstr "邮件的格式可能不正确"
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
msgid "The message contains only unsupported requests."
msgstr "邮件只含有不支持的请求。"
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
msgid "The attachment does not contain a valid calendar message"
msgstr "附件中没有有效的日历信息"
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日历项目"
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
msgid "Calendar file could not be updated!\n"
msgstr "无法更新日历文件!\n"
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
msgid "Update complete\n"
msgstr "更新完成\n"
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新参与者状态"
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
msgid "Object is invalid and cannot be updated\n"
msgstr "对象无效,无法更新\n"
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "此响应并非来自当前参与者。将响应者加为参与者吗?"
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新参与者状态!\n"
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
msgid "There was an error on the CORBA system\n"
msgstr "CORBA 系统出错\n"
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
msgid "Object could not be found\n"
msgstr "找不到对象\n"
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
msgid "You don't have the right permissions to update the calendar\n"
msgstr "您没有适当的权限打开日历\n"
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
msgid "Attendee status updated\n"
msgstr "更新参与者状态\n"
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
msgid "Attendee status could not be updated!\n"
msgstr "无法更新参与者状态!\n"
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
msgid "Removal Complete"
msgstr "删除完成"
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
msgid "Item sent!\n"
msgstr "项目已发送!\n"
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
@@ -5612,7 +5957,7 @@ msgstr "%Y年%m月%d日%A"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
#: 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:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
msgid "%m/%d/%Y"
msgstr "%Y年%m月%d日"
@@ -5676,49 +6021,44 @@ msgstr "会议开始时间(_S):"
msgid "Meeting _end time:"
msgstr "会议结束时间(_E):"
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
#, fuzzy
msgid "Start Date:"
msgstr "开始日期(_R):"
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
#, fuzzy
msgid "Due Date:"
msgstr "到期日期(_D):"
#. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
#, fuzzy
msgid "Priority:"
msgstr "优先级(_P):"
#. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
#, fuzzy
msgid "Web Page:"
msgstr "页面"
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "在 %s 打开任务"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
#, c-format
msgid "Could not load the tasks in `%s'"
msgstr "无法从“%s”中装入任务"
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
#, c-format
msgid "The method required to load `%s' is not supported"
msgstr "不支持装入“%s”必需的方法"
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
#, c-format
msgid "You don't have permission to open the folder in `%s'"
msgstr "您没有适当的权限打开“%s”中的文件夹"
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
#, c-format
msgid ""
"Error on %s:\n"
@@ -5727,48 +6067,39 @@ msgstr ""
"%s 错误:\n"
" %s"
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
msgid "Completing tasks..."
msgstr "正在完成的日期..."
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
msgid "Deleting selected objects..."
msgstr "正在删除选中的对象..."
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
msgid "Expunging"
msgstr "正在销毁"
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
#: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "任务"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
msgid "Calendar"
msgstr "日历"
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
#, c-format
msgid "Could not open the folder in `%s'"
msgstr "无法打开“%s”中的文件夹"
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr "不支持打开“%s”必需的方法"
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
#, c-format
msgid "Adding alarms for %s"
msgstr "添加关于 %s 的提醒"
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
#, c-format
msgid ""
"The task backend for\n"
@@ -5778,7 +6109,7 @@ msgstr ""
"%s\n"
"的任务后端已经崩溃。您需要重新启动 Evolution 才能再次使用该后端"
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
#, c-format
msgid ""
"The calendar backend for\n"
@@ -5788,58 +6119,11 @@ msgstr ""
"%s\n"
"的日历后端已经崩溃。您需要重新启动 Evolution 才能再次使用该后端"
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
#, fuzzy
msgid "Purging"
msgstr "都灵"
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "日历和任务"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "日历"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "在此配置您的时区、日历和任务列表 "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution 日历和任务"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution 日历配置控件"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution 日历调度邮件查看器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution 日历查看器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution 日历/任务新闻编辑器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution 任务查看器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution 日历和任务组件"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution 测试组件"
-
#: calendar/gui/goto-dialog.glade.h:1
msgid "April"
msgstr "四月"
@@ -5896,296 +6180,332 @@ msgstr "十月"
msgid "September"
msgstr "九月"
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
msgid "An organizer must be set."
msgstr "必须设定组织者。"
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
msgid "At least one attendee is necessary"
msgstr "至少需要一个参加者"
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
msgid "Event information"
msgstr "事件信息"
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
msgid "Task information"
msgstr "任务信息"
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
msgid "Journal information"
msgstr "日志信息"
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
msgid "Free/Busy information"
msgstr "忙闲信息"
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
msgid "Calendar information"
msgstr "日历信息"
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
msgid "Updated"
msgstr "更新"
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
msgid "Refresh"
msgstr "刷新"
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
msgid "Counter-proposal"
msgstr "投票表决"
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "忙闲信息 (%s 到 %s)"
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
msgid "iCalendar information"
msgstr "iCalendar 信息"
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
msgid "You must be an attendee of the event."
msgstr "您必须是事件的参与者。"
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
msgid "1st"
msgstr "1日"
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
msgid "2nd"
msgstr "2日"
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
msgid "3rd"
msgstr "3日"
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
msgid "4th"
msgstr "4日"
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
msgid "5th"
msgstr "5日"
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
msgid "6th"
msgstr "6日"
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
msgid "7th"
msgstr "7日"
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
msgid "8th"
msgstr "8日"
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
msgid "9th"
msgstr "9日"
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
msgid "10th"
msgstr "10日"
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
msgid "11th"
msgstr "11日"
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
msgid "12th"
msgstr "12日"
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
msgid "13th"
msgstr "13日"
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
msgid "14th"
msgstr "14日"
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
msgid "15th"
msgstr "15日"
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
msgid "16th"
msgstr "16日"
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
msgid "17th"
msgstr "17日"
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
msgid "18th"
msgstr "18八日"
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
msgid "19th"
msgstr "19日"
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
msgid "20th"
msgstr "20日"
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
msgid "21st"
msgstr "21日"
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
msgid "22nd"
msgstr "22日"
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
msgid "23rd"
msgstr "23日"
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
msgid "24th"
msgstr "24日"
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
msgid "25th"
msgstr "25日"
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
msgid "26th"
msgstr "二十六日"
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
msgid "27th"
msgstr "27日"
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
msgid "28th"
msgstr "28日"
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
msgid "29th"
msgstr "29日"
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
msgid "30th"
msgstr "30日"
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
msgid "31st"
msgstr "31日"
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
msgid "Su"
msgstr "日"
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
msgid "Mo"
msgstr "一"
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
msgid "Tu"
msgstr "二"
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
msgid "We"
msgstr "三"
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
msgid "Th"
msgstr "四"
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
msgid "Fr"
msgstr "五"
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
msgid "Sa"
msgstr "六"
#. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
msgid "Selected day (%a %b %d %Y)"
msgstr "选中的日期 (%Y年%m月%d日%A)"
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
msgid "%a %b %d"
msgstr "%m月%d日%A"
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
msgid "%a %d %Y"
msgstr "%Y年%d日%A"
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
msgid "%a %b %d %Y"
msgstr "%Y年%m月%d日%A"
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
#, c-format
msgid "Selected week (%s - %s)"
msgstr "选中的周(%s - %s)"
#. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
msgid "Selected month (%b %Y)"
msgstr "选中的月(%Y年%m月)"
#. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
msgid "Selected year (%Y)"
msgstr "选中的年 (%Y年)"
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
msgid "Task"
msgstr "任务"
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
#, c-format
msgid "Status: %s"
msgstr "状态:%s"
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
#, c-format
msgid "Priority: %s"
msgstr "优先级:%s"
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
#, c-format
msgid "Percent Complete: %i"
msgstr "完成率:%i"
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
#, c-format
msgid "Categories: %s"
msgstr "类别:%s"
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
msgid "Contacts: "
msgstr "联系人:"
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
msgid "Print Preview"
msgstr "打印预览"
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
msgid "Print Item"
msgstr "打印项"
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
msgid "Print Setup"
msgstr "打印设置"
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "重命名此快捷方式"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "任务列表"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "新建任务"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "任务(_T)"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "创建新任务"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
#: calendar/gui/tasks-control.c:148
msgid "The URI of the tasks folder to display"
msgstr "要显示的任务文件夹的 URI"
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -6196,11 +6516,11 @@ msgstr ""
"\n"
"确实删除这些任务吗?"
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
msgid "Do not ask me again."
msgstr "不要再次询问。"
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
msgid "Print Tasks"
msgstr "打印任务"
@@ -6228,15 +6548,15 @@ msgstr "iCalendar 文件(.ics)"
msgid "vCalendar files (.vcf)"
msgstr "vCalendar 文件(.vcf)"
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
msgid "Reminder!!"
msgstr "提醒!!"
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
msgid "Calendar Events"
msgstr "日历事件"
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
msgid ""
"Evolution has found Gnome Calendar files.\n"
"Would you like to import them into Evolution?"
@@ -6244,7 +6564,7 @@ msgstr ""
"Evolution 已找到 Gnome 日历文件。\n"
"您是否原意把它们导入 Evolution?"
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
msgid "Gnome Calendar"
msgstr "Gnome 日历"
@@ -7777,27 +8097,27 @@ msgstr "太平洋/沃利斯"
msgid "Pacific/Yap"
msgstr "太平洋/雅浦"
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
msgid "Signing is not supported by this cipher"
msgstr "该密码不支持签名"
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
msgid "Verifying is not supported by this cipher"
msgstr "该密码不支持验证"
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
msgid "Encryption is not supported by this cipher"
msgstr "该密码不支持加密"
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
msgid "Decryption is not supported by this cipher"
msgstr "该密码不支持解密"
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
msgid "You may not import keys with this cipher"
msgstr "您不能用此密码导入密钥"
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
msgid "You may not export keys with this cipher"
msgstr "您不能用此密码导出密钥"
@@ -7849,86 +8169,86 @@ msgstr "正在准备脱机文件夹“%s”"
msgid "You must be working online to complete this operation"
msgstr "您必须在线工作以便完成该操作"
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
#: camel/camel-process.c:48
#, c-format
msgid "Failed to create pipe to '%s': %s"
msgstr "创建到“%s”的管道失败:%s"
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
#, c-format
msgid "Failed to create create child process '%s': %s"
msgstr "创建子进程“%s”失败:%s"
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "收到 %s 发来的无效信息流:%s"
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
msgid "Syncing folders"
msgstr "同步文件夹"
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "解析过滤规则出错:%s:%s"
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "执行过滤规则错误:%s:%s"
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
msgid "Unable to open spool folder"
msgstr "无法打开脱机文件夹"
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
msgid "Unable to process spool folder"
msgstr "无法处理脱机文件夹"
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "正在获取邮件 %d (%d%%)"
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
msgid "Cannot open message"
msgstr "无法打开消息"
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
#, c-format
msgid "Failed on message %d"
msgstr "在消息 %d 失败"
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
msgid "Syncing folder"
msgstr "正在同步文件夹"
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
#, c-format
msgid "Getting message %d of %d"
msgstr "正在获取第 %d 个消息,共 %d 个"
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
#, c-format
msgid "Failed at message %d of %d"
msgstr "在第 %d 个消息失败,共 %d 个"
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
msgid "Failed to retrieve message"
msgstr "检索消息失败。"
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
msgid "Invalid arguments to (system-flag)"
msgstr "(system-flag)参数无效"
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
msgid "Invalid arguments to (user-tag)"
msgstr "(user-tag)参数无效"
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "执行过滤规则搜索错误:%s:%s"
@@ -7960,35 +8280,35 @@ msgstr "(match-all) 需要一个布尔结果"
msgid "Performing query on unknown header: %s"
msgstr "正在对未知的头进行查询:%s"
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr "不支持的操作:附加邮件:附加 %s"
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr "不支持的操作:按表达式搜索:搜索 %s"
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
#, c-format
msgid "Unsupported operation: search by uids: for %s"
msgstr "不支持的操作:按 uid 搜索:搜索 %s"
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
msgid "Moving messages"
msgstr "正在移动邮件"
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
msgid "Copying messages"
msgstr "正在复制邮件"
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
#, fuzzy
msgid "Filtering new message(s)"
msgstr "正在收取 %d 封邮件"
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -7999,15 +8319,15 @@ msgstr ""
"\n"
"%s"
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
msgid "Failed to parse gpg userid hint."
msgstr "解析 gpg userid 提示失败。"
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
msgid "Failed to parse gpg passphrase request."
msgstr "解析 gpg 密码句请求失败。"
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -8016,30 +8336,30 @@ msgstr ""
"您需要一个密码句用来解锁以下用户:\n"
"“%s”"
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
msgid "Cancelled."
msgstr "已取消"
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr "解锁密钥失败:给出了 3 个错误的密码句。"
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "来自 GnuPG 的意外应答:%s"
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
msgid "No data provided"
msgstr "未提供数据"
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
msgid "Failed to encrypt: No valid recipients specified."
msgstr "加密失败:没有指定有效的收件人。"
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
#, c-format
msgid ""
"Failed to GPG %s: %s\n"
@@ -8050,49 +8370,61 @@ msgstr ""
"\n"
"%s"
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
#, c-format
msgid "Failed to GPG %s: %s\n"
msgstr "GPG %s 失败:%s\n"
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
#, fuzzy, c-format
msgid "Could not generate signing data: %s"
msgstr "无法写数据:%s"
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "执行 gpg 失败:%s"
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
msgid "Failed to execute gpg."
msgstr "执行 gpg 失败。"
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
msgid "This is a digitally signed message part"
msgstr "这是消息的数字签名部分"
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "无法校验邮件签名:无法创建临时文件:%s"
+
+#: camel/camel-gpg-context.c:1392
#, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr "无法校验邮件签名:无法创建临时文件:%s"
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
#, fuzzy, c-format
msgid "Could not generate encrypting data: %s"
msgstr "无法写数据:%s"
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
#, fuzzy
msgid "This is a digitally encrypted message part"
msgstr "这是消息的数字签名部分"
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "索引邮件体内容"
+
+#: camel/camel-gpg-context.c:1632
#, fuzzy
msgid "Unable to parse message content"
msgstr "无法从编辑器检索邮件"
@@ -8191,15 +8523,15 @@ msgstr "写入邮件临时文件错误:%s"
msgid "Error copying mail temp file: %s"
msgstr "复制邮件临时文件错误:%s"
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
msgid "Failed to decrypt MIME part: protocol error"
msgstr "解密 MIME 部分失败:协议错误"
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
msgid "Failed to decrypt MIME part: invalid structure"
msgstr "解密 MIME 部分失败:无效的结构"
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
msgid "parse error"
msgstr "解析错误"
@@ -8504,12 +8836,12 @@ msgstr "虚拟文件夹电子邮件提供者"
msgid "For reading mail as a query of another set of folders"
msgstr "关于将读入邮件作为对另一组文件夹的查询"
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
#, c-format
msgid "No provider available for protocol `%s'"
msgstr "协议“%s”没有可用的提供者"
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -8518,71 +8850,82 @@ msgstr ""
"无法创建目录 %s:\n"
"%s"
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
#, fuzzy, c-format
msgid "Enter security pass-phrase for `%s'"
msgstr "为 %s 输入密码"
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
#, fuzzy
msgid "Unverified"
msgstr "未定义"
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
#, fuzzy
msgid "Good signature"
msgstr "编辑签名"
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
#, fuzzy
msgid "Bad signature"
msgstr "编辑签名"
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
msgid "Content tampered with or altered in transit"
msgstr ""
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
#, fuzzy
msgid "Signing certificate not found"
msgstr "链中的自签名证书"
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
#, fuzzy
msgid "Signing certificate not trusted"
msgstr "不信任的证书"
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
msgid "Signature algorithm unknown"
msgstr ""
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
msgid "Siganture algorithm unsupported"
msgstr ""
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
#, fuzzy
msgid "Malformed signature"
msgstr "保存签名"
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
#, fuzzy
msgid "Processing error"
msgstr "解析错误"
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
#, fuzzy, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "服务器:%s,类型:%s"
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
msgid "Cannot get folder: Invalid operation on this store"
msgstr "无法获取文件夹:对该存储的无效操作"
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
msgid "Cannot create folder: Invalid operation on this store"
msgstr "无法创建文件夹:对该存储的无效操作"
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "回收站"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "六月"
+
#: camel/camel-tcp-stream-openssl.c:568
msgid "Unable to get issuer's certificate"
msgstr "无法获取发行者的证书"
@@ -8791,7 +9134,7 @@ msgstr ""
"证书撤销列表已过期:%s\n"
"发行者:%s"
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
#, c-format
msgid "Could not parse URL `%s'"
msgstr "无法解析 URL “%s”"
@@ -8810,22 +9153,22 @@ msgstr "在 %2$s 中没有消息 %1$s"
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "无法将消息移动或复制到虚拟文件夹中"
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "无法删除文件夹:%s:无效操作"
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "无法删除文件夹:%s:没有该文件夹"
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "无法重命名文件夹:%s:无效操作"
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "无法重命名文件夹:%s:没有该文件夹"
@@ -8905,7 +9248,7 @@ msgstr "无法检索邮件:%s"
#: 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:422
+#: 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
@@ -8919,7 +9262,7 @@ msgstr ""
#: camel/providers/imap/camel-imap-folder.c:1923
#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
#: camel/providers/local/camel-mh-folder.c:200
msgid "No such message"
msgstr "没有该邮件"
@@ -8957,54 +9300,69 @@ msgid "Failed to cache %s: %s"
msgstr "缓冲 %s 失败:%s"
#: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "正在连接服务器..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "连接 LDAP 服务器失败"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "公司"
+
+#: camel/providers/imap/camel-imap-provider.c:50
msgid "Checking for new mail"
msgstr "正在检查新邮件"
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
msgid "Check for new messages in all folders"
msgstr "在所有文件夹中检查新邮件"
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
msgid "Folders"
msgstr "文件夹"
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
msgid "Show only subscribed folders"
msgstr "只显示订约了的文件夹"
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
msgid "Override server-supplied folder namespace"
msgstr "覆盖服务器提供的文件夹命名空间"
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
msgid "Namespace"
msgstr "命名空间"
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
msgid "Apply filters to new messages in INBOX on this server"
msgstr "应用过滤规则到本服务器上收件箱中的新邮件"
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
#, fuzzy
msgid "Automatically synchronize remote mail locally"
msgstr "自动检查邮件的间隔(_A)"
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
msgid "IMAP"
msgstr "IMAP"
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
msgid "For reading and storing mail on IMAP servers."
msgstr "IMAP 服务器上的邮件的读写。"
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
#: camel/providers/imapp/camel-imapp-provider.c:65
#: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
msgid "Password"
msgstr "密码"
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
#: camel/providers/imapp/camel-imapp-provider.c:67
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
@@ -9255,7 +9613,7 @@ msgid "Could not rename folder %s to %s: %s"
msgstr "无法将文件夹 %s 改名为 %s:%s"
#: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
#, c-format
msgid "Could not rename '%s': %s"
msgstr "无法重命名“%s”:%s"
@@ -9370,29 +9728,29 @@ msgstr "正在检查新邮件"
msgid "Storing folder"
msgstr "存储文件夹"
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
#: camel/providers/local/camel-spool-folder.c:148
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr "无法在 %s 创建文件夹锁:%s"
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
#, c-format
msgid "Cannot open mailbox: %s: %s\n"
msgstr "无法打开邮件箱:%s:%s\n"
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
msgid "Mail append cancelled"
msgstr "邮件追加取消"
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
#, c-format
msgid "Cannot append message to mbox file: %s: %s"
msgstr "无法将邮件附加到邮件箱文件:%s:%s"
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: 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"
@@ -9401,11 +9759,11 @@ msgstr ""
"无法从文件夹 %2$s 获取邮件:%1$s\n"
" %3$s"
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
msgid "The folder appears to be irrecoverably corrupted."
msgstr "文件夹好像已经被不可恢复地破坏了。"
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
msgid "Message construction failed: Corrupt mailbox?"
msgstr "邮件构造失败:邮件箱已损坏?"
@@ -9473,12 +9831,17 @@ msgstr "无法创建目录 %s:%s"
msgid "Cannot create folder: %s: %s"
msgstr "无法获取文件夹:%s:%s"
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "卡片 ID 已经存在"
+
+#: camel/providers/local/camel-mbox-store.c:409
#, fuzzy, c-format
msgid "Could not rename %s to %s: %s"
msgstr "无法将文件夹 %s 改名为 %s:%s"
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
#, fuzzy
msgid "The new folder name is illegal."
msgstr "指定的文件夹名称不合法:%s"
@@ -9522,7 +9885,7 @@ msgstr "无法关闭来源文件夹 %s:%s"
msgid "Could not close temp folder: %s"
msgstr "无法关闭临时文件夹:%s"
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
#, c-format
msgid "Could not rename folder: %s"
msgstr "无法重命名文件夹:%s"
@@ -9807,7 +10170,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:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
msgid "POP"
msgstr "POP"
@@ -9893,7 +10256,7 @@ msgid "No such folder `%s'."
msgstr "没有文件夹“%s”。"
#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
msgid "Sendmail"
msgstr "Sendmail"
@@ -9945,7 +10308,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:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
msgid "SMTP"
msgstr "SMTP"
@@ -10111,7 +10474,7 @@ msgstr "通过 %s 发送 SMTP 邮件"
msgid "Cannot send message: sender address not valid."
msgstr "无法发送邮件:发件人地址不合法。"
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
msgid "Sending message"
msgstr "正在发送邮件"
@@ -10232,7 +10595,7 @@ msgstr "%.0fM"
msgid "%.0fG"
msgstr "%.0fG"
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
msgid "attachment"
msgstr "附件"
@@ -10276,11 +10639,11 @@ msgstr "MIME 类型:"
msgid "Suggest automatic display of attachment"
msgstr "建议自动显示附件"
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
msgid "You need to configure an account before you can compose mail."
msgstr "在您可以撰写邮件之前您需要配置一个帐户。"
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
msgid "Click here for the address book"
msgstr "点击此处以使用地址簿"
@@ -10291,45 +10654,45 @@ msgstr "点击此处以使用地址簿"
#. * because that causes from_changed to be called, which
#. * expects the reply_to fields to be initialized.
#.
-#: composer/e-msg-composer-hdrs.c:513
+#: composer/e-msg-composer-hdrs.c:510
msgid "Reply-To:"
msgstr "回复到:"
#.
#. * From
#.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
msgid "From:"
msgstr "发件人:"
#.
#. * Subject
#.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
msgid "Subject:"
msgstr "主题:"
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
msgid "To:"
msgstr "收信人:"
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
msgid "Enter the recipients of the message"
msgstr "输入邮件的收件人"
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
msgid "Cc:"
msgstr "抄送:"
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "输入将接收该邮件副本的收件人地址"
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
msgid "Bcc:"
msgstr "暗中抄送:"
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -10338,14 +10701,19 @@ msgstr "输入将接收该邮件副本,但不出现在收件人列表中的收
#.
#. * Post-To
#.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
msgid "Post To:"
msgstr "投递到:"
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
msgid "Posting destination"
msgstr "投递目的"
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "把文件附件到邮件"
+
#: composer/e-msg-composer-select-file.c:119
msgid "Attach file(s)"
msgstr "添加附件"
@@ -10380,21 +10748,21 @@ msgstr "文件存在,覆盖它?"
msgid "Error saving file: %s"
msgstr "保存文件错误:%s"
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
#, c-format
msgid "Error loading file: %s"
msgstr "读入文件错误:%s"
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
#, c-format
msgid "Error accessing file: %s"
msgstr "访问文件错误:%s"
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
msgid "Unable to retrieve message from editor"
msgstr "无法从编辑器检索邮件"
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
#, c-format
msgid ""
"Unable to seek on file: %s\n"
@@ -10403,7 +10771,7 @@ msgstr ""
"无法搜索文件:%s\n"
"%s"
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
#, c-format
msgid ""
"Unable to truncate file: %s\n"
@@ -10412,7 +10780,7 @@ msgstr ""
"无法截断文件:%s\n"
"%s"
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
#, c-format
msgid ""
"Unable to copy file descriptor: %s\n"
@@ -10421,7 +10789,7 @@ msgstr ""
"无法复制文件描述符:%s\n"
"%s"
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
#, c-format
msgid ""
"Error autosaving message: %s\n"
@@ -10430,7 +10798,7 @@ msgstr ""
"自动存储邮件错误:%s\n"
" %s"
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
msgid ""
"Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"
@@ -10438,7 +10806,7 @@ msgstr ""
"Ximian Evolution 发现上次会话含有未保存的文件。\n"
"您是否希望恢复它们?"
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
#, c-format
msgid ""
"The message \"%s\" has not been sent.\n"
@@ -10449,28 +10817,28 @@ msgstr ""
"\n"
"您是否希望保存修改?"
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
msgid "Warning: Modified Message"
msgstr "警告:已改动的邮件"
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
msgid "Open file"
msgstr "打开文件"
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
msgid "Signature:"
msgstr "签名:"
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
msgid "Autogenerated"
msgstr "自动生成的"
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
msgid "Compose a message"
msgstr "撰写邮件"
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
@@ -10478,7 +10846,7 @@ msgstr ""
"无法创建撰写窗口:\n"
"无法激活地址选择控制。"
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component.\n"
@@ -10490,7 +10858,7 @@ msgstr ""
"请确定您的 gtkhtml 和 libgtkhtml 所安装的版\n"
"本正确。\n"
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
@@ -10498,18 +10866,20 @@ msgstr ""
"无法创建撰写窗口:\n"
"无法激活 HTML 编辑器组件。"
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
msgstr "<b>(编写器含有不可编辑的非文本消息体。)<b>"
#: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
msgstr "Evolution 群件套件"
#: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
msgstr "Ximian Evolution"
#: data/evolution.keys.in.h:1
@@ -10758,13 +11128,13 @@ msgstr "%H:%M:%S"
#. strptime format for time of day, without seconds,
#. in 12-hour format.
#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
msgid "%I:%M %p"
msgstr "%p %I:%M"
#. strptime format for time of day, without seconds 24-hour format.
#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
msgid "%H:%M"
msgstr "%H:%M"
@@ -10883,7 +11253,7 @@ msgstr "则"
msgid "You must specify a folder."
msgstr "您必须指定文件夹。"
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
#: mail/mail-account-gui.c:1099
msgid "Select Folder"
msgstr "选择文件夹"
@@ -10897,24 +11267,24 @@ msgstr ""
"常规表达式错误 “%s”:\n"
"%s"
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
msgid "Important"
msgstr "重要"
#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
msgid "To Do"
msgstr "待办"
#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
#: shell/e-config-upgrade.c:1458
msgid "Later"
msgstr "稍候"
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
msgid "Test"
msgstr "测试"
@@ -11008,7 +11378,7 @@ msgstr "过去"
msgid "months"
msgstr "月"
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
msgid "seconds"
msgstr "秒"
@@ -11105,7 +11475,7 @@ msgstr "表达式"
msgid "Follow Up"
msgstr "跟随"
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
msgid "Label"
msgstr "标签"
@@ -11175,112 +11545,118 @@ msgid "Source Account"
msgstr "来源帐号"
#: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "冰雾"
+
+#: filter/libfilter-i18n.h:36
msgid "Specific header"
msgstr "指定邮件头"
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
msgid "Stop Processing"
msgstr "停止处理"
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
msgid "Subject"
msgstr "主题"
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
msgid "Unset Status"
msgstr "未设置状态"
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
msgid "contains"
msgstr "含有"
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
msgid "does not contain"
msgstr "不含有"
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
msgid "does not end with"
msgstr "不以之结尾"
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
msgid "does not exist"
msgstr "不存在"
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
msgid "does not return"
msgstr "不返回"
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
msgid "does not sound like"
msgstr "听起来不像"
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
msgid "does not start with"
msgstr "不以之开始"
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
msgid "ends with"
msgstr "以之结束"
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
msgid "exists"
msgstr "存在"
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
msgid "is Flagged"
msgstr "有标志"
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
msgid "is after"
msgstr "以后"
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
msgid "is before"
msgstr "以前"
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
msgid "is greater than"
msgstr "大于"
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
msgid "is less than"
msgstr "小于"
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
msgid "is not Flagged"
msgstr "未标志"
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
msgid "is not"
msgstr "不是"
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
msgid "is"
msgstr "是"
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
msgid "returns greater than"
msgstr "返回大于"
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
msgid "returns less than"
msgstr "返回小于"
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
msgid "returns"
msgstr "返回"
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
msgid "sounds like"
msgstr "听起来象"
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
msgid "starts with"
msgstr "以之开始"
#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
#, c-format
msgid "Rule name '%s' is not unique, choose another."
msgstr "规则名“%s”不唯一,请另外选择一个名称。"
@@ -11305,18 +11681,77 @@ msgstr "规则名"
msgid "Score Rules"
msgstr "计分规则"
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
msgid "You must name this vfolder."
msgstr "您必须为该虚拟文件夹命名。"
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
msgid "You need to to specify at least one folder as a source."
msgstr "您至少需要把一个文件夹指定为源。"
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
msgid "VFolder source"
msgstr "虚拟文件夹来源"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "编写器首选项"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "在此配置邮件首选项,包括安全和邮件显示"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "在此配置拼写检查、签名和邮件编写器"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "在这里配置您的电子邮件账号"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution 邮件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution 邮件账户配置控制"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution 邮件组件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution 邮件撰写器"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution 邮件撰写控件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution 邮件文件夹查看器"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution 邮件首选项控件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "邮件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "邮件帐号"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "邮件首选项"
+
#: mail/em-account-prefs.c:233
msgid "Are you sure you want to delete this account?"
msgstr "您确信您要删除该帐号吗?"
@@ -11358,7 +11793,7 @@ msgid "Protocol"
msgstr "协议"
#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
msgid "Unnamed"
msgstr "未命名"
@@ -11382,18 +11817,15 @@ msgstr "添加脚本签名"
msgid "Signature(s)"
msgstr "签名"
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
msgid ""
"You are sending an HTML-formatted message. Please make sure that\n"
"the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
msgstr "您即将发送 HTML 格式的邮件。请确定下列收件人愿意接收 HTML 邮件:\n"
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "仍然发送?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
msgid ""
"This message has no subject.\n"
"Really send?"
@@ -11401,7 +11833,7 @@ msgstr ""
"该消息没有主题。\n"
"确实要发送?"
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
msgid ""
"Since the contact list you are sending to is configured to hide the list's "
"addresses, this message will contain only Bcc recipients."
@@ -11409,11 +11841,11 @@ msgstr ""
"由于您正在发送的邮件的接收人列表被配置为隐藏列表的地址,该消息将只含有密件抄"
"送收件人。"
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
msgid "This message contains only Bcc recipients."
msgstr "该邮件只含有密件抄送收件人。"
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
msgid ""
"It is possible that the mail server may reveal the recipients by adding an "
"Apparently-To header.\n"
@@ -11422,11 +11854,11 @@ msgstr ""
"邮件服务器可能会以添加 Apparent-To 头而使收件人可见。\n"
"仍然发送?"
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
msgid "You must specify recipients in order to send this message."
msgstr "您必须指定收件人以便发送该消息。"
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
@@ -11438,187 +11870,399 @@ msgstr ""
msgid "Create _Virtual Folder From Search..."
msgstr "根据搜索创建虚拟文件夹(_V)..."
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "邮件"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
#: shell/evolution-folder-selector-button.c:100
msgid "<click here to select a folder>"
msgstr "<点击这里以便选择文件夹>"
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "“%2$s”中的“%1$s”"
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "创建新文件夹"
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "指定在哪里创建文件夹:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
msgstr "文件夹名称(_N):"
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "无法创建临时目录:%s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "无法创建临时目录:%s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "无法创建临时文件“%s”:%s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "无法关闭临时文件夹:%s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "装入..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
msgid "Select folder"
msgstr "选择文件夹"
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "创建新文件夹"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "无法删除文件夹“%s”:%s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "您真的要删除文件夹“%s”吗?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "删除“%s”"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "把文件夹“%s”重命名为:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "重命名文件夹"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr "已经存在名为“%s”的文件夹。请使用不同的名称。"
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "字体属性"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "属性"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "文件夹名称(_F):"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "查看(_V)"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "在新窗口中打开"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "移动"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "新建文件夹(_N)..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "重命名(_R)"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "属性(_P)..."
+
#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
msgid "_Edit as New Message..."
msgstr "作为新邮件进行编辑(_E)..."
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
msgid "_Print"
msgstr "打印(_P)"
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
msgid "Reply to _All"
msgstr "回复所有人(_A)"
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
msgid "_Forward"
msgstr "转发(_F)"
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
msgid "Follo_w Up..."
msgstr "跟随(_W)..."
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
msgid "Fla_g Completed"
msgstr "已完成标志(_G)"
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
msgid "Cl_ear Flag"
msgstr "清除标志(_E)"
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
msgid "Mar_k as Read"
msgstr "标记为已读(_K)"
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
msgid "Mark as _Unread"
msgstr "标记为未读(_U)"
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
msgid "_Mark as Unimportant"
msgstr "标记为不重要(_M)"
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "标记为未读(_U)"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "标记为重要(_I)"
+
+#: mail/em-folder-view.c:706
msgid "U_ndelete"
msgstr "取消删除(_N)"
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
msgid "Mo_ve to Folder..."
msgstr "移动到文件夹(_V)..."
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
msgid "_Copy to Folder..."
msgstr "复制到文件夹(_C)..."
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
msgid "Add Sender to Address_book"
msgstr "将发件人添加到地址簿(_B)"
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
msgid "Appl_y Filters"
msgstr "应用过滤规则(_Y)"
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
msgid "Crea_te Rule From Message"
msgstr "从邮件创建规则(_T)"
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
msgid "VFolder on _Subject"
msgstr "基于主题的虚拟文件夹(_S)"
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
msgid "VFolder on Se_nder"
msgstr "基于发件人的虚拟文件夹(_N)"
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
msgid "VFolder on _Recipients"
msgstr "基于收件人的虚拟文件夹(_R)"
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
msgid "VFolder on Mailing _List"
msgstr "基于邮件列表的虚拟文件夹(_L)"
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
#, fuzzy
msgid "VFolder on Thread"
msgstr "基于发件人的虚拟文件夹(_N)"
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
msgid "Filter on Sub_ject"
msgstr "基于主题过滤(_J)"
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
msgid "Filter on Sen_der"
msgstr "基于发件人过滤(_D)"
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
msgid "Filter on Re_cipients"
msgstr "基于收件人过滤(_C)"
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
msgid "Filter on _Mailing List"
msgstr "基于邮件列表过滤(_M)"
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
#, fuzzy
msgid "Filter on Thread"
msgstr "基于发件人过滤(_D)"
#. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
msgid "Default"
msgstr "默认"
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
msgid "Print Message"
msgstr "打印消息"
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
#, fuzzy
msgid "_Copy Link Location"
msgstr "复制链接位置"
#. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
#, fuzzy, c-format
msgid "Matches: %d"
msgstr "匹配:"
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "已委派"
+
+#: mail/em-format-html-display.c:597
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee the sender of the message "
+"is authentic."
+msgstr "该邮件有数字签名,但不能证实是可信的。"
+
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "编辑签名"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "编辑签名"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr "input_token 包含无效的签名,或者无法验证签名。"
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "被中断"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted. It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
+"This message is encrypted, but with a weak encryption algorithm. It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP 加密"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted. It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "无法解析 MIME 邮件。显示源文本。"
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "不支持的方案"
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "无法校验叶子签名"
+
+#: mail/em-format-html-display.c:917
#, fuzzy
msgid "_View Inline"
msgstr "嵌入视图"
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
#, fuzzy
msgid "_Hide"
msgstr "隐藏"
@@ -11628,184 +12272,207 @@ msgstr "隐藏"
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
#, fuzzy, c-format
msgid "Retrieving `%s'"
msgstr "正在收取邮件 %s"
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "该邮件有数字签名,但不能证实是可信的。"
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "该邮件有数字签名,并被证实为可信。"
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "无法初始化 Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "不支持的方案"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
msgid "Could not parse MIME message. Displaying as source."
msgstr "无法解析 MIME 邮件。显示源文本。"
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
#, fuzzy
msgid "Formatting message"
msgstr "正在移动邮件"
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
msgid "From"
msgstr "发件人"
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
msgid "Reply-To"
msgstr "回复至"
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
#: mail/message-list.etspec.h:14
msgid "To"
msgstr "收件人"
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
msgid "Cc"
msgstr "抄送"
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
msgid "Bcc"
msgstr "密件抄送"
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
msgid "Mailer"
msgstr "邮件程序"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
msgid "<I> (%a, %R %Z)</I>"
msgstr ""
#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
msgid "<I> (%R %Z)</I>"
msgstr ""
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
#: mail/message-list.etspec.h:2
msgid "Date"
msgstr "日期"
-#: mail/em-format.c:893
+#: mail/em-format.c:892
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "无法解析 MIME 邮件。显示源文本。"
+msgid "Session not initialised"
+msgstr "无法初始化 Bonobo"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "该邮件有数字签名,并被证实为可信。"
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "该邮件有数字签名,但不能证实是可信的。"
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "正在等待..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "正在查验 %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "缓冲 %s 失败:%s"
-#: mail/em-popup.c:593
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "创建到“%s”的管道失败:%s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "解析主机“%s”:%s"
+
+#: mail/em-popup.c:599
#, fuzzy
msgid "Save As..."
msgstr "另存为(_A)..."
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
msgid "Set as _Background"
msgstr ""
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
#, fuzzy
msgid "_Reply to sender"
msgstr "回复发件人(_R)"
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
#, fuzzy
msgid "_Open Link in Browser"
msgstr "在浏览器中打开链接"
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
#, fuzzy
msgid "Se_nd message to..."
msgstr "把邮件发送到列表(_M)..."
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
#, fuzzy
msgid "_Add to Addressbook"
msgstr "将发件人添加到地址簿"
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
#, c-format
msgid "Open in %s..."
msgstr "在 %s 中打开..."
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
#, fuzzy
msgid "This store does not support subscriptions, or the are not enabled."
msgstr "此服务器不支持 LDAPv3 schema 信息"
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
#, fuzzy
msgid "Subscribed"
msgstr "订阅"
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
msgid "Folder"
msgstr "文件夹"
#. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
msgid "Please select a server."
msgstr "请选择服务器。"
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
msgid "No server has been selected"
msgstr "没有选定服务器"
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
msgid "Don't show this message again."
msgstr "不再显示此信息。"
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -11814,27 +12481,27 @@ msgstr ""
"装入过滤规则信息错误:\n"
"%s"
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
msgid "Filters"
msgstr "过滤规则"
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
#, fuzzy
msgid "-------- Forwarded Message --------"
msgstr "转发的邮件"
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
msgid "an unknown sender"
msgstr "未知的发件人"
#. translators: attribution string used when quoting messages,
#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
#, fuzzy
msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
msgstr "在%Y年%m月%d日的%H:%M,%%s写道:"
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
#, c-format
msgid ""
"Cannot save to `%s'\n"
@@ -11843,7 +12510,7 @@ msgstr ""
"无法保存到“%s”\n"
" %s"
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
#, c-format
msgid ""
"`%s' already exists.\n"
@@ -11852,25 +12519,26 @@ msgstr ""
"%s 已经存在。\n"
"您打算覆盖它吗?"
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
#, fuzzy
msgid "message"
msgstr "邮件"
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
#, fuzzy
msgid "Save Message..."
msgstr "邮件另存为..."
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "无法创建临时目录:%s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "地址"
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
"\n"
"Really erase these messages?"
msgstr ""
@@ -11879,58 +12547,425 @@ msgstr ""
"\n"
"确实删除这些邮件吗?"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "编写器首选项"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "在此配置邮件首选项,包括安全和邮件显示"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"该操作将永久删除所有标记为完成的邮件。\n"
+"如果您继续,您将无法恢复这些邮件。\n"
+"\n"
+"确实删除这些邮件吗?"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "在此配置拼写检查、签名和邮件编写器"
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
+msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "在这里配置您的电子邮件账号"
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution 邮件"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution 邮件账户配置控制"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution 邮件组件"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution 邮件撰写器"
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "邮件的默认主题。"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution 邮件撰写控件"
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "邮件的默认主题。"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution 邮件文件夹查看器"
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "在显示邮件的邮件体中搜索文本"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution 邮件首选项控件"
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "在显示邮件的邮件体中搜索文本"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "转发方式(_F):"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "回复风格(_R):"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "退出时清空已删除邮件(_T)"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "退出时清空已删除邮件(_T)"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
msgstr "邮件帐号"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "邮件首选项"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "执行动作"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "新邮件提醒"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "新邮件提醒"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "发送只有暗送收件人的邮件时提示(_O)"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "发送 HTML 邮件?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "发送 HTML 邮件?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "显示动画图像(_S)"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "显示动画图像(_S)"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "以普通样式显示邮件"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "预览板(_P)"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "新邮件到达时播放声音文件(_P)"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "拼写检查(_C)"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "终端字体(_T):"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "选择用于打印的 HTML 变宽度字体"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "按线索编排的邮件列表"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "按线索编排的邮件列表"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "使它成为我的默认帐号(_M)"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "变宽(_A):"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm 导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox 导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape 邮件导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine 导入器"
#: mail/importers/elm-importer.c:105
msgid "Evolution is importing your old Elm mail"
@@ -11970,34 +13005,6 @@ msgstr ""
msgid "Elm"
msgstr "Elm"
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm 导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox 导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape 邮件导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine 导入器"
-
#: mail/importers/netscape-importer.c:75
#, c-format
msgid "Priority Filter \"%s\""
@@ -12053,12 +13060,6 @@ msgstr ""
msgid "Evolution is importing your old Netscape data"
msgstr "Evolution 正在导入您原来的 Netscape 数据"
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "回收站"
-
#: mail/importers/netscape-importer.c:1995
msgid "Scanning mail filters"
msgstr "正在扫描过滤器"
@@ -12067,7 +13068,7 @@ msgstr "正在扫描过滤器"
msgid "Scanning directory"
msgstr "正在扫描目录"
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
msgid "Starting import"
msgstr "开始导入"
@@ -12142,23 +13143,23 @@ msgid "You have not filled in all of the required information."
msgstr "您还没有填写所有必须的信息。"
#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
msgid "Evolution Account Editor"
msgstr "Evolution 帐号编辑器"
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
msgid "_Host:"
msgstr "主机(_H):"
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
msgid "User_name:"
msgstr "用户名(_N):"
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
msgid "_Path:"
msgstr "路径(_P):"
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
msgid "You may not create two accounts with the same name."
msgstr "您不能以相同的名字创建两个帐号。"
@@ -12167,35 +13168,35 @@ msgstr "您不能以相同的名字创建两个帐号。"
msgid "Mail to %s"
msgstr "邮寄给 %s"
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
#, c-format
msgid "Subject is %s"
msgstr "主题是 %s"
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
#, c-format
msgid "Mail from %s"
msgstr "来自 %s 的邮件"
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
#, c-format
msgid "%s mailing list"
msgstr "%s 邮件列表"
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
#, fuzzy, c-format
msgid "Replies to %s"
msgstr "已回复"
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
msgid "Add Filter Rule"
msgstr "添加过滤规则"
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
msgid "The following filter rule(s):\n"
msgstr "下列过滤器规则:\n"
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
#, c-format
msgid ""
"Used the removed folder:\n"
@@ -12206,143 +13207,30 @@ msgstr ""
" “%s”\n"
"已经被更新。"
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "正在连接..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
msgid "On this Computer"
msgstr ""
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "该文件夹不能含有邮件。"
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "新建邮件"
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "无法打开共享文件夹:%s。"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "无法创建临时目录:%s"
-
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "无法创建临时文件“%s”:%s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "邮件(_M)"
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "无法关闭临时文件夹:%s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "撰写一封新邮件"
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
#, c-format
msgid ""
"The following error occured while migrating your mail data:\n"
"%s"
msgstr ""
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "为导入的数据选择目标文件夹"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "为导入的数据选择目标文件夹"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "创建新文件夹"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "指定在哪里创建文件夹:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "无法删除文件夹“%s”:%s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "您真的要删除文件夹“%s”吗?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "删除“%s”"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "把文件夹“%s”重命名为:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "重命名文件夹"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "指定的文件夹名称不合法:%s"
-
-#: mail/mail-component.c:1860
-#, fuzzy, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "已经存在名为“%s”的文件夹。请使用不同的名称。"
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "字体属性"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "属性"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "文件夹名称(_F):"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "查看(_V)"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "在新窗口中打开"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "移动"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "新建文件夹(_N)..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "重命名(_R)"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "属性(_P)..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
msgid "Identity"
msgstr "标识"
@@ -12398,11 +13286,11 @@ msgstr ""
"您即将完成邮件配置的过程了。您提供的用于收件服务器和发送方式将被组合在一起,"
"成为 Evolution 的邮件帐户。请在下面输入此帐户的名称。此名称只会用作显示。"
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
msgid "Checking Service"
msgstr "检查服务"
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
msgid "Connecting to server..."
msgstr "正在连接服务器..."
@@ -12484,26 +13372,35 @@ msgid "C_olors"
msgstr "颜色(_O)"
#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "检查新邮件"
+
+#: mail/mail-config.glade.h:27
msgid "Check spelling while I _type"
msgstr "在我输入时进行拼写检查(_T)"
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
msgid "Checking for New Mail"
msgstr "检查新邮件"
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
msgid "Color for _misspelled words:"
msgstr "给错误拼写的单词上色(_M):"
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
msgid "Composing Messages"
msgstr "撰写邮件"
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
msgid "Configuration"
msgstr "配置"
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -12518,272 +13415,277 @@ msgstr ""
"\n"
"单击“应用”可保存您的设置。"
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
msgid "De_fault"
msgstr "默认(_F)"
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
msgid "Default Behavior"
msgstr "默认行为"
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
msgid "Default character _encoding:"
msgstr "默认字符编码(_E):"
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
msgid "Deleting Mail"
msgstr "删除邮件"
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
#, fuzzy
msgid "Digitally _sign outgoing messages (by default)"
msgstr "当使用该帐号时总是发送签名邮件(_A)"
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
msgid "Do not quote original message"
msgstr "无法引用原始消息"
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(_M)(同 Outlook 兼容)"
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Done"
msgstr "完成"
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
msgid "Drafts _folder:"
msgstr "草稿文件夹(_F):"
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
msgid "E_nable"
msgstr "启用(_N)"
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
msgid "Email Accounts"
msgstr "电子邮件"
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
msgid "Email _address:"
msgstr "电子邮件地址(_A):"
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
msgid "Empty _trash folders on exit"
msgstr "退出时清空已删除邮件(_T)"
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
#, fuzzy
msgid "Encry_ption certificate:"
msgstr "证书 ID(_C):"
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
msgid "Evolution Account Assistant"
msgstr "Evolution 帐号助手"
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
msgid "Execute Command..."
msgstr "执行命令..."
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
msgid "Fi_xed -width:"
msgstr "固定宽度(_X):"
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "过滤规则"
+
+#: mail/mail-config.glade.h:59
msgid "Font Properties"
msgstr "字体属性"
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
msgid "Format messages in _HTML"
msgstr "用 HTML 格式化邮件(_H)"
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
msgid "Highlight _quotations with"
msgstr "突出显示引用(_Q)"
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
msgid "IMAPv4 "
msgstr "IMAPv4"
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
msgid "Inline"
msgstr "嵌入"
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
msgid "Kerberos "
msgstr "Kerberos"
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
msgid "Labels and Colors"
msgstr "标签和颜色"
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
msgid "Loading Images"
msgstr "装入图像"
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
msgid "Mail Configuration"
msgstr "邮件配置"
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
msgid "Mailbox location"
msgstr "邮件箱位置"
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
msgid "Message Composer"
msgstr "邮件撰写器"
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
msgid "Message Display"
msgstr "邮件显示"
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
msgid "Message Fonts"
msgstr "邮件字体"
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
msgid "New Mail Notification"
msgstr "新邮件提醒"
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
msgstr "注意:直到您第一次连接的时候,才会询问密码。"
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
msgid "Optional Information"
msgstr "可选的信息"
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
msgid "Or_ganization:"
msgstr "组织(_G):"
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG 键标识(_K):"
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
msgid "Pick a color"
msgstr "选取一种颜色"
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr "发送只有暗送收件人的邮件时提示(_O)"
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
msgid "Pretty Good Privacy (PGP/GPG)"
msgstr "Pretty Good Privacy (PGP/GPG)"
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
msgid "Printed Fonts"
msgstr "打印用字体"
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
msgid "Qmail maildir "
msgstr "Qmail maildir "
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
msgid "Quote original message"
msgstr "引用原始消息"
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
msgid "Quoted"
msgstr "引用"
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
msgid "Re_member this password"
msgstr "记住该密码(_M)"
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
msgid "Re_ply-To:"
msgstr "回复到(_P):"
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
msgid "Receiving Email"
msgstr "接收电子邮件"
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
msgid "Receiving _Options"
msgstr "接收选项(_O)"
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
msgid "Remember this _password"
msgstr "记住此密码(_P)"
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
msgid "Required Information"
msgstr "必需的信息"
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
msgid "Restore Defaults"
msgstr "恢复默认值"
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
msgid "S_ecurity"
msgstr "安全(_E)"
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
msgid "Secure MIME (S/MIME)"
msgstr "安全 MIME (S/MIME)"
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
msgid "Select HTML fixed width font"
msgstr "选择 HTML 固定宽度字体"
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
msgid "Select HTML fixed width font for printing"
msgstr "选择用于打印的 HTML 固定宽度字体"
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
msgid "Select HTML variable width font"
msgstr "选择 HTML 变宽度字体"
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
msgid "Select HTML variable width font for printing"
msgstr "选择用于打印的 HTML 变宽度字体"
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
msgid "Sending Email"
msgstr "发送电子邮件"
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
msgid "Sent _messages folder:"
msgstr "已发送邮件文件夹(_M):"
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
msgid "Sent and Draft Messages"
msgstr "已发送和草稿邮件"
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
msgid "Ser_ver requires authentication"
msgstr "服务器需要认证(_V)"
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
msgid "Server Configuration"
msgstr "服务器配置"
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
msgid "Server _Type: "
msgstr "服务器类型(_T):"
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
#, fuzzy
msgid "Si_gning certificate:"
msgstr "链中的自签名证书"
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
msgid "Specify _filename:"
msgstr "指定文件名(_F):"
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
msgid "Spell _Checking"
msgstr "拼写检查(_C)"
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
msgid "Standard Unix mbox"
msgstr "标准 Unix mbox"
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -12792,7 +13694,7 @@ msgstr ""
"此脚本的输出将用于您的签名。您指定的名称将只会\n"
"用于显示。"
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
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 "
@@ -12800,7 +13702,7 @@ msgid ""
msgstr ""
"此页面允许您配置拼写检查行为和语言。在此列出的语言反映了您所安装的字典。"
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -12808,11 +13710,15 @@ msgstr ""
"输入您想要给此帐户起的名字。\n"
"如:“工作”或“私人”"
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
msgid "V_ariable-width:"
msgstr "变宽(_A):"
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -12822,169 +13728,178 @@ msgstr ""
"\n"
"单击“前进”开始。"
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
msgid "_Add Signature"
msgstr "添加签名(_A)"
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
msgid "_Always load images off the net"
msgstr "总是离线装入图像(_A)"
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
msgid "_Always sign outgoing messages when using this account"
msgstr "当使用该帐号时总是发送签名邮件(_A)"
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
msgid "_Authentication Type: "
msgstr "验证类型(_A):"
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
msgid "_Authentication type: "
msgstr "验证类型(_A):"
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
msgid "_Automatically check for new mail every"
msgstr "自动检查邮件的间隔(_A)"
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
msgid "_Automatically insert smiley images"
msgstr "自动插入笑脸图像(_A)"
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
msgid "_Beep when new mail arrives"
msgstr "新邮件到达时鸣笛(_B)"
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
msgid "_Confirm when expunging a folder"
msgstr "当销毁文件夹时进行提示(_C)"
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
msgid "_Default signature:"
msgstr "默认签名(_D):"
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
msgid "_Defaults"
msgstr "默认(_D)"
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
msgid "_Do not notify me when new mail arrives"
msgstr "新邮件到达时不要提醒我(_D)"
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
msgid "_Enable"
msgstr "启用(_E)"
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
msgid "_Encrypt outgoing messages (by default)"
msgstr ""
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
msgid "_Forward style:"
msgstr "转发方式(_F):"
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
msgid "_Full name:"
msgstr "全名(_F):"
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
msgid "_HTML Mail"
msgstr "HTML 邮件(_H)"
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
msgid "_Identity"
msgstr "标识(_I)"
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "六月"
+
+#: mail/mail-config.glade.h:156
msgid "_Load images if sender is in addressbook"
msgstr "如果发件人在地址簿中就装入图像(_L)"
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
msgid "_Make this my default account"
msgstr "使它成为我的默认帐号(_M)"
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
msgid "_Mark messages as read after"
msgstr "把邮件标记为已读前等(_M)"
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
msgid "_Name:"
msgstr "名称(_N):"
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
msgid "_Never load images off the net"
msgstr "从不离线装入图像(_N)"
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
msgid "_Play sound file when new mail arrives"
msgstr "新邮件到达时播放声音文件(_P)"
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
msgid "_Prompt when sending HTML messages to contacts that don't want them"
msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
msgid "_Prompt when sending messages with an empty subject line"
msgstr "发送空主题行的邮件时提示(_P)"
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
msgid "_Receiving Mail"
msgstr "接收邮件(_R)"
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
msgid "_Reply style:"
msgstr "回复风格(_R):"
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
msgid "_Restore defaults"
msgstr "恢复默认值(_R)"
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
msgid "_Script:"
msgstr "脚本(_S):"
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
#, fuzzy
msgid "_Select..."
msgstr "删除..."
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
msgid "_Sending Mail"
msgstr "发送邮件(_S)"
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
msgid "_Show animated images"
msgstr "显示动画图像(_S)"
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
msgid "_Signatures"
msgstr "签名(_S)"
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
msgid "_Standard Font:"
msgstr "标准字体(_S):"
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
msgid "_Terminal Font:"
msgstr "终端字体(_T):"
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
msgid "_Use secure connection (SSL):"
msgstr "使用安全连接 (SSL)(_U):"
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
msgid "_Use the same fonts as other applications"
msgstr "使用与其它应用程序相同的字体(_U)"
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
msgid "description"
msgstr "描述"
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
#, c-format
msgid "Pinging %s"
msgstr "正在查验 %s"
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
#, c-format
msgid ""
"Error while '%s':\n"
@@ -12993,7 +13908,7 @@ msgstr ""
"当“%s”时错误:\n"
"%s"
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
#, c-format
msgid ""
"Error while performing operation:\n"
@@ -13002,7 +13917,7 @@ msgstr ""
"执行操作时错误:\n"
"%s"
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
msgid "Working"
msgstr "工作"
@@ -13014,12 +13929,12 @@ msgstr "过滤文件夹"
msgid "Fetching Mail"
msgstr "收取邮件"
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "应用寄出过滤器失败:%s"
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -13028,106 +13943,106 @@ msgstr ""
"追加到 %s:%s 失败\n"
"转而追加到本地“已发”文件夹。"
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "追加到本地“已发”文件夹失败:%s"
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
#, c-format
msgid "Sending \"%s\""
msgstr "正在发送“%s”"
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
#, c-format
msgid "Sending message %d of %d"
msgstr "发送第 %d 个邮件,共 %d 个"
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
#, c-format
msgid "Failed on message %d of %d"
msgstr "在第 %d 个邮件失败,共 %d 个"
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
msgid "Complete."
msgstr "完成。"
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
msgid "Saving message to folder"
msgstr "把邮件保存到文件夹中"
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
#, c-format
msgid "Moving messages to %s"
msgstr "把邮件移动到 %s"
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
#, c-format
msgid "Copying messages to %s"
msgstr "把邮件复制到 %s"
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "正在“%s”中扫描文件夹"
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
msgid "Forwarded messages"
msgstr "转发的邮件"
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
#, c-format
msgid "Opening folder %s"
msgstr "正在打开文件夹 %s"
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
#, c-format
msgid "Opening store %s"
msgstr "正在打开存储 %s"
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
#, c-format
msgid "Removing folder %s"
msgstr "正在删除文件夹“%s”"
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
#, c-format
msgid "Storing folder '%s'"
msgstr "正在存储文件夹“%s”"
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
msgid "Refreshing folder"
msgstr "正在刷新文件夹"
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
msgid "Expunging folder"
msgstr "正在销毁文件夹"
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
#, c-format
msgid "Emptying trash in '%s'"
msgstr "正在清空“%s”中的已删除邮件"
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
msgid "Local Folders"
msgstr "本地文件夹"
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
#, c-format
msgid "Retrieving message %s"
msgstr "正在收取邮件 %s"
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
#, c-format
msgid "Retrieving %d message(s)"
msgstr "正在收取 %d 封邮件"
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
#, c-format
msgid "Saving %d messsage(s)"
msgstr "正在保存 %d 封邮件"
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -13136,7 +14051,7 @@ msgstr ""
"无法创建输出文件:%s\n"
" %s"
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -13145,11 +14060,11 @@ msgstr ""
"在将邮件保存到 %s 时发生错误:\n"
" %s"
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
msgid "Saving attachment"
msgstr "正在保存附件"
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -13158,21 +14073,25 @@ msgstr ""
"无法创建输出文件:%s:\n"
" %s"
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据:%s"
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
#, c-format
msgid "Disconnecting from %s"
msgstr "正在断开与 %s 的连接"
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
#, c-format
msgid "Reconnecting to %s"
msgstr "正在重新连接到 %s"
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
#: mail/mail-search.glade.h:2
msgid "Case Sensitive"
msgstr "区分大小写"
@@ -13190,59 +14109,74 @@ msgstr "查找:"
msgid "Search"
msgstr "搜索(_S)"
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "编辑签名"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "例外"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "帐号信息"
+
+#: mail/mail-send-recv.c:146
msgid "Cancelling..."
msgstr "正在取消..."
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
#, c-format
msgid "Server: %s, Type: %s"
msgstr "服务器:%s,类型:%s"
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
#, c-format
msgid "Path: %s, Type: %s"
msgstr "路径:%s,类型:%s"
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
#, c-format
msgid "Type: %s"
msgstr "类型:%s"
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
msgid "Send & Receive Mail"
msgstr "发送和接收邮件"
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
msgid "Cancel _All"
msgstr "全部取消(_A)"
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
msgid "Updating..."
msgstr "正在更新..."
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
msgid "Waiting..."
msgstr "正在等待..."
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
msgid "User canceled operation."
msgstr "用户己取消操作。"
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
msgid "Enter Password"
msgstr "输入密码"
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
msgid "_Remember this password"
msgstr "记住该密码(_R)"
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
msgid "_Remember this password for the remainder of this session"
msgstr "在本会话中记住该密码(_R)"
@@ -13281,26 +14215,31 @@ msgstr "输入该签名的名字。"
msgid "Name:"
msgstr "名称:"
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
#, c-format
msgid "Forwarded message - %s"
msgstr "转发的邮件 - %s"
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
msgid "Forwarded message"
msgstr "转发的邮件"
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "正在打开文件夹 %s"
+
+#: mail/mail-vfolder.c:87
#, c-format
msgid "Setting up vfolder: %s"
msgstr "设置虚拟文件夹:%s"
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
#, c-format
msgid "Updating vfolders for uri: %s"
msgstr "为 uri: %s 更新虚拟文件夹"
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
#, c-format
msgid ""
"The following vFolder(s):\n"
@@ -13313,88 +14252,88 @@ msgstr ""
" “%s”\n"
"已经被更新。"
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
msgid "VFolders"
msgstr "虚拟文件夹"
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
msgid "vFolders"
msgstr "虚拟文件夹"
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
msgid "Edit VFolder"
msgstr "编辑虚拟文件夹"
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
#, c-format
msgid "Trying to edit a vfolder '%s' which doesn't exist."
msgstr "试图编辑并不存在的虚拟文件夹“%s”。"
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
msgid "New VFolder"
msgstr "新建虚拟文件夹"
-#: mail/message-list.c:900
+#: mail/message-list.c:904
msgid "Unseen"
msgstr "不可见"
-#: mail/message-list.c:901
+#: mail/message-list.c:905
msgid "Seen"
msgstr "可见"
-#: mail/message-list.c:902
+#: mail/message-list.c:906
msgid "Answered"
msgstr "已答复"
-#: mail/message-list.c:903
+#: mail/message-list.c:907
msgid "Multiple Unseen Messages"
msgstr "多封不可见邮件"
-#: mail/message-list.c:904
+#: mail/message-list.c:908
msgid "Multiple Messages"
msgstr "多封邮件"
-#: mail/message-list.c:908
+#: mail/message-list.c:912
msgid "Lowest"
msgstr "最低"
-#: mail/message-list.c:909
+#: mail/message-list.c:913
msgid "Lower"
msgstr "较低"
-#: mail/message-list.c:913
+#: mail/message-list.c:917
msgid "Higher"
msgstr "较高"
-#: mail/message-list.c:914
+#: mail/message-list.c:918
msgid "Highest"
msgstr "最高"
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
msgid "?"
msgstr "?"
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
msgid "Today %l:%M %p"
msgstr "今天 %H:%M"
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
msgid "Yesterday %l:%M %p"
msgstr "昨天 %H:%M"
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
msgid "%a %l:%M %p"
msgstr "%A %H:%M"
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
msgid "%b %d %l:%M %p"
msgstr "%m月%d日 %H:%M"
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
msgid "Generating message list"
msgstr "正在生成邮件列表"
@@ -13450,11 +14389,11 @@ msgstr "转发"
msgid "No Response Necessary"
msgstr "不必回复"
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
msgid "Reply"
msgstr "回复"
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
msgid "Reply to All"
msgstr "全部回复"
@@ -13506,41 +14445,139 @@ msgstr "订阅(_S)"
msgid "_Unsubscribe"
msgstr "退订(_U)"
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "在此配置特殊文件夹和脱机文件夹的行为"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolution 外壳"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "文件夹设置"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "重命名该快捷方式组"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "是否显示文件夹栏"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "隐藏快捷方式栏"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "默认优先级:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "默认优先级:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Evolution Mail 配置界面"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "默认让附件只能嵌入显示。"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
msgstr ""
-"无法转移文件夹:\n"
-"%s"
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "添加文件夹"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "草稿"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "收件箱"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "正在打开默认任务文件夹"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "正在打开默认任务文件夹"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "正在打开默认任务文件夹"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "发件箱"
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "已发送"
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "正在打开默认任务文件夹"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "是否显示文件夹栏"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "是否显示快捷方式栏"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "电子邮件"
+
+#: shell/e-setup.c:144
msgid "Could not update files correctly"
msgstr "无法正确更新文件"
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
#, c-format
msgid ""
"Cannot create the directory\n"
@@ -13551,14 +14588,14 @@ msgstr ""
"%s\n"
"错误:%s"
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
#, c-format
msgid ""
"An error occurred in copying files into\n"
"`%s'."
msgstr "在把文件复制到“%s”时发生错误。"
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
#, c-format
msgid ""
"The file `%s' is not a directory.\n"
@@ -13568,7 +14605,7 @@ msgstr ""
"文件“%s”不是目录。\n"
"请移动它以便安装 Evolution 用户文件。"
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
#, c-format
msgid ""
"The directory `%s' exists but is not the\n"
@@ -13665,10 +14702,11 @@ msgstr ""
"无法重命名文件夹:\n"
"%s"
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "已经存在名为“%s”的文件夹。请使用不同的名称。"
+msgid "The specified folder name is not valid: %s"
+msgstr "指定的文件夹名称不合法:%s"
#: shell/e-shell-folder-commands.c:584
msgid "Selected folder does not belong to another user"
@@ -13692,19 +14730,15 @@ msgstr ""
"无法创建指定的文件夹:\n"
"%s"
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "创建新文件夹"
-
#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
msgid "(Untitled)"
msgstr "(无标题)"
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
msgid "Choose the type of importer to run:"
msgstr "选择要运行的导入器类型:"
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list.\n"
@@ -13716,11 +14750,11 @@ msgstr ""
"\n"
"如果您不清楚,可以选择“自动”,Evolution 将试图为您确定类型。"
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
msgid "Please select the information that you would like to import:"
msgstr "请选择您希望导入的信息:"
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
msgid ""
"Evolution checked for settings to import from the following\n"
"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13731,7 +14765,7 @@ msgstr ""
"iCalendar。并未发现可导入的设置。如果您想要再试一次,请单击\n"
"“后退”按钮。\n"
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
#, c-format
msgid ""
"Importing %s\n"
@@ -13740,21 +14774,21 @@ msgstr ""
"正在导入 %s\n"
"正在导入项目 %d。"
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
msgid "Select importer"
msgstr "选择导入器"
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
#, c-format
msgid "File %s does not exist"
msgstr "文件 %s 不存在"
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
msgid "Evolution Error"
msgstr "Evolution 错误"
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
#, c-format
msgid ""
"There is no importer that is able to handle\n"
@@ -13763,11 +14797,11 @@ msgstr ""
"没有导入器能够处理\n"
"%s"
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
msgid "Importing"
msgstr "正在导入"
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
#, c-format
msgid ""
"Importing %s.\n"
@@ -13776,17 +14810,17 @@ msgstr ""
"正在导入 %s。\n"
"正在启动 %s"
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
#, c-format
msgid "Error starting %s"
msgstr "启动 %s 错误"
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
#, c-format
msgid "Error loading %s"
msgstr "装入 %s 错误"
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
#, c-format
msgid ""
"Importing %s\n"
@@ -13795,35 +14829,35 @@ msgstr ""
"正在导入 %s\n"
"正在导入项目 1。"
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
msgid "Automatic"
msgstr "自动"
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
#, fuzzy
msgid "_Filename:"
msgstr "文件名:"
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
msgid "Select a file"
msgstr "选择一个文件"
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
#, fuzzy
msgid "File _type:"
msgstr "文件类型:"
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
#, fuzzy
msgid "Import data and settings from _older programs"
msgstr "从老版程序中导入数据和设置"
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
#, fuzzy
msgid "Import a _single file"
msgstr "导入单个文件"
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
msgid ""
"Please wait...\n"
"Scanning for existing setups"
@@ -13831,47 +14865,28 @@ msgstr ""
"请稍候...\n"
"正在扫描现有设置"
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
msgid "Starting Intelligent Importers"
msgstr "启动智能导入器"
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
#, c-format
msgid "From %s:"
msgstr "从 %s:"
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
msgid "Select a destination folder for importing this data"
msgstr "为导入的数据选择目标文件夹"
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
#, fuzzy
msgid "_Import"
msgstr "导入"
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
msgid "Closing connections..."
msgstr "正在关闭连接..."
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"同步“%s”时出错:\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "正在同步文件夹"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "正在同步“%s” (%d / %d) ..."
-
#: shell/e-shell-settings-dialog.c:346
msgid "Evolution Settings"
msgstr "Evolution 设置"
@@ -13906,7 +14921,7 @@ msgstr "无法打开共享文件夹:%s。"
msgid "Cannot find the specified shared folder."
msgstr "无法找到指定的共享文件夹。"
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
msgid ""
"If you quit the Evolution Setup Assistant now, all of the information that "
"you have entered will be forgotten. You will need to run this assistant "
@@ -13915,17 +14930,11 @@ msgid ""
"Do you want to quit using the Assistant now?"
msgstr ""
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
#, fuzzy
msgid "Quit Assistant"
msgstr "助手"
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "新建"
-
#: shell/e-shell-utils.c:116
msgid "No folder name specified."
msgstr "没有指定文件夹名称。"
@@ -13983,60 +14992,47 @@ msgstr "创建新快捷方式"
msgid "Select the folder you want the shortcut to point to:"
msgstr "选择您希望快捷方式指向的文件夹:"
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
msgid "_Work Online"
msgstr "在线工作(_W)"
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
msgid "_Work Offline"
msgstr "离线工作(_W)"
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
msgid "Work Offline"
msgstr "离线工作"
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(未显示文件夹)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(无)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr "Ximian Evolution 目前在线。点击该按钮则离线工作。"
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
msgid "Ximian Evolution is in the process of going offline."
msgstr "Ximian Evolution 正在离线过程中。"
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr "Ximian Evolution 目前离线。点击该按钮则在线工作。"
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
msgid "Invalid arguments"
msgstr "无效参数"
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
msgid "Cannot register on OAF"
msgstr "无法注册到 OAF"
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
msgid "Configuration Database not found"
msgstr "找不到配置数据库"
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
msgid "Generic error"
msgstr "通用错误"
@@ -14149,74 +15145,18 @@ msgstr "删除(_M)"
msgid "Remove this shortcut from the shortcut bar"
msgstr "从快捷方式栏上删除此快捷方式"
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
msgid "Error saving shortcuts."
msgstr "保存快捷方式错误。"
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "收件箱"
+
+#: shell/e-shortcuts.c:1097
msgid "Shortcuts"
msgstr "快捷方式"
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "无错误"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "已经有一个同名文件夹存在"
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "指定的文件夹类型无效"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "输入输出错误"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "没有足够的空间创建文件夹"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "文件夹不为空"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "找不到指定的文件夹"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "在该存储中没有实现该功能"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "不支持的操作"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "在该存储中不支持指定的类型"
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "无法修改或删除指定的文件夹"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "无法使文件夹成为它的子目录的子目录"
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "无法以那个名字创建文件夹"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "本操作不能在离线模式下执行"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "复选框"
-
#: shell/e-task-widget.c:211
#, c-format
msgid "%s (...)"
@@ -14227,6 +15167,17 @@ msgstr "%s (...)"
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "新建"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "“%2$s”中的“%1$s”"
+
#: shell/evolution-shell-component-utils.c:124
#, c-format
msgid ""
@@ -14264,74 +15215,6 @@ msgstr ""
"来自激活系统的错误是:\n"
"%s"
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA 错误"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "被中断"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "无效参数"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "已经有所有者了"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "无所有者"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "没找到"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "不支持的类型"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "不支持的方案"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "不支持的操作"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "内部错误"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "存在"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "无效 URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "含有子文件夹"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "没有剩余空间"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "原所有者已死"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "测试类型"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Evolution 测试组件"
-
#: shell/glade/e-active-connection-dialog.glade.h:1
msgid "Active Connections"
msgstr "当前连接"
@@ -14360,10 +15243,6 @@ msgstr "邮件(_M):"
msgid "_Tasks:"
msgstr "任务(_T):"
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "文件夹名称(_N):"
-
#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
msgid "Folder _type:"
msgstr "文件夹类型(_T):"
@@ -14424,22 +15303,6 @@ msgstr ""
"\n"
"单击“应用”按钮可保存您的设置。"
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "在此配置特殊文件夹和脱机文件夹的行为"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolution 外壳"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution 文件夹配置控件"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "文件夹设置"
-
#: shell/importer/import.glade.h:1
msgid "Click \"Import\" to begin importing the file into Evolution. "
msgstr "点击“导入”以便开始将文件导入到 Evolution。"
@@ -14477,7 +15340,7 @@ msgstr ""
msgid "Importers"
msgstr "导入器"
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
msgid "Import"
msgstr "导入"
@@ -14493,16 +15356,16 @@ msgstr "不要再问我"
msgid "Evolution can import data from the following files:"
msgstr "Evolution 可以从下列文件中导入数据:"
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
msgid "Evolution"
msgstr "Evolution"
-#: shell/main.c:115
+#: shell/main.c:120
msgid "Evolution is now exiting ..."
msgstr "Evolution 正在退出 ..."
#. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -14534,7 +15397,7 @@ msgstr ""
"\n"
"我们希望您尽情享受我们努力工作的成果,我们也热切盼望着您的意见!\n"
-#: shell/main.c:289
+#: shell/main.c:294
msgid ""
"Thanks\n"
"The Ximian Evolution Team\n"
@@ -14542,36 +15405,48 @@ msgstr ""
"感谢\n"
"Ximian Evolution 团队\n"
-#: shell/main.c:297
+#: shell/main.c:302
msgid "Don't tell me again"
msgstr "不要再问我"
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
msgid "Cannot access the Ximian Evolution shell."
msgstr "无法访问 Ximian Evolution shell。"
-#: shell/main.c:398
+#: shell/main.c:420
#, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "无法初始化 Ximian Evolution shell:%s"
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
msgid "Start in offline mode"
msgstr "以离线模式启动"
-#: shell/main.c:532
+#: shell/main.c:530
msgid "Start in online mode"
msgstr "以在线模式启动"
-#: shell/main.c:535
+#: shell/main.c:533
msgid "Forcibly shut down all evolution components"
msgstr "强制关闭所有 Evolution 组件"
-#: shell/main.c:538
+#: shell/main.c:536
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
-#: shell/main.c:565
+#: shell/main.c:563
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -14580,31 +15455,60 @@ msgstr ""
"%s:不能同时使用 --online 和 --offline。\n"
" 详情请使用 %s --help。\n"
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "选择导入器"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
#, fuzzy
msgid "Certificate Name"
msgstr "证书 ID(_C):"
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
#, fuzzy
msgid "Purposes"
msgstr "进度"
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
msgid "Serial Number"
msgstr ""
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
#, fuzzy
msgid "Expires"
msgstr "表达式"
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
#, fuzzy
msgid "E-Mail Address"
msgstr "合并电子邮件地址"
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"证书过期:%s\n"
+"发行者:%s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+" Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+" Subject: %s\n"
+msgstr ""
+
#: smime/gui/smime-ui.glade.h:1
msgid "<Not Part of Certificate>"
msgstr ""
@@ -14662,91 +15566,376 @@ msgid "Backup All"
msgstr "黑泽"
#: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "证书 ID(_C):"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "不信任的证书"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "证书 ID(_C):"
+
+#: smime/gui/smime-ui.glade.h:17
#, fuzzy
msgid "Common Name (CN)"
msgstr "通用名"
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
#, fuzzy
msgid "Contact Certificates"
msgstr "证书 ID(_C):"
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
#, fuzzy
msgid "Edit"
msgstr "编辑(_E)"
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
msgid "Email Recipient Certificate"
msgstr ""
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
#, fuzzy
msgid "Email Signer Certificate"
msgstr "验证证书失败。"
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
#, fuzzy
msgid "Expires On"
msgstr "表达式"
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
msgid "Issued On"
msgstr ""
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
msgid "MD5 Fingerprint"
msgstr ""
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
#, fuzzy
msgid "Organization (O)"
msgstr "组织"
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
#, fuzzy
msgid "Organizational Unit (OU)"
msgstr "组织单元"
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
msgid "SHA1 Fingerprint"
msgstr ""
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
msgid "SSL Client Certificate"
msgstr ""
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
msgid "SSL Server Certificate"
msgstr ""
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
#, fuzzy
msgid "View"
msgstr "查看(_V)"
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "证书 ID(_C):"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "无效的证书颁发机构(CA)"
+
+#: smime/gui/smime-ui.glade.h:43
msgid "You have certificates from these organizations that identify you:"
msgstr ""
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
msgid ""
"You have certificates on file that identify these certificate authorities:"
msgstr ""
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
msgid "You have certificates on file that identify these people:"
msgstr ""
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
#, fuzzy
msgid "Your Certificates"
msgstr "证书 ID(_C):"
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
#, fuzzy
-msgid "import"
-msgstr "导入"
+msgid "Certificate already exists"
+msgstr "卡片 ID 已经存在"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%Y年%m月%d日"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "佛蒙特州"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "北"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "确定"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "北"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "证书 ID(_C):"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "证书 ID(_C):"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "不信任的证书"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "主题是 %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "无法处理脱机文件夹"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "无效的证书颁发机构(CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "无效的证书颁发机构(CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "没有信息"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "附件"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "证书 ID(_C):"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "库里提巴"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "北卡罗莱纳州"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "表达式"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "在 %2$s 时 %1$s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "证书签名失败"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "插入(_I)"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "主题是 %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "证书签名失败"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "为 %s 输入密码"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "证书 ID(_C):"
#: tools/evolution-launch-composer.c:324
msgid "An attachment to add."
@@ -14797,7 +15986,7 @@ msgstr "复制选中内容"
msgid "Copy to Folder..."
msgstr "复制到文件夹..."
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
msgid "Cut the selection"
msgstr "剪切选中内容"
@@ -14813,7 +16002,7 @@ msgstr "把选中的联系人移动到其它文件夹..."
msgid "Move to Folder..."
msgstr "移动到文件夹..."
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
msgid "Paste the clipboard"
msgstr "粘贴剪贴板"
@@ -14821,8 +16010,8 @@ msgstr "粘贴剪贴板"
msgid "Previews the contacts to be printed"
msgstr "预览将要打印的联系人"
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
#: ui/evolution-tasks.xml.h:13
msgid "Print Pre_view"
msgstr "打印预览(_V)"
@@ -14867,13 +16056,13 @@ msgstr "停止载入"
msgid "View the current contact"
msgstr "查看当前联系人"
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
#: ui/evolution-contact-list-editor.xml.h:11
#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
msgid "_Actions"
msgstr "操作(_A)"
@@ -14903,142 +16092,110 @@ msgstr "给联系人发邮件(_S)..."
#: ui/evolution-calendar.xml.h:3
#, fuzzy
-msgid "Create a new all-day event"
-msgstr "创建一个新的全天约会创建新约会"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "创建新约会"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
msgid "Create a new calendar"
msgstr "创建新文件夹"
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "创建一条新任务请求"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "创建新任务"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
msgid "Day"
msgstr "天"
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
msgid "Delete All Occurrences"
msgstr "删除所有发生"
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
msgid "Delete the appointment"
msgstr "删除约会"
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
msgid "Delete this Occurrence"
msgstr "删除此次发生"
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
msgid "Delete this occurrence"
msgstr "删除此次发生"
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
msgid "Go To"
msgstr "转到"
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
msgid "Go back"
msgstr "后退"
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
msgid "Go forward"
msgstr "前进"
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
msgid "Go to _Date"
msgstr "转到日期(_D)"
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
msgid "Go to a specific date"
msgstr "转到指定日期"
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
msgid "Go to today"
msgstr "转到今天"
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
msgid "List"
msgstr "列表"
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
msgid "Month"
msgstr "月"
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "新建约会(_A)"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
#, fuzzy
msgid "New _Calendar"
msgstr "新喀里多尼亚"
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "新会议"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "新建任务"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
msgid "Previews the calendar to be printed"
msgstr "预览将要打印的日历"
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
msgid "Print this calendar"
msgstr "打印此日历"
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
msgid "Publish Free/Busy information for this calendar"
msgstr "为此日历发布忙闲信息"
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
#, fuzzy
msgid "Purg_e"
msgstr "波治"
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
#, fuzzy
msgid "Purge old appointments and meetings"
msgstr "含有约会和事件的公共文件夹"
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
#, fuzzy
msgid "Show as list"
msgstr "显示细节"
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
msgid "Show one day"
msgstr "显示一天"
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
msgid "Show one month"
msgstr "显示一个月"
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
msgid "Show one week"
msgstr "显示一周"
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
msgid "Show the working week"
msgstr "显示工作周"
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
msgid "Week"
msgstr "周"
@@ -15102,7 +16259,7 @@ msgstr "把此项保存到磁盘"
#: ui/evolution-mail-messagedisplay.xml.h:7
#: ui/evolution-message-composer.xml.h:42
#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
msgid "_File"
msgstr "文件(_F)"
@@ -15318,7 +16475,7 @@ msgstr "全部标为已读(_R)"
msgid "Mark all visible messages as read"
msgstr "把所由可见的邮件标记为已读"
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
msgid "Paste message(s) from the clipboard"
msgstr "从剪贴板粘贴邮件"
@@ -15374,16 +16531,6 @@ msgstr "反转选择(_I)"
msgid "_Threaded Message List"
msgstr "按线索编排的邮件列表(_T)"
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "关闭此窗口"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "关闭(_C)"
-
#: ui/evolution-mail-message.xml.h:1
msgid "A_dd Sender to Addressbook"
msgstr "将发件人添加到地址簿(_D)"
@@ -15541,256 +16688,281 @@ msgstr "把选定的邮件作为附件转发给某人"
msgid "Increase the text size"
msgstr "增加文本大小"
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
msgid "Load _Images"
msgstr "装入图像(_I)"
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
msgid "Mark as I_mportant"
msgstr "标记为重要(_M)"
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
msgid "Mark as U_nread"
msgstr "标记为未读(_N)"
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
msgid "Mark as Unimp_ortant"
msgstr "标记为不重要(_O)"
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
msgid "Mark the selected message(s) as having been read"
msgstr "把选定的邮件标记为已读"
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
msgid "Mark the selected message(s) as important"
msgstr "把选定的邮件标记为重要邮件"
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "把选定的邮件标记为不重要邮件"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "把选定的邮件标记为未读"
+
+#: ui/evolution-mail-message.xml.h:58
msgid "Mark the selected message(s) as not having been read"
msgstr "把选定的邮件标记为未读"
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
msgid "Mark the selected message(s) as unimportant"
msgstr "把选定的邮件标记为不重要邮件"
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
msgid "Mark the selected messages for deletion"
msgstr "为选定的邮件做删除标记"
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
msgid "Move"
msgstr "移动"
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
msgid "Move selected message(s) to another folder"
msgstr "把选中的邮件移动到其它文件夹"
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
msgid "Next"
msgstr "下一封"
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
msgid "Next _Important Message"
msgstr "下一封重要邮件(_I)"
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
msgid "Next _Thread"
msgstr "下一条线索(_T)"
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
msgid "Next _Unread Message"
msgstr "下一封未读邮件(_U)"
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "没找到"
+
+#: ui/evolution-mail-message.xml.h:68
msgid "Open the selected message in a new window"
msgstr "在新窗口中打开选中的邮件"
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
msgid "Open the selected message in the composer to re-send it"
msgstr "在邮件撰写器中打开选中的邮件以便重发"
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
msgid "Original Si_ze"
msgstr "原大小(_Z)"
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
msgid "P_revious Unread Message"
msgstr "上一封未读邮件(_R)"
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
#, fuzzy
msgid "Post a Repl_y"
msgstr "投递回复"
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
msgid "Post a reply to a message in a Public folder"
msgstr "在公共文件夹中回复邮件"
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
msgid "Pr_evious Important Message"
msgstr "上一封重要邮件(_E)"
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
msgid "Preview the message to be printed"
msgstr "预览要打印的邮件"
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
msgid "Previous"
msgstr "上一封"
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
msgid "Print this message"
msgstr "打印该邮件"
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
msgid "Re_direct"
msgstr "重定向(_D)"
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
msgid "Redirect (bounce) the selected message to someone"
msgstr "将选定的消息转发(退回)给某人"
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
msgid "Reset the text to its original size"
msgstr "把文件重新设置为原来的大小"
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
msgid "S_earch in Message..."
msgstr "在邮件中搜索(_E)..."
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
msgid "S_maller"
msgstr "较小(_M)"
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
msgid "Save the message as a text file"
msgstr "把邮件存为文本文件"
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
msgid "Search for text in the body of the displayed message"
msgstr "在显示邮件的邮件体中搜索文本"
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
msgid "Set up the page settings for your current printer"
msgstr "设定您当前打印机的页面设置"
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
msgid "Show Email _Source"
msgstr "显示电子邮件源代码(_S)"
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
msgid "Show Full _Headers"
msgstr "显示完整的邮件头(_H)"
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
#, fuzzy
msgid "Show a blinking cursor in the body of displayed messages"
msgstr "在显示邮件的邮件体中搜索文本"
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
msgid "Show message in the normal style"
msgstr "以普通样式显示邮件"
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
msgid "Show message with all email headers"
msgstr "显示邮件时显示所有邮件头"
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
msgid "Show the raw email source of the message"
msgstr "显示邮件的原始邮件源代码"
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
msgid "Text Si_ze"
msgstr "文字大小(_Z)"
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
msgid "Un-delete the selected messages"
msgstr "取消选中邮件的删除"
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
msgid "VFolder on Mailing _List..."
msgstr "基于邮件列表的虚拟文件夹(_L)..."
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
msgid "VFolder on Se_nder..."
msgstr "基于发件人的虚拟文件夹(_N)..."
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
msgid "VFolder on _Recipients..."
msgstr "基于收件人的虚拟文件夹(_R)..."
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
msgid "VFolder on _Subject..."
msgstr "基于主题的虚拟文件夹(_S)..."
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
msgid "_Attached"
msgstr "附加(_A)"
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
msgid "_Copy to Folder"
msgstr "复制到文件夹(_C)"
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
msgid "_Create Filter From Message"
msgstr "根据邮件创建过滤规则(_C)"
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
msgid "_Forward Message"
msgstr "转发邮件(_F)"
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
msgid "_Go To"
msgstr "转到(_G)"
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
msgid "_Inline"
msgstr "嵌入(_I)"
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
msgid "_Larger"
msgstr "较大(_L)"
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
msgid "_Message Display"
msgstr "邮件显示(_M)"
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
msgid "_Move to Folder"
msgstr "移动到文件夹(_M)"
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
msgid "_Next Message"
msgstr "下一封邮件(_N)"
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
msgid "_Normal Display"
msgstr "普通显示(_N)"
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
msgid "_Open Message"
msgstr "打开邮件(_O)"
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
msgid "_Previous Message"
msgstr "上一封邮件(_P)"
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
msgid "_Quoted"
msgstr "引用(_Q)"
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
msgid "_Resend..."
msgstr "重发(_R)..."
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
msgid "_Tools"
msgstr "工具(_T)"
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
msgid "_Undelete"
msgstr "取消删除(_U)"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "关闭此窗口"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "关闭(_C)"
+
#: ui/evolution-message-composer.xml.h:1
msgid "Attach"
msgstr "附件"
@@ -16068,12 +17240,13 @@ msgid "Change Evolution's settings"
msgstr "更改 Evolution 的设置"
#: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "退出(_X)"
+#, fuzzy
+msgid "Create a new window"
+msgstr "创建一条新任务请求"
#: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Evolution 窗口(_W)"
+msgid "E_xit"
+msgstr "退出(_X)"
#: ui/evolution.xml.h:7
msgid "Exit the program"
@@ -16085,61 +17258,74 @@ msgstr "从其它程序导入数据"
#: ui/evolution.xml.h:10
#, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolution 窗口(_W)"
+msgid "Open a new window"
+msgstr "在新窗口中打开"
#: ui/evolution.xml.h:11
msgid "Pi_lot Settings..."
msgstr "Pilot 设置(_L)..."
#: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "发送/接收"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "发送队列中的的邮件并收取新邮件"
+
+#: ui/evolution.xml.h:14
msgid "Set up Pilot configuration"
msgstr "配置 Pilot"
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
msgid "Show information about Ximian Evolution"
msgstr "显示关于 Ximian Evolution 的信息"
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
msgid "Submit Bug Report"
msgstr "提交错误报告"
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
msgid "Submit _Bug Report"
msgstr "提交错误报告(_B)"
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
msgid "Submit a bug report using Bug Buddy"
msgstr "用 Bug Buddy 提交错误报告"
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "反转"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
msgid "Toggle whether we are working offline."
msgstr "切换是否脱机工作。"
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
msgid "Ximian Evolution _FAQ"
msgstr "Ximian Evolution 常见问题(_F)"
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
msgid "_About Ximian Evolution..."
msgstr "关于 Ximian Evolution(_A)..."
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
msgid "_Help"
msgstr "帮助(_H)"
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
msgid "_Import..."
msgstr "导入(_I)..."
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
msgid "_New"
msgstr "新建(_N)"
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "发送/接收(_S)"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "立即查找(_F)"
+
#: ui/my-evolution.xml.h:2
msgid "Print Summary"
msgstr "打印概要"
@@ -16267,12 +17453,12 @@ msgstr "定义视图..."
#. Translators: These are the first characters of each day of the
#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
msgid "MTWTFSS"
msgstr "一二三四五六日"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
msgid "%B %Y"
msgstr "%Y年%B"
@@ -16405,7 +17591,7 @@ msgstr "搜索(_S)"
msgid "_Find Now"
msgstr "立即查找(_F)"
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
msgid "_Clear"
msgstr "清除(_C)"
@@ -16421,24 +17607,261 @@ msgstr "子项目 ID"
msgid "Text"
msgstr "文字"
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "清除"
-
#: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
msgstr "立即查找"
+#~ msgid "Account Name"
+#~ msgstr "帐号名"
+
+#~ msgid "Server Name"
+#~ msgstr "服务器名"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "在本次 Evolution 创建中未打开 LDAP 支持"
+
+#~ msgid "Other Contacts"
+#~ msgstr "其他联系人"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "在此配置对 LDAP 目录服务器的访问"
+
+#~ msgid "Directory Servers"
+#~ msgstr "目录服务器"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Evolution 的地址簿 LDAP 配置控件"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "添加 LDAP 服务器"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "第四步:显示姓名"
+
+#~ msgid "Find contact in"
+#~ msgstr "在其中查找联系人"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* 点击此处以便添加联系人 *"
+
+#~ msgid "Business Address"
+#~ msgstr "商务地址"
+
+#~ msgid "Department"
+#~ msgstr "部门"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "忙闲 URL"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "职业"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "在 %s 打开任务"
+
+#~ msgid "Send anyway?"
+#~ msgstr "仍然发送?"
+
#, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "取消当前邮件操作"
+#~ msgid "Folder _name"
+#~ msgstr "文件夹名称(_N):"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
+
+#~ msgid "Connecting..."
+#~ msgstr "正在连接..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "该文件夹不能含有邮件。"
+
+#, fuzzy
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "无法打开共享文件夹:%s。"
+
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "为导入的数据选择目标文件夹"
+
+#, fuzzy
+#~ msgid "A folder named \"%s\" already exists. Please use a different name."
+#~ msgstr "已经存在名为“%s”的文件夹。请使用不同的名称。"
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法转移文件夹:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "添加文件夹"
+
+#~ msgid "Drafts"
+#~ msgstr "草稿"
+
+#~ msgid "Outbox"
+#~ msgstr "发件箱"
+
+#~ msgid "Sent"
+#~ msgstr "已发送"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "同步“%s”时出错:\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "正在同步文件夹"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "正在同步“%s” (%d / %d) ..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(未显示文件夹)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(无)"
+
+#~ msgid "No error"
+#~ msgstr "无错误"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "已经有一个同名文件夹存在"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "指定的文件夹类型无效"
+
+#~ msgid "I/O error"
+#~ msgstr "输入输出错误"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "没有足够的空间创建文件夹"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "文件夹不为空"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "找不到指定的文件夹"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "在该存储中没有实现该功能"
+
+#~ msgid "Operation not supported"
+#~ msgstr "不支持的操作"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "在该存储中不支持指定的类型"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "无法修改或删除指定的文件夹"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "无法使文件夹成为它的子目录的子目录"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "无法以那个名字创建文件夹"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "本操作不能在离线模式下执行"
+
+#~ msgid "Checkbox"
+#~ msgstr "复选框"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA 错误"
+
+#~ msgid "Invalid argument"
+#~ msgstr "无效参数"
+
+#~ msgid "Already has an owner"
+#~ msgstr "已经有所有者了"
+
+#~ msgid "No owner"
+#~ msgstr "无所有者"
+
+#~ msgid "Unsupported type"
+#~ msgstr "不支持的类型"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "不支持的方案"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "不支持的操作"
+
+#~ msgid "Internal error"
+#~ msgstr "内部错误"
+
+#~ msgid "Exists"
+#~ msgstr "存在"
+
+#~ msgid "Invalid URI"
+#~ msgstr "无效 URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "含有子文件夹"
+
+#~ msgid "No space left"
+#~ msgstr "没有剩余空间"
+
+#~ msgid "Old owner has died"
+#~ msgstr "原所有者已死"
+
+#~ msgid "Test type"
+#~ msgstr "测试类型"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolution 测试组件"
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "导入"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "创建一个新的全天约会创建新约会"
+
+#~ msgid "New _Appointment"
+#~ msgstr "新建约会(_A)"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "新会议"
#, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "域名"
+#~ msgid "New _Task"
+#~ msgstr "新建任务"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution 窗口(_W)"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolution 窗口(_W)"
+
+#~ msgid "Toggle"
+#~ msgstr "反转"
-#~ msgid "Family Name"
-#~ msgstr "姓"
+#~ msgid "Clear"
+#~ msgstr "清除"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "取消当前邮件操作"
#, fuzzy
#~ msgid "Address List"
@@ -16531,9 +17954,6 @@ msgstr "立即查找"
#~ msgid "VCard (.vcf, .gcrd)"
#~ msgstr "VCard (.vcf, .gcrd)"
-#~ msgid "Loading..."
-#~ msgstr "装入..."
-
#~ msgid "Searching..."
#~ msgstr "搜索..."
@@ -16585,10 +18005,6 @@ msgstr "立即查找"
#~ msgstr "没有装入 EBook\n"
#, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "卡片 ID 已经存在"
-
-#, fuzzy
#~ msgid "Operation has been cancelled"
#~ msgstr "操作已取消"
@@ -16730,9 +18146,6 @@ msgstr "立即查找"
#~ msgid "Callback"
#~ msgstr "反馈"
-#~ msgid "Company"
-#~ msgstr "公司"
-
#~ msgid "Comp"
#~ msgstr "公司"
@@ -16799,9 +18212,6 @@ msgstr "立即查找"
#~ msgid "%x"
#~ msgstr "%x"
-#~ msgid "Phone"
-#~ msgstr "电话"
-
#~ msgid "Birth date"
#~ msgstr "生日"
@@ -16814,9 +18224,6 @@ msgstr "立即查找"
#~ msgid "Arbitrary"
#~ msgstr "武断"
-#~ msgid "ID"
-#~ msgstr "ID"
-
#~ msgid "Last Use"
#~ msgstr "上次使用"
@@ -16829,9 +18236,6 @@ msgstr "立即查找"
#~ msgid "Folder containing contact information"
#~ msgstr "含有联系人信息的文件夹"
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP 服务器"
-
#~ msgid "LDAP server containing contact information"
#~ msgstr "含有联系人信息的 LDAP 服务器"
@@ -16841,18 +18245,6 @@ msgstr "立即查找"
#~ msgid "Public folder containing contact information"
#~ msgstr "含有联系人信息的公共文件夹"
-#~ msgid "_Contact"
-#~ msgstr "联系人(_C)"
-
-#~ msgid "Create a new contact"
-#~ msgstr "创建一个新联系人"
-
-#~ msgid "New Contact List"
-#~ msgstr "新建联系人列表"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "创建一个新的联系人列表"
-
#~ msgid "The URI that the Folder Browser will display"
#~ msgstr "文件夹浏览器将显示的 URI"
@@ -16868,9 +18260,6 @@ msgstr "立即查找"
#~ msgid "Is New Card"
#~ msgstr "为新卡片"
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
#~ msgid "No cards"
#~ msgstr "没有卡片"
@@ -16929,30 +18318,6 @@ msgstr "立即查找"
#~ msgid "Public folder containing to-do items"
#~ msgstr "含有待办项目的公共文件夹"
-#~ msgid "New appointment"
-#~ msgstr "新建约会"
-
-#~ msgid "_Appointment"
-#~ msgstr "约会(_A)"
-
-#~ msgid "New meeting"
-#~ msgstr "新闻会议"
-
-#~ msgid "M_eeting"
-#~ msgstr "会议(_E)"
-
-#~ msgid "New task"
-#~ msgstr "新建任务"
-
-#~ msgid "_Task"
-#~ msgstr "任务(_T)"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "新建全天约会"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "全天约会(_D)"
-
#~ msgid "Could not update invalid object"
#~ msgstr "无法更新无效对象"
@@ -16998,9 +18363,6 @@ msgstr "立即查找"
#~ msgid "Opening calendar at %s"
#~ msgstr "从 %s 打开日历"
-#~ msgid "Opening default tasks folder"
-#~ msgstr "正在打开默认任务文件夹"
-
#~ msgid "Evaluation of the search expression did not yield a boolean value"
#~ msgstr "计算搜索表达式没有得到布尔值"
@@ -17038,9 +18400,6 @@ msgstr "立即查找"
#~ "Evolution 找到了 GnomeCard 文件。\n"
#~ "您是否希望把它们导入 Evolution?"
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Evolution Mail 配置界面"
-
#~ msgid "Folder containing mail"
#~ msgstr "含有邮件的文件夹"
@@ -17056,9 +18415,6 @@ msgstr "立即查找"
#~ msgid "Virtual Trash folder"
#~ msgstr "虚拟已删除邮件文件夹"
-#~ msgid "Properties..."
-#~ msgstr "属性..."
-
#~ msgid "Change this folder's properties"
#~ msgstr "改变该文件夹的属性"
@@ -17068,15 +18424,6 @@ msgstr "立即查找"
#~ msgid "You have unsent messages, do you wish to quit anyway?"
#~ msgstr "您已取消邮件的发送,您仍希望退出吗?"
-#~ msgid "New Mail Message"
-#~ msgstr "新建邮件"
-
-#~ msgid "_Mail Message"
-#~ msgstr "邮件(_M)"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "撰写一封新邮件"
-
#~ msgid "New Message Post"
#~ msgstr "新建邮件投递"
@@ -18887,9 +20234,6 @@ msgstr "立即查找"
#~ msgid "Cumberland"
#~ msgstr "坎伯兰郡"
-#~ msgid "Curitiba"
-#~ msgstr "库里提巴"
-
#~ msgid "Curitiba Apt"
#~ msgstr "库里提巴 Apt"
@@ -21881,9 +23225,6 @@ msgstr "立即查找"
#~ msgid "North Bend"
#~ msgstr "North Bend"
-#~ msgid "North Carolina"
-#~ msgstr "北卡罗莱纳州"
-
#~ msgid "North Conway"
#~ msgstr "North Conway"
@@ -23495,9 +24836,6 @@ msgstr "立即查找"
#~ msgid "State College"
#~ msgstr "州立学院"
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
#~ msgid "Staunton"
#~ msgstr "斯托顿"
@@ -24086,9 +25424,6 @@ msgstr "立即查找"
#~ msgid "United Arab Emirates "
#~ msgstr "阿拉伯联合酋长国 "
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
#~ msgid "Upington"
#~ msgstr "Upington"
@@ -24197,12 +25532,6 @@ msgstr "立即查找"
#~ msgid "Veracruz"
#~ msgstr "韦拉克鲁斯"
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "佛蒙特州"
-
#~ msgid "Vernal"
#~ msgstr "Vernal"
@@ -24731,9 +26060,6 @@ msgstr "立即查找"
#~ msgid " F"
#~ msgstr " F"
-#~ msgid " C"
-#~ msgstr " C"
-
#~ msgid "knots"
#~ msgstr "节"
@@ -25352,9 +26678,6 @@ msgstr "立即查找"
#~ msgid "Freezing haze"
#~ msgstr "冻灰尘"
-#~ msgid "Spray"
-#~ msgstr "冰雾"
-
#~ msgid "Spray in the vicinity"
#~ msgstr "邻近有冰雾"
@@ -25719,18 +27042,6 @@ msgstr "立即查找"
#~ msgid "Remove a folder added with \"Open Other User's Folder\""
#~ msgstr "删除用“打开其它用户的文件夹”添加的文件夹"
-#~ msgid "Send / Receive"
-#~ msgstr "发送/接收"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "发送队列中的的邮件并收取新邮件"
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "是否显示文件夹栏"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "是否显示快捷方式栏"
-
#~ msgid "View the selected folder"
#~ msgstr "查看选中的文件夹"
@@ -25758,9 +27069,6 @@ msgstr "立即查找"
#~ msgid "_Rename..."
#~ msgstr "重命名(_R)..."
-#~ msgid "_Send / Receive"
-#~ msgstr "发送/接收(_S)"
-
#~ msgid "_Shortcut Bar"
#~ msgstr "快捷方式栏(_S)"