aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po4658
1 files changed, 2716 insertions, 1942 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4ed4818e18..9a5e28ff63 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
"PO-Revision-Date: 2002-02-04 22:51+0800\n"
"Last-Translator: Wang Li <charlesw1234@163.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -54,7 +54,7 @@ msgstr ""
# addressbook/backend/ebook/e-card-simple.c:61
# addressbook/backend/ebook/e-card-simple.c:61
# addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
#: my-evolution/e-summary-table.c:59
msgid "Name"
msgstr "名称"
@@ -750,15 +750,15 @@ msgstr "无法初始化 Bonobo"
# addressbook/backend/pas/pas-backend-ldap.c:2269
# addressbook/backend/pas/pas-backend-file.c:259
# addressbook/backend/pas/pas-backend-ldap.c:2272
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
msgid "Searching..."
msgstr "搜索..."
# addressbook/backend/pas/pas-backend-file.c:261
# addressbook/backend/pas/pas-backend-file.c:261
# addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
msgid "Loading..."
msgstr "装入..."
@@ -766,42 +766,42 @@ msgstr "装入..."
# addressbook/backend/pas/pas-backend-file.c:270
# addressbook/backend/pas/pas-backend-file.c:270
#. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
msgid "Error in search expression."
msgstr "搜索表达式错误。"
# addressbook/backend/pas/pas-backend-ldap.c:912
# addressbook/backend/pas/pas-backend-ldap.c:912
# addressbook/backend/pas/pas-backend-ldap.c:915
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
msgid "Adding card to LDAP server..."
msgstr "正在将卡片添加到 LDAP 服务器..."
# addressbook/backend/pas/pas-backend-ldap.c:1013
# addressbook/backend/pas/pas-backend-ldap.c:1013
# addressbook/backend/pas/pas-backend-ldap.c:1016
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
msgid "Removing card from LDAP server..."
msgstr "正在从 LDAP 服务器删除卡片..."
# addressbook/backend/pas/pas-backend-ldap.c:1123
# addressbook/backend/pas/pas-backend-ldap.c:1123
# addressbook/backend/pas/pas-backend-ldap.c:1126
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
msgid "Modifying card from LDAP server..."
msgstr "正在修改 LDAP 服务器上的卡片..."
# addressbook/backend/pas/pas-backend-ldap.c:2219
# addressbook/backend/pas/pas-backend-ldap.c:2219
# addressbook/backend/pas/pas-backend-ldap.c:2222
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
msgid "Restarting search."
msgstr "开始搜索,"
# addressbook/backend/pas/pas-backend-ldap.c:2214
# addressbook/backend/pas/pas-backend-ldap.c:2214
# addressbook/backend/pas/pas-backend-ldap.c:2217
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
msgid "Receiving LDAP search results..."
msgstr "正在接收 LDAP 的搜索结果..."
@@ -811,7 +811,7 @@ msgstr "正在接收 LDAP 的搜索结果..."
# addressbook/gui/widgets/e-addressbook-view.c:1278
# addressbook/gui/widgets/e-addressbook-util.c:95
# addressbook/gui/widgets/e-addressbook-view.c:1389
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
#, fuzzy
msgid "Error performing search"
msgstr "删除卡片错误"
@@ -819,7 +819,7 @@ msgstr "删除卡片错误"
# camel/camel-url.c:288
# camel/camel-url.c:288
# camel/camel-url.c:288
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
#, fuzzy
msgid "Could not parse query string"
msgstr "无法解析 URL “%s”"
@@ -987,11 +987,11 @@ msgstr ""
# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
# shell/e-shortcuts.c:1061
#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
#: calendar/gui/dialogs/comp-editor-util.c:310
#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
msgid "Contacts"
msgstr "联系人"
@@ -1016,39 +1016,54 @@ msgstr "LDAP 服务器"
msgid "LDAP server containing contact information"
msgstr "含有联系人信息的 LDAP 服务器"
-# addressbook/gui/component/addressbook-component.c:527
-# addressbook/gui/component/addressbook-component.c:527
-# addressbook/gui/component/addressbook-component.c:530
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "New Contact List"
-msgstr "新建联系人列表"
-
-# ui/evolution-addressbook.xml.h:32
-# ui/evolution-addressbook.xml.h:32
-# ui/evolution-addressbook.xml.h:33
-#: addressbook/gui/component/addressbook-component.c:578
-#, fuzzy
-msgid "Contact _List"
-msgstr "联系人列表(_C)"
-
# addressbook/gui/component/addressbook-component.c:526
# ui/evolution-addressbook.xml.h:11
# addressbook/gui/component/addressbook-component.c:526
# ui/evolution-addressbook.xml.h:11
# addressbook/gui/component/addressbook-component.c:527
# ui/evolution-addressbook.xml.h:11
-#: addressbook/gui/component/addressbook-component.c:581
+#: addressbook/gui/component/addressbook-component.c:564
msgid "New Contact"
msgstr "新建联系人"
# ui/evolution-addressbook.xml.h:31
# ui/evolution-addressbook.xml.h:31
# ui/evolution-addressbook.xml.h:32
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
+#: addressbook/gui/component/addressbook-component.c:564
msgid "_Contact"
msgstr "联系人(_C)"
+# ui/evolution-addressbook.xml.h:4
+# ui/evolution-addressbook.xml.h:4
+# ui/evolution-addressbook.xml.h:4
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "创建新的联系人"
+
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "New Contact List"
+msgstr "新建联系人列表"
+
+# ui/evolution-addressbook.xml.h:32
+# ui/evolution-addressbook.xml.h:32
+# ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/addressbook-component.c:568
+#, fuzzy
+msgid "Contact _List"
+msgstr "联系人列表(_C)"
+
+# ui/evolution-addressbook.xml.h:5
+# ui/evolution-addressbook.xml.h:5
+# ui/evolution-addressbook.xml.h:5
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "创建新的联系人列表"
+
# addressbook/backend/pas/pas-backend-ldap.c:493
# addressbook/backend/pas/pas-backend-ldap.c:493
# addressbook/backend/pas/pas-backend-ldap.c:496
@@ -1076,14 +1091,14 @@ msgstr ""
msgid "The server responded with no supported search bases"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
msgid "This server does not support LDAPv3 schema information"
msgstr ""
# mail/mail-callbacks.c:2250
# mail/mail-callbacks.c:2369
# mail/mail-callbacks.c:2405
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
#, fuzzy
msgid "Error retrieving schema information"
msgstr ""
@@ -1093,7 +1108,7 @@ msgstr ""
# camel/providers/imap/camel-imap-command.c:608
# camel/providers/imap/camel-imap-command.c:608
# camel/providers/imap/camel-imap-command.c:610
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
#, fuzzy
msgid "Server did not respond with valid schema information"
msgstr "IMAP 服务器应答不含有 %s 信息"
@@ -1101,7 +1116,7 @@ msgstr "IMAP 服务器应答不含有 %s 信息"
# mail/mail-config.glade.h:3
# mail/mail-config.glade.h:3
# mail/mail-config.glade.h:3
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
#, fuzzy
msgid "LDAP was not enabled in this build of Evolution"
msgstr "(在该版本的 evolution 中不支持SSL)"
@@ -1113,7 +1128,7 @@ msgstr "(在该版本的 evolution 中不支持SSL)"
# addressbook/gui/component/addressbook-factory.c:70
# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
msgid "Could not initialize gnome-vfs"
msgstr "无法创始化 gnome-vfs"
@@ -1127,14 +1142,14 @@ msgstr "其他联系人"
# addressbook/gui/component/addressbook.c:485
# addressbook/gui/component/addressbook.c:485
# addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
msgid "Unable to open addressbook"
msgstr "无法打开地址簿"
# addressbook/gui/component/addressbook.c:494
# addressbook/gui/component/addressbook.c:494
# addressbook/gui/component/addressbook.c:508
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the LDAP server\n"
@@ -1147,7 +1162,7 @@ msgstr ""
# addressbook/gui/component/addressbook.c:499
# addressbook/gui/component/addressbook.c:499
# addressbook/gui/component/addressbook.c:513
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
msgid ""
"This version of Evolution does not have LDAP support\n"
"compiled in to it. If you want to use LDAP in Evolution\n"
@@ -1162,7 +1177,7 @@ msgstr ""
# addressbook/gui/component/addressbook.c:507
# addressbook/gui/component/addressbook.c:507
# addressbook/gui/component/addressbook.c:521
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
msgid ""
"We were unable to open this addressbook. Please check that the\n"
"path exists and that you have permission to access it."
@@ -1174,13 +1189,13 @@ msgstr ""
# addressbook/gui/component/addressbook.c:640
# addressbook/gui/component/addressbook.c:655
# addressbook/gui/component/addressbook.c:658
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "为 %s (用户 %s)输入口令"
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
#, fuzzy
msgid "Name begins with"
msgstr "以之结束"
@@ -1197,7 +1212,7 @@ msgstr "以之结束"
# addressbook/gui/component/e-address-popup.c:484
# addressbook/gui/contact-editor/e-contact-editor.c:1687
# addressbook/gui/widgets/e-addressbook-view.c:986
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
#, fuzzy
msgid "Email is"
msgstr "电子邮件 2"
@@ -1208,7 +1223,7 @@ msgstr "电子邮件 2"
# calendar/gui/cal-search-bar.c:59
# addressbook/gui/component/addressbook.c:839
# calendar/gui/cal-search-bar.c:59
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
#: calendar/gui/cal-search-bar.c:53
msgid "Category is"
msgstr "类别为"
@@ -1220,7 +1235,7 @@ msgstr "类别为"
# addressbook/gui/component/addressbook.c:836
# calendar/gui/cal-search-bar.c:55
#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
#: calendar/gui/cal-search-bar.c:49
msgid "Any field contains"
msgstr "任何域含有"
@@ -1230,7 +1245,7 @@ msgstr "任何域含有"
# widgets/misc/e-filter-bar.h:104
# addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
# widgets/misc/e-filter-bar.h:104
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
msgid "Advanced..."
msgstr "高级..."
@@ -1241,7 +1256,7 @@ msgstr "高级..."
# addressbook/gui/component/addressbook.c:1067
# calendar/gui/cal-search-bar.c:412
#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
#: calendar/gui/cal-search-bar.c:382
msgid "Any Category"
msgstr "任何类别"
@@ -1249,7 +1264,7 @@ msgstr "任何类别"
# addressbook/gui/component/addressbook.c:1107
# addressbook/gui/component/addressbook.c:1107
# addressbook/gui/component/addressbook.c:1150
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
msgid "The URI that the Folder Browser will display"
msgstr "文件夹浏览器将显示的 URI"
@@ -1446,7 +1461,7 @@ msgstr "地址簿资源"
# addressbook/gui/contact-editor/fulladdr.glade.h:3
# addressbook/gui/contact-editor/fulladdr.glade.h:3
# my-evolution/Locations.h:43
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
#: mail/mail-config.glade.h:15
#, fuzzy
msgid "Always"
@@ -1581,8 +1596,8 @@ msgstr "边界"
# mail/mail-config.glade.h:118
# mail/mail-config.glade.h:118
# mail/mail-config.glade.h:127
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
#, fuzzy
msgid "Never"
msgstr "每(_E)"
@@ -1654,8 +1669,8 @@ msgstr "搜索范围(_C):"
# calendar/gui/e-week-view.c:1188
#. No time range is set, so don't start a query
#: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
msgid "Searching"
msgstr "搜索"
@@ -1872,7 +1887,7 @@ msgid "Using email address"
msgstr "电子邮件地址"
#: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
msgid "Whenever Possible"
msgstr ""
@@ -1894,8 +1909,8 @@ msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:104
#: addressbook/gui/contact-editor/contact-editor.glade.h:30
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
msgid "_Add"
msgstr "添加(_A)"
@@ -1987,12 +2002,12 @@ msgstr "下载上限(_D)"
# ui/evolution-message-composer.xml.h:47
# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
# ui/evolution-tasks.xml.h:19
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
#: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
#: ui/evolution-tasks.xml.h:17
msgid "_Edit"
msgstr "编辑(_E)"
@@ -2168,10 +2183,10 @@ msgstr "地址簿名称选择界面车间"
# composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
#. Fixme: Ditto
#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
msgid "Remove"
msgstr "删除"
@@ -2218,55 +2233,21 @@ msgstr "(%d 未显示)"
msgid "Unnamed Contact"
msgstr "未命名的联系人"
+# addressbook/gui/component/select-names/e-select-names.c:608
+# addressbook/gui/component/select-names/e-select-names.c:608
+# addressbook/gui/component/select-names/e-select-names.c:671
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "从地址簿中选择联系人"
+
# default_user/searches.xml.h:6
# default_user/searches.xml.h:6
# default_user/searches.xml.h:6
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:544
#, fuzzy
msgid "Find contact in"
msgstr "发件人含有"
-# addressbook/gui/component/select-names/e-select-names.c:524
-# addressbook/gui/component/select-names/e-select-names.c:524
-# addressbook/gui/component/select-names/e-select-names.c:581
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred. Thank you."
-msgstr ""
-"Evolution 无法获取本地地址簿空间。\n"
-"这可能是由 evolution 的地址簿组件崩溃导致的。\n"
-"为了帮助我们更好地理解并最终解决该问题,\n"
-"请把对产生该错误环境的详细情况作为电子邮件发送给\n"
-" Jon Trowbridge <trow@ximian.com>。\n"
-"谢谢。"
-
-# addressbook/gui/component/select-names/e-select-names.c:532
-# addressbook/gui/component/select-names/e-select-names.c:532
-# addressbook/gui/component/select-names/e-select-names.c:589
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolution 无法获得地址簿本地存储。\n"
-"在普通环境下,这不会发生。\n"
-"您可能需要退出并重新启动 Evolution 以便\n"
-"改正这一问题。"
-
-# addressbook/gui/component/select-names/e-select-names.c:608
-# addressbook/gui/component/select-names/e-select-names.c:608
-# addressbook/gui/component/select-names/e-select-names.c:671
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "从地址簿中选择联系人"
-
# addressbook/gui/component/select-names/select-names.glade.h:4
# addressbook/gui/component/select-names/select-names.glade.h:4
# addressbook/gui/component/select-names/select-names.glade.h:3
@@ -2305,25 +2286,17 @@ msgid ""
"select one from the list below:"
msgstr ""
-# ui/evolution.xml.h:42
-# ui/evolution.xml.h:42
-# ui/evolution.xml.h:42
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "移动(_M)..."
-
# addressbook/gui/component/select-names/select-names.glade.h:6
# addressbook/gui/component/select-names/select-names.glade.h:6
# addressbook/gui/component/select-names/select-names.glade.h:5
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:6
msgid "_Category:"
msgstr "类别(_C):"
# addressbook/gui/component/select-names/select-names.glade.h:7
# addressbook/gui/component/select-names/select-names.glade.h:7
# addressbook/gui/component/select-names/select-names.glade.h:6
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
msgid "_Folder:"
msgstr "文件夹(_F):"
@@ -2522,11 +2495,12 @@ msgstr "愿意接收 HTML 邮件(_H)"
#: addressbook/gui/contact-editor/contact-editor.glade.h:31
#: calendar/gui/dialogs/alarm-page.glade.h:9
#: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
msgid "_Delete"
msgstr "删除(_D)"
@@ -4703,7 +4677,7 @@ msgstr "在往该列表发送邮件时隐藏地址(_H)"
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
msgid "_Remove"
msgstr "删除(_R)"
@@ -4811,7 +4785,7 @@ msgstr ""
# addressbook/gui/search/e-addressbook-search-dialog.c:145
# widgets/misc/e-filter-bar.c:238
#: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
msgid "Advanced Search"
msgstr "高级搜索"
@@ -4866,7 +4840,7 @@ msgstr "启动 %s 错误"
# addressbook/gui/widgets/e-addressbook-util.c:85
# addressbook/gui/widgets/e-minicard.c:475
#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
#: addressbook/gui/widgets/e-minicard.c:475
msgid "Error modifying card"
msgstr "修改卡片错误"
@@ -4878,7 +4852,7 @@ msgstr "修改卡片错误"
# addressbook/gui/widgets/e-addressbook-util.c:33
# shell/evolution-shell-component.c:1020
#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
msgid "Success"
msgstr "成功"
@@ -4897,8 +4871,8 @@ msgstr "成功"
#: addressbook/gui/widgets/e-addressbook-util.c:36
#: camel/providers/imap/camel-imap-command.c:305
#: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
msgid "Unknown error"
msgstr "未知的错误"
@@ -4915,8 +4889,8 @@ msgstr "仓库离线"
# shell/evolution-shell-component.c:1035
# addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
# shell/evolution-shell-component.c:1048
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
msgid "Permission denied"
msgstr "没有权限"
@@ -4957,7 +4931,7 @@ msgstr "不支持的协议"
# calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
# camel/camel-service.c:610 camel/camel-service.c:646
#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
#: calendar/gui/dialogs/task-details-page.glade.h:3
#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
#: camel/camel-service.c:738 camel/camel-service.c:778
@@ -4985,10 +4959,18 @@ msgstr "必须认证"
msgid "TLS not Available"
msgstr ""
+# shell/e-shell-importer.c:397
+# shell/e-shell-importer.c:397
+# shell/e-shell-importer.c:409
+#: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "文件 %s 不存在"
+
# addressbook/gui/widgets/e-addressbook-util.c:41
# addressbook/gui/widgets/e-addressbook-util.c:41
# addressbook/gui/widgets/e-addressbook-util.c:41
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
msgid "Other error"
msgstr "其它错误"
@@ -4998,7 +4980,7 @@ msgstr "其它错误"
# calendar/gui/dialogs/save-comp.c:50
# addressbook/gui/widgets/e-addressbook-util.c:57
# calendar/gui/dialogs/save-comp.c:50
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
#: calendar/gui/dialogs/save-comp.c:50
msgid "Do you want to save changes?"
msgstr "您希望保存修改吗?"
@@ -5006,29 +4988,29 @@ msgstr "您希望保存修改吗?"
# addressbook/gui/widgets/e-addressbook-util.c:76
# addressbook/gui/widgets/e-addressbook-util.c:76
# addressbook/gui/widgets/e-addressbook-util.c:76
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
msgid "Error adding list"
msgstr "添加列表错误"
# addressbook/gui/widgets/e-addressbook-util.c:76
# addressbook/gui/widgets/e-addressbook-util.c:76
# addressbook/gui/widgets/e-addressbook-util.c:76
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
msgid "Error adding card"
msgstr "添加卡片错误"
# addressbook/gui/widgets/e-addressbook-util.c:85
# addressbook/gui/widgets/e-addressbook-util.c:85
# addressbook/gui/widgets/e-addressbook-util.c:85
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
msgid "Error modifying list"
msgstr "修改列表错误"
# addressbook/gui/widgets/e-addressbook-util.c:95
# addressbook/gui/widgets/e-addressbook-util.c:95
# addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
msgid "Error removing list"
msgstr "删除列表错误"
@@ -5038,8 +5020,8 @@ msgstr "删除列表错误"
# addressbook/gui/widgets/e-addressbook-view.c:1278
# addressbook/gui/widgets/e-addressbook-util.c:95
# addressbook/gui/widgets/e-addressbook-view.c:1389
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
#: addressbook/gui/widgets/e-addressbook-view.c:1624
msgid "Error removing card"
msgstr "删除卡片错误"
@@ -5047,19 +5029,19 @@ msgstr "删除卡片错误"
# mail/mail-config.glade.h:28
# mail/mail-config.glade.h:28
# addressbook/gui/widgets/e-addressbook-util.c:202
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
msgid "Display Cards?"
msgstr "显示卡片?"
# mail/mail-config.glade.h:28
# mail/mail-config.glade.h:28
# addressbook/gui/widgets/e-addressbook-util.c:203
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
msgid "Display Cards"
msgstr "显示卡片"
# addressbook/gui/widgets/e-addressbook-util.c:207
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
#, c-format
msgid ""
"You have requested that %d cards be cards. This will cause %d new windows to "
@@ -5072,7 +5054,7 @@ msgstr ""
# mail/mail-callbacks.c:1281 mail/message-browser.c:130
# mail/mail-callbacks.c:1376 mail/message-browser.c:130
# mail/mail-callbacks.c:1411 mail/message-browser.c:130
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
#, fuzzy
msgid "Move card to"
msgstr "将消息移动到"
@@ -5080,7 +5062,7 @@ msgstr "将消息移动到"
# ui/evolution-tasks.xml.h:4
# ui/evolution-tasks.xml.h:4
# ui/evolution-tasks.xml.h:4
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
#, fuzzy
msgid "Copy card to"
msgstr "复制选中的任务"
@@ -5088,7 +5070,7 @@ msgstr "复制选中的任务"
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
#, fuzzy
msgid "Move cards to"
msgstr "没有卡片"
@@ -5096,7 +5078,7 @@ msgstr "没有卡片"
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
#, fuzzy
msgid "Copy cards to"
msgstr "没有卡片"
@@ -5235,7 +5217,7 @@ msgstr "地址簿"
#: addressbook/gui/widgets/e-addressbook-view.c:701
#: addressbook/gui/widgets/e-addressbook-view.c:890
#: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr "保存为 VCard"
@@ -5308,7 +5290,7 @@ msgstr "Pilot 设置(_P)..."
# addressbook/gui/widgets/e-addressbook-view.c:835
# ui/evolution-addressbook.xml.h:10
#: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "转发联系人"
@@ -5338,8 +5320,8 @@ msgstr "给联系人发邮件"
# ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
# ui/my-evolution.xml.h:2
#: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
#: ui/my-evolution.xml.h:1
msgid "Print"
msgstr "打印"
@@ -5376,7 +5358,7 @@ msgstr "移动到文件夹(_M)..."
# addressbook/gui/widgets/e-addressbook-view.c:841
# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
#: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "剪切"
@@ -5400,7 +5382,7 @@ msgstr "复制"
# addressbook/gui/widgets/e-addressbook-view.c:843
# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
#: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
msgid "Paste"
msgstr "粘贴"
@@ -5421,9 +5403,9 @@ msgstr "粘贴"
# mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
# ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
# ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
#: ui/evolution-contact-editor.xml.h:2
#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
msgid "Delete"
@@ -5433,7 +5415,7 @@ msgstr "删除"
# widgets/menus/gal-view-menus.c:195
# widgets/menus/gal-view-menus.c:195
#: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
#, fuzzy
msgid "Current View"
msgstr "当前视图(_C)"
@@ -5710,7 +5692,7 @@ msgstr "列数:"
# addressbook/printing/e-contact-print.glade.h:23
# addressbook/printing/e-contact-print.glade.h:23
# addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
msgid "Options"
msgstr "选项"
@@ -5870,7 +5852,7 @@ msgstr "无标题约会"
# calendar/gui/e-calendar-table.c:406 mail/message-list.c:679
#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
msgid "High"
msgstr "高"
@@ -5887,9 +5869,9 @@ msgstr "高"
# calendar/gui/dialogs/task-details-page.glade.h:9
# calendar/gui/e-calendar-table.c:407 mail/message-list.c:678
#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
msgid "Normal"
msgstr "中"
@@ -5904,7 +5886,7 @@ msgstr "中"
# calendar/gui/e-calendar-table.c:408 mail/message-list.c:677
#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
msgid "Low"
msgstr "低"
@@ -5919,7 +5901,7 @@ msgstr "低"
# calendar/gui/e-calendar-table.c:409
#. An empty string is the same as 'None'.
#: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
#: calendar/gui/e-calendar-table.c:421
msgid "Undefined"
msgstr "未定义"
@@ -6133,14 +6115,14 @@ msgstr "编辑约会(_E)"
# calendar/gui/alarm-notify/alarm-queue.c:670
# calendar/gui/alarm-notify/alarm-queue.c:670
# calendar/gui/alarm-notify/alarm-queue.c:675
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
msgid "No description available."
msgstr "没有描述。"
# calendar/gui/alarm-notify/alarm-queue.c:730
# calendar/gui/alarm-notify/alarm-queue.c:730
# calendar/gui/alarm-notify/alarm-queue.c:735
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -6157,8 +6139,8 @@ msgstr ""
# calendar/gui/alarm-notify/alarm-queue.c:753
# calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2283
# widgets/misc/e-messagebox.c:159
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
#: widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr "警告"
@@ -6166,7 +6148,7 @@ msgstr "警告"
# calendar/gui/alarm-notify/alarm-queue.c:781
# calendar/gui/alarm-notify/alarm-queue.c:781
# calendar/gui/alarm-notify/alarm-queue.c:758
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -6185,7 +6167,7 @@ msgstr ""
# mail/mail-callbacks.c:2142
# mail/mail-callbacks.c:2261
# calendar/gui/alarm-notify/alarm-queue.c:772
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
msgid "Do not ask me about this program again."
msgstr "不要再次询问该问题。"
@@ -6234,7 +6216,7 @@ msgstr "注释含有"
# calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1072
# calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1074
# calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
msgid "Unmatched"
msgstr "未匹配"
@@ -6254,7 +6236,7 @@ msgstr "%Y %B %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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
msgid "%a %d %b"
msgstr "%b %d %a"
@@ -6297,7 +6279,7 @@ msgstr "%B %d"
# calendar/gui/calendar-commands.c:805
# calendar/gui/calendar-commands.c:820
# calendar/gui/calendar-commands.c:820
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
@@ -6308,7 +6290,7 @@ msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
# calendar/gui/e-calendar-table.c:384
# calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
# calendar/gui/e-calendar-table.c:385
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
#: calendar/gui/e-calendar-table.c:397
msgid "Private"
msgstr "保密"
@@ -6319,7 +6301,7 @@ msgstr "保密"
# calendar/gui/e-calendar-table.c:385
# calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
# calendar/gui/e-calendar-table.c:386
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
#: calendar/gui/e-calendar-table.c:398
msgid "Confidential"
msgstr "机密"
@@ -6365,7 +6347,7 @@ msgstr "西"
# calendar/gui/e-calendar-table.c:457
# calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
# calendar/gui/e-calendar-table.c:458
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
#: calendar/gui/e-calendar-table.c:470
msgid "Free"
msgstr "放假"
@@ -6381,7 +6363,7 @@ msgstr "放假"
# shell/evolution-shell-component.c:1042
#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
#: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
msgid "Busy"
msgstr "繁忙"
@@ -6394,8 +6376,8 @@ msgstr "繁忙"
# calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
# calendar/gui/dialogs/task-details-page.glade.h:10
# calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2246
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
msgid "Not Started"
msgstr "尚未开始"
@@ -6409,7 +6391,7 @@ msgstr "尚未开始"
# calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
# calendar/gui/dialogs/task-details-page.glade.h:7
# calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
#: calendar/gui/dialogs/task-details-page.glade.h:7
#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
msgid "In Progress"
@@ -6427,7 +6409,7 @@ msgstr "正在进行中"
# calendar/gui/dialogs/task-details-page.glade.h:4
# calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
#: calendar/gui/dialogs/task-details-page.glade.h:4
#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
@@ -6437,7 +6419,7 @@ msgstr "已完成"
# calendar/gui/calendar-model.c:1052
# calendar/gui/calendar-model.c:1052
# calendar/gui/calendar-model.c:1052
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -6469,13 +6451,12 @@ msgstr ""
# widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
# widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
#: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
msgid "None"
@@ -6484,14 +6465,14 @@ msgstr "无"
# calendar/gui/calendar-model.c:1713
# calendar/gui/calendar-model.c:1713
# calendar/gui/calendar-model.c:1713
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
msgid "Recurring"
msgstr "正在重复"
# calendar/gui/calendar-model.c:1715
# calendar/gui/calendar-model.c:1715
# calendar/gui/calendar-model.c:1715
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
msgid "Assigned"
msgstr "已分派"
@@ -6504,9 +6485,9 @@ msgstr "已分派"
# calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:301
# calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
# calendar/gui/e-meeting-model.c:810
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
msgid "Yes"
msgstr "是"
@@ -6516,36 +6497,36 @@ msgstr "是"
# calendar/gui/e-meeting-model.c:811
# calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
# calendar/gui/e-meeting-model.c:811
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
msgid "No"
msgstr "否"
# calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
# calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
# calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
msgid "Day View"
msgstr "日视图"
# calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
# calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
# calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
msgid "Work Week View"
msgstr "周工作视图"
# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
msgid "Week View"
msgstr "周视图"
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
msgid "Month View"
msgstr "月视图"
@@ -6556,8 +6537,8 @@ msgstr "月视图"
# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
msgid "Calendar"
msgstr "日历"
@@ -6580,12 +6561,12 @@ msgstr "文件夹含有约会和事件"
# my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
# views/tasks/galview.xml.h:1
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
msgid "Tasks"
msgstr "任务"
@@ -6596,10 +6577,33 @@ msgstr "任务"
msgid "Folder containing to-do items"
msgstr "文件夹含有 to-do 项"
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "新建约会"
+
+# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "约会"
+
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "创建新约会"
+
# my-evolution/my-evolution.glade.h:10
# my-evolution/my-evolution.glade.h:10
# my-evolution/my-evolution.glade.h:10
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
#, fuzzy
msgid "New meeting"
msgstr "新闻来源设置"
@@ -6613,15 +6617,26 @@ msgstr "新闻来源设置"
# calendar/gui/dialogs/event-editor.c:207
# calendar/gui/dialogs/event-editor.c:263
# calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
#, fuzzy
msgid "_Meeting"
msgstr "会见"
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:6
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "创建新任务"
+
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
#, fuzzy
msgid "New task"
msgstr "新建任务"
@@ -6629,14 +6644,24 @@ msgstr "新建任务"
# ui/evolution-tasks.xml.h:18
# ui/evolution-tasks.xml.h:18
# ui/evolution-tasks.xml.h:22
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
msgid "_Task"
msgstr "任务(_T)"
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:6
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "创建新任务"
+
# ui/evolution-calendar.xml.h:21
# ui/evolution-calendar.xml.h:21
# ui/evolution-calendar.xml.h:21
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
#, fuzzy
msgid "New All Day Appointment"
msgstr "新建约会"
@@ -6644,26 +6669,18 @@ msgstr "新建约会"
# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
#, fuzzy
msgid "All _Day Appointment"
msgstr "新建约会(_A)"
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "New appointment"
-msgstr "新建约会"
-
-# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-#: calendar/gui/component-factory.c:716
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:724
#, fuzzy
-msgid "_Appointment"
-msgstr "约会"
+msgid "Create a new all-day appointment"
+msgstr "创建新约会"
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1499
@@ -6779,7 +6796,8 @@ msgstr "使用这些参数:"
# calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
# calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
# calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
msgid "days"
msgstr "天数"
@@ -6793,7 +6811,8 @@ msgstr "每个额外时间"
# calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
# calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
# calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
msgid "hours"
msgstr "小时"
@@ -6801,7 +6820,8 @@ msgstr "小时"
# calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
# calendar/gui/dialogs/alarm-options.glade.h:11
# executive-summary/test-service/rdf-summary.c:806
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
msgid "minutes"
msgstr "分钟"
@@ -7031,7 +7051,7 @@ msgstr "提示器"
# calendar/gui/e-itip-control.c:748 calendar/gui/e-itip-control.glade.h:11
#: calendar/gui/dialogs/alarm-page.glade.h:7
#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "概要:"
@@ -7084,7 +7104,7 @@ msgstr "小时"
# calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
# calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
# calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:129
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
msgid "minute(s)"
msgstr "分钟"
@@ -7397,7 +7417,7 @@ msgstr "星期五(_F)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
msgid "_General"
msgstr "常规(_G)"
@@ -7469,31 +7489,42 @@ msgstr "星期三(_W)"
msgid "before every appointment"
msgstr "在约会开始以前"
-# calendar/gui/dialogs/cancel-comp.c:51
-# calendar/gui/dialogs/cancel-comp.c:51
-# calendar/gui/dialogs/cancel-comp.c:51
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "会见状态已经改变。发送更新后的版本?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
# calendar/gui/dialogs/cancel-comp.c:57
# calendar/gui/dialogs/cancel-comp.c:57
# calendar/gui/dialogs/cancel-comp.c:57
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
msgid "Are you sure you want to cancel and delete this meeting?"
msgstr "您确信您希望取消并删除该会见?"
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
# calendar/gui/dialogs/cancel-comp.c:62
# calendar/gui/dialogs/cancel-comp.c:62
# calendar/gui/dialogs/cancel-comp.c:62
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:68
msgid "Are you sure you want to cancel and delete this task?"
msgstr "您确信您希望取消并删除该任务?"
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
# calendar/gui/dialogs/cancel-comp.c:67
# calendar/gui/dialogs/cancel-comp.c:67
# calendar/gui/dialogs/cancel-comp.c:67
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:77
msgid "Are you sure you want to cancel and delete this journal entry?"
msgstr "您确信您希望取消并删除该日志条目?"
@@ -7609,23 +7640,23 @@ msgstr "预定 "
# calendar/gui/dialogs/comp-editor.c:303
# calendar/gui/dialogs/comp-editor.c:303
# calendar/gui/dialogs/comp-editor.c:321
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
#, fuzzy
msgid "Could not update invalid object"
msgstr "无法更新对象!"
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
msgid "Object not found, not updated"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
msgid "You don't have permissions to update this object"
msgstr ""
# calendar/gui/dialogs/comp-editor.c:303
# calendar/gui/dialogs/comp-editor.c:303
# calendar/gui/dialogs/comp-editor.c:321
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
#, fuzzy
msgid "Could not update object"
msgstr "无法更新对象!"
@@ -7633,14 +7664,14 @@ msgstr "无法更新对象!"
# calendar/gui/dialogs/comp-editor.c:678
# calendar/gui/dialogs/comp-editor.c:678
# calendar/gui/dialogs/comp-editor.c:692
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
msgid "Edit Appointment"
msgstr "编辑约会"
# calendar/gui/dialogs/comp-editor.c:683
# calendar/gui/dialogs/comp-editor.c:683
# calendar/gui/dialogs/comp-editor.c:697
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
@@ -7648,7 +7679,7 @@ msgstr "约会 - %s"
# calendar/gui/dialogs/comp-editor.c:686
# calendar/gui/dialogs/comp-editor.c:686
# calendar/gui/dialogs/comp-editor.c:700
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
@@ -7656,7 +7687,7 @@ msgstr "任务 - %s"
# calendar/gui/dialogs/comp-editor.c:689
# calendar/gui/dialogs/comp-editor.c:689
# calendar/gui/dialogs/comp-editor.c:703
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
#, c-format
msgid "Journal entry - %s"
msgstr "日志条目 - %s"
@@ -7664,22 +7695,22 @@ msgstr "日志条目 - %s"
# calendar/gui/dialogs/comp-editor.c:703
# calendar/gui/dialogs/comp-editor.c:703
# calendar/gui/dialogs/comp-editor.c:717
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
msgid "No summary"
msgstr "没有概要"
# composer/e-msg-composer.c:943
# composer/e-msg-composer.c:947
# composer/e-msg-composer.c:912
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
msgid "Save as..."
msgstr "另存为..."
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
msgid ""
"Changes made to this item may be discarded if an update arrives via email"
msgstr ""
@@ -7687,7 +7718,7 @@ msgstr ""
# calendar/gui/dialogs/comp-editor.c:1272
# calendar/gui/dialogs/comp-editor.c:1272
# calendar/gui/dialogs/comp-editor.c:1277
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
msgid "Unable to obtain current version!"
msgstr "无法获取当前版本!"
@@ -8081,7 +8112,7 @@ msgstr "成员"
# calendar/gui/e-itip-control.c:809
# calendar/gui/e-meeting-time-sel.etspec.h:8
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
@@ -8111,7 +8142,7 @@ msgstr "角色"
# mail/message-list.etspec.h:9
#: calendar/gui/dialogs/meeting-page.etspec.h:10
#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
#: mail/message-list.etspec.h:12
msgid "Status"
msgstr "状态"
@@ -8244,7 +8275,7 @@ msgstr "在"
msgid "first"
msgstr "霭"
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
msgid "second"
msgstr "秒"
@@ -8297,7 +8328,7 @@ msgstr "其它传真"
# calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
# calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
# calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
msgid "day"
msgstr "天"
@@ -8467,10 +8498,22 @@ msgstr "% 完成"
msgid "Date Completed:"
msgstr "完成日期:"
+# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
+# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
+# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
+# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
+# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
+# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "需要动作"
+
# calendar/gui/dialogs/task-details-page.glade.h:11
# calendar/gui/dialogs/task-details-page.glade.h:11
# calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:12
msgid "Progress"
msgstr "进度"
@@ -8480,22 +8523,22 @@ msgstr "进度"
# my-evolution/e-summary-preferences.c:964
# calendar/gui/dialogs/task-details-page.glade.h:12
# my-evolution/e-summary-preferences.c:966
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
msgid "URL:"
msgstr "URL:"
# calendar/gui/dialogs/task-details-page.glade.h:14
# calendar/gui/dialogs/task-details-page.glade.h:14
# calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
msgid "_Priority:"
msgstr "优先级(_P):"
# calendar/gui/dialogs/task-details-page.glade.h:15
# calendar/gui/dialogs/task-details-page.glade.h:15
# calendar/gui/dialogs/task-details-page.glade.h:15
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
msgid "_Status:"
msgstr "状态(_S):"
@@ -8533,7 +8576,7 @@ msgstr "分派"
# calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:757
# calendar/gui/e-itip-control.glade.h:6
# composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
#: calendar/gui/e-itip-control.glade.h:6
#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
msgid "Description:"
@@ -8647,8 +8690,8 @@ msgstr "100%"
# calendar/gui/e-week-view.c:1824
# calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
# calendar/gui/e-week-view.c:1828
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
msgid "Deleting selected objects"
msgstr "删除选中的对象"
@@ -8661,16 +8704,16 @@ msgstr "删除选中的对象"
# calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
# calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1455
# shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
msgid "_Open"
msgstr "打开(_O)"
# composer/e-msg-composer.c:943
# composer/e-msg-composer.c:947
# composer/e-msg-composer.c:912
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
#, fuzzy
msgid "_Save as..."
msgstr "另存为..."
@@ -8684,10 +8727,10 @@ msgstr "另存为..."
# ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:41
# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:105
# ui/my-evolution.xml.h:7
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
msgid "_Print..."
msgstr "打印(_P)..."
@@ -8701,8 +8744,8 @@ msgstr "打印(_P)..."
# calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
# calendar/gui/e-week-view.c:3441 ui/evolution-addressbook.xml.h:1
# ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "剪切(_U)"
@@ -8719,8 +8762,8 @@ msgstr "剪切(_U)"
# calendar/gui/e-week-view.c:3443 ui/evolution-addressbook.xml.h:34
# ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
# ui/evolution-tasks.xml.h:17
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
#: ui/evolution-tasks.xml.h:15
msgid "_Copy"
@@ -8741,9 +8784,9 @@ msgstr "复制(_C)"
# calendar/gui/e-week-view.c:3445 ui/evolution-addressbook.xml.h:38
# ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
# ui/evolution-tasks.xml.h:21
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
#: ui/evolution-tasks.xml.h:19
msgid "_Paste"
@@ -8752,7 +8795,7 @@ msgstr "粘贴(_P)"
# ui/evolution-task-editor.xml.h:1
# ui/evolution-task-editor.xml.h:1
# ui/evolution-task-editor.xml.h:1
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
#, fuzzy
msgid "_Assign Task"
msgstr "委派任务"
@@ -8760,7 +8803,7 @@ msgstr "委派任务"
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
#, fuzzy
msgid "_Forward as iCalendar"
msgstr "作为 iCalendar 转发(_C)"
@@ -8768,14 +8811,14 @@ msgstr "作为 iCalendar 转发(_C)"
# calendar/gui/e-calendar-table.c:954
# calendar/gui/e-calendar-table.c:954
# calendar/gui/e-calendar-table.c:973
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
# calendar/gui/e-calendar-table.c:959
# calendar/gui/e-calendar-table.c:959
# calendar/gui/e-calendar-table.c:978
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
#, fuzzy
msgid "_Mark Selected Tasks as Complete"
msgstr "把任务标记为完成(_M)"
@@ -8783,7 +8826,7 @@ msgstr "把任务标记为完成(_M)"
# calendar/gui/e-calendar-table.c:961
# calendar/gui/e-calendar-table.c:961
# calendar/gui/e-calendar-table.c:980
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
msgid "_Delete Selected Tasks"
msgstr "删除选定的任务(_D)"
@@ -8793,8 +8836,8 @@ msgstr "删除选定的任务(_D)"
# calendar/gui/e-week-view.c:3924
# calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
# calendar/gui/e-week-view.c:3928
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
msgid "Updating objects"
msgstr "更新对象"
@@ -8804,7 +8847,7 @@ msgstr "更新对象"
# calendar/gui/e-calendar-table.etspec.h:6
# calendar/gui/e-calendar-table.c:1247
# calendar/gui/e-calendar-table.etspec.h:6
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
#: calendar/gui/e-calendar-table.etspec.h:6
msgid "Click to add a task"
msgstr "点击以添加任务"
@@ -8822,8 +8865,8 @@ msgstr "提醒"
# camel/camel-filter-driver.c:886
# calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
# camel/camel-filter-driver.c:1026
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
msgid "Complete"
msgstr "完成"
@@ -8878,11 +8921,9 @@ msgstr "开始日期"
# calendar/gui/e-calendar-table.etspec.h:16
# my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
# shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
#: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
msgid "Summary"
msgstr "概要"
@@ -8954,7 +8995,7 @@ msgstr "%02i 分钟分割"
# calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
#. 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
msgid "%A %d %B"
msgstr "%B %d %A"
@@ -8967,7 +9008,7 @@ msgstr "%B %d %A"
# calendar/gui/e-week-view-main-item.c:347
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
#: calendar/gui/e-week-view-main-item.c:347
msgid "%d %b"
msgstr "%b %d"
@@ -8979,7 +9020,7 @@ msgstr "%b %d"
# calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:350
# calendar/gui/print.c:768
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
#: calendar/gui/print.c:791
msgid "am"
msgstr "上午"
@@ -8991,7 +9032,7 @@ msgstr "上午"
# calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
# calendar/gui/print.c:770
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
#: calendar/gui/print.c:793
msgid "pm"
msgstr "下午"
@@ -8999,14 +9040,14 @@ msgstr "下午"
# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
msgid "New _Appointment"
msgstr "新建约会(_A)"
# calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
# calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3410
# calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3414
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
@@ -9019,7 +9060,7 @@ msgstr "新建全天事件(_E)"
# calendar/gui/dialogs/event-editor.c:207
# calendar/gui/dialogs/event-editor.c:263
# calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
#, fuzzy
msgid "New Meeting"
msgstr "会见"
@@ -9027,14 +9068,14 @@ msgstr "会见"
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
msgid "New Task"
msgstr "新建任务"
# ui/evolution-comp-editor.xml.h:11
# ui/evolution-comp-editor.xml.h:11
# ui/evolution-comp-editor.xml.h:11
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
msgid "Print..."
msgstr "打印..."
@@ -9044,7 +9085,7 @@ msgstr "打印..."
# ui/evolution-calendar.xml.h:17
# calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
# ui/evolution-calendar.xml.h:17
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
#: ui/evolution-calendar.xml.h:10
msgid "Go to _Today"
msgstr "转到今天(_T)"
@@ -9052,14 +9093,14 @@ msgstr "转到今天(_T)"
# calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
# calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3422
# calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3426
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
msgid "_Go to Date..."
msgstr "转到日期(_G)..."
# ui/evolution-calendar.xml.h:42
# ui/evolution-calendar.xml.h:42
# ui/evolution-calendar.xml.h:42
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
#: ui/evolution-calendar.xml.h:31
msgid "_Publish Free/Busy Information"
msgstr "发布忙闲信息(_P)"
@@ -9067,8 +9108,7 @@ msgstr "发布忙闲信息(_P)"
# mail/mail-local.c:1416
# mail/mail-local.c:1416
# executive-summary/component/e-summary-url.c:80
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
#, fuzzy
msgid "_Configure..."
msgstr "配置 %s"
@@ -9076,7 +9116,7 @@ msgstr "配置 %s"
# mail/mail-local.c:1416
# mail/mail-local.c:1416
# executive-summary/component/e-summary-url.c:80
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
#, fuzzy
msgid "_Configure Pilot..."
msgstr "配置 %s"
@@ -9084,15 +9124,15 @@ msgstr "配置 %s"
# mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:105
# mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:105
# mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:107
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
msgid "_Save As..."
msgstr "另存为(_S)..."
# ui/evolution-event-editor.xml.h:7
# ui/evolution-event-editor.xml.h:7
# ui/evolution-event-editor.xml.h:7
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
#, fuzzy
msgid "_Schedule Meeting..."
msgstr "调度会议(_M)"
@@ -9100,7 +9140,7 @@ msgstr "调度会议(_M)"
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
#, fuzzy
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_C)"
@@ -9108,37 +9148,37 @@ msgstr "作为 iCalendar 转发(_C)"
# calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
# calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3455
# calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
msgid "Make this Occurrence _Movable"
msgstr "使该事件可移动(_M)"
# calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
# calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3457
# calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3461
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
msgid "Delete this _Occurrence"
msgstr "删除该时间(_O)"
# calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
# calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3459
# calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3463
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
msgid "Delete _All Occurrences"
msgstr "删除所有事件(_A)"
# shell/e-shell-view-menu.c:577
# shell/e-shell-view-menu.c:577
# shell/e-shell-view-menu.c:577
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr "GNOME Pilot 工具好像并未安装到系统中。"
# shell/e-shell-view-menu.c:585
# shell/e-shell-view-menu.c:585
# shell/e-shell-view-menu.c:585
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
#, c-format
msgid "Error executing %s."
msgstr "执行 %s 错误。"
@@ -9209,7 +9249,7 @@ msgstr "任务到期时间:<b>"
# calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
# calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
# calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
msgid "iCalendar Information"
msgstr "iCalendar 信息"
@@ -9224,7 +9264,7 @@ msgstr "iCalendar 错误"
# calendar/gui/e-itip-control.c:706 calendar/gui/e-itip-control.c:722
# calendar/gui/e-itip-control.c:706 calendar/gui/e-itip-control.c:722
# calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
msgid "An unknown person"
msgstr "未知的人"
@@ -9232,7 +9272,7 @@ msgstr "未知的人"
# calendar/gui/e-itip-control.c:729
# calendar/gui/e-itip-control.c:732
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
@@ -9241,14 +9281,22 @@ msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作
# calendar/gui/e-itip-control.c:745
# calendar/gui/e-itip-control.c:745
# calendar/gui/e-itip-control.c:748
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
msgid "<i>None</i>"
msgstr "<i>无</i>"
+# calendar/gui/dialogs/event-page.glade.h:8
+# calendar/gui/dialogs/event-page.glade.h:8
+# calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "地理位置(_O):"
+
# calendar/gui/dialogs/task-details-page.glade.h:15
# calendar/gui/dialogs/task-details-page.glade.h:15
# calendar/gui/dialogs/task-details-page.glade.h:15
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:910
msgid "Status:"
msgstr "状态:"
@@ -9258,16 +9306,16 @@ msgstr "状态:"
# calendar/gui/e-meeting-model.c:824
# calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
# calendar/gui/e-meeting-model.c:824
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
msgid "Accepted"
msgstr "接受"
# calendar/gui/e-itip-control.c:804
# calendar/gui/e-itip-control.c:804
# calendar/gui/e-itip-control.c:807
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
msgid "Tentatively Accepted"
msgstr "暂时接受"
@@ -9277,9 +9325,9 @@ msgstr "暂时接受"
# calendar/gui/e-meeting-model.c:825
# calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
# calendar/gui/e-meeting-model.c:825
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
msgid "Declined"
msgstr "否决"
@@ -9302,13 +9350,13 @@ msgstr "否决"
# camel/providers/smtp/camel-smtp-transport.c:171
# camel/providers/smtp/camel-smtp-transport.c:226
# widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:442
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
#: camel/providers/smtp/camel-smtp-transport.c:172
#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
#: widgets/misc/e-charset-picker.c:444
msgid "Unknown"
msgstr "未知"
@@ -9322,16 +9370,16 @@ msgstr "未知"
# calendar/gui/e-itip-control.c:789 calendar/gui/e-itip-control.c:805
# calendar/gui/e-itip-control.c:821 calendar/gui/e-itip-control.c:834
# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:860
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
msgid "Choose an action:"
msgstr "选择一项活动:"
# calendar/gui/e-itip-control.c:787
# calendar/gui/e-itip-control.c:787
# calendar/gui/e-itip-control.c:790
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
msgid "Update"
msgstr "更新"
@@ -9347,67 +9395,67 @@ msgstr "更新"
# calendar/gui/e-itip-control.c:823 calendar/gui/e-itip-control.c:836
# calendar/gui/e-itip-control.c:849 calendar/gui/e-itip-control.c:862
# shell/e-shell.c:1885 widgets/misc/e-cell-date-edit.c:258
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
msgid "OK"
msgstr "确定"
# calendar/gui/e-itip-control.c:803
# calendar/gui/e-itip-control.c:803
# calendar/gui/e-itip-control.c:806
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
msgid "Accept"
msgstr "接受"
# calendar/gui/e-itip-control.c:804
# calendar/gui/e-itip-control.c:804
# calendar/gui/e-itip-control.c:807
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
msgid "Tentatively accept"
msgstr "暂时接受"
# calendar/gui/e-itip-control.c:805
# calendar/gui/e-itip-control.c:805
# calendar/gui/e-itip-control.c:808
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
msgid "Decline"
msgstr "否决"
# calendar/gui/e-itip-control.c:819
# calendar/gui/e-itip-control.c:819
# calendar/gui/e-itip-control.c:822
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
msgid "Send Free/Busy Information"
msgstr "发送忙闲信息"
# calendar/gui/e-itip-control.c:832
# calendar/gui/e-itip-control.c:832
# calendar/gui/e-itip-control.c:835
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
msgid "Update respondent status"
msgstr "更新应答者状态"
# calendar/gui/e-itip-control.c:846
# calendar/gui/e-itip-control.c:846
# calendar/gui/e-itip-control.c:848
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
msgid "Send Latest Information"
msgstr "发送最新的信息"
# calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
# calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
# calendar/gui/e-itip-control.c:861 ui/evolution-mail-global.xml.h:1
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
# calendar/gui/e-itip-control.c:875
# calendar/gui/e-itip-control.c:875
# calendar/gui/e-itip-control.c:909
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> 发布了会议信息。"
@@ -9415,14 +9463,14 @@ msgstr "<b>%s</b> 发布了会议信息。"
# calendar/gui/e-itip-control.c:876
# calendar/gui/e-itip-control.c:876
# calendar/gui/e-itip-control.c:910
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
msgid "Meeting Information"
msgstr "会议信息"
# calendar/gui/e-itip-control.c:880
# calendar/gui/e-itip-control.c:880
# calendar/gui/e-itip-control.c:914
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请求您参加一个会议。"
@@ -9430,14 +9478,14 @@ msgstr "<b>%s</b> 请求您参加一个会议。"
# calendar/gui/e-itip-control.c:881
# calendar/gui/e-itip-control.c:881
# calendar/gui/e-itip-control.c:915
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
msgid "Meeting Proposal"
msgstr "会议建议"
# calendar/gui/e-itip-control.c:885
# calendar/gui/e-itip-control.c:885
# calendar/gui/e-itip-control.c:919
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> 希望加入到已存的会议。"
@@ -9445,14 +9493,14 @@ msgstr "<b>%s</b> 希望加入到已存的会议。"
# calendar/gui/e-itip-control.c:886
# calendar/gui/e-itip-control.c:886
# calendar/gui/e-itip-control.c:920
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
msgid "Meeting Update"
msgstr "会议更新"
# calendar/gui/e-itip-control.c:890
# calendar/gui/e-itip-control.c:890
# calendar/gui/e-itip-control.c:924
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> 想收到最新的会议信息。"
@@ -9460,14 +9508,14 @@ msgstr "<b>%s</b> 想收到最新的会议信息。"
# calendar/gui/e-itip-control.c:891
# calendar/gui/e-itip-control.c:891
# calendar/gui/e-itip-control.c:925
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
msgid "Meeting Update Request"
msgstr "会议更新请求"
# calendar/gui/e-itip-control.c:895
# calendar/gui/e-itip-control.c:895
# calendar/gui/e-itip-control.c:948
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> 已回复一个会议请求。"
@@ -9475,14 +9523,14 @@ msgstr "<b>%s</b> 已回复一个会议请求。"
# calendar/gui/e-itip-control.c:896
# calendar/gui/e-itip-control.c:896
# calendar/gui/e-itip-control.c:949
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
msgid "Meeting Reply"
msgstr "会议答复"
# calendar/gui/e-itip-control.c:900
# calendar/gui/e-itip-control.c:900
# calendar/gui/e-itip-control.c:953
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
@@ -9490,7 +9538,7 @@ msgstr "<b>%s</b> 取消了一个会议。"
# calendar/gui/e-itip-control.c:901
# calendar/gui/e-itip-control.c:901
# calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
msgid "Meeting Cancellation"
msgstr "会议取消"
@@ -9500,8 +9548,8 @@ msgstr "会议取消"
# calendar/gui/e-itip-control.c:990
# calendar/gui/e-itip-control.c:958 calendar/gui/e-itip-control.c:1029
# calendar/gui/e-itip-control.c:1064
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> 发送了一个无法理解的信息。"
@@ -9509,14 +9557,14 @@ msgstr "<b>%s</b> 发送了一个无法理解的信息。"
# calendar/gui/e-itip-control.c:906
# calendar/gui/e-itip-control.c:906
# calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
msgid "Bad Meeting Message"
msgstr "错误的会议信息"
# calendar/gui/e-itip-control.c:925
# calendar/gui/e-itip-control.c:925
# calendar/gui/e-itip-control.c:979
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> 发布了任务信息。"
@@ -9524,14 +9572,14 @@ msgstr "<b>%s</b> 发布了任务信息。"
# calendar/gui/e-itip-control.c:926
# calendar/gui/e-itip-control.c:926
# calendar/gui/e-itip-control.c:980
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
msgid "Task Information"
msgstr "任务信息"
# calendar/gui/e-itip-control.c:930
# calendar/gui/e-itip-control.c:930
# calendar/gui/e-itip-control.c:984
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请求您完成一个任务。"
@@ -9539,14 +9587,14 @@ msgstr "<b>%s</b> 请求您完成一个任务。"
# calendar/gui/e-itip-control.c:931
# calendar/gui/e-itip-control.c:931
# calendar/gui/e-itip-control.c:985
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
msgid "Task Proposal"
msgstr "任务建议"
# calendar/gui/e-itip-control.c:935
# calendar/gui/e-itip-control.c:935
# calendar/gui/e-itip-control.c:989
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s<b> 希望加入到已存在的任务。"
@@ -9554,14 +9602,14 @@ msgstr "<b>%s<b> 希望加入到已存在的任务。"
# calendar/gui/e-itip-control.c:936
# calendar/gui/e-itip-control.c:936
# calendar/gui/e-itip-control.c:990
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
msgid "Task Update"
msgstr "任务更新"
# calendar/gui/e-itip-control.c:940
# calendar/gui/e-itip-control.c:940
# calendar/gui/e-itip-control.c:994
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> 希望获取最新的任务信息。"
@@ -9569,14 +9617,14 @@ msgstr "<b>%s</b> 希望获取最新的任务信息。"
# calendar/gui/e-itip-control.c:941
# calendar/gui/e-itip-control.c:941
# calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
msgid "Task Update Request"
msgstr "任务更新请求"
# calendar/gui/e-itip-control.c:945
# calendar/gui/e-itip-control.c:945
# calendar/gui/e-itip-control.c:1019
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> 已经回复了任务委派。"
@@ -9584,14 +9632,14 @@ msgstr "<b>%s</b> 已经回复了任务委派。"
# calendar/gui/e-itip-control.c:946
# calendar/gui/e-itip-control.c:946
# calendar/gui/e-itip-control.c:1020
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
msgid "Task Reply"
msgstr "任务回复"
# calendar/gui/e-itip-control.c:950
# calendar/gui/e-itip-control.c:950
# calendar/gui/e-itip-control.c:1024
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> 取消了任务。"
@@ -9599,21 +9647,21 @@ msgstr "<b>%s</b> 取消了任务。"
# calendar/gui/e-itip-control.c:951
# calendar/gui/e-itip-control.c:951
# calendar/gui/e-itip-control.c:1025
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
msgid "Task Cancellation"
msgstr "任务取消"
# calendar/gui/e-itip-control.c:956
# calendar/gui/e-itip-control.c:956
# calendar/gui/e-itip-control.c:1030
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
msgid "Bad Task Message"
msgstr "错误的任务邮件"
# calendar/gui/e-itip-control.c:975
# calendar/gui/e-itip-control.c:975
# calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> 发布了忙闲信息。"
@@ -9621,14 +9669,14 @@ msgstr "<b>%s</b> 发布了忙闲信息。"
# calendar/gui/e-itip-control.c:976
# calendar/gui/e-itip-control.c:976
# calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
msgid "Free/Busy Information"
msgstr "忙闲信息"
# calendar/gui/e-itip-control.c:980
# calendar/gui/e-itip-control.c:980
# calendar/gui/e-itip-control.c:1054
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请求您的忙闲信息。"
@@ -9636,14 +9684,14 @@ msgstr "<b>%s</b> 请求您的忙闲信息。"
# calendar/gui/e-itip-control.c:981
# calendar/gui/e-itip-control.c:981
# calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
msgid "Free/Busy Request"
msgstr "忙闲请求"
# calendar/gui/e-itip-control.c:985
# calendar/gui/e-itip-control.c:985
# calendar/gui/e-itip-control.c:1059
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> 应答了忙闲请求。"
@@ -9651,136 +9699,136 @@ msgstr "<b>%s</b> 应答了忙闲请求。"
# calendar/gui/e-itip-control.c:986
# calendar/gui/e-itip-control.c:986
# calendar/gui/e-itip-control.c:1060
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
msgid "Free/Busy Reply"
msgstr "忙闲应答"
# calendar/gui/e-itip-control.c:991
# calendar/gui/e-itip-control.c:991
# calendar/gui/e-itip-control.c:1065
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
msgid "Bad Free/Busy Message"
msgstr "错误的忙闲信息"
# calendar/gui/e-itip-control.c:1064
# calendar/gui/e-itip-control.c:1064
# calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
msgid "The message does not appear to be properly formed"
msgstr "邮件的格式可能不正确"
# calendar/gui/e-itip-control.c:1083
# calendar/gui/e-itip-control.c:1083
# calendar/gui/e-itip-control.c:1157
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
msgid "The message contains only unsupported requests."
msgstr "邮件只含有不支持的请求。"
# calendar/gui/e-itip-control.c:1111 calendar/gui/e-itip-control.c:1117
# calendar/gui/e-itip-control.c:1111 calendar/gui/e-itip-control.c:1117
# calendar/gui/e-itip-control.c:1185 calendar/gui/e-itip-control.c:1191
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
msgid "The attachment does not contain a valid calendar message"
msgstr "附件中没有有效的日程信息"
# calendar/gui/e-itip-control.c:1142
# calendar/gui/e-itip-control.c:1142
# calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日程项目"
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
msgid "Object is invalid and cannot be updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
msgid "There was an error on the CORBA system\n"
msgstr ""
# calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
# calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
# calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
#, fuzzy
msgid "Object could not be found\n"
msgstr "无法发送项目!\n"
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
msgid "You don't have permissions to update the calendar\n"
msgstr ""
# calendar/gui/e-itip-control.c:1243
# calendar/gui/e-itip-control.c:1243
# calendar/gui/e-itip-control.c:1317
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
msgid "Update complete\n"
msgstr "更新完成\n"
# calendar/gui/e-itip-control.c:1241
# calendar/gui/e-itip-control.c:1241
# calendar/gui/e-itip-control.c:1315
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
msgid "Calendar file could not be updated!\n"
msgstr "无法更新日历文件!\n"
# calendar/gui/e-itip-control.c:1300
# calendar/gui/e-itip-control.c:1300
# calendar/gui/e-itip-control.c:1374
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新参与者状态"
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr ""
# calendar/gui/e-itip-control.c:1288
# calendar/gui/e-itip-control.c:1288
# calendar/gui/e-itip-control.c:1362
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新参与者状态!\n"
# calendar/gui/e-itip-control.c:1298
# calendar/gui/e-itip-control.c:1298
# calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
msgid "Attendee status updated\n"
msgstr "更新参与者状态\n"
# calendar/gui/e-itip-control.c:1296
# calendar/gui/e-itip-control.c:1296
# calendar/gui/e-itip-control.c:1370
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
msgid "Attendee status could not be updated!\n"
msgstr "无法更新参与者状态!\n"
# calendar/gui/e-itip-control.c:1328
# calendar/gui/e-itip-control.c:1328
# calendar/gui/e-itip-control.c:1402
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
msgid "Removal Complete"
msgstr "删除完成"
# calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1411
# calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1411
# calendar/gui/e-itip-control.c:1421 calendar/gui/e-itip-control.c:1471
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
msgid "Item sent!\n"
msgstr "项目已发送!\n"
# calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
# calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
# calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:834
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
#, fuzzy
msgid "Select Calendar Folder"
msgstr "选择文件夹"
@@ -9788,7 +9836,7 @@ msgstr "选择文件夹"
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:834
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
#, fuzzy
msgid "Select Tasks Folder"
msgstr "选择文件夹"
@@ -9867,7 +9915,7 @@ msgstr "主席人员"
# calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1550
# calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
# calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
msgid "Required Participants"
msgstr "必需的参与者"
@@ -9892,7 +9940,7 @@ msgstr "不参加"
# calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
# calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
msgid "Individual"
msgstr "个人"
@@ -9903,7 +9951,7 @@ msgstr "个人"
# calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
# calendar/gui/e-meeting-model.c:779
#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
msgid "Group"
msgstr "组"
@@ -9914,7 +9962,7 @@ msgstr "组"
# calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
# calendar/gui/e-meeting-model.c:780
#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
msgid "Resource"
msgstr "资源"
@@ -9925,7 +9973,7 @@ msgstr "资源"
# calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
# calendar/gui/e-meeting-model.c:781
#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
msgid "Room"
msgstr "房间"
@@ -9936,7 +9984,7 @@ msgstr "房间"
# calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
# calendar/gui/e-meeting-model.c:794
#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
msgid "Chair"
msgstr "主席"
@@ -9947,7 +9995,7 @@ msgstr "主席"
# calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
# calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
msgid "Required Participant"
msgstr "必需的参与者"
@@ -9958,7 +10006,7 @@ msgstr "必需的参与者"
# calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
# calendar/gui/e-meeting-model.c:796
#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
msgid "Optional Participant"
msgstr "可选的参与者"
@@ -9969,21 +10017,10 @@ msgstr "可选的参与者"
# calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
# calendar/gui/e-meeting-model.c:797
#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
msgid "Non-Participant"
msgstr "不参加"
-# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
-# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
-# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
-# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
-# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
-# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "需要动作"
-
# calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
# calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:428
# calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
@@ -9991,7 +10028,7 @@ msgstr "需要动作"
# calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
# calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
msgid "Tentative"
msgstr "暂时的"
@@ -10002,7 +10039,7 @@ msgstr "暂时的"
# calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
# calendar/gui/e-meeting-model.c:827
#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
msgid "Delegated"
msgstr "被委任的"
@@ -10164,7 +10201,8 @@ msgstr "会议结束时间(_E):"
# calendar/gui/e-tasks.c:328
# calendar/gui/e-tasks.c:328
# calendar/gui/e-tasks.c:342
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
@@ -10172,7 +10210,7 @@ msgstr "在 %s 打开任务"
# calendar/gui/e-tasks.c:355
# calendar/gui/e-tasks.c:355
# calendar/gui/e-tasks.c:367
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
#, c-format
msgid "Could not load the tasks in `%s'"
msgstr "无法从“%s”中装入任务"
@@ -10180,7 +10218,7 @@ msgstr "无法从“%s”中装入任务"
# calendar/gui/e-tasks.c:367
# calendar/gui/e-tasks.c:367
# calendar/gui/e-tasks.c:379
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
#, c-format
msgid "The method required to load `%s' is not supported"
msgstr "不支持装入“%s”必需的方法"
@@ -10188,7 +10226,7 @@ msgstr "不支持装入“%s”必需的方法"
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1493
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
#, fuzzy, c-format
msgid "You don't have permission to open the folder in `%s'"
msgstr "无法打开“%s”中的文件夹"
@@ -10196,7 +10234,7 @@ msgstr "无法打开“%s”中的文件夹"
# calendar/gui/e-calendar-table.etspec.h:8
# calendar/gui/e-calendar-table.etspec.h:8
# calendar/gui/e-calendar-table.etspec.h:8
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
#, fuzzy
msgid "Completing tasks..."
msgstr "完成日期"
@@ -10207,7 +10245,7 @@ msgstr "完成日期"
# calendar/gui/e-week-view.c:1824
# calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
# calendar/gui/e-week-view.c:1828
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
#, fuzzy
msgid "Deleting selected objects..."
msgstr "删除选中的对象"
@@ -10215,24 +10253,17 @@ msgstr "删除选中的对象"
# mail/mail-ops.c:1556
# mail/mail-ops.c:1558
# calendar/gui/e-tasks.c:629
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
msgid "Expunging"
msgstr "正在删除"
# calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
# calendar/gui/e-week-view.c:3408 calendar/gui/e-week-view.c:3446
# calendar/gui/e-week-view.c:3412 calendar/gui/e-week-view.c:3450
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
-# calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
-# calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3430
-# calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "删除该约会(_D)"
-
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1493
@@ -10252,11 +10283,19 @@ msgstr "不支持打开“%s”必需的方法"
# calendar/gui/gnome-cal.c:1865
# calendar/gui/gnome-cal.c:1865
# calendar/gui/gnome-cal.c:1859
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
#, c-format
msgid "Opening calendar at %s"
msgstr "从 %s 打开日历"
+# mail/mail-ops.c:1234
+# mail/mail-ops.c:1236
+# mail/mail-ops.c:1279
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "正在打开文件夹 %s"
+
# calendar/gui/goto-dialog.glade.h:1
# calendar/gui/goto-dialog.glade.h:1
# calendar/gui/goto-dialog.glade.h:1
@@ -10358,56 +10397,56 @@ msgstr "九月"
# calendar/gui/itip-utils.c:243
# calendar/gui/itip-utils.c:243
# calendar/gui/itip-utils.c:243
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
msgid "At least one attendee is necessary"
msgstr "至少需要一个参加者"
# calendar/gui/itip-utils.c:274
# calendar/gui/itip-utils.c:274
# calendar/gui/itip-utils.c:274
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
msgid "An organizer must be set."
msgstr "必须设定组织者。"
# calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
# calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
# calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
msgid "Event information"
msgstr "事件信息"
# calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
# calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
# calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
msgid "Task information"
msgstr "任务信息"
# calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
# calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
# calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
msgid "Journal information"
msgstr "日志信息"
# calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
# calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
# calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
msgid "Free/Busy information"
msgstr "忙闲信息"
# calendar/gui/itip-utils.c:321
# calendar/gui/itip-utils.c:321
# calendar/gui/itip-utils.c:321
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
msgid "Calendar information"
msgstr "日历信息"
# calendar/gui/e-itip-control.c:787
# calendar/gui/e-itip-control.c:787
# calendar/gui/e-itip-control.c:790
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
#, fuzzy
msgid "Updated"
msgstr "更新"
@@ -10415,26 +10454,65 @@ msgstr "更新"
# ui/evolution-subscribe.xml.h:3
# ui/evolution-subscribe.xml.h:3
# ui/evolution-subscribe.xml.h:3
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
#, fuzzy
msgid "Refresh"
msgstr "刷新列表"
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
msgid "Counter-proposal"
msgstr ""
# calendar/gui/itip-utils.c:573
# calendar/gui/itip-utils.c:573
# calendar/gui/itip-utils.c:581
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
msgid "You must be an attendee of the event."
msgstr "您必须是事件的参与者。"
+# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+# addressbook/backend/ebook/load-pine-addressbook.c:22
+# addressbook/backend/ebook/test-client-list.c:23
+# addressbook/backend/ebook/test-client.c:33
+# addressbook/conduit/address-conduit.c:1533
+# addressbook/gui/component/addressbook-factory.c:50
+# calendar/conduits/calendar/calendar-conduit.c:1449
+# calendar/conduits/todo/todo-conduit.c:1130
+# calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+# tools/evolution-addressbook-export.c:60
+# tools/evolution-addressbook-import.c:86
+# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+# addressbook/backend/ebook/load-pine-addressbook.c:22
+# addressbook/backend/ebook/test-client-list.c:23
+# addressbook/backend/ebook/test-client.c:33
+# addressbook/conduit/address-conduit.c:1538
+# addressbook/gui/component/addressbook-factory.c:50
+# calendar/conduits/calendar/calendar-conduit.c:1546
+# calendar/conduits/todo/todo-conduit.c:1130
+# calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+# tools/evolution-addressbook-export.c:60
+# tools/evolution-addressbook-import.c:86
+# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+# addressbook/backend/ebook/load-pine-addressbook.c:22
+# addressbook/backend/ebook/test-client-list.c:23
+# addressbook/backend/ebook/test-client.c:33
+# addressbook/conduit/address-conduit.c:1721
+# addressbook/gui/component/addressbook-factory.c:50
+# calendar/conduits/calendar/calendar-conduit.c:1727
+# calendar/conduits/todo/todo-conduit.c:1316
+# calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+# tools/evolution-addressbook-abuse.c:132
+# tools/evolution-addressbook-export.c:60
+# tools/evolution-addressbook-import.c:86
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "无法初始化 Bonobo"
+
# calendar/gui/main.c:91
# calendar/gui/main.c:91
# calendar/gui/main.c:91
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:99
msgid "Could not create the component editor factory"
msgstr "无法创建组件编辑器车间"
@@ -10832,9 +10910,8 @@ msgstr "打印日历"
# mail/mail-callbacks.c:2597 my-evolution/e-summary.c:605
# ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
msgid "Print Preview"
msgstr "打印预览"
@@ -10884,8 +10961,8 @@ msgstr ""
# mail/mail-callbacks.c:2142
# mail/mail-callbacks.c:2261
# calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2297
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
msgid "Do not ask me again."
msgstr "不要再次询问。"
@@ -10969,10 +11046,43 @@ msgstr "将 iCalendar 文件导入 Evolution"
msgid "Imports vCalendar files into Evolution"
msgstr "将 iCalendar 文件导入 Evolution"
+# camel/providers/local/camel-mbox-folder.c:347
+# camel/providers/local/camel-mbox-folder.c:379
+# camel/providers/local/camel-mbox-folder.c:391
+# camel/providers/local/camel-spool-folder.c:595
+# camel/providers/local/camel-spool-folder.c:627
+# camel/providers/local/camel-spool-folder.c:639
+# camel/providers/local/camel-mbox-folder.c:347
+# camel/providers/local/camel-mbox-folder.c:379
+# camel/providers/local/camel-mbox-folder.c:391
+# camel/providers/local/camel-spool-folder.c:595
+# camel/providers/local/camel-spool-folder.c:627
+# camel/providers/local/camel-spool-folder.c:639
+# camel/providers/local/camel-mbox-folder.c:347
+# camel/providers/local/camel-mbox-folder.c:379
+# camel/providers/local/camel-mbox-folder.c:391
+# camel/providers/local/camel-spool-folder.c:595
+# camel/providers/local/camel-spool-folder.c:627
+# camel/providers/local/camel-spool-folder.c:639
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"无法从文件夹 %2$s 获取邮件: %1$s\n"
+" %3$s"
+
+# mail/component-factory.c:129
+# mail/component-factory.c:129
+# mail/component-factory.c:129
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "无法连接到存储: %s"
+
# calendar/gui/dialogs/event-editor.c:190
# calendar/gui/dialogs/event-editor.c:190
# calendar/gui/dialogs/event-editor.c:190
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:482
#, fuzzy
msgid "Reminder!!"
msgstr "提醒"
@@ -10980,7 +11090,7 @@ msgstr "提醒"
# calendar/gui/e-itip-control.glade.h:4
# calendar/gui/e-itip-control.glade.h:4
# calendar/gui/e-itip-control.glade.h:4
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
#, fuzzy
msgid "Calendar Events"
msgstr "日历消息"
@@ -10988,7 +11098,7 @@ msgstr "日历消息"
# importers/pine-importer.c:663
# importers/pine-importer.c:663
# importers/pine-importer.c:663
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
#, fuzzy
msgid ""
"Evolution has found Gnome Calendar files.\n"
@@ -11003,7 +11113,7 @@ msgstr ""
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
#, fuzzy
msgid "Gnome Calendar"
msgstr "日历"
@@ -11011,133 +11121,133 @@ msgstr "日历"
# calendar/pcs/query.c:246
# calendar/pcs/query.c:246
# calendar/pcs/query.c:246
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
msgid "time-now expects 0 arguments"
msgstr "time-now 需要 0 个参数"
# calendar/pcs/query.c:270
# calendar/pcs/query.c:270
# calendar/pcs/query.c:270
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
msgid "make-time expects 1 argument"
msgstr "make-time 需要 1 个参数"
# calendar/pcs/query.c:275
# calendar/pcs/query.c:275
# calendar/pcs/query.c:275
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
msgid "make-time expects argument 1 to be a string"
msgstr "make-time 的第一个参数应该是字符串"
# calendar/pcs/query.c:283
# calendar/pcs/query.c:283
# calendar/pcs/query.c:283
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
msgid "make-time argument 1 must be an ISO 8601 date/time string"
msgstr "make-time 的第一个参数必须是 ISO 8601 日期/时间字符串"
# calendar/pcs/query.c:312
# calendar/pcs/query.c:312
# calendar/pcs/query.c:312
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
msgid "time-add-day expects 2 arguments"
msgstr "time-add-day 需要 2 个参数"
# calendar/pcs/query.c:317
# calendar/pcs/query.c:317
# calendar/pcs/query.c:317
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
msgid "time-add-day expects argument 1 to be a time_t"
msgstr "time-add-day 的第一个参数应该是 time_t"
# calendar/pcs/query.c:324
# calendar/pcs/query.c:324
# calendar/pcs/query.c:324
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
msgid "time-add-day expects argument 2 to be an integer"
msgstr "time-add-day 的第二个参数应该是整数"
# calendar/pcs/query.c:351
# calendar/pcs/query.c:351
# calendar/pcs/query.c:351
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
msgid "time-day-begin expects 1 argument"
msgstr "time-day-begin 需要 1 个参数"
# calendar/pcs/query.c:356
# calendar/pcs/query.c:356
# calendar/pcs/query.c:356
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
msgid "time-day-begin expects argument 1 to be a time_t"
msgstr "time-day-begin 的第一个参数应该是 time_t"
# calendar/pcs/query.c:383
# calendar/pcs/query.c:383
# calendar/pcs/query.c:383
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
msgid "time-day-end expects 1 argument"
msgstr "time-day-end 需要一个参数"
# calendar/pcs/query.c:388
# calendar/pcs/query.c:388
# calendar/pcs/query.c:388
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
msgid "time-day-end expects argument 1 to be a time_t"
msgstr "time-day-end 的第一个参数应该是 time_t"
# calendar/pcs/query.c:424
# calendar/pcs/query.c:424
# calendar/pcs/query.c:424
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
msgid "get-vtype expects 0 arguments"
msgstr "get-vtype 需要 0 个参数"
# calendar/pcs/query.c:520
# calendar/pcs/query.c:520
# calendar/pcs/query.c:520
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
msgid "occur-in-time-range? expects 2 arguments"
msgstr "occur-in-time-range? 需要两个参数"
# calendar/pcs/query.c:525
# calendar/pcs/query.c:525
# calendar/pcs/query.c:525
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
msgid "occur-in-time-range? expects argument 1 to be a time_t"
msgstr "occur-in-time-range? 的第一个参数应该是 time_t"
# calendar/pcs/query.c:532
# calendar/pcs/query.c:532
# calendar/pcs/query.c:532
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
msgid "occur-in-time-range? expects argument 2 to be a time_t"
msgstr "occur-in-time-rang? 的第二个参数应该是 time_t"
# calendar/pcs/query.c:662
# calendar/pcs/query.c:662
# calendar/pcs/query.c:662
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
msgid "contains? expects 2 arguments"
msgstr "contains? 需要 2 个参数"
# calendar/pcs/query.c:667
# calendar/pcs/query.c:667
# calendar/pcs/query.c:667
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
msgid "contains? expects argument 1 to be a string"
msgstr "contains? 的第一个参数应该是字符串"
# calendar/pcs/query.c:674
# calendar/pcs/query.c:674
# calendar/pcs/query.c:674
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
msgid "contains? expects argument 2 to be a string"
msgstr "contains? 的第二个参数应该是字符串"
# calendar/pcs/query.c:691
# calendar/pcs/query.c:691
# calendar/pcs/query.c:691
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
msgid ""
"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
"\""
@@ -11146,14 +11256,14 @@ msgstr "contains? 的第一个参数必须是“任意”、“概要”、“
# calendar/pcs/query.c:733
# calendar/pcs/query.c:733
# calendar/pcs/query.c:733
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
msgid "has-categories? expects at least 1 argument"
msgstr "has-categories? 至少需要 1 个参数"
# calendar/pcs/query.c:745
# calendar/pcs/query.c:745
# calendar/pcs/query.c:745
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
msgid ""
"has-categories? expects all arguments to be strings or one and only one "
"argument to be a boolean false (#f)"
@@ -11162,28 +11272,28 @@ msgstr "has-categories? 的所有参数都应该为字符串或者它唯一的
# calendar/pcs/query.c:833
# calendar/pcs/query.c:833
# calendar/pcs/query.c:833
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
msgid "is-completed? expects 0 arguments"
msgstr "is-completed? 需要 0 个参数"
# calendar/pcs/query.c:878
# calendar/pcs/query.c:878
# calendar/pcs/query.c:878
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
msgid "completed-before? expects 1 argument"
msgstr "completed-before? 需要 1 个参数"
# calendar/pcs/query.c:883
# calendar/pcs/query.c:883
# calendar/pcs/query.c:883
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
msgid "completed-before? expects argument 1 to be a time_t"
msgstr "completed-before? 的第一个参数应该是 time_t"
# calendar/pcs/query.c:1160
# calendar/pcs/query.c:1160
# calendar/pcs/query.c:1160
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
msgid "Evaluation of the search expression did not yield a boolean value"
msgstr "计算搜索表达式没有得到布尔值"
@@ -13686,14 +13796,14 @@ msgstr "您必需在线工作以便完成该操作"
# camel/camel-filter-driver.c:553 camel/camel-filter-driver.c:562
# camel/camel-filter-driver.c:602 camel/camel-filter-driver.c:611
# camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:698
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
msgid "Syncing folders"
msgstr "同步文件夹"
# camel/camel-filter-driver.c:921
# camel/camel-filter-driver.c:970
# camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "解析过滤规则错误: %s: %s"
@@ -13701,7 +13811,7 @@ msgstr "解析过滤规则错误: %s: %s"
# camel/camel-filter-driver.c:927
# camel/camel-filter-driver.c:976
# camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "执行过滤规则错误: %s: %s"
@@ -13709,21 +13819,21 @@ msgstr "执行过滤规则错误: %s: %s"
# camel/camel-filter-driver.c:664
# camel/camel-filter-driver.c:713
# camel/camel-filter-driver.c:865
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
msgid "Unable to open spool folder"
msgstr "无法打开脱机文件夹"
# camel/camel-filter-driver.c:673
# camel/camel-filter-driver.c:722
# camel/camel-filter-driver.c:874
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
msgid "Unable to process spool folder"
msgstr "无法处理脱机文件夹"
# camel/camel-filter-driver.c:688
# camel/camel-filter-driver.c:737
# camel/camel-filter-driver.c:889
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "获取邮件 %d (%d%%)"
@@ -13731,14 +13841,14 @@ msgstr "获取邮件 %d (%d%%)"
# camel/camel-filter-driver.c:692
# camel/camel-filter-driver.c:741
# camel/camel-filter-driver.c:893
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
msgid "Cannot open message"
msgstr "无法打开消息"
# camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
# camel/camel-filter-driver.c:742 camel/camel-filter-driver.c:754
# camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
#, c-format
msgid "Failed on message %d"
msgstr "在消息 %d 失败"
@@ -13746,14 +13856,14 @@ msgstr "在消息 %d 失败"
# camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
# camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:881
# camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
msgid "Syncing folder"
msgstr "正在同步文件夹"
# camel/camel-filter-driver.c:789
# camel/camel-filter-driver.c:838
# camel/camel-filter-driver.c:988
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
#, c-format
msgid "Getting message %d of %d"
msgstr "正在获取第 %d 个消息,共 %d 个"
@@ -13761,7 +13871,7 @@ msgstr "正在获取第 %d 个消息,共 %d 个"
# camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
# camel/camel-filter-driver.c:843 camel/camel-filter-driver.c:861
# camel/camel-filter-driver.c:1003
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
#, c-format
msgid "Failed at message %d of %d"
msgstr "在第 %d 个消息失败,共 %d 个"
@@ -13769,10 +13879,26 @@ msgstr "在第 %d 个消息失败,共 %d 个"
# camel/camel-smime-context.c:810
# camel/camel-smime-context.c:810
# camel/camel-filter-search.c:126
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
msgid "Failed to retrieve message"
msgstr "检索消息失败。"
+# shell/e-shell.c:1886
+# shell/e-shell.c:1886
+# shell/e-shell.c:1887
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "无效参数"
+
+# shell/e-shell.c:1886
+# shell/e-shell.c:1886
+# shell/e-shell.c:1887
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "无效参数"
+
# camel/providers/imap/camel-imap-message-cache.c:256
# camel/providers/imap/camel-imap-message-cache.c:313
# camel/providers/imap/camel-imap-message-cache.c:344
@@ -13785,7 +13911,7 @@ msgstr "检索消息失败。"
# camel/providers/imap/camel-imap-message-cache.c:313
# camel/providers/imap/camel-imap-message-cache.c:344
# camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:511
#, fuzzy, c-format
msgid "Failed to create pipe to '%s': %s"
msgstr "缓冲邮件 %s 失败: %s"
@@ -13802,7 +13928,7 @@ msgstr "缓冲邮件 %s 失败: %s"
# camel/providers/imap/camel-imap-message-cache.c:313
# camel/providers/imap/camel-imap-message-cache.c:344
# camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
#, fuzzy, c-format
msgid "Failed to create create child process '%s': %s"
msgstr "缓冲邮件 %s 失败: %s"
@@ -13810,7 +13936,7 @@ msgstr "缓冲邮件 %s 失败: %s"
# camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
# camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
# camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "执行过滤规则搜索错误: %s: %s"
@@ -13893,7 +14019,7 @@ msgstr "正在移动邮件"
msgid "Copying messages"
msgstr "把邮件复制到 %s"
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -13901,15 +14027,15 @@ msgid ""
"%s"
msgstr ""
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
msgid "Failed to parse gpg userid hint."
msgstr ""
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
msgid "Failed to parse gpg passphrase request."
msgstr ""
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -13919,20 +14045,20 @@ msgstr ""
# mail/mail-send-recv.c:533
# mail/mail-send-recv.c:541
# mail/mail-send-recv.c:541
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
msgid "Cancelled."
msgstr "已取消"
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr ""
# camel/providers/pop3/camel-pop3-store.c:563
# camel/providers/pop3/camel-pop3-store.c:563
# camel/providers/pop3/camel-pop3-store.c:563
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
#, fuzzy, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "来自 POP 服务器的意外应答: %s"
@@ -13940,7 +14066,7 @@ msgstr "来自 POP 服务器的意外应答: %s"
# tools/evolution-addressbook-import.c:80
# tools/evolution-addressbook-import.c:80
# tools/evolution-addressbook-import.c:80
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
#, fuzzy
msgid "No data provided"
msgstr "没有提供文件名。"
@@ -13948,7 +14074,7 @@ msgstr "没有提供文件名。"
# camel/camel-pgp-context.c:1169
# camel/camel-pgp-context.c:1169
# camel/camel-pgp-context.c:1169
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
#, fuzzy
msgid "Failed to encrypt: No valid recipients specified."
msgstr "无法加密该邮件: 没有指明收件人"
@@ -13965,7 +14091,7 @@ msgstr "无法加密该邮件: 没有指明收件人"
# camel/providers/imap/camel-imap-message-cache.c:313
# camel/providers/imap/camel-imap-message-cache.c:344
# camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
#, fuzzy, c-format
msgid ""
"Failed to GPG %s message: %s\n"
@@ -13985,7 +14111,7 @@ msgstr "缓冲邮件 %s 失败: %s"
# camel/providers/imap/camel-imap-message-cache.c:313
# camel/providers/imap/camel-imap-message-cache.c:344
# camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
#, fuzzy, c-format
msgid "Failed to GPG %s message: %s\n"
msgstr "缓冲邮件 %s 失败: %s"
@@ -13993,8 +14119,8 @@ msgstr "缓冲邮件 %s 失败: %s"
# camel/camel-smime-context.c:810
# camel/camel-smime-context.c:810
# camel/camel-smime-context.c:810
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
#, fuzzy
msgid "Failed to execute gpg."
msgstr "解码邮件失败。"
@@ -14002,7 +14128,7 @@ msgstr "解码邮件失败。"
# camel/camel-pgp-context.c:970
# camel/camel-pgp-context.c:970
# camel/camel-pgp-context.c:970
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
#, fuzzy, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr "无法验证该邮件:无法创建临时文件: %s"
@@ -14043,7 +14169,7 @@ msgstr "无法锁定“%s”"
# camel/camel-lock.c:91 camel/camel-lock.c:110
# camel/camel-lock.c:91 camel/camel-lock.c:110
#. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
#, c-format
msgid "Could not create lock file for %s: %s"
msgstr "无法为 %s 创建锁定文件: %s"
@@ -14051,7 +14177,7 @@ msgstr "无法为 %s 创建锁定文件: %s"
# camel/camel-lock.c:150
# camel/camel-lock.c:150
# camel/camel-lock.c:150
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
#, c-format
msgid "Timed out trying to get lock file on %s. Try again later."
msgstr "对 %s 获取锁文件的尝试超时。请稍后再试。"
@@ -14059,7 +14185,7 @@ msgstr "对 %s 获取锁文件的尝试超时。请稍后再试。"
# camel/camel-lock.c:204
# camel/camel-lock.c:204
# camel/camel-lock.c:204
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
#, c-format
msgid "Failed to get lock using fcntl(2): %s"
msgstr "用 fcntl(2) 获取锁失败: %s"
@@ -14067,7 +14193,7 @@ msgstr "用 fcntl(2) 获取锁失败: %s"
# camel/camel-lock.c:266
# camel/camel-lock.c:266
# camel/camel-lock.c:266
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
#, c-format
msgid "Failed to get lock using flock(2): %s"
msgstr "用 flock(2) 获取锁失败: %s"
@@ -14159,12 +14285,18 @@ msgstr "写入邮件临时文件错误: %s"
msgid "Error copying mail temp file: %s"
msgstr "复制邮件临时文件错误: %s"
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
msgid "Failed to decrypt MIME part: protocol error"
msgstr ""
# camel/camel-pkcs7-context.c:677
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+#, fuzzy
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr "无法解密:未知"
+
+# camel/camel-pkcs7-context.c:677
+#: camel/camel-multipart-encrypted.c:327
#, fuzzy
msgid "Failed to decrypt MIME part: parse error"
msgstr "无法解密:未知"
@@ -14371,7 +14503,7 @@ msgstr ""
# camel/camel-sasl-kerberos4.c:218
# camel/providers/imap/camel-imap-store.c:495
#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
msgid "Bad authentication response from server."
msgstr "来自服务器的无效认证应答。"
@@ -14649,38 +14781,168 @@ msgstr "无法获取文件夹: 对该存储的无效操作"
msgid "Cannot create folder: Invalid operation on this store"
msgstr "无法创建文件夹: 对该存储的无效操作"
-# camel/camel-tcp-stream-openssl.c:519
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+# camel/camel-smime-context.c:855
+# camel/camel-smime-context.c:855
+# camel/camel-smime-context.c:855
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "验证证书失败。"
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
msgstr ""
-"提交者:%s\n"
-"主题:%s"
-# camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
-# camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
-# camel/camel-tcp-stream-openssl.c:524
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+# camel/camel-smime-context.c:855
+# camel/camel-smime-context.c:855
+# camel/camel-smime-context.c:855
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "验证证书失败。"
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+# mail/mail-account-gui.c:962
+# mail/mail-account-gui.c:962
+# mail/mail-account-gui.c:959
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "无法保存签名文件。"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:104
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "证书 ID(_C):"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+# shell/e-shell-importer.c:474
+# shell/e-shell-importer.c:474
+# shell/e-shell-importer.c:485
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "装入 %s 错误"
+
+# calendar/gui/e-meeting-time-sel.c:430
+# calendar/gui/e-meeting-time-sel.c:433
+# calendar/gui/e-meeting-time-sel.c:433
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "办公室以外"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+# camel/camel-smime-context.c:855
+# camel/camel-smime-context.c:855
+# camel/camel-smime-context.c:855
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "验证证书失败。"
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:104
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "证书 ID(_C):"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+# shell/evolution-shell-component.c:1013
+# shell/evolution-shell-component.c:1013
+# shell/evolution-shell-component.c:1026
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "无效参数"
+
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:104
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "证书 ID(_C):"
+
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:104
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "证书 ID(_C):"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
msgstr ""
-"来自 %s 的错误证书:\n"
-"\n"
-"%s\n"
-"\n"
-"您仍然希望接受吗?"
# camel/camel-tcp-stream-ssl.c:438
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
#, c-format
msgid ""
"Issuer: %s\n"
@@ -14694,20 +14956,40 @@ msgstr ""
"签名: %s"
# camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
msgid "GOOD"
msgstr "好"
# camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
msgid "BAD"
msgstr "坏"
# camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
# camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
+# camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"来自 %s 的错误证书:\n"
+"\n"
+"%s\n"
+"\n"
+"您仍然希望接受吗?"
+
+# camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
+# camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
# camel/camel-tcp-stream-ssl.c:447
#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -14730,10 +15012,18 @@ msgstr ""
msgid "Could not parse URL `%s'"
msgstr "无法解析 URL “%s”"
+# shell/e-shell-importer.c:455
+# shell/e-shell-importer.c:455
+# shell/e-shell-importer.c:466
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "启动 %s 错误"
+
# camel/camel-vee-folder.c:588
# camel/camel-vee-folder.c:588
# camel/camel-vee-folder.c:588
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:656
#, c-format
msgid "No such message %s in %s"
msgstr "在 %2$s 中没有消息 %1$s"
@@ -14741,7 +15031,7 @@ msgstr "在 %2$s 中没有消息 %1$s"
# camel/providers/imap/camel-imap-provider.c:45
# camel/providers/imap/camel-imap-provider.c:45
# camel/providers/imap/camel-imap-provider.c:45
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
#, fuzzy
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "在所有文件夹中检查新邮件"
@@ -14749,7 +15039,7 @@ msgstr "在所有文件夹中检查新邮件"
# camel/camel-vee-store.c:258
# camel/camel-vee-store.c:258
# camel/camel-vee-store.c:258
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "无法删除文件夹: %s: 无效操作"
@@ -14757,7 +15047,7 @@ msgstr "无法删除文件夹: %s: 无效操作"
# camel/camel-vee-store.c:293
# camel/camel-vee-store.c:293
# camel/camel-vee-store.c:293
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "无法删除文件夹: %s: 没有该文件夹"
@@ -14765,7 +15055,7 @@ msgstr "无法删除文件夹: %s: 没有该文件夹"
# camel/camel-vee-store.c:306
# camel/camel-vee-store.c:306
# camel/camel-vee-store.c:306
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "无法重命名文件夹: %s: 无效操作"
@@ -14773,7 +15063,7 @@ msgstr "无法重命名文件夹: %s: 无效操作"
# camel/camel-vee-store.c:314
# camel/camel-vee-store.c:314
# camel/camel-vee-store.c:314
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "无法重命名文件夹: %s: 没有该文件夹"
@@ -14793,7 +15083,7 @@ msgstr "无法重命名文件夹: %s: 没有该文件夹"
#: camel/providers/imap/camel-imap-command.c:220
#: camel/providers/imap/camel-imap-command.c:259
#: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
msgid "Operation cancelled"
msgstr "操作已取消"
@@ -14804,7 +15094,7 @@ msgstr "操作已取消"
# camel/camel-remote-store.c:484
# camel/providers/imap/camel-imap-command.c:274
#: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "服务器意外地中止了连接: %s"
@@ -14851,7 +15141,7 @@ msgstr "来自 IMAP 服务器意外的 OK 应答: %s"
# camel/providers/imap/camel-imap-folder.c:194
# camel/providers/imap/camel-imap-folder.c:194
# camel/providers/imap/camel-imap-folder.c:197
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
#, c-format
msgid "Could not create directory %s: %s"
msgstr "无法创建目录 %s: %s"
@@ -14859,7 +15149,7 @@ msgstr "无法创建目录 %s: %s"
# camel/providers/imap/camel-imap-folder.c:213
# camel/providers/imap/camel-imap-folder.c:213
# camel/providers/imap/camel-imap-folder.c:216
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
#, c-format
msgid "Could not load summary for %s"
msgstr "无法为 %s 装入概要"
@@ -14867,7 +15157,7 @@ msgstr "无法为 %s 装入概要"
# camel/providers/imap/camel-imap-folder.c:277
# camel/providers/imap/camel-imap-folder.c:277
# camel/providers/imap/camel-imap-folder.c:282
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
msgid "Folder was destroyed and recreated on server."
msgstr "文件夹已被删除并在服务器上重建了。"
@@ -14875,7 +15165,7 @@ msgstr "文件夹已被删除并在服务器上重建了。"
# camel/providers/imap/camel-imap-folder.c:461
# camel/providers/imap/camel-imap-folder.c:466
#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
msgid "Scanning for changed messages"
msgstr "正在扫描改变了的邮件"
@@ -14885,8 +15175,8 @@ msgstr "正在扫描改变了的邮件"
# camel/providers/imap/camel-imap-folder.c:2001
# camel/providers/imap/camel-imap-folder.c:1632
# camel/providers/imap/camel-imap-folder.c:2108
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
msgid "This message is not currently available"
msgstr "该邮件目前不可用"
@@ -14896,22 +15186,22 @@ msgstr "该邮件目前不可用"
# camel/providers/imap/camel-imap-folder.c:1821
# camel/providers/imap/camel-imap-folder.c:1787
# camel/providers/imap/camel-imap-folder.c:1861
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
msgid "Fetching summary information for new messages"
msgstr "从新邮件中获取概要信息"
# camel/providers/imap/camel-imap-folder.c:1746
# camel/providers/imap/camel-imap-folder.c:1746
# camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
msgid "Scanning for new messages"
msgstr "正在扫描新邮件"
# camel/providers/imap/camel-imap-folder.c:2038
# camel/providers/imap/camel-imap-folder.c:2038
# camel/providers/imap/camel-imap-folder.c:2145
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
msgid "Could not find message body in FETCH response."
msgstr "无法在 FETCH 应答中找到邮件体。"
@@ -14935,10 +15225,10 @@ msgstr "无法打开缓冲器目录: %s"
# camel/providers/imap/camel-imap-message-cache.c:313
# camel/providers/imap/camel-imap-message-cache.c:344
# camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
#, c-format
msgid "Failed to cache message %s: %s"
msgstr "缓冲邮件 %s 失败: %s"
@@ -14960,7 +15250,7 @@ msgstr "在所有文件夹中检查新邮件"
# camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
# camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
# camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:832
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
msgid "Folders"
msgstr "文件夹"
@@ -15017,7 +15307,7 @@ msgstr "IMAP 服务器上的邮件的读写。"
# camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:60
#: camel/providers/imap/camel-imap-provider.c:80
#: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
msgid "Password"
msgstr "密码"
@@ -15031,7 +15321,7 @@ msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
# camel/providers/smtp/camel-smtp-transport.c:554
# camel/providers/smtp/camel-smtp-transport.c:554
# camel/providers/smtp/camel-smtp-transport.c:565
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
#, fuzzy, c-format
msgid "IMAP server %s"
msgstr "SMTP 服务器 %s"
@@ -15039,7 +15329,7 @@ msgstr "SMTP 服务器 %s"
# camel/camel-remote-store.c:207
# camel/camel-remote-store.c:207
# camel/camel-remote-store.c:207
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
#, fuzzy, c-format
msgid "IMAP service for %s on %s"
msgstr "%s 为 %s 服务,在 %s"
@@ -15047,7 +15337,7 @@ msgstr "%s 为 %s 服务,在 %s"
# camel/camel-remote-store.c:264
# camel/camel-remote-store.c:264
# camel/camel-remote-store.c:264
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
#: camel/providers/nntp/camel-nntp-store.c:130
#: camel/providers/nntp/camel-nntp-store.c:148
#: camel/providers/pop3/camel-pop3-store.c:180
@@ -15060,9 +15350,8 @@ msgstr "连接已取消"
# camel/providers/smtp/camel-smtp-transport.c:273
# camel/camel-remote-store.c:267
# camel/providers/smtp/camel-smtp-transport.c:276
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
#: camel/providers/smtp/camel-smtp-transport.c:276
#, c-format
msgid "Could not connect to %s (port %d): %s"
@@ -15071,8 +15360,8 @@ msgstr "无法连接到 %s (端口 %d): %s"
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
#, fuzzy, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr ""
@@ -15082,7 +15371,7 @@ msgstr ""
# shell/e-storage.c:518
# shell/e-storage.c:518
# shell/e-storage.c:518
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
#: camel/providers/pop3/camel-pop3-store.c:213
#, fuzzy
msgid "SSL/TLS extension not supported."
@@ -15091,16 +15380,24 @@ msgstr "不支持的操作"
# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
#: camel/providers/pop3/camel-pop3-store.c:254
#, fuzzy
msgid "SSL negotiations failed"
msgstr "认证失败。"
+# shell/e-storage.c:510
+# shell/e-storage.c:510
+# shell/e-storage.c:510
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "文件夹不为空"
+
# camel/providers/imap/camel-imap-store.c:518
# camel/providers/imap/camel-imap-store.c:518
# camel/providers/imap/camel-imap-store.c:518
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:1025
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
@@ -15111,8 +15408,8 @@ msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
# camel/providers/smtp/camel-smtp-transport.c:389
# camel/providers/imap/camel-imap-store.c:528
# camel/providers/smtp/camel-smtp-transport.c:393
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
#, c-format
msgid "No support for authentication type %s"
msgstr "不支持验证类型 %s"
@@ -15120,7 +15417,7 @@ msgstr "不支持验证类型 %s"
# camel/providers/imap/camel-imap-store.c:552
# camel/providers/imap/camel-imap-store.c:552
# camel/providers/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%s请为 %s@%s 输入 IMAP 密码"
@@ -15131,15 +15428,15 @@ msgstr "%s请为 %s@%s 输入 IMAP 密码"
# camel/providers/smtp/camel-smtp-transport.c:430
# camel/providers/imap/camel-imap-store.c:567
# camel/providers/smtp/camel-smtp-transport.c:434
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
msgid "You didn't enter a password."
msgstr "您没有输入密码。"
# camel/providers/imap/camel-imap-store.c:596
# camel/providers/imap/camel-imap-store.c:596
# camel/providers/imap/camel-imap-store.c:596
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -15153,16 +15450,25 @@ msgstr ""
# camel/providers/imap/camel-imap-store.c:899
# camel/providers/imap/camel-imap-store.c:899
# camel/providers/imap/camel-imap-store.c:900
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
#, c-format
msgid "No such folder %s"
msgstr "没有文件夹 %s"
+# shell/e-shell-utils.c:121
+# shell/e-shell-utils.c:121
+# shell/e-shell-utils.c:121
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "文件夹名不能含有回车符。"
+
# camel/providers/imap/camel-imap-store.c:1274
# camel/providers/imap/camel-imap-store.c:1274
# camel/providers/imap/camel-imap-store.c:1275
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1788
msgid "The parent folder is not allowed to contain subfolders"
msgstr "父文件夹不允许含有子文件夹"
@@ -15170,7 +15476,7 @@ msgstr "父文件夹不允许含有子文件夹"
# shell/e-shell-view.c:1585
# shell/e-shell-view.c:1598
#. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
#, fuzzy, c-format
msgid "~%s (%s)"
msgstr "%s (%d)"
@@ -15182,8 +15488,8 @@ msgstr "%s (%d)"
# camel/providers/local/camel-mbox-folder.c:208
# camel/providers/local/camel-spool-folder.c:456
#. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
#, fuzzy, c-format
msgid "mailbox:%s (%s)"
msgstr "无法打开邮件箱: %s: %s\n"
@@ -15192,7 +15498,7 @@ msgstr "无法打开邮件箱: %s: %s\n"
# shell/e-shell-view.c:1585
# shell/e-shell-view.c:1598
#. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
#, fuzzy, c-format
msgid "%s (%s)"
msgstr "%s (%d)"
@@ -15226,7 +15532,10 @@ msgstr "本地发送"
# camel/providers/local/camel-local-provider.c:53
# camel/providers/local/camel-local-provider.c:53
#: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
msgstr "在按照标准邮件箱格式化的脱机文件中检索本地邮件。"
# camel/providers/local/camel-local-provider.c:62
@@ -15269,7 +15578,7 @@ msgstr "标准 Unix 邮件箱"
#: camel/providers/local/camel-local-provider.c:102
#, fuzzy
msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"For reading and storing local mail in external standard mbox spool files.\n"
"May also be used to read a tree of Elm, Pine, or Mutt style folders."
msgstr "在标准邮件箱文件中读取和存储本地邮件。"
@@ -15283,7 +15592,7 @@ msgstr "在标准邮件箱文件中读取和存储本地邮件。"
# camel/providers/local/camel-local-store.c:227
# camel/providers/local/camel-spool-store.c:109
#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
#: camel/providers/local/camel-spool-store.c:110
#, c-format
msgid "Store root %s is not an absolute path"
@@ -15306,9 +15615,9 @@ msgstr "存储根目录 %s 不是普通目录"
# camel/providers/local/camel-local-store.c:153
# camel/providers/local/camel-local-store.c:169
# camel/providers/local/camel-local-store.c:235
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "无法获取文件夹: %s: %s"
@@ -15316,14 +15625,14 @@ msgstr "无法获取文件夹: %s: %s"
# camel/providers/local/camel-local-store.c:184
# camel/providers/local/camel-local-store.c:184
# camel/providers/local/camel-local-store.c:184
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
msgid "Local stores do not have an inbox"
msgstr "本地存储没有收件箱"
# camel/providers/local/camel-local-store.c:196
# camel/providers/local/camel-local-store.c:196
# camel/providers/local/camel-local-store.c:196
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
#, c-format
msgid "Local mail file %s"
msgstr "本地邮件文件 %s"
@@ -15331,7 +15640,7 @@ msgstr "本地邮件文件 %s"
# camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
# camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
# camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "无法将文件夹 %s 改名为 %s: %s"
@@ -15339,7 +15648,7 @@ msgstr "无法将文件夹 %s 改名为 %s: %s"
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
#, fuzzy, c-format
msgid "Could not rename '%s': %s"
msgstr "无法重命名文件夹: %s"
@@ -15347,7 +15656,7 @@ msgstr "无法重命名文件夹: %s"
# camel/providers/local/camel-local-store.c:374
# camel/providers/local/camel-local-store.c:374
# camel/providers/local/camel-local-store.c:374
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
#, c-format
msgid "Could not delete folder summary file `%s': %s"
msgstr "无法删除文件夹概要文件 “%s”: %s"
@@ -15355,7 +15664,7 @@ msgstr "无法删除文件夹概要文件 “%s”: %s"
# camel/providers/local/camel-local-store.c:384
# camel/providers/local/camel-local-store.c:384
# camel/providers/local/camel-local-store.c:384
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
#, c-format
msgid "Could not delete folder index file `%s': %s"
msgstr "无法删除文件夹索引文件 “%s”: %s"
@@ -15487,7 +15796,7 @@ msgstr ""
# camel/providers/local/camel-mbox-store.c:100
# camel/providers/local/camel-mh-store.c:96
#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
#: camel/providers/local/camel-mh-store.c:209
#, c-format
msgid "Folder `%s' does not exist."
@@ -15555,8 +15864,8 @@ msgstr "无法扫描文件夹“%s”: %s"
# camel/providers/local/camel-maildir-summary.c:526
# camel/providers/local/camel-maildir-summary.c:405
# camel/providers/local/camel-maildir-summary.c:526
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "无法打开邮件目录路径: %s: %s"
@@ -15564,7 +15873,7 @@ msgstr "无法打开邮件目录路径: %s: %s"
# camel/providers/imap/camel-imap-provider.c:43
# camel/providers/imap/camel-imap-provider.c:43
# camel/providers/imap/camel-imap-provider.c:43
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
#, fuzzy
msgid "Checking folder consistency"
msgstr "正在检查新邮件"
@@ -15572,7 +15881,7 @@ msgstr "正在检查新邮件"
# camel/providers/imap/camel-imap-folder.c:1746
# camel/providers/imap/camel-imap-folder.c:1746
# camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
#, fuzzy
msgid "Checking for new messages"
msgstr "正在扫描新邮件"
@@ -15595,10 +15904,10 @@ msgstr "正在扫描新邮件"
# camel/providers/local/camel-spool-summary.c:378
# camel/providers/local/camel-spool-summary.c:643
# camel/providers/local/camel-spool-summary.c:935
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
#: camel/providers/local/camel-spool-summary.c:145
msgid "Storing folder"
msgstr "正在存储文件夹"
@@ -15693,7 +16002,7 @@ msgstr "邮件构造失败:邮件箱已损坏?"
# camel/providers/local/camel-mbox-store.c:93
# camel/providers/local/camel-mbox-store.c:93
# camel/providers/local/camel-mbox-store.c:93
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
#, c-format
msgid ""
"Could not open file `%s':\n"
@@ -15705,7 +16014,7 @@ msgstr ""
# camel/providers/local/camel-mbox-store.c:109
# camel/providers/local/camel-mbox-store.c:109
# camel/providers/local/camel-mbox-store.c:109
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
#, c-format
msgid ""
"Could not create file `%s':\n"
@@ -15720,8 +16029,8 @@ msgstr ""
# camel/providers/local/camel-mbox-store.c:145
# camel/providers/local/camel-mbox-store.c:118
# camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
#, c-format
msgid "`%s' is not a regular file."
msgstr "“%s”并不是普通文件。"
@@ -15732,8 +16041,8 @@ msgstr "“%s”并不是普通文件。"
# camel/providers/local/camel-mbox-store.c:160
# camel/providers/local/camel-mbox-store.c:137
# camel/providers/local/camel-mbox-store.c:160
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
#, c-format
msgid ""
"Could not delete folder `%s':\n"
@@ -15745,7 +16054,7 @@ msgstr ""
# camel/providers/local/camel-mbox-store.c:152
# camel/providers/local/camel-mbox-store.c:152
# camel/providers/local/camel-mbox-store.c:152
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
#, c-format
msgid "Folder `%s' is not empty. Not deleted."
msgstr "文件夹“%s”非空。没有删除。"
@@ -15778,7 +16087,7 @@ msgstr "在文件夹 %2$s 中邻近 %1$ld 的位置出现致命的解析错误"
# camel/providers/local/camel-spool-summary.c:497
# camel/providers/local/camel-mbox-summary.c:370
# camel/providers/local/camel-spool-summary.c:497
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "无法检查文件夹: %s: %s"
@@ -15792,8 +16101,8 @@ msgstr "无法检查文件夹: %s: %s"
# camel/providers/local/camel-mbox-summary.c:502
# camel/providers/local/camel-mbox-summary.c:703
# camel/providers/local/camel-spool-summary.c:648
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
#: camel/providers/local/camel-spool-summary.c:150
#, c-format
msgid "Could not open file: %s: %s"
@@ -15805,7 +16114,7 @@ msgstr "无法打开文件: %s: %s"
# camel/providers/local/camel-spool-summary.c:672
# camel/providers/local/camel-mbox-summary.c:519
# camel/providers/local/camel-spool-summary.c:672
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
#: camel/providers/local/camel-spool-summary.c:169
#, c-format
msgid "Cannot open temporary mailbox: %s"
@@ -15820,8 +16129,8 @@ msgstr "无法打开临时邮件箱: %s"
# camel/providers/local/camel-mbox-summary.c:630
# camel/providers/local/camel-mbox-summary.c:799
# camel/providers/local/camel-spool-summary.c:1036
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "无法关闭来源文件夹 %s: %s"
@@ -15829,7 +16138,7 @@ msgstr "无法关闭来源文件夹 %s: %s"
# camel/providers/local/camel-mbox-summary.c:639
# camel/providers/local/camel-mbox-summary.c:639
# camel/providers/local/camel-mbox-summary.c:639
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
#, c-format
msgid "Could not close temp folder: %s"
msgstr "无法关闭临时文件夹: %s"
@@ -15837,7 +16146,7 @@ msgstr "无法关闭临时文件夹: %s"
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
#, c-format
msgid "Could not rename folder: %s"
msgstr "无法重命名文件夹: %s"
@@ -15866,10 +16175,10 @@ msgstr "无法重命名文件夹: %s"
# camel/providers/local/camel-spool-summary.c:705
# camel/providers/local/camel-spool-summary.c:978
# camel/providers/local/camel-spool-summary.c:986
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
msgid "Summary and folder mismatch, even after a sync"
msgstr "即使同步后,概要和文件夹仍然不匹配"
@@ -15882,7 +16191,7 @@ msgstr "即使同步后,概要和文件夹仍然不匹配"
# camel/providers/local/camel-mbox-summary.c:873
# camel/providers/local/camel-spool-summary.c:544
# camel/providers/local/camel-spool-summary.c:1110
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
#: camel/providers/local/camel-spool-summary.c:332
#, c-format
msgid "Unknown error: %s"
@@ -15891,7 +16200,7 @@ msgstr "未知的错误: %s"
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
#, fuzzy, c-format
msgid "Could not store folder: %s"
msgstr "无法重命名文件夹: %s"
@@ -15902,7 +16211,7 @@ msgstr "无法重命名文件夹: %s"
# camel/providers/local/camel-spool-summary.c:749
# camel/providers/local/camel-mbox-summary.c:595
# camel/providers/local/camel-spool-summary.c:749
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
#, c-format
msgid "Error writing to temp mailbox: %s"
msgstr "写入临时文件夹错误: %s"
@@ -15913,7 +16222,7 @@ msgstr "写入临时文件夹错误: %s"
# camel/providers/local/camel-spool-summary.c:771
# camel/providers/local/camel-mbox-summary.c:612
# camel/providers/local/camel-spool-summary.c:771
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
#, c-format
msgid "Writing to tmp mailbox failed: %s: %s"
msgstr "写入临时文件夹失败: %s: %s"
@@ -16165,7 +16474,7 @@ msgstr "操作失败:%s"
# camel/providers/pop3/camel-pop3-folder.c:175
# camel/providers/pop3/camel-pop3-folder.c:175
# camel/providers/pop3/camel-pop3-folder.c:175
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
msgid "Retrieving POP summary"
msgstr "检索 POP 概要"
@@ -16178,10 +16487,10 @@ msgstr "检索 POP 概要"
# camel/providers/imap/camel-imap-command.c:228
# camel/providers/imap/camel-imap-command.c:409
# camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
msgid "User cancelled"
msgstr "用户已取消"
@@ -16203,7 +16512,7 @@ msgstr "用户已取消"
# camel/providers/local/camel-spool-folder.c:579
# camel/providers/nntp/camel-nntp-folder.c:153
# camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
#, c-format
msgid "Cannot get POP summary: %s"
msgstr "无法获取消息 POP 摘要:%s"
@@ -16211,14 +16520,14 @@ msgstr "无法获取消息 POP 摘要:%s"
# camel/providers/pop3/camel-pop3-folder.c:252
# camel/providers/pop3/camel-pop3-folder.c:252
# camel/providers/pop3/camel-pop3-folder.c:252
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
msgid "Expunging deleted messages"
msgstr "彻底去除已删除的邮件"
# camel/providers/pop3/camel-pop3-folder.c:367
# camel/providers/pop3/camel-pop3-folder.c:367
# camel/providers/pop3/camel-pop3-folder.c:367
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
#, c-format
msgid "No message with uid %s"
msgstr "没有 uid 为 %s 的邮件"
@@ -16228,7 +16537,7 @@ msgstr "没有 uid 为 %s 的邮件"
# camel/providers/pop3/camel-pop3-folder.c:371
#. Sigh, most of the crap in this function is so that the cancel button
#. returns the proper exception code. Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
#, c-format
msgid "Retrieving POP message %d"
msgstr "检索 POP 邮件 %d"
@@ -16251,10 +16560,10 @@ msgstr "检索 POP 邮件 %d"
# camel/providers/local/camel-spool-folder.c:579
# camel/providers/nntp/camel-nntp-folder.c:153
# camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
#, c-format
msgid "Cannot get message %s: %s"
msgstr "无法获取消息 %s:%s"
@@ -16262,7 +16571,7 @@ msgstr "无法获取消息 %s:%s"
# my-evolution/metar.c:247
# my-evolution/metar.c:247
# my-evolution/metar.c:247
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
msgid "Unknown reason"
msgstr "未知原因"
@@ -16291,7 +16600,7 @@ msgstr "%s 天之后删除"
# camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
# camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
# camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:59
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
msgid "POP"
msgstr "POP"
@@ -16325,6 +16634,17 @@ msgstr ""
"该选项使 Evolution 在连接到 POP 服务器时使用 APOP 协议。即使是声称支持这一功"
"能的服务器,也不一定能使所有用户工作。"
+# camel/camel-remote-store.c:267
+# camel/providers/smtp/camel-smtp-transport.c:273
+# camel/camel-remote-store.c:267
+# camel/providers/smtp/camel-smtp-transport.c:273
+# camel/camel-remote-store.c:267
+# camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "无法连接到 %s (端口 %d): %s"
+
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
@@ -16342,17 +16662,18 @@ msgstr ""
# camel/providers/pop3/camel-pop3-store.c:321
#: camel/providers/pop3/camel-pop3-store.c:351
#, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
msgstr "无法连接到在 %s 的 POP 服务器。"
# camel/providers/pop3/camel-pop3-store.c:407
# camel/providers/pop3/camel-pop3-store.c:407
# camel/providers/pop3/camel-pop3-store.c:407
#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
msgstr ""
"无法连接到 POP 服务器。\n"
"不支持所要求的验证机制。"
@@ -16361,26 +16682,27 @@ msgstr ""
# camel/providers/imap/camel-imap-command.c:362
# camel/providers/imap/camel-imap-command.c:362
#: camel/providers/pop3/camel-pop3-store.c:408
-#, c-format
-msgid "SASL `%s' Login failed: %s"
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed for POP server %s: %s"
msgstr "SASL“%s”登录失败:%s"
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
-msgstr "SASL 协议错误"
-
-# shell/e-storage.c:506
-# shell/e-storage.c:506
-# shell/e-storage.c:506
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:420
#, c-format
-msgid "I/O Error: %s"
-msgstr "输入输出错误:%s"
+msgid "Cannot login to POP server %s: SASL Protocol error"
+msgstr ""
+
+# camel/providers/pop3/camel-pop3-store.c:198
+# camel/providers/pop3/camel-pop3-store.c:198
+# camel/providers/pop3/camel-pop3-store.c:198
+#: camel/providers/pop3/camel-pop3-store.c:436
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "无法认证到 KPOP 服务器: %s"
# camel/providers/pop3/camel-pop3-store.c:360
# camel/providers/pop3/camel-pop3-store.c:360
# camel/providers/pop3/camel-pop3-store.c:360
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
#, c-format
msgid "%sPlease enter the POP password for %s@%s"
msgstr "%s请为 %s@%s 输入 POP 密码"
@@ -16388,11 +16710,11 @@ msgstr "%s请为 %s@%s 输入 POP 密码"
# camel/providers/pop3/camel-pop3-store.c:415
# camel/providers/pop3/camel-pop3-store.c:415
# camel/providers/pop3/camel-pop3-store.c:415
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
"Error sending password: %s"
msgstr ""
"无法连接到 POP 服务器。\n"
@@ -16401,7 +16723,7 @@ msgstr ""
# camel/providers/pop3/camel-pop3-store.c:480
# camel/providers/pop3/camel-pop3-store.c:480
# camel/providers/pop3/camel-pop3-store.c:480
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
#, c-format
msgid "No such folder `%s'."
msgstr "没有文件夹“%s”。"
@@ -16413,7 +16735,7 @@ msgstr "没有文件夹“%s”。"
# camel/providers/sendmail/camel-sendmail-provider.c:36
# mail/mail-config.glade.h:81
#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
msgid "Sendmail"
msgstr "Sendmail"
@@ -16452,7 +16774,7 @@ msgstr "无法创建 sendmail 进程: %s: 邮件未发送"
# camel/providers/sendmail/camel-sendmail-transport.c:149
# camel/providers/sendmail/camel-sendmail-transport.c:149
# camel/providers/sendmail/camel-sendmail-transport.c:150
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
#, c-format
msgid "Could not send message: %s"
msgstr "无法发送邮件: %s"
@@ -16460,7 +16782,7 @@ msgstr "无法发送邮件: %s"
# camel/providers/sendmail/camel-sendmail-transport.c:162
# camel/providers/sendmail/camel-sendmail-transport.c:162
# camel/providers/sendmail/camel-sendmail-transport.c:163
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr "sendmail 以信号 %s 退出: 邮件未发送。"
@@ -16468,7 +16790,7 @@ msgstr "sendmail 以信号 %s 退出: 邮件未发送。"
# camel/providers/sendmail/camel-sendmail-transport.c:169
# camel/providers/sendmail/camel-sendmail-transport.c:169
# camel/providers/sendmail/camel-sendmail-transport.c:170
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr "无法执行 %s: 邮件未发送。"
@@ -16476,7 +16798,7 @@ msgstr "无法执行 %s: 邮件未发送。"
# camel/providers/sendmail/camel-sendmail-transport.c:174
# camel/providers/sendmail/camel-sendmail-transport.c:174
# camel/providers/sendmail/camel-sendmail-transport.c:175
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr "sendmail 以状态码 %d 退出: 邮件未发送。"
@@ -16484,21 +16806,21 @@ msgstr "sendmail 以状态码 %d 退出: 邮件未发送。"
# camel/providers/sendmail/camel-sendmail-transport.c:246
# camel/providers/sendmail/camel-sendmail-transport.c:246
# camel/providers/sendmail/camel-sendmail-transport.c:259
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
msgid "sendmail"
msgstr "sendmail"
# camel/providers/sendmail/camel-sendmail-transport.c:248
# camel/providers/sendmail/camel-sendmail-transport.c:248
# camel/providers/sendmail/camel-sendmail-transport.c:261
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
msgid "Mail delivery via the sendmail program"
msgstr "通过 sendmail 程序发送邮件"
# camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
# camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
# camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:74
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
msgid "SMTP"
msgstr "SMTP"
@@ -16684,19 +17006,19 @@ msgstr "临时认证失败"
msgid "Authentication required"
msgstr "必须认证"
-# camel/providers/smtp/camel-smtp-transport.c:317
-# camel/providers/smtp/camel-smtp-transport.c:317
-# camel/providers/smtp/camel-smtp-transport.c:320
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Welcome 应答错误: %s: 可能不致命"
+# camel/providers/smtp/camel-smtp-transport.c:1110
+# camel/providers/smtp/camel-smtp-transport.c:1110
+# camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "QUIT 应答错误"
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
#, fuzzy, c-format
msgid "Failed to connect to SMTP server %s in secure mode: %s"
msgstr ""
@@ -16706,7 +17028,7 @@ msgstr ""
# calendar/gui/e-itip-control.c:1064
# calendar/gui/e-itip-control.c:1064
# calendar/gui/e-itip-control.c:1138
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
#, fuzzy
msgid "server does not appear to support SSL"
msgstr "邮件的格式可能不正确"
@@ -16714,7 +17036,7 @@ msgstr "邮件的格式可能不正确"
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1199
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
#, fuzzy, c-format
msgid "STARTTLS request timed out: %s"
msgstr "RSET 请求超时: %s"
@@ -16722,7 +17044,7 @@ msgstr "RSET 请求超时: %s"
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1104
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
#, fuzzy
msgid "STARTTLS response error"
msgstr "DATA 应答错误"
@@ -16730,7 +17052,7 @@ msgstr "DATA 应答错误"
# camel/providers/smtp/camel-smtp-transport.c:379
# camel/providers/smtp/camel-smtp-transport.c:379
# camel/providers/smtp/camel-smtp-transport.c:383
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
#, fuzzy, c-format
msgid "SMTP server %s does not support requested authentication type %s."
msgstr "SMTP 服务器 %s 并不支持请求的认证类型 %s"
@@ -16738,7 +17060,7 @@ msgstr "SMTP 服务器 %s 并不支持请求的认证类型 %s"
# camel/providers/smtp/camel-smtp-transport.c:417
# camel/providers/smtp/camel-smtp-transport.c:417
# camel/providers/smtp/camel-smtp-transport.c:421
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
#, c-format
msgid "%sPlease enter the SMTP password for %s@%s"
msgstr "%s请为 %s@%s 输入 SMTP 密码"
@@ -16746,7 +17068,7 @@ msgstr "%s请为 %s@%s 输入 SMTP 密码"
# camel/providers/smtp/camel-smtp-transport.c:438
# camel/providers/smtp/camel-smtp-transport.c:438
# camel/providers/smtp/camel-smtp-transport.c:442
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -16760,7 +17082,7 @@ msgstr ""
# camel/providers/smtp/camel-smtp-transport.c:554
# camel/providers/smtp/camel-smtp-transport.c:554
# camel/providers/smtp/camel-smtp-transport.c:565
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
#, c-format
msgid "SMTP server %s"
msgstr "SMTP 服务器 %s"
@@ -16768,7 +17090,7 @@ msgstr "SMTP 服务器 %s"
# camel/providers/smtp/camel-smtp-transport.c:556
# camel/providers/smtp/camel-smtp-transport.c:556
# camel/providers/smtp/camel-smtp-transport.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "通过 %s 发送 SMTP 邮件"
@@ -16776,65 +17098,65 @@ msgstr "通过 %s 发送 SMTP 邮件"
# camel/providers/smtp/camel-smtp-transport.c:588
# camel/providers/smtp/camel-smtp-transport.c:588
# camel/providers/smtp/camel-smtp-transport.c:598
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
msgid "Cannot send message: sender address not valid."
msgstr "无法发送邮件: 发件人地址不合法。"
# camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:558
# camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:560
# camel/providers/smtp/camel-smtp-transport.c:603 mail/mail-ops.c:603
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
msgid "Sending message"
msgstr "正在发送邮件"
# camel/providers/smtp/camel-smtp-transport.c:604
# camel/providers/smtp/camel-smtp-transport.c:604
# camel/providers/smtp/camel-smtp-transport.c:614
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
msgid "Cannot send message: no recipients defined."
msgstr "无法发送邮件: 没有定义收件人。"
# camel/providers/smtp/camel-smtp-transport.c:604
# camel/providers/smtp/camel-smtp-transport.c:604
# camel/providers/smtp/camel-smtp-transport.c:624
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
msgid "Cannot send message: one or more invalid recipients"
msgstr "无法发送消息:一个或多个非法收件人"
# camel/providers/smtp/camel-smtp-transport.c:684
# camel/providers/smtp/camel-smtp-transport.c:684
# camel/providers/smtp/camel-smtp-transport.c:798
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
msgid "SMTP Greeting"
msgstr "SMTP 欢迎"
-# camel/providers/smtp/camel-smtp-transport.c:706
-# camel/providers/smtp/camel-smtp-transport.c:706
-# camel/providers/smtp/camel-smtp-transport.c:820
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "HELLO 请求超时: %s: 非致命"
-
-# camel/providers/smtp/camel-smtp-transport.c:726
-# camel/providers/smtp/camel-smtp-transport.c:726
-# camel/providers/smtp/camel-smtp-transport.c:840
+# camel/providers/smtp/camel-smtp-transport.c:1091
+# camel/providers/smtp/camel-smtp-transport.c:1091
+# camel/providers/smtp/camel-smtp-transport.c:1199
#: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "HELLO 应答错误: %s: 非致命"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "RSET 请求超时: %s"
+
+# camel/providers/smtp/camel-smtp-transport.c:1110
+# camel/providers/smtp/camel-smtp-transport.c:1110
+# camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "RSET 应答错误"
# camel/providers/smtp/camel-smtp-transport.c:758
# camel/providers/smtp/camel-smtp-transport.c:758
# camel/providers/smtp/camel-smtp-transport.c:883
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:979
msgid "SMTP Authentication"
msgstr "SMTP 认证"
# camel/providers/smtp/camel-smtp-transport.c:764
# camel/providers/smtp/camel-smtp-transport.c:764
# camel/providers/smtp/camel-smtp-transport.c:889
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
msgid "Error creating SASL authentication object."
msgstr "创建 SASL 认证对象错误。"
@@ -16844,8 +17166,8 @@ msgstr "创建 SASL 认证对象错误。"
# camel/providers/smtp/camel-smtp-transport.c:791
# camel/providers/smtp/camel-smtp-transport.c:904
# camel/providers/smtp/camel-smtp-transport.c:916
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
#, c-format
msgid "AUTH request timed out: %s"
msgstr "AUTH 请求超时: %s"
@@ -16853,21 +17175,21 @@ msgstr "AUTH 请求超时: %s"
# camel/providers/smtp/camel-smtp-transport.c:800
# camel/providers/smtp/camel-smtp-transport.c:800
# camel/providers/smtp/camel-smtp-transport.c:925
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
msgid "AUTH request failed."
msgstr "AUTH 请求失败。"
# camel/providers/smtp/camel-smtp-transport.c:848
# camel/providers/smtp/camel-smtp-transport.c:848
# camel/providers/smtp/camel-smtp-transport.c:973
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
msgid "Bad authentication response from server.\n"
msgstr "来自服务器的错误认证应答。\n"
# camel/providers/smtp/camel-smtp-transport.c:874
# camel/providers/smtp/camel-smtp-transport.c:874
# camel/providers/smtp/camel-smtp-transport.c:999
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr "MAIL FROM 请求超时: %s: 邮件未发送"
@@ -16875,20 +17197,20 @@ msgstr "MAIL FROM 请求超时: %s: 邮件未发送"
# camel/providers/smtp/camel-smtp-transport.c:893
# camel/providers/smtp/camel-smtp-transport.c:893
# camel/providers/smtp/camel-smtp-transport.c:1013
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
msgid "MAIL FROM response error"
msgstr "MAIL FROM 应答错误"
# camel/providers/smtp/camel-smtp-transport.c:918
# camel/providers/smtp/camel-smtp-transport.c:918
# camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
#, c-format
msgid "RCPT TO request timed out: %s: mail not sent"
msgstr "RCPT TO 请求超时: %s: 邮件未发送"
# camel/providers/smtp/camel-smtp-transport.c:1054
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
#, c-format
msgid "RCPT TO <%s> failed"
msgstr "RCPT TO <%s> 失败"
@@ -16896,7 +17218,7 @@ msgstr "RCPT TO <%s> 失败"
# camel/providers/smtp/camel-smtp-transport.c:971
# camel/providers/smtp/camel-smtp-transport.c:971
# camel/providers/smtp/camel-smtp-transport.c:1090
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr "DATA 请求超时: %s: 邮件未发送"
@@ -16907,7 +17229,7 @@ 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:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
msgid "DATA response error"
msgstr "DATA 应答错误"
@@ -16917,8 +17239,8 @@ msgstr "DATA 应答错误"
# camel/providers/smtp/camel-smtp-transport.c:1048
# camel/providers/smtp/camel-smtp-transport.c:1144
# camel/providers/smtp/camel-smtp-transport.c:1162
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr "DATA 发送超时: 消息终止: %s: 邮件未发送"
@@ -16928,14 +17250,14 @@ msgstr "DATA 发送超时: 消息终止: %s: 邮件未发送"
# camel/camel-sasl-kerberos4.c:218
# camel/providers/imap/camel-imap-store.c:495
# camel/providers/smtp/camel-smtp-transport.c:1176
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
msgid "DATA termination response error"
msgstr "DATA 终止应答错误"
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1199
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
#, c-format
msgid "RSET request timed out: %s"
msgstr "RSET 请求超时: %s"
@@ -16943,36 +17265,39 @@ msgstr "RSET 请求超时: %s"
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1213
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
msgid "RSET response error"
msgstr "RSET 应答错误"
-# camel/providers/smtp/camel-smtp-transport.c:1133
-# camel/providers/smtp/camel-smtp-transport.c:1133
-# camel/providers/smtp/camel-smtp-transport.c:1236
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "QUIT 请求超时: %s: 非致命"
+# camel/providers/smtp/camel-smtp-transport.c:779
+# camel/providers/smtp/camel-smtp-transport.c:791
+# camel/providers/smtp/camel-smtp-transport.c:779
+# camel/providers/smtp/camel-smtp-transport.c:791
+# camel/providers/smtp/camel-smtp-transport.c:904
+# camel/providers/smtp/camel-smtp-transport.c:916
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "AUTH 请求超时: %s"
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1250
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
msgid "QUIT response error"
msgstr "QUIT 应答错误"
# composer/e-msg-composer-attachment-bar.c:101
# composer/e-msg-composer-attachment-bar.c:101
# composer/e-msg-composer-attachment-bar.c:101
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
msgid "1 byte"
msgstr "1 字节"
# composer/e-msg-composer-attachment-bar.c:103
# composer/e-msg-composer-attachment-bar.c:103
# composer/e-msg-composer-attachment-bar.c:103
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
#, c-format
msgid "%u bytes"
msgstr "%u 字节"
@@ -16980,7 +17305,7 @@ msgstr "%u 字节"
# composer/e-msg-composer-attachment-bar.c:110
# composer/e-msg-composer-attachment-bar.c:110
# composer/e-msg-composer-attachment-bar.c:110
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
#, c-format
msgid "%.1fK"
msgstr "%.1fK"
@@ -16988,7 +17313,7 @@ msgstr "%.1fK"
# composer/e-msg-composer-attachment-bar.c:114
# composer/e-msg-composer-attachment-bar.c:114
# composer/e-msg-composer-attachment-bar.c:114
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
#, c-format
msgid "%.1fM"
msgstr "%.1fM"
@@ -16996,7 +17321,7 @@ msgstr "%.1fM"
# composer/e-msg-composer-attachment-bar.c:118
# composer/e-msg-composer-attachment-bar.c:118
# composer/e-msg-composer-attachment-bar.c:118
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
#, c-format
msgid "%.1fG"
msgstr "%.1fG"
@@ -17005,28 +17330,28 @@ msgstr "%.1fG"
# composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:136
# composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:135
#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
msgid "attachment"
msgstr "附件"
# composer/e-msg-composer-attachment-bar.c:500
# composer/e-msg-composer-attachment-bar.c:506
# composer/e-msg-composer-attachment-bar.c:506
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
msgid "Remove selected items from the attachment list"
msgstr "从附件列表中删除选定的条目"
# composer/e-msg-composer-attachment-bar.c:531
# composer/e-msg-composer-attachment-bar.c:537
# composer/e-msg-composer-attachment-bar.c:537
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
msgid "Add attachment..."
msgstr "添加附件..."
# composer/e-msg-composer-attachment-bar.c:532
# composer/e-msg-composer-attachment-bar.c:538
# composer/e-msg-composer-attachment-bar.c:538
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
msgid "Attach a file to the message"
msgstr "把文件附件到邮件"
@@ -17036,8 +17361,8 @@ msgstr "把文件附件到邮件"
# composer/e-msg-composer-attachment.c:184
# composer/e-msg-composer-attachment.c:168
# composer/e-msg-composer-attachment.c:184
-#: 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"
@@ -17045,7 +17370,7 @@ msgstr "无法附加文件 %s: %s"
# composer/e-msg-composer-attachment.c:176
# composer/e-msg-composer-attachment.c:176
# composer/e-msg-composer-attachment.c:176
-#: 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:不是普通文件"
@@ -17078,98 +17403,113 @@ msgstr "MIME 类型:"
# composer/e-msg-composer-attachment.glade.h:5
# composer/e-msg-composer-select-file.c:180
#: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
msgid "Suggest automatic display of attachment"
msgstr "建议自动显示附件"
# composer/e-msg-composer-hdrs.c:327
# composer/e-msg-composer-hdrs.c:327
# composer/e-msg-composer-hdrs.c:326
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
msgid "Click here for the address book"
msgstr "点击此处以使用地址簿"
-# composer/e-msg-composer-hdrs.c:358
-# composer/e-msg-composer-hdrs.c:358
-# composer/e-msg-composer-hdrs.c:356
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "发件人:"
-
# composer/e-msg-composer-hdrs.c:364
# composer/e-msg-composer-hdrs.c:364
# composer/e-msg-composer-hdrs.c:362
#.
#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
#.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
msgid "Reply-To:"
msgstr "回复到:"
+# composer/e-msg-composer-hdrs.c:358
+# composer/e-msg-composer-hdrs.c:358
+# composer/e-msg-composer-hdrs.c:356
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "发件人:"
+
# composer/e-msg-composer-hdrs.c:375
# composer/e-msg-composer-hdrs.c:375
# composer/e-msg-composer-hdrs.c:373
#.
-#. * Subject:
+#. * Subject
#.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
msgid "Subject:"
msgstr "主题:"
# composer/e-msg-composer-hdrs.c:389
# composer/e-msg-composer-hdrs.c:389
# composer/e-msg-composer-hdrs.c:387
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
msgid "To:"
msgstr "收信人:"
# composer/e-msg-composer-hdrs.c:390
# composer/e-msg-composer-hdrs.c:390
# composer/e-msg-composer-hdrs.c:388
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
msgid "Enter the recipients of the message"
msgstr "输入邮件的收件人"
# composer/e-msg-composer-hdrs.c:393
# composer/e-msg-composer-hdrs.c:393
# composer/e-msg-composer-hdrs.c:391
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
msgid "Cc:"
msgstr "抄送:"
# composer/e-msg-composer-hdrs.c:394
# composer/e-msg-composer-hdrs.c:394
# composer/e-msg-composer-hdrs.c:392
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "输入将接收该邮件副本的收件人地址"
# composer/e-msg-composer-hdrs.c:397
# composer/e-msg-composer-hdrs.c:397
# composer/e-msg-composer-hdrs.c:395
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
msgid "Bcc:"
msgstr "暗中抄送:"
# composer/e-msg-composer-hdrs.c:398
# composer/e-msg-composer-hdrs.c:398
# composer/e-msg-composer-hdrs.c:396
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
msgstr "输入将接收该邮件副本,但不出现在收件人列表中的收件人地址。"
+# addressbook/gui/component/addressbook-config.glade.h:27
+# addressbook/gui/component/addressbook-config.glade.h:27
+# my-evolution/Locations.h:1783
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "波尔图"
+
# composer/e-msg-composer-select-file.c:228
# ui/evolution-message-composer.xml.h:2
# composer/e-msg-composer-select-file.c:290
# ui/evolution-message-composer.xml.h:2
# composer/e-msg-composer-select-file.c:291
# ui/evolution-message-composer.xml.h:2
-#: composer/e-msg-composer-select-file.c:267
+#: composer/e-msg-composer-select-file.c:274
#: ui/evolution-message-composer.xml.h:2
msgid "Attach a file"
msgstr "附件一个文件"
@@ -17177,7 +17517,7 @@ msgstr "附件一个文件"
# mail/mail-crypto.c:59
# mail/mail-crypto.c:59
# mail/mail-crypto.c:59
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
#, fuzzy
msgid "Could not create a PGP signature context"
msgstr "无法创建 PGP 签名上下文。"
@@ -17185,7 +17525,7 @@ msgstr "无法创建 PGP 签名上下文。"
# composer/e-msg-composer.c:743
# composer/e-msg-composer.c:747
# composer/e-msg-composer.c:695
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
#, c-format
msgid ""
"Error while reading file %s:\n"
@@ -17197,21 +17537,21 @@ msgstr ""
# composer/e-msg-composer.c:952
# composer/e-msg-composer.c:956
# composer/e-msg-composer.c:921
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
msgid "Warning!"
msgstr "警告!"
# composer/e-msg-composer.c:956
# composer/e-msg-composer.c:960
# composer/e-msg-composer.c:925
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
msgid "File exists, overwrite?"
msgstr "文件存在,覆盖它?"
# composer/e-msg-composer.c:978
# composer/e-msg-composer.c:982
# composer/e-msg-composer.c:947
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
#, c-format
msgid "Error saving file: %s"
msgstr "保存文件错误: %s"
@@ -17219,7 +17559,7 @@ msgstr "保存文件错误: %s"
# composer/e-msg-composer.c:997
# composer/e-msg-composer.c:1001
# composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
#, c-format
msgid "Error loading file: %s"
msgstr "读入文件错误: %s"
@@ -17227,7 +17567,7 @@ msgstr "读入文件错误: %s"
# composer/e-msg-composer.c:1118
# composer/e-msg-composer.c:1032
# composer/e-msg-composer.c:997
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
#, c-format
msgid "Error accessing file: %s"
msgstr "访问文件错误: %s"
@@ -17235,14 +17575,14 @@ msgstr "访问文件错误: %s"
# composer/e-msg-composer.c:1126
# composer/e-msg-composer.c:1040
# composer/e-msg-composer.c:1005
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
msgid "Unable to retrieve message from editor"
msgstr "无法从编辑器检索邮件"
# composer/e-msg-composer.c:1133
# composer/e-msg-composer.c:1047
# composer/e-msg-composer.c:1012
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
#, c-format
msgid ""
"Unable to seek on file: %s\n"
@@ -17254,7 +17594,7 @@ msgstr ""
# composer/e-msg-composer.c:1140
# composer/e-msg-composer.c:1054
# composer/e-msg-composer.c:1019
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
#, c-format
msgid ""
"Unable to truncate file: %s\n"
@@ -17266,7 +17606,7 @@ msgstr ""
# composer/e-msg-composer.c:1149
# composer/e-msg-composer.c:1063
# composer/e-msg-composer.c:1028
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
#, c-format
msgid ""
"Error autosaving message: %s\n"
@@ -17278,7 +17618,7 @@ msgstr ""
# composer/e-msg-composer.c:1251
# composer/e-msg-composer.c:1165
# composer/e-msg-composer.c:1130
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
msgid ""
"Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"
@@ -17289,7 +17629,7 @@ msgstr ""
# composer/e-msg-composer.c:1405
# composer/e-msg-composer.c:1322
# composer/e-msg-composer.c:1288
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
msgid ""
"This message has not been sent.\n"
"\n"
@@ -17302,25 +17642,18 @@ msgstr ""
# composer/e-msg-composer.c:1412
# composer/e-msg-composer.c:1329
# composer/e-msg-composer.c:1295
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
msgid "Warning: Modified Message"
msgstr "警告: 已改动的邮件"
# composer/e-msg-composer.c:1435
# composer/e-msg-composer.c:1352
# composer/e-msg-composer.c:1318
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
msgid "Open file"
msgstr "打开文件"
-# composer/e-msg-composer.c:1584
-# composer/e-msg-composer.c:1501
-# composer/e-msg-composer.c:1467
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "插入文件"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
msgid ""
"Can't set default signature for this account. Maybe accounts were modified "
"meanwhile?"
@@ -17329,19 +17662,19 @@ msgstr ""
# mail/mail-config.glade.h:79
# mail/mail-config.glade.h:79
# mail/mail-config.glade.h:88
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
#, fuzzy
msgid "Signature:"
msgstr "签名文件:"
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
msgid "Autogenerated"
msgstr ""
# mail/mail-accounts.c:149
# mail/mail-accounts.c:149
# mail/mail-accounts.c:149
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
#, fuzzy
msgid "Set as default"
msgstr "(默认)"
@@ -17349,14 +17682,14 @@ msgstr "(默认)"
# composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
# composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
# composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2334
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
msgid "Compose a message"
msgstr "撰写邮件"
# composer/e-msg-composer.c:2440
# composer/e-msg-composer.c:2380
# composer/e-msg-composer.c:2351
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
@@ -17367,7 +17700,7 @@ msgstr ""
# composer/e-msg-composer.c:2463 composer/e-msg-composer.c:2518
# composer/e-msg-composer.c:2403 composer/e-msg-composer.c:2458
# composer/e-msg-composer.c:2374 composer/e-msg-composer.c:2429
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
@@ -17375,9 +17708,9 @@ msgstr ""
"无法创见撰写窗口:\n"
"无法激活 HTML 编辑器组件。"
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
msgstr ""
@@ -17489,8 +17822,8 @@ msgstr "主题不含有"
# mail/mail-display.c:106
# calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2070
# mail/mail-display.c:105
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -17501,15 +17834,14 @@ msgstr ""
# e-util/e-passwords.c:360 mail/mail-session.c:267
# e-util/e-passwords.c:360 mail/mail-session.c:267
# e-util/e-passwords.c:360 mail/mail-session.c:269
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
msgid "Remember this password"
msgstr "记住该密码"
# e-util/e-passwords.c:362 mail/mail-session.c:268
# e-util/e-passwords.c:362 mail/mail-session.c:268
# e-util/e-passwords.c:362 mail/mail-session.c:270
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
msgid "Remember this password for the remainder of this session"
msgstr "在本会话中记住该密码"
@@ -17664,129 +17996,85 @@ msgstr "%H:%M"
msgid "%I %p"
msgstr "%I %p"
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "年"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "年"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "秒"
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "月"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "分钟"
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "月"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "小时"
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
msgid "week"
msgstr "周"
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
msgid "weeks"
msgstr "周"
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "小时"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "月"
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "分钟"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "月"
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "秒"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "年"
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "年"
+
+#: filter/filter-datespec.c:174
msgid "You have forgotten to choose a date."
msgstr "您忘记选择日期了。"
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "您选择了无效的日期。"
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"邮件的日期将与过滤规则运行的\n"
-"日期或者虚拟文件夹打开的\n"
-"日期进行比较。"
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"邮件的日期将与您在这里\n"
-"指定的日期进行比较。"
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"邮件的日期将于相对于过滤规则\n"
-"运行的时间进行比较;\n"
-"例如:“一周以前”。"
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "当前时间"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "您指定的时间"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "相对于当前时间的时间"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "选择用于比较的时间"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "比较"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<点击这里以选择日期>"
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
msgid "now"
msgstr "现在"
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " 过去"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "过去"
+# calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+# calendar/gui/calendar-commands.c:458
+# calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+# calendar/gui/calendar-commands.c:458
+# calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+# calendar/gui/calendar-commands.c:458
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%Y %b %d %a"
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " 过去"
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<点击这里以选择日期>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "选择用于比较的时间"
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
msgid "Filter Rules"
msgstr "过滤规则"
# addressbook/printing/e-contact-print.glade.h:38
# addressbook/printing/e-contact-print.glade.h:38
# mail/mail-config.glade.h:92
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
#, fuzzy
msgid "You must specify a file name"
msgstr "指定文件名:"
@@ -17794,7 +18082,7 @@ msgstr "指定文件名:"
# camel/providers/local/camel-spool-store.c:115
# camel/providers/local/camel-spool-store.c:115
# camel/providers/local/camel-spool-store.c:115
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
#, fuzzy, c-format
msgid "File '%s' does not exist or is not a regular file."
msgstr "脱机文件“%s”不存在或不是普通文件"
@@ -17802,21 +18090,21 @@ msgstr "脱机文件“%s”不存在或不是普通文件"
# ui/evolution-message-composer.xml.h:14
# ui/evolution-message-composer.xml.h:14
# ui/evolution-message-composer.xml.h:14
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
#, fuzzy
msgid "Choose a file"
msgstr "打开文件"
#. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
msgid "Then"
msgstr "则"
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
msgid "Add action"
msgstr "添加动作"
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
msgid ""
"You forgot to choose a folder.\n"
"Please go back and specify a valid folder to deliver mail to."
@@ -17827,12 +18115,12 @@ msgstr ""
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:834
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
msgid "Select Folder"
msgstr "选择文件夹"
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
#, c-format
msgid ""
"Error in regular expression '%s':\n"
@@ -17841,91 +18129,175 @@ msgstr ""
"常规表达式错误 “%s”:\n"
"%s"
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "重要"
+
+# my-evolution/Locations.h:508
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "科克"
+
+# my-evolution/Locations.h:1795
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Personal"
+msgstr "波纳尔"
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+# addressbook/gui/contact-editor/fulladdr.glade.h:209
+# addressbook/gui/contact-editor/fulladdr.glade.h:209
+# addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "多哥"
+
+# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
+# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
+# calendar/gui/dialogs/alarm-page.glade.h:11
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "之后"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
msgid "Test"
msgstr "测试"
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
msgid "You must name this filter."
msgstr "您必须为该过滤规则命名。"
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
msgid "Rule name: "
msgstr "规则名:"
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
msgid "Untitled"
msgstr "无标题"
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
msgid "If"
msgstr "如果"
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
msgid "Execute actions"
msgstr "执行动作"
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
msgid "if all criteria are met"
msgstr "如果满足所有条件"
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
msgid "if any criteria are met"
msgstr "如果满足任一条件"
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
msgid "Add criterion"
msgstr "添加条件"
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
msgid "incoming"
msgstr "接收"
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
msgid "outgoing"
msgstr "发送"
#: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "比较"
+
+#: filter/filter.glade.h:2
msgid "Edit Filters"
msgstr "编辑过滤规则"
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
msgid "Edit VFolders"
msgstr "编辑虚拟文件夹"
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
msgid "Incoming"
msgstr "接收"
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
msgid "Outgoing"
msgstr "发送"
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"邮件的日期将与您在这里\n"
+"指定的日期进行比较。"
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"邮件的日期将于相对于过滤规则\n"
+"运行的时间进行比较;\n"
+"例如:“一周以前”。"
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"邮件的日期将与您在这里\n"
+"指定的日期进行比较。"
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
msgid "Virtual Folders"
msgstr "虚拟文件夹"
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "相对于当前时间的时间"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "过去"
+
+#: filter/filter.glade.h:25
msgid "specific folders only"
msgstr "仅指定文件夹"
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "当前时间"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "您指定的时间"
+
+#: filter/filter.glade.h:28
msgid "vFolder Sources"
msgstr "虚拟文件夹来源"
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
msgid "with all active remote folders"
msgstr "以全部活跃远程文件夹"
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
msgid "with all local and active remote folders"
msgstr "以全部本地和活跃远程文件夹"
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
msgid "with all local folders"
msgstr "以所有本地文件夹"
@@ -17955,49 +18327,43 @@ msgstr "附件"
msgid "Beep"
msgstr "伯利兹"
-# addressbook/backend/ebook/e-card-simple.c:67
-# addressbook/gui/contact-editor/e-contact-editor.c:1650
-# addressbook/backend/ebook/e-card-simple.c:67
-# addressbook/gui/contact-editor/e-contact-editor.c:1650
-# addressbook/backend/ebook/e-card-simple.c:67
-# addressbook/gui/contact-editor/e-contact-editor.c:1650
#: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "公司"
-
-#: filter/libfilter-i18n.h:8
msgid "contains"
msgstr "含有"
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
msgid "Copy to Folder"
msgstr "复制到文件夹"
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
msgid "Date received"
msgstr "接收日期"
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
msgid "Date sent"
msgstr "发送日期"
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
msgid "Deleted"
msgstr "已删除"
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
msgid "does not contain"
msgstr "不含有"
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
msgid "does not end with"
msgstr "不以之结尾"
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
msgid "does not exist"
msgstr "不存在"
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "不存在"
+
#: filter/libfilter-i18n.h:17
msgid "does not sound like"
msgstr "听起来不像"
@@ -18019,66 +18385,57 @@ msgid "ends with"
msgstr "以之结束"
#: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr "执行 Shell 命令"
-
-#: filter/libfilter-i18n.h:23
msgid "Exist"
msgstr "存在"
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
msgid "exists"
msgstr "存在"
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
msgid "Expression"
msgstr "表达式"
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
msgid "Follow Up"
msgstr ""
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "重要"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
msgid "is"
msgstr "是"
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
msgid "is after"
msgstr "以后"
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
msgid "is before"
msgstr "以前"
# mail/message-list.etspec.h:2
# mail/message-list.etspec.h:2
# mail/message-list.etspec.h:2
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
#, fuzzy
msgid "is Flagged"
msgstr "已标志"
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
msgid "is greater than"
msgstr "大于"
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
msgid "is less than"
msgstr "小于"
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
msgid "is not"
msgstr "不是"
# mail/message-list.etspec.h:2
# mail/message-list.etspec.h:2
# mail/message-list.etspec.h:2
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
#, fuzzy
msgid "is not Flagged"
msgstr "已标志"
@@ -18086,27 +18443,32 @@ msgstr "已标志"
# ui/evolution-mail-message.xml.h:98
# ui/evolution-mail-message.xml.h:98
# my-evolution/Locations.h:1192
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
#, fuzzy
msgid "Label"
msgstr "劳雷尔"
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
msgid "Mailing list"
msgstr "邮件列表"
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
msgid "Message Body"
msgstr "邮件体"
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
msgid "Message Header"
msgstr "邮件头"
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
msgid "Move to Folder"
msgstr "移动到文件夹"
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "执行 Shell 命令"
+
# calendar/gui/dialogs/alarm-options.glade.h:3
# calendar/gui/dialogs/alarm-options.glade.h:3
# calendar/gui/dialogs/alarm-options.glade.h:3
@@ -18115,7 +18477,7 @@ msgstr "移动到文件夹"
msgid "Play Sound"
msgstr "播放声音:"
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
msgid "Read"
msgstr "已读"
@@ -18131,63 +18493,98 @@ msgstr "常规表达式匹配"
msgid "Replied to"
msgstr "已回复"
+# addressbook/backend/ebook/e-card-simple.c:65
+# addressbook/backend/ebook/e-card-simple.c:70
+# addressbook/backend/ebook/e-card-simple.c:65
+# addressbook/backend/ebook/e-card-simple.c:70
+# my-evolution/Locations.h:327
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "伯恩斯"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "大于"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "小于"
+
# mail/message-list.etspec.h:5
# mail/message-list.etspec.h:6
# mail/message-list.etspec.h:6
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
#: mail/message-list.etspec.h:10
msgid "Score"
msgstr "分数"
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
msgid "Sender"
msgstr "发件人"
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
msgid "Set Status"
msgstr "设置状态"
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "执行 Shell 命令"
+
+#: filter/libfilter-i18n.h:53
msgid "Size (kB)"
msgstr "大小 (kB)"
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
msgid "sounds like"
msgstr "听起来象"
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
msgid "Source Account"
msgstr "来源帐号"
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
msgid "Specific header"
msgstr "指定邮件头"
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
msgid "starts with"
msgstr "以之开始"
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
msgid "Stop Processing"
msgstr "停止处理"
# mail/message-list.etspec.h:9
# mail/message-list.etspec.h:10
# mail/message-list.etspec.h:10
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
#: mail/message-list.etspec.h:13
msgid "Subject"
msgstr "主题"
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "设置状态"
+
+#: filter/rule-editor.c:180
msgid "Rules"
msgstr "规则"
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
msgid "Add Rule"
msgstr "添加规则"
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
msgid "Edit Rule"
msgstr "编辑规则"
@@ -18195,11 +18592,11 @@ msgstr "编辑规则"
msgid "Score Rules"
msgstr "计分规则"
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
msgid "You must name this vfolder."
msgstr "您必须为该虚拟文件夹命名。"
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
msgid "You need to to specify at least one folder as a source."
msgstr "您至少需要把一个文件夹指定为源。"
@@ -18216,7 +18613,7 @@ msgstr "Evolution 正在导入您原来的电子邮件"
# importers/pine-importer.c:101
# importers/elm-importer.c:96 importers/netscape-importer.c:107
# importers/pine-importer.c:101
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
#: importers/pine-importer.c:101
msgid "Importing..."
msgstr "正在导入..."
@@ -18227,7 +18624,7 @@ msgstr "正在导入..."
# importers/pine-importer.c:103
# importers/elm-importer.c:98 importers/netscape-importer.c:109
# importers/pine-importer.c:103
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
#: importers/pine-importer.c:103
msgid "Please wait"
msgstr "请等待"
@@ -18238,7 +18635,7 @@ msgstr "请等待"
# importers/pine-importer.c:365
# importers/elm-importer.c:169 importers/netscape-importer.c:689
# importers/pine-importer.c:365
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
#: importers/pine-importer.c:365
#, c-format
msgid "Importing %s as %s"
@@ -18250,7 +18647,7 @@ msgstr "正在按 %2$s 导入 %1$s"
# importers/pine-importer.c:471
# importers/elm-importer.c:375 importers/netscape-importer.c:782
# importers/pine-importer.c:471
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
#: importers/pine-importer.c:471
#, c-format
msgid "Scanning %s"
@@ -18262,9 +18659,9 @@ msgstr "正在扫描 %s"
# importers/pine-importer.c:637 mail/component-factory.c:100
# importers/elm-importer.c:525 importers/netscape-importer.c:958
# importers/pine-importer.c:637 mail/component-factory.c:100
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
#: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
msgid "Mail"
msgstr "邮件"
@@ -18340,7 +18737,7 @@ msgstr ""
# importers/netscape-importer.c:106
# importers/netscape-importer.c:106
# importers/netscape-importer.c:106
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
msgid "Evolution is importing your old Netscape data"
msgstr "Evolution 正在导入您原来的 Netscape 数据"
@@ -18348,15 +18745,15 @@ msgstr "Evolution 正在导入您原来的 Netscape 数据"
# mail/mail-ops.c:1060 shell/e-local-storage.c:178
# mail/mail-ops.c:1103 shell/e-local-storage.c:178
#. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
msgid "Trash"
msgstr "已删除"
# camel/providers/local/camel-local-store.c:196
# camel/providers/local/camel-local-store.c:196
# camel/providers/local/camel-local-store.c:196
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
#, fuzzy
msgid "Scanning mail filters"
msgstr "本地邮件文件 %s"
@@ -18364,25 +18761,25 @@ msgstr "本地邮件文件 %s"
# importers/netscape-importer.c:888 importers/pine-importer.c:570
# importers/netscape-importer.c:888 importers/pine-importer.c:570
# importers/netscape-importer.c:888 importers/pine-importer.c:570
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
msgid "Scanning directory"
msgstr "正在扫描目录"
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
msgid "Starting import"
msgstr "开始导入"
# importers/netscape-importer.c:963
# importers/netscape-importer.c:963
# importers/netscape-importer.c:963
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
msgid "Settings"
msgstr "设置"
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
#, fuzzy
msgid "Mail Filters"
msgstr "编辑过滤规则"
@@ -18390,7 +18787,7 @@ msgstr "编辑过滤规则"
# importers/netscape-importer.c:984
# importers/netscape-importer.c:984
# importers/netscape-importer.c:984
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
@@ -18519,12 +18916,12 @@ msgstr "没有循环(_N)"
# mail/mail-config.glade.h:8
# mail/mail-config.glade.h:8
# mail/mail-config.glade.h:8
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
#, fuzzy
msgid "Mail Accounts"
msgstr "帐号"
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
msgid "Mail Preferences"
msgstr ""
@@ -18596,7 +18993,7 @@ msgstr "改变该文件夹的属性"
# mail/component-factory.c:783
# mail/component-factory.c:783
# mail/component-factory.c:786
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
msgid ""
"Some of your mail settings seem corrupt, please check that everything is in "
"order."
@@ -18605,18 +19002,18 @@ msgstr "您的某些邮件设置好像已崩溃,请按顺序检查所有内容
# mail/mail-callbacks.c:230
# mail/mail-callbacks.c:230
# mail/mail-callbacks.c:187
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
msgid "You have not set a mail transport method"
msgstr "您还没有设置邮件传输方法"
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr ""
# composer/e-msg-composer.c:1412
# composer/e-msg-composer.c:1329
# composer/e-msg-composer.c:1295
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
#, fuzzy
msgid "Warning: Unsent Messages"
msgstr "警告: 已改动的邮件"
@@ -18624,42 +19021,74 @@ msgstr "警告: 已改动的邮件"
# mail/component-factory.c:951
# mail/component-factory.c:951
# mail/component-factory.c:955
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
msgid "New Mail Message"
msgstr "新建邮件"
# ui/evolution-mail-global.xml.h:20
# ui/evolution-mail-global.xml.h:20
# ui/evolution-mail-global.xml.h:20
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
msgid "_Mail Message"
msgstr "邮件(_M)"
+# composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
+# composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
+# composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2334
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "撰写邮件"
+
+# ui/evolution-mail-global.xml.h:10
+# ui/evolution-mail-global.xml.h:10
+# ui/evolution-mail-global.xml.h:10
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "新建邮件"
+
+# ui/evolution-mail-message.xml.h:65
+# ui/evolution-mail-message.xml.h:65
+# ui/evolution-mail-message.xml.h:65
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "上一个邮件"
+
+# mail/component-factory.c:951
+# mail/component-factory.c:951
+# mail/component-factory.c:955
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "新建邮件"
+
# mail/component-factory.c:975
# mail/component-factory.c:975
# mail/component-factory.c:980
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:1035
msgid "Cannot initialize Evolution's mail component."
msgstr "无法初始化 Evolution 的邮件组件。"
# mail/component-factory.c:984
# mail/component-factory.c:984
# mail/component-factory.c:989
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
msgid "Cannot initialize Evolution's mail config component."
msgstr "无法初始化 Evolution 的邮件配置组件。"
# mail/component-factory.c:990
# mail/component-factory.c:990
# mail/component-factory.c:995
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
msgid "Cannot initialize Evolution's folder info component."
msgstr "无法初始化 Evolution 的文件夹信息组件。"
# mail/mail-config.c:2184 mail/mail-config.c:2188
# mail/mail-config.c:2233 mail/mail-config.c:2237
# mail/mail-config.c:2326 mail/mail-config.c:2330
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
#, fuzzy
msgid "Connecting..."
msgstr "正在连接服务器..."
@@ -18667,14 +19096,14 @@ msgstr "正在连接服务器..."
# mail/component-factory.c:1206
# mail/component-factory.c:1206
# mail/component-factory.c:1211
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
msgid "Cannot register storage with shell"
msgstr "无法用 shell 注册存储"
# mail/folder-browser-ui.c:272
# mail/folder-browser-ui.c:272
# mail/folder-browser-ui.c:273
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
#, c-format
msgid "Properties for \"%s\""
msgstr "“%s”的属性"
@@ -18682,14 +19111,14 @@ msgstr "“%s”的属性"
# mail/folder-browser-ui.c:274
# mail/folder-browser-ui.c:274
# mail/folder-browser-ui.c:275
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
msgid "Properties"
msgstr "属性"
# mail/folder-browser.c:297 mail/mail-display.c:298
# mail/folder-browser.c:297 mail/mail-display.c:297
# mail/folder-browser.c:298 mail/mail-display.c:298
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "无法创建临时目录: %s"
@@ -18770,102 +19199,102 @@ msgstr "从邮件创建虚拟文件夹(_V)"
# mail/folder-browser.c:1430
# mail/folder-browser.c:1437
# mail/folder-browser.c:1438
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
msgid "VFolder on _Subject"
msgstr "关于主题的虚拟文件夹(_S)"
# mail/folder-browser.c:1431
# mail/folder-browser.c:1438
# mail/folder-browser.c:1439
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
msgid "VFolder on Se_nder"
msgstr "关于发件人的虚拟文件夹(_N)"
# mail/folder-browser.c:1432
# mail/folder-browser.c:1439
# mail/folder-browser.c:1440
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
msgid "VFolder on _Recipients"
msgstr "关于收件人的虚拟文件夹(_R)"
# mail/folder-browser.c:1433
# mail/folder-browser.c:1440
# mail/folder-browser.c:1441
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
msgid "VFolder on Mailing _List"
msgstr "关于邮件列表的虚拟文件夹(_L)"
# mail/folder-browser.c:1437
# mail/folder-browser.c:1444
# mail/folder-browser.c:1445
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
msgid "Filter on Sub_ject"
msgstr "过滤标题(_J)"
# mail/folder-browser.c:1438
# mail/folder-browser.c:1445
# mail/folder-browser.c:1446
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
msgid "Filter on Sen_der"
msgstr "过滤发件人(_D)"
# mail/folder-browser.c:1439
# mail/folder-browser.c:1446
# mail/folder-browser.c:1447
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
msgid "Filter on Re_cipients"
msgstr "过滤收件人(_C)"
# mail/folder-browser.c:1440
# mail/folder-browser.c:1447
# mail/folder-browser.c:1448
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
msgid "Filter on _Mailing List"
msgstr "过滤邮件列表(_M)"
# mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:96
# mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:96
# mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:98
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
msgid "_Edit as New Message..."
msgstr "作为新邮件进行编辑(_E)..."
# mail/folder-browser.c:1450
# mail/folder-browser.c:1457
# mail/folder-browser.c:1458
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
msgid "_Print"
msgstr "打印(_P)"
# mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:104
# mail/folder-browser.c:1461 ui/evolution-mail-message.xml.h:104
# mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:106
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
# mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:73
# mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:73
# mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:75
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
# mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:72
# mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:72
# mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:74
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
msgid "Reply to _All"
msgstr "回复所有人(_A)"
# mail/folder-browser.c:1457
# mail/folder-browser.c:1464
# mail/folder-browser.c:1465
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
msgid "_Forward"
msgstr "转发(_F)"
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
msgid "Follo_w Up..."
msgstr ""
@@ -18881,7 +19310,7 @@ msgstr ""
# calendar/gui/dialogs/task-details-page.glade.h:4
# calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
#, fuzzy
msgid "Fla_g Completed"
msgstr "已完成"
@@ -18890,7 +19319,7 @@ msgstr "已完成"
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
# widgets/misc/e-filter-bar.h:95
# widgets/misc/e-filter-bar.h:95
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
#, fuzzy
msgid "Cl_ear Flag"
msgstr "清除"
@@ -18899,14 +19328,14 @@ msgstr "清除"
# mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:43
# mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:43
#. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
msgid "Mar_k as Read"
msgstr "标记为已读(_K)"
# mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:45
# mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:45
# mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:45
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
#, fuzzy
msgid "Mark as _Unread"
msgstr "标记为未读(_N)"
@@ -18914,14 +19343,14 @@ msgstr "标记为未读(_N)"
# mail/folder-browser.c:1461
# mail/folder-browser.c:1468
# mail/folder-browser.c:1469
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
# ui/evolution-mail-message.xml.h:46
# ui/evolution-mail-message.xml.h:46
# ui/evolution-mail-message.xml.h:46
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
#, fuzzy
msgid "_Mark as Unimportant"
msgstr "标记为不重要(_O)"
@@ -18929,7 +19358,7 @@ msgstr "标记为不重要(_O)"
# mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
# mail/folder-browser.c:1478 ui/evolution-mail-message.xml.h:107
# mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:109
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
#, fuzzy
msgid "U_ndelete"
msgstr "反删除(_U)"
@@ -18937,7 +19366,7 @@ msgstr "反删除(_U)"
# mail/folder-browser.c:1466
# mail/folder-browser.c:1475
# mail/folder-browser.c:1476
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
#, fuzzy
msgid "Mo_ve to Folder..."
msgstr "移动到文件夹(_M)..."
@@ -18945,14 +19374,14 @@ msgstr "移动到文件夹(_M)..."
# mail/folder-browser.c:1467
# mail/folder-browser.c:1476
# mail/folder-browser.c:1477
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
msgid "_Copy to Folder..."
msgstr "复制到文件夹..."
# mail/folder-browser.c:1473 ui/evolution-mail-message.xml.h:1
# mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:1
# mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
#, fuzzy
msgid "Add Sender to Address_book"
msgstr "将发件人添加到地址簿"
@@ -18960,7 +19389,7 @@ msgstr "将发件人添加到地址簿"
# mail/folder-browser.c:1476
# mail/folder-browser.c:1485
# mail/folder-browser.c:1486
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
#, fuzzy
msgid "Appl_y Filters"
msgstr "应用过滤规则"
@@ -18968,7 +19397,7 @@ msgstr "应用过滤规则"
# mail/folder-browser.c:1478
# mail/folder-browser.c:1487
# mail/folder-browser.c:1488
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
#, fuzzy
msgid "Crea_te Rule From Message"
msgstr "从消息创建规则(_L)"
@@ -18976,7 +19405,7 @@ msgstr "从消息创建规则(_L)"
# mail/folder-browser.c:1629
# mail/folder-browser.c:1657
# mail/folder-browser.c:1658
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
#, fuzzy
msgid "VFolder on M_ailing List"
msgstr "关于邮件列表的虚拟文件夹"
@@ -18984,7 +19413,7 @@ msgstr "关于邮件列表的虚拟文件夹"
# mail/folder-browser.c:1631
# mail/folder-browser.c:1659
# mail/folder-browser.c:1660
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
#, fuzzy, c-format
msgid "Filter on _Mailing List (%s)"
msgstr "过滤邮件列表 (%s)"
@@ -18992,7 +19421,7 @@ msgstr "过滤邮件列表 (%s)"
# mail/folder-browser.c:1632
# mail/folder-browser.c:1660
# mail/folder-browser.c:1661
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
#, fuzzy, c-format
msgid "VFolder on M_ailing List (%s)"
msgstr "关于邮件列表 (%s) 的虚拟文件夹"
@@ -19098,18 +19527,10 @@ msgstr "mh"
# mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
# mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
# mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
msgid "You have not filled in all of the required information."
msgstr "您还没有填写所有必须的信息。"
-# mail/mail-account-editor-news.c:160
-# mail/mail-account-editor-news.c:160
-# mail/mail-account-editor-news.c:160
-#. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-msgid "Evolution News Editor"
-msgstr "Evolution 新闻编辑器"
-
# mail/mail-account-editor.c:160
# mail/mail-account-editor.c:160
# mail/mail-account-editor.c:160
@@ -19121,14 +19542,14 @@ msgstr "Evolution 帐号编辑器"
# mail/mail-config.glade.h:104
# mail/mail-config.glade.h:104
# mail/mail-config.glade.h:113
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
msgid "_Host:"
msgstr "主机(_H):"
# mail/mail-config.glade.h:117
# mail/mail-config.glade.h:117
# mail/mail-config.glade.h:126
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
#, fuzzy
msgid "User_name:"
msgstr "用户名(_U):"
@@ -19136,42 +19557,42 @@ msgstr "用户名(_U):"
# mail/mail-config.glade.h:112
# mail/mail-config.glade.h:112
# mail/mail-config.glade.h:121
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
msgid "_Path:"
msgstr "路径(_P):"
# mail/mail-account-gui.c:1654
# mail/mail-account-gui.c:1654
# mail/mail-account-gui.c:1665
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
msgid "You may not create two accounts with the same name."
msgstr "您不能以相同的名字创建两个帐号。"
# mail/mail-accounts.c:293
# mail/mail-accounts.c:293
# mail/mail-accounts.c:293
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
msgid "Are you sure you want to delete this account?"
msgstr "您确信您要删除该帐号?"
# mail/mail-accounts.c:297
# mail/mail-accounts.c:297
# mail/mail-accounts.c:297
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
msgid "Don't delete"
msgstr "不要删除"
# mail/mail-accounts.c:300
# mail/mail-accounts.c:300
# mail/mail-accounts.c:300
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
msgid "Really delete account?"
msgstr "确实删除帐号?"
# mail/mail-accounts.c:194
# mail/mail-accounts.c:194
# mail/mail-accounts.c:194
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
#: mail/mail-composer-prefs.c:697
msgid "Disable"
@@ -19180,23 +19601,16 @@ msgstr "禁用"
# mail/mail-accounts.c:196
# mail/mail-accounts.c:196
# mail/mail-accounts.c:196
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
#: mail/mail-composer-prefs.c:697
msgid "Enable"
msgstr "启用"
-# mail/mail-accounts.c:532 mail/mail-accounts.c:536
-# mail/mail-accounts.c:532 mail/mail-accounts.c:536
-# mail/mail-accounts.c:532 mail/mail-accounts.c:536
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "您确信您要删除该邮件帐号?"
-
# mail/mail-config.glade.h:33
# mail/mail-config.glade.h:33
# mail/mail-config.glade.h:39
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
#: mail/mail-config.glade.h:53
msgid "Enabled"
msgstr "已启用"
@@ -19204,7 +19618,7 @@ msgstr "已启用"
# addressbook/gui/component/addressbook-config.glade.h:23
# addressbook/gui/component/addressbook-config.glade.h:23
# addressbook/gui/component/addressbook-config.glade.h:30
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
#, fuzzy
msgid "Account name"
msgstr "帐号名(_A):"
@@ -19213,7 +19627,7 @@ msgstr "帐号名(_A):"
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# addressbook/gui/contact-editor/e-contact-editor-address.c:298
# my-evolution/Locations.h:1824
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
#, fuzzy
msgid "Protocol"
msgstr "波多黎各"
@@ -19229,7 +19643,7 @@ msgstr "邮寄给 %s"
# mail/mail-autofilter.c:215
# mail/mail-autofilter.c:217
# mail/mail-autofilter.c:217
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
#, c-format
msgid "Subject is %s"
msgstr "主题是 %s"
@@ -19237,7 +19651,7 @@ msgstr "主题是 %s"
# mail/mail-autofilter.c:231
# mail/mail-autofilter.c:233
# mail/mail-autofilter.c:233
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
#, c-format
msgid "Mail from %s"
msgstr "邮件来自 %s"
@@ -19245,7 +19659,7 @@ msgstr "邮件来自 %s"
# mail/mail-autofilter.c:287
# mail/mail-autofilter.c:289
# mail/mail-autofilter.c:289
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
#, c-format
msgid "%s mailing list"
msgstr "%s 邮件列表"
@@ -19253,15 +19667,15 @@ msgstr "%s 邮件列表"
# mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
# mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
# mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
msgid "Add Filter Rule"
msgstr "添加过滤规则"
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
msgid "The following filter rule(s):\n"
msgstr ""
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
#, c-format
msgid ""
"Used the removed folder:\n"
@@ -19272,7 +19686,7 @@ msgstr ""
# mail/mail-callbacks.c:137
# mail/mail-callbacks.c:137
# mail/mail-callbacks.c:94
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
msgid ""
"You have not configured the mail client.\n"
"You need to do this before you can send,\n"
@@ -19287,7 +19701,7 @@ msgstr ""
# mail/mail-callbacks.c:186
# mail/mail-callbacks.c:186
# mail/mail-callbacks.c:143
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
@@ -19298,7 +19712,7 @@ msgstr ""
# mail/mail-callbacks.c:200
# mail/mail-callbacks.c:200
# mail/mail-callbacks.c:157
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
@@ -19310,7 +19724,7 @@ msgstr ""
# mail/mail-callbacks.c:265
# mail/mail-callbacks.c:222
#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
msgid ""
"You are sending an HTML-formatted message, but the following recipients do "
"not want HTML-formatted mail:\n"
@@ -19319,14 +19733,14 @@ msgstr "您正在发送 HTML 格式的消息,当以下收件人不希望接收
# mail/mail-callbacks.c:280
# mail/mail-callbacks.c:280
# mail/mail-callbacks.c:237
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
msgid "Send anyway?"
msgstr "仍然发送?"
# mail/mail-callbacks.c:322
# mail/mail-callbacks.c:322
# mail/mail-callbacks.c:279
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
msgid ""
"This message has no subject.\n"
"Really send?"
@@ -19337,7 +19751,7 @@ msgstr ""
# mail/mail-callbacks.c:366
# mail/mail-callbacks.c:366
# mail/mail-callbacks.c:323
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
msgid ""
"Since the contact list you are sending to is configured to hide the list's "
"addresses, this message will contain only Bcc recipients."
@@ -19348,14 +19762,14 @@ msgstr ""
# mail/mail-callbacks.c:370
# mail/mail-callbacks.c:370
# mail/mail-callbacks.c:327
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
msgid "This message contains only Bcc recipients."
msgstr "该邮件只含有密件抄送收件人。"
# mail/mail-callbacks.c:374
# mail/mail-callbacks.c:374
# mail/mail-callbacks.c:331
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
msgid ""
"It is possible that the mail server may reveal the recipients by adding an "
"Apparently-To header.\n"
@@ -19367,21 +19781,14 @@ msgstr ""
# mail/mail-callbacks.c:504
# mail/mail-callbacks.c:504
# mail/mail-callbacks.c:460
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
msgid "You must specify recipients in order to send this message."
msgstr "您必须指定收件人以便发送该消息。"
-# mail/mail-callbacks.c:600
-# mail/mail-callbacks.c:600
-# mail/mail-callbacks.c:549
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "在您能够发送该邮件之前您必须配置一个帐号。"
-
# composer/e-msg-composer.c:1068
# mail/mail-callbacks.c:716
# mail/mail-callbacks.c:668
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
@@ -19392,35 +19799,35 @@ msgstr ""
# mail/mail-callbacks.c:838
# mail/mail-callbacks.c:928
# mail/mail-callbacks.c:878
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
msgid "an unknown sender"
msgstr "未知的发件人"
# mail/mail-callbacks.c:843
# mail/mail-callbacks.c:933
# mail/mail-callbacks.c:883
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
msgstr "在 %Y-%m-%d %a 的 %H:%M, %%s 写道:"
# mail/mail-callbacks.c:1281 mail/message-browser.c:130
# mail/mail-callbacks.c:1376 mail/message-browser.c:130
# mail/mail-callbacks.c:1411 mail/message-browser.c:130
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
msgid "Move message(s) to"
msgstr "将消息移动到"
# mail/mail-callbacks.c:1283 mail/message-browser.c:132
# mail/mail-callbacks.c:1378 mail/message-browser.c:132
# mail/mail-callbacks.c:1413 mail/message-browser.c:132
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
msgid "Copy message(s) to"
msgstr "将消息复制到"
# mail/mail-callbacks.c:1759
# mail/mail-callbacks.c:1878
# mail/mail-callbacks.c:1914
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr "您确信您需要编辑所有的 %d 个消息?"
@@ -19428,7 +19835,7 @@ msgstr "您确信您需要编辑所有的 %d 个消息?"
# mail/mail-callbacks.c:1784
# mail/mail-callbacks.c:1903
# mail/mail-callbacks.c:1939
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -19439,7 +19846,7 @@ msgstr ""
# mail/mail-callbacks.c:1823
# mail/mail-callbacks.c:1942
# mail/mail-callbacks.c:1978
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
msgid ""
"You may only resend messages\n"
"in the Sent folder."
@@ -19450,7 +19857,7 @@ msgstr ""
# mail/mail-callbacks.c:1837
# mail/mail-callbacks.c:1956
# mail/mail-callbacks.c:1992
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr "您确信您希望重新发送所有的 %d 个消息?"
@@ -19458,7 +19865,7 @@ msgstr "您确信您希望重新发送所有的 %d 个消息?"
# mail/mail-callbacks.c:1863
# mail/mail-callbacks.c:1982
# mail/mail-callbacks.c:2018
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
msgid "No Message Selected"
msgstr "没有选择消息"
@@ -19468,33 +19875,33 @@ msgstr "没有选择消息"
# mail/mail-display.c:102
# calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
# mail/mail-display.c:101
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
msgid "Overwrite file?"
msgstr "覆盖文件?"
# mail/mail-callbacks.c:1962
# mail/mail-callbacks.c:2081
# mail/mail-callbacks.c:2117
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
msgid "Save Message As..."
msgstr "消息另存为..."
# mail/mail-callbacks.c:1964
# mail/mail-callbacks.c:2083
# mail/mail-callbacks.c:2119
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
msgid "Save Messages As..."
msgstr "消息另存为..."
# ui/evolution-mail-message.xml.h:21
# ui/evolution-mail-message.xml.h:21
# ui/evolution-mail-message.xml.h:21
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
#, fuzzy
msgid "Go to next folder with unread messages?"
msgstr "显示下一个未读文件"
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
msgid ""
"There are no more new messages in this folder.\n"
"Would you like to go to the next folder?"
@@ -19503,7 +19910,7 @@ msgstr ""
# mail/mail-callbacks.c:2135
# mail/mail-callbacks.c:2254
# mail/mail-callbacks.c:2290
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
msgid ""
"This operation will permanently erase all messages marked as deleted. If you "
"continue, you will not be able to recover these messages.\n"
@@ -19518,7 +19925,7 @@ msgstr ""
# mail/mail-callbacks.c:2250
# mail/mail-callbacks.c:2369
# mail/mail-callbacks.c:2405
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -19530,14 +19937,14 @@ msgstr ""
# mail/mail-callbacks.c:2262
# mail/mail-callbacks.c:2381
# mail/mail-callbacks.c:2417
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
msgid "Filters"
msgstr "过滤规则"
# camel/camel-filter-driver.c:789
# camel/camel-filter-driver.c:838
# mail/mail-callbacks.c:2490
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
#, c-format
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
@@ -19545,27 +19952,27 @@ msgstr "第 %d 页,共 %d 页"
# mail/mail-callbacks.c:2325
# mail/mail-callbacks.c:2465
# mail/mail-callbacks.c:2542
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
msgid "Print Message"
msgstr "打印消息"
# mail/mail-callbacks.c:2492
# mail/mail-callbacks.c:2569
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
msgid "US-Letter"
msgstr "美国信纸"
# mail/mail-callbacks.c:2371
# mail/mail-callbacks.c:2531
# mail/mail-callbacks.c:2604
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
msgid "Printing of message failed"
msgstr "打印消息失败"
# mail/mail-callbacks.c:2473
# mail/mail-callbacks.c:2697
# mail/mail-callbacks.c:2770
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr "您确信您希望在单独的窗口中打开所有的 %d 个消息?"
@@ -19592,7 +19999,7 @@ msgstr ""
# addressbook/gui/component/select-names/e-select-names-popup.c:506
# addressbook/gui/component/select-names/e-select-names-popup.c:506
# addressbook/gui/component/select-names/e-select-names-popup.c:506
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
#, fuzzy
msgid "Unnamed"
msgstr "未命名的联系人"
@@ -19622,10 +20029,11 @@ msgstr "保存签名"
# mail/mail-config-druid.c:146
# mail/mail-config-druid.c:146
#: mail/mail-config-druid.c:146
+#, fuzzy
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
msgstr ""
"请在下面输入您的名字和电子邮件地址。“可选”域可以不填写,\n"
"除非您希望在您发送的邮件中含有这些信息。"
@@ -19634,10 +20042,10 @@ msgstr ""
# mail/mail-config-druid.c:148
# mail/mail-config-druid.c:148
#: mail/mail-config-druid.c:148
+#, fuzzy
msgid ""
"Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
msgstr ""
"请在下面输入您的接收邮件服务器的信息。如果您不能确定,\n"
"请询问您的系统管理员或互联网服务提供商。"
@@ -19653,10 +20061,10 @@ msgstr "请从以下选项中选择"
# mail/mail-config-druid.c:152
# mail/mail-config-druid.c:152
#: mail/mail-config-druid.c:152
+#, fuzzy
msgid ""
"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
msgstr ""
"请输入您发送邮件的方式的信息。如果您不能确定,\n"
"请询问您的系统管理员或互联网服务提供商。"
@@ -19665,14 +20073,13 @@ msgstr ""
# mail/mail-config-druid.c:154
# mail/mail-config-druid.c:154
#: mail/mail-config-druid.c:154
+#, fuzzy
msgid ""
"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
msgstr ""
"您基本上完成了邮件配置过程。身份标识、邮件接收服务器和您提供\n"
"的邮件发送传输方法将组合起来构成 Evolution 邮件帐号。\n"
@@ -19683,46 +20090,14 @@ msgstr ""
# mail/mail-config-druid.c:599
# mail/mail-config-druid.c:599
#. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
msgid "Evolution Account Assistant"
msgstr "Evolution 帐号助手"
-# my-evolution/Locations.h:508
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "科克"
-
-# my-evolution/Locations.h:1795
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Personal"
-msgstr "波纳尔"
-
-# addressbook/gui/contact-editor/fulladdr.glade.h:209
-# addressbook/gui/contact-editor/fulladdr.glade.h:209
-# addressbook/gui/contact-editor/e-contact-editor-address.c:335
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "多哥"
-
-# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
-# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
-# calendar/gui/dialogs/alarm-page.glade.h:11
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "之后"
-
# mail/mail-config.c:326
# mail/mail-config.c:329
# mail/mail-config.c:354
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
#, c-format
msgid "Account %d"
msgstr "帐号 %d"
@@ -19730,14 +20105,14 @@ msgstr "帐号 %d"
# mail/mail-config.c:2113
# mail/mail-config.c:2155
# mail/mail-config.c:2248
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
msgid "Checking Service"
msgstr "正在检查服务"
# mail/mail-config.c:2184 mail/mail-config.c:2188
# mail/mail-config.c:2233 mail/mail-config.c:2237
# mail/mail-config.c:2326 mail/mail-config.c:2330
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
msgid "Connecting to server..."
msgstr "正在连接服务器..."
@@ -20146,21 +20521,21 @@ msgstr "装入图像(_I)"
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:48
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
msgid "Mail Configuration"
msgstr "邮件配置"
# mail/mail-config.glade.h:43
# mail/mail-config.glade.h:43
# mail/mail-config.glade.h:50
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
msgid "Mailbox location"
msgstr "邮件箱位置"
# views/mail/galview.xml.h:4
# views/mail/galview.xml.h:4
# views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
#, fuzzy
msgid "Message Composer"
msgstr "邮件"
@@ -20168,7 +20543,7 @@ msgstr "邮件"
# ui/evolution-mail-message.xml.h:99
# ui/evolution-mail-message.xml.h:99
# ui/evolution-mail-message.xml.h:101
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
#, fuzzy
msgid "Message Display"
msgstr "邮件显示(_M)"
@@ -20176,48 +20551,33 @@ msgstr "邮件显示(_M)"
# addressbook/gui/contact-editor/fulladdr.glade.h:138
# addressbook/gui/contact-editor/fulladdr.glade.h:138
# addressbook/gui/contact-editor/e-contact-editor-address.c:264
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
#, fuzzy
msgid "Microsoft"
msgstr "密克罗尼西亚"
-# mail/mail-config.glade.h:45
-# mail/mail-config.glade.h:45
-# mail/mail-config.glade.h:52
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP 服务器:"
-
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:53
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
msgid "New Mail Notification"
msgstr "新邮件提醒"
-# my-evolution/my-evolution.glade.h:28
-# my-evolution/my-evolution.glade.h:28
-# my-evolution/my-evolution.glade.h:28
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "新闻来源(_N)"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
msgid "On Screen fonts"
msgstr ""
# mail/mail-config.glade.h:48
# mail/mail-config.glade.h:48
# mail/mail-config.glade.h:56
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
msgid "Optional Information"
msgstr "可选的信息"
# addressbook/gui/contact-editor/contact-editor.glade.h:23
# addressbook/gui/contact-editor/contact-editor.glade.h:23
# addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
#, fuzzy
msgid "Or_ganization:"
msgstr "组织(_Z):"
@@ -20225,21 +20585,21 @@ msgstr "组织(_Z):"
# mail/mail-config.glade.h:50
# mail/mail-config.glade.h:50
# mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG 键标识(_K):"
# mail/mail-config.glade.h:53
# mail/mail-config.glade.h:53
# mail/mail-config.glade.h:61
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
msgid "Pick a color"
msgstr "选取一个颜色"
# mail/mail-config.glade.h:57
# mail/mail-config.glade.h:57
# mail/mail-config.glade.h:66
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
#, fuzzy
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr "在发送只给出了暗送收件人时进行提示(_B)"
@@ -20247,14 +20607,14 @@ msgstr "在发送只给出了暗送收件人时进行提示(_B)"
# mail/mail-config.glade.h:54
# mail/mail-config.glade.h:54
# mail/mail-config.glade.h:63
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
msgid "Pretty Good Privacy (PGP/GPG)"
msgstr "Pretty Good Privacy (PGP/GPG)"
# ui/evolution-addressbook.xml.h:18
# ui/evolution-addressbook.xml.h:18
# ui/evolution-addressbook.xml.h:18
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
#, fuzzy
msgid "Printed Fonts"
msgstr "打印选中的联系人"
@@ -20262,14 +20622,14 @@ msgstr "打印选中的联系人"
# mail/mail-config.glade.h:58
# mail/mail-config.glade.h:58
# mail/mail-config.glade.h:67
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
msgid "Qmail maildir "
msgstr "Qmail 邮件目录"
# camel/camel-filter-driver.c:692
# camel/camel-filter-driver.c:741
# camel/camel-filter-driver.c:893
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
#, fuzzy
msgid "Quote original message"
msgstr "无法打开消息"
@@ -20277,21 +20637,21 @@ msgstr "无法打开消息"
# mail/mail-config.glade.h:59
# mail/mail-config.glade.h:59
# mail/mail-config.glade.h:68
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
msgid "Quoted"
msgstr "已引用"
# mail/mail-config.glade.h:60
# mail/mail-config.glade.h:60
# mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
msgid "Re_member this password"
msgstr "记住该密码(_M)"
# composer/e-msg-composer-hdrs.c:364
# composer/e-msg-composer-hdrs.c:364
# composer/e-msg-composer-hdrs.c:362
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
#, fuzzy
msgid "Re_ply-To:"
msgstr "回复到:"
@@ -20299,14 +20659,14 @@ msgstr "回复到:"
# mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
# mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:6
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
msgid "Receiving Email"
msgstr "正在接收电子邮件"
# mail/mail-config.glade.h:63
# mail/mail-config.glade.h:63
# mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
#, fuzzy
msgid "Receiving _Options"
msgstr "接收中选项"
@@ -20314,7 +20674,7 @@ msgstr "接收中选项"
# e-util/e-passwords.c:360 mail/mail-session.c:267
# e-util/e-passwords.c:360 mail/mail-session.c:267
# e-util/e-passwords.c:360 mail/mail-session.c:269
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
#, fuzzy
msgid "Remember this _password"
msgstr "记住该密码"
@@ -20322,14 +20682,22 @@ msgstr "记住该密码"
# mail/mail-config.glade.h:64
# mail/mail-config.glade.h:64
# mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
msgid "Required Information"
msgstr "必需的信息"
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "默认"
+
# mail/mail-config.glade.h:67
# mail/mail-config.glade.h:67
# mail/mail-config.glade.h:76
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
#, fuzzy
msgid "S_ecurity"
msgstr "安全"
@@ -20337,30 +20705,30 @@ msgstr "安全"
# mail/mail-config.glade.h:66
# mail/mail-config.glade.h:66
# mail/mail-config.glade.h:75
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
msgid "Secure MIME (S/MIME)"
msgstr "安全 MIME (S/MIME)"
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
msgid "Select HTML fixed width font"
msgstr ""
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
msgid "Select HTML fixed width font for printing"
msgstr ""
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
msgid "Select HTML variable width font"
msgstr ""
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
msgid "Select HTML variable width font for printing"
msgstr ""
# mail/mail-config.glade.h:69
# mail/mail-config.glade.h:69
# mail/mail-config.glade.h:78
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
#, fuzzy
msgid "Select PGP program"
msgstr "选择 PGP 二进制数"
@@ -20368,49 +20736,49 @@ msgstr "选择 PGP 二进制数"
# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
# mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
msgid "Sending Email"
msgstr "正在发送电子邮件"
# mail/mail-config.glade.h:74
# mail/mail-config.glade.h:74
# mail/mail-config.glade.h:83
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
msgid "Sent _messages folder:"
msgstr "发送邮件文件夹(_M):"
# mail/mail-config.glade.h:75
# mail/mail-config.glade.h:75
# mail/mail-config.glade.h:84
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
msgid "Sent and Draft Messages"
msgstr "已发送和草稿邮件"
# mail/mail-config.glade.h:76
# mail/mail-config.glade.h:76
# mail/mail-config.glade.h:85
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
msgid "Ser_ver requires authentication"
msgstr "服务器需要认证(_V)"
# mail/mail-config.glade.h:77
# mail/mail-config.glade.h:77
# mail/mail-config.glade.h:86
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
msgid "Server Configuration"
msgstr "服务器配置"
# mail/mail-config.glade.h:78
# mail/mail-config.glade.h:78
# mail/mail-config.glade.h:87
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
msgid "Server _Type: "
msgstr "服务器类型(_T):"
# shell/e-shortcuts.c:1043
# shell/e-shortcuts.c:1043
# shell/e-shortcuts.c:1043
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
#, fuzzy
msgid "Shortcuts _type:"
msgstr "快捷方式"
@@ -20418,7 +20786,7 @@ msgstr "快捷方式"
# mail/mail-config.glade.h:79
# mail/mail-config.glade.h:79
# mail/mail-config.glade.h:88
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
#, fuzzy
msgid "Signature #1"
msgstr "签名文件:"
@@ -20426,63 +20794,49 @@ msgstr "签名文件:"
# mail/mail-config.glade.h:79
# mail/mail-config.glade.h:79
# mail/mail-config.glade.h:88
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
#, fuzzy
msgid "Signature #2"
msgstr "签名文件:"
-# mail/mail-config.glade.h:80
-# mail/mail-config.glade.h:80
-# mail/mail-config.glade.h:89
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "来源"
-
-# mail/mail-config.glade.h:81
-# mail/mail-config.glade.h:81
-# mail/mail-config.glade.h:90
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "来源信息"
-
# addressbook/printing/e-contact-print.glade.h:38
# addressbook/printing/e-contact-print.glade.h:38
# mail/mail-config.glade.h:92
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
#, fuzzy
msgid "Specify _filename:"
msgstr "指定文件名:"
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
msgid "Spell Checking Language"
msgstr ""
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
msgid "Spell _Checking"
msgstr ""
# mail/mail-config.glade.h:84
# mail/mail-config.glade.h:84
# mail/mail-config.glade.h:93
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
msgid "Standard Unix mbox"
msgstr "标准 Unix mbox"
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
"for display purposes only. "
msgstr ""
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:125
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 "
"dictionary installed."
msgstr ""
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:127
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -20491,7 +20845,7 @@ msgstr ""
# my-evolution/metar.c:63
# my-evolution/metar.c:63
# my-evolution/metar.c:63
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:130
#, fuzzy
msgid "V_ariable-width:"
msgstr "不定风"
@@ -20499,7 +20853,7 @@ msgstr "不定风"
# mail/mail-config.glade.h:87
# mail/mail-config.glade.h:87
# mail/mail-config.glade.h:96
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -20512,7 +20866,7 @@ msgstr ""
# my-evolution/metar.c:65
# my-evolution/metar.c:65
# my-evolution/metar.c:65
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
#, fuzzy
msgid "XEmacs"
msgstr "东"
@@ -20520,7 +20874,7 @@ msgstr "东"
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:125
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
#, fuzzy
msgid "_Add Signature"
msgstr "签名文件(_S):"
@@ -20528,48 +20882,48 @@ msgstr "签名文件(_S):"
# mail/mail-config.glade.h:91
# mail/mail-config.glade.h:91
# mail/mail-config.glade.h:100
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
msgid "_Always load images off the net"
msgstr "总是离线装入图像(_A)"
# mail/mail-config.glade.h:92
# mail/mail-config.glade.h:92
# mail/mail-config.glade.h:101
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
msgid "_Always sign outgoing messages when using this account"
msgstr "当使用该帐号时总是发送签名邮件(_A)"
# mail/mail-config.glade.h:93
# mail/mail-config.glade.h:93
# mail/mail-config.glade.h:102
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
msgid "_Authentication Type: "
msgstr "验证类型(_A):"
# mail/mail-config.glade.h:93
# mail/mail-config.glade.h:93
# mail/mail-config.glade.h:102
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
msgid "_Authentication type: "
msgstr "验证类型(_A):"
# mail/mail-config.glade.h:94
# mail/mail-config.glade.h:94
# mail/mail-config.glade.h:103
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
msgid "_Automatically check for new mail"
msgstr "自动检查新邮件(_A)"
# mail/mail-config.glade.h:94
# mail/mail-config.glade.h:94
# mail/mail-config.glade.h:103
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
#, fuzzy
msgid "_Automatically insert smiley images"
msgstr "自动检查新邮件(_A)"
# mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
#, fuzzy
msgid "_Beep when new mail arrives"
msgstr "新邮件到达时鸣笛"
@@ -20577,14 +20931,14 @@ msgstr "新邮件到达时鸣笛"
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:104
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
msgid "_Certificate ID:"
msgstr "证书 ID(_C):"
# mail/mail-config.glade.h:16
# mail/mail-config.glade.h:16
# mail/mail-config.glade.h:20
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
#, fuzzy
msgid "_Confirm when expunging a folder"
msgstr "当删除文件夹时进行提示"
@@ -20592,7 +20946,7 @@ msgstr "当删除文件夹时进行提示"
# ui/evolution-message-composer.xml.h:5
# ui/evolution-message-composer.xml.h:5
# ui/evolution-message-composer.xml.h:5
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
#, fuzzy
msgid "_Default signature:"
msgstr "删除签名以外的所有内容"
@@ -20600,13 +20954,13 @@ msgstr "删除签名以外的所有内容"
# mail/mail-config.glade.h:23
# mail/folder-browser.h:26
# mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
#, fuzzy
msgid "_Defaults"
msgstr "默认"
# mail/mail-config.glade.h:34
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
#, fuzzy
msgid "_Do not notify me when new mail arrives"
msgstr "新邮件到达时不要提醒我"
@@ -20614,19 +20968,19 @@ msgstr "新邮件到达时不要提醒我"
# mail/mail-accounts.c:196
# mail/mail-accounts.c:196
# mail/mail-accounts.c:196
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
#, fuzzy
msgid "_Enable"
msgstr "启用"
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
msgid "_Fixed-width:"
msgstr ""
# ui/evolution-mail-message.xml.h:32
# ui/evolution-mail-message.xml.h:32
# ui/evolution-mail-message.xml.h:32
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
#, fuzzy
msgid "_Forward style:"
msgstr "转发方式"
@@ -20634,14 +20988,14 @@ msgstr "转发方式"
# mail/mail-config.glade.h:101
# mail/mail-config.glade.h:101
# mail/mail-config.glade.h:110
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
msgid "_Full name:"
msgstr "全名(_F):"
# mail/mail-config.glade.h:38
# mail/mail-config.glade.h:38
# mail/mail-config.glade.h:45
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
#, fuzzy
msgid "_HTML Mail"
msgstr "在 HTML 邮件中"
@@ -20649,7 +21003,7 @@ msgstr "在 HTML 邮件中"
# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
# mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
#, fuzzy
msgid "_Identity"
msgstr "标识"
@@ -20657,14 +21011,14 @@ msgstr "标识"
# mail/mail-config.glade.h:105
# mail/mail-config.glade.h:105
# mail/mail-config.glade.h:114
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
msgid "_Load images if sender is in addressbook"
msgstr "如果发件人在地址簿中就装入图像(_L)"
# mail/mail-config.glade.h:44
# mail/mail-config.glade.h:44
# mail/mail-config.glade.h:51
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
#, fuzzy
msgid "_Make this my default account"
msgstr "设置为我的默认帐号(_D)"
@@ -20672,7 +21026,7 @@ msgstr "设置为我的默认帐号(_D)"
# mail/mail-config.glade.h:107
# mail/mail-config.glade.h:107
# mail/mail-config.glade.h:116
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
#, fuzzy
msgid "_Mark messages as read after"
msgstr "阅读时将邮件标记为已读,延时(_M)"
@@ -20680,26 +21034,26 @@ msgstr "阅读时将邮件标记为已读,延时(_M)"
# mail/mail-config.glade.h:108
# mail/mail-config.glade.h:108
# mail/mail-config.glade.h:117
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
msgid "_Name:"
msgstr "名称(_N):"
# mail/mail-config.glade.h:109
# mail/mail-config.glade.h:109
# mail/mail-config.glade.h:118
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
msgid "_Never load images off the net"
msgstr "从不装入图像"
# mail/mail-config.glade.h:111
# mail/mail-config.glade.h:111
# mail/mail-config.glade.h:120
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
msgid "_PGP binary path:"
msgstr "PGP 二进制路径(_P):"
# mail/mail-config.glade.h:62
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
#, fuzzy
msgid "_Play sound file when new mail arrives"
msgstr "新邮件到达时播放声音文件"
@@ -20707,7 +21061,7 @@ msgstr "新邮件到达时播放声音文件"
# mail/mail-config.glade.h:55
# mail/mail-config.glade.h:55
# mail/mail-config.glade.h:64
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
#, fuzzy
msgid "_Prompt when sending HTML messages to contacts that don't want them"
msgstr "在往不希望接收 HTML 消息的联系人发送 HTML 消息的时候进行提示"
@@ -20715,7 +21069,7 @@ msgstr "在往不希望接收 HTML 消息的联系人发送 HTML 消息的时候
# mail/mail-config.glade.h:56
# mail/mail-config.glade.h:56
# mail/mail-config.glade.h:65
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
#, fuzzy
msgid "_Prompt when sending messages with an empty subject line"
msgstr "在发送空标题的消息时进行提示(_E)"
@@ -20723,7 +21077,7 @@ msgstr "在发送空标题的消息时进行提示(_E)"
# mail/mail-config.glade.h:62
# mail/mail-config.glade.h:62
# mail/mail-config.glade.h:71
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
#, fuzzy
msgid "_Receiving Mail"
msgstr "正在接收邮件"
@@ -20731,19 +21085,19 @@ msgstr "正在接收邮件"
# ui/evolution-mail-message.xml.h:71
# ui/evolution-mail-message.xml.h:71
# ui/evolution-mail-message.xml.h:73
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
#, fuzzy
msgid "_Reply style:"
msgstr "全部回复"
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
msgid "_Restore defaults"
msgstr ""
# ui/evolution-message-composer.xml.h:54
# ui/evolution-message-composer.xml.h:54
# ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
#, fuzzy
msgid "_Script:"
msgstr "安全(_S)"
@@ -20751,14 +21105,14 @@ msgstr "安全(_S)"
# ui/evolution-message-composer.xml.h:54
# ui/evolution-message-composer.xml.h:54
# ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
msgid "_Security"
msgstr "安全(_S)"
# mail/mail-config.glade.h:71
# mail/mail-config.glade.h:71
# mail/mail-config.glade.h:80
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
#, fuzzy
msgid "_Sending Mail"
msgstr "正在发送邮件"
@@ -20769,7 +21123,7 @@ msgstr "正在发送邮件"
# calendar/gui/e-calendar-table.etspec.h:13
# calendar/gui/dialogs/event-page.glade.h:11
# calendar/gui/e-calendar-table.etspec.h:13
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
#, fuzzy
msgid "_Show animated images"
msgstr "按其显示时间"
@@ -20777,7 +21131,7 @@ msgstr "按其显示时间"
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:125
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
#, fuzzy
msgid "_Signatures"
msgstr "签名文件(_S):"
@@ -20785,7 +21139,7 @@ msgstr "签名文件(_S):"
# mail/mail-config.glade.h:86
# mail/mail-config.glade.h:86
# mail/mail-config.glade.h:95
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
#, fuzzy
msgid "_Use secure connection (SSL):"
msgstr "使用安全连接 (SSL)"
@@ -20793,7 +21147,7 @@ msgstr "使用安全连接 (SSL)"
# my-evolution/metar.c:63
# my-evolution/metar.c:63
# my-evolution/metar.c:63
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
#, fuzzy
msgid "_Variable-width:"
msgstr "不定风"
@@ -20801,14 +21155,14 @@ msgstr "不定风"
# mail/mail-config.glade.h:118
# mail/mail-config.glade.h:118
# mail/mail-config.glade.h:127
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
msgid "_every"
msgstr "每(_E)"
# mail/mail-config.glade.h:2
# mail/mail-config.glade.h:2
# mail/mail-config.glade.h:2
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
#, fuzzy
msgid "color"
msgstr " 颜色"
@@ -20816,18 +21170,11 @@ msgstr " 颜色"
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:128
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
msgid "description"
msgstr "描述"
-# mail/mail-config.glade.h:121
-# mail/mail-config.glade.h:121
-# mail/mail-config.glade.h:130
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "新闻窗口1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
msgid "xxxxxxxxxxxxxxxxxxxx"
msgstr ""
@@ -20869,36 +21216,37 @@ msgstr "无法创建 S/MIME 解码上下文。"
# mail/mail-display.c:243
# mail/mail-display.c:242
# mail/mail-display.c:243
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
msgid "Save Attachment"
msgstr "保存附件"
# mail/folder-browser.c:297 mail/mail-display.c:298
# mail/folder-browser.c:297 mail/mail-display.c:297
# mail/folder-browser.c:298 mail/mail-display.c:298
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
#, fuzzy, c-format
msgid "Could not create temporary file '%s': %s"
msgstr "无法创建临时目录: %s"
-# mail/mail-display.c:350
-# mail/mail-display.c:349
-# mail/mail-display.c:350
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "保存到磁盘..."
+# mail/mail-display.c:243
+# mail/mail-display.c:242
+# mail/mail-display.c:243
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "保存附件"
# mail/mail-display.c:352
# mail/mail-display.c:351
# mail/mail-display.c:352
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
msgid "View Inline"
msgstr "嵌入视图"
# mail/mail-display.c:354
# mail/mail-display.c:353
# mail/mail-display.c:354
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
#, c-format
msgid "Open in %s..."
msgstr "在 %s 中打开..."
@@ -20906,7 +21254,7 @@ msgstr "在 %s 中打开..."
# mail/mail-display.c:415
# mail/mail-display.c:414
# mail/mail-display.c:415
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
#, c-format
msgid "View Inline (via %s)"
msgstr "嵌入视图 (通过 %s)"
@@ -20914,64 +21262,81 @@ msgstr "嵌入视图 (通过 %s)"
# mail/mail-display.c:419
# mail/mail-display.c:418
# mail/mail-display.c:419
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
msgid "Hide"
msgstr "隐藏"
# mail/mail-display.c:440
# mail/mail-display.c:439
# mail/mail-display.c:440
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
msgid "External Viewer"
msgstr "外部视图"
+# ui/evolution-mail-message.xml.h:42
+# ui/evolution-mail-message.xml.h:42
+# ui/evolution-mail-message.xml.h:42
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "装入图像(_I)"
+
# mail/mail-display.c:1133
# mail/mail-display.c:1136
# mail/mail-display.c:1162
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1454
msgid "Loading message content"
msgstr "装入邮件内容"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
#, fuzzy
msgid "Overdue:"
msgstr "被延误的任务(_V):"
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
# mail/mail-display.c:1602
# mail/mail-display.c:1628
# mail/mail-display.c:1657
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:2069
msgid "Open Link in Browser"
msgstr "在浏览器中打开连接"
# mail/mail-display.c:1604
# mail/mail-display.c:1630
# mail/mail-display.c:1659
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
msgid "Copy Link Location"
msgstr "复制连接位置"
# mail/mail-display.c:1607
# mail/mail-display.c:1633
# mail/mail-display.c:1662
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
msgid "Save Link as (FIXME)"
msgstr "连接保存为 (FIXME)"
# mail/mail-display.c:1610
# mail/mail-display.c:1636
# mail/mail-display.c:1665
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
msgid "Save Image as..."
msgstr "图像保存为..."
# mail/mail-format.c:635
# mail/mail-format.c:640
# mail/mail-format.c:646
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
@@ -20979,56 +21344,56 @@ msgstr "%s 附件"
# mail/mail-format.c:680
# mail/mail-format.c:686
# mail/mail-format.c:692
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
msgid "Could not parse MIME message. Displaying as source."
msgstr "无法解析 MIME 邮件。显示源文本。"
# mail/mail-format.c:763
# mail/mail-format.c:769
# mail/mail-format.c:775
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
msgid "Date"
msgstr "日期"
# mail/mail-format.c:846
# mail/mail-format.c:861
# mail/mail-format.c:867
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
msgid "Bad Address"
msgstr "无效地址"
# mail/mail-format.c:886 mail/message-list.etspec.h:3
# mail/mail-format.c:904 mail/message-list.etspec.h:3
# mail/mail-format.c:910 mail/message-list.etspec.h:3
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
msgid "From"
msgstr "发件人"
# mail/mail-format.c:889
# mail/mail-format.c:908
# mail/mail-format.c:914
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
msgid "Reply-To"
msgstr "回复至"
# mail/mail-format.c:893 mail/message-list.etspec.h:10
# mail/mail-format.c:913 mail/message-list.etspec.h:11
# mail/mail-format.c:919 mail/message-list.etspec.h:11
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
msgid "To"
msgstr "收件人"
# mail/mail-format.c:897
# mail/mail-format.c:918
# mail/mail-format.c:924
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
msgid "Cc"
msgstr "抄送"
# mail/mail-format.c:901
# mail/mail-format.c:923
# mail/mail-format.c:929
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
msgid "Bcc"
msgstr "密件抄送"
@@ -21038,23 +21403,15 @@ msgstr "密件抄送"
# importers/pine-importer.c:637 mail/component-factory.c:100
# importers/elm-importer.c:525 importers/netscape-importer.c:958
# importers/pine-importer.c:637 mail/component-factory.c:100
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
#, fuzzy
msgid "Mailer"
msgstr "邮件"
-# mail/mail-callbacks.c:1962
-# mail/mail-callbacks.c:2081
-# mail/mail-callbacks.c:2117
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "消息另存为..."
-
# mail/mail-format.c:1813
# mail/mail-format.c:1749
# mail/mail-format.c:1768
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
msgid ""
"This message is digitally signed. Click the lock icon for more information."
msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
@@ -21062,7 +21419,7 @@ msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
# mail/mail-crypto.c:84
# mail/mail-crypto.c:84
# mail/mail-crypto.c:84
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
#, fuzzy
msgid "Could not create a PGP verfication context"
msgstr "无法创建 PGP 验证上下文。"
@@ -21070,21 +21427,21 @@ msgstr "无法创建 PGP 验证上下文。"
# mail/mail-format.c:1844
# mail/mail-format.c:1780
# mail/mail-format.c:1799
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
msgid "This message is digitally signed and has been found to be authentic."
msgstr "该邮件有数字签名,并被证实为可信。"
# mail/mail-format.c:1852
# mail/mail-format.c:1788
# mail/mail-format.c:1807
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr "该邮件有数字签名,但不能证实是可信的。"
# mail/mail-format.c:2068
# mail/mail-format.c:2003
# mail/mail-format.c:2022
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
@@ -21092,7 +21449,7 @@ msgstr "指向 FTP 站点 (%s)"
# mail/mail-format.c:2082
# mail/mail-format.c:2017
# mail/mail-format.c:2036
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
@@ -21100,7 +21457,7 @@ msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
# mail/mail-format.c:2087
# mail/mail-format.c:2022
# mail/mail-format.c:2041
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
@@ -21108,7 +21465,7 @@ msgstr "指向本地文件 (%s)"
# mail/mail-format.c:2116
# mail/mail-format.c:2051
# mail/mail-format.c:2070
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
@@ -21116,7 +21473,7 @@ msgstr "指向远程数据 (%s)"
# mail/mail-format.c:2124
# mail/mail-format.c:2059
# mail/mail-format.c:2078
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
@@ -21124,14 +21481,14 @@ msgstr "指向未知的外部数据 (“%s”类型)"
# mail/mail-format.c:2129
# mail/mail-format.c:2064
# mail/mail-format.c:2083
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
# shell/e-local-storage.c:636
# shell/e-local-storage.c:636
# shell/e-local-storage.c:636
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
#, fuzzy, c-format
msgid "Local folders/%s"
msgstr "本地文件夹"
@@ -21139,17 +21496,17 @@ msgstr "本地文件夹"
# mail/mail-local.c:626
# mail/mail-local.c:626
# mail/mail-local.c:626
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
msgid "Reconfiguring folder"
msgstr "正在重新配置文件夹"
# mail/mail-local.c:707
# mail/mail-local.c:707
# mail/mail-local.c:707
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
"open this folder anymore: %s: %s"
msgstr ""
"无法保存文件夹元信息;您可能无法再\n"
@@ -21158,7 +21515,7 @@ msgstr ""
# mail/mail-local.c:763
# mail/mail-local.c:763
# mail/mail-local.c:763
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
#, c-format
msgid "Cannot save folder metainfo to %s: %s"
msgstr "无法把文件夹元信息保存到 %s: %s"
@@ -21166,7 +21523,7 @@ msgstr "无法把文件夹元信息保存到 %s: %s"
# mail/mail-local.c:815
# mail/mail-local.c:815
# mail/mail-local.c:815
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
#, c-format
msgid "Cannot delete folder metadata %s: %s"
msgstr "无法删除文件夹元信息 %s: %s"
@@ -21174,7 +21531,7 @@ msgstr "无法删除文件夹元信息 %s: %s"
# mail/mail-local.c:1281
# mail/mail-local.c:1281
# mail/mail-local.c:1281
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr "将文件夹格式从“%s”改为“%s”"
@@ -21182,7 +21539,7 @@ msgstr "将文件夹格式从“%s”改为“%s”"
# mail/mail-local.c:1296
# mail/mail-local.c:1296
# mail/mail-local.c:1296
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
#, c-format
msgid "%s may not be reconfigured because it is not a local folder"
msgstr "由于 %s 不是本地文件夹,因此不能重新配置"
@@ -21190,7 +21547,7 @@ msgstr "由于 %s 不是本地文件夹,因此不能重新配置"
# mail/mail-local.c:1318
# mail/mail-local.c:1318
# mail/mail-local.c:1318
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
@@ -21201,14 +21558,14 @@ msgstr ""
# mail/mail-local.c:1407
# mail/mail-local.c:1407
# mail/mail-local.c:1407
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
msgid "You cannot change the format of a non-local folder."
msgstr "您不能改变远程文件夹的格式。"
# mail/mail-local.c:1416
# mail/mail-local.c:1416
# mail/mail-local.c:1416
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
#, c-format
msgid "Reconfigure /%s"
msgstr "重新配置 /%s"
@@ -21216,7 +21573,7 @@ msgstr "重新配置 /%s"
# mail/mail-mt.c:254
# mail/mail-mt.c:254
# mail/mail-mt.c:254
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
#, c-format
msgid ""
"Error while '%s':\n"
@@ -21228,7 +21585,7 @@ msgstr ""
# mail/mail-mt.c:257
# mail/mail-mt.c:257
# mail/mail-mt.c:257
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
#, c-format
msgid ""
"Error while performing operation:\n"
@@ -21240,7 +21597,7 @@ msgstr ""
# mail/mail-mt.c:901
# mail/mail-mt.c:901
# mail/mail-mt.c:901
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
msgid "Working"
msgstr "正在工作"
@@ -21254,21 +21611,21 @@ msgstr "正在过滤文件夹"
# mail/mail-ops.c:249
# mail/mail-ops.c:250
# mail/mail-ops.c:258
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
msgid "Fetching Mail"
msgstr "正在收取邮件"
# mail/mail-ops.c:489 mail/mail-ops.c:518
# mail/mail-ops.c:491 mail/mail-ops.c:520
# mail/mail-ops.c:534 mail/mail-ops.c:563
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
msgid "However, the message was successfully sent."
msgstr "可是,邮件已经成功发送。"
# mail/mail-ops.c:554
# mail/mail-ops.c:556
# mail/mail-ops.c:599
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
#, c-format
msgid "Sending \"%s\""
msgstr "正在发送“%s”"
@@ -21276,7 +21633,7 @@ msgstr "正在发送“%s”"
# mail/mail-ops.c:674
# mail/mail-ops.c:676
# mail/mail-ops.c:719
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
#, c-format
msgid "Sending message %d of %d"
msgstr "发送第 %d 个邮件,共 %d 个"
@@ -21284,7 +21641,7 @@ msgstr "发送第 %d 个邮件,共 %d 个"
# mail/mail-ops.c:693
# mail/mail-ops.c:695
# mail/mail-ops.c:738
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
#, c-format
msgid "Failed on message %d of %d"
msgstr "在第 %d 个邮件失败,共 %d 个"
@@ -21292,21 +21649,21 @@ msgstr "在第 %d 个邮件失败,共 %d 个"
# mail/mail-ops.c:695 mail/mail-send-recv.c:537
# mail/mail-ops.c:697 mail/mail-send-recv.c:545
# mail/mail-ops.c:740 mail/mail-send-recv.c:545
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
msgid "Complete."
msgstr "完成。"
# mail/mail-ops.c:788
# mail/mail-ops.c:790
# mail/mail-ops.c:833
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
msgid "Saving message to folder"
msgstr "把邮件保存到文件夹中"
# mail/mail-ops.c:868
# mail/mail-ops.c:870
# mail/mail-ops.c:913
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
#, c-format
msgid "Moving messages to %s"
msgstr "把邮件移动到 %s"
@@ -21314,7 +21671,7 @@ msgstr "把邮件移动到 %s"
# mail/mail-ops.c:868
# mail/mail-ops.c:870
# mail/mail-ops.c:913
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
#, c-format
msgid "Copying messages to %s"
msgstr "把邮件复制到 %s"
@@ -21322,7 +21679,7 @@ msgstr "把邮件复制到 %s"
# mail/mail-ops.c:1008
# mail/mail-ops.c:1010
# mail/mail-ops.c:1053
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "正在“%s”中扫描文件夹"
@@ -21330,14 +21687,14 @@ msgstr "正在“%s”中扫描文件夹"
# mail/mail-ops.c:1191
# mail/mail-ops.c:1193
# mail/mail-ops.c:1236
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
msgid "Forwarded messages"
msgstr "已转发邮件"
# mail/mail-ops.c:1234
# mail/mail-ops.c:1236
# mail/mail-ops.c:1279
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
#, c-format
msgid "Opening folder %s"
msgstr "正在打开文件夹 %s"
@@ -21345,7 +21702,7 @@ msgstr "正在打开文件夹 %s"
# mail/mail-ops.c:1306
# mail/mail-ops.c:1308
# mail/mail-ops.c:1351
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
#, c-format
msgid "Opening store %s"
msgstr "正在打开存储 %s"
@@ -21353,7 +21710,7 @@ msgstr "正在打开存储 %s"
# mail/mail-ops.c:1375
# mail/mail-ops.c:1377
# mail/mail-ops.c:1420
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
#, c-format
msgid "Removing folder %s"
msgstr "正在删除文件夹“%s”"
@@ -21361,7 +21718,7 @@ msgstr "正在删除文件夹“%s”"
# mail/mail-ops.c:1469
# mail/mail-ops.c:1471
# mail/mail-ops.c:1514
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
#, c-format
msgid "Storing folder '%s'"
msgstr "正在存储文件夹“%s”"
@@ -21369,21 +21726,21 @@ msgstr "正在存储文件夹“%s”"
# mail/mail-ops.c:1520
# mail/mail-ops.c:1522
# mail/mail-ops.c:1565
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
msgid "Refreshing folder"
msgstr "正在刷新文件夹"
# mail/mail-ops.c:1556
# mail/mail-ops.c:1558
# mail/mail-ops.c:1601
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
msgid "Expunging folder"
msgstr "正在删除文件夹"
# mail/mail-ops.c:1605
# mail/mail-ops.c:1607
# mail/mail-ops.c:1650
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
#, c-format
msgid "Retrieving message %s"
msgstr "正在检索邮件 %s"
@@ -21391,7 +21748,7 @@ msgstr "正在检索邮件 %s"
# mail/mail-ops.c:1672
# mail/mail-ops.c:1674
# mail/mail-ops.c:1717
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
#, c-format
msgid "Retrieving %d message(s)"
msgstr "正在检索 %d 个邮件"
@@ -21399,7 +21756,7 @@ msgstr "正在检索 %d 个邮件"
# mail/mail-ops.c:1758
# mail/mail-ops.c:1760
# mail/mail-ops.c:1803
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
#, c-format
msgid "Saving %d messsage(s)"
msgstr "正在保存 %d 个邮件"
@@ -21407,7 +21764,7 @@ msgstr "正在保存 %d 个邮件"
# mail/mail-ops.c:1870
# mail/mail-ops.c:1872
# mail/mail-ops.c:1915
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -21419,7 +21776,7 @@ msgstr ""
# mail/mail-ops.c:1898
# mail/mail-ops.c:1900
# mail/mail-ops.c:1943
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -21431,14 +21788,14 @@ msgstr ""
# mail/mail-ops.c:1972
# mail/mail-ops.c:1974
# mail/mail-ops.c:2017
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
msgid "Saving attachment"
msgstr "正在保存附件"
# mail/mail-ops.c:1988
# mail/mail-ops.c:1990
# mail/mail-ops.c:2033
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -21450,7 +21807,7 @@ msgstr ""
# mail/mail-ops.c:2019
# mail/mail-ops.c:2021
# mail/mail-ops.c:2064
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据: %s"
@@ -21458,7 +21815,7 @@ msgstr "无法写数据: %s"
# mail/mail-ops.c:2088
# mail/mail-ops.c:2090
# mail/mail-ops.c:2133
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
#, c-format
msgid "Disconnecting from %s"
msgstr "断开与 %s 的连接"
@@ -21466,21 +21823,15 @@ msgstr "断开与 %s 的连接"
# mail/mail-ops.c:2089
# mail/mail-ops.c:2091
# mail/mail-ops.c:2134
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
#, c-format
msgid "Reconnecting to %s"
msgstr "重新与 %s 连接"
-# mail/mail-ops.c:2233
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr "正在执行 shell 命令:%s"
-
# mail/mail-search-dialogue.c:113
# mail/mail-search-dialogue.c:113
# mail/mail-search-dialogue.c:113
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
msgid "_Search"
msgstr "搜索(_S)"
@@ -21574,42 +21925,57 @@ msgstr "类型: %s"
# mail/mail-send-recv.c:286
# mail/mail-send-recv.c:292
# mail/mail-send-recv.c:292
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
msgid "Send & Receive Mail"
msgstr "发送和接收邮件"
# mail/mail-send-recv.c:288
# mail/mail-send-recv.c:294
# mail/mail-send-recv.c:294
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
msgid "Cancel All"
msgstr "全部取消"
# mail/mail-send-recv.c:348
# mail/mail-send-recv.c:354
# mail/mail-send-recv.c:354
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
msgid "Updating..."
msgstr "正在更新..."
# mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
# mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
# mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
msgid "Waiting..."
msgstr "正在等待..."
# mail/mail-session.c:220
# mail/mail-session.c:220
# mail/mail-session.c:222
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
msgid "User canceled operation."
msgstr "用户己取消操作。"
+# mail/mail-config.glade.h:113
+# mail/mail-config.glade.h:113
+# mail/mail-config.glade.h:122
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "记住该密码(_R)"
+
+# e-util/e-passwords.c:362 mail/mail-session.c:268
+# e-util/e-passwords.c:362 mail/mail-session.c:268
+# e-util/e-passwords.c:362 mail/mail-session.c:270
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "在本会话中记住该密码"
+
# mail/mail-session.c:319
# mail/mail-session.c:319
# mail/mail-session.c:321
-#: mail/mail-session.c:321
+#: mail/mail-session.c:334
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
@@ -21617,7 +21983,7 @@ msgstr "为 %s 输入密码"
# mail/mail-session.c:322
# mail/mail-session.c:322
# mail/mail-session.c:324
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
msgid "Enter Password"
msgstr "输入密码"
@@ -21656,7 +22022,7 @@ msgstr ""
# my-evolution/e-summary-preferences.c:956
# my-evolution/e-summary-preferences.c:956
# my-evolution/e-summary-preferences.c:958
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
msgid "Name:"
msgstr "名称:"
@@ -21701,7 +22067,7 @@ msgstr "已转发邮件"
# mail/mail-tools.c:393
# mail/mail-tools.c:393
# mail/mail-tools.c:394
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
msgid "Forwarded Message"
msgstr "已转发邮件"
@@ -21724,7 +22090,7 @@ msgstr "为 uri 更新虚拟文件夹: %s"
# mail/mail-vfolder.c:419
# mail/mail-vfolder.c:419
# mail/mail-vfolder.c:419
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
#, c-format
msgid ""
"The following vFolder(s):\n"
@@ -21736,29 +22102,28 @@ msgstr ""
# mail/mail-vfolder.c:728
# mail/mail-vfolder.c:728
# mail/mail-vfolder.c:728
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
msgid "VFolders"
msgstr "虚拟文件夹"
# camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
# mail/mail-vfolder.c:785
# mail/mail-vfolder.c:785
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
msgid "vFolders"
msgstr "虚拟文件夹"
# mail/mail-vfolder.c:824
# mail/mail-vfolder.c:825
# mail/mail-vfolder.c:825
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
msgid "Edit VFolder"
msgstr "编辑虚拟文件夹"
# mail/mail-vfolder.c:840
# mail/mail-vfolder.c:841
# mail/mail-vfolder.c:841
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
#, c-format
msgid "Trying to edit a vfolder '%s' which doesn't exist."
msgstr "试图编辑并不存在的虚拟文件夹“%s”。"
@@ -21766,21 +22131,21 @@ msgstr "试图编辑并不存在的虚拟文件夹“%s”。"
# mail/mail-vfolder.c:894
# mail/mail-vfolder.c:895
# mail/mail-vfolder.c:895
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
msgid "New VFolder"
msgstr "新建虚拟文件夹"
# mail/message-browser.c:212
# mail/message-browser.c:212
# mail/message-browser.c:212
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
msgid "(No subject)"
msgstr "(没有主题)"
# mail/message-browser.c:214
# mail/message-browser.c:214
# mail/message-browser.c:214
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
#, c-format
msgid "%s - Message"
msgstr "%s - 邮件"
@@ -21788,105 +22153,109 @@ msgstr "%s - 邮件"
# mail/message-list.c:639
# mail/message-list.c:645
# mail/message-list.c:662
-#: mail/message-list.c:720
+#: mail/message-list.c:733
msgid "Unseen"
msgstr "不可见"
# mail/message-list.c:640
# mail/message-list.c:646
# mail/message-list.c:663
-#: mail/message-list.c:721
+#: mail/message-list.c:734
msgid "Seen"
msgstr "可见"
# mail/message-list.c:641
# mail/message-list.c:647
# mail/message-list.c:664
-#: mail/message-list.c:722
+#: mail/message-list.c:735
msgid "Answered"
msgstr "已应答"
# mail/message-list.c:642
# mail/message-list.c:648
# mail/message-list.c:665
-#: mail/message-list.c:723
+#: mail/message-list.c:736
msgid "Multiple Unseen Messages"
msgstr "多个不可见邮件"
# mail/message-list.c:643
# mail/message-list.c:649
# mail/message-list.c:666
-#: mail/message-list.c:724
+#: mail/message-list.c:737
msgid "Multiple Messages"
msgstr "多个邮件"
# mail/message-list.c:647
# mail/message-list.c:658
# mail/message-list.c:675
-#: mail/message-list.c:728
+#: mail/message-list.c:741
msgid "Lowest"
msgstr "最低"
# mail/message-list.c:648
# mail/message-list.c:659
# mail/message-list.c:676
-#: mail/message-list.c:729
+#: mail/message-list.c:742
msgid "Lower"
msgstr "较低"
# mail/message-list.c:652
# mail/message-list.c:663
# mail/message-list.c:680
-#: mail/message-list.c:733
+#: mail/message-list.c:746
msgid "Higher"
msgstr "较高"
# mail/message-list.c:653
# mail/message-list.c:664
# mail/message-list.c:681
-#: mail/message-list.c:734
+#: mail/message-list.c:747
msgid "Highest"
msgstr "最高"
# mail/message-list.c:903
# mail/message-list.c:920
# mail/message-list.c:937
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
msgid "?"
msgstr "?"
# mail/message-list.c:910
# mail/message-list.c:927
# mail/message-list.c:944
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
msgid "Today %l:%M %p"
msgstr "今天 %l:%M %p"
# mail/message-list.c:919
# mail/message-list.c:936
# mail/message-list.c:953
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
msgid "Yesterday %l:%M %p"
msgstr "昨天 %l:%M %p"
# mail/message-list.c:931
# mail/message-list.c:948
# mail/message-list.c:965
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
msgid "%a %l:%M %p"
msgstr "%a %l:%m %p"
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
# mail/message-list.c:941
# mail/message-list.c:958
# mail/message-list.c:975
-#: mail/message-list.c:1105
+#: mail/message-list.c:1101
msgid "%b %d %Y"
msgstr "%Y %b %d"
# mail/message-list.c:2334
# mail/message-list.c:2358
# mail/message-list.c:2387
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
msgid "Generating message list"
msgstr "正在生成邮件列表"
@@ -21953,7 +22322,7 @@ msgstr "大小"
# importers/elm-importer.c:525 importers/netscape-importer.c:958
# importers/pine-importer.c:637 mail/component-factory.c:100
# my-evolution/Locations.h:1355
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
#, fuzzy
msgid "Call"
msgstr "邮件"
@@ -21961,19 +22330,19 @@ msgstr "邮件"
# ui/evolution-mail-message.xml.h:31
# ui/evolution-mail-message.xml.h:31
# ui/evolution-mail-message.xml.h:31
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
#, fuzzy
msgid "Do Not Forward"
msgstr "转发"
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
msgid "Follow-Up"
msgstr ""
# mail/mail-config.glade.h:81
# mail/mail-config.glade.h:81
# mail/mail-config.glade.h:90
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
#, fuzzy
msgid "For Your Information"
msgstr "来源信息"
@@ -21981,37 +22350,37 @@ msgstr "来源信息"
# ui/evolution-mail-message.xml.h:31
# ui/evolution-mail-message.xml.h:31
# ui/evolution-mail-message.xml.h:31
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
msgid "Forward"
msgstr "转发"
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
msgid "No Response Necessary"
msgstr ""
# ui/evolution-mail-message.xml.h:70
# ui/evolution-mail-message.xml.h:70
# ui/evolution-mail-message.xml.h:72
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
msgid "Reply"
msgstr "回复"
# ui/evolution-mail-message.xml.h:71
# ui/evolution-mail-message.xml.h:71
# ui/evolution-mail-message.xml.h:73
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
msgid "Reply to All"
msgstr "全部回复"
# calendar/gui/dialogs/recurrence-page.glade.h:6
# calendar/gui/dialogs/recurrence-page.glade.h:6
# calendar/gui/dialogs/recurrence-page.glade.h:6
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
#, fuzzy
msgid "Review"
msgstr "预览"
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
msgid "Flag to Follow Up"
msgstr ""
@@ -22053,7 +22422,7 @@ msgstr "取消到文件夹“%s”的订阅"
# shell/e-storage-set-view.etspec.h:1
# mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
# shell/e-storage-set-view.etspec.h:1
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
#: shell/e-storage-set-view.etspec.h:2
msgid "Folder"
msgstr "文件夹"
@@ -22061,14 +22430,14 @@ msgstr "文件夹"
# mail/subscribe-dialog.c:1520
# mail/subscribe-dialog.c:1520
# mail/subscribe-dialog.c:1520
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
msgid "No server has been selected"
msgstr "没有选定服务器"
# mail/subscribe-dialog.c:1581
# mail/subscribe-dialog.c:1581
# mail/subscribe-dialog.c:1581
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
msgid "Please select a server."
msgstr "请选择服务器。"
@@ -29018,14 +29387,12 @@ msgstr "昆明"
msgid "Kushiro Airport"
msgstr ""
-# my-evolution/Locations.h:1147
#: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
msgstr ""
-# my-evolution/Locations.h:1148
#: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
msgstr ""
# my-evolution/Locations.h:1149
@@ -37561,8 +37928,8 @@ msgstr "邮件概要"
# shell/e-local-storage.c:636
# shell/e-local-storage.c:636
# shell/e-local-storage.c:636
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
msgid "Local Folders"
msgstr "本地文件夹"
@@ -37592,21 +37959,21 @@ msgstr "Dictionary.com 的每日一词"
# my-evolution/e-summary-preferences.c:465
# my-evolution/e-summary-preferences.c:465
# my-evolution/e-summary-preferences.c:466
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
msgid "Quotes of the Day"
msgstr "每日引用"
# my-evolution/e-summary-preferences.c:944
# my-evolution/e-summary-preferences.c:944
# my-evolution/e-summary-preferences.c:946
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
msgid "Add a news feed"
msgstr "添加新闻来源"
# my-evolution/e-summary-preferences.c:952
# my-evolution/e-summary-preferences.c:952
# my-evolution/e-summary-preferences.c:954
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
msgid "Enter the URL of the news feed you wish to add"
msgstr "输入您希望添加的新闻来源的 URL"
@@ -37627,7 +37994,7 @@ msgid "News Feed"
msgstr "新闻来源"
# my-evolution/Locations.h:1354
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
#, fuzzy
msgid "All"
msgstr "麦卡伦"
@@ -37636,7 +38003,7 @@ msgstr "麦卡伦"
# calendar/gui/dialogs/recurrence-page.glade.h:1
# calendar/gui/dialogs/recurrence-page.glade.h:1
#. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
#, fuzzy
msgid "Add"
msgstr "添加(_D)"
@@ -37644,7 +38011,7 @@ msgstr "添加(_D)"
# my-evolution/metar.c:157
# my-evolution/metar.c:157
# my-evolution/metar.c:157
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
#, fuzzy
msgid "Shown"
msgstr "雪"
@@ -37652,14 +38019,14 @@ msgstr "雪"
# my-evolution/e-summary-tasks.c:248
# my-evolution/e-summary-tasks.c:248
# my-evolution/e-summary-tasks.c:241
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
msgid "No tasks"
msgstr "没有任务"
# my-evolution/e-summary-tasks.c:287
# my-evolution/e-summary-tasks.c:287
# my-evolution/e-summary-tasks.c:281
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
msgid "(No Description)"
msgstr "(没有描述)"
@@ -39862,7 +40229,8 @@ msgstr "任务 "
# my-evolution/my-evolution.glade.h:20
# my-evolution/my-evolution.glade.h:20
#: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
msgstr "天气设置"
# my-evolution/my-evolution.glade.h:25
@@ -39954,7 +40322,7 @@ msgstr "取消操作"
# shell/e-storage-set-view.c:658
# shell/e-storage-set-view.c:658
# shell/e-storage-set-view.c:658
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
#, c-format
msgid ""
"Cannot transfer folder:\n"
@@ -39977,22 +40345,22 @@ msgstr "文件夹"
# mail/mail-config.glade.h:30 shell/e-local-storage.c:173
# mail/mail-config.glade.h:30 shell/e-local-storage.c:173
# mail/mail-config.glade.h:36 shell/e-local-storage.c:173
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
msgid "Drafts"
msgstr "草稿"
# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
msgid "Inbox"
msgstr "收件箱"
# shell/e-local-storage.c:175
# shell/e-local-storage.c:175
# shell/e-local-storage.c:175
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
msgid "Outbox"
msgstr "发件箱"
@@ -40002,7 +40370,7 @@ msgstr "发件箱"
# shell/e-local-storage.c:176
# mail/mail-config.glade.h:82 mail/message-list.etspec.h:7
# shell/e-local-storage.c:176
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
msgid "Sent"
msgstr "已发送"
@@ -40346,35 +40714,25 @@ msgstr ""
"无法创建指定的文件夹:\n"
"%s"
-# shell/e-shell-folder-creation-dialog.c:267
-# shell/e-shell-folder-creation-dialog.c:267
-# shell/e-shell-folder-creation-dialog.c:304
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
#: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - 创建新文件夹"
-
-# shell/e-shell-folder-selection-dialog.c:98
-# shell/e-shell-folder-selection-dialog.c:98
-# shell/e-shell-folder-selection-dialog.c:98
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"文件夹的类型对于请求的\n"
-"操作来说是不合法的。"
+#, fuzzy
+msgid "Create New Folder"
+msgstr "创建新文件夹(_N)..."
# shell/e-shell-folder-selection-dialog.c:376
# shell/e-shell-folder-selection-dialog.c:376
# shell/e-shell-folder-selection-dialog.c:376
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
msgid "New..."
msgstr "正在新建..."
# shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
# shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
# shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
msgid "(Untitled)"
msgstr "(无标题)"
@@ -40403,7 +40761,7 @@ msgstr ""
# shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
# shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
# shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
msgid "Please select the information that you would like to import:"
msgstr "请选择您希望导入的信息:"
@@ -40446,7 +40804,7 @@ msgstr "选择文件夹"
# shell/e-shell-importer.c:397
# shell/e-shell-importer.c:397
# shell/e-shell-importer.c:409
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
#, c-format
msgid "File %s does not exist"
msgstr "文件 %s 不存在"
@@ -40455,22 +40813,15 @@ msgstr "文件 %s 不存在"
# shell/e-shell-about-box.c:40
# shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
# shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
msgid "Evolution Error"
msgstr "Evolution 错误"
-# shell/e-shell-importer.c:409
-# shell/e-shell-importer.c:409
-# shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "您只能导入到本地文件夹"
-
# shell/e-shell-importer.c:424
# shell/e-shell-importer.c:424
# shell/e-shell-importer.c:435
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
#, c-format
msgid ""
"There is no importer that is able to handle\n"
@@ -40482,14 +40833,14 @@ msgstr ""
# shell/e-shell-importer.c:434
# shell/e-shell-importer.c:434
# shell/e-shell-importer.c:445
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
msgid "Importing"
msgstr "正在导入"
# shell/e-shell-importer.c:442
# shell/e-shell-importer.c:442
# shell/e-shell-importer.c:453
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
#, c-format
msgid ""
"Importing %s.\n"
@@ -40501,7 +40852,7 @@ msgstr ""
# shell/e-shell-importer.c:455
# shell/e-shell-importer.c:455
# shell/e-shell-importer.c:466
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
#, c-format
msgid "Error starting %s"
msgstr "启动 %s 错误"
@@ -40509,7 +40860,7 @@ msgstr "启动 %s 错误"
# shell/e-shell-importer.c:474
# shell/e-shell-importer.c:474
# shell/e-shell-importer.c:485
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
#, c-format
msgid "Error loading %s"
msgstr "装入 %s 错误"
@@ -40517,7 +40868,7 @@ msgstr "装入 %s 错误"
# shell/e-shell-importer.c:491
# shell/e-shell-importer.c:491
# shell/e-shell-importer.c:502
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
#, c-format
msgid ""
"Importing %s\n"
@@ -40529,49 +40880,49 @@ msgstr ""
# shell/e-shell-importer.c:561
# shell/e-shell-importer.c:561
# shell/e-shell-importer.c:572
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
msgid "Automatic"
msgstr "自动"
# shell/e-shell-importer.c:612
# shell/e-shell-importer.c:612
# shell/e-shell-importer.c:623
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
msgid "Filename:"
msgstr "文件名:"
# shell/e-shell-importer.c:617
# shell/e-shell-importer.c:617
# shell/e-shell-importer.c:628
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
msgid "Select a file"
msgstr "选择一个文件"
# shell/e-shell-importer.c:627
# shell/e-shell-importer.c:627
# shell/e-shell-importer.c:638
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
msgid "File type:"
msgstr "文件类型:"
# shell/e-shell-importer.c:652
# shell/e-shell-importer.c:652
# shell/e-shell-importer.c:663
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
msgid "Import data and settings from older programs"
msgstr "从老版程序中导入数据和设置"
# shell/e-shell-importer.c:656
# shell/e-shell-importer.c:656
# shell/e-shell-importer.c:667
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
msgid "Import a single file"
msgstr "导入单个文件"
# shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:628
# shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:628
# shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
msgid ""
"Please wait...\n"
"Scanning for existing setups"
@@ -40582,14 +40933,14 @@ msgstr ""
# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
# shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
msgid "Starting Intelligent Importers"
msgstr "启动智能导入器"
# shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:754
# shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:754
# shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
#, c-format
msgid "From %s:"
msgstr "从 %s:"
@@ -40597,21 +40948,21 @@ msgstr "从 %s:"
# shell/e-shell-importer.c:1014
# shell/e-shell-importer.c:1014
# shell/e-shell-importer.c:1027
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
msgid "Select folder"
msgstr "选择文件夹"
# shell/e-shell-importer.c:1015
# shell/e-shell-importer.c:1015
# shell/e-shell-importer.c:1028
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
msgid "Select a destination folder for importing this data"
msgstr "为导入的数据选择目标文件夹"
# shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
# shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
# shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
msgid "Import"
msgstr "导入"
@@ -40680,12 +41031,20 @@ msgstr "正在打开文件夹 %s"
msgid "in \"%s\" ..."
msgstr "在 %s 中打开..."
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "无法重命名文件夹: %s"
+
# shell/e-shell-folder-creation-dialog.c:111
# shell/e-shell-folder-creation-dialog.c:111
# shell/e-shell-folder-creation-dialog.c:125
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:542
#, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
msgstr ""
"无法创建指定的文件夹:\n"
"%s"
@@ -40714,8 +41073,8 @@ msgstr "无法启动 Evolution 邮件助手界面\n"
# shell/e-shell-user-creatable-items-handler.c:495
# shell/e-shell-user-creatable-items-handler.c:540
# widgets/misc/e-charset-picker.c:104
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
#: widgets/misc/e-charset-picker.c:104
msgid "New"
msgstr "新建"
@@ -40786,49 +41145,50 @@ msgstr "选择您希望打开的文件夹"
# shell/e-shell-view-menu.c:545
# shell/e-shell-view-menu.c:545
# shell/e-shell-view-menu.c:545
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
msgstr "创建新快捷方式"
# shell/e-shell-view-menu.c:546
# shell/e-shell-view-menu.c:546
# shell/e-shell-view-menu.c:546
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
msgid "Select the folder you want the shortcut to point to:"
msgstr "选择您希望快捷方式指向的文件夹:"
# shell/e-shell-view-menu.c:688
# shell/e-shell-view-menu.c:688
# shell/e-shell-view-menu.c:688
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
msgid "_Work Online"
msgstr "在线工作(_W)"
# shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
# shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
# shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
msgid "_Work Offline"
msgstr "离线工作(_W)"
# shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
# shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
# shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
msgid "Work Offline"
msgstr "离线工作"
# shell/e-shell-view.c:214
# shell/e-shell-view.c:214
# shell/e-shell-view.c:215
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
msgid "(No folder displayed)"
msgstr "(未显示文件夹)"
# shell/e-shell-view.c:1585
# shell/e-shell-view.c:1585
# shell/e-shell-view.c:1598
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
#, c-format
msgid "%s (%d)"
msgstr "%s (%d)"
@@ -40836,14 +41196,14 @@ msgstr "%s (%d)"
# shell/e-shell-view.c:1587
# shell/e-shell-view.c:1587
# shell/e-shell-view.c:1600
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
msgid "(None)"
msgstr "(无)"
# shell/e-shell-view.c:1634
# shell/e-shell-view.c:1634
# shell/e-shell-view.c:1647
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
@@ -40851,14 +41211,14 @@ msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
# shell/e-shell-view.c:1641
# shell/e-shell-view.c:1641
# shell/e-shell-view.c:1654
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
msgid "Ximian Evolution is in the process of going offline."
msgstr "Ximian Evolution 正在离线过程中。"
# shell/e-shell-view.c:1647
# shell/e-shell-view.c:1647
# shell/e-shell-view.c:1660
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr "Ximian Evolution 目前离线。 点击该按钮则在线工作。"
@@ -40866,7 +41226,7 @@ msgstr "Ximian Evolution 目前离线。 点击该按钮则在线工作。"
# shell/evolution-shell-component-utils.c:134
# shell/evolution-shell-component-utils.c:134
# shell/evolution-shell-component-utils.c:134
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
#, fuzzy, c-format
msgid ""
"Cannot activate component %s :\n"
@@ -40881,7 +41241,7 @@ msgstr ""
# shell/e-shell.c:651
# shell/e-shell.c:651
# shell/e-shell.c:651
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr "无法设置本地存储 -- %s"
@@ -40889,7 +41249,7 @@ msgstr "无法设置本地存储 -- %s"
# shell/e-shell.c:1659
# shell/e-shell.c:1659
# shell/e-shell.c:1660
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
#, c-format
msgid ""
"The Evolution component that handles folders of type \"%s\"\n"
@@ -40903,49 +41263,49 @@ msgstr ""
# shell/e-shell.c:1886
# shell/e-shell.c:1886
# shell/e-shell.c:1887
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
msgid "Invalid arguments"
msgstr "无效参数"
# shell/e-shell.c:1888
# shell/e-shell.c:1888
# shell/e-shell.c:1889
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
msgid "Cannot register on OAF"
msgstr "无法注册到 OAF"
# shell/e-shell.c:1890
# shell/e-shell.c:1890
# shell/e-shell.c:1891
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
msgid "Configuration Database not found"
msgstr "找不到配置数据库"
# shell/e-shell.c:1892 shell/e-storage.c:500
# shell/e-shell.c:1892 shell/e-storage.c:500
# shell/e-shell.c:1893 shell/e-storage.c:500
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
msgid "Generic error"
msgstr "通用错误"
# shell/e-shortcuts-view.c:74
# shell/e-shortcuts-view.c:74
# shell/e-shortcuts-view.c:74
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
msgid "Create new shortcut group"
msgstr "创建新快捷方式组"
# shell/e-shortcuts-view.c:75
# shell/e-shortcuts-view.c:75
# shell/e-shortcuts-view.c:75
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
msgid "Group name:"
msgstr "组名:"
# shell/e-shortcuts-view.c:175
# shell/e-shortcuts-view.c:175
# shell/e-shortcuts-view.c:175
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
#, c-format
msgid ""
"Do you really want to remove group\n"
@@ -40957,182 +41317,198 @@ msgstr ""
# shell/e-shortcuts-view.c:180
# shell/e-shortcuts-view.c:180
# shell/e-shortcuts-view.c:180
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
msgid "Don't remove"
msgstr "不删除"
# shell/e-shortcuts-view.c:209
# shell/e-shortcuts-view.c:209
# shell/e-shortcuts-view.c:209
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
msgid "Rename Shortcut Group"
msgstr "重命名快捷方式组"
# shell/e-shortcuts-view.c:210
# shell/e-shortcuts-view.c:210
# shell/e-shortcuts-view.c:210
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
msgid "Rename selected shortcut group to:"
msgstr "把选中的快捷方式组重命名为:"
# shell/e-shortcuts-view.c:224
# shell/e-shortcuts-view.c:224
# shell/e-shortcuts-view.c:224
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
msgid "_Small Icons"
msgstr "小图标(_S)"
# shell/e-shortcuts-view.c:225
# shell/e-shortcuts-view.c:225
# shell/e-shortcuts-view.c:225
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
msgid "Show the shortcuts as small icons"
msgstr "用小图标显示快捷方式"
# shell/e-shortcuts-view.c:227
# shell/e-shortcuts-view.c:227
# shell/e-shortcuts-view.c:227
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
msgid "_Large Icons"
msgstr "大图标(_L)"
# shell/e-shortcuts-view.c:228
# shell/e-shortcuts-view.c:228
# shell/e-shortcuts-view.c:228
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
msgid "Show the shortcuts as large icons"
msgstr "用大图标显示快捷方式"
# shell/e-shortcuts-view.c:239
# shell/e-shortcuts-view.c:239
# shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
msgid "_New Group..."
msgstr "新组(_N)..."
# shell/e-shortcuts-view.c:240
# shell/e-shortcuts-view.c:240
# shell/e-shortcuts-view.c:240
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
msgid "Create a new shortcut group"
msgstr "创建新快捷方式组"
# shell/e-shortcuts-view.c:242
# shell/e-shortcuts-view.c:242
# shell/e-shortcuts-view.c:242
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
msgid "_Remove this Group..."
msgstr "删除该组(_R)..."
# shell/e-shortcuts-view.c:243
# shell/e-shortcuts-view.c:243
# shell/e-shortcuts-view.c:243
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
msgid "Remove this shortcut group"
msgstr "删除该快捷方式组"
# shell/e-shortcuts-view.c:245
# shell/e-shortcuts-view.c:245
# shell/e-shortcuts-view.c:245
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
msgid "Re_name this Group..."
msgstr "重命名该组(_N)..."
# shell/e-shortcuts-view.c:246
# shell/e-shortcuts-view.c:246
# shell/e-shortcuts-view.c:246
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
msgid "Rename this shortcut group"
msgstr "重命名该快捷方式组"
# shell/e-shortcuts-view.c:251
# shell/e-shortcuts-view.c:251
# shell/e-shortcuts-view.c:251
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
msgid "_Hide the Shortcut Bar"
msgstr "隐藏快捷方式栏(_H)"
# shell/e-shortcuts-view.c:252
# shell/e-shortcuts-view.c:252
# shell/e-shortcuts-view.c:252
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
msgid "Hide the shortcut bar"
msgstr "隐藏快捷方式栏"
+# shell/e-shell-view-menu.c:545
+# shell/e-shell-view-menu.c:545
+# shell/e-shell-view-menu.c:545
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "创建新快捷方式"
+
+# shell/e-shell-view-menu.c:545
+# shell/e-shell-view-menu.c:545
+# shell/e-shell-view-menu.c:545
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "创建新快捷方式"
+
# shell/e-shortcuts-view.c:371
# shell/e-shortcuts-view.c:371
# shell/e-shortcuts-view.c:371
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:394
msgid "Rename shortcut"
msgstr "重命名快捷方式"
# shell/e-shortcuts-view.c:372
# shell/e-shortcuts-view.c:372
# shell/e-shortcuts-view.c:372
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
msgid "Rename selected shortcut to:"
msgstr "把快捷方式重命名为:"
# shell/e-shortcuts-view.c:384
# shell/e-shortcuts-view.c:384
# shell/e-shortcuts-view.c:384
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
msgid "Open the folder linked to this shortcut"
msgstr "打开连接到该快捷方式的文件夹"
# shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
# shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
# shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
msgid "Open in New _Window"
msgstr "在新窗口中打开(_W)"
# shell/e-shortcuts-view.c:386
# shell/e-shortcuts-view.c:386
# shell/e-shortcuts-view.c:386
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
msgid "Open the folder linked to this shortcut in a new window"
msgstr "在新窗口中打开连接到该快捷方式的文件夹"
# shell/e-shortcuts-view.c:389
# shell/e-shortcuts-view.c:389
# shell/e-shortcuts-view.c:389
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
msgid "_Rename"
msgstr "重命名(_R)"
# shell/e-shortcuts-view.c:389
# shell/e-shortcuts-view.c:389
# shell/e-shortcuts-view.c:389
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
msgid "Rename this shortcut"
msgstr "重命名该快捷方式"
# shell/e-shortcuts-view.c:391
# shell/e-shortcuts-view.c:391
# shell/e-shortcuts-view.c:391
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
msgid "Re_move"
msgstr "删除(_M)"
# shell/e-shortcuts-view.c:391
# shell/e-shortcuts-view.c:391
# shell/e-shortcuts-view.c:391
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
msgid "Remove this shortcut from the shortcut bar"
msgstr "从快捷方式栏上删除该快捷方式"
# shell/e-shortcuts.c:640
# shell/e-shortcuts.c:640
# shell/e-shortcuts.c:640
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
msgid "Error saving shortcuts."
msgstr "保存快捷方式错误。"
# shell/e-shortcuts.c:1043
# shell/e-shortcuts.c:1043
# shell/e-shortcuts.c:1043
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
msgid "Shortcuts"
msgstr "快捷方式"
@@ -41149,91 +41525,91 @@ msgstr "主席"
# shell/e-storage.c:498
# shell/e-storage.c:498
# shell/e-storage.c:498
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
msgid "No error"
msgstr "无错误"
# shell/e-storage.c:502
# shell/e-storage.c:502
# shell/e-storage.c:502
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
msgid "A folder with the same name already exists"
msgstr "已经有一个同名文件夹存在"
# shell/e-storage.c:504
# shell/e-storage.c:504
# shell/e-storage.c:504
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
msgid "The specified folder type is not valid"
msgstr "指定的文件夹类型无效"
# shell/e-storage.c:506
# shell/e-storage.c:506
# shell/e-storage.c:506
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
msgid "I/O error"
msgstr "输入输出错误"
# shell/e-storage.c:508
# shell/e-storage.c:508
# shell/e-storage.c:508
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
msgid "Not enough space to create the folder"
msgstr "没有足够的空间创建文件夹"
# shell/e-storage.c:510
# shell/e-storage.c:510
# shell/e-storage.c:510
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
msgid "The folder is not empty"
msgstr "文件夹不为空"
# shell/e-storage.c:512
# shell/e-storage.c:512
# shell/e-storage.c:512
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
msgid "The specified folder was not found"
msgstr "找不到指定的文件夹"
# shell/e-storage.c:514
# shell/e-storage.c:514
# shell/e-storage.c:514
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
msgid "Function not implemented in this storage"
msgstr "在该存储中没有实现该功能"
# shell/e-storage.c:518
# shell/e-storage.c:518
# shell/e-storage.c:518
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
msgid "Operation not supported"
msgstr "不支持的操作"
# shell/e-storage.c:520
# shell/e-storage.c:520
# shell/e-storage.c:520
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
msgid "The specified type is not supported in this storage"
msgstr "在该存储中不支持指定的类型"
# shell/e-storage.c:522
# shell/e-storage.c:522
# shell/e-storage.c:522
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
msgid "The specified folder cannot be modified or removed"
msgstr "无法修改或删除指定的文件夹"
# shell/e-storage.c:524
# shell/e-storage.c:524
# shell/e-storage.c:524
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
msgid "Cannot make a folder a child of one of its descendants"
msgstr "无法使文件夹成为它的子目录的子目录"
# shell/e-storage.c:526
# shell/e-storage.c:526
# shell/e-storage.c:526
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
msgid "Cannot create a folder with that name"
msgstr "无法以那个名字创建文件夹"
@@ -41306,105 +41682,105 @@ msgstr ""
# shell/evolution-shell-component.c:1009
# shell/evolution-shell-component.c:1009
# shell/evolution-shell-component.c:1022
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
msgid "CORBA error"
msgstr "CORBA 错误"
# shell/evolution-shell-component.c:1011
# shell/evolution-shell-component.c:1011
# shell/evolution-shell-component.c:1024
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
msgid "Interrupted"
msgstr "被中断"
# shell/evolution-shell-component.c:1013
# shell/evolution-shell-component.c:1013
# shell/evolution-shell-component.c:1026
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
msgid "Invalid argument"
msgstr "无效参数"
# shell/evolution-shell-component.c:1015
# shell/evolution-shell-component.c:1015
# shell/evolution-shell-component.c:1028
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
msgid "Already has an owner"
msgstr "已经有所有者了"
# shell/evolution-shell-component.c:1017
# shell/evolution-shell-component.c:1017
# shell/evolution-shell-component.c:1030
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
msgid "No owner"
msgstr "无所有者"
# shell/evolution-shell-component.c:1019
# shell/evolution-shell-component.c:1019
# shell/evolution-shell-component.c:1032
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
msgid "Not found"
msgstr "没找到"
# shell/evolution-shell-component.c:1021
# shell/evolution-shell-component.c:1021
# shell/evolution-shell-component.c:1034
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
msgid "Unsupported type"
msgstr "不支持的类型"
# shell/evolution-shell-component.c:1023
# shell/evolution-shell-component.c:1023
# shell/evolution-shell-component.c:1036
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
msgid "Unsupported schema"
msgstr "不支持的方案"
# shell/evolution-shell-component.c:1025
# shell/evolution-shell-component.c:1025
# shell/evolution-shell-component.c:1038
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
msgid "Unsupported operation"
msgstr "不支持的操作"
# shell/evolution-shell-component.c:1027
# shell/evolution-shell-component.c:1027
# shell/evolution-shell-component.c:1040
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
msgid "Internal error"
msgstr "内部错误"
# shell/evolution-shell-component.c:1031
# shell/evolution-shell-component.c:1031
# shell/evolution-shell-component.c:1044
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
msgid "Exists"
msgstr "存在"
# shell/evolution-shell-component.c:1033
# shell/evolution-shell-component.c:1033
# shell/evolution-shell-component.c:1046
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
msgid "Invalid URI"
msgstr "无效 URI"
# shell/evolution-shell-component.c:1037
# shell/evolution-shell-component.c:1037
# shell/evolution-shell-component.c:1050
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
msgid "Has subfolders"
msgstr "含有子文件夹"
# shell/evolution-shell-component.c:1039
# shell/evolution-shell-component.c:1039
# shell/evolution-shell-component.c:1052
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
msgid "No space left"
msgstr "没有剩余空间"
# shell/evolution-shell-component.c:1041
# shell/evolution-shell-component.c:1041
# shell/evolution-shell-component.c:1054
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
msgid "Old owner has died"
msgstr "原所有者已死"
@@ -41443,6 +41819,50 @@ msgstr "主机"
msgid "The following connections are currently active:"
msgstr "下列连接正处于活跃状态:"
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "日历"
+
+# calendar/gui/print.c:2331
+# calendar/gui/print.c:2331
+# calendar/gui/print.c:2331
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "联系人:"
+
+# my-evolution/my-evolution.glade.h:27
+# my-evolution/my-evolution.glade.h:27
+# my-evolution/my-evolution.glade.h:27
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "邮件(_M)"
+
+# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+# my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+# views/tasks/galview.xml.h:1
+# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+# my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+# views/tasks/galview.xml.h:1
+# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+# my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
+# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+# views/tasks/galview.xml.h:1
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "任务"
+
# shell/glade/e-shell-folder-creation-dialog.glade.h:1
# shell/glade/e-shell-folder-creation-dialog.glade.h:1
# shell/glade/e-shell-folder-creation-dialog.glade.h:1
@@ -41464,6 +41884,46 @@ msgstr "文件夹类型:"
msgid "Specify where to create the folder:"
msgstr "指定在那里创建文件夹:"
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "创建新文件夹(_N)..."
+
+# shell/glade/e-shell-folder-creation-dialog.glade.h:1
+# shell/glade/e-shell-folder-creation-dialog.glade.h:1
+# shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "文件夹名称:"
+
+# addressbook/gui/component/addressbook-config.glade.h:28
+# addressbook/gui/component/addressbook-config.glade.h:28
+# addressbook/gui/component/addressbook-config.glade.h:37
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "服务器名(_S):"
+
+# mail/mail-config.glade.h:117
+# mail/mail-config.glade.h:117
+# mail/mail-config.glade.h:126
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "用户名(_U):"
+
# shell/glade/evolution-startup-wizard.glade.h:3
# shell/glade/evolution-startup-wizard.glade.h:3
# shell/glade/evolution-startup-wizard.glade.h:3
@@ -41617,18 +42077,18 @@ msgstr "Evolution 可以从下列文件中导入数据:"
# data/evolution.desktop.in.h:1 shell/main.c:83
# shell/main.c:83
# shell/main.c:83
-#: shell/main.c:91
+#: shell/main.c:92
msgid "Evolution"
msgstr "Evolution"
# shell/main.c:89
# shell/main.c:89
# shell/main.c:89
-#: shell/main.c:97
+#: shell/main.c:98
msgid "Evolution is now exiting ..."
msgstr "Evolution 正在退出 ..."
-#: shell/main.c:222
+#: shell/main.c:223
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -41651,7 +42111,7 @@ msgstr ""
# ui/evolution.xml.h:31
# data/evolution.desktop.in.h:2
# data/evolution.desktop.in.h:2
-#: shell/main.c:245
+#: shell/main.c:246
#, fuzzy
msgid ""
"Thanks\n"
@@ -41661,7 +42121,7 @@ msgstr "Ximian Evolution"
# shell/importer/intelligent.c:198
# shell/importer/intelligent.c:198
# shell/importer/intelligent.c:198
-#: shell/main.c:254
+#: shell/main.c:255
#, fuzzy
msgid "Don't tell me again"
msgstr "不要再问我"
@@ -41669,14 +42129,14 @@ msgstr "不要再问我"
# shell/main.c:210
# shell/main.c:210
# shell/main.c:210
-#: shell/main.c:347
+#: shell/main.c:348
msgid "Cannot access the Ximian Evolution shell."
msgstr "无法访问 Ximian Evolution shell。"
# shell/main.c:219
# shell/main.c:219
# shell/main.c:219
-#: shell/main.c:356
+#: shell/main.c:357
#, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "无法初始化 Ximian Evolution shell: %s"
@@ -41684,14 +42144,14 @@ msgstr "无法初始化 Ximian Evolution shell: %s"
# shell/main.c:289
# shell/main.c:289
# shell/main.c:289
-#: shell/main.c:437
+#: shell/main.c:438
msgid "Disable splash screen"
msgstr "禁用启动屏幕"
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
-#: shell/main.c:438
+#: shell/main.c:439
#, fuzzy
msgid "Start in offline mode"
msgstr "开始导入"
@@ -41699,7 +42159,7 @@ msgstr "开始导入"
# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
# shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
-#: shell/main.c:439
+#: shell/main.c:440
#, fuzzy
msgid "Start in online mode"
msgstr "启动智能导入器"
@@ -41707,11 +42167,11 @@ msgstr "启动智能导入器"
# shell/main.c:290
# shell/main.c:290
# shell/main.c:290
-#: shell/main.c:440
+#: shell/main.c:441
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
-#: shell/main.c:458
+#: shell/main.c:459
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -41721,7 +42181,7 @@ msgstr ""
# shell/main.c:332
# shell/main.c:332
# shell/main.c:332
-#: shell/main.c:488
+#: shell/main.c:490
msgid "Cannot initialize the Bonobo component system."
msgstr "无法初始化 Bonobo 成员系统。"
@@ -41784,38 +42244,24 @@ msgstr "复制选中内容"
msgid "Copy to Folder..."
msgstr "复制到文件夹..."
-# ui/evolution-addressbook.xml.h:4
-# ui/evolution-addressbook.xml.h:4
-# ui/evolution-addressbook.xml.h:4
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "创建新的联系人"
-
-# ui/evolution-addressbook.xml.h:5
-# ui/evolution-addressbook.xml.h:5
-# ui/evolution-addressbook.xml.h:5
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "创建新的联系人列表"
-
# ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
# ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
# ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
msgid "Cut the selection"
msgstr "剪切选中内容"
# ui/evolution-addressbook.xml.h:9
# ui/evolution-addressbook.xml.h:9
# ui/evolution-addressbook.xml.h:9
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
msgid "Delete selected contacts"
msgstr "删除选中的联系人"
# ui/evolution-mail-message.xml.h:53
# ui/evolution-mail-message.xml.h:53
# ui/evolution-mail-message.xml.h:53
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
#, fuzzy
msgid "Move Contact(s) to Another Folder..."
msgstr "把选中的邮件移动到其它文件夹"
@@ -41823,7 +42269,7 @@ msgstr "把选中的邮件移动到其它文件夹"
# mail/folder-browser.c:1466
# mail/folder-browser.c:1475
# mail/folder-browser.c:1476
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
#, fuzzy
msgid "Move to Folder..."
msgstr "移动到文件夹(_M)..."
@@ -41831,82 +42277,91 @@ msgstr "移动到文件夹(_M)..."
# ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
# ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
# ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
msgid "Paste the clipboard"
msgstr "粘贴剪贴板"
# ui/evolution-addressbook.xml.h:15
# ui/evolution-addressbook.xml.h:15
# ui/evolution-addressbook.xml.h:15
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
msgid "Previews the contacts to be printed"
msgstr "预览将要打印的联系人"
+# ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+# ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+# ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "打印预览(_V)"
+
# ui/evolution-addressbook.xml.h:18
# ui/evolution-addressbook.xml.h:18
# ui/evolution-addressbook.xml.h:18
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:18
msgid "Print selected contacts"
msgstr "打印选中的联系人"
# ui/evolution-addressbook.xml.h:20
# ui/evolution-addressbook.xml.h:20
# ui/evolution-addressbook.xml.h:20
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
msgid "Save selected contacts as a VCard."
msgstr "把选中的联系人保存为 VCard。"
# ui/evolution-addressbook.xml.h:21
# ui/evolution-addressbook.xml.h:21
# ui/evolution-addressbook.xml.h:21
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
msgid "Select All"
msgstr "全选"
# ui/evolution-addressbook.xml.h:22
# ui/evolution-addressbook.xml.h:22
# ui/evolution-addressbook.xml.h:22
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
msgid "Select all contacts"
msgstr "选中所有的联系人"
# ui/evolution-addressbook.xml.h:24
# ui/evolution-addressbook.xml.h:24
# ui/evolution-addressbook.xml.h:24
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
msgid "Send a mess to the selected contacts."
msgstr "给选定的联系人发邮件。"
# ui/evolution-addressbook.xml.h:25
# ui/evolution-addressbook.xml.h:25
# ui/evolution-addressbook.xml.h:25
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
msgid "Send message to contact"
msgstr "给联系人发邮件"
# ui/evolution-addressbook.xml.h:26
# ui/evolution-addressbook.xml.h:26
# ui/evolution-addressbook.xml.h:26
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
msgid "Send selected contacts to another person."
msgstr "把选中的联系人发送给其他人。"
# ui/evolution-addressbook.xml.h:27
# ui/evolution-addressbook.xml.h:27
# ui/evolution-addressbook.xml.h:27
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
msgid "Stop"
msgstr "停止"
# ui/evolution-addressbook.xml.h:28
# ui/evolution-addressbook.xml.h:28
# ui/evolution-addressbook.xml.h:28
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
msgid "Stop Loading"
msgstr "停止载入"
# ui/evolution-addressbook.xml.h:29
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
msgid "View the current contact"
msgstr "查看当前联系人"
@@ -41928,62 +42383,55 @@ msgstr "查看当前联系人"
# ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
# ui/evolution-mail-message.xml.h:93 ui/evolution-mail-messagedisplay.xml.h:4
# ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:16
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
#: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
msgid "_Actions"
msgstr "动作(_A)"
-# ui/evolution-addressbook.xml.h:32
-# ui/evolution-addressbook.xml.h:32
-# ui/evolution-addressbook.xml.h:33
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "联系人列表(_C)"
-
# ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
# ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
# ui/evolution-addressbook.xml.h:36 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
msgid "_Forward Contact..."
msgstr "转发联系人(_F)..."
# mail/folder-browser.c:1466
# mail/folder-browser.c:1475
# mail/folder-browser.c:1476
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
msgid "_Move to Folder..."
msgstr "移动到文件夹(_M)..."
# ui/evolution-addressbook.xml.h:38
# ui/evolution-addressbook.xml.h:38
# ui/evolution-addressbook.xml.h:40
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
msgid "_Save as VCard"
msgstr "另存为 VCard(_S)"
# ui/evolution-addressbook.xml.h:39
# ui/evolution-addressbook.xml.h:39
# ui/evolution-addressbook.xml.h:41
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
msgid "_Search for Contacts"
msgstr "搜索联系人(_S)"
# ui/evolution-addressbook.xml.h:40
# ui/evolution-addressbook.xml.h:40
# ui/evolution-addressbook.xml.h:42
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
msgid "_Select All"
msgstr "全选(_S)"
# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
#, fuzzy
msgid "_Send Message to Contact..."
msgstr "给联系人发邮件(_M)..."
@@ -42058,14 +42506,6 @@ msgstr "月"
msgid "Previews the calendar to be printed"
msgstr "预览将要打印的日历"
-# ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
-# ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
-# ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "打印预览(_V)"
-
# ui/evolution-calendar.xml.h:26
# ui/evolution-calendar.xml.h:26
# ui/evolution-calendar.xml.h:26
@@ -42134,7 +42574,7 @@ msgstr "周"
#: ui/evolution-contact-list-editor.xml.h:1
#: ui/evolution-mail-messagedisplay.xml.h:1
#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
msgid "Close"
msgstr "关闭"
@@ -42159,7 +42599,7 @@ msgstr "删除这一项"
# ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
# ui/evolution.xml.h:16
#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
msgid "Main toolbar"
msgstr "主工具栏"
@@ -42183,8 +42623,8 @@ msgstr "打印该项"
# ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
# ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
# ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
msgid "Save"
msgstr "保存"
@@ -42248,9 +42688,9 @@ msgstr "把该项保存到磁盘"
#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
#: ui/evolution-contact-list-editor.xml.h:11
#: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
msgid "_File"
msgstr "文件(_F)"
@@ -42272,7 +42712,7 @@ msgstr "打印信封(_V)..."
# ui/evolution-message-composer.xml.h:21
#: ui/evolution-contact-editor.xml.h:7
#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
msgid "Save _As..."
msgstr "另存为(_A)..."
@@ -42304,8 +42744,8 @@ msgstr "给联系人发邮件(_M)..."
# ui/evolution-signature-editor.xml.h:11
#: ui/evolution-contact-editor.xml.h:15
#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
msgid "_Save"
msgstr "保存(_S)"
@@ -42470,45 +42910,61 @@ msgstr "打开窗口以书写邮件"
msgid "Permanently remove all deleted messages from all folders"
msgstr "永久删除所有文件夹中的所有已删除的邮件"
+# ui/evolution-mail-global.xml.h:10
+# ui/evolution-mail-global.xml.h:10
+# ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "新建邮件"
+
+# mail/mail-ops.c:788
+# mail/mail-ops.c:790
+# mail/mail-ops.c:833
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "把邮件保存到文件夹中"
+
# ui/evolution-mail-global.xml.h:15
# ui/evolution-mail-global.xml.h:15
# ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:13
msgid "Show message preview window"
msgstr "显示邮件预览窗口"
# ui/evolution-mail-global.xml.h:16
# ui/evolution-mail-global.xml.h:16
# ui/evolution-mail-global.xml.h:16
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "订阅 或 取消订阅远程服务器上的文件夹"
# ui/evolution-mail-global.xml.h:17
# ui/evolution-mail-global.xml.h:17
# ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
msgid "Virtual Folder _Editor..."
msgstr "虚拟文件夹编辑器(_E)..."
# ui/evolution-mail-global.xml.h:19
# ui/evolution-mail-global.xml.h:19
# ui/evolution-mail-global.xml.h:19
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
msgid "_Filters..."
msgstr "邮件过滤(_F)..."
# ui/evolution-mail-global.xml.h:22
# ui/evolution-mail-global.xml.h:22
# ui/evolution-mail-global.xml.h:22
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
msgid "_Preview Pane"
msgstr "预览窗口(_P)"
# ui/evolution-mail-global.xml.h:24
# ui/evolution-mail-global.xml.h:24
# ui/evolution-mail-global.xml.h:24
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
msgid "_Subscribe to Folders..."
msgstr "订阅到文件夹(_S)..."
@@ -42677,7 +43133,7 @@ msgstr "删除(_E)"
# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
msgid "_Folder"
msgstr "文件夹(_F)"
@@ -43116,10 +43572,26 @@ msgstr "原大小(_Z)"
msgid "P_revious Unread Message"
msgstr "上一个未读邮件"
+# calendar/gui/e-itip-control.c:946
+# calendar/gui/e-itip-control.c:946
+# calendar/gui/e-itip-control.c:1020
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Post a Reply"
+msgstr "任务回复"
+
+# camel/providers/imap/camel-imap-provider.c:45
+# camel/providers/imap/camel-imap-provider.c:45
+# camel/providers/imap/camel-imap-provider.c:45
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "在所有文件夹中检查新邮件"
+
# ui/evolution-mail-message.xml.h:64
# ui/evolution-mail-message.xml.h:64
# ui/evolution-mail-message.xml.h:64
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
#, fuzzy
msgid "Pr_evious Important Message"
msgstr "上一个重要邮件"
@@ -43127,26 +43599,26 @@ msgstr "上一个重要邮件"
# ui/evolution-mail-message.xml.h:62
# ui/evolution-mail-message.xml.h:62
# ui/evolution-mail-message.xml.h:62
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
msgid "Preview the message to be printed"
msgstr "预览需打印的邮件"
# ui/evolution-mail-message.xml.h:63
# ui/evolution-mail-message.xml.h:63
# ui/evolution-mail-message.xml.h:63
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
msgid "Previous"
msgstr "上一个"
# ui/evolution-mail-message.xml.h:69
# ui/evolution-mail-message.xml.h:69
# ui/evolution-mail-message.xml.h:69
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
msgid "Print this message"
msgstr "打印该邮件"
# ui/evolution-mail-message.xml.h:70
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
#, fuzzy
msgid "Re_direct"
msgstr "转发"
@@ -43154,133 +43626,133 @@ msgstr "转发"
# ui/evolution-mail-message.xml.h:38
# ui/evolution-mail-message.xml.h:38
# ui/evolution-mail-message.xml.h:71
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
msgid "Redirect (bounce) the selected message to someone"
msgstr "将选定的消息转发(退回)给某人"
# ui/evolution-mail-message.xml.h:74
# ui/evolution-mail-message.xml.h:74
# ui/evolution-mail-message.xml.h:76
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
msgid "Reset the text to its original size"
msgstr "把文件重新设置为原来的大小"
# ui/evolution-mail-message.xml.h:75
# ui/evolution-mail-message.xml.h:75
# ui/evolution-mail-message.xml.h:77
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
msgid "S_earch Message..."
msgstr "搜索邮件(_E)"
# ui/evolution-mail-message.xml.h:76
# ui/evolution-mail-message.xml.h:76
# ui/evolution-mail-message.xml.h:78
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
msgid "S_maller"
msgstr "更小(_M)"
# ui/evolution-mail-message.xml.h:77
# ui/evolution-mail-message.xml.h:77
# ui/evolution-mail-message.xml.h:79
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
msgid "Save the message as a text file"
msgstr "把邮件存为文本文件"
# ui/evolution-mail-message.xml.h:78
# ui/evolution-mail-message.xml.h:78
# ui/evolution-mail-message.xml.h:80
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
msgid "Search for text in the body of the displayed message"
msgstr "在显示邮件的邮件体中搜索文本"
# ui/evolution-mail-message.xml.h:79
# ui/evolution-mail-message.xml.h:79
# ui/evolution-mail-message.xml.h:81
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
msgid "Setup the page settings for your current printer"
msgstr "设定您当前打印机的页面设置"
# ui/evolution-mail-message.xml.h:80
# ui/evolution-mail-message.xml.h:80
# ui/evolution-mail-message.xml.h:82
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
msgid "Show Email _Source"
msgstr "显示电子邮件源代码(_S)"
# ui/evolution-mail-message.xml.h:81
# ui/evolution-mail-message.xml.h:81
# ui/evolution-mail-message.xml.h:83
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
msgid "Show Full _Headers"
msgstr "显示完整的邮件头(_H)"
# ui/evolution-mail-message.xml.h:82
# ui/evolution-mail-message.xml.h:82
# ui/evolution-mail-message.xml.h:84
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
msgid "Show message in the normal style"
msgstr "以常用方式显示邮件"
# ui/evolution-mail-message.xml.h:83
# ui/evolution-mail-message.xml.h:83
# ui/evolution-mail-message.xml.h:85
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
msgid "Show message with all email headers"
msgstr "显示邮件时显示所有邮件头"
# ui/evolution-mail-message.xml.h:84
# ui/evolution-mail-message.xml.h:84
# ui/evolution-mail-message.xml.h:86
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
msgid "Show the raw email source of the message"
msgstr "显示邮件的原始邮件源代码"
# ui/evolution-mail-message.xml.h:85
# ui/evolution-mail-message.xml.h:85
# ui/evolution-mail-message.xml.h:87
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
msgid "Text Si_ze"
msgstr "文本大小(_Z)"
# ui/evolution-mail-message.xml.h:86
# ui/evolution-mail-message.xml.h:86
# ui/evolution-mail-message.xml.h:88
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
msgid "Un-delete the selected messages"
msgstr "反删除选中的邮件"
# ui/evolution-mail-message.xml.h:87
# ui/evolution-mail-message.xml.h:87
# ui/evolution-mail-message.xml.h:89
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
msgid "VFolder on Mailing _List..."
msgstr "关于邮件列表的虚拟文件夹(_L)..."
# ui/evolution-mail-message.xml.h:88
# ui/evolution-mail-message.xml.h:88
# ui/evolution-mail-message.xml.h:90
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
msgid "VFolder on Se_nder..."
msgstr "关于发件人的虚拟文件夹(_N)..."
# ui/evolution-mail-message.xml.h:89
# ui/evolution-mail-message.xml.h:89
# ui/evolution-mail-message.xml.h:91
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
msgid "VFolder on _Recipients..."
msgstr "关于收件人的虚拟文件夹(_R)..."
# ui/evolution-mail-message.xml.h:90
# ui/evolution-mail-message.xml.h:90
# ui/evolution-mail-message.xml.h:92
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
msgid "VFolder on _Subject..."
msgstr "关于主题的虚拟文件夹(_S)..."
# ui/evolution-message-composer.xml.h:1
# ui/evolution-message-composer.xml.h:1
# ui/evolution-message-composer.xml.h:1
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
#, fuzzy
msgid "_Attached"
msgstr "附加"
@@ -43288,28 +43760,28 @@ msgstr "附加"
# ui/evolution-mail-message.xml.h:93
# ui/evolution-mail-message.xml.h:93
# ui/evolution-mail-message.xml.h:95
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
msgid "_Copy to Folder"
msgstr "复制到文件夹(_C)"
# ui/evolution-mail-message.xml.h:94
# ui/evolution-mail-message.xml.h:94
# ui/evolution-mail-message.xml.h:96
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
msgid "_Create Filter From Message"
msgstr "从邮件创建过滤规则(_C)"
# ui/evolution-mail-message.xml.h:97
# ui/evolution-mail-message.xml.h:97
# ui/evolution-mail-message.xml.h:99
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
msgid "_Forward Message"
msgstr "转发邮件(_F)"
# ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
# ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
# ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
#, fuzzy
msgid "_Go To"
msgstr "转到"
@@ -43317,7 +43789,7 @@ msgstr "转到"
# mail/mail-config.glade.h:39
# mail/mail-config.glade.h:39
# mail/mail-config.glade.h:46
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
#, fuzzy
msgid "_Inline"
msgstr "嵌入"
@@ -43325,28 +43797,28 @@ msgstr "嵌入"
# ui/evolution-mail-message.xml.h:98
# ui/evolution-mail-message.xml.h:98
# ui/evolution-mail-message.xml.h:100
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
msgid "_Larger"
msgstr "更大(_L)"
# ui/evolution-mail-message.xml.h:99
# ui/evolution-mail-message.xml.h:99
# ui/evolution-mail-message.xml.h:101
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
msgid "_Message Display"
msgstr "邮件显示(_M)"
# ui/evolution-mail-message.xml.h:100
# ui/evolution-mail-message.xml.h:100
# ui/evolution-mail-message.xml.h:102
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
msgid "_Move to Folder"
msgstr "移动到文件夹(_M)"
# ui/evolution-mail-message.xml.h:56
# ui/evolution-mail-message.xml.h:56
# ui/evolution-mail-message.xml.h:56
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
#, fuzzy
msgid "_Next Message"
msgstr "下一个邮件"
@@ -43354,21 +43826,21 @@ msgstr "下一个邮件"
# ui/evolution-mail-message.xml.h:101
# ui/evolution-mail-message.xml.h:101
# ui/evolution-mail-message.xml.h:103
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
msgid "_Normal Display"
msgstr "普通显示(_N)"
# ui/evolution-mail-message.xml.h:102
# ui/evolution-mail-message.xml.h:102
# ui/evolution-mail-message.xml.h:104
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
msgid "_Open Message"
msgstr "打开邮件(_O)"
# ui/evolution-mail-message.xml.h:65
# ui/evolution-mail-message.xml.h:65
# ui/evolution-mail-message.xml.h:65
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
#, fuzzy
msgid "_Previous Message"
msgstr "上一个邮件"
@@ -43376,32 +43848,40 @@ msgstr "上一个邮件"
# mail/mail-config.glade.h:59
# mail/mail-config.glade.h:59
# mail/mail-config.glade.h:68
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
#, fuzzy
msgid "_Quoted"
msgstr "已引用"
+# ui/evolution.xml.h:46
+# ui/evolution.xml.h:46
+# ui/evolution.xml.h:46
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "重命名(_R)..."
+
# ui/evolution-mail-message.xml.h:106 ui/evolution.xml.h:49
# ui/my-evolution.xml.h:9
# ui/evolution-mail-message.xml.h:106 ui/evolution.xml.h:49
# ui/my-evolution.xml.h:9
# ui/evolution-mail-message.xml.h:108 ui/evolution.xml.h:49
# ui/my-evolution.xml.h:9
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
msgid "_Tools"
msgstr "工具(_T)"
# mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
# mail/folder-browser.c:1478 ui/evolution-mail-message.xml.h:107
# mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:109
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
msgid "_Undelete"
msgstr "反删除(_U)"
# ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
# ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
# ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
msgid "Close this window"
msgstr "关闭该窗口"
@@ -43418,9 +43898,9 @@ msgstr "关闭该窗口"
# ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
# ui/evolution.xml.h:33
#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
msgid "_Close"
msgstr "关闭(_C)"
@@ -43431,7 +43911,7 @@ msgstr "关闭(_C)"
# ui/evolution-mail-messagedisplay.xml.h:8
# ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
msgid "_View"
msgstr "查看(_V)"
@@ -43480,94 +43960,74 @@ msgstr "格式(_M)"
# ui/evolution-message-composer.xml.h:9
# ui/evolution-message-composer.xml.h:9
# ui/evolution-message-composer.xml.h:9
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
msgstr "HTML(_T)"
-# ui/evolution-message-composer.xml.h:10
-# ui/evolution-message-composer.xml.h:10
-# ui/evolution-message-composer.xml.h:10
-#: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "内联文本文件(_F)..."
-
-# ui/evolution-message-composer.xml.h:11
-# ui/evolution-message-composer.xml.h:11
-# ui/evolution-message-composer.xml.h:11
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "把文件作为文本插入邮件"
-
-# ui/evolution-message-composer.xml.h:12
-# ui/evolution-message-composer.xml.h:12
-# ui/evolution-message-composer.xml.h:12
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "插入文本文件..."
-
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
# ui/evolution-message-composer.xml.h:13
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
# ui/evolution-message-composer.xml.h:13
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:277
# ui/evolution-message-composer.xml.h:13
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:10
msgid "Open"
msgstr "打开"
# ui/evolution-message-composer.xml.h:14
# ui/evolution-message-composer.xml.h:14
# ui/evolution-message-composer.xml.h:14
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
msgid "Open a file"
msgstr "打开文件"
# ui/evolution-message-composer.xml.h:15
# ui/evolution-message-composer.xml.h:15
# ui/evolution-message-composer.xml.h:15
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
msgid "PGP Encrypt"
msgstr "PGP 加密"
# ui/evolution-message-composer.xml.h:16
# ui/evolution-message-composer.xml.h:16
# ui/evolution-message-composer.xml.h:16
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
msgid "PGP Sign"
msgstr "PGP 签名"
# ui/evolution-message-composer.xml.h:17
# ui/evolution-message-composer.xml.h:17
# ui/evolution-message-composer.xml.h:17
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
msgid "S/MIME Encrypt"
msgstr "S/MIME 加密"
# ui/evolution-message-composer.xml.h:18
# ui/evolution-message-composer.xml.h:18
# ui/evolution-message-composer.xml.h:18
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
msgid "S/MIME Sign"
msgstr "S/MIME 签名"
# ui/evolution-message-composer.xml.h:20
# ui/evolution-message-composer.xml.h:20
# ui/evolution-message-composer.xml.h:20
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
msgid "Save As"
msgstr "另存为"
# ui/evolution-message-composer.xml.h:22
# ui/evolution-message-composer.xml.h:22
# ui/evolution-message-composer.xml.h:22
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
msgid "Save _Draft"
msgstr "保存草稿(_D)"
# ui/evolution-message-composer.xml.h:23
# ui/evolution-message-composer.xml.h:23
# ui/evolution-message-composer.xml.h:23
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
msgid "Save in folder..."
msgstr "保存到文件夹..."
@@ -43577,7 +44037,7 @@ msgstr "保存到文件夹..."
# ui/evolution-signature-editor.xml.h:5
# ui/evolution-message-composer.xml.h:24
# ui/evolution-signature-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
#: ui/evolution-signature-editor.xml.h:7
msgid "Save the current file"
msgstr "保存当前文件"
@@ -43585,155 +44045,135 @@ msgstr "保存当前文件"
# ui/evolution-message-composer.xml.h:25
# ui/evolution-message-composer.xml.h:25
# ui/evolution-message-composer.xml.h:25
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
msgid "Save the current file with a different name"
msgstr "用不同的文件名保存当前文件"
# ui/evolution-message-composer.xml.h:26
# ui/evolution-message-composer.xml.h:26
# ui/evolution-message-composer.xml.h:26
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
msgid "Save the message in a specified folder"
msgstr "在指定的文件夹中保存邮件"
# ui/evolution-message-composer.xml.h:27
# ui/evolution-message-composer.xml.h:27
# ui/evolution-message-composer.xml.h:27
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
msgid "Send"
msgstr "发送"
-# ui/evolution-message-composer.xml.h:28
-# ui/evolution-message-composer.xml.h:28
-# ui/evolution-message-composer.xml.h:28
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "以后发送(_L)"
-
-# ui/evolution-message-composer.xml.h:29
-# ui/evolution-message-composer.xml.h:29
-# ui/evolution-message-composer.xml.h:29
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "以后发送(_L)"
-
# ui/evolution-message-composer.xml.h:30
# ui/evolution-message-composer.xml.h:30
# ui/evolution-message-composer.xml.h:30
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
msgid "Send the mail in HTML format"
msgstr "以 HTML 格式发送邮件"
-# ui/evolution-message-composer.xml.h:31
-# ui/evolution-message-composer.xml.h:31
-# ui/evolution-message-composer.xml.h:31
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "以后再发送邮件"
-
# ui/evolution-message-composer.xml.h:32
# ui/evolution-message-composer.xml.h:32
# ui/evolution-message-composer.xml.h:32
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
msgstr "现在发送邮件"
# ui/evolution-message-composer.xml.h:33
# ui/evolution-message-composer.xml.h:33
# ui/evolution-message-composer.xml.h:33
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
msgid "Show / hide attachments"
msgstr "显示 / 隐藏附件"
# ui/evolution-message-composer.xml.h:34
# ui/evolution-message-composer.xml.h:34
# ui/evolution-message-composer.xml.h:34
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
msgid "Show _attachments"
msgstr "显示附件(_A)"
# ui/evolution-message-composer.xml.h:35
# ui/evolution-message-composer.xml.h:35
# ui/evolution-message-composer.xml.h:35
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
msgid "Show attachments"
msgstr "显示附件"
# ui/evolution-message-composer.xml.h:36
# ui/evolution-message-composer.xml.h:36
# ui/evolution-message-composer.xml.h:36
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
msgid "Sign this message with your PGP key"
msgstr "用您的 PGP 密钥签名该邮件"
# ui/evolution-message-composer.xml.h:37
# ui/evolution-message-composer.xml.h:37
# ui/evolution-message-composer.xml.h:37
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
msgid "Sign this message with your S/MIME Signature Certificate"
msgstr "用您的 S/MIME 签名认证签名该邮件"
# ui/evolution-message-composer.xml.h:38
# ui/evolution-message-composer.xml.h:38
# ui/evolution-message-composer.xml.h:38
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
msgid "Toggles whether the BCC field is displayed"
msgstr "是否显示暗中转发域"
# ui/evolution-message-composer.xml.h:39
# ui/evolution-message-composer.xml.h:39
# ui/evolution-message-composer.xml.h:39
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
msgid "Toggles whether the CC field is displayed"
msgstr "是否显示转发域"
# ui/evolution-message-composer.xml.h:40
# ui/evolution-message-composer.xml.h:40
# ui/evolution-message-composer.xml.h:40
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
msgid "Toggles whether the From chooser is displayed"
msgstr "是否显示发件人选择器"
# ui/evolution-message-composer.xml.h:41
# ui/evolution-message-composer.xml.h:41
# ui/evolution-message-composer.xml.h:41
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
msgid "Toggles whether the Reply-To field is displayed"
msgstr "是否显示回复域"
# ui/evolution-message-composer.xml.h:42
# ui/evolution-message-composer.xml.h:42
# ui/evolution-message-composer.xml.h:42
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
msgid "_Attachment..."
msgstr "附件(_A)..."
# ui/evolution-message-composer.xml.h:43
# ui/evolution-message-composer.xml.h:43
# ui/evolution-message-composer.xml.h:43
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
msgid "_Bcc Field"
msgstr "暗中转发域(_B)"
# ui/evolution-message-composer.xml.h:44
# ui/evolution-message-composer.xml.h:44
# ui/evolution-message-composer.xml.h:44
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
msgid "_Cc Field"
msgstr "转发域(_C)"
# ui/evolution-message-composer.xml.h:46
# ui/evolution-message-composer.xml.h:46
# ui/evolution-message-composer.xml.h:46
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
msgid "_Delete all"
msgstr "全部删除(_D)"
# ui/evolution-message-composer.xml.h:49
# ui/evolution-message-composer.xml.h:49
# ui/evolution-message-composer.xml.h:49
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
msgid "_From Field"
msgstr "发件人域(_F)"
@@ -43743,32 +44183,55 @@ msgstr "发件人域(_F)"
# ui/evolution-signature-editor.xml.h:10
# ui/evolution-message-composer.xml.h:50
# ui/evolution-signature-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
msgid "_Insert"
msgstr "插入(_I)"
# ui/evolution-message-composer.xml.h:51
# ui/evolution-message-composer.xml.h:51
# ui/evolution-message-composer.xml.h:51
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
msgid "_Open..."
msgstr "打开(_O)..."
# ui/evolution-message-composer.xml.h:52
# ui/evolution-message-composer.xml.h:52
# ui/evolution-message-composer.xml.h:52
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
msgid "_Reply-To Field"
msgstr "回复域(_R)"
+# ui/evolution-message-composer.xml.h:9
+# ui/evolution-message-composer.xml.h:9
+# ui/evolution-message-composer.xml.h:9
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "HTML(_T)"
+
+# ui/evolution-comp-editor.xml.h:15
+# ui/evolution-comp-editor.xml.h:15
+# ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "保存项并关闭对话框"
+
# ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
# ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
# ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
msgid "_Help"
msgstr "帮助(_H)"
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "签名文件:"
+
# ui/evolution-subscribe.xml.h:1
# ui/evolution-subscribe.xml.h:1
# ui/evolution-subscribe.xml.h:1
@@ -43932,292 +44395,341 @@ msgstr "关于 Ximian Evolution..."
msgid "Add to _Shortcut Bar"
msgstr "添加到快捷方式栏(_S)"
+# shell/e-shell-about-box.c:40
+# shell/e-shell-about-box.c:40
+# shell/e-shell-about-box.c:40
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution "
+
# ui/evolution.xml.h:3
# ui/evolution.xml.h:3
# ui/evolution.xml.h:3
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
msgid "Change the name of this folder"
msgstr "改变该文件夹的名称"
# ui/evolution.xml.h:6
# ui/evolution.xml.h:6
# ui/evolution.xml.h:6
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
msgid "Copy this folder"
msgstr "复制该文件夹"
# ui/evolution.xml.h:7
# ui/evolution.xml.h:7
# ui/evolution.xml.h:7
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
msgid "Create _New Folder..."
msgstr "创建新文件夹(_N)..."
# ui/evolution.xml.h:8
# ui/evolution.xml.h:8
# ui/evolution.xml.h:8
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
msgid "Create a link to this folder in the shortcut bar"
msgstr "在快捷方式栏中创建到该文件夹的连接"
# ui/evolution.xml.h:9
# ui/evolution.xml.h:9
# ui/evolution.xml.h:9
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
msgid "Create a new folder"
msgstr "创建新文件夹"
+# shell/e-shell-view-menu.c:545
+# shell/e-shell-view-menu.c:545
+# shell/e-shell-view-menu.c:545
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "创建新快捷方式"
+
+# ui/evolution.xml.h:9
+# ui/evolution.xml.h:9
+# ui/evolution.xml.h:9
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "创建新文件夹"
+
# ui/evolution.xml.h:10
# ui/evolution.xml.h:10
# ui/evolution.xml.h:10
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:13
msgid "Delete this folder"
msgstr "删除该文件夹"
# ui/evolution.xml.h:11
# ui/evolution.xml.h:11
# ui/evolution.xml.h:11
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
msgid "Display a different folder"
msgstr "显示另一个文件夹"
# ui/evolution.xml.h:12
# ui/evolution.xml.h:12
# ui/evolution.xml.h:12
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
msgid "E_xit"
msgstr "退出(_X)"
# ui/evolution.xml.h:13
# ui/evolution.xml.h:13
# ui/evolution.xml.h:13
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
msgid "Evolution _Window"
msgstr "Evolution 窗口(_W)"
# ui/evolution.xml.h:14
# ui/evolution.xml.h:14
# ui/evolution.xml.h:14
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
msgid "Exit the program"
msgstr "退出程序"
# ui/evolution.xml.h:15
# ui/evolution.xml.h:15
# ui/evolution.xml.h:15
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
msgid "Import data from other programs"
msgstr "从其它程序导入数据"
# ui/evolution.xml.h:17
# ui/evolution.xml.h:17
# ui/evolution.xml.h:17
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
msgid "Move this folder to another place"
msgstr "把该文件夹移到其它位置"
# ui/evolution.xml.h:7
# ui/evolution.xml.h:7
# ui/evolution.xml.h:7
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
#, fuzzy
msgid "Open Other _User's Folder..."
msgstr "创建新文件夹(_N)..."
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
msgid "Open a folder that is made available by some other user on the server"
msgstr ""
# ui/evolution.xml.h:18
# ui/evolution.xml.h:18
# ui/evolution.xml.h:18
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
msgid "Open in New Window"
msgstr "在新窗口中打开"
# ui/evolution.xml.h:20
# ui/evolution.xml.h:20
# ui/evolution.xml.h:20
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
msgid "Open this folder in an other window"
msgstr "在另一个窗口中打开该文件夹"
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "Pilot 设置(_P)..."
+
# ui/evolution-mail-global.xml.h:13
# ui/evolution-mail-global.xml.h:13
# ui/evolution-mail-global.xml.h:13
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:27
msgid "Send / Receive"
msgstr "发送和接收"
# ui/evolution-mail-global.xml.h:14
# ui/evolution-mail-global.xml.h:14
# ui/evolution-mail-global.xml.h:14
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
#, fuzzy
msgid "Send queued items and retrieve new items"
msgstr "发送编队的邮件并检索新邮件"
+# mail/mail-config.glade.h:41
+# mail/mail-config.glade.h:41
+# mail/mail-config.glade.h:48
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "邮件配置"
+
# ui/evolution.xml.h:21
# ui/evolution.xml.h:21
# ui/evolution.xml.h:21
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:30
msgid "Show information about Ximian Evolution"
msgstr "显示关于 Ximian Evolution 的信息"
# ui/evolution.xml.h:22
# ui/evolution.xml.h:22
# ui/evolution.xml.h:22
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
msgid "Submit Bug Report"
msgstr "提交错误报告"
# ui/evolution.xml.h:23
# ui/evolution.xml.h:23
# ui/evolution.xml.h:23
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
msgid "Submit _Bug Report"
msgstr "提交错误报告(_B)"
# ui/evolution.xml.h:24
# ui/evolution.xml.h:24
# ui/evolution.xml.h:24
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
msgid "Submit a bug report using Bug Buddy"
msgstr "用 Bug Buddy 提交错误报告"
# ui/evolution.xml.h:25
# ui/evolution.xml.h:25
# ui/evolution.xml.h:25
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
msgid "Toggle"
msgstr "反转"
# ui/evolution.xml.h:26
# ui/evolution.xml.h:26
# ui/evolution.xml.h:26
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
msgid "Toggle whether to show the folder bar"
msgstr "是否显示文件夹栏"
# ui/evolution.xml.h:27
# ui/evolution.xml.h:27
# ui/evolution.xml.h:27
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
msgid "Toggle whether to show the shortcut bar"
msgstr "是否显示快捷方式栏"
# ui/evolution.xml.h:28
# ui/evolution.xml.h:28
# ui/evolution.xml.h:28
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
msgid "Toggle whether we are working offline."
msgstr "我们是否离线工作。"
# ui/evolution.xml.h:29
# ui/evolution.xml.h:29
# ui/evolution.xml.h:29
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
msgid "View the selected folder"
msgstr "查看选中的文件夹"
# ui/evolution.xml.h:31
# ui/evolution.xml.h:31
# ui/evolution.xml.h:31
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
msgid "Ximian Evolution _FAQ"
msgstr "Ximian Evolution 常见问题(_F)"
# ui/evolution.xml.h:32
# ui/evolution.xml.h:32
# ui/evolution.xml.h:32
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
msgid "_About Ximian Evolution..."
msgstr "关于 Ximian Evolution(_A)..."
# ui/evolution.xml.h:34
# ui/evolution.xml.h:34
# ui/evolution.xml.h:34
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
msgid "_Copy..."
msgstr "复制(_C)..."
# ui/evolution.xml.h:38
# ui/evolution.xml.h:38
# ui/evolution.xml.h:38
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
msgid "_Folder Bar"
msgstr "文件夹工具栏(_F)"
+# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "文件夹(_F)"
+
# ui/evolution.xml.h:39
# ui/evolution.xml.h:39
# ui/evolution.xml.h:39
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:50
msgid "_Go to Folder..."
msgstr "转到文件夹(_G)..."
# ui/evolution.xml.h:41
# ui/evolution.xml.h:41
# ui/evolution.xml.h:41
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
msgid "_Import..."
msgstr "正在导入(_I)..."
# ui/evolution.xml.h:42
# ui/evolution.xml.h:42
# ui/evolution.xml.h:42
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
msgid "_Move..."
msgstr "移动(_M)..."
# ui/evolution.xml.h:43
# ui/evolution.xml.h:43
# ui/evolution.xml.h:43
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
msgid "_New"
msgstr "新建(_N)"
# ui/evolution.xml.h:44
# ui/evolution.xml.h:44
# ui/evolution.xml.h:44
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
msgid "_New Folder"
msgstr "新建文件夹(_N)"
-# ui/evolution.xml.h:45
-# ui/evolution.xml.h:45
-# ui/evolution.xml.h:45
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "Pilot 设置(_P)..."
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "没有循环(_N)"
# ui/evolution.xml.h:46
# ui/evolution.xml.h:46
# ui/evolution.xml.h:46
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
msgid "_Rename..."
msgstr "重命名(_R)..."
# ui/evolution-mail-global.xml.h:23
# ui/evolution-mail-global.xml.h:23
# ui/evolution-mail-global.xml.h:23
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
msgid "_Send / Receive"
msgstr "发送和接收(_S)"
-# ui/evolution.xml.h:47
-# ui/evolution.xml.h:47
-# ui/evolution.xml.h:47
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "快捷方式(_S)"
-
# ui/evolution.xml.h:48
# ui/evolution.xml.h:48
# ui/evolution.xml.h:48
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
msgid "_Shortcut Bar"
msgstr "快捷方式栏(_S)"
+# ui/evolution.xml.h:47
+# ui/evolution.xml.h:47
+# ui/evolution.xml.h:47
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "快捷方式(_S)"
+
# ui/my-evolution.xml.h:4
# ui/my-evolution.xml.h:4
# ui/my-evolution.xml.h:4
@@ -44239,27 +44751,62 @@ msgstr "重新载入"
msgid "Reload the view"
msgstr "重新载入视图"
-# views/addressbook/galview.xml.h:1
-# views/addressbook/galview.xml.h:1
-# views/addressbook/galview.xml.h:1
-#: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "地址卡片"
-
# views/addressbook/galview.xml.h:2
# views/addressbook/galview.xml.h:2
# views/addressbook/galview.xml.h:2
-#: views/addressbook/galview.xml.h:2
-msgid "By Company"
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "By _Company"
msgstr "按公司"
+# views/addressbook/galview.xml.h:1
+# views/addressbook/galview.xml.h:1
+# views/addressbook/galview.xml.h:1
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "_Address Cards"
+msgstr "地址卡片"
+
# views/addressbook/galview.xml.h:3
# views/addressbook/galview.xml.h:3
# views/addressbook/galview.xml.h:3
#: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
msgstr "电话列表"
+# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "周视图"
+
+# calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+# calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+# calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "日视图"
+
+# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "月视图"
+
+# calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+# calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+# calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "周工作视图"
+
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:834
@@ -44303,15 +44850,24 @@ msgstr "邮件"
# views/tasks/galview.xml.h:2
# views/tasks/galview.xml.h:2
# views/tasks/galview.xml.h:2
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
msgstr "按类别"
+# ui/evolution-tasks.xml.h:18
+# ui/evolution-tasks.xml.h:18
+# ui/evolution-tasks.xml.h:22
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "任务(_T)"
+
# widgets/e-timezone-dialog/e-timezone-dialog.c:207
# widgets/e-timezone-dialog/e-timezone-dialog.c:700
#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
msgid "UTC"
msgstr ""
@@ -44563,14 +45119,14 @@ msgstr "..."
# widgets/misc/e-filter-bar.c:152
# widgets/misc/e-filter-bar.c:153
# widgets/misc/e-filter-bar.c:153
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
msgid "Search Editor"
msgstr "搜索编辑器"
# widgets/misc/e-filter-bar.c:168
# widgets/misc/e-filter-bar.c:169
# widgets/misc/e-filter-bar.c:169
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
msgid "Save Search"
msgstr "保存搜索"
@@ -44642,7 +45198,7 @@ msgstr "不再显示该邮件。"
# widgets/misc/e-search-bar.c:460
# widgets/misc/e-search-bar.c:460
# widgets/misc/e-search-bar.c:460
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
#, fuzzy
msgid "_Find Now"
msgstr "立即查找"
@@ -44651,7 +45207,7 @@ msgstr "立即查找"
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
# widgets/misc/e-filter-bar.h:95
# widgets/misc/e-filter-bar.h:95
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
#, fuzzy
msgid "_Clear"
msgstr "清除"
@@ -44660,14 +45216,14 @@ msgstr "清除"
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
# widgets/misc/e-filter-bar.h:95
# widgets/misc/e-filter-bar.h:95
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
msgid "Clear"
msgstr "清除"
# widgets/misc/e-search-bar.c:460
# widgets/misc/e-search-bar.c:460
# widgets/misc/e-search-bar.c:460
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
msgid "Find Now"
msgstr "立即查找"
@@ -44696,24 +45252,281 @@ msgstr "个人日历服务器;日历工厂"
# wombat/wombat.c:200
# wombat/wombat.c:200
# wombat/wombat.c:200
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
msgid "setup_vfs(): could not initialize GNOME-VFS"
msgstr "setup_vfs(): 无法初始化 GNOME-VFS"
# wombat/wombat.c:212
# wombat/wombat.c:212
# wombat/wombat.c:212
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
msgid "init_corba(): could not initialize GNOME"
msgstr "init_corba(): 无法初始化 GNOME"
# wombat/wombat.c:225
# wombat/wombat.c:225
# wombat/wombat.c:225
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "init_bonobo(): 无法初始化 Bonobo"
+# addressbook/gui/component/select-names/e-select-names.c:524
+# addressbook/gui/component/select-names/e-select-names.c:524
+# addressbook/gui/component/select-names/e-select-names.c:581
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred. Thank you."
+#~ msgstr ""
+#~ "Evolution 无法获取本地地址簿空间。\n"
+#~ "这可能是由 evolution 的地址簿组件崩溃导致的。\n"
+#~ "为了帮助我们更好地理解并最终解决该问题,\n"
+#~ "请把对产生该错误环境的详细情况作为电子邮件发送给\n"
+#~ " Jon Trowbridge <trow@ximian.com>。\n"
+#~ "谢谢。"
+
+# addressbook/gui/component/select-names/e-select-names.c:532
+# addressbook/gui/component/select-names/e-select-names.c:532
+# addressbook/gui/component/select-names/e-select-names.c:589
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolution 无法获得地址簿本地存储。\n"
+#~ "在普通环境下,这不会发生。\n"
+#~ "您可能需要退出并重新启动 Evolution 以便\n"
+#~ "改正这一问题。"
+
+# ui/evolution.xml.h:42
+# ui/evolution.xml.h:42
+# ui/evolution.xml.h:42
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "移动(_M)..."
+
+# calendar/gui/dialogs/cancel-comp.c:51
+# calendar/gui/dialogs/cancel-comp.c:51
+# calendar/gui/dialogs/cancel-comp.c:51
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "会见状态已经改变。发送更新后的版本?"
+
+# calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
+# calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3430
+# calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
+#~ msgid "_Delete this Appointment"
+#~ msgstr "删除该约会(_D)"
+
+# camel/camel-tcp-stream-openssl.c:519
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "提交者:%s\n"
+#~ "主题:%s"
+
+#~ msgid "SASL Protocol error"
+#~ msgstr "SASL 协议错误"
+
+# shell/e-storage.c:506
+# shell/e-storage.c:506
+# shell/e-storage.c:506
+#~ msgid "I/O Error: %s"
+#~ msgstr "输入输出错误:%s"
+
+# camel/providers/smtp/camel-smtp-transport.c:317
+# camel/providers/smtp/camel-smtp-transport.c:317
+# camel/providers/smtp/camel-smtp-transport.c:320
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Welcome 应答错误: %s: 可能不致命"
+
+# camel/providers/smtp/camel-smtp-transport.c:706
+# camel/providers/smtp/camel-smtp-transport.c:706
+# camel/providers/smtp/camel-smtp-transport.c:820
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "HELLO 请求超时: %s: 非致命"
+
+# camel/providers/smtp/camel-smtp-transport.c:726
+# camel/providers/smtp/camel-smtp-transport.c:726
+# camel/providers/smtp/camel-smtp-transport.c:840
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "HELLO 应答错误: %s: 非致命"
+
+# camel/providers/smtp/camel-smtp-transport.c:1133
+# camel/providers/smtp/camel-smtp-transport.c:1133
+# camel/providers/smtp/camel-smtp-transport.c:1236
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "QUIT 请求超时: %s: 非致命"
+
+# composer/e-msg-composer.c:1584
+# composer/e-msg-composer.c:1501
+# composer/e-msg-composer.c:1467
+#~ msgid "Insert File"
+#~ msgstr "插入文件"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "您选择了无效的日期。"
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "邮件的日期将与过滤规则运行的\n"
+#~ "日期或者虚拟文件夹打开的\n"
+#~ "日期进行比较。"
+
+# addressbook/backend/ebook/e-card-simple.c:67
+# addressbook/gui/contact-editor/e-contact-editor.c:1650
+# addressbook/backend/ebook/e-card-simple.c:67
+# addressbook/gui/contact-editor/e-contact-editor.c:1650
+# addressbook/backend/ebook/e-card-simple.c:67
+# addressbook/gui/contact-editor/e-contact-editor.c:1650
+#, fuzzy
+#~ msgid "Command"
+#~ msgstr "公司"
+
+# mail/mail-account-editor-news.c:160
+# mail/mail-account-editor-news.c:160
+# mail/mail-account-editor-news.c:160
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolution 新闻编辑器"
+
+# mail/mail-accounts.c:532 mail/mail-accounts.c:536
+# mail/mail-accounts.c:532 mail/mail-accounts.c:536
+# mail/mail-accounts.c:532 mail/mail-accounts.c:536
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "您确信您要删除该邮件帐号?"
+
+# mail/mail-callbacks.c:600
+# mail/mail-callbacks.c:600
+# mail/mail-callbacks.c:549
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "在您能够发送该邮件之前您必须配置一个帐号。"
+
+# mail/mail-config.glade.h:45
+# mail/mail-config.glade.h:45
+# mail/mail-config.glade.h:52
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP 服务器:"
+
+# my-evolution/my-evolution.glade.h:28
+# my-evolution/my-evolution.glade.h:28
+# my-evolution/my-evolution.glade.h:28
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "新闻来源(_N)"
+
+# mail/mail-config.glade.h:80
+# mail/mail-config.glade.h:80
+# mail/mail-config.glade.h:89
+#~ msgid "Source"
+#~ msgstr "来源"
+
+# mail/mail-config.glade.h:81
+# mail/mail-config.glade.h:81
+# mail/mail-config.glade.h:90
+#~ msgid "Source Information"
+#~ msgstr "来源信息"
+
+# mail/mail-config.glade.h:121
+# mail/mail-config.glade.h:121
+# mail/mail-config.glade.h:130
+#~ msgid "newswindow1"
+#~ msgstr "新闻窗口1"
+
+# mail/mail-display.c:350
+# mail/mail-display.c:349
+# mail/mail-display.c:350
+#~ msgid "Save to Disk..."
+#~ msgstr "保存到磁盘..."
+
+# mail/mail-callbacks.c:1962
+# mail/mail-callbacks.c:2081
+# mail/mail-callbacks.c:2117
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "消息另存为..."
+
+# mail/mail-ops.c:2233
+#~ msgid "Executing shell command: %s"
+#~ msgstr "正在执行 shell 命令:%s"
+
+# shell/e-shell-folder-creation-dialog.c:267
+# shell/e-shell-folder-creation-dialog.c:267
+# shell/e-shell-folder-creation-dialog.c:304
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - 创建新文件夹"
+
+# shell/e-shell-folder-selection-dialog.c:98
+# shell/e-shell-folder-selection-dialog.c:98
+# shell/e-shell-folder-selection-dialog.c:98
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "文件夹的类型对于请求的\n"
+#~ "操作来说是不合法的。"
+
+# shell/e-shell-importer.c:409
+# shell/e-shell-importer.c:409
+# shell/e-shell-importer.c:420
+#~ msgid "You may only import to local folders"
+#~ msgstr "您只能导入到本地文件夹"
+
+# ui/evolution-addressbook.xml.h:32
+# ui/evolution-addressbook.xml.h:32
+# ui/evolution-addressbook.xml.h:33
+#~ msgid "_Contact List"
+#~ msgstr "联系人列表(_C)"
+
+# ui/evolution-message-composer.xml.h:10
+# ui/evolution-message-composer.xml.h:10
+# ui/evolution-message-composer.xml.h:10
+#~ msgid "Inline Text _File..."
+#~ msgstr "内联文本文件(_F)..."
+
+# ui/evolution-message-composer.xml.h:11
+# ui/evolution-message-composer.xml.h:11
+# ui/evolution-message-composer.xml.h:11
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "把文件作为文本插入邮件"
+
+# ui/evolution-message-composer.xml.h:12
+# ui/evolution-message-composer.xml.h:12
+# ui/evolution-message-composer.xml.h:12
+#~ msgid "Insert text file..."
+#~ msgstr "插入文本文件..."
+
+# ui/evolution-message-composer.xml.h:28
+# ui/evolution-message-composer.xml.h:28
+# ui/evolution-message-composer.xml.h:28
+#~ msgid "Send _Later"
+#~ msgstr "以后发送(_L)"
+
+# ui/evolution-message-composer.xml.h:29
+# ui/evolution-message-composer.xml.h:29
+# ui/evolution-message-composer.xml.h:29
+#~ msgid "Send _later"
+#~ msgstr "以后发送(_L)"
+
+# ui/evolution-message-composer.xml.h:31
+# ui/evolution-message-composer.xml.h:31
+# ui/evolution-message-composer.xml.h:31
+#~ msgid "Send the message later"
+#~ msgstr "以后再发送邮件"
+
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+#~ msgid "_Pilot Settings..."
+#~ msgstr "Pilot 设置(_P)..."
+
# addressbook/backend/pas/pas-backend-ldap.c:483
# addressbook/backend/pas/pas-backend-ldap.c:483
# addressbook/backend/pas/pas-backend-ldap.c:486
@@ -44868,21 +45681,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "Factory for the Calendar Summary component."
#~ msgstr "日历概要组件车间。"
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-#~ msgid "Create a new appointment"
-#~ msgstr "创建新约会"
-
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:5
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:5
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:6
-#~ msgid "Create a new task"
-#~ msgstr "创建新任务"
-
# calendar/gui/component-factory.c:649
# calendar/gui/component-factory.c:649
# calendar/gui/component-factory.c:649
@@ -45385,12 +46183,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "Mail storage folder (internal)"
#~ msgstr "邮件存储文件夹 (内部)"
-# mail/component-factory.c:129
-# mail/component-factory.c:129
-# mail/component-factory.c:129
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "无法连接到存储: %s"
-
# mail/component-factory.c:951
# mail/component-factory.c:951
# mail/component-factory.c:955
@@ -45531,12 +46323,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "_Organization:"
#~ msgstr "组织(_O):"
-# mail/mail-config.glade.h:113
-# mail/mail-config.glade.h:113
-# mail/mail-config.glade.h:122
-#~ msgid "_Remember this password"
-#~ msgstr "记住该密码(_R)"
-
# mail/mail-config.glade.h:114
# mail/mail-config.glade.h:114
# mail/mail-config.glade.h:123
@@ -45739,12 +46525,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "Create or edit mail accounts and other preferences"
#~ msgstr "创建或编辑邮件帐号和其它属性"
-# ui/evolution-mail-global.xml.h:10
-# ui/evolution-mail-global.xml.h:10
-# ui/evolution-mail-global.xml.h:10
-#~ msgid "New Message"
-#~ msgstr "新建邮件"
-
# ui/evolution-mail-global.xml.h:21
# ui/evolution-mail-global.xml.h:21
# ui/evolution-mail-global.xml.h:21
@@ -46185,12 +46965,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ "it."
#~ msgstr "这将连接到 POP 服务器并使用 Kerberos 4 进行认证。"
-# camel/providers/pop3/camel-pop3-store.c:198
-# camel/providers/pop3/camel-pop3-store.c:198
-# camel/providers/pop3/camel-pop3-store.c:198
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "无法认证到 KPOP 服务器: %s"
-
# camel/providers/pop3/camel-pop3-store.c:214
# camel/providers/pop3/camel-pop3-store.c:214
# camel/providers/pop3/camel-pop3-store.c:214