aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2004-04-03 00:33:55 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-04-03 00:33:55 +0800
commit5748693354eb261e91fd9648a0ae6cdbbfdefbd9 (patch)
tree3229ee1db67a670b275dd2043217fb1c809df88b /po/zh_CN.po
parent8cc048dc72218fcd37c3a77297bf5a14bb7347bc (diff)
downloadgsoc2013-evolution-5748693354eb261e91fd9648a0ae6cdbbfdefbd9.tar
gsoc2013-evolution-5748693354eb261e91fd9648a0ae6cdbbfdefbd9.tar.gz
gsoc2013-evolution-5748693354eb261e91fd9648a0ae6cdbbfdefbd9.tar.bz2
gsoc2013-evolution-5748693354eb261e91fd9648a0ae6cdbbfdefbd9.tar.lz
gsoc2013-evolution-5748693354eb261e91fd9648a0ae6cdbbfdefbd9.tar.xz
gsoc2013-evolution-5748693354eb261e91fd9648a0ae6cdbbfdefbd9.tar.zst
gsoc2013-evolution-5748693354eb261e91fd9648a0ae6cdbbfdefbd9.zip
bump version, requirements
2004-04-02 JP Rosevear <jpr@ximian.com> * configure.in: bump version, requirements svn path=/trunk/; revision=25301
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po4907
1 files changed, 2699 insertions, 2208 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index be99ec7b97..c5c6040af7 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: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
"PO-Revision-Date: 2004-01-25 07:08+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -18,6 +18,47 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: a11y/addressbook/ea-addressbook-view.c:94
+#: a11y/addressbook/ea-addressbook-view.c:103
+#: a11y/addressbook/ea-minicard-view.c:119
+#, fuzzy
+msgid "evolution addressbook"
+msgstr "Evolution 地址簿"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "以全部本地和活跃远程文件夹"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "另存为"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "卡片"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "卡片"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "联系人:"
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution 提醒"
+
#: addressbook/conduit/address-conduit.c:272
msgid "Default Sync Address:"
msgstr "默认的同步地址:"
@@ -95,76 +136,92 @@ msgstr "在此管理您的 S/Mime 证书"
msgid "Address book '%s' will be removed. Are you sure you want to continue?"
msgstr "即将删除地址簿“%s”。您确定想要继续吗?"
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
#, fuzzy
msgid "New Address Book"
msgstr "新建地址簿"
-#: addressbook/gui/component/addressbook-component.c:309
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 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
+#: addressbook/gui/component/addressbook-component.c:314
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:367
+#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: 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
+#: ui/evolution-tasks.xml.h:6
msgid "Delete"
msgstr "删除"
-#: addressbook/gui/component/addressbook-component.c:310
-#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:315
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
msgid "Properties..."
msgstr "属性..."
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
msgid "New Contact"
msgstr "新建联系人"
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
msgid "_Contact"
msgstr "联系人(_C)"
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
msgid "Create a new contact"
msgstr "创建一个新联系人"
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
msgid "New Contact List"
msgstr "新建联系人列表"
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
msgid "Contact _List"
msgstr "联系人列表(_L)"
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
msgid "Create a new contact list"
msgstr "创建一个新的联系人列表"
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "新建地址簿"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "地址簿"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "创建新任务"
+
+#: addressbook/gui/component/addressbook-config.c:407
msgid "Failed to connect to LDAP server"
msgstr "连接 LDAP 服务器失败"
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
msgid "Failed to authenticate with LDAP server"
msgstr "LDAP 服务器认证失败"
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
msgid "Could not perform query on Root DSE"
msgstr "无法在根 DSE 上执行查询"
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
msgid "The server responded with no supported search bases"
msgstr "服务器响应为没有支持的搜索起点"
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
msgid "This server does not support LDAPv3 schema information"
msgstr "此服务器不支持 LDAPv3 schema 信息"
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
msgid "Error retrieving schema information"
msgstr "检索 schema 信息错误"
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
msgid "Server did not respond with valid schema information"
msgstr "服务器没有响应有效的 schema 信息"
@@ -192,17 +249,17 @@ msgstr "升迁“%s”:"
#. create the local source group
#: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
msgid "On This Computer"
msgstr "在此计算机中"
#. Create the default Person addressbook
#: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
msgid "Personal"
msgstr "个人"
@@ -253,7 +310,7 @@ msgstr "此地址簿的后端拒绝执行此查询。"
msgid "This query did not complete successfully."
msgstr "此查询未成功完成。"
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
#, fuzzy
msgid ""
"We were unable to open this addressbook. Please check that the path exists "
@@ -262,7 +319,7 @@ msgstr ""
"我们无法打开此地址簿。请检查路径是否存在\n"
"以及您是否有足够的权限访问它。"
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
#, fuzzy
msgid ""
"We were unable to open this addressbook. This either means you have entered "
@@ -272,7 +329,7 @@ msgstr ""
"您输入了错误的 URI,也可能是因为\n"
"LDAP 服务器已经关闭。"
-#: addressbook/gui/component/addressbook.c:606
+#: addressbook/gui/component/addressbook.c:603
#, fuzzy
msgid ""
"This version of Evolution does not have LDAP support compiled in to it. If "
@@ -284,7 +341,7 @@ msgstr ""
"以下链接获取 OpenLDAP,然后从程序的 CVS 源代码\n"
"重新编译程序。\n"
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:612
#, fuzzy
msgid ""
"We were unable to open this addressbook. This either means you have entered "
@@ -294,29 +351,29 @@ msgstr ""
"您输入了错误的 URI,也可能是因为\n"
"服务器已经关闭。"
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
msgid "Unable to open addressbook"
msgstr "无法打开地址簿"
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
msgid "Accessing LDAP Server anonymously"
msgstr "匿名访问 LDAP 服务器"
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
msgid "Failed to authenticate.\n"
msgstr "认证失败。\n"
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%s为 %s 输入口令 (用户 %s)"
-#: addressbook/gui/component/addressbook.c:1116
+#: addressbook/gui/component/addressbook.c:1113
#, fuzzy
msgid "UID of the contacts source that the view will display"
msgstr "日历将显示的 URI"
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
#, fuzzy
msgid "The URI that the address book will display"
msgstr "日历将显示的 URI"
@@ -340,16 +397,10 @@ msgid "URI for the folder last used in the select names dialog"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
msgid " S_how Supported Bases "
msgstr " 显示支持的基础(_H) "
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:2
#: addressbook/gui/component/select-names/select-names.glade.h:1
#: addressbook/gui/contact-editor/contact-editor.glade.h:2
#: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -364,62 +415,53 @@ msgstr " 显示支持的基础(_H) "
#: calendar/gui/dialogs/new-task-list.glade.h:1
#: calendar/gui/dialogs/task-page.glade.h:1
#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
msgid "*"
msgstr "*"
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
msgid "1:00"
msgstr "1:00"
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
-msgstr "2:30"
-
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:4
msgid "3268"
msgstr "3268"
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:5
msgid "389"
msgstr "389"
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
msgid "5:00"
msgstr "5:00"
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
msgid "636"
msgstr "636"
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
#, fuzzy
msgid "Address Book Creation Assistant"
msgstr "地址簿创建助手"
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
#, fuzzy
msgid "Address Book Properties"
msgstr "地址簿属性"
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "地址簿来源..."
-
-#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:40
msgid "Always"
msgstr "总是"
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
msgid "Anonymously"
msgstr "匿名"
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
#, fuzzy
msgid ""
"Congratulations, you are\n"
@@ -431,50 +473,50 @@ msgstr ""
"\n"
"请单击“完成”按钮保存您在此输入的设置。"
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
msgid "Connecting"
msgstr "连接"
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
msgid "Distinguished _name:"
msgstr "识别性名称(_N):"
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
msgid "Email address:"
msgstr "电子邮件地址:"
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
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:20
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:21
#: calendar/gui/dialogs/calendar-setup.glade.h:10
msgid "Finished"
msgstr "已完成"
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:22
#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
#: smime/gui/smime-ui.glade.h:27
msgid "General"
msgstr "常规"
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:23
#: calendar/gui/dialogs/calendar-setup.glade.h:12
msgid "Group:"
msgstr "组:"
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:99
msgid "Never"
msgstr "从不"
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:26
msgid ""
"Now, you must specify how you want to connect to the LDAP server. The SSL "
"(Secure Sockets Layer)\n"
@@ -487,23 +529,19 @@ msgstr ""
"字层)或TLS(传输层安全)协议来加密保护您的连接。请询问您的系统管理员关于您\n"
"的 LDAP 服务器使用何种协议的信息。"
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
msgid "One"
msgstr "一级"
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
msgid "S_earch scope: "
msgstr "搜索范围(_E):"
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
msgid "Searching"
msgstr "搜索"
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "已选择:"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:32
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if\n"
@@ -512,7 +550,7 @@ msgstr ""
"选中此选项意味着 Evolution 只在您的 LDAP 服务器支持\n"
"SSL 或 TLS 时才连接到您的 LDAP 服务器。"
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:34
msgid ""
"Selecting this option means that Evolution will only try to use SSL/TLS if "
"you are in a \n"
@@ -526,7 +564,7 @@ msgstr ""
"例如,如果您和您的 LDAP 服务器工作时位于防火墙后,Evolution 就没有必\n"
"要使用 SSL/TLS,因为您的连接已经相当安全了。"
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:38
msgid ""
"Selecting this option means that your server does not support either SSL or "
"TLS. This \n"
@@ -537,7 +575,7 @@ msgstr ""
"选择此选项意味着您的服务器既不支持 SSL 也不支持 TLS。可能导致的结果将是\n"
"您的连接不太安全,您也易于受到安全漏洞的攻击。"
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:41
#: calendar/gui/dialogs/calendar-setup.glade.h:16
msgid ""
"Selecting this option will let you change Evolution's default settings for "
@@ -546,7 +584,7 @@ msgid ""
msgstr ""
"选择此选项可让您更改 Evolution 对 LDAP 搜索及创建和编辑联系人所用的默认设置。"
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
#, fuzzy
msgid ""
"Specifying a\n"
@@ -554,32 +592,32 @@ msgid ""
"\t\t\t up an address book."
msgstr "指定显示名称是配置 LDAP 服务器所需的最后一个步骤。"
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
#: calendar/gui/dialogs/calendar-setup.glade.h:20
msgid "Step 1: Folder Characteristics"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
msgid "Step 2: Server Information"
msgstr "第二步:服务器信息"
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
msgid "Step 3: Connecting to Server"
msgstr "第三步:连接服务器"
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
msgid "Step 4: Searching the Directory"
msgstr "第四步:搜索目录"
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
msgid "Sub"
msgstr "子级"
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
msgid "Supported Search Bases"
msgstr "支持的搜索起点"
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:52
msgid ""
"The options on this page control how many entries should be included in "
"your\n"
@@ -590,7 +628,7 @@ msgstr ""
"本页中的选项控制了在您的搜索中应当包含多少项,以及搜索将花费的时间。\n"
"如果您需要更改这些选项,请询问您的系统管理员。"
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:55
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
"searches will \n"
@@ -600,7 +638,7 @@ msgstr ""
"搜索基础是您搜索开始项的可识别名称(DN)。如果您将此处留空,搜索将从目\n"
"录树的根开始。"
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:57
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the \n"
@@ -613,7 +651,7 @@ msgstr ""
"指定的搜索基础下所属的全部项。搜索范围若为“一级”,则只会包含您指定的搜\n"
"索基础之下一级的项目。\n"
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
#, fuzzy
msgid ""
"This assistant will help you\n"
@@ -628,13 +666,13 @@ msgstr ""
"添加新的 LDAP 服务器需要关于服务器的一些专业化信息。如果您对这些信\n"
"息不太了解的话,请询问您的系统管理员。"
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
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:73
+#: addressbook/gui/component/ldap-config.glade.h:68
#, fuzzy
msgid ""
"This is the maximum number of entries to download. Setting this number to "
@@ -644,7 +682,7 @@ msgstr ""
"这是可下载条目的最大数量。将此数值设定\n"
"得太大将导致地址簿变慢。"
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:70
msgid ""
"This is the method evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -653,7 +691,7 @@ msgstr ""
"这是 evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
"对 ldap 服务器的匿名访问权限。"
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:71
msgid ""
"This is the name for this server that will appear in your Evolution folder "
"list.\n"
@@ -662,7 +700,7 @@ msgstr ""
"这是此服务器在 Evolution 文件夹列表中显示的名称。\n"
"它只用于显示。"
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:73
#: calendar/gui/dialogs/calendar-setup.glade.h:34
#, fuzzy
msgid ""
@@ -672,7 +710,7 @@ msgstr ""
"这是此服务器在 Evolution 文件夹列表中显示的名称。\n"
"它只用于显示。"
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:74
msgid ""
"This is the port on the LDAP server that Evolution will try to connect to. "
"A \n"
@@ -682,28 +720,28 @@ msgstr ""
"这是 LDAP 服务器上的端口,Evolution 将试图连接到您所给出的标准端口列表。\n"
"如果您不清楚要指定端口,请询问您的系统管理员。"
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:77
msgid "This option controls how long a search will be run."
msgstr "此选项控制搜索将运行多长时间。"
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
msgid "U_se SSL/TLS:"
msgstr "使用 _SSL/TLS:"
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
msgid "Using distinguished name (DN)"
msgstr "使用已识别的姓名 (DN)"
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
msgid "Using email address"
msgstr "使用电子邮件地址"
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:154
msgid "Whenever Possible"
msgstr "可能时"
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
#, fuzzy
msgid ""
"You have decided to configure an LDAP server. The first step in doing this "
@@ -714,60 +752,48 @@ msgstr ""
"配置 LDAP 服务器的第一个步骤是提供其名称,以及您的登录信息。\n"
"如果您对这些信息不太了解,请询问您的系统管理员。"
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
#: calendar/gui/dialogs/calendar-setup.glade.h:37
msgid "_Display name:"
msgstr "显示名称(_D):"
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
msgid "_Download limit:"
msgstr "下载上限(_D):"
-#: addressbook/gui/component/ldap-config.glade.h:91
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:20
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
msgid "_Log in method:"
msgstr "登录方式(_L):"
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
msgid "_Port number:"
msgstr "端口号(_P):"
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
msgid "_Search base:"
msgstr "搜索起点(_S):"
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
msgid "_Server name:"
msgstr "服务器名(_S):"
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
msgid "_Timeout (minutes):"
msgstr "超时(分钟)(_T):"
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
msgid "cards"
msgstr "卡片"
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
msgid "connecting-tab"
msgstr "连接-页"
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
msgid "general-tab"
msgstr "常规-页"
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
msgid "searching-tab"
msgstr "搜索-页"
@@ -799,7 +825,7 @@ msgid "Send HTML Mail?"
msgstr "发送 HTML 邮件吗?"
#: addressbook/gui/component/select-names/e-select-names-popup.c:330
-#: addressbook/gui/widgets/eab-popup-control.c:1002
+#: addressbook/gui/widgets/eab-popup-control.c:1001
msgid "Add to Contacts"
msgstr "添加到联系人"
@@ -815,7 +841,7 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:216
+#: addressbook/gui/widgets/e-addressbook-view.c:222
msgid "Source"
msgstr "来源"
@@ -882,7 +908,8 @@ msgstr "合作"
#. Construct the app
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
msgid "Contact Editor"
msgstr "联系人编辑器"
@@ -891,7 +918,7 @@ msgid "D_epartment:"
msgstr "部门(_E):"
#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
#: smime/gui/smime-ui.glade.h:19
msgid "Details"
msgstr "细节"
@@ -972,16 +999,27 @@ msgstr "类别(_C)..."
#. FIXME: need to disable for undeletable folders
#: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 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:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
msgid "_Delete"
msgstr "删除(_D)"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22
+msgid "_Edit"
+msgstr "编辑(_E)"
+
#: addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "_Home:"
msgstr "家庭(_H):"
@@ -1023,22 +1061,22 @@ msgid "_Web page address:"
msgstr "网页地址(_W):"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
msgid "Address"
msgstr "地址"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
#: addressbook/gui/widgets/e-minicard-label.c:164
#: addressbook/gui/widgets/e-minicard-view-widget.c:119
#: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
msgid "Editable"
msgstr "可编辑"
@@ -2024,9 +2062,9 @@ msgid "Novell Groupwise"
msgstr "Novell GroupWise"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
msgid "Jabber"
msgstr "Jabber"
@@ -2039,20 +2077,21 @@ msgid "MSN Messenger"
msgstr "MSN Messenger"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
msgid "ICQ"
msgstr "ICQ"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
msgid "Service"
msgstr "服务"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
#: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
msgid "Location"
msgstr "位置"
@@ -2061,108 +2100,96 @@ msgid "Username"
msgstr "用户名"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
msgid "Home"
msgstr "家庭"
#. red
#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
msgid "Work"
msgstr "工作"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
msgid "Other"
msgstr "其它"
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
msgid "Source Book"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
msgid "Target Book"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
msgid "Contact"
msgstr "联系人"
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
msgid "Is New Contact"
msgstr "为新联系人"
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
msgid "Writable Fields"
msgstr "可写域"
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
msgid "Changed"
msgstr "已更改"
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
msgid "Account Name"
msgstr "账户名"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
msgid "Category editor not available."
msgstr "类别编辑器不可用。"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
msgid "This contact belongs to these categories:"
msgstr "此联系人属于这些类别:"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
msgid "Save Contact as VCard"
msgstr "将联系人保存为 VCard"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr "您确定要删除这些联系人吗?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "您确定要删除此联系人吗?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
msgid "Business"
msgstr "商务"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
msgid "AIM"
msgstr "AIM"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
msgid "Yahoo"
msgstr "雅虎"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
msgid "MSN"
msgstr "MSN"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
#, fuzzy
msgid "GroupWise"
msgstr "Novell GroupWise"
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr "无法为域找到构件:“%s”"
@@ -2176,6 +2203,7 @@ msgid "_Edit Full"
msgstr "编辑全名(_E)"
#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
msgid "_Full Name:"
msgstr "全名(_F):"
@@ -2183,6 +2211,18 @@ msgstr "全名(_F):"
msgid "E-_mail:"
msgstr "电子邮件(_M):"
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr "您确定要删除这些联系人吗?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "您确定要删除此联系人吗?"
+
#: addressbook/gui/contact-editor/fulladdr.glade.h:2
msgid "Address _2:"
msgstr "地址 _2:"
@@ -2285,22 +2325,28 @@ msgid "_Title:"
msgstr "头衔(_T):"
#: addressbook/gui/contact-editor/im.glade.h:2
-msgid "Account name:"
-msgstr "账户名:"
-
-#: addressbook/gui/contact-editor/im.glade.h:3
msgid "Add IM Account"
msgstr "添加即时通讯账户"
+#: addressbook/gui/contact-editor/im.glade.h:3
+#, fuzzy
+msgid "_Account name:"
+msgstr "账户名:"
+
#: addressbook/gui/contact-editor/im.glade.h:4
-msgid "IM Service:"
+#, fuzzy
+msgid "_IM Service:"
msgstr "即时通讯服务:"
#: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-msgid "Location:"
+#, fuzzy
+msgid "_Location:"
msgstr "位置:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "\n"
+msgstr "\n"
+
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
msgid "Members"
msgstr "成员"
@@ -2321,25 +2367,26 @@ msgstr "输入电子邮件地址或者把联系人拖放到下面的列表(_T)
msgid "contact-list-editor"
msgstr "联系人列表编辑器"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147
-#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:295
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:209
+#: addressbook/gui/widgets/e-addressbook-view.c:215
#: addressbook/gui/widgets/e-minicard-view-widget.c:105
#: addressbook/gui/widgets/e-minicard-view.c:460
msgid "Book"
msgstr "名簿"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
msgid "Is New List"
msgstr "为新列表"
#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
msgid "Contact List Editor"
msgstr "联系人列表编辑器"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
msgid "Save List as VCard"
msgstr "将列表保存为 VCard"
@@ -2391,23 +2438,20 @@ msgid "No contacts"
msgstr "无联系人"
#: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr "1 个联系人"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
-#, c-format
-msgid "%d contacts"
-msgstr "%d 个联系人"
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d 个联系人"
-#: addressbook/gui/widgets/e-addressbook-model.c:305
+#: addressbook/gui/widgets/e-addressbook-model.c:302
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:223
+#: addressbook/gui/widgets/e-addressbook-view.c:229
#: addressbook/gui/widgets/e-minicard-view-widget.c:112
#: addressbook/gui/widgets/e-minicard-view.c:467
msgid "Query"
msgstr "查询"
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
msgid "Error getting book view"
msgstr "获取名簿视图出错"
@@ -2419,132 +2463,131 @@ msgstr "模型"
msgid "Error modifying card"
msgstr "修改卡片错误"
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
msgid "Name begins with"
msgstr "姓名以此开头"
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
msgid "Email begins with"
msgstr "邮件以此开头"
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:163
#: calendar/gui/cal-search-bar.c:54
msgid "Category is"
msgstr "类别为"
#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:164
#: calendar/gui/cal-search-bar.c:49
msgid "Any field contains"
msgstr "任何域含有"
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:170
msgid "Advanced..."
msgstr "高级..."
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:236
#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:12
#: calendar/gui/e-meeting-list-view.c:249
#: calendar/gui/e-meeting-time-sel.etspec.h:11
msgid "Type"
msgstr "类型"
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
msgid "Address Book"
msgstr "地址簿"
-#: addressbook/gui/widgets/e-addressbook-view.c:838
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
-#: addressbook/gui/widgets/e-addressbook-view.c:2016
+#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:2031
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr "保存为 VCard"
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
msgid "New Contact..."
msgstr "新建联系人..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
msgid "New Contact List..."
msgstr "新建联系人列表..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
msgid "Go to Folder..."
msgstr "转到文件夹..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
msgid "Import..."
msgstr "导入..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
msgid "Search for Contacts..."
msgstr "搜索联系人..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
#, fuzzy
msgid "Address Book Sources..."
msgstr "地址簿来源..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
msgid "Pilot Settings..."
msgstr "Pilot 设置..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "转发联系人"
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
msgid "Send Message to Contact"
msgstr "给联系人发邮件"
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: 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:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
msgid "Print"
msgstr "打印"
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
msgid "Print Envelope"
msgstr "打印信封"
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
#, fuzzy
msgid "Copy to Address Book..."
msgstr "地址簿..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
#, fuzzy
msgid "Move to Address Book..."
msgstr "地址簿..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "剪切"
-#. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: calendar/gui/calendar-component.c:372
-#: calendar/gui/dialogs/copy-source-dialog.c:159
-#: calendar/gui/tasks-component.c:363 ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1084
+#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:365
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr "复制"
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
msgid "Paste"
msgstr "粘贴"
-#: addressbook/gui/widgets/e-addressbook-view.c:1078
-#: calendar/gui/e-cal-view.c:1269
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1248
msgid "Current View"
msgstr "当前视图"
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
#, c-format
msgid ""
"The addressbook backend for\n"
@@ -2555,7 +2598,7 @@ msgstr ""
"的地址簿后端已经崩溃。您需要重新启动 Evolution 才能再次使用该后端"
#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
#: calendar/gui/cal-search-bar.c:359
msgid "Any Category"
msgstr "任何类别"
@@ -2589,8 +2632,6 @@ msgid "Car Phone"
msgstr "车载电话"
#: 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 "类别"
@@ -2599,7 +2640,7 @@ msgid "Company Phone"
msgstr "公司电话"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
msgid "Email"
msgstr "电子邮件"
@@ -2651,6 +2692,7 @@ msgid "Manager"
msgstr "经理"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
msgid "Mobile Phone"
msgstr "移动电话"
@@ -2659,7 +2701,7 @@ msgid "Nickname"
msgstr "昵称"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
msgid "Note"
msgstr "注释"
@@ -2668,7 +2710,7 @@ msgid "Office"
msgstr "办公室"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
msgid "Organization"
msgstr "组织"
@@ -2724,17 +2766,17 @@ msgid "Web Site"
msgstr "网站"
#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:145
+#: addressbook/gui/widgets/e-minicard.c:136
msgid "Width"
msgstr "宽度"
#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard.c:143
msgid "Height"
msgstr "高度"
#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:160
+#: addressbook/gui/widgets/e-minicard.c:151
msgid "Has Focus"
msgstr "有焦点"
@@ -2786,89 +2828,92 @@ msgstr ""
msgid "Adapter"
msgstr "适配器"
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
msgid "Selected"
msgstr "已选择"
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
msgid "Has Cursor"
msgstr "有光标"
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
msgid "(map)"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
msgid "map"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
msgid "List Members"
msgstr "列出成员"
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
#, fuzzy
msgid "E-mail"
msgstr "电子邮件"
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "工作"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
#, fuzzy
msgid "Position"
msgstr "描述"
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
#, fuzzy
msgid "Groupwise"
msgstr "组"
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
#, fuzzy
msgid "Video Conferencing"
msgstr "视频会议 URL(_V):"
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
#, fuzzy
msgid "Phone"
msgstr "车载电话"
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
msgid "Fax"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/widgets/eab-contact-display.c:319
#, fuzzy
-msgid "personal"
-msgstr "个人"
+msgid "work"
+msgstr "工作"
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
msgid "WWW"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
msgid "Blog"
msgstr "Blog"
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#, fuzzy
+msgid "personal"
+msgstr "个人"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
msgid "Job Title"
msgstr "职称"
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
msgid "Home page"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
msgid "Success"
msgstr "成功"
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:48
#: camel/providers/imap/camel-imap-command.c:303
#: camel/providers/imap/camel-imap-command.c:400
#: camel/providers/pop3/camel-pop3-store.c:538
@@ -2876,93 +2921,93 @@ msgstr "成功"
msgid "Unknown error"
msgstr "未知的错误"
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
msgid "Repository offline"
msgstr "仓库离线"
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
msgid "Permission denied"
msgstr "没有权限"
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
msgid "Contact not found"
msgstr "找不到联系人"
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
msgid "Contact ID already exists"
msgstr "联系人 ID 已经存在"
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
msgid "Protocol not supported"
msgstr "不支持的协议"
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
#: calendar/gui/dialogs/task-details-page.glade.h:3
#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2350 camel/camel-service.c:728
+#: calendar/gui/print.c:2349 camel/camel-service.c:728
#: camel/camel-service.c:766 camel/camel-service.c:850
#: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451
#: camel/providers/pop3/camel-pop3-store.c:532
msgid "Cancelled"
msgstr "已经取消"
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
msgid "Authentication Failed"
msgstr "认证失败"
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
msgid "Authentication Required"
msgstr "必须认证"
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
msgid "TLS not Available"
msgstr "TLS 不可用"
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
#, fuzzy
msgid "Address Book does not exist"
msgstr "地址簿不存在"
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
msgid "Other error"
msgstr "其它错误"
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
msgid "Do you want to save changes?"
msgstr "您希望保存修改吗?"
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
msgid "_Discard"
msgstr "丢弃(_D)"
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
msgid "Error adding list"
msgstr "添加列表出错"
-#: addressbook/gui/widgets/eab-gui-util.c:106
-#: addressbook/gui/widgets/eab-gui-util.c:524
+#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:525
msgid "Error adding contact"
msgstr "添加联系人出错"
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
msgid "Error modifying list"
msgstr "修改列表出错"
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
msgid "Error modifying contact"
msgstr "修改联系人出错"
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
msgid "Error removing list"
msgstr "删除列表出错"
-#: addressbook/gui/widgets/eab-gui-util.c:125
-#: addressbook/gui/widgets/eab-gui-util.c:482
+#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:483
msgid "Error removing contact"
msgstr "删除联系人出错"
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
#, fuzzy, c-format
msgid ""
"Opening %d contacts will open %d new windows as well.\n"
@@ -2971,7 +3016,7 @@ msgstr ""
"打开 %d 张卡片将同时打开 %d 个新窗口。\n"
"您真的想要显示所有卡片吗?"
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
#, c-format
msgid ""
"%s already exists\n"
@@ -2980,50 +3025,50 @@ msgstr ""
"%s 已经存在\n"
"您打算覆盖它吗?"
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
msgid "Overwrite"
msgstr "覆盖"
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
#, c-format
msgid "Error saving %s: %s"
msgstr "保存 %s 出错:%s"
#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:310
+#: addressbook/gui/widgets/eab-gui-util.c:311
msgid "card.vcf"
msgstr "card.vcf"
-#: addressbook/gui/widgets/eab-gui-util.c:443
+#: addressbook/gui/widgets/eab-gui-util.c:444
msgid "list"
msgstr "列表"
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
msgid "Move contact to"
msgstr "将联系人移动到"
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
msgid "Copy contact to"
msgstr "将联系人复制到"
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
msgid "Move contacts to"
msgstr "将联系人移动到"
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
msgid "Copy contacts to"
msgstr "将联系人复制到"
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
#, fuzzy
msgid "Select target addressbook."
msgstr "从地址簿中选择联系人"
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
msgid "Multiple VCards"
msgstr "多个 VCard"
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
#, c-format
msgid "VCard for %s"
msgstr "%s 的 VCard"
@@ -3060,33 +3105,30 @@ msgstr "为现有的联系人“%s”添加地址"
msgid "Querying Address Book..."
msgstr "正在查询地址簿..."
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
msgid "Edit Contact Info"
msgstr "编辑联系人信息"
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
msgid "Merge E-Mail Address"
msgstr "合并电子邮件地址"
-#: addressbook/gui/widgets/eab-vcard-control.c:140
-#, c-format
-msgid "and %d other contacts."
-msgstr "以及另外 %d 个联系人。"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
msgid "and one other contact."
-msgstr "以及另外一个联系人。"
+msgid_plural "and %d other contacts."
+msgstr[0] "以及另外一个联系人。"
-#: addressbook/gui/widgets/eab-vcard-control.c:225
-#: addressbook/gui/widgets/eab-vcard-control.c:275
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
msgid "Show Full VCard"
msgstr "显示完整 VCard"
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
msgid "Show Compact VCard"
msgstr "显示紧凑 VCard"
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
msgid "Save in addressbook"
msgstr "保存在地址簿中"
@@ -3237,7 +3279,7 @@ msgstr "边界"
msgid "Number of columns:"
msgstr "列数:"
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23
msgid "Options"
msgstr "选项"
@@ -3415,7 +3457,7 @@ msgid "Unnamed List"
msgstr "未命名的列表"
#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
msgid "Enter password"
msgstr "输入密码"
@@ -3492,7 +3534,7 @@ msgid "Evolution's Tasks component"
msgstr "Evolution 任务组件"
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1139 calendar/gui/print.c:1819
#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
#: calendar/importers/icalendar-importer.c:709
msgid "Tasks"
@@ -3538,24 +3580,24 @@ msgstr "午睡时间(分钟)"
msgid "_Edit appointment"
msgstr "编辑约会(_E)"
-#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: calendar/gui/alarm-notify/alarm-queue.c:906
#: ui/evolution-message-composer.xml.h:10
msgid "Open"
msgstr "打开"
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
msgid "Dismiss"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
msgid "Dismiss All"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
msgid "No description available."
msgstr "没有描述。"
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
#, c-format
msgid ""
"Alarm on %s\n"
@@ -3564,12 +3606,12 @@ msgid ""
"Ending at %s"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
msgid "Warning"
msgstr "警告"
-#: calendar/gui/alarm-notify/alarm-queue.c:1086
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -3581,7 +3623,7 @@ msgstr ""
"发送电子邮件。Evolution 将以\n"
"显示普通提示会话框代替。"
-#: calendar/gui/alarm-notify/alarm-queue.c:1112
+#: calendar/gui/alarm-notify/alarm-queue.c:1119
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3597,7 +3639,7 @@ msgstr ""
"\n"
"您确信您要运行该程序吗?"
-#: calendar/gui/alarm-notify/alarm-queue.c:1126
+#: calendar/gui/alarm-notify/alarm-queue.c:1133
msgid "Do not ask me about this program again."
msgstr "不要再次询问此问题。"
@@ -3770,13 +3812,13 @@ msgstr "注释含有"
msgid "Location contains"
msgstr "描述含有"
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
msgid "Unmatched"
msgstr "无匹配"
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
-#: camel/providers/groupwise/camel-gw-listener.c:298
-#: camel/providers/groupwise/camel-gw-listener.c:322
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1596
+#: camel/providers/groupwise/camel-gw-listener.c:302
+#: camel/providers/groupwise/camel-gw-listener.c:326
msgid "Calendar"
msgstr "日历"
@@ -3797,7 +3839,7 @@ msgid "Purge events older than"
msgstr "返回小于"
#: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
msgid "days"
msgstr "天数"
@@ -3808,7 +3850,7 @@ 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:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329
msgid "%a %d %b"
msgstr "%m月%d日%A"
@@ -3830,70 +3872,70 @@ msgstr "%Y年%m月%d日"
msgid "%d %B"
msgstr "%m月%d日"
-#: calendar/gui/calendar-component.c:313
+#: calendar/gui/calendar-component.c:373
#, c-format
msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
msgstr "即将删除日历“%s”。您确定想要继续吗?"
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
#: calendar/gui/dialogs/calendar-setup.glade.h:13
msgid "New Calendar"
msgstr "新建日历"
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
msgid "New appointment"
msgstr "新建约会"
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
msgid "_Appointment"
msgstr "约会(_A)"
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
msgid "Create a new appointment"
msgstr "创建新约会"
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
msgid "New meeting"
msgstr "新闻会议"
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
msgid "M_eeting"
msgstr "会议(_E)"
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
msgid "Create a new meeting request"
msgstr "创建一条新会议请求"
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
msgid "New all day appointment"
msgstr "新建全天约会"
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
msgid "All _Day Appointment"
msgstr "全天约会(_D)"
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
msgid "Create a new all-day appointment"
msgstr "创建新全天约会"
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
msgid "New calendar"
msgstr "新建日历"
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
msgid "C_alendar"
msgstr "日历(_A)"
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
msgid "Create a new calendar"
msgstr "创建新日历"
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
#, c-format
msgid "Unable to open the calendar '%s' for creating events and meetings"
msgstr ""
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
msgid "There is no calendar available for creating events and meetings"
msgstr ""
@@ -3923,10 +3965,6 @@ msgstr "周视图"
msgid "Month View"
msgstr "月视图"
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr "列表视图"
-
#: calendar/gui/comp-editor-factory.c:408
msgid "Error while opening the calendar"
msgstr "打开日历时出错"
@@ -3944,16 +3982,16 @@ msgstr "没有权限打开日历"
msgid "open_client(): %s"
msgstr ""
-#: calendar/gui/control-factory.c:140
+#: calendar/gui/control-factory.c:142
#, c-format
msgid "Could not open the folder in '%s'"
msgstr "无法在“%s”中打开文件夹"
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
msgid "The URI that the calendar will display"
msgstr "日历将显示的 URI"
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
msgid "The type of view to show"
msgstr "要显示的视图"
@@ -4017,11 +4055,11 @@ msgstr "dialog1"
msgid "extra times every"
msgstr "每个额外时间"
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
msgid "hours"
msgstr "小时"
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
msgid "minutes"
msgstr "分钟"
@@ -4044,11 +4082,11 @@ msgstr "基本"
msgid "Date/Time:"
msgstr "日期/时间:"
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:463
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
msgid "Display a message"
msgstr "显示消息"
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:459
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
msgid "Play a sound"
msgstr "播放声音"
@@ -4057,17 +4095,17 @@ msgstr "播放声音"
msgid "Reminders"
msgstr "提醒"
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
msgid "Run a program"
msgstr "运行程序"
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-msgid "Send an Email"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
msgstr "发送电子邮件"
#: calendar/gui/dialogs/alarm-page.glade.h:9
#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:938 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
#: calendar/gui/e-tasks.c:164
msgid "Summary:"
msgstr "概要:"
@@ -4098,7 +4136,7 @@ msgid "hour(s)"
msgstr "小时"
#: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:40
msgid "minute(s)"
msgstr "分钟"
@@ -4108,8 +4146,8 @@ msgstr "约会开始"
#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
#. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
+#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:492
+#: mail/em-composer-prefs.c:784 mail/em-composer-prefs.c:948
msgid "Enabled"
msgstr "已启用"
@@ -4123,19 +4161,19 @@ msgstr "不删除"
#: calendar/gui/dialogs/cal-prefs-dialog.c:710
#: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:397
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
msgid "Disable"
msgstr "禁用"
#: calendar/gui/dialogs/cal-prefs-dialog.c:710
#: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:400
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
msgid "Enable"
msgstr "启用"
@@ -4159,7 +4197,7 @@ msgstr "30 分钟"
msgid "60 minutes"
msgstr "60 分钟"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
msgid "Alerts"
msgstr "警告"
@@ -4184,7 +4222,7 @@ msgid "Days"
msgstr "天数"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:74
msgid "E_nable"
msgstr "启用(_N)"
@@ -4279,7 +4317,7 @@ msgid "Wednesday"
msgstr "星期三"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
msgid "Work Week"
msgstr "一周工作日"
@@ -4324,7 +4362,6 @@ msgid "_Fri"
msgstr "周五(_F)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
msgid "_General"
msgstr "常规(_G)"
@@ -4422,7 +4459,7 @@ msgstr ""
"请单击“完成”按钮保存您在此输入的设置。"
#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:363
msgid "New Task List"
msgstr "新建任务列表"
@@ -4573,28 +4610,28 @@ msgstr "%s 您已经做出了修改。放弃这些修改并更新编辑器吗
msgid "%s You have made no changes, update the editor?"
msgstr "%s 您还没有进行修改,更新编辑器吗?"
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
#, c-format
msgid "Validation error: %s"
msgstr "校验错误:%s"
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
msgid " to "
msgstr " 到 "
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
msgid " (Completed "
msgstr " (完成 "
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
msgid "Completed "
msgstr "已完成 "
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
msgid " (Due "
msgstr " (预定 "
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
msgid "Due "
msgstr "预定 "
@@ -4630,8 +4667,9 @@ msgstr "日志条目 - %s"
msgid "No summary"
msgstr "没有概要"
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
+#: calendar/gui/dialogs/comp-editor.c:1360
+#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
+#: composer/e-msg-composer.c:1153
msgid "Save as..."
msgstr "另存为..."
@@ -4645,35 +4683,20 @@ msgstr "如果更新到达的话,对此项目的更改将被丢弃"
msgid "Unable to use current version!"
msgstr "无法使用当前版本!"
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
#, fuzzy
msgid "Could not open source"
msgstr "无法打开“%s”:%s"
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
#, fuzzy
msgid "Could not open destination"
msgstr "投递目的"
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
msgid "Destination is read only"
msgstr ""
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, fuzzy, c-format
-msgid "Select destination %s"
-msgstr "投递目的"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "日历"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "新建任务列表"
-
#: calendar/gui/dialogs/delete-comp.c:95
#, c-format
msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4702,19 +4725,22 @@ msgid "Are you sure want to delete this untitled journal entry?"
msgstr "您真的想要删除此无标题日志条目吗?"
#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "您真的想要删除 %d 个约会吗?"
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointment?"
+msgid_plural "Are you sure you want to delete %d appointments?"
+msgstr[0] "您真的想要删除 %d 个约会吗?"
-#: 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:138
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d task?"
+msgid_plural "Are you sure you want to delete %d tasks?"
+msgstr[0] "您真的想要删除 %d 个任务吗?"
-#: 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-comp.c:145
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entry?"
+msgid_plural "Are you sure you want to delete %d journal entries?"
+msgstr[0] "您真的想要删除 %d 个日志条目吗?"
#: calendar/gui/dialogs/delete-error.c:52
msgid "The event could not be deleted due to a corba error"
@@ -4780,7 +4806,7 @@ msgstr "授权给:"
msgid "Enter Delegate"
msgstr "输入代表"
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
msgid "Appointment"
msgstr "约会"
@@ -4853,8 +4879,6 @@ msgstr "日历:"
#: calendar/gui/dialogs/event-page.glade.h:6
#: calendar/gui/dialogs/task-page.glade.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#: calendar/gui/e-calendar-table.etspec.h:5
msgid "Classification"
msgstr "分类"
@@ -4905,13 +4929,13 @@ msgstr "开始时间(_S):"
#. an empty string is the same as 'None'
#: calendar/gui/dialogs/meeting-page.c:311
#: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
msgid "None"
msgstr "无"
@@ -4968,13 +4992,13 @@ msgid "Member"
msgstr "成员"
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1048 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:10
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:9
#: calendar/gui/e-meeting-list-view.c:270
#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
#: mail/message-list.etspec.h:12
@@ -5145,7 +5169,7 @@ msgid "_No recurrence"
msgstr "不再现(_N)"
#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:452
msgid "_Remove"
msgstr "删除(_R)"
@@ -5187,7 +5211,7 @@ msgstr ""
"\n"
"您希望保存改动吗?"
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1570
msgid "_Discard Changes"
msgstr "丢弃修改(_D)"
@@ -5195,6 +5219,28 @@ msgstr "丢弃修改(_D)"
msgid "Save Event"
msgstr "保存事件"
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "选择导入器"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "投递目的"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "日历"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "新建任务列表"
+
#: calendar/gui/dialogs/send-comp.c:57
msgid "The meeting information has been created. Send it?"
msgstr "会议信息已创建。发送此信息吗?"
@@ -5224,39 +5270,39 @@ msgstr "完成百分比(_C)"
#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
#: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2347
+#: calendar/gui/print.c:2346
msgid "Completed"
msgstr "已完成"
#: calendar/gui/dialogs/task-details-page.glade.h:5
#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:227
-#: mail/message-list.c:939
+#: mail/message-list.c:947
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:595
#: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2343
msgid "In Progress"
msgstr "正在进行中"
#: calendar/gui/dialogs/task-details-page.glade.h:7
#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:937
+#: mail/message-list.c:945
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:392
-#: calendar/gui/e-tasks.c:229 mail/message-list.c:938
+#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-tasks.c:229 mail/message-list.c:946
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:593
#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2340
msgid "Not Started"
msgstr "尚未开始"
@@ -5270,7 +5316,8 @@ msgid "Undefined"
msgstr "未定义"
#: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
+#, fuzzy
+msgid "_Date completed:"
msgstr "完成日期(_D):"
#: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5313,9 +5360,9 @@ msgstr "无法打开“%s”中的任务。"
msgid "Con_fidential"
msgstr "机密(_F)"
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
msgid "Description:"
msgstr "描述:"
@@ -5324,11 +5371,13 @@ msgid "Folder:"
msgstr "文件夹:"
#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
+#, fuzzy
+msgid "Sta_rt date:"
msgstr "开始日期(_R):"
#: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
+#, fuzzy
+msgid "_Due date:"
msgstr "到期日期(_D):"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
@@ -5380,136 +5429,108 @@ msgid "Weekly"
msgstr "每周"
#: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d 天"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 天"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d 周"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 周"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d 小时"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 小时"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d 分钟"
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d 天"
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 分钟"
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d 周"
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d 秒"
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 小时"
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 秒"
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分钟"
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "发送电子邮件"
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 秒"
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
msgid "Unknown action to be performed"
msgstr "执行未知的动作"
-#: calendar/gui/e-alarm-list.c:489
+#: calendar/gui/e-alarm-list.c:474
#, c-format
msgid "%s %s before the start of the appointment"
msgstr "在约会开始之前 %s %s"
-#: calendar/gui/e-alarm-list.c:492
+#: calendar/gui/e-alarm-list.c:477
#, c-format
msgid "%s %s after the start of the appointment"
msgstr "在约会开始之后 %s %s"
-#: calendar/gui/e-alarm-list.c:497
+#: calendar/gui/e-alarm-list.c:482
#, c-format
msgid "%s at the start of the appointment"
msgstr "在约会开始时 %s"
-#: calendar/gui/e-alarm-list.c:506
+#: calendar/gui/e-alarm-list.c:491
#, c-format
msgid "%s %s before the end of the appointment"
msgstr "在约会结束之前 %s %s"
-#: calendar/gui/e-alarm-list.c:509
+#: calendar/gui/e-alarm-list.c:494
#, c-format
msgid "%s %s after the end of the appointment"
msgstr "在约会结束之后 %s %s"
-#: calendar/gui/e-alarm-list.c:514
+#: calendar/gui/e-alarm-list.c:499
#, c-format
msgid "%s at the end of the appointment"
msgstr "在约会结束时 %s"
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
#, c-format
msgid "%s at %s"
msgstr "在 %2$s 时 %1$s"
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:527
#, c-format
msgid "%s for an unknown trigger type"
msgstr "%s 为未知触发类型"
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
+#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:369
msgid "Public"
msgstr "公开"
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
#: calendar/gui/e-calendar-table.c:370
msgid "Private"
msgstr "保密"
-#: calendar/gui/e-cal-list-view.c:266 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
#: calendar/gui/e-calendar-table.c:371
msgid "Confidential"
msgstr "机密"
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
-msgstr "描述"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "日期"
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-cal-list-view.etspec.h:3
msgid "Start Date"
msgstr "开始日期"
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
msgid "Summary"
msgstr "概要"
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr "颜色"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr "组件"
-
#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
msgid "Free"
msgstr "空闲"
@@ -5545,141 +5566,39 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
msgid "Yes"
msgstr "是"
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
msgid "No"
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:978 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
#: calendar/gui/e-meeting-list-view.c:144
#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
#: 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:2112
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2133
+#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:61
msgid "Unknown"
msgstr "未知"
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
msgid "Recurring"
msgstr "重复"
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
msgid "Assigned"
msgstr "已委派"
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "删除选中的对象"
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "更新对象"
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr "新建约会(_A)..."
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr "新建全天事件(_E)"
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
-msgstr "新会议"
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr "新建任务"
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: 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:23
-msgid "_Print..."
-msgstr "打印(_P)..."
-
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: 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:22
-msgid "_Paste"
-msgstr "粘贴(_P)"
-
-#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "转到今天(_T)"
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr "转到日期(_G)..."
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "发布忙闲信息(_P)"
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "打开(_O)"
-
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: 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:1044 calendar/gui/e-calendar-table.c:1073
-#: 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:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "复制(_C)"
-
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
-msgstr "调度会议(_S)..."
-
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
-msgstr "作为 iCalendar 转发(_F)..."
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr "删除此次出现(_O)"
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr "删除所有出现(_A)"
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "设置(_S)..."
-
#: calendar/gui/e-calendar-table.c:413
msgid "0%"
msgstr "0%"
@@ -5724,32 +5643,85 @@ msgstr "90%"
msgid "100%"
msgstr "100%"
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:701 calendar/gui/e-calendar-view.c:626
+msgid "Deleting selected objects"
+msgstr "删除选中的对象"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "更新对象"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1081
+#: calendar/gui/e-calendar-view.c:1261 calendar/gui/e-calendar-view.c:1328
+#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "打开(_O)"
+
+#: calendar/gui/e-calendar-table.c:1041
msgid "Open _Web Page"
msgstr "打开网页(_W)"
-#: calendar/gui/e-calendar-table.c:1050
+#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1087
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1334
+#: mail/em-folder-view.c:742 mail/em-popup.c:689 mail/em-popup.c:804
+#: ui/evolution-mail-message.xml.h:128
+msgid "_Save As..."
+msgstr "另存为(_S)..."
+
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1085
+#: calendar/gui/e-calendar-view.c:1240 calendar/gui/e-calendar-view.c:1263
+#: calendar/gui/e-calendar-view.c:1332 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
+#: ui/evolution-tasks.xml.h:25
+msgid "_Print..."
+msgstr "打印(_P)..."
+
+#: calendar/gui/e-calendar-table.c:1047 calendar/gui/e-calendar-table.c:1076
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1310
+#: 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-calendar-table.c:1048 calendar/gui/e-calendar-table.c:1074
+#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1308
+#: mail/em-folder-tree.c:2508 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+msgid "_Copy"
+msgstr "复制(_C)"
+
+#: calendar/gui/e-calendar-table.c:1049 calendar/gui/e-calendar-table.c:1083
+#: calendar/gui/e-calendar-view.c:1244 calendar/gui/e-calendar-view.c:1270
+#: calendar/gui/e-calendar-view.c:1330 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:24
+msgid "_Paste"
+msgstr "粘贴(_P)"
+
+#: calendar/gui/e-calendar-table.c:1053
msgid "_Assign Task"
msgstr "委派任务(_A)"
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
msgid "_Forward as iCalendar"
msgstr "作为 iCalendar 转发(_F)"
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
msgid "_Mark Selected Tasks as Complete"
msgstr "把任务标记为完成(_M)"
-#: calendar/gui/e-calendar-table.c:1058 calendar/gui/e-calendar-table.c:1076
+#: calendar/gui/e-calendar-table.c:1061 calendar/gui/e-calendar-table.c:1079
msgid "_Delete Selected Tasks"
msgstr "删除选定的任务(_D)"
-#: calendar/gui/e-calendar-table.c:1368
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1371
+#: calendar/gui/e-calendar-table.etspec.h:3
msgid "Click to add a task"
msgstr "点击以添加任务"
@@ -5758,38 +5730,101 @@ msgstr "点击以添加任务"
msgid "% Complete"
msgstr "% 完成"
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "提醒"
-
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
msgid "Complete"
msgstr "完成"
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
msgstr "完成日期"
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
msgstr "到期日期"
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "地理位置"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
msgid "Priority"
msgstr "优先级"
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "开始日期"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
msgid "Task sort"
msgstr "任务排序"
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
+msgid "New _Appointment..."
+msgstr "新建约会(_A)..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "新建全天事件(_E)"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "新会议"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "新建任务"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "选定线索(_T)"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "选择(_S)..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "发布忙闲信息(_P)"
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "复制到文件夹..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "移动到文件夹(_V)..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr "调度会议(_S)..."
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr "作为 iCalendar 转发(_F)..."
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "删除此次出现(_O)"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "删除所有出现(_A)"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "转到今天(_T)"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "转到日期(_G)..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "设置(_S)..."
#. strftime format of a weekday, a date and a time, 24-hour.
#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -5821,26 +5856,26 @@ 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:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
msgid "%A %d %B"
msgstr "%B%d日%A"
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
#: calendar/gui/e-week-view-main-item.c:343
msgid "%d %b"
msgstr "%B%d日"
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:592
#: calendar/gui/print.c:838
msgid "am"
msgstr "上午"
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:824 calendar/gui/e-week-view.c:595
#: calendar/gui/print.c:840
msgid "pm"
msgstr "下午"
@@ -5849,415 +5884,405 @@ msgstr "下午"
msgid "Yes. (Complex Recurrence)"
msgstr "是(复杂重现)"
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
msgid "Every day"
-msgstr "每天"
+msgid_plural "Every %d days"
+msgstr[0] "每天"
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "每 %d 天"
-
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
msgid "Every week"
-msgstr "每周"
-
-#: calendar/gui/e-itip-control.c:613
-#, c-format
-msgid "Every %d weeks"
-msgstr "每 %d 周"
+msgid_plural "Every %d weeks"
+msgstr[0] "每周"
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:609
+#, fuzzy, c-format
msgid "Every week on "
-msgstr "每周的"
+msgid_plural "Every %d weeks on "
+msgstr[0] "每周的"
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "每 %d 周的"
-
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
msgid " and "
msgstr " 和 "
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
#, c-format
msgid "The %s day of "
msgstr "第 %s 天属于"
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
#, c-format
msgid "The %s %s of "
msgstr "%s %s 属于"
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
msgid "every month"
-msgstr "每月"
-
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr "每 %d 个月"
+msgid_plural "every %d months"
+msgstr[0] "每月"
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
msgid "Every year"
-msgstr "每年"
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "每 %d 年"
+msgid_plural "Every %d years"
+msgstr[0] "每年"
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr " 总计 %d 次"
+#: calendar/gui/e-itip-control.c:659
+#, fuzzy, c-format
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] " 总计 %d 次"
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
msgid ", ending on "
msgstr ",结束于 "
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
msgid "<b>Starts:</b> "
msgstr "<b>开始:</b>"
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
msgid "<b>Ends:</b> "
msgstr "<b>结束:</b>"
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
msgid "<b>Completed:</b> "
msgstr "<b>已完成:</b> "
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
msgid "<b>Due:</b> "
msgstr "<b>到期:</b>"
-#: calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.c:822
msgid "iCalendar Information"
msgstr "iCalendar 信息"
#. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
msgid "iCalendar Error"
msgstr "iCalendar 错误"
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:886
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:914
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
msgid "An unknown person"
msgstr "未知的人"
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作。"
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
msgid "<i>None</i>"
msgstr "<i>无</i>"
+#: calendar/gui/e-itip-control.c:930
+msgid "Location:"
+msgstr "位置:"
+
#. write status
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-tasks.c:199
+#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:199
msgid "Status:"
msgstr "状态:"
-#: calendar/gui/e-itip-control.c:966 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:180
#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
#: calendar/gui/itip-utils.c:422
msgid "Accepted"
msgstr "接受"
-#: calendar/gui/e-itip-control.c:970 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
msgid "Tentatively Accepted"
msgstr "暂时接受"
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
msgid "Declined"
msgstr "拒绝"
-#: calendar/gui/e-itip-control.c:1033 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1087 calendar/gui/e-itip-control.c:1100
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1126
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
msgid "Choose an action:"
msgstr "选择一项活动:"
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
msgid "Update"
msgstr "更新"
-#: calendar/gui/e-itip-control.c:1035 calendar/gui/e-itip-control.c:1066
-#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1102
-#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
#: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "确定"
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
msgid "Accept"
msgstr "接受"
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
msgid "Tentatively accept"
msgstr "暂时接受"
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
msgid "Decline"
msgstr "拒绝"
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
msgid "Send Free/Busy Information"
msgstr "发送忙闲信息"
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
msgid "Update respondent status"
msgstr "更新应答者状态"
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
msgid "Send Latest Information"
msgstr "发送最新的信息"
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1186
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> 发布了会议信息。"
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
msgid "Meeting Information"
msgstr "会议信息"
-#: calendar/gui/e-itip-control.c:1209
+#: calendar/gui/e-itip-control.c:1192
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr "<b>%s</b> 请求 %s 参加一个会议。"
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1194
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请求您参加一个会议。"
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
msgid "Meeting Proposal"
msgstr "会议建议"
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1199
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> 希望加入到已存的会议。"
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
msgid "Meeting Update"
msgstr "会议更新"
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1204
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> 想收到最新的会议信息。"
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
msgid "Meeting Update Request"
msgstr "会议更新请求"
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1212
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> 已回复一个会议请求。"
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
msgid "Meeting Reply"
msgstr "会议答复"
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1220
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
msgid "Meeting Cancellation"
msgstr "会议取消"
-#: calendar/gui/e-itip-control.c:1245 calendar/gui/e-itip-control.c:1313
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> 发送了一个无法理解的信息。"
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
msgid "Bad Meeting Message"
msgstr "错误的会议信息"
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1254
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> 发布了任务信息。"
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
msgid "Task Information"
msgstr "任务信息"
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1260
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> 请求 %s 完成一个任务。"
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1262
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请求您完成一个任务。"
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
msgid "Task Proposal"
msgstr "任务建议"
-#: calendar/gui/e-itip-control.c:1284
+#: calendar/gui/e-itip-control.c:1267
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s<b> 希望加入到已存在的任务。"
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
msgid "Task Update"
msgstr "任务更新"
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1272
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> 希望获取最新的任务信息。"
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
msgid "Task Update Request"
msgstr "任务更新请求"
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1280
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> 已经回复了任务委派。"
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
msgid "Task Reply"
msgstr "任务回复"
-#: calendar/gui/e-itip-control.c:1305
+#: calendar/gui/e-itip-control.c:1288
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> 取消了任务。"
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
msgid "Task Cancellation"
msgstr "任务取消"
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
msgid "Bad Task Message"
msgstr "错误的任务邮件"
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1316
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> 发布了忙闲信息。"
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
msgid "Free/Busy Information"
msgstr "忙闲信息"
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1321
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请求您的忙闲信息。"
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
msgid "Free/Busy Request"
msgstr "忙/闲请求"
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1326
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> 应答了忙闲请求。"
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
msgid "Free/Busy Reply"
msgstr "忙闲应答"
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
msgid "Bad Free/Busy Message"
msgstr "错误的忙闲信息"
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1407
msgid "The message does not appear to be properly formed"
msgstr "邮件的格式可能不正确"
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
msgid "The message contains only unsupported requests."
msgstr "邮件只含有不支持的请求。"
-#: calendar/gui/e-itip-control.c:1514
+#: calendar/gui/e-itip-control.c:1497
msgid "The attachment does not contain a valid calendar message"
msgstr "附件中没有有效的日历信息"
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日历项目"
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
msgid "Calendar file could not be updated!\n"
msgstr "无法更新日历文件!\n"
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
msgid "Update complete\n"
msgstr "更新完成\n"
-#: calendar/gui/e-itip-control.c:1807 calendar/gui/e-itip-control.c:1879
+#: calendar/gui/e-itip-control.c:1790 calendar/gui/e-itip-control.c:1862
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新参与者状态"
-#: calendar/gui/e-itip-control.c:1823 calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
msgid "Object is invalid and cannot be updated\n"
msgstr "对象无效,无法更新\n"
-#: calendar/gui/e-itip-control.c:1833
+#: calendar/gui/e-itip-control.c:1816
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "此响应并非来自当前参与者。将响应者加为参与者吗?"
-#: calendar/gui/e-itip-control.c:1845
+#: calendar/gui/e-itip-control.c:1828
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新参与者状态!\n"
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1847
msgid "There was an error on the CORBA system\n"
msgstr "CORBA 系统出错\n"
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
msgid "Object could not be found\n"
msgstr "找不到对象\n"
-#: calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1853
msgid "You don't have the right permissions to update the calendar\n"
msgstr "您没有适当的权限打开日历\n"
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
msgid "Attendee status updated\n"
msgstr "更新参与者状态\n"
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
msgid "Attendee status could not be updated!\n"
msgstr "无法更新参与者状态!\n"
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
msgid "Removal Complete"
msgstr "删除完成"
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1978
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
msgid "Item sent!\n"
msgstr "项目已发送!\n"
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:1982
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1965
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
@@ -6392,7 +6417,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:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
msgid "%m/%d/%Y"
msgstr "%Y-%m-%d"
@@ -6474,12 +6499,12 @@ msgstr "优先级:"
msgid "Web Page:"
msgstr "网页:"
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
#, c-format
msgid "Click to open %s"
msgstr "点击以打开 %s"
-#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
#, c-format
msgid ""
"Error on %s:\n"
@@ -6489,7 +6514,7 @@ msgstr ""
" %s"
#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
+#: calendar/gui/e-tasks.c:792
#, c-format
msgid ""
"The task backend for\n"
@@ -6497,12 +6522,12 @@ msgid ""
" has crashed."
msgstr ""
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
#, c-format
msgid ""
"Error opening %s:\n"
@@ -6511,46 +6536,48 @@ msgstr ""
"打开 %s 出错:\n"
" %s"
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
msgid "Loading tasks"
msgstr "装入任务"
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
msgid "Completing tasks..."
msgstr "正在完成的日期..."
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
msgid "Deleting selected objects..."
msgstr "正在删除选中的对象..."
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
msgid "Expunging"
msgstr "销毁"
-#: calendar/gui/gnome-cal.c:1751
-#, fuzzy, c-format
-msgid "Loading tasks at %s"
-msgstr "装入任务"
-
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1760
#, fuzzy, c-format
msgid "Loading appointments at %s"
msgstr "约会 - %s"
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1779
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "装入任务"
+
+#: calendar/gui/gnome-cal.c:1799
#, c-format
msgid "Opening %s"
msgstr "打开 %s"
-#: calendar/gui/gnome-cal.c:1945
+#: calendar/gui/gnome-cal.c:1928
#, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+msgid "The calendar backend for '%s' has crashed."
msgstr ""
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:1940
+#, c-format
+msgid "The task backend for '%s' has crashed."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:2754
#, fuzzy
msgid "Purging"
msgstr "都灵"
@@ -6572,45 +6599,46 @@ msgid "February"
msgstr "二月"
#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "转到日期"
-
-#: calendar/gui/goto-dialog.glade.h:6
msgid "January"
msgstr "一月"
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
msgid "July"
msgstr "七月"
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
msgid "June"
msgstr "六月"
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
msgid "March"
msgstr "三月"
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
msgid "May"
msgstr "五月"
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
msgid "November"
msgstr "十一月"
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
msgid "October"
msgstr "十月"
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "选中所有文字"
+
#: calendar/gui/goto-dialog.glade.h:13
msgid "September"
msgstr "九月"
#: calendar/gui/goto-dialog.glade.h:14
#, fuzzy
-msgid "_Go To Today"
-msgstr "转到今天"
+msgid "_Select Today"
+msgstr "选择文件夹"
#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
#: calendar/gui/itip-utils.c:351
@@ -6700,7 +6728,7 @@ msgid "Birthdays & Anniversaries"
msgstr ""
#. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
msgid "On The Web"
msgstr ""
@@ -6857,81 +6885,81 @@ msgid "Sa"
msgstr "六"
#. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
msgid "Selected day (%a %b %d %Y)"
msgstr "选中的日期(%Y年%m月%d日%A)"
-#: calendar/gui/print.c:1940 calendar/gui/print.c:1944
+#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
msgid "%a %b %d"
msgstr "%m月%d日%A"
-#: calendar/gui/print.c:1941
+#: calendar/gui/print.c:1940
msgid "%a %d %Y"
msgstr "%Y年%d日%A"
-#: calendar/gui/print.c:1945 calendar/gui/print.c:1947
-#: calendar/gui/print.c:1948
+#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
+#: calendar/gui/print.c:1947
msgid "%a %b %d %Y"
msgstr "%Y年%m月%d日%A"
-#: calendar/gui/print.c:1952
+#: calendar/gui/print.c:1951
#, c-format
msgid "Selected week (%s - %s)"
msgstr "选中的周(%s - %s)"
#. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
msgid "Selected month (%b %Y)"
msgstr "选中的月(%Y年%m月)"
#. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
msgid "Selected year (%Y)"
msgstr "选中的年(%Y年)"
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
msgid "Task"
msgstr "任务"
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
#, c-format
msgid "Status: %s"
msgstr "状态:%s"
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
#, c-format
msgid "Priority: %s"
msgstr "优先级:%s"
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
#, c-format
msgid "Percent Complete: %i"
msgstr "完成率:%i"
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2397
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2411
#, c-format
msgid "Categories: %s"
msgstr "类别:%s"
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
msgid "Contacts: "
msgstr "联系人:"
-#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
-#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
msgid "Print Preview"
msgstr "打印预览"
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
msgid "Print Item"
msgstr "打印项"
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
msgid "Print Setup"
msgstr "打印设置"
@@ -6940,36 +6968,36 @@ msgstr "打印设置"
msgid "Task List '%s' will be removed. Are you sure you want to continue?"
msgstr "即将删除任务列表“%s”。您确定想要继续吗?"
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
msgid "New task"
msgstr "新建任务"
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
msgid "_Task"
msgstr "任务(_T)"
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
msgid "Create a new task"
msgstr "创建新任务"
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
msgid "New task list"
msgstr "新建任务列表"
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
msgid "_Task List"
msgstr "任务列表(_T)"
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
msgid "Create a new task list"
msgstr "创建新任务列表"
-#: calendar/gui/tasks-component.c:634
+#: calendar/gui/tasks-component.c:636
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr ""
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
msgid "There is no calendar available for creating tasks"
msgstr ""
@@ -8612,7 +8640,7 @@ msgstr "无法创建缓冲路径"
msgid "Could not remove cache entry: %s: %s"
msgstr "无法删除缓冲条目:%s:%s"
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
#, c-format
msgid ""
"Could not write log entry: %s\n"
@@ -8623,7 +8651,7 @@ msgstr ""
"当您重新连接到网络时本服务器\n"
"上进一步的操作不会重做。"
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
#, c-format
msgid ""
"Could not open `%s':\n"
@@ -8634,7 +8662,7 @@ msgstr ""
"%s\n"
"对该文件夹的修改不会被重新同步。"
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
msgid "Resynchronizing with server"
msgstr "正在重新与服务器同步"
@@ -8651,7 +8679,7 @@ msgstr "下载新邮件以进行脱机操作"
msgid "Preparing folder '%s' for offline"
msgstr "正在准备脱机文件夹“%s”"
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
msgid "You must be working online to complete this operation"
msgstr "您必须在线工作以便完成该操作"
@@ -8766,30 +8794,34 @@ msgstr "(match-all) 需要一个布尔结果"
msgid "Performing query on unknown header: %s"
msgstr "正在对未知的头进行查询:%s"
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr "不支持的操作:附加邮件:附加 %s"
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr "不支持的操作:按表达式搜索:搜索 %s"
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
#, c-format
msgid "Unsupported operation: search by uids: for %s"
msgstr "不支持的操作:按 uid 搜索:搜索 %s"
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
msgid "Moving messages"
msgstr "移动邮件"
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
msgid "Copying messages"
msgstr "复制邮件"
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1589
+msgid "Learning junk and/or non junk message(s)"
+msgstr ""
+
+#: camel/camel-folder.c:1618
msgid "Filtering new message(s)"
msgstr "过滤新邮件"
@@ -8823,7 +8855,8 @@ msgstr ""
#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
-#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
+#: camel/camel-gpg-context.c:1615 mail/mail-ops.c:697
+#: mail/mail-send-recv.c:598
msgid "Cancelled."
msgstr "已取消。"
@@ -9186,7 +9219,7 @@ msgstr "引用的证书已过期。"
#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
msgid "Bad authentication response from server."
msgstr "来自服务器的无效认证应答。"
@@ -9385,7 +9418,7 @@ msgstr "解析错误"
msgid "Signer: %s <%s>: %s\n"
msgstr "服务器:%s,类型:%s"
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
msgid "Cannot get folder: Invalid operation on this store"
msgstr "无法获取文件夹:对该存储的无效操作"
@@ -9394,21 +9427,22 @@ msgstr "无法获取文件夹:对该存储的无效操作"
msgid "Cannot create folder `%s': folder exists"
msgstr "无法创建文件夹:%s:%s"
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
msgid "Cannot create folder: Invalid operation on this store"
msgstr "无法创建文件夹:对该存储的无效操作"
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "无法删除文件夹:%s:无效操作"
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
msgid "Trash"
msgstr "回收站"
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
#, fuzzy
msgid "Junk"
msgstr "六月"
@@ -9640,17 +9674,17 @@ msgstr "在 %2$s 中没有消息 %1$s"
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "无法将消息移动或复制到虚拟文件夹中"
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "无法删除文件夹:%s:没有该文件夹"
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "无法重命名文件夹:%s:无效操作"
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "无法重命名文件夹:%s:没有该文件夹"
@@ -9684,39 +9718,40 @@ msgstr "应用过滤规则到此服务器上收件箱中的新邮件"
msgid "Automatically synchronize remote mail locally"
msgstr "自动将远程邮件同步到本地"
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "LDAP Server Name:"
-msgstr "LDAP 服务器名:"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book And Calendar"
+msgstr "地址簿"
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Search base:"
-msgstr "搜索起点:"
+#: camel/providers/groupwise/camel-groupwise-provider.c:69
+msgid "Post Office Agent SOAP Port:"
+msgstr ""
-#: camel/providers/groupwise/camel-groupwise-provider.c:83
+#: camel/providers/groupwise/camel-groupwise-provider.c:80
msgid "Novell GroupWise"
msgstr "Novell GroupWise"
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
#, fuzzy
msgid "For accessing Novell Groupwise servers"
msgstr "访问 Novell GroupWise 服务器"
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
#: camel/providers/imap/camel-imap-provider.c:93
#: camel/providers/imapp/camel-imapp-provider.c:65
#: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
msgid "Password"
msgstr "密码"
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
#: camel/providers/imap/camel-imap-provider.c:95
#: camel/providers/imapp/camel-imapp-provider.c:67
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
-#: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:323
+#: camel/providers/groupwise/camel-gw-listener.c:303
+#: camel/providers/groupwise/camel-gw-listener.c:327
#, fuzzy
msgid "Checklist"
msgstr "列表"
@@ -9724,12 +9759,12 @@ msgstr "列表"
#: camel/providers/imap/camel-imap-command.c:218
#: camel/providers/imap/camel-imap-command.c:257
#: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
msgid "Operation cancelled"
msgstr "操作已取消"
#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "服务器意外地中止了连接:%s"
@@ -9787,12 +9822,12 @@ msgstr "文件夹已被删除并在服务器上重建了。"
msgid "Scanning for changed messages"
msgstr "正在扫描改变了的邮件"
-#: camel/providers/imap/camel-imap-folder.c:1917
+#: camel/providers/imap/camel-imap-folder.c:1924
#, c-format
msgid "Unable to retrieve message: %s"
msgstr "无法检索邮件:%s"
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1971
#: camel/providers/local/camel-maildir-folder.c:211
#: camel/providers/local/camel-maildir-folder.c:224
#: camel/providers/local/camel-maildir-folder.c:233
@@ -9808,25 +9843,25 @@ msgstr ""
"无法获取邮件:%s\n"
" %s"
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1971
#: camel/providers/local/camel-maildir-folder.c:211
#: camel/providers/local/camel-mbox-folder.c:417
#: camel/providers/local/camel-mh-folder.c:200
msgid "No such message"
msgstr "没有该邮件"
-#: camel/providers/imap/camel-imap-folder.c:1971
-#: camel/providers/imap/camel-imap-folder.c:2567
+#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2601
#: camel/providers/nntp/camel-nntp-folder.c:205
msgid "This message is not currently available"
msgstr "该邮件目前不可用"
-#: camel/providers/imap/camel-imap-folder.c:2231
-#: camel/providers/imap/camel-imap-folder.c:2301
+#: camel/providers/imap/camel-imap-folder.c:2265
+#: camel/providers/imap/camel-imap-folder.c:2335
msgid "Fetching summary information for new messages"
msgstr "从新邮件中获取概要信息"
-#: camel/providers/imap/camel-imap-folder.c:2605
+#: camel/providers/imap/camel-imap-folder.c:2639
msgid "Could not find message body in FETCH response."
msgstr "无法在 FETCH 应答中找到邮件体。"
@@ -9899,18 +9934,18 @@ msgstr "IMAP"
msgid "For reading and storing mail on IMAP servers."
msgstr "IMAP 服务器上的邮件的读写。"
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
#, c-format
msgid "IMAP server %s"
msgstr "IMAP 服务器 %s"
-#: camel/providers/imap/camel-imap-store.c:480
+#: camel/providers/imap/camel-imap-store.c:426
#, c-format
msgid "IMAP service for %s on %s"
msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
-#: camel/providers/imap/camel-imap-store.c:601
-#: camel/providers/imap/camel-imap-store.c:621
+#: camel/providers/imap/camel-imap-store.c:546
+#: camel/providers/imap/camel-imap-store.c:566
#: camel/providers/imapp/camel-imapp-store.c:231
#: camel/providers/nntp/camel-nntp-store.c:140
#: camel/providers/pop3/camel-pop3-store.c:175
@@ -9920,14 +9955,14 @@ msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
msgid "Could not connect to %s (port %d): %s"
msgstr "无法连接到 %s (端口 %d):%s"
-#: camel/providers/imap/camel-imap-store.c:603
+#: camel/providers/imap/camel-imap-store.c:548
#: camel/providers/pop3/camel-pop3-store.c:177
#: camel/providers/smtp/camel-smtp-transport.c:271
msgid "SSL unavailable"
msgstr "SSL 不可用"
-#: camel/providers/imap/camel-imap-store.c:618
-#: camel/providers/imap/camel-imap-store.c:850
+#: camel/providers/imap/camel-imap-store.c:563
+#: camel/providers/imap/camel-imap-store.c:800
#: camel/providers/imapp/camel-imapp-store.c:228
#: camel/providers/nntp/camel-nntp-store.c:137
#: camel/providers/nntp/camel-nntp-store.c:155
@@ -9935,49 +9970,49 @@ msgstr "SSL 不可用"
msgid "Connection cancelled"
msgstr "连接已取消"
-#: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap/camel-imap-store.c:715
+#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:665
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
-#: camel/providers/imap/camel-imap-store.c:685
+#: camel/providers/imap/camel-imap-store.c:635
#: camel/providers/pop3/camel-pop3-store.c:228
msgid "SSL/TLS extension not supported."
msgstr "不支持 SSL/TLS 扩展。"
-#: camel/providers/imap/camel-imap-store.c:716
+#: camel/providers/imap/camel-imap-store.c:666
#: camel/providers/pop3/camel-pop3-store.c:269
msgid "SSL negotiations failed"
msgstr "SSL 协商失败"
-#: camel/providers/imap/camel-imap-store.c:853
+#: camel/providers/imap/camel-imap-store.c:803
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "无法使用命令“%s”连接:%s"
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
#: camel/providers/smtp/camel-smtp-transport.c:486
#, c-format
msgid "No support for authentication type %s"
msgstr "不支持验证类型 %s"
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
#: camel/providers/imapp/camel-imapp-store.c:344
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%s请为 %s@%s 输入 IMAP 密码"
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
msgid "You didn't enter a password."
msgstr "您没有输入密码。"
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -9988,32 +10023,33 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
#, c-format
msgid "No such folder %s"
msgstr "没有文件夹 %s"
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "文件夹名“%s”无效,原因是其中含有字符“%c”"
+
+#: camel/providers/imap/camel-imap-store.c:1825
#: camel/providers/local/camel-maildir-store.c:137
#: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:234
+#: camel/providers/local/camel-mh-store.c:236
#, fuzzy, c-format
msgid "Cannot create folder `%s': folder exists."
msgstr "无法创建文件夹:%s:%s"
-#: camel/providers/imap/camel-imap-store.c:2046
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr "文件夹名“%s”无效,原因是其中含有字符“%c”"
-
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2102
#, c-format
msgid "Unknown parent folder: %s"
msgstr "未知的父文件夹:%s"
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
msgid "The parent folder is not allowed to contain subfolders"
msgstr "父文件夹不允许含有子文件夹"
@@ -10045,20 +10081,20 @@ msgid "Index message body data"
msgstr "给联系人发邮件"
#. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:382
+#: camel/providers/local/camel-local-folder.c:389
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
#. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:386
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:396
#, c-format
msgid "mailbox:%s (%s)"
msgstr "邮件箱:%s (%s)"
#. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:400
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
@@ -10118,7 +10154,7 @@ msgstr ""
#: camel/providers/local/camel-local-store.c:138
#: camel/providers/local/camel-local-store.c:215
-#: camel/providers/local/camel-mbox-store.c:355
+#: camel/providers/local/camel-mbox-store.c:356
#: camel/providers/local/camel-spool-store.c:116
#, c-format
msgid "Store root %s is not an absolute path"
@@ -10167,8 +10203,8 @@ msgstr "无法删除文件夹概要文件 “%s”:%s"
msgid "Could not delete folder index file `%s': %s"
msgstr "无法删除文件夹索引文件 “%s”:%s"
-#: camel/providers/local/camel-local-store.c:417
-#: camel/providers/local/camel-mbox-store.c:319
+#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-mbox-store.c:320
#, c-format
msgid "Could not delete folder meta file `%s': %s"
msgstr "无法删除文件夹元文件“%s”:%s"
@@ -10198,14 +10234,14 @@ msgstr "无效的邮件内容"
#: camel/providers/local/camel-maildir-store.c:107
#: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
#, fuzzy, c-format
msgid "Cannot get folder `%s': %s"
msgstr "无法获取文件夹:%s:%s"
#: camel/providers/local/camel-maildir-store.c:111
#: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
#, fuzzy, c-format
msgid "Cannot get folder `%s': folder does not exist."
msgstr "文件夹“%s”不存在。"
@@ -10224,7 +10260,7 @@ msgstr "“%s”不是邮件目录。"
#: camel/providers/local/camel-maildir-store.c:173
#: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
#, c-format
msgid "Could not delete folder `%s': %s"
msgstr "无法删除文件夹“%s”:%s"
@@ -10233,28 +10269,28 @@ msgstr "无法删除文件夹“%s”:%s"
msgid "not a maildir directory"
msgstr "不是邮件目录"
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
#: camel/providers/local/camel-spool-store.c:286
#: camel/providers/local/camel-spool-store.c:316
#, c-format
msgid "Could not scan folder `%s': %s"
msgstr "无法扫描文件夹“%s”:%s"
-#: camel/providers/local/camel-maildir-summary.c:417
-#: camel/providers/local/camel-maildir-summary.c:548
+#: camel/providers/local/camel-maildir-summary.c:419
+#: camel/providers/local/camel-maildir-summary.c:550
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "无法打开邮件目录路径:%s:%s"
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
msgid "Checking folder consistency"
msgstr "正在检查文件夹一致性"
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
msgid "Checking for new messages"
msgstr "正在检查新邮件"
-#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-maildir-summary.c:735
#: camel/providers/local/camel-mbox-summary.c:369
#: camel/providers/local/camel-mbox-summary.c:542
#: camel/providers/local/camel-mbox-summary.c:633
@@ -10302,7 +10338,7 @@ msgid "Message construction failed: Corrupt mailbox?"
msgstr "邮件构造失败:邮件箱已损坏?"
#: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
msgid "Cannot create a folder by this name."
msgstr "无法以此名称创建文件夹。"
@@ -10332,30 +10368,30 @@ msgstr "“%s”并不是普通文件。"
msgid "Folder `%s' is not empty. Not deleted."
msgstr "文件夹“%s”非空。没有删除。"
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:375
#, c-format
msgid "Cannot create directory `%s': %s."
msgstr "无法创建目录“%s”:%s"
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:389
#, c-format
msgid "Cannot create folder: %s: %s"
msgstr "无法创建文件夹:%s:%s"
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
msgid "Folder already exists"
msgstr "文件夹已经存在"
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
msgid "The new folder name is illegal."
msgstr "指定的文件夹名称不合法。"
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
#, fuzzy, c-format
msgid "Could not rename `%s': `%s': %s"
msgstr "无法重命名“%s”:%s"
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
#, fuzzy, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "无法将 %s 改名为 %s:%s"
@@ -10399,7 +10435,7 @@ msgstr "无法关闭来源文件夹 %s:%s"
msgid "Could not close temp folder: %s"
msgstr "无法关闭临时文件夹:%s"
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
#, c-format
msgid "Could not rename folder: %s"
msgstr "无法重命名文件夹:%s"
@@ -10442,14 +10478,14 @@ msgstr "已取消 MH 附件邮件"
msgid "Cannot append message to mh folder: %s: %s"
msgstr "无法将邮件附加到 mh 文件夹:%s:%s"
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
#, fuzzy, c-format
msgid "Could not create folder `%s': %s"
msgstr ""
"无法创建文件夹“%s”:\n"
"%s"
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
#, fuzzy, c-format
msgid "Cannot get folder `%s': not a directory."
msgstr "无法获取文件夹:%s:%s"
@@ -10732,47 +10768,47 @@ msgstr "无法将文件夹 %s 改名为 %s:%s"
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr "无法把文件夹移动到其子目录。"
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
#, fuzzy, c-format
msgid "Connection error: %s"
msgstr "未知的错误:%s"
-#: camel/providers/nntp/camel-nntp-summary.c:258
+#: camel/providers/nntp/camel-nntp-summary.c:262
#, c-format
msgid "No such folder: %s"
msgstr "没有文件夹:%s"
-#: camel/providers/nntp/camel-nntp-summary.c:264
+#: camel/providers/nntp/camel-nntp-summary.c:268
#, c-format
msgid "Could not get group: %s"
msgstr "无法获取组:%s"
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
#, fuzzy
msgid "Could not get messages: unspecificed error"
msgstr "无法发送邮件:%s"
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
#, c-format
msgid "NNTP Command failed: %s"
msgstr "NNTP 命令失败:%s"
-#: camel/providers/nntp/camel-nntp-summary.c:434
-#: camel/providers/nntp/camel-nntp-summary.c:539
+#: camel/providers/nntp/camel-nntp-summary.c:438
+#: camel/providers/nntp/camel-nntp-summary.c:543
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s:正在扫描新消息"
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
#, c-format
msgid "Unknown server response: %s"
msgstr "未知的服务器应答:%s"
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
msgid "Use cancel"
msgstr "使用取消"
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
#, c-format
msgid "Operation failed: %s"
msgstr "操作失败:%s"
@@ -10819,7 +10855,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:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
msgid "POP"
msgstr "POP"
@@ -10905,7 +10941,7 @@ msgid "No such folder `%s'."
msgstr "没有文件夹“%s”。"
#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
msgid "Sendmail"
msgstr "Sendmail"
@@ -10957,12 +10993,13 @@ msgstr "sendmail"
msgid "Mail delivery via the sendmail program"
msgstr "通过 sendmail 程序发送邮件"
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
msgid "SMTP"
msgstr "SMTP"
#: camel/providers/smtp/camel-smtp-provider.c:39
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
msgstr "通过SMTP连接到远程邮件服务器来发送邮件。\n"
#: camel/providers/smtp/camel-smtp-transport.c:174
@@ -11080,13 +11117,14 @@ msgid "server does not appear to support SSL"
msgstr "服务器似乎不支持 SSL"
#: camel/providers/smtp/camel-smtp-transport.c:358
-#, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "STARTTLS 请求超时:%s"
+#, fuzzy, c-format
+msgid "STARTTLS command failed: %s"
+msgstr "IMAP 命令失败:%s"
#: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
-msgstr "STARTTLS 响应错误"
+#, fuzzy
+msgid "STARTTLS command failed"
+msgstr "IMAP 命令失败:%s"
#: camel/providers/smtp/camel-smtp-transport.c:476
#, c-format
@@ -11120,153 +11158,157 @@ msgid "SMTP mail delivery via %s"
msgstr "通过 %s 发送 SMTP 邮件"
#: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "无法发送邮件:没有定义收件人。"
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
msgid "Cannot send message: sender address not valid."
msgstr "无法发送邮件:发件人地址不合法。"
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
msgid "Sending message"
msgstr "正在发送邮件"
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
msgid "Cannot send message: no recipients defined."
msgstr "无法发送邮件:没有定义收件人。"
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:722
msgid "Cannot send message: one or more invalid recipients"
msgstr "无法发送消息:一个或多个非法收件人"
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
msgid "SMTP Greeting"
msgstr "SMTP 欢迎"
-#: camel/providers/smtp/camel-smtp-transport.c:934
-#, c-format
-msgid "HELO request timed out: %s"
-msgstr "HELO 请求超时:%s"
+#: camel/providers/smtp/camel-smtp-transport.c:943
+#, fuzzy, c-format
+msgid "HELO command failed: %s"
+msgstr "IMAP 命令失败:%s"
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
-msgstr "HELO 应答错误"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#, fuzzy
+msgid "HELO command failed"
+msgstr "IMAP 命令失败:%s"
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
msgid "SMTP Authentication"
msgstr "SMTP 认证"
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
msgid "Error creating SASL authentication object."
msgstr "创建 SASL 认证对象错误。"
-#: camel/providers/smtp/camel-smtp-transport.c:1045
-#: camel/providers/smtp/camel-smtp-transport.c:1057
-#, c-format
-msgid "AUTH request timed out: %s"
-msgstr "AUTH 请求超时:%s"
+#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1060
+#, fuzzy, c-format
+msgid "AUTH command failed: %s"
+msgstr "IMAP 命令失败:%s"
#: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr "AUTH 请求失败。"
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "IMAP 命令失败:%s"
-#: camel/providers/smtp/camel-smtp-transport.c:1127
+#: camel/providers/smtp/camel-smtp-transport.c:1128
msgid "Bad authentication response from server.\n"
msgstr "来自服务器的错误认证应答。\n"
-#: camel/providers/smtp/camel-smtp-transport.c:1152
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1153
+#, fuzzy, c-format
+msgid "MAIL FROM command failed: %s: mail not sent"
msgstr "MAIL FROM 请求超时:%s:邮件未发送"
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
-msgstr "MAIL FROM 应答错误"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+#, fuzzy
+msgid "MAIL FROM command failed"
+msgstr "IMAP 命令失败:%s"
-#: camel/providers/smtp/camel-smtp-transport.c:1196
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1194
+#, fuzzy, c-format
+msgid "RCPT TO command failed: %s: mail not sent"
msgstr "RCPT TO 请求超时:%s:邮件未发送"
-#: camel/providers/smtp/camel-smtp-transport.c:1218
+#: camel/providers/smtp/camel-smtp-transport.c:1213
#, c-format
msgid "RCPT TO <%s> failed"
msgstr "RCPT TO <%s> 失败"
-#: camel/providers/smtp/camel-smtp-transport.c:1257
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1310
+#: camel/providers/smtp/camel-smtp-transport.c:1329
+#, fuzzy, c-format
+msgid "DATA command failed: %s: mail not sent"
msgstr "DATA 请求超时:%s:邮件未发送"
#. we should have gotten instructions on how to use the DATA command:
#. * 354 Enter mail, end with "." on a line by itself
#.
-#: camel/providers/smtp/camel-smtp-transport.c:1277
-msgid "DATA response error"
-msgstr "DATA 应答错误"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1318
-#: camel/providers/smtp/camel-smtp-transport.c:1341
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "DATA 发送超时:消息终止:%s:邮件未发送"
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+#, fuzzy
+msgid "DATA command failed"
+msgstr "IMAP 命令失败:%s"
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
-msgstr "DATA 终止应答错误"
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "IMAP 命令失败:%s"
#: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "RSET 请求超时:%s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
-msgstr "RSET 应答错误"
+#, fuzzy
+msgid "RSET command failed"
+msgstr "IMAP 命令失败:%s"
-#: camel/providers/smtp/camel-smtp-transport.c:1427
-#, c-format
-msgid "QUIT request timed out: %s"
-msgstr "QUIT 请求超时:%s"
+#: camel/providers/smtp/camel-smtp-transport.c:1407
+#, fuzzy, c-format
+msgid "QUIT command failed: %s"
+msgstr "IMAP 命令失败:%s"
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
-msgstr "QUIT 应答错误"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+#, fuzzy
+msgid "QUIT command failed"
+msgstr "IMAP 命令失败:%s"
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:105
#, c-format
msgid "%.0fK"
msgstr "%.0fK"
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:108
#, c-format
msgid "%.0fM"
msgstr "%.0fM"
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
#, c-format
msgid "%.0fG"
msgstr "%.0fG"
-#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1485
msgid "attachment"
msgstr "附件"
-#: composer/e-msg-composer-attachment-bar.c:452
+#: composer/e-msg-composer-attachment-bar.c:453
msgid "Remove selected items from the attachment list"
msgstr "从附件列表中删除选定的条目"
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
msgid "Add attachment..."
msgstr "添加附件..."
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
msgid "Attach a file to the message"
msgstr "把文件附件到邮件"
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
#, c-format
msgid "Cannot attach file %s: %s"
msgstr "无法附加文件 %s:%s"
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
#, c-format
msgid "Cannot attach file %s: not a regular file"
msgstr "无法附加文件 %s:不是普通文件"
@@ -11288,20 +11330,20 @@ msgstr "MIME 类型:"
msgid "Suggest automatic display of attachment"
msgstr "建议自动显示附件"
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:308
msgid "You need to configure an account before you can compose mail."
msgstr "在您可以撰写邮件之前您需要配置一个帐户。"
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
msgid "Posting destination"
msgstr "投递目的"
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
#, fuzzy
msgid "Choose folders to post the message to."
msgstr "把文件附件到邮件"
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
msgid "Click here for the address book"
msgstr "点击此处以使用地址簿"
@@ -11312,45 +11354,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:572
+#: composer/e-msg-composer-hdrs.c:577
msgid "Reply-To:"
msgstr "回复到:"
#.
#. * From
#.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
msgid "From:"
msgstr "发件人:"
#.
#. * Subject
#.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
msgid "Subject:"
msgstr "主题:"
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
msgid "To:"
msgstr "收信人:"
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
msgid "Enter the recipients of the message"
msgstr "输入邮件的收件人"
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:602
msgid "Cc:"
msgstr "抄送:"
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:603
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "输入将接收该邮件副本的收件人地址"
-#: composer/e-msg-composer-hdrs.c:601
+#: composer/e-msg-composer-hdrs.c:606
msgid "Bcc:"
msgstr "暗中抄送:"
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:607
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -11359,11 +11401,11 @@ msgstr "输入将接收该邮件副本,但不出现在收件人列表中的收
#.
#. * Post-To
#.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
msgid "Post To:"
msgstr "投递到:"
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
#, fuzzy
msgid "Click here to select folders to post to"
msgstr "<点击这里以便选择文件夹>"
@@ -11372,19 +11414,19 @@ msgstr "<点击这里以便选择文件夹>"
msgid "Attach file(s)"
msgstr "添加附件"
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:662
#, fuzzy
msgid ""
"Cannot sign outgoing message: No signing certificate set for from account"
msgstr "当使用该账户时总是发送签名邮件(_A)"
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for from "
"account"
msgstr ""
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
#, c-format
msgid ""
"Error while reading file %s:\n"
@@ -11393,30 +11435,30 @@ msgstr ""
"读入文件 %s 时发声错误:\n"
"%s"
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
msgid "File exists, overwrite?"
msgstr "文件存在,覆盖它?"
-#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
+#: composer/e-msg-composer.c:1179 composer/e-msg-composer.c:1195
#, c-format
msgid "Error saving file: %s"
msgstr "保存文件错误:%s"
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
#, c-format
msgid "Error loading file: %s"
msgstr "读入文件错误:%s"
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
#, c-format
msgid "Error accessing file: %s"
msgstr "访问文件错误:%s"
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
msgid "Unable to retrieve message from editor"
msgstr "无法从编辑器检索邮件"
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
#, c-format
msgid ""
"Unable to seek on file: %s\n"
@@ -11425,7 +11467,7 @@ msgstr ""
"无法搜索文件:%s\n"
"%s"
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
#, c-format
msgid ""
"Unable to truncate file: %s\n"
@@ -11434,7 +11476,7 @@ msgstr ""
"无法截断文件:%s\n"
"%s"
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1288
#, c-format
msgid ""
"Unable to copy file descriptor: %s\n"
@@ -11443,7 +11485,7 @@ msgstr ""
"无法复制文件描述符:%s\n"
"%s"
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
#, c-format
msgid ""
"Error autosaving message: %s\n"
@@ -11452,7 +11494,7 @@ msgstr ""
"自动存储邮件错误:%s\n"
" %s"
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1401
#, fuzzy
msgid ""
"Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11461,7 +11503,7 @@ msgstr ""
"Ximian Evolution 发现上次会话含有未保存的文件。\n"
"您是否希望恢复它们?"
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
#, c-format
msgid ""
"The message \"%s\" has not been sent.\n"
@@ -11473,41 +11515,46 @@ msgstr ""
"您是否希望保存修改?"
#: composer/e-msg-composer.c:1567
+#, fuzzy
+msgid "Untitled Message"
+msgstr "多封邮件"
+
+#: composer/e-msg-composer.c:1574
msgid "Warning: Modified Message"
msgstr "警告:已改动的邮件"
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
msgid "Open file"
msgstr "打开文件"
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "签名:"
-
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
msgid "Autogenerated"
msgstr "自动生成的"
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "签名:"
+
+#: composer/e-msg-composer.c:2316
#, c-format
msgid "<b>%d</b> File Attached"
msgid_plural "<b>%d</b> Files Attached"
msgstr[0] "附加了 <b>%d</b> 个文件"
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
msgid "Hide _Attachment Bar (drop attachments here)"
msgstr "隐藏附件栏(将附件拖至此处)(_A)"
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
msgid "Show _Attachment Bar (drop attachments here)"
msgstr "显示附件栏(将附件拖至此处)(_A)"
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
msgid "Compose a message"
msgstr "撰写邮件"
-#: composer/e-msg-composer.c:3083
+#: composer/e-msg-composer.c:3152
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
@@ -11515,7 +11562,7 @@ msgstr ""
"无法创建撰写窗口:\n"
"无法激活地址选择控制。"
-#: composer/e-msg-composer.c:3112
+#: composer/e-msg-composer.c:3181
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component.\n"
@@ -11527,7 +11574,7 @@ msgstr ""
"请确定您的 gtkhtml 和 libgtkhtml 所安装的版\n"
"本正确。\n"
-#: composer/e-msg-composer.c:3216
+#: composer/e-msg-composer.c:3285
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
@@ -11535,7 +11582,7 @@ msgstr ""
"无法创建撰写窗口:\n"
"无法激活 HTML 编辑器组件。"
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -11656,7 +11703,7 @@ msgid ""
"do?"
msgstr "当您收到请求阅读收条的邮件,Evolution 应该做什么?"
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -11664,15 +11711,15 @@ msgstr ""
"指定名称的文件已经存在。\n"
"覆盖它?"
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
msgid "Overwrite file?"
msgstr "覆盖文件吗?"
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
msgid "Remember this password"
msgstr "记住该密码"
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
msgid "Remember this password for the remainder of this session"
msgstr "在本会话中记住该密码"
@@ -11755,13 +11802,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:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
msgid "%I:%M %p"
msgstr "%p %I:%M"
#. strptime format for time of day, without seconds 24-hour format.
#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
msgid "%H:%M"
msgstr "%H:%M"
@@ -11770,118 +11817,99 @@ msgstr "%H:%M"
msgid "%I %p"
msgstr "%p %I点"
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:73
+#, fuzzy, c-format
msgid "1 second ago"
-msgstr "1 秒前"
-
-#: filter/filter-datespec.c:65
-#, c-format
-msgid "%d seconds ago"
-msgstr "%d 秒前"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 秒前"
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:74
+#, fuzzy, c-format
msgid "1 minute ago"
-msgstr "1 分钟前"
-
-#: filter/filter-datespec.c:66
-#, c-format
-msgid "%d minutes ago"
-msgstr "%d 分钟前"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 分钟前"
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:75
+#, fuzzy, c-format
msgid "1 hour ago"
-msgstr "1 小时前"
-
-#: filter/filter-datespec.c:67
-#, c-format
-msgid "%d hours ago"
-msgstr "%d 小时前"
+msgid_plural "%d hours ago"
+msgstr[0] "1 小时前"
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:76
+#, fuzzy, c-format
msgid "1 day ago"
-msgstr "1 天前"
+msgid_plural "%d days ago"
+msgstr[0] "1 天前"
-#: filter/filter-datespec.c:68
-#, c-format
-msgid "%d days ago"
-msgstr "%d 天前"
-
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:77
+#, fuzzy, c-format
msgid "1 week ago"
-msgstr "1 周前"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 周前"
-#: filter/filter-datespec.c:69
-#, c-format
-msgid "%d weeks ago"
-msgstr "%d 周前"
-
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:78
+#, fuzzy, c-format
msgid "1 month ago"
-msgstr "1 个月前"
+msgid_plural "%d months ago"
+msgstr[0] "1 个月前"
-#: filter/filter-datespec.c:70
-#, c-format
-msgid "%d months ago"
-msgstr "%d 个月前"
-
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, fuzzy, c-format
msgid "1 year ago"
-msgstr "1 年前"
-
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr "%d 年前"
+msgid_plural "%d years ago"
+msgstr[0] "1 年前"
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
msgid "You must choose a date."
msgstr "您忘记选择日期了。"
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
msgid "<click here to select a date>"
msgstr "<点击这里以选择日期>"
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
msgid "now"
msgstr "现在"
#. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:285
+#: filter/filter-datespec.c:297
msgid "%d-%b-%Y"
msgstr "%Y-%m-%d"
-#: filter/filter-datespec.c:406
+#: filter/filter-datespec.c:413
msgid "Select a time to compare against"
msgstr "选择用于比较的时间"
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
msgstr "过滤规则"
#: filter/filter-file.c:166
msgid "You must specify a file name."
msgstr "您必须指定文件名。"
-#: filter/filter-file.c:184
+#: filter/filter-file.c:185
#, c-format
msgid "File '%s' does not exist or is not a regular file."
msgstr "文件“%s”不存在或者不是普通文件。"
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
msgid "Choose a file"
msgstr "选择文件"
#. and now for the action area
#: filter/filter-filter.c:491
-msgid "Then"
-msgstr "则"
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>到期:</b>"
#: filter/filter-folder.c:153
msgid "You must specify a folder."
msgstr "您必须指定文件夹。"
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
-#: mail/mail-account-gui.c:1098
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
+#: mail/mail-account-gui.c:1153
msgid "Select Folder"
msgstr "选择文件夹"
@@ -11895,23 +11923,23 @@ msgstr ""
"%s"
#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:66
+#: mail/mail-config.c:65 mail/mail-config.glade.h:90
msgid "Important"
msgstr "重要"
#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:125
+#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:68
+#: mail/mail-config.glade.h:145
msgid "To Do"
msgstr "待办"
#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:70
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
+#: mail/mail-config.glade.h:94
msgid "Later"
msgstr "稍候"
-#: filter/filter-part.c:531 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
msgid "Test"
msgstr "测试"
@@ -11919,129 +11947,125 @@ msgstr "测试"
msgid "You must name this filter."
msgstr "您必须为该过滤规则命名。"
-#: filter/filter-rule.c:751
-msgid "Rule name: "
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
msgstr "规则名:"
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
msgid "Untitled"
msgstr "无标题"
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "如果"
+#: filter/filter-rule.c:779
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>到期:</b>"
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
msgid "Execute actions"
msgstr "执行动作"
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
msgid "if all criteria are met"
msgstr "如果满足所有条件"
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
msgid "if any criteria are met"
msgstr "如果满足任一条件"
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
msgid "incoming"
msgstr "接收"
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
msgid "outgoing"
msgstr "发送"
#: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "比较"
+msgid " "
+msgstr " "
#: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr "编辑过滤规则"
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "过滤规则"
#: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr "编辑虚拟文件夹"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "虚拟文件夹来源"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
+msgstr "比较"
#: filter/filter.glade.h:5
msgid "Incoming"
msgstr "接收"
#: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr "发送"
-
-#: filter/filter.glade.h:7
msgid ""
"The message's date will be compared against\n"
"12:00am of the date specified."
msgstr "邮件的日期将会与指定日期的午夜12:00进行比较。"
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:8
msgid ""
"The message's date will be compared against\n"
"a time relative to when filtering occurs."
msgstr "邮件的日期将会在过滤执行时与指定时间进行比较。"
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:10
msgid ""
"The message's date will be compared against\n"
"the current time when filtering occurs."
msgstr "邮件的日期将会在过滤执行时与当前时间进行比较。"
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "虚拟文件夹"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
msgid "a time relative to the current time"
msgstr "相对于当前时间的时间"
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
msgid "ago"
msgstr "过去"
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
msgid "months"
msgstr "月"
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
msgid "seconds"
msgstr "秒"
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
msgid "specific folders only"
msgstr "仅指定文件夹"
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
msgid "the current time"
msgstr "当前时间"
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
msgid "the time you specify"
msgstr "您指定的时间"
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "虚拟文件夹来源"
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
msgid "weeks"
msgstr "周"
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
msgid "with all active remote folders"
msgstr "以全部活跃远程文件夹"
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
msgid "with all local and active remote folders"
msgstr "以全部本地和活跃远程文件夹"
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
msgid "with all local folders"
msgstr "以所有本地文件夹"
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
msgid "years"
msgstr "年"
@@ -12175,7 +12199,7 @@ msgstr "未标志"
msgid "Junk Test"
msgstr "六月"
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
#: widgets/misc/e-expander.c:189
msgid "Label"
msgstr "标签"
@@ -12207,8 +12231,9 @@ msgid "Move to Folder"
msgstr "移动到文件夹"
#: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr "将邮件管道给 Shell 命令"
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "退出程序"
#: filter/libfilter-i18n.h:45
msgid "Play Sound"
@@ -12242,23 +12267,24 @@ msgstr "返回大于"
msgid "returns less than"
msgstr "返回小于"
-#: filter/libfilter-i18n.h:53 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "运行程序:"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
#: mail/message-list.etspec.h:10
msgid "Score"
msgstr "分数"
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
msgid "Sender"
msgstr "发件人"
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
msgid "Set Status"
msgstr "设置状态"
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "Shell 命令"
-
#: filter/libfilter-i18n.h:57
msgid "Size (kB)"
msgstr "大小 (kB)"
@@ -12283,9 +12309,9 @@ msgstr "以之开始"
msgid "Stop Processing"
msgstr "停止处理"
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
#: smime/lib/e-cert.c:1079
msgid "Subject"
msgstr "主题"
@@ -12294,17 +12320,13 @@ msgstr "主题"
msgid "Unset Status"
msgstr "未设置状态"
-#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
-#: mail/mail-vfolder.c:1007
+#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:1008
#, c-format
msgid "Rule name '%s' is not unique, choose another."
msgstr "规则名“%s”不唯一,请另外选择一个名称。"
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr "规则"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
msgid "Add Rule"
msgstr "添加规则"
@@ -12316,8 +12338,9 @@ msgstr "编辑规则"
msgid "Rule name"
msgstr "规则名"
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
msgstr "计分规则"
#: filter/searchtypes.xml.h:1
@@ -12352,15 +12375,20 @@ msgstr "主题含有"
msgid "Subject does not contain"
msgstr "主题不含有"
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "虚拟文件夹"
+
#: filter/vfolder-rule.c:215
msgid "You must name this vfolder."
msgstr "您必须为该虚拟文件夹命名。"
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
msgid "You need to to specify at least one folder as a source."
msgstr "您至少需要把一个文件夹指定为源。"
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
msgid "VFolder source"
msgstr "虚拟文件夹来源"
@@ -12409,8 +12437,8 @@ msgstr "Evolution 邮件文件夹查看器"
msgid "Evolution Mail preferences control"
msgstr "Evolution 邮件首选项控件"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
#: mail/importers/pine-importer.c:473
msgid "Mail"
msgstr "邮件"
@@ -12419,53 +12447,50 @@ msgstr "邮件"
msgid "Mail Accounts"
msgstr "邮件账户"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
msgid "Mail Preferences"
msgstr "邮件首选项"
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
msgid "Are you sure you want to delete this account?"
msgstr "您确信您要删除该账户吗?"
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
msgid "Don't delete"
msgstr "不要删除"
#. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
msgid "[Default]"
msgstr "[默认]"
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
msgid "Account name"
msgstr "账户名"
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
msgid "Protocol"
msgstr "协议"
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353
-#: mail/mail-config.c:1252
+#: mail/em-composer-prefs.c:338 mail/em-composer-prefs.c:461
+#: mail/mail-config.c:1048
msgid "Unnamed"
msgstr "未命名"
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
msgid "You must specify a valid script name."
msgstr "您必须指定有效的脚本名。"
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr "[脚本]"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
msgid "Language(s)"
msgstr "语言"
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
-msgstr "添加脚本签名"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "添加签名(_A)"
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
msgid "Signature(s)"
msgstr "签名"
@@ -12518,7 +12543,7 @@ msgstr ""
"无法为该账户打开草稿文件夹。\n"
"您是否希望使用默认草稿文件夹?"
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
msgid "Create _Virtual Folder From Search..."
msgstr "根据搜索创建虚拟文件夹(_V)..."
@@ -12548,402 +12573,432 @@ msgstr "下一封未读邮件"
msgid "<click here to select a folder>"
msgstr "<点击这里以便选择文件夹>"
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
msgid "Create New Folder"
msgstr "创建新文件夹"
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
msgid "Specify where to create the folder:"
msgstr "指定在哪里创建文件夹:"
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
msgid "Folder _name:"
msgstr "文件夹名称(_N):"
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
msgid "VFolders"
msgstr "虚拟文件夹"
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
msgid "UNMATCHED"
msgstr ""
#. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
msgid "Inbox"
msgstr "收件箱"
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
msgid "Loading..."
msgstr "正在装入..."
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "正在删除文件夹“%s”"
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "正在打开文件夹 %s"
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "把邮件移动到 %s"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "把邮件复制到 %s"
+
+#: mail/em-folder-tree.c:904
#, fuzzy
msgid "Cannot drop message(s) into toplevel store"
msgstr "无法将消息移动或复制到虚拟文件夹中"
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
#, fuzzy, c-format
msgid "Cannot move folder `%s': illegal operation"
msgstr "无法重命名文件夹:%s:无效操作"
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
#, c-format
msgid "%s"
msgstr "%s"
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
#: mail/importers/evolution-mbox-importer.c:119
msgid "Select folder"
msgstr "选择文件夹"
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "正在存储文件夹“%s”"
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
msgid "Create folder"
msgstr "创建文件夹"
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
#, c-format
msgid "Could not delete folder: %s"
msgstr "无法删除文件夹:%s"
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
#, fuzzy, c-format
msgid "Cannot delete local %s folder."
msgstr "无法删除文件夹:%s:没有该文件夹"
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
#, c-format
msgid "Really delete folder \"%s\" and all of its subfolders?"
msgstr "您真的要删除文件夹“%s”及其全部子文件夹吗?"
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
#, c-format
msgid "Delete \"%s\""
msgstr "删除“%s”"
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
#, fuzzy, c-format
msgid "Cannot rename local %s folder."
msgstr "无法重命名文件夹:%s:没有该文件夹"
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "把文件夹“%s”重命名为:"
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
msgid "Rename Folder"
msgstr "重命名文件夹"
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
#, c-format
msgid "A folder named \"%s\" already exists. Please use a different name."
msgstr "已经存在名为“%s”的文件夹。请使用不同的名称。"
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
msgid "_View"
msgstr "查看(_V)"
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
msgid "Open in _New Window"
msgstr "在新窗口中打开(_N)"
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
msgid "_Move"
msgstr "移动(_M)"
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
msgid "_New Folder..."
msgstr "新建文件夹(_N)..."
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
msgid "_Rename"
msgstr "重命名(_R)"
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 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:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
msgid "_Edit as New Message..."
msgstr "作为新邮件进行编辑(_E)..."
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
msgid "_Print"
msgstr "打印(_P)"
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
msgid "Reply to _All"
msgstr "回复所有人(_A)"
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
msgid "_Forward"
msgstr "转发(_F)"
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
msgid "Follo_w Up..."
msgstr "跟随(_W)..."
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
msgid "Fla_g Completed"
msgstr "已完成标志(_G)"
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
msgid "Cl_ear Flag"
msgstr "清除标志(_E)"
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
msgid "Mar_k as Read"
msgstr "标记为已读(_K)"
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
msgid "Mark as _Unread"
msgstr "标记为未读(_U)"
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
msgid "_Mark as Unimportant"
msgstr "标记为不重要(_M)"
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
#, fuzzy
msgid "Mark as _Junk"
msgstr "标记为未读(_U)"
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
#, fuzzy
msgid "Mark as _Not Junk"
msgstr "标记为重要(_I)"
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
msgid "U_ndelete"
msgstr "取消删除(_N)"
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
msgid "Mo_ve to Folder..."
msgstr "移动到文件夹(_V)..."
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
msgid "_Copy to Folder..."
msgstr "复制到文件夹(_C)..."
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
msgid "Add Sender to Address_book"
msgstr "将发件人添加到地址簿(_B)"
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
msgid "Appl_y Filters"
msgstr "应用过滤规则(_Y)"
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "过滤规则"
+
+#: mail/em-folder-view.c:785
msgid "Crea_te Rule From Message"
msgstr "从邮件创建规则(_T)"
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
msgid "VFolder on _Subject"
msgstr "基于主题的虚拟文件夹(_S)"
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
msgid "VFolder on Se_nder"
msgstr "基于发件人的虚拟文件夹(_N)"
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
msgid "VFolder on _Recipients"
msgstr "基于收件人的虚拟文件夹(_R)"
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
msgid "VFolder on Mailing _List"
msgstr "基于邮件列表的虚拟文件夹(_L)"
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
msgid "VFolder on Thread"
msgstr "基于线索的虚拟文件夹"
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
msgid "Filter on Sub_ject"
msgstr "基于主题过滤(_J)"
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
msgid "Filter on Sen_der"
msgstr "基于发件人过滤(_D)"
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
msgid "Filter on Re_cipients"
msgstr "基于收件人过滤(_C)"
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
msgid "Filter on _Mailing List"
msgstr "基于邮件列表过滤(_M)"
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
msgid "Filter on Thread"
msgstr "基于线索过滤"
#. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
msgid "Default"
msgstr "默认"
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
msgid "Print Message"
msgstr "打印消息"
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
msgid "_Copy Link Location"
msgstr "复制链接位置(_C)"
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
#, c-format
msgid "Click to mail %s"
msgstr "点击以给 %s 发送邮件"
#. message-search popup match count string
-#: mail/em-format-html-display.c:402
+#: mail/em-format-html-display.c:409
#, c-format
msgid "Matches: %d"
msgstr "匹配:%d"
-#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:645 mail/em-format-html.c:568
msgid "Unsigned"
msgstr "未签名"
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
#, fuzzy
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
msgstr "该邮件有数字签名,但不能证实是可信的。"
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
#, fuzzy
msgid "Valid signature"
msgstr "编辑签名"
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
#, fuzzy
msgid ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
msgstr "该邮件有数字签名,但不能证实是可信的。"
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
#, fuzzy
msgid "Invalid signature"
msgstr "编辑签名"
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
msgstr ""
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
msgid "Valid signature, cannot verify sender"
msgstr ""
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
#, 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:647 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
#, fuzzy
msgid "Unencrypted"
msgstr "被中断"
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
msgstr ""
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
msgid "Encrypted, weak"
msgstr ""
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
msgid ""
"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:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
#, fuzzy
msgid "Encrypted"
msgstr "PGP 加密"
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
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:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
msgid "Encrypted, strong"
msgstr ""
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
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:734
+#: mail/em-format-html-display.c:741
#, fuzzy
msgid "_View Certificate"
msgstr "证书 ID(_C):"
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
#, fuzzy
msgid "This certificate is not viewable"
msgstr "证书未生效"
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
#, fuzzy
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "到 %m月%d日%A,%H:%M"
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
msgid "Overdue:"
msgstr "延误:"
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
msgid "by %B %d, %Y, %l:%M %p"
msgstr "到 %m月%d日%A,%H:%M"
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
msgid "_View Inline"
msgstr "嵌入视图(_V)"
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
msgid "_Hide"
msgstr "隐藏(_H)"
@@ -12952,128 +13007,163 @@ msgstr "隐藏(_H)"
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
-#: mail/em-format-html.c:455 mail/em-format-html.c:457
+#: mail/em-format-html.c:461 mail/em-format-html.c:463
#, c-format
msgid "Retrieving `%s'"
msgstr "正在收取“%s”"
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
-#: mail/em-format-html.c:853
+#: mail/em-format-html.c:881
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
#, fuzzy
msgid "Formatting message"
msgstr "正在移动邮件"
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:742
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:743
#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
+#: mail/message-tag-followup.c:304
msgid "From"
msgstr "发件人"
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:744
#: mail/em-mailer-prefs.c:68
msgid "Reply-To"
msgstr "回复至"
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:744
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:745
#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
msgid "To"
msgstr "收件人"
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:745
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:746
#: mail/em-mailer-prefs.c:70
msgid "Cc"
msgstr "抄送"
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:747
#: mail/em-mailer-prefs.c:71
msgid "Bcc"
msgstr "密件抄送"
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
msgid "Mailer"
msgstr "邮件程序"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
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:1520
+#: mail/em-format-html.c:1572
msgid "<I> (%R %Z)</I>"
msgstr ""
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
msgid "Date"
msgstr "日期"
-#: mail/em-format.c:963
+#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:987
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
-#: mail/em-format.c:1042 mail/em-format.c:1161
+#: mail/em-format.c:1066 mail/em-format.c:1188
#, fuzzy
msgid "Could not parse S/MIME message: Unknown error"
msgstr "无法解析 MIME 邮件。显示源文本。"
-#: mail/em-format.c:1151
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
+#: mail/em-format.c:1223
+#, c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr ""
+
+#: mail/em-format.c:1178
msgid "Unsupported encryption type for multipart/encrypted"
msgstr ""
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
msgid "Could not parse MIME message. Displaying as source."
msgstr "无法解析 MIME 邮件。显示源文本。"
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
#, fuzzy
msgid "Unsupported signature format"
msgstr "不支持的方案"
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
#, fuzzy
msgid "Error verifying signature"
msgstr "无法校验叶子签名"
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
#, fuzzy
msgid "Unknown error verifying signature"
msgstr "无法校验叶子签名"
+#: mail/em-format.c:1372
+#, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr ""
+
#: mail/em-junk-filter.c:82
msgid "Spamassassin (built-in)"
msgstr ""
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "每年"
+
+#: mail/em-mailer-prefs.c:86
+msgid "Once per day"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "每周"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "每月"
+
#: mail/em-migrate.c:1079
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13082,22 +13172,22 @@ msgid ""
"Please be patient while Evolution migrates your folders..."
msgstr ""
-#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
+#: mail/em-migrate.c:1845 mail/em-migrate.c:1860
#, fuzzy, c-format
msgid "Failed to migrate pop3 uid caches: %s"
msgstr "缓冲 %s 失败:%s"
-#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
+#: mail/em-migrate.c:1948 mail/em-migrate.c:2049
#, fuzzy, c-format
msgid "Failed to migrate folder expand state: %s"
msgstr "缓冲 %s 失败:%s"
-#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
+#: mail/em-migrate.c:2173 mail/em-migrate.c:2345
#, fuzzy, c-format
msgid "Failed to create directory `%s': %s"
msgstr "创建到“%s”的管道失败:%s"
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
#, fuzzy, c-format
msgid "Failed to open store for `%s': %s"
msgstr "解析主机“%s”:%s"
@@ -13136,33 +13226,33 @@ msgstr "添加到地址簿(_A)"
msgid "Open in %s..."
msgstr "在 %s 中打开..."
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:604
#, fuzzy
msgid "This store does not support subscriptions, or they are not enabled."
msgstr "此服务器不支持 LDAPv3 schema 信息"
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
msgid "Subscribed"
msgstr "已订阅"
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
msgid "Folder"
msgstr "文件夹"
#. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:827
+#: mail/em-subscribe-editor.c:850
msgid "Please select a server."
msgstr "请选择服务器。"
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
msgid "No server has been selected"
msgstr "没有选定服务器"
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
msgid "Don't show this message again."
msgstr "不再显示此信息。"
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -13171,25 +13261,25 @@ msgstr ""
"装入过滤规则信息错误:\n"
"%s"
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
msgid "Filters"
msgstr "过滤规则"
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
msgid "-------- Forwarded Message --------"
msgstr "-------- 转发的邮件 --------"
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
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:1149
+#: mail/em-utils.c:1152
msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
msgstr "在%Y年%m月%d日的%H:%M,%%s写道:"
-#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
#, c-format
msgid ""
"Cannot save to `%s'\n"
@@ -13198,7 +13288,7 @@ msgstr ""
"无法保存到“%s”\n"
" %s"
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
#, c-format
msgid ""
"`%s' already exists.\n"
@@ -13207,36 +13297,36 @@ msgstr ""
"%s 已经存在。\n"
"您打算覆盖它吗?"
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
msgid "message"
msgstr "邮件"
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
#, fuzzy, c-format
msgid "Error: '%s' exists and is not a regular file"
msgstr "错误:“%s”不存在或者不是普通文件"
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
msgid "Save Message..."
msgstr "保存邮件..."
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
#, fuzzy
msgid "Add address"
msgstr "地址"
#. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
#, fuzzy, c-format
msgid "Messages from %s"
msgstr "来自 %s 的邮件"
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "无法创建临时目录:%s"
-#: mail/em-utils.c:2434
+#: mail/em-utils.c:2455
#, fuzzy, c-format
msgid ""
"This operation will permanently remove all deleted messages in the folder `%"
@@ -13249,7 +13339,7 @@ msgstr ""
"\n"
"确实删除这些邮件吗?"
-#: mail/em-utils.c:2459
+#: mail/em-utils.c:2480
#, fuzzy
msgid ""
"This operation will permanently remove all deleted messages in all folders. "
@@ -13327,273 +13417,307 @@ msgstr "邮件的默认主题。"
#: mail/evolution-mail.schemas.in.in.h:15
#, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "邮件的默认主题。"
+
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
msgid "Default reply style"
msgstr "回复风格(_R):"
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
#, fuzzy
msgid "Default width of the Composer Window"
msgstr "文件夹栏面板的默认宽度"
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
#, fuzzy
msgid "Default width of the Message Window"
msgstr "文件夹栏面板的默认宽度"
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:19
+#, fuzzy
+msgid "Default width of the Subscribe dialog"
+msgstr "文件夹栏面板的默认宽度"
+
+#: mail/evolution-mail.schemas.in.in.h:20
msgid "Draw spelling error indicators on words as you type."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
#, fuzzy
msgid "Empty Trash folders on exit"
msgstr "退出时清空已删除邮件(_T)"
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:22
#, fuzzy
msgid "Empty all Trash folders when exiting Evolution."
msgstr "退出时清空已删除邮件(_T)"
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:23
msgid "Enable caret mode, so that you can see a cursor when reading mail."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
msgid "Enable/disable caret mode"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
msgid "Height of the message-list pane"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
msgid "Height of the message-list pane."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:27
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:26
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
msgid "List of Labels and their associated colours"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
#, fuzzy
msgid "List of accounts"
msgstr "邮件账户"
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
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:29
+#: mail/evolution-mail.schemas.in.in.h:32
msgid "List of custom headers and whether they are enabled."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
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:31
+#: mail/evolution-mail.schemas.in.in.h:34
msgid "List of mime types to check for bonobo component viewers"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
msgid "Load images for HTML messages over http"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
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:34
+#: mail/evolution-mail.schemas.in.in.h:37
#, fuzzy
msgid "Log filter actions"
msgstr "执行动作"
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
msgid "Log filter actions to the specified log file."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
msgid "Logfile to log filter actions"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
msgid "Logfile to log filter actions."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
msgid "Mark as Seen after specified timeout"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
msgid "Mark as Seen after specified timeout."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
msgid "Mark citations in the message \"Preview\""
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
msgid "Mark citations in the message \"Preview\"."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
msgid "Message Window default hight"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
msgid "Message Window default width"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
msgid "Message-display style (normal, full headers, source)"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
#, fuzzy
msgid "New Mail Notify sound file"
msgstr "新邮件提醒"
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
#, fuzzy
msgid "New Mail Notify type"
msgstr "新邮件提醒"
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
msgid "Prompt on empty subject"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:53
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:54
msgid ""
"Prompt the user when he or she tries to send a message without a Subject."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
msgid "Prompt when user expunges"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
msgid "Prompt when user only fills Bcc"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:57
#, 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:53
+#: mail/evolution-mail.schemas.in.in.h:58
#, 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:54
+#: mail/evolution-mail.schemas.in.in.h:59
msgid "Prompt when user tries to send unwanted HTML"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:60
msgid "Recognize links in text and replace them."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:61
msgid "Recognize smileys in text and replace them with images."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
msgid "Run junk test on incoming mail"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
msgid "S3kr3t 0pt10n"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
msgid "S3kr3t 0pt10n."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
#, fuzzy
msgid "Send HTML mail by default"
msgstr "发送 HTML 邮件?"
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
#, fuzzy
msgid "Send HTML mail by default."
msgstr "发送 HTML 邮件?"
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
#, fuzzy
msgid "Show Animations"
msgstr "显示动画图像(_S)"
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
#, fuzzy
msgid "Show animated images as animations."
msgstr "显示动画图像(_S)"
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:69
msgid "Show deleted messages (with a strike-through) in the message-list."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:70
#, fuzzy
msgid "Show deleted messages in the message-list"
msgstr "以普通样式显示邮件"
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
msgid "Show the \"Preview\" pane"
msgstr "显示“预览”面板"
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
msgid "Show the \"Preview\" pane."
msgstr "显示“预览”面板。"
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:73
#, fuzzy
msgid "Sound file to play when new mail arrives."
msgstr "新邮件到达时播放声音文件(_P)"
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:74
msgid "Specifies the type of New Mail Notification the user wishes to use."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
#, fuzzy
msgid "Spell check inline"
msgstr "拼写检查(_C)"
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
msgid "Terminal font"
msgstr "终端字体"
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
msgid "The terminal font for mail display"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:81
#, fuzzy
msgid "The variable width font for mail display"
msgstr "选择用于打印的 HTML 变宽度字体"
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:82
msgid ""
"This key should contain a list of XML structures specifying custom headers, "
"and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13601,113 +13725,113 @@ msgid ""
"mail view."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
#, fuzzy
msgid "Thread the message list."
msgstr "按线索编排的邮件列表"
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
#, fuzzy
msgid "Thread the message-list"
msgstr "按线索编排的邮件列表"
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:85
msgid "Thread the message-list based on Subject"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
msgid "Timeout for marking message as Seen"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
msgid "Timeout for marking message as Seen."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
#, fuzzy
msgid "UID string of the default account."
msgstr "使它成为我的默认账户(_M)"
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
msgid "Use Spamasssassin daemon and client"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:90
msgid "Use Spamasssassin daemon and client (spamc/spamd)"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
msgid "Use custom fonts"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
msgid "Use custom fonts for displaying mail"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
msgid "Use only local spam tests."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:94
msgid "Use only the local spam tests (no DNS)."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
#, fuzzy
msgid "Variable width font"
msgstr "变宽(_A):"
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
msgid "View/Bcc menu item is checked"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
msgid "View/Bcc menu item is checked."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
msgid "View/Cc menu item is checked"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
msgid "View/Cc menu item is checked."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
msgid "View/From menu item is checked"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
msgid "View/From menu item is checked."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
msgid "View/PostTo menu item is checked"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
msgid "View/PostTo menu item is checked."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
msgid "View/ReplyTo menu item is checked"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
msgid "View/ReplyTo menu item is checked."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:106
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/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
msgid "port for starting user runned spamd"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
#, fuzzy
msgid "spamd port"
msgstr "导入"
@@ -13747,14 +13871,14 @@ msgstr "Evolution 正在导入您原来的电子邮件"
#: mail/importers/elm-importer.c:89
#: mail/importers/evolution-mbox-importer.c:220
#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
+#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
msgid "Importing..."
msgstr "正在导入..."
#: mail/importers/elm-importer.c:91
#: mail/importers/evolution-mbox-importer.c:222
#: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
+#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
msgid "Please wait"
msgstr "请稍候"
@@ -13803,12 +13927,12 @@ msgstr "正在导入文件"
msgid "Scanning %s"
msgstr "正在扫描 %s"
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
#, c-format
msgid "Priority Filter \"%s\""
msgstr "优先级过滤器“%s”"
-#: mail/importers/netscape-importer.c:650
+#: mail/importers/netscape-importer.c:651
msgid ""
"Some of your Netscape email filters are based on\n"
"email priorities, which are not used in Evolution.\n"
@@ -13831,7 +13955,7 @@ msgstr ""
"的过滤器也会用评分来替代优先级。请仔细检查导入的优先级,以确\n"
"保过滤能够正常进行。"
-#: mail/importers/netscape-importer.c:674
+#: mail/importers/netscape-importer.c:675
msgid ""
"Some of your Netscape email filters use\n"
"the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13842,7 +13966,7 @@ msgstr ""
"或“观察线索”特性,而 Evolution 并不支持该\n"
"特性。这些过滤器将被丢弃。"
-#: mail/importers/netscape-importer.c:691
+#: mail/importers/netscape-importer.c:692
msgid ""
"Some of your Netscape email filters test the\n"
"body of emails for (in)equality to a given string,\n"
@@ -13854,24 +13978,24 @@ msgstr ""
"给定字符串,而 Evolution 并不支持该特性。这些过滤器\n"
"将被修改为给定字符串是否包含于邮件体中。"
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
msgid "Evolution is importing your old Netscape data"
msgstr "Evolution 正在导入您原来的 Netscape 数据"
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
#, fuzzy
msgid "Importing Netscape data"
msgstr "Evolution 正在导入您原来的 Netscape 数据"
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
msgid "Settings"
msgstr "设置"
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
msgid "Mail Filters"
msgstr "邮件过滤规则"
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1904
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
@@ -13904,62 +14028,28 @@ msgstr ""
msgid "Pine"
msgstr "Pine"
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "当前存储格式:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "索引邮件体内容"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "新存储格式:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable. Please use this feature with care."
-msgstr ""
-"注意:在进行邮件箱格式间转换时,出现可能无法\n"
-"自动修复的错误 (例如磁盘空间不足)。\n"
-"请谨慎使用该功能。"
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "邮件目录"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "邮件箱"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
-#: mail/mail-account-editor.c:102
+#: mail/mail-account-editor.c:110
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:140
+#: mail/mail-account-editor.c:153
msgid "Evolution Account Editor"
msgstr "Evolution 账户编辑器"
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
msgid "_Host:"
msgstr "主机(_H):"
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
msgid "User_name:"
msgstr "用户名(_N):"
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
msgid "_Path:"
msgstr "路径(_P):"
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
msgid "You may not create two accounts with the same name."
msgstr "您不能以相同的名字创建两个账户。"
@@ -13992,11 +14082,11 @@ msgstr "到 %s 的回复"
msgid "Add Filter Rule"
msgstr "添加过滤规则"
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
msgid "The following filter rule(s):\n"
msgstr "下列过滤器规则:\n"
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
#, c-format
msgid ""
"Used the removed folder:\n"
@@ -14007,47 +14097,47 @@ msgstr ""
" “%s”\n"
"已经被更新。"
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr ""
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
msgid "New Mail Message"
msgstr "新建邮件"
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
msgid "_Mail Message"
msgstr "邮件(_M)"
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
msgid "Compose a new mail message"
msgstr "撰写一封新邮件"
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
#, fuzzy
msgid "New Mail Folder"
msgstr "新建虚拟文件夹"
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
#, fuzzy
msgid "Mail _Folder"
msgstr "邮件过滤规则"
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
#, fuzzy
msgid "Create a new mail folder"
msgstr "创建新日历"
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
#, fuzzy
msgid "URI of the mail source that the view will display"
msgstr "日历将显示的 URI"
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
msgid "Identity"
msgstr "标识"
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:368
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
"below do not need to be filled in, unless you wish to include this "
@@ -14056,11 +14146,12 @@ msgstr ""
"请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入,除非您想要在您发"
"出的邮件中包含此信息。"
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:374 mail/mail-config-druid.c:381
+#: mail/mail-config.glade.h:116
msgid "Receiving Mail"
msgstr "接收邮件"
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:376
msgid ""
"Please enter information about your incoming mail server below. If you are "
"not sure, ask your system administrator or Internet Service Provider."
@@ -14068,15 +14159,15 @@ msgstr ""
"请在下面输入您的收件服务器信息。如果您不太确定的话,请询问您的系统管理员或者"
"互联网服务提供商ISP。"
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
msgid "Please select among the following options"
msgstr "请从以下选项中选择"
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
msgid "Sending Mail"
msgstr "发送邮件"
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:388
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -14084,11 +14175,11 @@ msgstr ""
"请在下面输入您的发件服务器信息。如果您不太确定的话,请询问您的系统管理员或者"
"互联网服务提供商ISP。"
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
msgid "Account Management"
msgstr "账户管理"
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:395
msgid ""
"You are almost done with the mail configuration process. The identity, "
"incoming mail server and outgoing mail transport method which you provided "
@@ -14099,125 +14190,258 @@ msgstr ""
"您即将完成邮件配置的过程了。您提供的用于收件服务器和发送方式将被组合在一起,"
"成为 Evolution 的邮件帐户。请在下面输入此帐户的名称。此名称只会用作显示。"
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
msgid "Checking Service"
msgstr "检查服务"
-#: mail/mail-config.c:1170 mail/mail-config.c:1174
+#: mail/mail-config.c:976 mail/mail-config.c:980
msgid "Connecting to server..."
msgstr "正在连接服务器..."
-#: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " Ch_eck for Supported Types "
msgstr "检查支持的类型(_C) "
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "预览"
+
#: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
msgstr "(在该版本的 evolution 中不支持SSL)"
#: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(在该版本的 evolution 中不支持SSL)"
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "<b>状态:</b>"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "<b>状态:</b>"
#: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
-msgstr "<b>显示的邮件头(_D)</b>"
+msgid "<span weight=\"bold\">Account Information</span>"
+msgstr ""
#: mail/mail-config.glade.h:8
-#, fuzzy
-msgid "A_lso encrypt to self when sending encrypted mail"
-msgstr "当发送加密邮件时总是对自身加密(_L)"
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
#: mail/mail-config.glade.h:9
-msgid "Account Editor"
-msgstr "账户编辑器"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
#: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "账户信息"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "检查新邮件"
#: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
-msgstr "添加脚本(_R)"
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
#: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr "添加新签名..."
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
#: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "当发送加密邮件时总是对自身加密(_W)"
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+msgstr "<b>显示的邮件头(_D)</b>"
#: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr "总是暗送到(_B):"
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
#: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "总是抄送到(_C):"
+msgid "<span weight=\"bold\">General</span>"
+msgstr ""
#: mail/mail-config.glade.h:19
+msgid "<span weight=\"bold\">Labels and Colors</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+msgid "<span weight=\"bold\">Loading Images</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:22
+msgid "<span weight=\"bold\">Message Fonts</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "<span weight=\"bold\">New Mail Notification</span>"
+msgstr "新邮件提醒"
+
+#: mail/mail-config.glade.h:24
+msgid "<span weight=\"bold\">Optional Information</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "<span weight=\"bold\">Options</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr "Pretty Good Privacy (PGP/GPG)"
+
+#: mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Printed Fonts</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:28
+msgid "<span weight=\"bold\">Required Information</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
+msgid "<span weight=\"bold\">Security</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+msgstr "已发送和草稿邮件"
+
+#: mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "A_lso encrypt to self when sending encrypted mail"
+msgstr "当发送加密邮件时总是对自身加密(_L)"
+
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "账户编辑器"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "添加新签名..."
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
+msgstr "添加脚本(_R)"
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "当发送加密邮件时总是对自身加密(_W)"
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "总是抄送到(_C):"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "总是暗送到(_B):"
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "当使用该账户时总是发送签名邮件(_A)"
+
+#: mail/mail-config.glade.h:43
msgid "Always _trust keys in my keyring when encrypting"
msgstr "加密时总是信任我的密钥环中的密钥(_T)"
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
msgid "Attach original message"
msgstr "附加原始消息"
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
msgid "Attachment"
msgstr "附件"
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "身份验证"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "自动插入笑脸图像(_A)"
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "自动检查邮件的间隔(_A)"
+
+#: mail/mail-config.glade.h:48
msgid "Baltic (ISO-8859-13)"
msgstr "波罗的语(ISO-8859-13)"
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
msgid "Baltic (ISO-8859-4)"
msgstr "波罗的语(ISO-8859-4)"
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Beep w_hen new mail arrives"
+msgstr "新邮件到达时鸣笛(_B)"
+
+#: mail/mail-config.glade.h:51
msgid "C_haracter set:"
msgstr "字符集(_H)"
-#: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "颜色(_O)"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Ch_eck for Supported Types "
+msgstr "检查支持的类型(_C) "
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
#, fuzzy
msgid "Check _Incoming Mail"
msgstr "检查新邮件"
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
msgid "Check spelling while I _type"
msgstr "在我输入时进行拼写检查(_T)"
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "检查新邮件"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
msgid "Checks incoming mail messages to be Junk"
msgstr ""
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
msgid "Color for _misspelled words:"
msgstr "给错误拼写的单词上色(_M):"
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "撰写邮件"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Colors"
+msgstr "颜色(_O)"
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "配置"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "当销毁文件夹时进行提示(_C)"
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -14232,273 +14456,261 @@ msgstr ""
"\n"
"单击“应用”可保存您的设置。"
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
msgid "De_fault"
msgstr "默认(_F)"
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "默认行为"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Default character e_ncoding:"
msgstr "默认字符编码(_E):"
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "删除邮件"
-
-#: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "对寄出的邮件进行数字签名(默认)(_S)"
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Defaults"
+msgstr "默认(_D)"
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
msgid "Do not quote original message"
msgstr "无法引用原始消息"
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(_M)(同 Outlook 兼容)"
-#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Done"
msgstr "完成"
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
msgstr "草稿文件夹(_F):"
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
msgid "Email Accounts"
msgstr "电子邮件"
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Email _Address:"
msgstr "电子邮件地址(_A):"
-#: mail/mail-config.glade.h:54
-msgid "Empty _trash folders on exit"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "Empty trash folders on e_xit"
msgstr "退出时清空已删除邮件(_T)"
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
msgid "Encry_ption certificate:"
msgstr "加密证书(_P):"
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
msgid "Evolution Account Assistant"
msgstr "Evolution 账户助手"
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
msgid "Execute Command..."
msgstr "执行命令..."
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
msgid "Fi_xed -width:"
msgstr "固定宽度(_X):"
-#: mail/mail-config.glade.h:59
-msgid "Filter Options"
-msgstr "过滤选项"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
msgid "Font Properties"
msgstr "字体属性"
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
msgid "Format messages in _HTML"
msgstr "用 HTML 格式化邮件(_H)"
-#: mail/mail-config.glade.h:62
-msgid "H_eaders"
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "HTML 邮件(_H)"
+
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Headers"
msgstr "信头(_E)"
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
msgid "Highlight _quotations with"
msgstr "突出显示引用(_Q)"
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:88
msgid "IMAPv4 "
msgstr "IMAPv4"
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:91
msgid "Inline"
msgstr "嵌入"
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:93
msgid "Kerberos "
msgstr "Kerberos"
-#: mail/mail-config.glade.h:69
-msgid "Labels and Colors"
-msgstr "标签和颜色"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "装入图像"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
msgid "Mail Configuration"
msgstr "邮件配置"
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
msgid "Mailbox location"
msgstr "邮件箱位置"
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
msgid "Message Composer"
msgstr "邮件撰写器"
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "邮件显示"
-
-#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
-msgstr "邮件字体"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "新邮件提醒"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:101
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
msgstr "注意:直到您第一次连接的时候,才会询问密码。"
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "可选的信息"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
msgid "Or_ganization:"
msgstr "组织(_G):"
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG 键标识(_K):"
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
msgid "Pick a color"
msgstr "选取一种颜色"
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "Play sound file when new mail arri_ves"
+msgstr "新邮件到达时播放声音文件(_P)"
+
+#: mail/mail-config.glade.h:109
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr "发送只有暗送收件人的邮件时提示(_O)"
-#: mail/mail-config.glade.h:91
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Pretty Good Privacy (PGP/GPG)"
-
-#: mail/mail-config.glade.h:92
-msgid "Printed Fonts"
-msgstr "打印用字体"
-
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:110
msgid "Qmail maildir "
msgstr "Qmail maildir "
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:111
msgid "Quote original message"
msgstr "引用原始消息"
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
msgid "Quoted"
msgstr "引用"
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "记住该密码(_M)"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
+msgstr "记住密码"
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
msgid "Re_ply-To:"
msgstr "回复到(_P):"
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
msgid "Receiving Email"
msgstr "接收电子邮件"
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Receiving Options"
msgstr "接收选项(_O)"
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr "记住此密码(_P)"
-
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "必需的信息"
-
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr "恢复默认值"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Remember _password"
+msgstr "记住密码"
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
-msgstr "安全(_E)"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "S_tandard Font:"
+msgstr "标准字体(_S):"
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "安全 MIME (S/MIME)"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Security"
+msgstr "安全(_S)"
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
msgid "Select HTML fixed width font"
msgstr "选择 HTML 固定宽度字体"
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
msgid "Select HTML fixed width font for printing"
msgstr "选择用于打印的 HTML 固定宽度字体"
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
msgid "Select HTML variable width font"
msgstr "选择 HTML 变宽度字体"
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
msgid "Select HTML variable width font for printing"
msgstr "选择用于打印的 HTML 变宽度字体"
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "选择(_S)..."
+
+#: mail/mail-config.glade.h:127
msgid "Sending Email"
msgstr "发送电子邮件"
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
msgstr "已发送邮件文件夹(_M):"
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "已发送和草稿邮件"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
msgid "Ser_ver requires authentication"
msgstr "服务器需要认证(_V)"
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "服务器配置"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
msgid "Server _Type: "
msgstr "服务器类型(_T):"
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
msgid "Si_gning certificate:"
msgstr "签名证书(_G):"
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "签名:"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "签名(_S)"
+
+#: mail/mail-config.glade.h:136
msgid "Specify _filename:"
msgstr "指定文件名(_F):"
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Spell Checking"
msgstr "拼写检查(_C)"
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
msgid "Standard Unix mbox"
msgstr "标准 Unix mbox"
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "终端字体(_T):"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "类型:"
+
+#: mail/mail-config.glade.h:141
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -14507,7 +14719,7 @@ msgstr ""
"此脚本的输出将用于您的签名。您指定的名称将只会\n"
"用于显示。"
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:144
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 "
@@ -14515,7 +14727,7 @@ msgid ""
msgstr ""
"此页面允许您配置拼写检查行为和语言。在此列出的语言反映了您所安装的字典。"
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:146
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -14523,15 +14735,15 @@ msgstr ""
"输入您想要给此帐户起的名字。\n"
"如:“工作”或“私人”"
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
msgid "Use _Daemon"
msgstr ""
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
msgid "V_ariable-width:"
msgstr "变宽(_A):"
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -14541,178 +14753,110 @@ msgstr ""
"\n"
"单击“前进”开始。"
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
msgid "_Add Signature"
msgstr "添加签名(_A)"
-#: mail/mail-config.glade.h:137
-msgid "_Always load images off the net"
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Always load images from the Internet"
msgstr "总是离线装入图像(_A)"
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr "当使用该账户时总是发送签名邮件(_A)"
-
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "验证类型(_A):"
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "验证类型(_A):"
-
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr "自动检查邮件的间隔(_A)"
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr "自动插入笑脸图像(_A)"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr "新邮件到达时鸣笛(_B)"
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr "当销毁文件夹时进行提示(_C)"
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "默认签名(_D):"
-
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "默认(_D)"
+#: mail/mail-config.glade.h:158
+#, fuzzy
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr "对寄出的邮件进行数字签名(默认)(_S)"
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
msgid "_Do not notify me when new mail arrives"
msgstr "新邮件到达时不要提醒我(_D)"
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
msgid "_Enable"
msgstr "启用(_E)"
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
msgid "_Encrypt outgoing messages (by default)"
msgstr "加密寄出的邮件(默认)(_E)"
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
msgid "_Forward style:"
msgstr "转发方式(_F):"
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "全名(_F):"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "HTML 邮件(_H)"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr "标识(_I)"
-
-#: mail/mail-config.glade.h:157
-#, fuzzy
-msgid "_Junk"
-msgstr "六月"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
#, fuzzy
msgid "_Load images if sender is in address book"
msgstr "如果发件人在地址簿中就装入图像(_L)"
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
msgid "_Local Tests Only"
msgstr "只进行本地测试(_L)"
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
msgid "_Make this my default account"
msgstr "使它成为我的默认账户(_M)"
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
msgid "_Mark messages as read after"
msgstr "把邮件标记为已读前等(_M)"
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
msgid "_Name:"
msgstr "名称(_N):"
-#: mail/mail-config.glade.h:163
-msgid "_Never load images off the net"
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Never load images from the Internet"
msgstr "从不离线装入图像(_N)"
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr "新邮件到达时播放声音文件(_P)"
-
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:173
msgid "_Prompt when sending HTML messages to contacts that don't want them"
msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
msgid "_Prompt when sending messages with an empty subject line"
msgstr "发送空主题行的邮件时提示(_P)"
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr "接收邮件(_R)"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
msgid "_Reply style:"
msgstr "回复风格(_R):"
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr "恢复默认值(_R)"
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
msgid "_Script:"
msgstr "脚本(_S):"
-#: mail/mail-config.glade.h:172
-msgid "_Select..."
-msgstr "选择(_S)..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr "发送邮件(_S)"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
msgid "_Show animated images"
msgstr "显示动画图像(_S)"
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr "签名(_S)"
-
-#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr "标准字体(_S):"
-
-#: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
-msgstr "终端字体(_T):"
-
#: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+#, fuzzy
+msgid "_Use Secure Connection (SSL):"
msgstr "使用安全连接 (SSL)(_U):"
#: mail/mail-config.glade.h:179
msgid "_Use the same fonts as other applications"
msgstr "使用与其它应用程序相同的字体(_U)"
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "分钟"
+
#: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "颜色"
+
+#: mail/mail-config.glade.h:182
msgid "description"
msgstr "描述"
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
#, c-format
msgid "Pinging %s"
msgstr "正在查验 %s"
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
#, c-format
msgid ""
"Error while '%s':\n"
@@ -14721,7 +14865,7 @@ msgstr ""
"当“%s”时错误:\n"
"%s"
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
#, c-format
msgid ""
"Error while performing operation:\n"
@@ -14730,7 +14874,7 @@ msgstr ""
"执行操作时错误:\n"
"%s"
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
msgid "Working"
msgstr "工作"
@@ -14738,16 +14882,16 @@ msgstr "工作"
msgid "Filtering Folder"
msgstr "过滤文件夹"
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
msgid "Fetching Mail"
msgstr "收取邮件"
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "应用寄出过滤器失败:%s"
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -14756,116 +14900,113 @@ msgstr ""
"追加到 %s:%s 失败\n"
"转而追加到本地“已发”文件夹。"
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "追加到本地“已发”文件夹失败:%s"
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr "正在发送“%s”"
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
#, c-format
msgid "Sending message %d of %d"
msgstr "发送第 %d 个邮件,共 %d 个"
-#: mail/mail-ops.c:741
-#, c-format
-msgid "Failed on message %d of %d"
-msgstr "在第 %d 个邮件失败,共 %d 个"
+#: mail/mail-ops.c:695
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "在第 %d 个消息失败,共 %d 个"
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
msgid "Complete."
msgstr "完成。"
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
msgid "Saving message to folder"
msgstr "把邮件保存到文件夹中"
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
#, c-format
msgid "Moving messages to %s"
msgstr "把邮件移动到 %s"
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
#, c-format
msgid "Copying messages to %s"
msgstr "把邮件复制到 %s"
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "正在“%s”中扫描文件夹"
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
msgid "Forwarded messages"
msgstr "转发的邮件"
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
#, c-format
msgid "Opening folder %s"
msgstr "正在打开文件夹 %s"
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
#, c-format
msgid "Opening store %s"
msgstr "正在打开存储 %s"
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
#, c-format
msgid "Removing folder %s"
msgstr "正在删除文件夹“%s”"
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
#, c-format
msgid "Storing folder '%s'"
msgstr "正在存储文件夹“%s”"
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
#, c-format
msgid "Expunging and storing account '%s'"
msgstr ""
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
#, fuzzy, c-format
msgid "Storing account '%s'"
msgstr "正在存储文件夹“%s”"
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
msgid "Refreshing folder"
msgstr "正在刷新文件夹"
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
msgid "Expunging folder"
msgstr "正在销毁文件夹"
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
#, c-format
msgid "Emptying trash in '%s'"
msgstr "正在清空“%s”中的已删除邮件"
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
msgid "Local Folders"
msgstr "本地文件夹"
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
#, c-format
msgid "Retrieving message %s"
msgstr "正在收取邮件 %s"
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "正在收取 %d 封邮件"
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "正在收取 %d 封邮件"
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "正在保存 %d 封邮件"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "正在保存 %d 封邮件"
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -14874,7 +15015,7 @@ msgstr ""
"无法创建输出文件:%s\n"
" %s"
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -14883,11 +15024,11 @@ msgstr ""
"在将邮件保存到 %s 时发生错误:\n"
" %s"
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
msgid "Saving attachment"
msgstr "正在保存附件"
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -14896,25 +15037,21 @@ msgstr ""
"无法创建输出文件:%s:\n"
" %s"
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据:%s"
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
#, c-format
msgid "Disconnecting from %s"
msgstr "正在断开与 %s 的连接"
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
#, c-format
msgid "Reconnecting to %s"
msgstr "正在重新连接到 %s"
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr ""
-
#: mail/mail-search.glade.h:2
msgid "Case Sensitive"
msgstr "区分大小写"
@@ -14927,84 +15064,80 @@ msgstr "在邮件中寻找"
msgid "Find:"
msgstr "查找:"
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "搜索"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
#: mail/mail-security.glade.h:2
-msgid "Digital Signature"
-msgstr "数字签名"
-
-#: mail/mail-security.glade.h:3
-msgid "Encryption"
-msgstr "加密"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
#: mail/mail-security.glade.h:4
msgid "Security Information"
msgstr "安全信息"
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
msgid "Cancelling..."
msgstr "正在取消..."
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
#, c-format
msgid "Server: %s, Type: %s"
msgstr "服务器:%s,类型:%s"
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
#, c-format
msgid "Path: %s, Type: %s"
msgstr "路径:%s,类型:%s"
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
#, c-format
msgid "Type: %s"
msgstr "类型:%s"
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
msgid "Send & Receive Mail"
msgstr "发送和接收邮件"
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
msgid "Cancel _All"
msgstr "全部取消(_A)"
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
msgid "Updating..."
msgstr "正在更新..."
-#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
+#: mail/mail-send-recv.c:401 mail/mail-send-recv.c:453
msgid "Waiting..."
msgstr "正在等待..."
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
msgid "User canceled operation."
msgstr "用户己取消操作。"
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
msgid "Enter Password"
msgstr "输入密码"
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
msgid "_Remember this password"
msgstr "记住该密码(_R)"
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
msgid "_Remember this password for the remainder of this session"
msgstr "在本会话中记住该密码(_R)"
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
#, c-format
msgid "Could not save signature file: %s"
msgstr "无法保存签名文件:%s"
-#: mail/mail-signature-editor.c:226
+#: mail/mail-signature-editor.c:233
msgid ""
"This signature has been changed, but hasn't been saved.\n"
"\n"
@@ -15014,23 +15147,23 @@ msgstr ""
"\n"
"您希望保存改动吗?"
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
msgid "_Discard changes"
msgstr "丢弃更改(_D)"
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
msgid "Save signature"
msgstr "保存签名"
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
msgid "Edit signature"
msgstr "编辑签名"
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
msgid "Enter a name for this signature."
msgstr "输入该签名的名字。"
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
msgid "Name:"
msgstr "名称:"
@@ -15060,17 +15193,17 @@ msgstr "转发的邮件"
msgid "Invalid folder: `%s'"
msgstr "无效的文件夹:“%s”"
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
#, c-format
msgid "Setting up vfolder: %s"
msgstr "设置虚拟文件夹:%s"
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
#, c-format
msgid "Updating vfolders for uri: %s"
msgstr "为 uri: %s 更新虚拟文件夹"
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
#, c-format
msgid ""
"The following vFolder(s):\n"
@@ -15083,84 +15216,84 @@ msgstr ""
" “%s”\n"
"已经被更新。"
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
msgid "vFolders"
msgstr "虚拟文件夹"
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
msgid "Edit VFolder"
msgstr "编辑虚拟文件夹"
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
#, c-format
msgid "Trying to edit a vfolder '%s' which doesn't exist."
msgstr "试图编辑并不存在的虚拟文件夹“%s”。"
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
msgid "New VFolder"
msgstr "新建虚拟文件夹"
-#: mail/message-list.c:927
+#: mail/message-list.c:935
msgid "Unseen"
msgstr "不可见"
-#: mail/message-list.c:928
+#: mail/message-list.c:936
msgid "Seen"
msgstr "可见"
-#: mail/message-list.c:929
+#: mail/message-list.c:937
msgid "Answered"
msgstr "已答复"
-#: mail/message-list.c:930
+#: mail/message-list.c:938
msgid "Multiple Unseen Messages"
msgstr "多封不可见邮件"
-#: mail/message-list.c:931
+#: mail/message-list.c:939
msgid "Multiple Messages"
msgstr "多封邮件"
-#: mail/message-list.c:935
+#: mail/message-list.c:943
msgid "Lowest"
msgstr "最低"
-#: mail/message-list.c:936
+#: mail/message-list.c:944
msgid "Lower"
msgstr "较低"
-#: mail/message-list.c:940
+#: mail/message-list.c:948
msgid "Higher"
msgstr "较高"
-#: mail/message-list.c:941
+#: mail/message-list.c:949
msgid "Highest"
msgstr "最高"
-#: mail/message-list.c:1262
+#: mail/message-list.c:1270
msgid "?"
msgstr "?"
-#: mail/message-list.c:1269
+#: mail/message-list.c:1277
msgid "Today %l:%M %p"
msgstr "今天 %H:%M"
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
msgid "Yesterday %l:%M %p"
msgstr "昨天 %H:%M"
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
msgid "%a %l:%M %p"
msgstr "%A %H:%M"
-#: mail/message-list.c:1298
+#: mail/message-list.c:1306
msgid "%b %d %l:%M %p"
msgstr "%m月%d日 %H:%M"
-#: mail/message-list.c:1300
+#: mail/message-list.c:1308
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
msgid "Generating message list"
msgstr "正在生成邮件列表"
@@ -15208,7 +15341,7 @@ msgstr "跟随"
msgid "For Your Information"
msgstr "给您的信息"
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
msgid "Forward"
msgstr "转发"
@@ -15216,11 +15349,11 @@ msgstr "转发"
msgid "No Response Necessary"
msgstr "不必回复"
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
msgid "Reply"
msgstr "回复"
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
msgid "Reply to All"
msgstr "全部回复"
@@ -15245,7 +15378,8 @@ msgstr ""
"请从“标志”菜单中选择跟随操作。"
#: mail/message-tags.glade.h:6
-msgid "_Due by:"
+#, fuzzy
+msgid "_Due By:"
msgstr "延期(_D):"
#: mail/message-tags.glade.h:7
@@ -15454,7 +15588,7 @@ msgstr ""
msgid "Choose the destination for this import"
msgstr "取消该项的会议"
-#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:737
+#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:738
msgid "Please select the information that you would like to import:"
msgstr "请选择您希望导入的信息:"
@@ -15482,26 +15616,26 @@ msgstr ""
msgid "Select importer"
msgstr "选择导入器"
-#: shell/e-shell-importer.c:448 shell/e-shell-importer.c:1020
+#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
#, c-format
msgid "File %s does not exist"
msgstr "文件 %s 不存在"
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
msgid "Importing"
msgstr "正在导入"
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
#, fuzzy, c-format
msgid "Importing %s.\n"
msgstr "正在导入"
-#: shell/e-shell-importer.c:473 shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:475 shell/e-shell-importer.c:476
#, c-format
msgid "Error loading %s"
msgstr "装入 %s 错误"
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
#, c-format
msgid ""
"Importing %s\n"
@@ -15510,31 +15644,31 @@ msgstr ""
"正在导入 %s\n"
"正在导入项目 1。"
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
msgid "Automatic"
msgstr "自动"
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
msgid "_Filename:"
msgstr "文件名(_F):"
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
msgid "Select a file"
msgstr "选择一个文件"
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
msgid "File _type:"
msgstr "文件类型(_T):"
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
msgid "Import data and settings from _older programs"
msgstr "从老版程序中导入数据和设置(_O)"
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
msgid "Import a _single file"
msgstr "导入单个文件(_S)"
-#: shell/e-shell-importer.c:718 shell/e-shell-startup-wizard.c:566
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:566
msgid ""
"Please wait...\n"
"Scanning for existing setups"
@@ -15542,26 +15676,26 @@ msgstr ""
"请稍候...\n"
"正在扫描现有设置"
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
msgid "Starting Intelligent Importers"
msgstr "启动智能导入器"
-#: shell/e-shell-importer.c:847 shell/e-shell-startup-wizard.c:692
+#: shell/e-shell-importer.c:850 shell/e-shell-startup-wizard.c:693
#, c-format
msgid "From %s:"
msgstr "从 %s:"
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
#, fuzzy, c-format
msgid "No importer available for file %s"
msgstr "协议“%s”没有可用的提供者"
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
#, fuzzy
msgid "Unable to execute importer"
msgstr "执行 gpg 失败。"
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
msgid "_Import"
msgstr "导入(_I)"
@@ -15569,7 +15703,7 @@ msgstr "导入(_I)"
msgid "Closing connections..."
msgstr "正在关闭连接..."
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
msgid "Evolution Settings"
msgstr "Evolution 设置"
@@ -15603,11 +15737,11 @@ msgstr "无法打开共享文件夹:%s。"
msgid "Cannot find the specified shared folder."
msgstr "无法找到指定的共享文件夹。"
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
msgid "Starting import"
msgstr "开始导入"
-#: shell/e-shell-startup-wizard.c:784
+#: shell/e-shell-startup-wizard.c:785
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 "
@@ -15616,10 +15750,6 @@ msgid ""
"Do you want to quit using the Assistant now?"
msgstr ""
-#: shell/e-shell-startup-wizard.c:795
-msgid "Quit Assistant"
-msgstr "退出助手"
-
#: shell/e-shell-utils.c:116
msgid "No folder name specified."
msgstr "没有指定文件夹名称。"
@@ -15661,15 +15791,15 @@ msgstr "无法运行 Bug buddy。"
msgid "About Ximian Evolution"
msgstr "关于 Ximian Evolution"
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
msgid "_Work Online"
msgstr "在线工作(_W)"
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
msgid "_Work Offline"
msgstr "离线工作(_W)"
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
msgid "Work Offline"
msgstr "离线工作"
@@ -15717,7 +15847,6 @@ msgstr "复选框"
#: shell/e-user-creatable-items-handler.c:601
#: shell/e-user-creatable-items-handler.c:642
-#: widgets/misc/e-charset-picker.c:109
msgid "New"
msgstr "新建"
@@ -15771,16 +15900,17 @@ msgid "Create a new test item"
msgstr "创建新测试项"
#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
msgstr "当前连接"
#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "点击确定以关闭这些连接并下线"
+msgid "Active Connections"
+msgstr "当前连接"
#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "下列连接正处于活跃状态:"
+msgid "Click OK to close these connections and go offline"
+msgstr "点击确定以关闭这些连接并下线"
#: shell/glade/e-shell-config-default-folders.glade.h:1
msgid "C_alendar:"
@@ -15900,28 +16030,28 @@ msgstr ""
"欢迎使用 Evolution 导入助手。\n"
"本助手将全程指导您将外部文件导入 Evolution。"
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
msgid "Importers"
msgstr "导入器"
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
msgid "Import"
msgstr "导入"
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
msgid "Don't import"
msgstr "不要导入"
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
msgid "Don't ask me again"
msgstr "不要再问我"
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
msgid "Evolution can import data from the following files:"
msgstr "Evolution 可以从下列文件中导入数据:"
#. Preview/Alpha/Beta version warning message
-#: shell/main.c:217
+#: shell/main.c:231
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -15953,7 +16083,7 @@ msgstr ""
"\n"
"我们希望您尽情享受我们努力工作的成果,我们也热切盼望着您的意见!\n"
-#: shell/main.c:241
+#: shell/main.c:255
msgid ""
"Thanks\n"
"The Ximian Evolution Team\n"
@@ -15961,48 +16091,48 @@ msgstr ""
"感谢\n"
"Ximian Evolution 团队\n"
-#: shell/main.c:249
+#: shell/main.c:262
msgid "Don't tell me again"
msgstr "不要再问我"
-#: shell/main.c:381
+#: shell/main.c:392
msgid "Cannot access the Ximian Evolution shell."
msgstr "无法访问 Ximian Evolution shell。"
-#: shell/main.c:390
+#: shell/main.c:401
#, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "无法初始化 Ximian Evolution shell:%s"
-#: shell/main.c:487
+#: shell/main.c:498
msgid "Start Evolution activating the specified component"
msgstr ""
-#: shell/main.c:489
+#: shell/main.c:500
msgid "Start in offline mode"
msgstr "以离线模式启动"
-#: shell/main.c:491
+#: shell/main.c:502
msgid "Start in online mode"
msgstr "以在线模式启动"
-#: shell/main.c:494
+#: shell/main.c:505
msgid "Forcibly shut down all evolution components"
msgstr "强制关闭所有 Evolution 组件"
-#: shell/main.c:498
+#: shell/main.c:509
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr ""
-#: shell/main.c:501
+#: shell/main.c:512
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
-#: shell/main.c:524
+#: shell/main.c:535
msgid "Evolution"
msgstr "Evolution"
-#: shell/main.c:528
+#: shell/main.c:539
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -16011,46 +16141,57 @@ msgstr ""
"%s:不能同时使用 --online 和 --offline。\n"
" 详情请使用 %s --help。\n"
-#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
-#: smime/gui/certificate-manager.c:463
+#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
+#: smime/gui/certificate-manager.c:503
msgid "Select a cert to import..."
msgstr "选择要导入的证书..."
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
msgid "Certificate Name"
msgstr "证书名称"
-#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
msgid "Purposes"
msgstr "用途"
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
#: smime/lib/e-cert.c:517
msgid "Serial Number"
msgstr "序列号"
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
#, fuzzy
msgid "Expires"
msgstr "表达式"
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
msgid "E-Mail Address"
msgstr "电子邮件地址"
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
#, fuzzy, c-format
msgid "Certificate Viewer: %s"
msgstr ""
"证书过期:%s\n"
"发行者:%s"
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
#, fuzzy, c-format
msgid "Enter the password for `%s'"
msgstr "为 %s 输入密码"
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "输入 %s 的密码"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "输入密码"
+
#. FIXME: add serial no, validity date, uses
#: smime/gui/e-cert-selector.c:121
#, c-format
@@ -16246,7 +16387,8 @@ msgstr ""
msgid "Your Certificates"
msgstr "您的证书"
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
#, fuzzy
msgid "Certificate already exists"
msgstr "卡片 ID 已经存在"
@@ -16536,7 +16678,7 @@ msgstr "把选中的联系人移动到其它文件夹..."
msgid "Move to Folder..."
msgstr "移动到文件夹..."
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
msgid "Paste the clipboard"
msgstr "粘贴剪贴板"
@@ -16545,8 +16687,8 @@ msgid "Previews the contacts to be printed"
msgstr "预览将要打印的联系人"
#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
msgid "Print Pre_view"
msgstr "打印预览(_V)"
@@ -16594,13 +16736,13 @@ msgstr "停止载入"
msgid "View the current contact"
msgstr "查看当前联系人"
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
#: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
msgid "_Actions"
msgstr "操作(_A)"
@@ -16621,14 +16763,10 @@ msgid "_Save as VCard"
msgstr "另存为 VCard(_S)"
#: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "搜索联系人(_S)"
-
-#: ui/evolution-addressbook.xml.h:43
msgid "_Select All"
msgstr "全选(_S)"
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
msgid "_Send Message to Contact..."
msgstr "给联系人发邮件(_S)..."
@@ -16636,58 +16774,54 @@ msgstr "给联系人发邮件(_S)..."
msgid "Day"
msgstr "天"
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
msgid "Delete All Occurrences"
msgstr "删除所有发生"
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
msgid "Delete the appointment"
msgstr "删除约会"
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
msgid "Delete this Occurrence"
msgstr "删除此次发生"
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
msgid "Delete this occurrence"
msgstr "删除此次发生"
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
msgid "Go To"
msgstr "转到"
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
msgid "Go back"
msgstr "后退"
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
msgid "Go forward"
msgstr "前进"
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "转到日期(_D)"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "转到指定日期"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "转到今天"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
msgid "List"
msgstr "列表"
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
msgid "Month"
msgstr "月"
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "下一封"
+
+#: ui/evolution-calendar.xml.h:17
msgid "Previews the calendar to be printed"
msgstr "预览将要打印的日历"
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "上一封"
+
#: ui/evolution-calendar.xml.h:21
msgid "Print this calendar"
msgstr "打印此日历"
@@ -16696,7 +16830,7 @@ msgstr "打印此日历"
msgid "Publish Free/Busy information for this calendar"
msgstr "为此日历发布忙闲信息"
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
#, fuzzy
msgid "Purg_e"
msgstr "波治"
@@ -16707,34 +16841,54 @@ msgid "Purge old appointments and meetings"
msgstr "含有约会和事件的公共文件夹"
#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "选中所有文字"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "转到指定日期"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "选择文件夹"
+
+#: ui/evolution-calendar.xml.h:29
msgid "Show as list"
msgstr "显示为列表"
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
msgid "Show one day"
msgstr "显示一天"
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
msgid "Show one month"
msgstr "显示一个月"
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
msgid "Show one week"
msgstr "显示一周"
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
msgid "Show the working week"
msgstr "显示工作周"
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: widgets/misc/e-dateedit.c:435
+msgid "Today"
+msgstr "今天"
+
+#: ui/evolution-calendar.xml.h:35
msgid "View the current appointment"
msgstr "查看当前约会"
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
msgid "Week"
msgstr "周"
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
msgid "_Open Appointment"
msgstr "打开约会(_O)"
@@ -16999,7 +17153,7 @@ msgstr "全部标为已读(_R)"
msgid "Mark all visible messages as read"
msgstr "把所由可见的邮件标记为已读"
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
msgid "Paste message(s) from the clipboard"
msgstr "从剪贴板粘贴邮件"
@@ -17166,310 +17320,312 @@ msgid "F_orward As..."
msgstr "转发为(_O)..."
#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "过滤规则"
+
+#: ui/evolution-mail-message.xml.h:34
msgid "Filter on Mailing _List..."
msgstr "过滤邮件列表(_L)..."
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
msgid "Filter on Se_nder..."
msgstr "过滤发件人(_N)..."
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
msgid "Filter on _Recipients..."
msgstr "过滤收件人(_R)..."
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
msgid "Filter on _Subject..."
msgstr "过滤标题(_S)..."
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Filter the selected messages for junk status"
+msgstr "把选定的邮件标记为不重要邮件"
+
+#: ui/evolution-mail-message.xml.h:39
msgid "Flag selected message(s) for follow-up"
msgstr "为选定的邮件做跟随标志"
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
msgid "Follow _Up..."
msgstr "跟随(_U)..."
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
msgid "Force images in HTML mail to be loaded"
msgstr "强制装入 HTML 邮件中的图像"
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
msgid "Forward the selected message in the body of a new message"
msgstr "在新邮件体中转发选定的邮件"
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
msgid "Forward the selected message quoted like a reply"
msgstr "以类似于回复的引用方式转发选定的邮件"
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
msgid "Forward the selected message to someone"
msgstr "把选定的邮件转发给某人"
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
msgid "Forward the selected message to someone as an attachment"
msgstr "把选定的邮件作为附件转发给某人"
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
msgid "Increase the text size"
msgstr "增加文本大小"
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
msgid "Load _Images"
msgstr "装入图像(_I)"
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
msgid "Mark as I_mportant"
msgstr "标记为重要(_M)"
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
msgid "Mark as U_nread"
msgstr "标记为未读(_N)"
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
msgid "Mark as Unimp_ortant"
msgstr "标记为不重要(_O)"
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
msgid "Mark the selected message(s) as having been read"
msgstr "把选定的邮件标记为已读"
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
msgid "Mark the selected message(s) as important"
msgstr "把选定的邮件标记为重要邮件"
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
#, fuzzy
msgid "Mark the selected message(s) as junk"
msgstr "把选定的邮件标记为不重要邮件"
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
#, fuzzy
msgid "Mark the selected message(s) as not being junk"
msgstr "把选定的邮件标记为未读"
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
msgid "Mark the selected message(s) as not having been read"
msgstr "把选定的邮件标记为未读"
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
msgid "Mark the selected message(s) as unimportant"
msgstr "把选定的邮件标记为不重要邮件"
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
msgid "Mark the selected messages for deletion"
msgstr "为选定的邮件做删除标记"
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
msgid "Move"
msgstr "移动"
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
msgid "Move selected message(s) to another folder"
msgstr "把选中的邮件移动到其它文件夹"
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr "下一封"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
msgid "Next _Important Message"
msgstr "下一封重要邮件(_I)"
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
msgid "Next _Thread"
msgstr "下一条线索(_T)"
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
msgid "Next _Unread Message"
msgstr "下一封未读邮件(_U)"
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
#, fuzzy
msgid "Not Junk"
msgstr "没找到"
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
msgid "Open the selected message in a new window"
msgstr "在新窗口中打开选中的邮件"
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
msgid "Open the selected message in the composer to re-send it"
msgstr "在邮件撰写器中打开选中的邮件以便重发"
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
msgid "Original Si_ze"
msgstr "原大小(_Z)"
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
msgid "P_revious Unread Message"
msgstr "上一封未读邮件(_R)"
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
msgid "Post a Repl_y"
msgstr "投递回复(_Y)"
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
msgid "Post a reply to a message in a Public folder"
msgstr "在公共文件夹中回复邮件"
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
msgid "Pr_evious Important Message"
msgstr "上一封重要邮件(_E)"
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
msgid "Preview the message to be printed"
msgstr "预览要打印的邮件"
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr "上一封"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
msgid "Print this message"
msgstr "打印该邮件"
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
msgid "Re_direct"
msgstr "重定向(_D)"
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
msgid "Redirect (bounce) the selected message to someone"
msgstr "将选定的消息转发(退回)给某人"
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
msgid "Reset the text to its original size"
msgstr "把文件重新设置为原来的大小"
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
msgid "S_earch in Message..."
msgstr "在邮件中搜索(_E)..."
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
msgid "S_maller"
msgstr "较小(_M)"
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
msgid "Save the message as a text file"
msgstr "把邮件存为文本文件"
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
msgid "Search for text in the body of the displayed message"
msgstr "在显示邮件的邮件体中搜索文本"
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
msgid "Set up the page settings for your current printer"
msgstr "设定您当前打印机的页面设置"
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
msgid "Show Email _Source"
msgstr "显示电子邮件源代码(_S)"
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
msgid "Show Full _Headers"
msgstr "显示完整的邮件头(_H)"
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
#, fuzzy
msgid "Show a blinking cursor in the body of displayed messages"
msgstr "在显示邮件的邮件体中搜索文本"
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
msgid "Show message in the normal style"
msgstr "以普通样式显示邮件"
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
msgid "Show message with all email headers"
msgstr "显示邮件时显示所有邮件头"
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
msgid "Show the raw email source of the message"
msgstr "显示邮件的原始邮件源代码"
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
msgid "Text Si_ze"
msgstr "文字大小(_Z)"
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
msgid "Un-delete the selected messages"
msgstr "取消选中邮件的删除"
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
msgid "VFolder on Mailing _List..."
msgstr "基于邮件列表的虚拟文件夹(_L)..."
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
msgid "VFolder on Se_nder..."
msgstr "基于发件人的虚拟文件夹(_N)..."
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
msgid "VFolder on _Recipients..."
msgstr "基于收件人的虚拟文件夹(_R)..."
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
msgid "VFolder on _Subject..."
msgstr "基于主题的虚拟文件夹(_S)..."
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
msgid "_Attached"
msgstr "附加(_A)"
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
msgid "_Copy to Folder"
msgstr "复制到文件夹(_C)"
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
msgid "_Create Filter From Message"
msgstr "根据邮件创建过滤规则(_C)"
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
msgid "_Go To"
msgstr "转到(_G)"
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
msgid "_Inline"
msgstr "嵌入(_I)"
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
msgid "_Larger"
msgstr "较大(_L)"
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
msgid "_Message Display"
msgstr "邮件显示(_M)"
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
msgid "_Move to Folder"
msgstr "移动到文件夹(_M)"
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
msgid "_Next Message"
msgstr "下一封邮件(_N)"
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
msgid "_Normal Display"
msgstr "普通显示(_N)"
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
msgid "_Open Message"
msgstr "打开邮件(_O)"
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
msgid "_Previous Message"
msgstr "上一封邮件(_P)"
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
msgid "_Quoted"
msgstr "引用(_Q)"
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
msgid "_Resend..."
msgstr "重发(_R)..."
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
msgid "_Tools"
msgstr "工具(_T)"
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
msgid "_Undelete"
msgstr "取消删除(_U)"
@@ -17737,39 +17893,39 @@ msgstr "复制选中的任务"
msgid "Cut selected task"
msgstr "剪切选中的任务"
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
msgid "Delete completed tasks"
msgstr "删除已完成的任务"
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
msgid "Delete selected tasks"
msgstr "删除选中的任务"
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
msgid "Mar_k as Complete"
msgstr "标记为完成(_K)"
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
msgid "Mark selected tasks as complete"
msgstr "把选中任务标记为完成"
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
msgid "Paste task from the clipboard"
msgstr "从剪贴板中粘贴任务"
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
msgid "Previews the list of tasks to be printed"
msgstr "预览要打印的任务列表"
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
msgid "Print the list of tasks"
msgstr "打印任务列表"
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
msgid "View the selected task"
msgstr "查看选中的任务"
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
msgid "_Open Task"
msgstr "打开任务(_O)"
@@ -17899,10 +18055,15 @@ msgid "_Day View"
msgstr "日视图(_D)"
#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "列表视图"
+
+#: views/calendar/galview.xml.h:4
msgid "_Month View"
msgstr "月视图(_M)"
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
msgid "_Work Week View"
msgstr "周工作视图(_W)"
@@ -17931,10 +18092,16 @@ msgid "_Messages"
msgstr "邮件(_M)"
#: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "按类别(_C)"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "到期日期(_D):"
#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "设置状态"
+
+#: views/tasks/galview.xml.h:3
msgid "_Tasks"
msgstr "任务(_T)"
@@ -17992,14 +18159,10 @@ msgstr "一二三四五六日"
msgid "%B %Y"
msgstr "%Y年%B"
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
msgid "Now"
msgstr "现在"
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "今天"
-
#: widgets/misc/e-cell-date-edit.c:805
#, c-format
msgid "The time must be in the format: %s"
@@ -18009,82 +18172,87 @@ msgstr "时间必须采用格式:%s"
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "百分比值必需在 0 到 100 之间,含 0 和 100"
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
msgid "Baltic"
msgstr "波罗的语"
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
msgid "Central European"
msgstr "中欧"
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
msgid "Chinese"
msgstr "中文"
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
msgid "Cyrillic"
msgstr "西里尔语"
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
msgid "Greek"
msgstr "希腊语"
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
msgid "Hebrew"
msgstr "希伯来语"
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
msgid "Japanese"
msgstr "日文"
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
msgid "Korean"
msgstr "韩语"
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
msgid "Turkish"
msgstr "土耳其语"
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
msgid "Unicode"
msgstr "Unicode"
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
msgid "Western European"
msgstr "西欧"
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:73
+#, fuzzy
+msgid "Western European, New"
+msgstr "西欧"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
msgid "Traditional"
msgstr "繁体"
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
#: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
+#: widgets/misc/e-charset-picker.c:95 widgets/misc/e-charset-picker.c:96
msgid "Simplified"
msgstr "简体"
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
msgid "Ukrainian"
msgstr "乌克兰语"
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
msgid "Visual"
msgstr "可视"
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
#, c-format
msgid "Unknown character set: %s"
msgstr "未知的字符集:%s"
-#: widgets/misc/e-charset-picker.c:213 widgets/misc/e-charset-picker.c:442
+#: widgets/misc/e-charset-picker.c:215 widgets/misc/e-charset-picker.c:444
msgid "Character Encoding"
msgstr "字符编码"
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
msgid "Enter the character set to use"
msgstr "输入要使用的字符集"
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
msgid "Other..."
msgstr "其它..."
@@ -18152,11 +18320,16 @@ msgid "Spacing around expander arrow"
msgstr ""
#: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "搜索(_S)"
+
+#: widgets/misc/e-filter-bar.c:193
msgid "Search Editor"
msgstr "搜索编辑器"
#. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
msgid "Save Search"
msgstr "保存搜索"
@@ -18177,15 +18350,15 @@ msgstr "高级(_A)..."
msgid "Choose Image"
msgstr "选择文件"
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
msgid "_Search"
msgstr "搜索(_S)"
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
msgid "_Find Now"
msgstr "立即查找(_F)"
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
+#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
msgid "_Clear"
msgstr "清除(_C)"
@@ -18215,6 +18388,327 @@ msgstr "%s (...)"
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#, fuzzy
+#~ msgid "Address Book Sources"
+#~ msgstr "地址簿来源..."
+
+#~ msgid "Selected:"
+#~ msgstr "已选择:"
+
+#~ msgid "1 contact"
+#~ msgstr "1 个联系人"
+
+#~ msgid "and %d other contacts."
+#~ msgstr "以及另外 %d 个联系人。"
+
+#~ msgid "Send an Email"
+#~ msgstr "发送电子邮件"
+
+#~ msgid "1 day"
+#~ msgstr "1 天"
+
+#~ msgid "1 week"
+#~ msgstr "1 周"
+
+#~ msgid "1 hour"
+#~ msgstr "1 小时"
+
+#~ msgid "1 minute"
+#~ msgstr "1 分钟"
+
+#~ msgid "1 second"
+#~ msgstr "1 秒"
+
+#~ msgid "Description"
+#~ msgstr "描述"
+
+#~ msgid "component"
+#~ msgstr "组件"
+
+#~ msgid "Alarms"
+#~ msgstr "提醒"
+
+#~ msgid "Geographical Position"
+#~ msgstr "地理位置"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Every %d days"
+#~ msgstr "每 %d 天"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "每 %d 周"
+
+#~ msgid "Every %d weeks on "
+#~ msgstr "每 %d 周的"
+
+#~ msgid "every %d months"
+#~ msgstr "每 %d 个月"
+
+#~ msgid "Every %d years"
+#~ msgstr "每 %d 年"
+
+#~ msgid "Go To Date"
+#~ msgstr "转到日期"
+
+#, fuzzy
+#~ msgid "_Go To Today"
+#~ msgstr "转到今天"
+
+#~ msgid "LDAP Server Name:"
+#~ msgstr "LDAP 服务器名:"
+
+#~ msgid "Search base:"
+#~ msgstr "搜索起点:"
+
+#~ msgid "STARTTLS request timed out: %s"
+#~ msgstr "STARTTLS 请求超时:%s"
+
+#~ msgid "STARTTLS response error"
+#~ msgstr "STARTTLS 响应错误"
+
+#~ msgid "HELO request timed out: %s"
+#~ msgstr "HELO 请求超时:%s"
+
+#~ msgid "HELO response error"
+#~ msgstr "HELO 应答错误"
+
+#~ msgid "AUTH request timed out: %s"
+#~ msgstr "AUTH 请求超时:%s"
+
+#~ msgid "AUTH request failed."
+#~ msgstr "AUTH 请求失败。"
+
+#~ msgid "MAIL FROM response error"
+#~ msgstr "MAIL FROM 应答错误"
+
+#~ msgid "DATA response error"
+#~ msgstr "DATA 应答错误"
+
+#~ msgid "DATA send timed out: message termination: %s: mail not sent"
+#~ msgstr "DATA 发送超时:消息终止:%s:邮件未发送"
+
+#~ msgid "DATA termination response error"
+#~ msgstr "DATA 终止应答错误"
+
+#~ msgid "RSET request timed out: %s"
+#~ msgstr "RSET 请求超时:%s"
+
+#~ msgid "RSET response error"
+#~ msgstr "RSET 应答错误"
+
+#~ msgid "QUIT request timed out: %s"
+#~ msgstr "QUIT 请求超时:%s"
+
+#~ msgid "QUIT response error"
+#~ msgstr "QUIT 应答错误"
+
+#~ msgid "%d seconds ago"
+#~ msgstr "%d 秒前"
+
+#~ msgid "%d minutes ago"
+#~ msgstr "%d 分钟前"
+
+#~ msgid "%d hours ago"
+#~ msgstr "%d 小时前"
+
+#~ msgid "%d days ago"
+#~ msgstr "%d 天前"
+
+#~ msgid "%d weeks ago"
+#~ msgstr "%d 周前"
+
+#~ msgid "%d months ago"
+#~ msgstr "%d 个月前"
+
+#~ msgid "%d years ago"
+#~ msgstr "%d 年前"
+
+#~ msgid "Then"
+#~ msgstr "则"
+
+#~ msgid "If"
+#~ msgstr "如果"
+
+#~ msgid "Edit Filters"
+#~ msgstr "编辑过滤规则"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "编辑虚拟文件夹"
+
+#~ msgid "Outgoing"
+#~ msgstr "发送"
+
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "将邮件管道给 Shell 命令"
+
+#~ msgid "Shell Command"
+#~ msgstr "Shell 命令"
+
+#~ msgid "Rules"
+#~ msgstr "规则"
+
+#~ msgid "[script]"
+#~ msgstr "[脚本]"
+
+#~ msgid "Add script signature"
+#~ msgstr "添加脚本签名"
+
+#~ msgid "Current store format:"
+#~ msgstr "当前存储格式:"
+
+#~ msgid "Index body contents"
+#~ msgstr "索引邮件体内容"
+
+#~ msgid "New store format:"
+#~ msgstr "新存储格式:"
+
+#~ msgid ""
+#~ "Note: When converting between mailbox formats, a failure\n"
+#~ "(such as lack of disk space) may not be automatically\n"
+#~ "recoverable. Please use this feature with care."
+#~ msgstr ""
+#~ "注意:在进行邮件箱格式间转换时,出现可能无法\n"
+#~ "自动修复的错误 (例如磁盘空间不足)。\n"
+#~ "请谨慎使用该功能。"
+
+#~ msgid "maildir"
+#~ msgstr "邮件目录"
+
+#~ msgid "mbox"
+#~ msgstr "邮件箱"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(在该版本的 evolution 中不支持SSL)"
+
+#~ msgid "Account Information"
+#~ msgstr "账户信息"
+
+#~ msgid "Authentication"
+#~ msgstr "身份验证"
+
+#~ msgid "Composing Messages"
+#~ msgstr "撰写邮件"
+
+#~ msgid "Configuration"
+#~ msgstr "配置"
+
+#~ msgid "Default Behavior"
+#~ msgstr "默认行为"
+
+#~ msgid "Deleting Mail"
+#~ msgstr "删除邮件"
+
+#~ msgid "Filter Options"
+#~ msgstr "过滤选项"
+
+#~ msgid "Labels and Colors"
+#~ msgstr "标签和颜色"
+
+#~ msgid "Loading Images"
+#~ msgstr "装入图像"
+
+#~ msgid "Message Display"
+#~ msgstr "邮件显示"
+
+#~ msgid "Message Fonts"
+#~ msgstr "邮件字体"
+
+#~ msgid "Optional Information"
+#~ msgstr "可选的信息"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "打印用字体"
+
+#~ msgid "Re_member this password"
+#~ msgstr "记住该密码(_M)"
+
+#~ msgid "Remember this _password"
+#~ msgstr "记住此密码(_P)"
+
+#~ msgid "Required Information"
+#~ msgstr "必需的信息"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "恢复默认值"
+
+#~ msgid "S_ecurity"
+#~ msgstr "安全(_E)"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "安全 MIME (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "服务器配置"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "验证类型(_A):"
+
+#~ msgid "_Authentication type: "
+#~ msgstr "验证类型(_A):"
+
+#~ msgid "_Default signature:"
+#~ msgstr "默认签名(_D):"
+
+#~ msgid "_Full name:"
+#~ msgstr "全名(_F):"
+
+#~ msgid "_Identity"
+#~ msgstr "标识(_I)"
+
+#, fuzzy
+#~ msgid "_Junk"
+#~ msgstr "六月"
+
+#~ msgid "_Receiving Mail"
+#~ msgstr "接收邮件(_R)"
+
+#~ msgid "_Restore defaults"
+#~ msgstr "恢复默认值(_R)"
+
+#~ msgid "_Sending Mail"
+#~ msgstr "发送邮件(_S)"
+
+#~ msgid "Sending \"%s\""
+#~ msgstr "正在发送“%s”"
+
+#~ msgid "Failed on message %d of %d"
+#~ msgstr "在第 %d 个邮件失败,共 %d 个"
+
+#~ msgid "Search"
+#~ msgstr "搜索"
+
+#~ msgid "Digital Signature"
+#~ msgstr "数字签名"
+
+#~ msgid "Encryption"
+#~ msgstr "加密"
+
+#~ msgid "Quit Assistant"
+#~ msgstr "退出助手"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "下列连接正处于活跃状态:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "搜索联系人(_S)"
+
+#~ msgid "Go to _Date"
+#~ msgstr "转到日期(_D)"
+
+#~ msgid "Go to today"
+#~ msgstr "转到今天"
+
+#~ msgid "With _Category"
+#~ msgstr "按类别(_C)"
+
#~ msgid "Addressbook Sources"
#~ msgstr "地址簿源"
@@ -18255,9 +18749,6 @@ msgstr "%s (%d%% 完成)"
#~ msgid "Scanning directory"
#~ msgstr "正在扫描目录"
-#~ msgid " "
-#~ msgstr " "
-
#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
#~ msgstr "不检查 IMAP 账户收到的邮件(_N)"