aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2002-05-08 21:37:33 +0800
committerJP Rosevear <jpr@src.gnome.org>2002-05-08 21:37:33 +0800
commitb2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06 (patch)
tree5cb241d8ec2ea0a75d38ad395bd3578089e3250c /po/zh_CN.po
parentd02b29d95446c200856d69d0bf0abe856ed7a96f (diff)
downloadgsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.gz
gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.zst
gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.zip
Update the po files to cut down on dist time
02-05-08 JP Rosevear <jpr@ximian.com> * Update the po files to cut down on dist time svn path=/trunk/; revision=16721
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po11729
1 files changed, 6991 insertions, 4738 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 24d9131492..e44aaea3b9 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-02-04 22:42+0800\n"
+"POT-Creation-Date: 2002-05-07 15:46-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"
@@ -47,7 +47,7 @@ msgstr "将 VCard 文件导入 Evolution"
# addressbook/backend/ebook/e-card-simple.c:60
# addressbook/gui/widgets/e-addressbook-view.c:960
#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:960
+#: addressbook/gui/widgets/e-addressbook-view.c:335
msgid "File As"
msgstr ""
@@ -55,6 +55,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
+#: my-evolution/e-summary-table.c:59
msgid "Name"
msgstr "名称"
@@ -65,7 +66,7 @@ msgstr "名称"
# addressbook/backend/ebook/e-card-simple.c:62
# addressbook/gui/widgets/e-addressbook-view.c:962
#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:962
+#: addressbook/gui/widgets/e-addressbook-view.c:337
msgid "Email"
msgstr "电子邮件"
@@ -102,7 +103,7 @@ msgstr "主要"
#: addressbook/backend/ebook/e-card-simple.c:64
#: addressbook/backend/ebook/e-card-simple.c:94
#: addressbook/gui/contact-editor/e-contact-editor.c:1716
-#: addressbook/gui/widgets/e-addressbook-view.c:994
+#: addressbook/gui/widgets/e-addressbook-view.c:369
msgid "Assistant"
msgstr "助手"
@@ -199,7 +200,7 @@ msgstr "家庭"
# addressbook/backend/ebook/e-card-simple.c:69
# addressbook/gui/widgets/e-addressbook-view.c:969
#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:969
+#: addressbook/gui/widgets/e-addressbook-view.c:344
msgid "Organization"
msgstr "组织"
@@ -251,7 +252,7 @@ msgstr "汽车"
#: addressbook/backend/ebook/e-card-simple.c:74
#: addressbook/gui/contact-editor/contact-editor.glade.h:6
#: addressbook/gui/contact-editor/e-contact-editor.c:1719
-#: addressbook/gui/widgets/e-addressbook-view.c:974
+#: addressbook/gui/widgets/e-addressbook-view.c:349
msgid "Business Fax"
msgstr "商务传真"
@@ -273,7 +274,7 @@ msgstr "商务传真"
# addressbook/gui/widgets/e-addressbook-view.c:975
#: addressbook/backend/ebook/e-card-simple.c:75
#: addressbook/gui/contact-editor/e-contact-editor.c:1725
-#: addressbook/gui/widgets/e-addressbook-view.c:975
+#: addressbook/gui/widgets/e-addressbook-view.c:350
msgid "Home Fax"
msgstr "家庭传真"
@@ -317,7 +318,7 @@ msgstr "家庭 2"
# addressbook/gui/widgets/e-addressbook-view.c:978
#: addressbook/backend/ebook/e-card-simple.c:78
#: addressbook/gui/contact-editor/e-contact-editor.c:1726
-#: addressbook/gui/widgets/e-addressbook-view.c:978
+#: addressbook/gui/widgets/e-addressbook-view.c:353
msgid "ISDN"
msgstr "ISDN"
@@ -340,7 +341,6 @@ msgstr "ISDN"
#: addressbook/backend/ebook/e-card-simple.c:85
#: addressbook/gui/contact-editor/e-contact-editor.c:1728
#: addressbook/gui/contact-editor/e-contact-editor.c:1786
-#: mail/mail-config.glade.h:58
msgid "Other"
msgstr "其它"
@@ -355,7 +355,7 @@ msgstr "其它"
# addressbook/gui/widgets/e-addressbook-view.c:980
#: addressbook/backend/ebook/e-card-simple.c:80
#: addressbook/gui/contact-editor/e-contact-editor.c:1729
-#: addressbook/gui/widgets/e-addressbook-view.c:980
+#: addressbook/gui/widgets/e-addressbook-view.c:355
msgid "Other Fax"
msgstr "其它传真"
@@ -370,7 +370,7 @@ msgstr "其它传真"
# addressbook/gui/widgets/e-addressbook-view.c:981
#: addressbook/backend/ebook/e-card-simple.c:81
#: addressbook/gui/contact-editor/e-contact-editor.c:1730
-#: addressbook/gui/widgets/e-addressbook-view.c:981
+#: addressbook/gui/widgets/e-addressbook-view.c:356
msgid "Pager"
msgstr "传呼机"
@@ -385,7 +385,7 @@ msgstr "传呼机"
# addressbook/gui/widgets/e-addressbook-view.c:982
#: addressbook/backend/ebook/e-card-simple.c:82
#: addressbook/gui/contact-editor/e-contact-editor.c:1732
-#: addressbook/gui/widgets/e-addressbook-view.c:982
+#: addressbook/gui/widgets/e-addressbook-view.c:357
msgid "Radio"
msgstr "收音机"
@@ -400,7 +400,7 @@ msgstr "收音机"
# addressbook/gui/widgets/e-addressbook-view.c:983
#: addressbook/backend/ebook/e-card-simple.c:83
#: addressbook/gui/contact-editor/e-contact-editor.c:1733
-#: addressbook/gui/widgets/e-addressbook-view.c:983
+#: addressbook/gui/widgets/e-addressbook-view.c:358
msgid "Telex"
msgstr "电传"
@@ -411,7 +411,7 @@ msgstr "电传"
# addressbook/backend/ebook/e-card-simple.c:84
# addressbook/gui/widgets/e-addressbook-view.c:984
#: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:984
+#: addressbook/gui/widgets/e-addressbook-view.c:359
msgid "TTY"
msgstr "TTY"
@@ -430,7 +430,7 @@ msgstr "TTY"
#: addressbook/backend/ebook/e-card-simple.c:86
#: addressbook/gui/component/e-address-popup.c:484
#: addressbook/gui/contact-editor/e-contact-editor.c:1759
-#: addressbook/gui/widgets/e-addressbook-view.c:986
+#: addressbook/gui/widgets/e-addressbook-view.c:361
msgid "Email 2"
msgstr "电子邮件 2"
@@ -449,7 +449,7 @@ msgstr "电子邮件 2"
#: addressbook/backend/ebook/e-card-simple.c:87
#: addressbook/gui/component/e-address-popup.c:494
#: addressbook/gui/contact-editor/e-contact-editor.c:1760
-#: addressbook/gui/widgets/e-addressbook-view.c:987
+#: addressbook/gui/widgets/e-addressbook-view.c:362
msgid "Email 3"
msgstr "电子邮件 3"
@@ -460,7 +460,7 @@ msgstr "电子邮件 3"
# addressbook/backend/ebook/e-card-simple.c:88
# addressbook/gui/widgets/e-addressbook-view.c:988
#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:988
+#: addressbook/gui/widgets/e-addressbook-view.c:363
msgid "Web Site"
msgstr "网站"
@@ -478,7 +478,7 @@ msgstr "Url"
# addressbook/backend/ebook/e-card-simple.c:89
# addressbook/gui/widgets/e-addressbook-view.c:989
#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:989
+#: addressbook/gui/widgets/e-addressbook-view.c:364
msgid "Department"
msgstr "部门"
@@ -496,7 +496,7 @@ msgstr "部门"
# addressbook/backend/ebook/e-card-simple.c:90
# addressbook/gui/widgets/e-addressbook-view.c:990
#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:990
+#: addressbook/gui/widgets/e-addressbook-view.c:365
msgid "Office"
msgstr "办公室"
@@ -514,7 +514,7 @@ msgstr "办公室"
# addressbook/backend/ebook/e-card-simple.c:91
# addressbook/gui/widgets/e-addressbook-view.c:991
#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:991
+#: addressbook/gui/widgets/e-addressbook-view.c:366
msgid "Title"
msgstr "头衔"
@@ -525,7 +525,7 @@ msgstr "头衔"
# addressbook/backend/ebook/e-card-simple.c:92
# addressbook/gui/widgets/e-addressbook-view.c:992
#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:992
+#: addressbook/gui/widgets/e-addressbook-view.c:367
msgid "Profession"
msgstr "职业"
@@ -543,7 +543,7 @@ msgstr "职业"
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/gui/widgets/e-addressbook-view.c:993
#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:993
+#: addressbook/gui/widgets/e-addressbook-view.c:368
msgid "Manager"
msgstr "经理"
@@ -568,7 +568,7 @@ msgstr "助手"
# addressbook/backend/ebook/e-card-simple.c:95
# addressbook/gui/widgets/e-addressbook-view.c:995
#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:995
+#: addressbook/gui/widgets/e-addressbook-view.c:370
msgid "Nickname"
msgstr "绰号"
@@ -586,7 +586,7 @@ msgstr "绰号"
# addressbook/backend/ebook/e-card-simple.c:96
# addressbook/gui/widgets/e-addressbook-view.c:996
#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:996
+#: addressbook/gui/widgets/e-addressbook-view.c:371
msgid "Spouse"
msgstr "配偶"
@@ -597,7 +597,7 @@ msgstr "配偶"
# addressbook/backend/ebook/e-card-simple.c:97
# addressbook/gui/widgets/e-addressbook-view.c:997
#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:997
+#: addressbook/gui/widgets/e-addressbook-view.c:372
msgid "Note"
msgstr "注释"
@@ -622,7 +622,7 @@ msgstr "日历 URI"
# addressbook/backend/ebook/e-card-simple.c:99
# addressbook/gui/widgets/e-addressbook-view.c:998
#: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:998
+#: addressbook/gui/widgets/e-addressbook-view.c:373
msgid "Free-busy URL"
msgstr "忙闲 URL"
@@ -683,14 +683,14 @@ msgstr "%x"
# addressbook/backend/ebook/e-card.c:4235
# addressbook/backend/ebook/e-card.c:4235
# addressbook/backend/ebook/e-card.c:4235
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
msgid "Multiple VCards"
msgstr "多个 VCard"
# addressbook/backend/ebook/e-card.c:4243
# addressbook/backend/ebook/e-card.c:4243
# addressbook/backend/ebook/e-card.c:4243
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
#, c-format
msgid "VCard for %s"
msgstr "%s 的 VCard"
@@ -733,11 +733,11 @@ msgstr "%s 的 VCard"
#: addressbook/backend/ebook/load-pine-addressbook.c:22
#: addressbook/backend/ebook/test-client-list.c:23
#: addressbook/backend/ebook/test-client.c:34
-#: addressbook/conduit/address-conduit.c:1721
+#: addressbook/conduit/address-conduit.c:1860
#: 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
+#: calendar/conduits/todo/todo-conduit.c:1385
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
#: tools/evolution-addressbook-abuse.c:132
#: tools/evolution-addressbook-export.c:60
#: tools/evolution-addressbook-import.c:86
@@ -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:260
-#: addressbook/backend/pas/pas-backend-ldap.c:2272
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
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:262
+#: addressbook/backend/pas/pas-backend-file.c:263
msgid "Loading..."
msgstr "装入..."
@@ -766,77 +766,83 @@ 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:271
+#: addressbook/backend/pas/pas-backend-file.c:272
msgid "Error in search expression."
msgstr "搜索表达式错误。"
-# addressbook/backend/pas/pas-backend-ldap.c:483
-# addressbook/backend/pas/pas-backend-ldap.c:483
-# addressbook/backend/pas/pas-backend-ldap.c:486
-#: addressbook/backend/pas/pas-backend-ldap.c:486
-msgid "Connecting to LDAP server..."
-msgstr "正在连接 LDAP 服务器..."
-
-# addressbook/backend/pas/pas-backend-ldap.c:493
-# addressbook/backend/pas/pas-backend-ldap.c:493
-# addressbook/backend/pas/pas-backend-ldap.c:496
-#: addressbook/backend/pas/pas-backend-ldap.c:496
-msgid "Unable to connect to LDAP server."
-msgstr "无法连接 LDAP 服务器。"
-
-# addressbook/backend/pas/pas-backend-ldap.c:509
-# addressbook/backend/pas/pas-backend-ldap.c:509
-# addressbook/backend/pas/pas-backend-ldap.c:512
-#: addressbook/backend/pas/pas-backend-ldap.c:512
-msgid "Waiting for connection to LDAP server..."
-msgstr "正在等待与 LDAP 服务器的连接..."
-
# 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:915
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
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:1016
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
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:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
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:2586
+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:2217
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
msgid "Receiving LDAP search results..."
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:2222
-msgid "Restarting search."
-msgstr "开始搜索,"
+# addressbook/gui/widgets/e-addressbook-util.c:95
+# addressbook/gui/widgets/e-addressbook-view.c:1278
+# addressbook/gui/widgets/e-addressbook-util.c:95
+# 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:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "删除卡片错误"
+
+# camel/camel-url.c:288
+# camel/camel-url.c:288
+# camel/camel-url.c:288
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "无法解析 URL “%s”"
+
+# mail/mail-config.glade.h:99
+# mail/mail-config.glade.h:99
+# mail/mail-config.glade.h:108
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "电子邮件地址(_E):"
# addressbook/conduit/address-conduit.c:294
# addressbook/conduit/address-conduit.c:294
# addressbook/conduit/address-conduit.c:426
-#: addressbook/conduit/address-conduit.c:426
+#: addressbook/conduit/address-conduit.c:536
msgid "Cursor could not be loaded\n"
msgstr "无法装入光标\n"
# addressbook/conduit/address-conduit.c:307
# addressbook/conduit/address-conduit.c:307
# addressbook/conduit/address-conduit.c:439
-#: addressbook/conduit/address-conduit.c:439
+#: addressbook/conduit/address-conduit.c:549
msgid "EBook not loaded\n"
msgstr "没有装入 EBook\n"
@@ -849,9 +855,9 @@ msgstr "没有装入 EBook\n"
# addressbook/conduit/address-conduit.c:1220
# calendar/conduits/calendar/calendar-conduit.c:1203
# calendar/conduits/todo/todo-conduit.c:824
-#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1354
#: calendar/conduits/calendar/calendar-conduit.c:1203
-#: calendar/conduits/todo/todo-conduit.c:824
+#: calendar/conduits/todo/todo-conduit.c:889
msgid "Could not start wombat server"
msgstr "无法启动 wombat 服务器"
@@ -864,9 +870,9 @@ msgstr "无法启动 wombat 服务器"
# addressbook/conduit/address-conduit.c:1221
# calendar/conduits/calendar/calendar-conduit.c:1204
# calendar/conduits/todo/todo-conduit.c:825
-#: addressbook/conduit/address-conduit.c:1221
+#: addressbook/conduit/address-conduit.c:1355
#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:825
+#: calendar/conduits/todo/todo-conduit.c:890
msgid "Could not start wombat"
msgstr "无法启动 wombat"
@@ -876,8 +882,8 @@ msgstr "无法启动 wombat"
# addressbook/conduit/address-conduit.c:1128
# addressbook/conduit/address-conduit.c:1251
# addressbook/conduit/address-conduit.c:1254
-#: addressbook/conduit/address-conduit.c:1251
-#: addressbook/conduit/address-conduit.c:1254
+#: addressbook/conduit/address-conduit.c:1385
+#: addressbook/conduit/address-conduit.c:1388
msgid "Could not read pilot's Address application block"
msgstr "无法读入 Pilot 的地址应用程序块"
@@ -900,59 +906,90 @@ msgstr "用于显示一条地址的 Bonobo 控制。"
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
# notes/GNOME_Evolution_Notes.oaf.in.h:1
#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-#: notes/GNOME_Evolution_Notes.oaf.in.h:1
msgid "A sample Bonobo control which displays an addressbook."
msgstr "显示地址簿的 Bonobo 控制示例。"
+# addressbook/gui/component/addressbook-config.glade.h:4
+# addressbook/gui/component/addressbook-config.glade.h:4
+# addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Addressbook Settings"
+msgstr "地址簿资源"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Configuration control for the Evolution Addressbook Storages."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Configuration control for the Evolution Addressbook."
+msgstr ""
+
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
msgid "Control that displays an Evolution addressbook minicard."
msgstr "显示 Evolution 地址簿小卡片的控制。"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
msgid "Evolution Addressbook minicard viewer"
msgstr "Evolution 地址簿小卡片显示器"
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
msgid "Evolution component for handling contacts."
msgstr "处理联系人的 Evolution 成员。"
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
msgid "Factory for the Addressbook Minicard control"
msgstr "地址簿小卡片控制车间"
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
msgid "Factory for the Addressbook's address displayer"
msgstr "地址簿地址显示器车间"
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
msgid "Factory for the Addressbook's address popup"
msgstr "地址簿地址对话框车间"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
msgid "Factory for the sample Addressbook control"
msgstr "示例地址簿控制车间"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
+msgid "This page can be used to configure Addressbook Settings"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
# addressbook/gui/component/addressbook-component.c:71
# calendar/gui/dialogs/comp-editor-util.c:310
# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
@@ -965,31 +1002,31 @@ msgstr "示例地址簿控制车间"
# calendar/gui/dialogs/comp-editor-util.c:310
# 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:71
+#: addressbook/gui/component/addressbook-component.c:72
#: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
-#: shell/e-shortcuts.c:1061
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
msgid "Contacts"
msgstr "联系人"
# addressbook/gui/component/addressbook-component.c:71
# addressbook/gui/component/addressbook-component.c:71
# addressbook/gui/component/addressbook-component.c:71
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
msgid "Folder containing contact information"
msgstr "含有联系人信息的文件夹"
# addressbook/gui/component/addressbook-component.c:73
# addressbook/gui/component/addressbook-component.c:73
# addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
msgid "LDAP Server"
msgstr "LDAP 服务器"
# addressbook/gui/component/addressbook-component.c:73
# addressbook/gui/component/addressbook-component.c:73
# addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
msgid "LDAP server containing contact information"
msgstr "含有联系人信息的 LDAP 服务器"
@@ -999,349 +1036,32 @@ msgstr "含有联系人信息的 LDAP 服务器"
# 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:527
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
msgid "New Contact"
msgstr "新建联系人"
-# addressbook/gui/component/addressbook-component.c:526
-# addressbook/gui/component/addressbook-component.c:526
-# addressbook/gui/component/addressbook-component.c:527
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New _Contact"
-msgstr "新建联系人(_C)"
+# ui/evolution-addressbook.xml.h:31
+# ui/evolution-addressbook.xml.h:31
+# ui/evolution-addressbook.xml.h:32
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "联系人(_C)"
# 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:530
+#: addressbook/gui/component/addressbook-component.c:565
msgid "New Contact List"
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:530
-msgid "New Contact _List"
-msgstr "新建联系人列表(_L)"
-
-# addressbook/gui/component/addressbook-config.c:186
-# addressbook/gui/component/addressbook-config.c:186
-# addressbook/gui/component/addressbook-config.c:223
-#: addressbook/gui/component/addressbook-config.c:223
-msgid "Edit Addressbook"
-msgstr "编辑地址簿"
-
-# calendar/gui/e-calendar-table.c:437
-# calendar/gui/e-calendar-table.c:437
-# addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "100"
-msgstr "100"
-
-# addressbook/gui/component/addressbook-config.glade.h:1
-# addressbook/gui/component/addressbook-config.glade.h:1
-# addressbook/gui/component/addressbook-config.glade.h:2
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "389"
-msgstr "389"
-
-# camel/providers/smtp/camel-smtp-transport.c:222
-# camel/providers/smtp/camel-smtp-transport.c:222
-# addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "A_uthenticate with server using:"
-msgstr "以之与服务器进行认证(_U):"
-
-# addressbook/gui/component/addressbook-config.glade.h:2
-# addressbook/gui/component/addressbook-config.glade.h:2
-# addressbook/gui/component/addressbook-config.glade.h:4
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "帐号名"
-
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "添加地址簿"
-
-# addressbook/gui/component/addressbook-config.glade.h:4
-# addressbook/gui/component/addressbook-config.glade.h:4
-# addressbook/gui/component/addressbook-config.glade.h:6
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Addressbook Sources"
-msgstr "地址簿资源"
-
-# addressbook/gui/component/addressbook-config.glade.h:5
-# addressbook/gui/component/addressbook-config.glade.h:5
-# addressbook/gui/component/addressbook-config.glade.h:7
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "高级"
-
-# addressbook/gui/component/addressbook-config.glade.h:6
-# addressbook/gui/component/addressbook-config.glade.h:6
-# addressbook/gui/component/addressbook-config.glade.h:8
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "起点"
-
-# addressbook/gui/component/addressbook-config.glade.h:7
-# calendar/gui/dialogs/task-editor.c:178
-# addressbook/gui/component/addressbook-config.glade.h:7
-# calendar/gui/dialogs/task-editor.c:178
-# addressbook/gui/component/addressbook-config.glade.h:9
-# calendar/gui/dialogs/task-editor.c:178
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "基本"
-
-# addressbook/gui/component/addressbook-config.glade.h:26
-# addressbook/gui/component/addressbook-config.glade.h:26
-# addressbook/gui/component/addressbook-config.glade.h:10
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
-msgstr "如果服务器需要您进行认证就监查它。"
-
-# addressbook/gui/component/addressbook-config.glade.h:8
-# addressbook/gui/component/addressbook-config.glade.h:8
-# addressbook/gui/component/addressbook-config.glade.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "De_lete"
-msgstr "删除(_L)"
-
-# addressbook/gui/component/addressbook-config.glade.h:12
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
-msgstr "识别姓名 (DN)"
-
-# addressbook/gui/component/addressbook-config.glade.h:9
-# addressbook/gui/component/addressbook-config.glade.h:9
-# addressbook/gui/component/addressbook-config.glade.h:13
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Email address"
-msgstr "电子邮件地址"
-
-# addressbook/gui/component/addressbook-config.glade.h:10
-# addressbook/gui/component/addressbook-config.glade.h:10
-# addressbook/gui/component/addressbook-config.glade.h:14
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid ""
-"Evolution will use this Distinquished Name (DN) to authenticate you with the "
-"server"
-msgstr "Evolution 将使用该识别姓名 (DN) 在服务器上对您进行认证"
-
-# addressbook/gui/component/addressbook-config.glade.h:10
-# addressbook/gui/component/addressbook-config.glade.h:10
-# addressbook/gui/component/addressbook-config.glade.h:15
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution 将使用该电子邮件地址在服务器上对您进行认证"
-
-# addressbook/gui/component/addressbook-config.glade.h:11
-# addressbook/gui/component/addressbook-config.glade.h:11
-# addressbook/gui/component/addressbook-config.glade.h:16
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "One"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.glade.h:12
-# addressbook/gui/component/addressbook-config.glade.h:12
-# addressbook/gui/component/addressbook-config.glade.h:17
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr "搜索起点(_B):"
-
-# addressbook/gui/component/addressbook-config.glade.h:13
-# addressbook/gui/component/addressbook-config.glade.h:13
-# addressbook/gui/component/addressbook-config.glade.h:18
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
-msgstr "搜索范围(_C):"
-
-# addressbook/gui/component/addressbook-config.glade.h:14
-# addressbook/gui/component/addressbook-config.glade.h:14
-# addressbook/gui/component/addressbook-config.glade.h:19
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "服务器名"
-
-# addressbook/gui/component/addressbook-config.glade.h:15
-# addressbook/gui/component/addressbook-config.glade.h:15
-# addressbook/gui/component/addressbook-config.glade.h:20
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "Sub"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.glade.h:16
-# addressbook/gui/component/addressbook-config.glade.h:16
-# addressbook/gui/component/addressbook-config.glade.h:21
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook. "
-msgstr "为添加地址簿,需要以下信息。 "
-
-# addressbook/gui/component/addressbook-config.glade.h:17
-# addressbook/gui/component/addressbook-config.glade.h:17
-# addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
-msgstr "大部分 LDAP 服务器都不需要该信息。"
-
-# addressbook/gui/component/addressbook-config.glade.h:18
-# addressbook/gui/component/addressbook-config.glade.h:18
-# addressbook/gui/component/addressbook-config.glade.h:23
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid ""
-"This information is used by your ldap server to specify which nodes are used "
-"in a search. Contact your server administrator for more information."
-msgstr ""
-"您的 LDAP 服务器用该信息来确定在搜索中使用那个节点。详情请咨询您的服务器管理"
-"员。"
-
-# Addressbook/gui/component/addressbook-config.glade.h:19
-# addressbook/gui/component/addressbook-config.glade.h:19
-# addressbook/gui/component/addressbook-config.glade.h:24
-#: addressbook/gui/component/addressbook-config.glade.h:24
-msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
-msgstr ""
-"这是您在 LDAP 服务器上进行的所有搜索的基本节点。详情请咨询您的服务器管理员。"
-
-# addressbook/gui/component/addressbook-config.glade.h:25
-#: addressbook/gui/component/addressbook-config.glade.h:25
-msgid ""
-"This is the maximum number of cards to download. Setting this number too "
-"large will slow down this addressbook."
-msgstr "这是可下载卡片的最大数量。将该数值设定得太大将导致地址本变慢。"
-
-# addressbook/gui/component/addressbook-config.glade.h:26
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid ""
-"This is the method evolution will use to authenticate you. Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
-msgstr ""
-"这是 evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
-"对 ldap 服务器的匿名访问权限。"
-
-# addressbook/gui/component/addressbook-config.glade.h:20
-# addressbook/gui/component/addressbook-config.glade.h:20
-# addressbook/gui/component/addressbook-config.glade.h:27
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "This is the name of the server where your addressbook is located."
-msgstr "这是您的地址簿所在的服务器的名称。"
-
-# addressbook/gui/component/addressbook-config.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:28
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
-msgstr "这是您的 LDAP 服务器所使用的端口。"
-
-# addressbook/gui/component/addressbook-config.glade.h:22
-# addressbook/gui/component/addressbook-config.glade.h:22
-# addressbook/gui/component/addressbook-config.glade.h:29
-#: addressbook/gui/component/addressbook-config.glade.h:29
-msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
-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
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "帐号名(_A):"
-
-# addressbook/gui/component/addressbook-config.glade.h:24
-# 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:90 my-evolution/my-evolution.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:24
-# 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:90 my-evolution/my-evolution.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:31
-# 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:99 my-evolution/my-evolution.glade.h:21
-#: addressbook/gui/component/addressbook-config.glade.h:31
-#: 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:100 my-evolution/my-evolution.glade.h:21
-msgid "_Add"
-msgstr "添加(_A)"
-
-# addressbook/gui/component/addressbook-config.glade.h:32
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
-msgstr "识别名称(_D)"
-
-# addressbook/gui/component/addressbook-config.glade.h:33
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
-msgstr "下载上限(_D)"
-
-# addressbook/gui/component/addressbook-config.glade.h:25
-# ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
-# 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:7 ui/evolution-subscribe.xml.h:10
-# ui/evolution-tasks.xml.h:16
-# addressbook/gui/component/addressbook-config.glade.h:25
-# ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
-# 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:7 ui/evolution-subscribe.xml.h:10
-# ui/evolution-tasks.xml.h:16
-# addressbook/gui/component/addressbook-config.glade.h:34
-# filter/filter.glade.h:9 mail/mail-config.glade.h:107
-# ui/evolution-addressbook.xml.h:35 ui/evolution-calendar.xml.h:39
-# 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:7 ui/evolution-subscribe.xml.h:10
-# ui/evolution-tasks.xml.h:19
-#: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:109
-#: ui/evolution-addressbook.xml.h:35 ui/evolution-calendar.xml.h:39
-#: 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:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-# mail/mail-config.glade.h:99
-# mail/mail-config.glade.h:99
-# addressbook/gui/component/addressbook-config.glade.h:35
-#: addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:110
-msgid "_Email address:"
-msgstr "电子邮件地址(_E):"
-
-# addressbook/gui/component/addressbook-config.glade.h:27
-# addressbook/gui/component/addressbook-config.glade.h:27
-# addressbook/gui/component/addressbook-config.glade.h:36
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "端口(_P):"
-
-# addressbook/gui/component/addressbook-config.glade.h:28
-# addressbook/gui/component/addressbook-config.glade.h:28
-# addressbook/gui/component/addressbook-config.glade.h:37
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "服务器名(_S):"
+# ui/evolution-addressbook.xml.h:32
+# ui/evolution-addressbook.xml.h:32
+# ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "联系人列表(_C)"
# addressbook/gui/component/addressbook-factory.c:70
# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
@@ -1349,29 +1069,22 @@ msgstr "服务器名(_S):"
# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
# 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: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:174 calendar/gui/main.c:135
msgid "Could not initialize gnome-vfs"
msgstr "无法创始化 gnome-vfs"
-# addressbook/gui/component/addressbook-storage.c:167
-# addressbook/gui/component/addressbook-storage.c:167
-# addressbook/gui/component/addressbook-storage.c:168
-#: addressbook/gui/component/addressbook-storage.c:168
-msgid "Other Contacts"
-msgstr "其他联系人"
-
# addressbook/gui/component/addressbook.c:485
# addressbook/gui/component/addressbook.c:485
# addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c:499
+#: addressbook/gui/component/addressbook.c:516
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:508
+#: addressbook/gui/component/addressbook.c:525
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the LDAP server\n"
@@ -1384,7 +1097,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:513
+#: addressbook/gui/component/addressbook.c:530
msgid ""
"This version of Evolution does not have LDAP support\n"
"compiled in to it. If you want to use LDAP in Evolution\n"
@@ -1399,7 +1112,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:521
+#: addressbook/gui/component/addressbook.c:538
msgid ""
"We were unable to open this addressbook. Please check that the\n"
"path exists and that you have permission to access it."
@@ -1411,36 +1124,33 @@ msgstr ""
# addressbook/gui/component/addressbook.c:640
# addressbook/gui/component/addressbook.c:655
# addressbook/gui/component/addressbook.c:658
-#: addressbook/gui/component/addressbook.c:655
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "为 %s (用户 %s)输入口令"
-# addressbook/gui/component/addressbook.c:803
-# calendar/gui/cal-search-bar.c:55
-# addressbook/gui/component/addressbook.c:803
-# calendar/gui/cal-search-bar.c:55
-# addressbook/gui/component/addressbook.c:836
-# calendar/gui/cal-search-bar.c:55
-#: addressbook/gui/component/addressbook.c:836
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "任何域含有"
-
-# addressbook/gui/component/addressbook.c:804
-# addressbook/gui/component/addressbook.c:804
-# addressbook/gui/component/addressbook.c:837
-#: addressbook/gui/component/addressbook.c:837
-msgid "Name contains"
-msgstr "名称含有"
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "以之结束"
-# addressbook/gui/component/addressbook.c:805
-# addressbook/gui/component/addressbook.c:805
-# addressbook/gui/component/addressbook.c:838
-#: addressbook/gui/component/addressbook.c:838
-msgid "Email contains"
-msgstr "电子邮件含有"
+# addressbook/backend/ebook/e-card-simple.c:86
+# addressbook/gui/component/e-address-popup.c:484
+# addressbook/gui/contact-editor/e-contact-editor.c:1687
+# addressbook/gui/widgets/e-addressbook-view.c:875
+# addressbook/backend/ebook/e-card-simple.c:86
+# addressbook/gui/component/e-address-popup.c:484
+# addressbook/gui/contact-editor/e-contact-editor.c:1687
+# addressbook/gui/widgets/e-addressbook-view.c:875
+# addressbook/backend/ebook/e-card-simple.c:86
+# 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:770
+#, fuzzy
+msgid "Email is"
+msgstr "电子邮件 2"
# addressbook/gui/component/addressbook.c:806
# calendar/gui/cal-search-bar.c:59
@@ -1448,19 +1158,29 @@ msgstr "电子邮件含有"
# 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:839
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
msgid "Category is"
msgstr "类别为"
+# addressbook/gui/component/addressbook.c:803
+# calendar/gui/cal-search-bar.c:55
+# addressbook/gui/component/addressbook.c:803
+# calendar/gui/cal-search-bar.c:55
+# addressbook/gui/component/addressbook.c:836
+# calendar/gui/cal-search-bar.c:55
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:772
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "任何域含有"
+
# addressbook/gui/component/addressbook.c:807 widgets/misc/e-filter-bar.h:104
# addressbook/gui/component/addressbook.c:807 widgets/misc/e-filter-bar.h:97
# 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
-#. We attach subitems below
-#: 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:773 widgets/misc/e-filter-bar.h:99
msgid "Advanced..."
msgstr "高级..."
@@ -1471,30 +1191,18 @@ msgstr "高级..."
# addressbook/gui/component/addressbook.c:1067
# calendar/gui/cal-search-bar.c:412
#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1067
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
msgid "Any Category"
msgstr "任何类别"
# addressbook/gui/component/addressbook.c:1107
# addressbook/gui/component/addressbook.c:1107
# addressbook/gui/component/addressbook.c:1150
-#: addressbook/gui/component/addressbook.c:1150
+#: addressbook/gui/component/addressbook.c:1083
msgid "The URI that the Folder Browser will display"
msgstr "文件夹浏览器将显示的 URI"
-# shell/e-shell-view.c:1587
-# addressbook/gui/component/e-address-popup.c:178
-# addressbook/gui/component/e-address-popup.c:178
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(无)"
-
# addressbook/gui/component/e-address-popup.c:474
# addressbook/gui/contact-editor/contact-editor.glade.h:26
# addressbook/gui/contact-editor/e-contact-editor.c:1686
@@ -1591,6 +1299,858 @@ msgstr "关闭查询"
msgid "Enable Queries (Dangerous!)"
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
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "无法连接 LDAP 服务器。"
+
+# camel/providers/imap/camel-imap-store.c:596
+# camel/providers/imap/camel-imap-store.c:596
+# camel/providers/imap/camel-imap-store.c:596
+#: addressbook/gui/component/addressbook-config.c:215
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"无法认证到 IMAP 服务器。\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:235
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:641
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1143
+msgid "The server did not respond with a schema entry"
+msgstr ""
+
+# camel/camel-sasl-anonymous.c:131
+# camel/camel-sasl-anonymous.c:131
+# camel/camel-sasl-anonymous.c:131
+#: addressbook/gui/component/addressbook-config.c:1163
+#, fuzzy
+msgid "Could not query for schema information"
+msgstr ""
+"无效的诲涩跟踪信息:\n"
+"%s"
+
+# 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:1169
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+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:1613
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(在该版本的 evolution 中不支持SSL)"
+
+# calendar/gui/e-calendar-table.etspec.h:8
+# calendar/gui/e-calendar-table.etspec.h:8
+# calendar/gui/e-calendar-table.etspec.h:8
+#: addressbook/gui/component/addressbook-config.c:1689
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "完成日期"
+
+# mail/mail-config.glade.h:1
+# mail/mail-config.glade.h:1
+# mail/mail-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:1
+#, fuzzy
+msgid " S_how Supported Bases "
+msgstr "检查支持的类型(_C) "
+
+# 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/gui/component/ldap-config.glade.h:2
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "选项"
+
+# my-evolution/my-evolution.glade.h:1
+# my-evolution/my-evolution.glade.h:1
+# my-evolution/my-evolution.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "<- _Remove"
+msgstr "删除(_R)"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "1234"
+msgstr ""
+
+# calendar/gui/e-calendar-table.c:437
+# calendar/gui/e-calendar-table.c:437
+# addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:5
+#, fuzzy
+msgid "1:00"
+msgstr "100"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:1
+# addressbook/gui/component/addressbook-config.glade.h:1
+# addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+# addressbook/gui/component/addressbook-config.glade.h:1
+# addressbook/gui/component/addressbook-config.glade.h:1
+# addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:4
+# addressbook/gui/component/addressbook-config.glade.h:4
+# addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:14
+msgid "Addressbook Sources"
+msgstr "地址簿资源"
+
+# calendar/gui/e-calendar-table.etspec.h:3
+# calendar/gui/e-calendar-table.etspec.h:3
+# calendar/gui/e-calendar-table.etspec.h:3
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "提醒"
+
+# camel/camel-sasl-anonymous.c:33
+# camel/camel-sasl-anonymous.c:33
+# camel/camel-sasl-anonymous.c:33
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "匿名"
+
+#: addressbook/gui/component/ldap-config.glade.h:17
+msgid "Associated LDAP Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:18
+msgid "Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:19
+msgid ""
+"Congratulations, you are finished setting up this LDAP server. You\n"
+"are now ready to access this directory.\n"
+"\n"
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
+msgstr ""
+
+# ui/evolution-addressbook.xml.h:31
+# ui/evolution-addressbook.xml.h:31
+# my-evolution/Locations.h:502
+#: addressbook/gui/component/ldap-config.glade.h:23
+#, fuzzy
+msgid "Connecting"
+msgstr "康涅狄格"
+
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid "Corresponding Evolution Attribute"
+msgstr ""
+
+# calendar/gui/e-meeting-time-sel.c:431
+# calendar/gui/e-meeting-time-sel.c:434
+# calendar/gui/e-meeting-time-sel.c:434
+#: addressbook/gui/component/ldap-config.glade.h:25
+#, fuzzy
+msgid "DN Customization"
+msgstr "没有信息"
+
+# addressbook/gui/component/addressbook-config.glade.h:8
+# addressbook/gui/component/addressbook-config.glade.h:8
+# addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "删除(_L)"
+
+# addressbook/gui/component/addressbook-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "识别名称(_D)"
+
+# mail/mail-config.glade.h:99
+# mail/mail-config.glade.h:99
+# mail/mail-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Email Address:"
+msgstr "电子邮件地址(_E):"
+
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Evolution 提醒"
+
+# addressbook/gui/component/addressbook-config.glade.h:10
+# addressbook/gui/component/addressbook-config.glade.h:10
+# addressbook/gui/component/addressbook-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
+msgstr ""
+"Evolution 将使用该电子邮件地址在服务器上对您进行认证"
+
+# addressbook/gui/component/addressbook-config.glade.h:10
+# addressbook/gui/component/addressbook-config.glade.h:10
+# addressbook/gui/component/addressbook-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Evolution 将使用该电子邮件地址在服务器上对您进行认证"
+
+# addressbook/gui/component/select-names/select-names.glade.h:3
+# addressbook/gui/component/select-names/select-names.glade.h:3
+# addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "查找(_I)"
+
+# addressbook/gui/contact-editor/contact-editor.glade.h:16
+# addressbook/gui/contact-editor/contact-editor.glade.h:16
+# addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "常规"
+
+#: addressbook/gui/component/ldap-config.glade.h:34
+msgid "LDAP Attribute"
+msgstr ""
+
+# mail/mail-config.glade.h:15
+# mail/mail-config.glade.h:15
+# mail/mail-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "配置"
+
+# addressbook/printing/e-contact-print.glade.h:21
+# addressbook/printing/e-contact-print.glade.h:21
+# addressbook/printing/e-contact-print.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+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:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "每(_E)"
+
+#: addressbook/gui/component/ldap-config.glade.h:38
+msgid ""
+"Now, you must specify how you want to connect to the LDAP server. The SSL "
+"(Secure Sockets Layer)\n"
+"and TLS (Transport Layer Security) protocols are used by some servers to "
+"cryptographically protect\n"
+"your connection. Ask your system administrator if your LDAP server uses "
+"these protocols."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:41
+msgid "Objectclasses"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:42
+msgid "Objectclasses Used in Evolution:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:43
+msgid "Objectclasses Used on Server:"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:11
+# addressbook/gui/component/addressbook-config.glade.h:11
+# addressbook/gui/component/addressbook-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:44
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:45
+msgid ""
+"Please select and Evolution attribute and an\n"
+"LDAP attribute to associate with it."
+msgstr ""
+
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
+msgid "R_estore Defaults"
+msgstr "默认"
+
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "默认"
+
+# addressbook/gui/component/addressbook-config.glade.h:13
+# addressbook/gui/component/addressbook-config.glade.h:13
+# addressbook/gui/component/addressbook-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "搜索范围(_C):"
+
+# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1675
+# calendar/gui/e-week-view.c:1182
+# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
+# calendar/gui/e-week-view.c:1184
+# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
+# 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
+msgid "Searching"
+msgstr "搜索"
+
+# ui/evolution-addressbook.xml.h:21
+# ui/evolution-addressbook.xml.h:21
+# ui/evolution-addressbook.xml.h:21
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "全选"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "已删除"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if\n"
+"your LDAP server supports SSL or TLS."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:55
+msgid ""
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a \n"
+"insecure environment. For example, if you and your LDAP server are behind a "
+"firewall\n"
+"at work, then Evolution doesn't need to use SSL/TLS because your connection "
+"is already\n"
+"secure."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:59
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This \n"
+"means that your connection will be insecure, and that you will be vulnerable "
+"to security\n"
+"exploits. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:62
+msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:64
+msgid ""
+"Specifying a display name is the last required step in configuring an LDAP "
+"server."
+msgstr ""
+
+# mail/mail-config.glade.h:81
+# mail/mail-config.glade.h:81
+# mail/mail-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:65
+#, fuzzy
+msgid "Step 1: Server Information"
+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
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "正在连接服务器..."
+
+#: addressbook/gui/component/ldap-config.glade.h:67
+msgid "Step 3: Searching the Directory"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid "Step 4: Display Name"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:15
+# addressbook/gui/component/addressbook-config.glade.h:15
+# addressbook/gui/component/addressbook-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:69
+msgid "Sub"
+msgstr ""
+
+# shell/evolution-shell-component.c:1023
+# shell/evolution-shell-component.c:1023
+# shell/evolution-shell-component.c:1036
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "不支持的方案"
+
+#: addressbook/gui/component/ldap-config.glade.h:71
+msgid ""
+"The first step in configuring an LDAP server is to provide its name, and "
+"your log in\n"
+"information. Please ask your system administrator if you are unsure of this "
+"information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:73
+msgid ""
+"The options on this page control how many entries should be included in "
+"your\n"
+"searches, and how long a search should take. Ask your system administrator "
+"if you\n"
+"need to change these options."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:76
+msgid ""
+"The search base is the distinguished name (DN) of the entry where your "
+"searches will \n"
+"begin. If you leave this blank, the search will begin at the root of the "
+"directory tree."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:78
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the \n"
+"directory tree. A search scope of \"sub\" will include all entries below "
+"your search base.\n"
+"A search scope of \"one\" will only include the entries one level beneath "
+"your base."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:81
+msgid ""
+"This assistant will help you to access online directory services\n"
+"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"\n"
+"Adding a new LDAP server requires some specialized information\n"
+"about the server. Please contact your system administrator if you \n"
+"need help finding this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:87
+msgid ""
+"This is the full name of your ldap server. For example, "
+"\"ldap.mycompany.com\"."
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:88
+#, fuzzy
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"\n"
+"too large will slow down your addressbook."
+msgstr ""
+"这是可下载卡片的最大数量。将该数值设定得太大将导致"
+"址本变慢。"
+
+# addressbook/gui/component/addressbook-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:90
+msgid ""
+"This is the method evolution will use to authenticate you. Note that "
+"setting this to \"Email Address\" requires anonymous access to your ldap "
+"server."
+msgstr ""
+"这是 evolution "
+"用来认证您的方法。请注意若在此设定为“电子邮件地址"
+"则需要您具有对 ldap 服务器的匿名访问权限。"
+
+# addressbook/gui/component/addressbook-config.glade.h:22
+# addressbook/gui/component/addressbook-config.glade.h:22
+# addressbook/gui/component/addressbook-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:91
+#, fuzzy
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list.\n"
+"It is for display purposes only. "
+msgstr "这一名称将用于识别您的帐号。它只用于显示。"
+
+#: addressbook/gui/component/ldap-config.glade.h:93
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"\n"
+"list of standard ports has been provided. Ask your system administrator\n"
+"what port you should specify."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:96
+msgid "This option controls how long a search will be run."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:97
+msgid ""
+"To add an attribute to the DN, select it from the list and click the \"Add "
+"Attribute\" button.\n"
+"Any values that you add to the DN will become required values for any new "
+"contacts\n"
+"that you add to the directory on the LDAP server. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:100
+msgid "U_se SSL/TLS:"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:101
+#, fuzzy
+msgid "Using distinguished name (DN)"
+msgstr "识别姓名 (DN)"
+
+# addressbook/gui/component/addressbook-config.glade.h:9
+# addressbook/gui/component/addressbook-config.glade.h:9
+# addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+msgid "Using email address"
+msgstr "电子邮件地址"
+
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+msgid "Whenever Possible"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:24
+# 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:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:24
+# 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:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:31
+# 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:99 my-evolution/my-evolution.glade.h:21
+#: 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:139
+msgid "_Add"
+msgstr "添加(_A)"
+
+# addressbook/gui/component/addressbook-config.glade.h:24
+# 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:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:24
+# 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:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:31
+# 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:99 my-evolution/my-evolution.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "添加(_A)"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "添加动作"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "添加动作"
+
+# calendar/gui/e-calendar-table.etspec.h:3
+# calendar/gui/e-calendar-table.etspec.h:3
+# calendar/gui/e-calendar-table.etspec.h:3
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "提醒"
+
+# ui/evolution-message-composer.xml.h:46
+# ui/evolution-message-composer.xml.h:46
+# ui/evolution-message-composer.xml.h:46
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "全部删除(_D)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "显示(_D)"
+
+# addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:111
+#, fuzzy
+msgid "_Distinguished Name (DN):"
+msgstr "识别姓名 (DN)"
+
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:113
+#, fuzzy
+msgid "_Download limit:"
+msgstr "下载上限(_D)"
+
+# addressbook/gui/component/addressbook-config.glade.h:25
+# ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
+# 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:7 ui/evolution-subscribe.xml.h:10
+# ui/evolution-tasks.xml.h:16
+# addressbook/gui/component/addressbook-config.glade.h:25
+# ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
+# 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:7 ui/evolution-subscribe.xml.h:10
+# ui/evolution-tasks.xml.h:16
+# addressbook/gui/component/addressbook-config.glade.h:34
+# ui/evolution-addressbook.xml.h:35 ui/evolution-calendar.xml.h:39
+# 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: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:152 ui/evolution-addressbook.xml.h:36
+#: 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-tasks.xml.h:17
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+# calendar/gui/alarm-notify/alarm-notify.glade.h:4
+# calendar/gui/alarm-notify/alarm-notify.glade.h:4
+# calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "编辑约会(_E)"
+
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution 提醒"
+
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
+msgstr ""
+
+# calendar/gui/e-meeting-time-sel.c:467
+# calendar/gui/e-meeting-time-sel.c:470
+# calendar/gui/e-meeting-time-sel.c:470
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "选项(_O)"
+
+# addressbook/gui/component/addressbook-config.glade.h:27
+# addressbook/gui/component/addressbook-config.glade.h:27
+# addressbook/gui/component/addressbook-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "端口(_P):"
+
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "默认"
+
+# addressbook/gui/component/addressbook-config.glade.h:12
+# addressbook/gui/component/addressbook-config.glade.h:12
+# addressbook/gui/component/addressbook-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "搜索起点(_B):"
+
+# addressbook/gui/component/addressbook-config.glade.h:28
+# addressbook/gui/component/addressbook-config.glade.h:28
+# addressbook/gui/component/addressbook-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "服务器名(_S):"
+
+# calendar/gui/alarm-notify/alarm-notify.glade.h:3
+# calendar/gui/alarm-notify/alarm-notify.glade.h:3
+# calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "午睡时间(分钟)"
+
+# mail/mail-config.c:326
+# mail/mail-config.c:329
+# mail/mail-config.c:354
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "帐号 %d"
+
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+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/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "没有卡片"
+
+# mail/mail-ops.c:2089
+# mail/mail-ops.c:2091
+# mail/mail-ops.c:2134
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "重新与 %s 连接"
+
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
+msgstr ""
+
+# addressbook/gui/contact-editor/contact-editor.glade.h:16
+# addressbook/gui/contact-editor/contact-editor.glade.h:16
+# addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:133
+#, fuzzy
+msgid "general-tab"
+msgstr "常规"
+
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:135
+msgid "objectclasses-tab"
+msgstr ""
+
+# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1675
+# calendar/gui/e-week-view.c:1182
+# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
+# calendar/gui/e-week-view.c:1184
+# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
+# calendar/gui/e-week-view.c:1188
+#: addressbook/gui/component/ldap-config.glade.h:136
+#, fuzzy
+msgid "searching-tab"
+msgstr "搜索"
+
# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
@@ -1614,11 +2174,10 @@ msgstr "地址簿名称选择界面车间"
# addressbook/gui/component/select-names/e-select-names-popup.c:163
# addressbook/gui/component/select-names/e-select-names.c:830
# composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
-# filter/filter-rule.c:637 shell/e-shortcuts-view.c:180
#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:830
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
-#: filter/filter-rule.c:637 shell/e-shortcuts-view.c:180
+#: 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 shell/e-shortcuts-view.c:180
msgid "Remove"
msgstr "删除"
@@ -1665,10 +2224,18 @@ msgstr "(%d 未显示)"
msgid "Unnamed Contact"
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
+#, 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: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"
@@ -1687,7 +2254,7 @@ msgstr ""
# 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: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"
@@ -1702,49 +2269,67 @@ 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: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:1
-# addressbook/gui/component/select-names/select-names.glade.h:1
-# addressbook/gui/component/select-names/select-names.glade.h:1
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "含有(_O):"
-
-# addressbook/gui/component/select-names/select-names.glade.h:3
-# addressbook/gui/component/select-names/select-names.glade.h:3
-# addressbook/gui/component/select-names/select-names.glade.h:2
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "查找(_I)"
-
# 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
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:1
msgid "Select Names"
msgstr "选择名称"
-# addressbook/gui/component/select-names/select-names.glade.h:5
-# addressbook/gui/component/select-names/select-names.glade.h:5
-# addressbook/gui/component/select-names/select-names.glade.h:4
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "删除联系人?"
+
+# addressbook/gui/component/addressbook-component.c:71
+# calendar/gui/dialogs/comp-editor-util.c:310
+# 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:71
+# calendar/gui/dialogs/comp-editor-util.c:310
+# 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:71
+# calendar/gui/dialogs/comp-editor-util.c:310
+# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+# shell/e-shortcuts.c:1061
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Show Contacts"
+msgstr "联系人"
+
#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr "显示符合以下条件的联系人:"
+msgid ""
+"Type a name into the entry, or\n"
+"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:5
+#: addressbook/gui/component/select-names/select-names.glade.h:7
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:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
msgid "_Folder:"
msgstr "文件夹(_F):"
@@ -1856,13 +2441,6 @@ msgstr ""
msgid "Full _Name..."
msgstr "全名(_N)..."
-# addressbook/gui/contact-editor/contact-editor.glade.h:16
-# addressbook/gui/contact-editor/contact-editor.glade.h:16
-# addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "常规"
-
# addressbook/gui/contact-editor/contact-editor.glade.h:18
# addressbook/gui/contact-editor/contact-editor.glade.h:18
# addressbook/gui/contact-editor/contact-editor.glade.h:18
@@ -1871,7 +2449,9 @@ msgid ""
"If this person publishes free/busy or other calendar information on the "
"Internet, enter the address\n"
"of that information here."
-msgstr "如果此人把忙闲信息或其它日历信息发布到互联网上,就在这里输入发布地址。"
+msgstr ""
+"如果此人把忙闲信息或其它日历信息发布到互联网上,就"
+"这里输入发布地址。"
# addressbook/gui/contact-editor/contact-editor.glade.h:21
# addressbook/gui/contact-editor/contact-editor.glade.h:21
@@ -1949,10 +2529,11 @@ msgstr "愿意接收 HTML 邮件(_H)"
# ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
#: addressbook/gui/contact-editor/contact-editor.glade.h:31
#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1478 mail/mail-config.glade.h:107
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
+#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
+#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
msgid "_Delete"
msgstr "删除(_D)"
@@ -3809,19 +4390,10 @@ msgstr "赞比亚"
msgid "Zimbabwe"
msgstr "津巴布韦"
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "您确定要删除该联系人吗?"
-
# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
msgid "Delete Contact?"
msgstr "删除联系人?"
@@ -3856,7 +4428,7 @@ msgstr "TTY/TDD"
# addressbook/gui/contact-editor/e-contact-editor.c:2287
# addressbook/gui/contact-editor/e-contact-editor.c:2287
# addressbook/gui/contact-editor/e-contact-editor.c:2309
-#: addressbook/gui/contact-editor/e-contact-editor.c:2417
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr "无法为域找到构件:“%s”"
@@ -3882,7 +4454,7 @@ msgstr "完全编辑"
# addressbook/gui/contact-editor/e-contact-quick-add.c:326
# addressbook/gui/widgets/e-addressbook-view.c:961
#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:961
+#: addressbook/gui/widgets/e-addressbook-view.c:336
msgid "Full Name"
msgstr "全名"
@@ -4238,7 +4810,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:238
+#: widgets/misc/e-filter-bar.c:231
msgid "Advanced Search"
msgstr "高级搜索"
@@ -4256,184 +4828,32 @@ 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-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
msgid "No cards"
msgstr "没有卡片"
# addressbook/gui/widgets/e-addressbook-model.c:130
# addressbook/gui/widgets/e-addressbook-model.c:130
# addressbook/gui/widgets/e-addressbook-model.c:130
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
msgid "1 card"
msgstr "1 张卡片"
# addressbook/gui/widgets/e-addressbook-model.c:133
# addressbook/gui/widgets/e-addressbook-model.c:133
# addressbook/gui/widgets/e-addressbook-model.c:133
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
#, c-format
msgid "%d cards"
msgstr "%d 张卡片"
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-# addressbook/gui/widgets/e-addressbook-view.c:671
-# addressbook/gui/widgets/e-addressbook-view.c:733
-# addressbook/gui/widgets/e-addressbook-view.c:1405
-# ui/evolution-addressbook.xml.h:19
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-# addressbook/gui/widgets/e-addressbook-view.c:671
-# addressbook/gui/widgets/e-addressbook-view.c:733
-# addressbook/gui/widgets/e-addressbook-view.c:1405
-# ui/evolution-addressbook.xml.h:19
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:141
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:278
-# addressbook/gui/widgets/e-addressbook-view.c:734
-# addressbook/gui/widgets/e-addressbook-view.c:834
-# addressbook/gui/widgets/e-addressbook-view.c:1516
-# ui/evolution-addressbook.xml.h:19
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:141
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:278
-#: addressbook/gui/widgets/e-addressbook-view.c:734
-#: addressbook/gui/widgets/e-addressbook-view.c:834
-#: addressbook/gui/widgets/e-addressbook-view.c:1516
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
-msgstr "保存为 VCard"
-
-# 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
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:277
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "打开"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-# addressbook/gui/widgets/e-addressbook-view.c:734
-# ui/evolution-addressbook.xml.h:10
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-# addressbook/gui/widgets/e-addressbook-view.c:734
-# ui/evolution-addressbook.xml.h:10
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
-# addressbook/gui/widgets/e-addressbook-view.c:835
-# ui/evolution-addressbook.xml.h:10
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "转发联系人"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-# addressbook/gui/widgets/e-addressbook-view.c:735
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-# addressbook/gui/widgets/e-addressbook-view.c:735
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
-# addressbook/gui/widgets/e-addressbook-view.c:836
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
-#: addressbook/gui/widgets/e-addressbook-view.c:836
-msgid "Send Message to Contact"
-msgstr "给联系人发邮件"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-# addressbook/gui/widgets/e-addressbook-view.c:736
-# 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:2
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-# addressbook/gui/widgets/e-addressbook-view.c:736
-# 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:2
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:281
-# addressbook/gui/widgets/e-addressbook-view.c:837
-# 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:2
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:281
-#: addressbook/gui/widgets/e-addressbook-view.c:837
-#: 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:2
-msgid "Print"
-msgstr "打印"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-# addressbook/gui/widgets/e-addressbook-view.c:738
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-# addressbook/gui/widgets/e-addressbook-view.c:738
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
-# addressbook/gui/widgets/e-addressbook-view.c:839
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
-#: addressbook/gui/widgets/e-addressbook-view.c:839
-msgid "Print Envelope"
-msgstr "打印信封"
-
-# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:285
-# 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-reflow-adapter.c:285
-#: addressbook/gui/widgets/e-addressbook-view.c:841
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
-msgid "Cut"
-msgstr "剪切"
-
-# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
-# ui/evolution-tasks.xml.h:3
-# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
-# ui/evolution-tasks.xml.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:286
-# addressbook/gui/widgets/e-addressbook-view.c:842
-# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
-# ui/evolution-tasks.xml.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:286
-#: addressbook/gui/widgets/e-addressbook-view.c:842
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "复制"
-
-# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
-# 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-reflow-adapter.c:287
-#: addressbook/gui/widgets/e-addressbook-view.c:843
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
-msgid "Paste"
-msgstr "粘贴"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-# addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:8
-# 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
-# ui/evolution-tasks.xml.h:8
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-# addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:8
-# 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
-# ui/evolution-tasks.xml.h:8
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:288
-# addressbook/gui/widgets/e-addressbook-view.c:844 filter/libfilter-i18n.h:9
-# 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-reflow-adapter.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:844 filter/libfilter-i18n.h:9
-#: mail/mail-accounts.c:295 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
-msgid "Delete"
-msgstr "删除"
+# shell/e-shell-importer.c:455
+# shell/e-shell-importer.c:455
+# shell/e-shell-importer.c:466
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+msgid "Error getting book view"
+msgstr "启动 %s 错误"
# addressbook/gui/widgets/e-addressbook-table-adapter.c:140
# addressbook/gui/widgets/e-addressbook-util.c:85
@@ -4445,7 +4865,7 @@ msgstr "删除"
# 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:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
#: addressbook/gui/widgets/e-minicard.c:475
msgid "Error modifying card"
msgstr "修改卡片错误"
@@ -4456,8 +4876,8 @@ msgstr "修改卡片错误"
# shell/evolution-shell-component.c:1007
# addressbook/gui/widgets/e-addressbook-util.c:33
# shell/evolution-shell-component.c:1020
-#: 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:1043
msgid "Success"
msgstr "成功"
@@ -4473,17 +4893,18 @@ msgstr "成功"
# camel/providers/imap/camel-imap-command.c:275
# camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1895
# shell/e-storage.c:528 shell/evolution-shell-component.c:1057
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:36
#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1895
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
+#: camel/providers/imap/camel-imap-command.c:363
+#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
msgid "Unknown error"
msgstr "未知的错误"
# addressbook/gui/widgets/e-addressbook-util.c:35
# addressbook/gui/widgets/e-addressbook-util.c:35
# addressbook/gui/widgets/e-addressbook-util.c:35
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
msgid "Repository offline"
msgstr "仓库离线"
@@ -4493,29 +4914,29 @@ 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: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:1071
msgid "Permission denied"
msgstr "没有权限"
# addressbook/gui/widgets/e-addressbook-util.c:37
# addressbook/gui/widgets/e-addressbook-util.c:37
# addressbook/gui/widgets/e-addressbook-util.c:37
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
msgid "Card not found"
msgstr "找不到卡片"
# addressbook/gui/widgets/e-addressbook-util.c:38
# addressbook/gui/widgets/e-addressbook-util.c:38
# addressbook/gui/widgets/e-addressbook-util.c:38
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
msgid "Card ID already exists"
msgstr "卡片 ID 已经存在"
# addressbook/gui/widgets/e-addressbook-util.c:39
# addressbook/gui/widgets/e-addressbook-util.c:39
# addressbook/gui/widgets/e-addressbook-util.c:39
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
msgid "Protocol not supported"
msgstr "不支持的协议"
@@ -4534,18 +4955,18 @@ msgstr "不支持的协议"
# calendar/gui/dialogs/task-details-page.glade.h:3
# 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:40
+#: addressbook/gui/widgets/e-addressbook-util.c:42
#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
-#: camel/camel-service.c:610 camel/camel-service.c:646
+#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
+#: camel/camel-service.c:653 camel/camel-service.c:721
+#: camel/camel-service.c:764
msgid "Cancelled"
msgstr "已经取消"
# 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:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
msgid "Other error"
msgstr "其它错误"
@@ -4555,7 +4976,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:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
#: calendar/gui/dialogs/save-comp.c:50
msgid "Do you want to save changes?"
msgstr "您希望保存修改吗?"
@@ -4563,28 +4984,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:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
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:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
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:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
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:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
msgid "Error removing list"
msgstr "删除列表错误"
@@ -4594,27 +5016,28 @@ 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:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1389
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
msgid "Error removing card"
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:202
+#: addressbook/gui/widgets/e-addressbook-util.c:204
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:203
+#: addressbook/gui/widgets/e-addressbook-util.c:205
msgid "Display Cards"
msgstr "显示卡片"
# addressbook/gui/widgets/e-addressbook-util.c:207
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:209
#, c-format
msgid ""
"You have requested that %d cards be cards. This will cause %d new windows to "
@@ -4624,132 +5047,388 @@ msgstr ""
"您已经请求 %d 个卡片。这将在您的显示屏上打开\n"
" %d 个新窗口。您真的希望显示所有这些卡片?"
-# addressbook/gui/widgets/e-addressbook-view.c:378
-# addressbook/gui/widgets/e-addressbook-view.c:378
-# addressbook/gui/widgets/e-addressbook-view.c:404
-#. Translators: put here a list of labels you want to see on buttons in
-#. addressbook. You may use any character to separate labels but it must
-#. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:404
-msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+# 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:344
+#, fuzzy
+msgid "Move card to"
+msgstr "没有卡片"
-# addressbook/gui/widgets/e-addressbook-view.c:383
-# addressbook/gui/widgets/e-addressbook-view.c:383
-# addressbook/gui/widgets/e-addressbook-view.c:409
-#. Translators: put here a list of characters that correspond to buttons
-#. in addressbook. You may use any character to separate labels but it
-#. must also be placed at the begining ot the string.
-#. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:409
-msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+# 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:346
+#, fuzzy
+msgid "Copy card to"
+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:349
+#, fuzzy
+msgid "Move cards to"
+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:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "没有卡片"
# addressbook/gui/widgets/e-addressbook-view.c:848
# addressbook/gui/widgets/e-addressbook-view.c:848
# addressbook/gui/widgets/e-addressbook-view.c:959
-#: addressbook/gui/widgets/e-addressbook-view.c:959
+#: addressbook/gui/widgets/e-addressbook-view.c:334
msgid "* Click here to add a contact *"
msgstr "* 点击此处以便添加联系人 *"
# addressbook/gui/widgets/e-addressbook-view.c:852
# addressbook/gui/widgets/e-addressbook-view.c:852
# addressbook/gui/widgets/e-addressbook-view.c:963
-#: addressbook/gui/widgets/e-addressbook-view.c:963
+#: addressbook/gui/widgets/e-addressbook-view.c:338
msgid "Primary Phone"
msgstr "主要电话"
# addressbook/gui/widgets/e-addressbook-view.c:853
# addressbook/gui/widgets/e-addressbook-view.c:853
# addressbook/gui/widgets/e-addressbook-view.c:964
-#: addressbook/gui/widgets/e-addressbook-view.c:964
+#: addressbook/gui/widgets/e-addressbook-view.c:339
msgid "Assistant Phone"
msgstr "辅助电话"
# addressbook/gui/widgets/e-addressbook-view.c:854
# addressbook/gui/widgets/e-addressbook-view.c:854
# addressbook/gui/widgets/e-addressbook-view.c:965
-#: addressbook/gui/widgets/e-addressbook-view.c:965
+#: addressbook/gui/widgets/e-addressbook-view.c:340
msgid "Business Phone"
msgstr "商务电话"
# addressbook/gui/widgets/e-addressbook-view.c:855
# addressbook/gui/widgets/e-addressbook-view.c:855
# addressbook/gui/widgets/e-addressbook-view.c:966
-#: addressbook/gui/widgets/e-addressbook-view.c:966
+#: addressbook/gui/widgets/e-addressbook-view.c:341
msgid "Callback Phone"
msgstr "反馈电话"
# addressbook/gui/widgets/e-addressbook-view.c:856
# addressbook/gui/widgets/e-addressbook-view.c:856
# addressbook/gui/widgets/e-addressbook-view.c:967
-#: addressbook/gui/widgets/e-addressbook-view.c:967
+#: addressbook/gui/widgets/e-addressbook-view.c:342
msgid "Company Phone"
msgstr "公司电话"
# addressbook/gui/widgets/e-addressbook-view.c:857
# addressbook/gui/widgets/e-addressbook-view.c:857
# addressbook/gui/widgets/e-addressbook-view.c:968
-#: addressbook/gui/widgets/e-addressbook-view.c:968
+#: addressbook/gui/widgets/e-addressbook-view.c:343
msgid "Home Phone"
msgstr "家庭电话"
# addressbook/gui/widgets/e-addressbook-view.c:859
# addressbook/gui/widgets/e-addressbook-view.c:859
# addressbook/gui/widgets/e-addressbook-view.c:970
-#: addressbook/gui/widgets/e-addressbook-view.c:970
+#: addressbook/gui/widgets/e-addressbook-view.c:345
msgid "Business Address"
msgstr "商务地址"
# addressbook/gui/widgets/e-addressbook-view.c:860
# addressbook/gui/widgets/e-addressbook-view.c:860
# addressbook/gui/widgets/e-addressbook-view.c:971
-#: addressbook/gui/widgets/e-addressbook-view.c:971
+#: addressbook/gui/widgets/e-addressbook-view.c:346
msgid "Home Address"
msgstr "家庭地址"
# addressbook/gui/widgets/e-addressbook-view.c:861
# addressbook/gui/widgets/e-addressbook-view.c:861
# addressbook/gui/widgets/e-addressbook-view.c:972
-#: addressbook/gui/widgets/e-addressbook-view.c:972
+#: addressbook/gui/widgets/e-addressbook-view.c:347
msgid "Mobile Phone"
msgstr "手机"
# addressbook/gui/widgets/e-addressbook-view.c:862
# addressbook/gui/widgets/e-addressbook-view.c:862
# addressbook/gui/widgets/e-addressbook-view.c:973
-#: addressbook/gui/widgets/e-addressbook-view.c:973
+#: addressbook/gui/widgets/e-addressbook-view.c:348
msgid "Car Phone"
msgstr "汽车电话"
# addressbook/gui/widgets/e-addressbook-view.c:865
# addressbook/gui/widgets/e-addressbook-view.c:865
# addressbook/gui/widgets/e-addressbook-view.c:976
-#: addressbook/gui/widgets/e-addressbook-view.c:976
+#: addressbook/gui/widgets/e-addressbook-view.c:351
msgid "Business Phone 2"
msgstr "商务电话 2"
# addressbook/gui/widgets/e-addressbook-view.c:866
# addressbook/gui/widgets/e-addressbook-view.c:866
# addressbook/gui/widgets/e-addressbook-view.c:977
-#: addressbook/gui/widgets/e-addressbook-view.c:977
+#: addressbook/gui/widgets/e-addressbook-view.c:352
msgid "Home Phone 2"
msgstr "家庭电话 2"
# addressbook/gui/widgets/e-addressbook-view.c:868
# addressbook/gui/widgets/e-addressbook-view.c:868
# addressbook/gui/widgets/e-addressbook-view.c:979
-#: addressbook/gui/widgets/e-addressbook-view.c:979
+#: addressbook/gui/widgets/e-addressbook-view.c:354
msgid "Other Phone"
msgstr "其它电话"
# addressbook/gui/widgets/e-addressbook-view.c:874
# addressbook/gui/widgets/e-addressbook-view.c:874
# addressbook/gui/widgets/e-addressbook-view.c:985
-#: addressbook/gui/widgets/e-addressbook-view.c:985
+#: addressbook/gui/widgets/e-addressbook-view.c:360
msgid "Other Address"
msgstr "其它地址"
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+# addressbook/gui/widgets/e-addressbook-view.c:671
+# addressbook/gui/widgets/e-addressbook-view.c:733
+# addressbook/gui/widgets/e-addressbook-view.c:1405
+# ui/evolution-addressbook.xml.h:19
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+# addressbook/gui/widgets/e-addressbook-view.c:671
+# addressbook/gui/widgets/e-addressbook-view.c:733
+# addressbook/gui/widgets/e-addressbook-view.c:1405
+# ui/evolution-addressbook.xml.h:19
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:141
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:278
+# addressbook/gui/widgets/e-addressbook-view.c:734
+# addressbook/gui/widgets/e-addressbook-view.c:834
+# addressbook/gui/widgets/e-addressbook-view.c:1516
+# ui/evolution-addressbook.xml.h:19
+#: addressbook/gui/widgets/e-addressbook-view.c:699
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "保存为 VCard"
+
+# 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/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "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/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "新建联系人列表"
+
+# ui/evolution.xml.h:39
+# ui/evolution.xml.h:39
+# ui/evolution.xml.h:39
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "转到文件夹(_G)..."
+
+# ui/evolution.xml.h:41
+# ui/evolution.xml.h:41
+# ui/evolution.xml.h:41
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "正在导入(_I)..."
+
+# ui/evolution-addressbook.xml.h:39
+# ui/evolution-addressbook.xml.h:39
+# ui/evolution-addressbook.xml.h:41
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "搜索联系人(_S)"
+
+# ui/evolution-addressbook.xml.h:30
+# ui/evolution-addressbook.xml.h:30
+# ui/evolution-addressbook.xml.h:31
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "地址簿来源(_A)..."
+
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Pilot 设置(_P)..."
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+# addressbook/gui/widgets/e-addressbook-view.c:734
+# ui/evolution-addressbook.xml.h:10
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+# addressbook/gui/widgets/e-addressbook-view.c:734
+# ui/evolution-addressbook.xml.h:10
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
+# addressbook/gui/widgets/e-addressbook-view.c:835
+# ui/evolution-addressbook.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "转发联系人"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+# addressbook/gui/widgets/e-addressbook-view.c:735
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+# addressbook/gui/widgets/e-addressbook-view.c:735
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
+# addressbook/gui/widgets/e-addressbook-view.c:836
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "给联系人发邮件"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+# addressbook/gui/widgets/e-addressbook-view.c:736
+# 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:2
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+# addressbook/gui/widgets/e-addressbook-view.c:736
+# 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:2
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:281
+# addressbook/gui/widgets/e-addressbook-view.c:837
+# 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:2
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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/my-evolution.xml.h:1
+msgid "Print"
+msgstr "打印"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+# addressbook/gui/widgets/e-addressbook-view.c:738
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+# addressbook/gui/widgets/e-addressbook-view.c:738
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
+# addressbook/gui/widgets/e-addressbook-view.c:839
+#: addressbook/gui/widgets/e-addressbook-view.c:893
+msgid "Print Envelope"
+msgstr "打印信封"
+
+# mail/folder-browser.c:1467
+# mail/folder-browser.c:1476
+# mail/folder-browser.c:1477
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "复制到文件夹..."
+
+# mail/folder-browser.c:1466
+# mail/folder-browser.c:1475
+# mail/folder-browser.c:1476
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "移动到文件夹(_M)..."
+
+# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
+# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:285
+# 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:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "剪切"
+
+# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
+# ui/evolution-tasks.xml.h:3
+# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
+# ui/evolution-tasks.xml.h:3
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:286
+# addressbook/gui/widgets/e-addressbook-view.c:842
+# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
+# ui/evolution-tasks.xml.h:3
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "复制"
+
+# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
+# 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:903
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+msgid "Paste"
+msgstr "粘贴"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+# addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:8
+# 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
+# ui/evolution-tasks.xml.h:8
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+# addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:8
+# 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
+# ui/evolution-tasks.xml.h:8
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:288
+# addressbook/gui/widgets/e-addressbook-view.c:844 filter/libfilter-i18n.h:9
+# 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:904 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
+#: 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"
+msgstr "删除"
+
+# widgets/menus/gal-view-menus.c:195
+# widgets/menus/gal-view-menus.c:195
+# widgets/menus/gal-view-menus.c:195
+#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "当前视图(_C)"
+
+# addressbook/gui/widgets/e-addressbook-view.c:378
+# addressbook/gui/widgets/e-addressbook-view.c:378
+# addressbook/gui/widgets/e-addressbook-view.c:404
+#. Minicard view stuff
+#. Translators: put here a list of labels you want to see on buttons in
+#. addressbook. You may use any character to separate labels but it must
+#. also be placed at the begining ot the string
+#: addressbook/gui/widgets/e-addressbook-view.c:940
+msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+
+# addressbook/gui/widgets/e-addressbook-view.c:383
+# addressbook/gui/widgets/e-addressbook-view.c:383
+# addressbook/gui/widgets/e-addressbook-view.c:409
+#. Translators: put here a list of characters that correspond to buttons
+#. in addressbook. You may use any character to separate labels but it
+#. must also be placed at the begining ot the string.
+#. Use lower case letters if possible.
+#: addressbook/gui/widgets/e-addressbook-view.c:945
+msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+
# addressbook/gui/widgets/e-minicard-control.c:185
# addressbook/gui/widgets/e-minicard-control.c:185
# addressbook/gui/widgets/e-minicard-control.c:185
@@ -4775,11 +5454,12 @@ msgstr "保存在地址簿中"
# addressbook/gui/widgets/e-minicard-view.c:150
# addressbook/gui/widgets/e-minicard-view.c:150
# addressbook/gui/widgets/e-minicard-view.c:150
-#: addressbook/gui/widgets/e-minicard-view.c:150
+#: addressbook/gui/widgets/e-minicard-view.c:140
+#, fuzzy
msgid ""
"\n"
"\n"
-"There are no items to show in this view\n"
+"There are no items to show in this view.\n"
"\n"
"Double-click here to create a new Contact."
msgstr ""
@@ -4789,6 +5469,22 @@ msgstr ""
"\n"
"在这里双击以创建新联系人。"
+# addressbook/gui/widgets/e-minicard-view.c:150
+# addressbook/gui/widgets/e-minicard-view.c:150
+# addressbook/gui/widgets/e-minicard-view.c:150
+#: addressbook/gui/widgets/e-minicard-view.c:143
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"本视图中没有可显示的项\n"
+"\n"
+"在这里双击以创建新联系人。"
+
# addressbook/gui/widgets/gal-view-factory-minicard.c:26
# addressbook/gui/widgets/gal-view-factory-minicard.c:26
# addressbook/gui/widgets/gal-view-factory-minicard.c:26
@@ -4948,6 +5644,7 @@ msgstr "包含:"
# addressbook/printing/e-contact-print.glade.h:18
# addressbook/printing/e-contact-print.glade.h:18
#: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
msgid "Landscape"
msgstr "横向"
@@ -4990,6 +5687,7 @@ msgstr "选项"
# addressbook/printing/e-contact-print.glade.h:24
# addressbook/printing/e-contact-print.glade.h:24
#: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
msgid "Orientation"
msgstr "方向"
@@ -5026,7 +5724,9 @@ msgstr "纸张来源:"
# addressbook/printing/e-contact-print.glade.h:29
# addressbook/printing/e-contact-print.glade.h:29
# addressbook/printing/e-contact-print.glade.h:29
+#. Portrait
#: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
msgid "Portrait"
msgstr "纵向"
@@ -5137,9 +5837,8 @@ msgstr "无标题约会"
# calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
# calendar/gui/dialogs/task-details-page.glade.h:6
# calendar/gui/e-calendar-table.c:406 mail/message-list.c:679
-#: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: 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 mail/message-list.c:684
msgid "High"
msgstr "高"
@@ -5155,10 +5854,9 @@ msgstr "高"
# calendar/gui/calendar-model.c:1711
# 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:500 calendar/cal-util/cal-util.c:522
+#: 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:407 mail/message-list.c:678
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
msgid "Normal"
msgstr "中"
@@ -5171,9 +5869,8 @@ msgstr "中"
# calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
# calendar/gui/dialogs/task-details-page.glade.h:8
# calendar/gui/e-calendar-table.c:408 mail/message-list.c:677
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: 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 mail/message-list.c:682
msgid "Low"
msgstr "低"
@@ -5187,9 +5884,8 @@ msgstr "低"
# calendar/gui/dialogs/task-details-page.glade.h:13
# calendar/gui/e-calendar-table.c:409
#. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:518
+#: calendar/cal-util/cal-util.c:520
#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:409
msgid "Undefined"
msgstr "未定义"
@@ -5200,7 +5896,7 @@ msgstr "未定义"
# calendar/conduits/calendar/calendar-conduit.c:1150
# calendar/conduits/todo/todo-conduit.c:770
#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:770
+#: calendar/conduits/todo/todo-conduit.c:835
msgid "Error while communicating with calendar server"
msgstr "在与日历服务器通讯时发生错误"
@@ -5215,14 +5911,22 @@ msgstr "在与日历服务器通讯时发生错误"
msgid "Could not read pilot's Calendar application block"
msgstr "无法读入 Pilot 日历应用程序块"
+# 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/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "优先级(_P):"
+
# calendar/conduits/todo/todo-conduit.c:756
# calendar/conduits/todo/todo-conduit.c:759
# calendar/conduits/todo/todo-conduit.c:756
# calendar/conduits/todo/todo-conduit.c:759
# calendar/conduits/todo/todo-conduit.c:886
# calendar/conduits/todo/todo-conduit.c:889
-#: calendar/conduits/todo/todo-conduit.c:886
-#: calendar/conduits/todo/todo-conduit.c:889
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
msgid "Could not read pilot's ToDo application block"
msgstr "无法读入 Pilot ToDo 应用程序块"
@@ -5240,69 +5944,89 @@ msgstr "显示任务列表的 Bonobo 控制。"
msgid "A sample Bonobo control which displays an calendar."
msgstr "显示日历的示例 Bonobo 控制。"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "日历和任务设置"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Calendar."
+msgstr "Evolution 撰写器车间。"
+
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
msgid "Evolution calendar executive summary component."
msgstr "Evolution 日历实施概要组件。"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
msgid "Evolution calendar iTip/iMip viewer"
msgstr "Evolution 日历 iTip/iMip 查看器"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
msgid "Evolution component for handling the calendar."
msgstr "处理日历的 Evolution 组件。"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
msgid "Factory for the Calendar Summary component."
msgstr "日历概要组件车间。"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
msgid "Factory for the Evolution Tasks control"
msgstr "Evolution 任务控制车间"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
msgid "Factory for the calendar iTip view control"
msgstr "日历 iTip 视图控制车间"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
msgid "Factory for the sample Calendar control"
msgstr "日历控制示例车间"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
msgid "Factory to centralize calendar component editor dialogs"
msgstr "日历组件编辑器对话框集中车间"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
msgid "Factory to create a component editor factory"
msgstr "创建组件编辑车间的车间"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+msgid "This page can be used to configure Calendar and Task preferences"
+msgstr ""
+
# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
@@ -5317,20 +6041,6 @@ msgstr "提醒服务"
msgid "Factory for the alarm notification service"
msgstr "提醒服务车间"
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-msgid "Starting:"
-msgstr "开始:"
-
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-msgid "Ending:"
-msgstr "结束:"
-
# calendar/gui/alarm-notify/alarm-notify-dialog.c:231
# calendar/gui/alarm-notify/alarm-notify-dialog.c:231
# calendar/gui/alarm-notify/alarm-notify-dialog.c:231
@@ -5338,13 +6048,6 @@ msgstr "结束:"
msgid "invalid time"
msgstr "无效时间"
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-msgid "Evolution Alarm"
-msgstr "Evolution 提醒"
-
# calendar/gui/alarm-notify/alarm-notify-dialog.c:371
# calendar/gui/alarm-notify/alarm-notify-dialog.c:371
# calendar/gui/alarm-notify/alarm-notify-dialog.c:371
@@ -5413,7 +6116,7 @@ msgstr ""
# 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:426 mail/mail-callbacks.c:2297
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
#: widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr "警告"
@@ -5431,7 +6134,8 @@ msgid ""
"\n"
"Are you sure you want to run this program?"
msgstr ""
-"Evolution 日历提示器将要触发。该提示器被配置为运行以下程序:\n"
+"Evolution "
+"日历提示器将要触发。该提示器被配置为运行以下程序:\n"
"\n"
" %s\n"
"\n"
@@ -5447,7 +6151,7 @@ msgstr "不要再次询问该问题。"
# calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
# calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
# calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
msgid "Could not initialize GNOME"
msgstr "无法初始化 GNOME"
@@ -5468,35 +6172,35 @@ msgstr "无法创建提醒服务车间"
# calendar/gui/cal-search-bar.c:56
# calendar/gui/cal-search-bar.c:56
# calendar/gui/cal-search-bar.c:56
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:50
msgid "Summary contains"
msgstr "概要含有"
# calendar/gui/cal-search-bar.c:57
# calendar/gui/cal-search-bar.c:57
# calendar/gui/cal-search-bar.c:57
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:51
msgid "Description contains"
msgstr "描述含有"
# calendar/gui/cal-search-bar.c:58
# calendar/gui/cal-search-bar.c:58
# calendar/gui/cal-search-bar.c:58
-#: calendar/gui/cal-search-bar.c:58
+#: calendar/gui/cal-search-bar.c:52
msgid "Comment contains"
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:416 mail/mail-ops.c:1117
+#: calendar/gui/cal-search-bar.c:386
msgid "Unmatched"
msgstr "未匹配"
# calendar/gui/calendar-commands.c:446
# calendar/gui/calendar-commands.c:446
# calendar/gui/calendar-commands.c:446
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/calendar-commands.c:405
msgid "%A %d %B %Y"
msgstr "%Y %B %d %A"
@@ -5508,8 +6212,8 @@ msgstr "%Y %B %d %A"
# calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:333
#. 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:449 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:333
+#: 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
msgid "%a %d %b"
msgstr "%b %d %a"
@@ -5519,8 +6223,8 @@ msgstr "%b %d %a"
# 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
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
msgid "%a %d %b %Y"
msgstr "%Y %b %d %a"
@@ -5530,8 +6234,8 @@ msgstr "%Y %b %d %a"
# calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
# calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
# calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
-#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
-#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
+#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
msgid "%d %B %Y"
msgstr "%Y %B %d"
@@ -5544,15 +6248,15 @@ msgstr "%Y %B %d"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:474
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
+#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
msgid "%d %B"
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:820
+#: calendar/gui/calendar-commands.c:800
msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
@@ -5564,7 +6268,6 @@ msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
# 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/e-calendar-table.c:385
msgid "Private"
msgstr "保密"
@@ -5575,14 +6278,13 @@ msgstr "保密"
# 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/e-calendar-table.c:386
msgid "Confidential"
msgstr "机密"
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:424
msgid "Public"
msgstr "公开"
@@ -5621,7 +6323,6 @@ msgstr "西"
# 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/e-calendar-table.c:458
msgid "Free"
msgstr "放假"
@@ -5634,9 +6335,8 @@ msgstr "放假"
# calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
# calendar/gui/e-meeting-time-sel.c:432
# shell/evolution-shell-component.c:1042
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
-#: calendar/gui/e-meeting-time-sel.c:432
-#: shell/evolution-shell-component.c:1042
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
msgid "Busy"
msgstr "繁忙"
@@ -5651,7 +6351,6 @@ msgstr "繁忙"
# 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/e-calendar-table.c:479 calendar/gui/print.c:2246
msgid "Not Started"
msgstr "尚未开始"
@@ -5666,7 +6365,6 @@ msgstr "尚未开始"
# 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/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
msgid "In Progress"
msgstr "正在进行中"
@@ -5684,8 +6382,7 @@ msgstr "正在进行中"
# 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/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/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
msgid "Completed"
msgstr "已完成"
@@ -5725,9 +6422,10 @@ msgstr ""
# 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:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1496
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:404
-#: mail/mail-config.glade.h:56
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
+#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
+#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
+#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
#: 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
@@ -5757,9 +6455,8 @@ 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: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:298
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
msgid "Yes"
msgstr "是"
@@ -5769,23 +6466,10 @@ 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:313
-#: calendar/gui/e-meeting-model.c:811
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
msgid "No"
msgstr "否"
-# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1675
-# calendar/gui/e-week-view.c:1182
-# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-# calendar/gui/e-week-view.c:1184
-# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-# calendar/gui/e-week-view.c:1188
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-#: calendar/gui/e-week-view.c:1188
-msgid "Searching"
-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
@@ -5820,15 +6504,15 @@ 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/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:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
msgid "Calendar"
msgstr "日历"
# calendar/gui/component-factory.c:64
# calendar/gui/component-factory.c:64
# calendar/gui/component-factory.c:64
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
msgid "Folder containing appointments and events"
msgstr "文件夹含有约会和事件"
@@ -5844,9 +6528,10 @@ 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: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
+#: calendar/gui/component-factory.c:72 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-shortcuts.c:1039
#: views/tasks/galview.xml.h:1
msgid "Tasks"
msgstr "任务"
@@ -5854,49 +6539,102 @@ msgstr "任务"
# calendar/gui/component-factory.c:69
# calendar/gui/component-factory.c:69
# calendar/gui/component-factory.c:69
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
msgid "Folder containing to-do items"
msgstr "文件夹含有 to-do 项"
-# 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:642 ui/evolution-calendar.xml.h:7
-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:695
+#, fuzzy
+msgid "New meeting"
+msgstr "新闻来源设置"
+
+# calendar/gui/dialogs/event-editor.c:207
+# calendar/gui/dialogs/event-editor.c:263
+# calendar/gui/dialogs/event-editor.c:366
+# calendar/gui/dialogs/event-editor.c:207
+# calendar/gui/dialogs/event-editor.c:263
+# calendar/gui/dialogs/event-editor.c:366
+# 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:695
+#, fuzzy
+msgid "_Meeting"
+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:699
+#, fuzzy
+msgid "New task"
+msgstr "新建任务"
+
+# ui/evolution-tasks.xml.h:18
+# ui/evolution-tasks.xml.h:18
+# ui/evolution-tasks.xml.h:22
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "任务(_T)"
+
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+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:643 calendar/gui/e-day-view.c:3525
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
msgstr "新建约会(_A)"
-# 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:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:6
-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:707
+#, fuzzy
+msgid "New appointment"
+msgstr "新建约会"
-# calendar/gui/component-factory.c:649
-# calendar/gui/component-factory.c:649
-# calendar/gui/component-factory.c:649
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "新建任务(_T)"
+# 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:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "约会"
+
+# calendar/gui/gnome-cal.c:1499
+# calendar/gui/gnome-cal.c:1499
+# calendar/gui/gnome-cal.c:1493
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "无法打开“%s”中的文件夹"
# calendar/gui/control-factory.c:127
# calendar/gui/control-factory.c:127
# calendar/gui/control-factory.c:127
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:167
msgid "The URI that the calendar will display"
msgstr "日历将显示的 URI"
+# ui/evolution.xml.h:3
+# ui/evolution.xml.h:3
+# executive-summary/component/e-summary-url.c:72
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "将视图改变为 %s"
+
# calendar/gui/dialogs/alarm-options.c:359
# calendar/gui/dialogs/alarm-options.c:359
# calendar/gui/dialogs/alarm-options.c:359
@@ -5975,8 +6713,8 @@ msgid ""
"This is an email reminder, but Evolution does not yet support this kind of "
"reminders. You will not be able to edit the options for this reminder."
msgstr ""
-"这是电子邮件提示器,但 Evolution 尚不支持这类提示器。您无法为该提示器编辑选"
-"项。"
+"这是电子邮件提示器,但 Evolution "
+"尚不支持这类提示器。您无法为该提示器编辑选项。"
# calendar/gui/dialogs/alarm-options.glade.h:7
# calendar/gui/dialogs/alarm-options.glade.h:7
@@ -6010,10 +6748,7 @@ 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
-# filter/filter-datespec.c:85
-#: calendar/gui/dialogs/alarm-options.glade.h:11
-#: executive-summary/test-service/rdf-summary.c:806
-#: filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
msgid "minutes"
msgstr "分钟"
@@ -6243,7 +6978,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:748 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "概要:"
@@ -6296,7 +7031,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:131
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
msgid "minute(s)"
msgstr "分钟"
@@ -6363,49 +7098,35 @@ msgstr "被延误任务的颜色"
msgid "Color for tasks due today"
msgstr "今天到期任务的颜色"
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "用默认提醒器创建新约会(_R)"
-
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
msgid "Days"
msgstr "天数"
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "每周的第一天(_K):"
-
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
# calendar/gui/dialogs/recurrence-page.c:963
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
# calendar/gui/dialogs/recurrence-page.c:963
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
# calendar/gui/dialogs/recurrence-page.c:963
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
msgid "Friday"
msgstr "星期五"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
msgid "Hours"
msgstr "小时"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
msgid "Minutes"
msgstr "分钟"
@@ -6415,54 +7136,44 @@ msgstr "分钟"
# calendar/gui/dialogs/recurrence-page.c:959
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
# calendar/gui/dialogs/recurrence-page.c:959
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
msgid "Monday"
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
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "被延误的任务(_V):"
-
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
# calendar/gui/dialogs/recurrence-page.c:964
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
# calendar/gui/dialogs/recurrence-page.c:964
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
# calendar/gui/dialogs/recurrence-page.c:964
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
msgid "Saturday"
msgstr "星期六"
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
-msgstr "在周视图和月视图中显示约会结束时间(_E)"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
msgid "Show week _numbers in date navigator"
msgstr "在日期浏览器中显示周数(_N)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
msgid "Sta_rt of day:"
msgstr "每天的开始(_R):"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
msgid "Su_n"
msgstr "星期日(_N)"
@@ -6472,31 +7183,40 @@ msgstr "星期日(_N)"
# calendar/gui/dialogs/recurrence-page.c:965
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
# calendar/gui/dialogs/recurrence-page.c:965
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
msgid "Sunday"
msgstr "星期日"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "今天到期的任务(_K):"
+
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
msgid "T_hu"
msgstr "星期四(_H)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
msgid "T_ue"
msgstr "星期二(_U)"
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "今天到期的任务(_K):"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "任务列表(_T)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
# calendar/gui/dialogs/recurrence-page.c:962
@@ -6504,36 +7224,29 @@ msgstr "今天到期的任务(_K):"
# calendar/gui/dialogs/recurrence-page.c:962
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
# calendar/gui/dialogs/recurrence-page.c:962
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:962
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:1124
msgid "Thursday"
msgstr "星期四"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
msgid "Time"
msgstr "时间"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
msgid "Time _zone:"
msgstr "时区(_Z):"
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "时间分割(_V):"
-
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
msgid "Time format:"
msgstr "时间格式:"
@@ -6543,8 +7256,8 @@ msgstr "时间格式:"
# calendar/gui/dialogs/recurrence-page.c:960
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
# calendar/gui/dialogs/recurrence-page.c:960
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:960
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/recurrence-page.c:1122
msgid "Tuesday"
msgstr "星期二"
@@ -6554,8 +7267,8 @@ msgstr "星期二"
# calendar/gui/dialogs/recurrence-page.c:961
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
# calendar/gui/dialogs/recurrence-page.c:961
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/recurrence-page.c:1123
msgid "Wednesday"
msgstr "星期三"
@@ -6565,113 +7278,124 @@ msgstr "星期三"
# ui/evolution-calendar.xml.h:33
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
# ui/evolution-calendar.xml.h:33
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
msgid "Work Week"
msgstr "一周工作日"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
msgid "_12 hour (AM/PM)"
msgstr "12 小时 (AM/PM) (_1)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
msgid "_24 hour"
msgstr "24 小时(_2)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
msgid "_Ask for confirmation when deleting items"
msgstr "删除项时要求确认(_A)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
msgid "_Compress weekends in month view"
msgstr "不在月视图中显示周末(_C)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
msgid "_Display"
msgstr "显示(_D)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
msgid "_End of day:"
msgstr "每天的结束(_E):"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
msgid "_Fri"
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:41
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
msgid "_General"
msgstr "常规(_G)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
msgid "_Hide completed tasks after"
msgstr "随后隐藏已完成的任务(_H)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
msgid "_Mon"
msgstr "星期一(_M)"
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "其它(_O)"
+# 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
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "被延误的任务(_V):"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
msgid "_Sat"
msgstr "星期六(_S)"
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "任务列表(_T)"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Show appointment end times in week and month views"
+msgstr "在周视图和月视图中显示约会结束时间(_E)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "时间分割(_V):"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
msgid "_Wed"
msgstr "星期三(_W)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
msgid "before the start of the appointment"
msgstr "在约会开始以前"
@@ -6780,56 +7504,56 @@ msgstr "%s 您还没有进行修改,更新编辑器?"
# calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
# calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
# calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
msgid " to "
msgstr " 到 "
# calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
# calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
# calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
msgid " (Completed "
msgstr " (完成 "
# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
msgid "Completed "
msgstr "已完成 "
# calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
# calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
# calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
msgid " (Due "
msgstr " (预定 "
# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
msgid "Due "
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:321
+#: calendar/gui/dialogs/comp-editor.c:322
msgid "Could not update object!"
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:692
+#: calendar/gui/dialogs/comp-editor.c:693
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:697
+#: calendar/gui/dialogs/comp-editor.c:698
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
@@ -6837,7 +7561,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:700
+#: calendar/gui/dialogs/comp-editor.c:701
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
@@ -6845,7 +7569,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:703
+#: calendar/gui/dialogs/comp-editor.c:704
#, c-format
msgid "Journal entry - %s"
msgstr "日志条目 - %s"
@@ -6853,51 +7577,23 @@ 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:717
+#: calendar/gui/dialogs/comp-editor.c:718
msgid "No summary"
msgstr "没有概要"
-# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1908
-# mail/mail-display.c:102
-# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:2027
-# mail/mail-display.c:102
-# calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
-# mail/mail-display.c:101
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2077
-#: mail/mail-display.c:101
-msgid "Overwrite file?"
-msgstr "覆盖文件?"
-
-# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1915
-# mail/mail-display.c:106
-# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:2034
-# mail/mail-display.c:106
-# calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2070
-# mail/mail-display.c:105
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2084
-#: mail/mail-display.c:105
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"指定名称的文件已经存在。\n"
-"覆盖它?"
-
-# calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-# widgets/misc/e-filter-bar.h:101
-# calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-# widgets/misc/e-filter-bar.h:101
-# calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-# widgets/misc/e-filter-bar.h:101
-#: calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+# composer/e-msg-composer.c:943
+# composer/e-msg-composer.c:947
+# composer/e-msg-composer.c:912
+#: calendar/gui/dialogs/comp-editor.c:1074
+#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+msgid "Save as..."
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:1277
+#: calendar/gui/dialogs/comp-editor.c:1226
msgid "Unable to obtain current version!"
msgstr "无法获取当前版本!"
@@ -6994,7 +7690,7 @@ 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/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
msgid "Appointment"
msgstr "约会"
@@ -7023,7 +7719,7 @@ msgstr "再次发生"
# calendar/gui/dialogs/event-editor.c:363
#: calendar/gui/dialogs/event-editor.c:202
#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:363
+#: calendar/gui/dialogs/event-editor.c:365
msgid "Scheduling"
msgstr "正在调度"
@@ -7038,7 +7734,7 @@ msgstr "正在调度"
# calendar/gui/dialogs/event-editor.c:366
#: calendar/gui/dialogs/event-editor.c:207
#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:366
+#: calendar/gui/dialogs/event-editor.c:368
msgid "Meeting"
msgstr "会见"
@@ -7136,7 +7832,7 @@ msgstr "公开的(_B)"
# calendar/gui/dialogs/event-page.glade.h:11
# calendar/gui/e-calendar-table.etspec.h:13
#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
msgid "Show Time As"
msgstr "按其显示时间"
@@ -7215,25 +7911,14 @@ msgstr "授权于(_D)..."
msgid "Attendee"
msgstr "出席者"
-# calendar/gui/dialogs/meeting-page.etspec.h:2
-# calendar/gui/e-meeting-time-sel.etspec.h:2
-# calendar/gui/dialogs/meeting-page.etspec.h:2
-# calendar/gui/e-meeting-time-sel.etspec.h:2
-# calendar/gui/dialogs/meeting-page.etspec.h:2
-# calendar/gui/e-meeting-time-sel.etspec.h:2
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "点击此处添加出席者"
-
# calendar/gui/dialogs/meeting-page.etspec.h:3
# calendar/gui/e-meeting-time-sel.etspec.h:3
# calendar/gui/dialogs/meeting-page.etspec.h:3
# calendar/gui/e-meeting-time-sel.etspec.h:3
# calendar/gui/dialogs/meeting-page.etspec.h:3
# calendar/gui/e-meeting-time-sel.etspec.h:3
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
msgid "Common Name"
msgstr "通用名"
@@ -7243,8 +7928,8 @@ msgstr "通用名"
# calendar/gui/e-meeting-time-sel.etspec.h:4
# calendar/gui/dialogs/meeting-page.etspec.h:4
# calendar/gui/e-meeting-time-sel.etspec.h:4
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
msgid "Delegated From"
msgstr "来自...的代表"
@@ -7254,8 +7939,8 @@ msgstr "来自...的代表"
# calendar/gui/e-meeting-time-sel.etspec.h:5
# calendar/gui/dialogs/meeting-page.etspec.h:5
# calendar/gui/e-meeting-time-sel.etspec.h:5
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
msgid "Delegated To"
msgstr "授权于"
@@ -7265,8 +7950,8 @@ msgstr "授权于"
# calendar/gui/e-meeting-time-sel.etspec.h:6
# calendar/gui/dialogs/meeting-page.etspec.h:6
# calendar/gui/e-meeting-time-sel.etspec.h:6
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
msgid "Language"
msgstr "语言"
@@ -7276,8 +7961,8 @@ msgstr "语言"
# calendar/gui/e-meeting-time-sel.etspec.h:7
# calendar/gui/dialogs/meeting-page.etspec.h:7
# calendar/gui/e-meeting-time-sel.etspec.h:7
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
msgid "Member"
msgstr "成员"
@@ -7290,9 +7975,8 @@ msgstr "成员"
# calendar/gui/dialogs/meeting-page.etspec.h:8
# 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:843
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
msgid "RSVP"
msgstr "RSVP"
@@ -7302,8 +7986,8 @@ msgstr "RSVP"
# calendar/gui/e-meeting-time-sel.etspec.h:9
# calendar/gui/dialogs/meeting-page.etspec.h:9
# calendar/gui/e-meeting-time-sel.etspec.h:9
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "Role"
msgstr "角色"
@@ -7319,10 +8003,10 @@ msgstr "角色"
# calendar/gui/e-calendar-table.etspec.h:15
# calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:47
# 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:47
-#: mail/message-list.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
+#: mail/message-list.etspec.h:11
msgid "Status"
msgstr "状态"
@@ -7338,9 +8022,9 @@ msgstr "状态"
# calendar/gui/e-calendar-table.etspec.h:18
# calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:94
# shell/glade/e-active-connection-dialog.glade.h:5
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:95
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
#: shell/glade/e-active-connection-dialog.glade.h:5
msgid "Type"
msgstr "类型"
@@ -7370,7 +8054,7 @@ msgstr "改变组织者(_C)"
# calendar/gui/dialogs/meeting-page.glade.h:4
# calendar/gui/e-meeting-time-sel.c:450
#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:450
+#: calendar/gui/e-meeting-time-sel.c:453
msgid "_Invite Others..."
msgstr "邀请其他人(_I)..."
@@ -7381,45 +8065,158 @@ msgstr "邀请其他人(_I)..."
msgid "_Other Organizer"
msgstr "其他组织者(_O)"
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+#: calendar/gui/dialogs/recurrence-page.c:126
+#: calendar/gui/dialogs/recurrence-page.c:146
+#: calendar/gui/dialogs/recurrence-page.c:156
+#, fuzzy
+msgid "st"
+msgstr "一号"
+
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "二号"
+
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+#, fuzzy
+msgid "rd"
+msgstr "三号"
+
+# calendar/gui/dialogs/recurrence-page.c:1096
+# calendar/gui/dialogs/recurrence-page.c:1096
+# calendar/gui/dialogs/recurrence-page.c:1096
+#: calendar/gui/dialogs/recurrence-page.c:129
+#: calendar/gui/dialogs/recurrence-page.c:130
+#: calendar/gui/dialogs/recurrence-page.c:131
+#: calendar/gui/dialogs/recurrence-page.c:132
+#: calendar/gui/dialogs/recurrence-page.c:133
+#: calendar/gui/dialogs/recurrence-page.c:134
+#: calendar/gui/dialogs/recurrence-page.c:135
+#: calendar/gui/dialogs/recurrence-page.c:136
+#: calendar/gui/dialogs/recurrence-page.c:137
+#: calendar/gui/dialogs/recurrence-page.c:138
+#: calendar/gui/dialogs/recurrence-page.c:139
+#: calendar/gui/dialogs/recurrence-page.c:140
+#: calendar/gui/dialogs/recurrence-page.c:141
+#: calendar/gui/dialogs/recurrence-page.c:142
+#: calendar/gui/dialogs/recurrence-page.c:143
+#: calendar/gui/dialogs/recurrence-page.c:144
+#: calendar/gui/dialogs/recurrence-page.c:145
+#: calendar/gui/dialogs/recurrence-page.c:149
+#: calendar/gui/dialogs/recurrence-page.c:150
+#: calendar/gui/dialogs/recurrence-page.c:151
+#: calendar/gui/dialogs/recurrence-page.c:152
+#: calendar/gui/dialogs/recurrence-page.c:153
+#: calendar/gui/dialogs/recurrence-page.c:154
+#: calendar/gui/dialogs/recurrence-page.c:155
+msgid "th"
+msgstr ""
+
# calendar/gui/dialogs/recurrence-page.c:571
# calendar/gui/dialogs/recurrence-page.c:571
# calendar/gui/dialogs/recurrence-page.c:571
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: calendar/gui/dialogs/recurrence-page.c:629
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "该约会含有 Evolution 无法编辑的循环。"
# calendar/gui/dialogs/recurrence-page.c:932
# calendar/gui/dialogs/recurrence-page.c:932
# calendar/gui/dialogs/recurrence-page.c:932
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
msgid "on"
msgstr "在"
+# addressbook/gui/contact-editor/e-contact-save-as.c:170
+# addressbook/gui/contact-editor/e-contact-save-as.c:170
+# addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "列表"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "秒"
+
+# addressbook/backend/ebook/e-card-simple.c:79
+# addressbook/backend/ebook/e-card-simple.c:85
+# addressbook/gui/contact-editor/e-contact-editor.c:1656
+# addressbook/gui/contact-editor/e-contact-editor.c:1714
+# mail/mail-config.glade.h:49
+# addressbook/backend/ebook/e-card-simple.c:79
+# addressbook/backend/ebook/e-card-simple.c:85
+# addressbook/gui/contact-editor/e-contact-editor.c:1656
+# addressbook/gui/contact-editor/e-contact-editor.c:1714
+# mail/mail-config.glade.h:49
+# addressbook/backend/ebook/e-card-simple.c:79
+# addressbook/backend/ebook/e-card-simple.c:85
+# addressbook/gui/contact-editor/e-contact-editor.c:1656
+# addressbook/gui/contact-editor/e-contact-editor.c:1714
+# mail/mail-config.glade.h:57
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "其它"
+
+# my-evolution/metar.c:64
+# my-evolution/metar.c:64
+# my-evolution/metar.c:64
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "北"
+
+# addressbook/gui/contact-editor/e-contact-save-as.c:170
+# addressbook/gui/contact-editor/e-contact-save-as.c:170
+# addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "列表"
+
+# addressbook/backend/ebook/e-card-simple.c:80
+# addressbook/gui/contact-editor/e-contact-editor.c:1657
+# addressbook/gui/widgets/e-addressbook-view.c:869
+# addressbook/backend/ebook/e-card-simple.c:80
+# addressbook/gui/contact-editor/e-contact-editor.c:1657
+# addressbook/gui/widgets/e-addressbook-view.c:869
+# addressbook/backend/ebook/e-card-simple.c:80
+# addressbook/gui/contact-editor/e-contact-editor.c:1657
+# addressbook/gui/widgets/e-addressbook-view.c:980
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+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:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
msgid "day"
msgstr "天"
# calendar/gui/dialogs/recurrence-page.c:1088
# calendar/gui/dialogs/recurrence-page.c:1088
# calendar/gui/dialogs/recurrence-page.c:1088
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
msgid "on the"
msgstr "在"
-# calendar/gui/dialogs/recurrence-page.c:1096
-# calendar/gui/dialogs/recurrence-page.c:1096
-# calendar/gui/dialogs/recurrence-page.c:1096
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
-msgstr ""
-
# calendar/gui/dialogs/recurrence-page.c:1269
# calendar/gui/dialogs/recurrence-page.c:1269
# calendar/gui/dialogs/recurrence-page.c:1269
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
msgid "occurrences"
msgstr "循环"
@@ -7589,7 +8386,7 @@ msgstr "进度"
# 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:966
+#: my-evolution/e-summary-preferences.c:740
msgid "URL:"
msgstr "URL:"
@@ -7607,6 +8404,16 @@ msgstr "优先级(_P):"
msgid "_Status:"
msgstr "状态(_S):"
+# addressbook/gui/component/addressbook-config.glade.h:7
+# calendar/gui/dialogs/task-editor.c:178
+# addressbook/gui/component/addressbook-config.glade.h:7
+# calendar/gui/dialogs/task-editor.c:178
+# addressbook/gui/component/addressbook-config.glade.h:9
+# calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "基本"
+
# calendar/gui/dialogs/task-editor.c:190
# calendar/gui/dialogs/task-editor.c:227
# calendar/gui/dialogs/task-editor.c:322
@@ -7618,7 +8425,7 @@ msgstr "状态(_S):"
# calendar/gui/dialogs/task-editor.c:322
#: calendar/gui/dialogs/task-editor.c:190
#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:322
+#: calendar/gui/dialogs/task-editor.c:324
msgid "Assignment"
msgstr "分派"
@@ -7631,9 +8438,9 @@ 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:791
+#: calendar/gui/dialogs/task-page.glade.h:5
#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:32
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
msgid "Description:"
msgstr "描述:"
@@ -7651,102 +8458,14 @@ msgstr "开始日期(_R):"
msgid "_Due Date:"
msgstr "到期日期(_D):"
-# calendar/gui/e-calendar-table.c:427
-# calendar/gui/e-calendar-table.c:427
-# calendar/gui/e-calendar-table.c:428
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-# calendar/gui/e-calendar-table.c:428
-# calendar/gui/e-calendar-table.c:428
-# calendar/gui/e-calendar-table.c:429
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-# calendar/gui/e-calendar-table.c:429
-# calendar/gui/e-calendar-table.c:429
-# calendar/gui/e-calendar-table.c:430
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-# calendar/gui/e-calendar-table.c:430
-# calendar/gui/e-calendar-table.c:430
-# calendar/gui/e-calendar-table.c:431
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-# calendar/gui/e-calendar-table.c:431
-# calendar/gui/e-calendar-table.c:431
-# calendar/gui/e-calendar-table.c:432
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-# calendar/gui/e-calendar-table.c:432
-# calendar/gui/e-calendar-table.c:432
-# calendar/gui/e-calendar-table.c:433
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-# calendar/gui/e-calendar-table.c:433
-# calendar/gui/e-calendar-table.c:433
-# calendar/gui/e-calendar-table.c:434
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-# calendar/gui/e-calendar-table.c:434
-# calendar/gui/e-calendar-table.c:434
-# calendar/gui/e-calendar-table.c:435
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-# calendar/gui/e-calendar-table.c:435
-# calendar/gui/e-calendar-table.c:435
-# calendar/gui/e-calendar-table.c:436
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-# calendar/gui/e-calendar-table.c:436
-# calendar/gui/e-calendar-table.c:436
-# calendar/gui/e-calendar-table.c:437
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-# calendar/gui/e-calendar-table.c:437
-# calendar/gui/e-calendar-table.c:437
-# calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-calendar-table.c:438
-#, c-format
-msgid "100%"
-msgstr "100%"
-
# calendar/gui/e-calendar-table.c:722 calendar/gui/e-day-view.c:2724
# calendar/gui/e-week-view.c:1822
# calendar/gui/e-calendar-table.c:722 calendar/gui/e-day-view.c:2726
# 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:741 calendar/gui/e-day-view.c:2726
-#: calendar/gui/e-week-view.c:1828
+#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-week-view.c:1853
msgid "Deleting selected objects"
msgstr "删除选中的对象"
@@ -7759,12 +8478,37 @@ 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: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:972 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
+#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
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:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "另存为..."
+
+# ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
+# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:103
+# ui/my-evolution.xml.h:7
+# ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
+# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:103
+# ui/my-evolution.xml.h:7
+# 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:974 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
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+msgid "_Print..."
+msgstr "打印(_P)..."
+
# calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3553
# calendar/gui/e-week-view.c:3431 ui/evolution-addressbook.xml.h:1
# ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
@@ -7774,8 +8518,8 @@ msgstr "打开(_O)"
# 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:964 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3441 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "剪切(_U)"
@@ -7792,10 +8536,10 @@ 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:966 calendar/gui/e-day-view.c:3557
-#: 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:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:15
msgid "_Copy"
msgstr "复制(_C)"
@@ -7814,39 +8558,49 @@ 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:968 calendar/gui/e-day-view.c:3532
-#: calendar/gui/e-day-view.c:3559 calendar/gui/e-week-view.c:3419
-#: 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:980 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
+#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:19
msgid "_Paste"
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:984
+#, fuzzy
+msgid "_Assign Task"
+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:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+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:973
+#: calendar/gui/e-calendar-table.c:986
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
-# calendar/gui/e-calendar-table.c:956
-# calendar/gui/e-calendar-table.c:956
-# calendar/gui/e-calendar-table.c:975
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "删除该任务(_D)"
-
# 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:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
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:980
+#: calendar/gui/e-calendar-table.c:992
msgid "_Delete Selected Tasks"
msgstr "删除选定的任务(_D)"
@@ -7856,8 +8610,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:1164 calendar/gui/e-day-view.c:7137
-#: calendar/gui/e-week-view.c:3928
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
msgid "Updating objects"
msgstr "更新对象"
@@ -7867,8 +8621,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:1247
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
msgid "Click to add a task"
msgstr "点击以添加任务"
@@ -7885,50 +8638,50 @@ 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:924
-#: camel/camel-filter-driver.c:1026
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
msgid "Complete"
msgstr "完成"
# 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-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
msgid "Completion Date"
msgstr "完成日期"
# calendar/gui/e-calendar-table.etspec.h:9
# calendar/gui/e-calendar-table.etspec.h:9
# calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
msgid "Due Date"
msgstr "约定日期"
# calendar/gui/e-calendar-table.etspec.h:10
# calendar/gui/e-calendar-table.etspec.h:10
# calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
msgid "End Date"
msgstr "结束日期"
# calendar/gui/e-calendar-table.etspec.h:11
# calendar/gui/e-calendar-table.etspec.h:11
# calendar/gui/e-calendar-table.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
msgid "Geographical Position"
msgstr "地理位置"
# calendar/gui/e-calendar-table.etspec.h:12
# calendar/gui/e-calendar-table.etspec.h:12
# calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
msgid "Priority"
msgstr "优先级"
# calendar/gui/e-calendar-table.etspec.h:14
# calendar/gui/e-calendar-table.etspec.h:14
# calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
msgid "Start Date"
msgstr "开始日期"
@@ -7943,23 +8696,22 @@ msgstr "开始日期"
# 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:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
msgid "Summary"
msgstr "概要"
# calendar/gui/e-calendar-table.etspec.h:17
# calendar/gui/e-calendar-table.etspec.h:17
# calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
msgid "Task sort"
msgstr "任务排序"
# calendar/gui/e-calendar-table.etspec.h:19
# calendar/gui/e-calendar-table.etspec.h:19
# calendar/gui/e-calendar-table.etspec.h:19
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
msgid "URL"
msgstr "URL"
@@ -8017,8 +8769,8 @@ 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:1389
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
msgid "%A %d %B"
msgstr "%B %d %A"
@@ -8030,7 +8782,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:1416
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1440
#: calendar/gui/e-week-view-main-item.c:347
msgid "%d %b"
msgstr "%b %d"
@@ -8042,8 +8794,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:614 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:768
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
msgid "am"
msgstr "上午"
@@ -8054,201 +8805,156 @@ 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:617 calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:770
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
msgid "pm"
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
+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:3527 calendar/gui/e-week-view.c:3414
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
msgid "New All Day _Event"
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/dialogs/event-editor.c:207
+# calendar/gui/dialogs/event-editor.c:263
+# calendar/gui/dialogs/event-editor.c:366
+# 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
+#, fuzzy
+msgid "New Meeting"
+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
+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
+msgid "Print..."
+msgstr "打印..."
+
# calendar/gui/e-day-view.c:3535 calendar/gui/e-week-view.c:3414
# ui/evolution-calendar.xml.h:17
# calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3420
# 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: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
+#: ui/evolution-calendar.xml.h:10
msgid "Go to _Today"
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:3539 calendar/gui/e-week-view.c:3426
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
msgid "_Go to Date..."
msgstr "转到日期(_G)..."
-# 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-day-view.c:3548 calendar/gui/e-week-view.c:3434
-msgid "_Delete this Appointment"
-msgstr "删除该约会(_D)"
+# 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
+#: ui/evolution-calendar.xml.h:31
+msgid "_Publish Free/Busy Information"
+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:37
+#, fuzzy
+msgid "_Configure..."
+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
+#, fuzzy
+msgid "_Configure Pilot..."
+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:1610 ui/evolution-mail-message.xml.h:110
+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
+#, fuzzy
+msgid "_Schedule Meeting..."
+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
+#, fuzzy
+msgid "_Forward as iCalendar..."
+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:3567 calendar/gui/e-week-view.c:3459
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
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:3569 calendar/gui/e-week-view.c:3461
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
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:3571 calendar/gui/e-week-view.c:3463
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
msgid "Delete _All Occurrences"
msgstr "删除所有事件(_A)"
-# calendar/gui/e-itip-control.c:532
-# calendar/gui/e-itip-control.c:532
-# calendar/gui/e-itip-control.c:535
-#: calendar/gui/e-itip-control.c:535
-msgid "Meeting begins: <b>"
-msgstr "会议开始:<b>"
-
-# calendar/gui/e-itip-control.c:537
-# calendar/gui/e-itip-control.c:537
-# calendar/gui/e-itip-control.c:540
-#: calendar/gui/e-itip-control.c:540
-msgid "Task begins: <b>"
-msgstr "任务开始:<b>"
-
-# calendar/gui/e-itip-control.c:542
-# calendar/gui/e-itip-control.c:542
-# calendar/gui/e-itip-control.c:545
-#: calendar/gui/e-itip-control.c:545
-msgid "Free/Busy info begins: <b>"
-msgstr "忙闲信息开始于:<b>"
-
-# calendar/gui/e-itip-control.c:546
-# calendar/gui/e-itip-control.c:546
-# calendar/gui/e-itip-control.c:549
-#: calendar/gui/e-itip-control.c:549
-msgid "Begins: <b>"
-msgstr "开始时间:<b>"
-
-# calendar/gui/e-itip-control.c:558
-# calendar/gui/e-itip-control.c:558
-# calendar/gui/e-itip-control.c:561
-#: calendar/gui/e-itip-control.c:561
-msgid "Meeting ends: <b>"
-msgstr "会议结束时间:<b>"
-
-# calendar/gui/e-itip-control.c:561
-# calendar/gui/e-itip-control.c:561
-# calendar/gui/e-itip-control.c:564
-#: calendar/gui/e-itip-control.c:564
-msgid "Free/Busy info ends: <b>"
-msgstr "忙闲信息结束于:<b>"
-
-# calendar/gui/e-itip-control.c:565
-# calendar/gui/e-itip-control.c:565
-# calendar/gui/e-itip-control.c:568
-#: calendar/gui/e-itip-control.c:568
-msgid "Ends: <b>"
-msgstr "结束于:<b>"
-
-# calendar/gui/e-itip-control.c:579
-# calendar/gui/e-itip-control.c:579
-# calendar/gui/e-itip-control.c:582
-#: calendar/gui/e-itip-control.c:582
-msgid "Task Completed: <b>"
-msgstr "任务完成率:<b>"
-
-# calendar/gui/e-itip-control.c:589
-# calendar/gui/e-itip-control.c:589
-# calendar/gui/e-itip-control.c:592
-#: calendar/gui/e-itip-control.c:592
-msgid "Task Due: <b>"
-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:629 calendar/gui/e-itip-control.c:678
-msgid "iCalendar Information"
-msgstr "iCalendar 信息"
-
-# calendar/gui/e-itip-control.c:641
-# calendar/gui/e-itip-control.c:641
-# calendar/gui/e-itip-control.c:644
-#. Title
-#: calendar/gui/e-itip-control.c:644
-msgid "iCalendar Error"
-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:709 calendar/gui/e-itip-control.c:725
-msgid "An unknown person"
-msgstr "未知的人"
-
-# calendar/gui/e-itip-control.c:729
-# 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:732
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-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:748
-msgid "<i>None</i>"
-msgstr "<i>无</i>"
-
-# 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:760
-msgid "Status:"
-msgstr "状态:"
-
-# calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-# 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-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-# calendar/gui/e-meeting-model.c:824
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-meeting-model.c:321
-#: calendar/gui/e-meeting-model.c:344 calendar/gui/e-meeting-model.c:824
-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:769
-msgid "Tentatively Accepted"
-msgstr "暂时接受"
+# 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:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "GNOME Pilot 工具好像并未安装到系统中。"
-# calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-# 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-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-# calendar/gui/e-meeting-model.c:825
-#: calendar/gui/e-itip-control.c:773 calendar/gui/e-meeting-model.c:323
-#: calendar/gui/e-meeting-model.c:346 calendar/gui/e-meeting-model.c:825
-msgid "Declined"
-msgstr "否决"
+# 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:617
+#, c-format
+msgid "Error executing %s."
+msgstr "执行 %s 错误。"
# calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:292
# calendar/gui/e-meeting-model.c:357 calendar/gui/e-meeting-model.c:782
@@ -8269,461 +8975,98 @@ 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:777 calendar/gui/e-itip-control.c:976
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:357
-#: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-model.c:798
-#: 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:1150 calendar/gui/e-itip-control.c:1223
+#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:444
msgid "Unknown"
msgstr "未知"
-# calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:802
-# calendar/gui/e-itip-control.c:818 calendar/gui/e-itip-control.c:831
-# calendar/gui/e-itip-control.c:845 calendar/gui/e-itip-control.c:859
-# calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:802
-# calendar/gui/e-itip-control.c:818 calendar/gui/e-itip-control.c:831
-# calendar/gui/e-itip-control.c:845 calendar/gui/e-itip-control.c:859
-# 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:823 calendar/gui/e-itip-control.c:839
-#: calendar/gui/e-itip-control.c:855 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:881 calendar/gui/e-itip-control.c:894
-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:824
-msgid "Update"
-msgstr "更新"
-
-# calendar/gui/e-itip-control.c:788 calendar/gui/e-itip-control.c:807
-# calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:833
-# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:861
-# shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
-# calendar/gui/e-itip-control.c:788 calendar/gui/e-itip-control.c:807
-# calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:833
-# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:861
-# shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
-# calendar/gui/e-itip-control.c:791 calendar/gui/e-itip-control.c:810
-# 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:825 calendar/gui/e-itip-control.c:844
-#: calendar/gui/e-itip-control.c:857 calendar/gui/e-itip-control.c:870
-#: calendar/gui/e-itip-control.c:883 calendar/gui/e-itip-control.c:896
-#: shell/e-shell.c:1885 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:840
-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:841
-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:842
-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:856
-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:869
-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:882
-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:895 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:943
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-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:944
-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:948
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-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:949
-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:953
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-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:954
-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:958
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-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:959
-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:982
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-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:983
-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:987
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-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:988
-msgid "Meeting Cancellation"
-msgstr "会议取消"
-
-# calendar/gui/e-itip-control.c:905 calendar/gui/e-itip-control.c:955
-# calendar/gui/e-itip-control.c:990
-# calendar/gui/e-itip-control.c:905 calendar/gui/e-itip-control.c:955
-# 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:992 calendar/gui/e-itip-control.c:1063
-#: calendar/gui/e-itip-control.c:1098
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-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:993
-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:1013
-#, c-format
-msgid "<b>%s</b> has published task information."
-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:1014
-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:1018
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-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:1019
-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:1023
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-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:1024
-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:1028
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-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:1029
-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:1053
-#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-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:1054
-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:1058
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-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:1059
-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:1064
-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:1083
-#, c-format
-msgid "<b>%s</b> has published free/busy information."
-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:1084
-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:1088
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-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:1089
-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:1093
-#, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-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:1094
-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:1099
-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:1172
-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:1191
-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:1219 calendar/gui/e-itip-control.c:1225
-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:1250
-msgid "The attachment has no viewable calendar items"
-msgstr "附件中没有可查看的日程项目"
-
# 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:1349
+#: calendar/gui/e-itip-control.c:1564
msgid "Calendar file could not be updated!\n"
msgstr "无法更新日历文件!\n"
# 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:1351
+#: calendar/gui/e-itip-control.c:1566
msgid "Update complete\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:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "由于条目不再存在而无法更新参与者状态"
+
+#: calendar/gui/e-itip-control.c:1613
+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:1396
+#: calendar/gui/e-itip-control.c:1625
msgid "Attendee status could not be updated because of an invalid status!\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:1404
+#: calendar/gui/e-itip-control.c:1638
msgid "Attendee status could not be updated!\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:1406
+#: calendar/gui/e-itip-control.c:1640
msgid "Attendee status 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:1408
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "由于条目不再存在而无法更新参与者状态"
-
# 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:1436
+#: calendar/gui/e-itip-control.c:1674
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:1455 calendar/gui/e-itip-control.c:1505
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
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:1457 calendar/gui/e-itip-control.c:1509
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
-# calendar/gui/e-itip-control.c:1581
-# calendar/gui/e-itip-control.c:1581
-# calendar/gui/e-itip-control.c:1648
-#: calendar/gui/e-itip-control.c:1682
-msgid "Unable to find any of your identities in the attendees list!\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:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+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:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "选择文件夹"
# calendar/gui/e-itip-control.glade.h:2
# calendar/gui/e-itip-control.glade.h:2
@@ -8792,28 +9135,28 @@ msgstr "日期-开始"
# calendar/gui/e-meeting-model.c:95
# calendar/gui/e-meeting-model.c:95
# calendar/gui/e-meeting-model.c:95
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
msgid "Chair Persons"
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:96 calendar/gui/e-meeting-model.c:1568
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
msgid "Required Participants"
msgstr "必需的参与者"
# calendar/gui/e-meeting-model.c:97
# calendar/gui/e-meeting-model.c:97
# calendar/gui/e-meeting-model.c:97
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
msgid "Optional Participants"
msgstr "可选的参与者"
# calendar/gui/e-meeting-model.c:98
# calendar/gui/e-meeting-model.c:98
# calendar/gui/e-meeting-model.c:98
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
msgid "Non-Participants"
msgstr "不参加"
@@ -8823,8 +9166,8 @@ msgstr "不参加"
# calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
# 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: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:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
msgid "Individual"
msgstr "个人"
@@ -8834,8 +9177,7 @@ msgstr "个人"
# calendar/gui/e-meeting-model.c:779
# 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:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:779
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
msgid "Group"
msgstr "组"
@@ -8845,8 +9187,7 @@ msgstr "组"
# calendar/gui/e-meeting-model.c:780
# 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:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:780
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
msgid "Resource"
msgstr "资源"
@@ -8856,8 +9197,7 @@ msgstr "资源"
# calendar/gui/e-meeting-model.c:781
# 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:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:781
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
msgid "Room"
msgstr "房间"
@@ -8867,8 +9207,7 @@ msgstr "房间"
# calendar/gui/e-meeting-model.c:794
# 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:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:794
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
msgid "Chair"
msgstr "主席"
@@ -8878,8 +9217,8 @@ msgstr "主席"
# calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
# 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: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:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
msgid "Required Participant"
msgstr "必需的参与者"
@@ -8889,8 +9228,7 @@ msgstr "必需的参与者"
# calendar/gui/e-meeting-model.c:796
# 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:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:796
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
msgid "Optional Participant"
msgstr "可选的参与者"
@@ -8900,8 +9238,7 @@ msgstr "可选的参与者"
# calendar/gui/e-meeting-model.c:797
# 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:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:797
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
msgid "Non-Participant"
msgstr "不参加"
@@ -8911,19 +9248,39 @@ msgstr "不参加"
# 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:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543
msgid "Needs Action"
msgstr "需要动作"
+# calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
+# 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-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
+# calendar/gui/e-meeting-model.c:824
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+msgid "Accepted"
+msgstr "接受"
+
+# calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
+# 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-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
+# calendar/gui/e-meeting-model.c:825
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+msgid "Declined"
+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
# calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
# 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: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:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
msgid "Tentative"
msgstr "暂时的"
@@ -8933,15 +9290,14 @@ msgstr "暂时的"
# calendar/gui/e-meeting-model.c:827
# 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:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
msgid "Delegated"
msgstr "被委任的"
# calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
# calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
# calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
msgid "In Process"
msgstr "正在处理"
@@ -8953,8 +9309,8 @@ msgstr "正在处理"
# calendar/gui/e-meeting-time-sel.c:2102
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:471
-#: calendar/gui/e-meeting-time-sel.c:2102
+#: calendar/gui/e-meeting-time-sel-item.c:475
+#: calendar/gui/e-meeting-time-sel.c:2088
msgid "%A, %B %d, %Y"
msgstr "%Y年%B月%d日 %A"
@@ -8969,8 +9325,8 @@ msgstr "%Y年%B月%d日 %A"
# e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
#. This is a strftime() format string %a = abbreviated weekday
#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2132 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel-item.c:479
+#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
msgid "%a %m/%d/%Y"
msgstr "%Y年%m月%d日 %a"
@@ -8983,7 +9339,7 @@ msgstr "%Y年%m月%d日 %a"
# e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479 e-util/e-time-utils.c:221
+#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:221
#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
msgid "%m/%d/%Y"
msgstr "%Y年%m月%d日"
@@ -8991,112 +9347,112 @@ msgstr "%Y年%m月%d日"
# calendar/gui/e-meeting-time-sel.c:430
# calendar/gui/e-meeting-time-sel.c:433
# calendar/gui/e-meeting-time-sel.c:433
-#: calendar/gui/e-meeting-time-sel.c:433
+#: calendar/gui/e-meeting-time-sel.c:436
msgid "Out of Office"
msgstr "办公室以外"
# calendar/gui/e-meeting-time-sel.c:431
# calendar/gui/e-meeting-time-sel.c:434
# calendar/gui/e-meeting-time-sel.c:434
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:437
msgid "No Information"
msgstr "没有信息"
# calendar/gui/e-meeting-time-sel.c:467
# calendar/gui/e-meeting-time-sel.c:470
# calendar/gui/e-meeting-time-sel.c:470
-#: calendar/gui/e-meeting-time-sel.c:470
+#: calendar/gui/e-meeting-time-sel.c:473
msgid "_Options"
msgstr "选项(_O)"
# calendar/gui/e-meeting-time-sel.c:484
# calendar/gui/e-meeting-time-sel.c:487
# calendar/gui/e-meeting-time-sel.c:487
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:490
msgid "Show _Only Working Hours"
msgstr "只显示工作小时(_O)"
# calendar/gui/e-meeting-time-sel.c:497
# calendar/gui/e-meeting-time-sel.c:500
# calendar/gui/e-meeting-time-sel.c:500
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:503
msgid "Show _Zoomed Out"
msgstr "显示缩放的输出(_Z)"
# calendar/gui/e-meeting-time-sel.c:515
# calendar/gui/e-meeting-time-sel.c:518
# calendar/gui/e-meeting-time-sel.c:518
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:521
msgid "_Update Free/Busy"
msgstr "更新忙闲(_U)"
# calendar/gui/e-meeting-time-sel.c:533
# calendar/gui/e-meeting-time-sel.c:536
# calendar/gui/e-meeting-time-sel.c:536
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:539
msgid "_<<"
msgstr "_<<"
# calendar/gui/e-meeting-time-sel.c:550
# calendar/gui/e-meeting-time-sel.c:553
# calendar/gui/e-meeting-time-sel.c:553
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:556
msgid "_Autopick"
msgstr "自动获取(_A)"
# calendar/gui/e-meeting-time-sel.c:564
# calendar/gui/e-meeting-time-sel.c:567
# calendar/gui/e-meeting-time-sel.c:567
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:570
msgid ">_>"
msgstr ">_>"
# calendar/gui/e-meeting-time-sel.c:581
# calendar/gui/e-meeting-time-sel.c:584
# calendar/gui/e-meeting-time-sel.c:584
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:587
msgid "_All People and Resources"
msgstr "所有人和资源(_A)"
# calendar/gui/e-meeting-time-sel.c:594
# calendar/gui/e-meeting-time-sel.c:597
# calendar/gui/e-meeting-time-sel.c:597
-#: calendar/gui/e-meeting-time-sel.c:597
+#: calendar/gui/e-meeting-time-sel.c:600
msgid "All _People and One Resource"
msgstr "所有人和一个资源(_P)"
# calendar/gui/e-meeting-time-sel.c:607
# calendar/gui/e-meeting-time-sel.c:610
# calendar/gui/e-meeting-time-sel.c:610
-#: calendar/gui/e-meeting-time-sel.c:610
+#: calendar/gui/e-meeting-time-sel.c:613
msgid "_Required People"
msgstr "必需的人(_R)"
# calendar/gui/e-meeting-time-sel.c:620
# calendar/gui/e-meeting-time-sel.c:623
# calendar/gui/e-meeting-time-sel.c:623
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:626
msgid "Required People and _One Resource"
msgstr "必需的人和一个资源(_O)"
# calendar/gui/e-meeting-time-sel.c:643
# calendar/gui/e-meeting-time-sel.c:646
# calendar/gui/e-meeting-time-sel.c:646
-#: calendar/gui/e-meeting-time-sel.c:646
+#: calendar/gui/e-meeting-time-sel.c:649
msgid "Meeting _start time:"
msgstr "会议开始时间(_S):"
# calendar/gui/e-meeting-time-sel.c:662
# calendar/gui/e-meeting-time-sel.c:665
# calendar/gui/e-meeting-time-sel.c:665
-#: calendar/gui/e-meeting-time-sel.c:665
+#: calendar/gui/e-meeting-time-sel.c:668
msgid "Meeting _end time:"
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:342
+#: calendar/gui/e-tasks.c:362
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
@@ -9104,7 +9460,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:367
+#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
#, c-format
msgid "Could not load the tasks in `%s'"
msgstr "无法从“%s”中装入任务"
@@ -9112,29 +9468,55 @@ 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:379
+#: calendar/gui/e-tasks.c:404
#, c-format
msgid "The method required to load `%s' is not supported"
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:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "完成日期"
+
+# calendar/gui/e-calendar-table.c:722 calendar/gui/e-day-view.c:2724
+# calendar/gui/e-week-view.c:1822
+# calendar/gui/e-calendar-table.c:722 calendar/gui/e-day-view.c:2726
+# 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:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "删除选中的对象"
+
# mail/mail-ops.c:1556
# mail/mail-ops.c:1558
# calendar/gui/e-tasks.c:629
-#: calendar/gui/e-tasks.c:629
+#: calendar/gui/e-tasks.c:659
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:3412 calendar/gui/e-week-view.c:3450
+#: calendar/gui/e-week-view.c:3438
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
-#: calendar/gui/gnome-cal.c:1493
+#: calendar/gui/gnome-cal.c:1538
#, c-format
msgid "Could not open the folder in `%s'"
msgstr "无法打开“%s”中的文件夹"
@@ -9142,7 +9524,7 @@ msgstr "无法打开“%s”中的文件夹"
# calendar/gui/gnome-cal.c:1510
# calendar/gui/gnome-cal.c:1510
# calendar/gui/gnome-cal.c:1504
-#: calendar/gui/gnome-cal.c:1504
+#: calendar/gui/gnome-cal.c:1549
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr "不支持打开“%s”必需的方法"
@@ -9150,7 +9532,7 @@ 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:1859
+#: calendar/gui/gnome-cal.c:1916
#, c-format
msgid "Opening calendar at %s"
msgstr "从 %s 打开日历"
@@ -9256,344 +9638,294 @@ msgstr "九月"
# calendar/gui/itip-utils.c:243
# calendar/gui/itip-utils.c:243
# calendar/gui/itip-utils.c:243
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
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:274
+#: calendar/gui/itip-utils.c:251
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:313 calendar/gui/itip-utils.c:355
-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:315 calendar/gui/itip-utils.c:357
-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:317 calendar/gui/itip-utils.c:359
-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:319 calendar/gui/itip-utils.c:376
-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:321
-msgid "Calendar information"
-msgstr "日历信息"
-
-# calendar/gui/itip-utils.c:370
-# calendar/gui/itip-utils.c:370
-# calendar/gui/itip-utils.c:370
-#: calendar/gui/itip-utils.c:370
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "忙闲信息 (%s 到 %s)"
-
-# calendar/gui/itip-utils.c:382
-# calendar/gui/itip-utils.c:382
-# calendar/gui/itip-utils.c:382
-#: calendar/gui/itip-utils.c:382
-msgid "iCalendar information"
-msgstr "iCalendar 信息"
-
# calendar/gui/itip-utils.c:573
# calendar/gui/itip-utils.c:573
# calendar/gui/itip-utils.c:581
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:617
msgid "You must be an attendee of the event."
msgstr "您必须是事件的参与者。"
# calendar/gui/main.c:91
# calendar/gui/main.c:91
# calendar/gui/main.c:91
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
msgid "Could not create the component editor factory"
msgstr "无法创建组件编辑器车间"
# calendar/gui/print.c:425
# calendar/gui/print.c:425
# calendar/gui/print.c:425
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
msgid "1st"
msgstr "一号"
# calendar/gui/print.c:425
# calendar/gui/print.c:425
# calendar/gui/print.c:425
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
msgid "2nd"
msgstr "二号"
# calendar/gui/print.c:425
# calendar/gui/print.c:425
# calendar/gui/print.c:425
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
msgid "3rd"
msgstr "三号"
# calendar/gui/print.c:425
# calendar/gui/print.c:425
# calendar/gui/print.c:425
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
msgid "4th"
msgstr "四号"
# calendar/gui/print.c:425
# calendar/gui/print.c:425
# calendar/gui/print.c:425
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
msgid "5th"
msgstr "五号"
# calendar/gui/print.c:426
# calendar/gui/print.c:426
# calendar/gui/print.c:426
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
msgid "6th"
msgstr "六号"
# calendar/gui/print.c:426
# calendar/gui/print.c:426
# calendar/gui/print.c:426
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
msgid "7th"
msgstr "七号"
# calendar/gui/print.c:426
# calendar/gui/print.c:426
# calendar/gui/print.c:426
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
msgid "8th"
msgstr "八号"
# calendar/gui/print.c:426
# calendar/gui/print.c:426
# calendar/gui/print.c:426
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
msgid "9th"
msgstr "九号"
# calendar/gui/print.c:426
# calendar/gui/print.c:426
# calendar/gui/print.c:426
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
msgid "10th"
msgstr "十号"
# calendar/gui/print.c:427
# calendar/gui/print.c:427
# calendar/gui/print.c:427
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
msgid "11th"
msgstr "十一号"
# calendar/gui/print.c:427
# calendar/gui/print.c:427
# calendar/gui/print.c:427
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
msgid "12th"
msgstr "十二号"
# calendar/gui/print.c:427
# calendar/gui/print.c:427
# calendar/gui/print.c:427
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
msgid "13th"
msgstr "十三号"
# calendar/gui/print.c:427
# calendar/gui/print.c:427
# calendar/gui/print.c:427
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
msgid "14th"
msgstr "十四号"
# calendar/gui/print.c:427
# calendar/gui/print.c:427
# calendar/gui/print.c:427
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
msgid "15th"
msgstr "十五号"
# calendar/gui/print.c:428
# calendar/gui/print.c:428
# calendar/gui/print.c:428
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
msgid "16th"
msgstr "十六号"
# calendar/gui/print.c:428
# calendar/gui/print.c:428
# calendar/gui/print.c:428
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
msgid "17th"
msgstr "十七号"
# calendar/gui/print.c:428
# calendar/gui/print.c:428
# calendar/gui/print.c:428
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
msgid "18th"
msgstr "十八号"
# calendar/gui/print.c:428
# calendar/gui/print.c:428
# calendar/gui/print.c:428
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
msgid "19th"
msgstr "十九号"
# calendar/gui/print.c:428
# calendar/gui/print.c:428
# calendar/gui/print.c:428
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
msgid "20th"
msgstr "二十号"
# calendar/gui/print.c:429
# calendar/gui/print.c:429
# calendar/gui/print.c:429
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
msgid "21st"
msgstr "二十一号"
# calendar/gui/print.c:429
# calendar/gui/print.c:429
# calendar/gui/print.c:429
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
msgid "22nd"
msgstr "二十二号"
# calendar/gui/print.c:429
# calendar/gui/print.c:429
# calendar/gui/print.c:429
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
msgid "23rd"
msgstr "二十三号"
# calendar/gui/print.c:429
# calendar/gui/print.c:429
# calendar/gui/print.c:429
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
msgid "24th"
msgstr "二十四号"
# calendar/gui/print.c:429
# calendar/gui/print.c:429
# calendar/gui/print.c:429
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
msgid "25th"
msgstr "二十五号"
# calendar/gui/print.c:430
# calendar/gui/print.c:430
# calendar/gui/print.c:430
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
msgid "26th"
msgstr "二十六号"
# calendar/gui/print.c:430
# calendar/gui/print.c:430
# calendar/gui/print.c:430
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
msgid "27th"
msgstr "二十七号"
# calendar/gui/print.c:430
# calendar/gui/print.c:430
# calendar/gui/print.c:430
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
msgid "28th"
msgstr "二十八号"
# calendar/gui/print.c:430
# calendar/gui/print.c:430
# calendar/gui/print.c:430
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
msgid "29th"
msgstr "二十九号"
# calendar/gui/print.c:430
# calendar/gui/print.c:430
# calendar/gui/print.c:430
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
msgid "30th"
msgstr "三十号"
# calendar/gui/print.c:431
# calendar/gui/print.c:431
# calendar/gui/print.c:431
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:462
msgid "31st"
msgstr "三十一号"
# calendar/gui/print.c:498
# calendar/gui/print.c:498
# calendar/gui/print.c:498
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
msgid "Su"
msgstr "日"
# calendar/gui/print.c:498
# calendar/gui/print.c:498
# calendar/gui/print.c:498
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
msgid "Mo"
msgstr "一"
# calendar/gui/print.c:498
# calendar/gui/print.c:498
# calendar/gui/print.c:498
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
msgid "Tu"
msgstr "二"
# calendar/gui/print.c:498
# calendar/gui/print.c:498
# calendar/gui/print.c:498
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
msgid "We"
msgstr "三"
# calendar/gui/print.c:499
# calendar/gui/print.c:499
# calendar/gui/print.c:499
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
msgid "Th"
msgstr "四"
# calendar/gui/print.c:499
# calendar/gui/print.c:499
# calendar/gui/print.c:499
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
msgid "Fr"
msgstr "五"
# calendar/gui/print.c:499
# calendar/gui/print.c:499
# calendar/gui/print.c:499
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
msgid "Sa"
msgstr "六"
@@ -9601,21 +9933,21 @@ msgstr "六"
# calendar/gui/print.c:1819
# calendar/gui/print.c:1819
#. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
msgid "Selected day (%a %b %d %Y)"
msgstr "选中的日期 (%Y年%b月%d日 %a)"
# calendar/gui/print.c:1844 calendar/gui/print.c:1848
# calendar/gui/print.c:1844 calendar/gui/print.c:1848
# calendar/gui/print.c:1844 calendar/gui/print.c:1848
-#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
+#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
msgid "%a %b %d"
msgstr "%b月%d日 %a"
# calendar/gui/print.c:1845
# calendar/gui/print.c:1845
# calendar/gui/print.c:1845
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1889
msgid "%a %d %Y"
msgstr "%Y年%d日 %a"
@@ -9625,15 +9957,15 @@ msgstr "%Y年%d日 %a"
# calendar/gui/print.c:1852
# calendar/gui/print.c:1849 calendar/gui/print.c:1851
# calendar/gui/print.c:1852
-#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1852
+#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
+#: calendar/gui/print.c:1896
msgid "%a %b %d %Y"
msgstr "%Y年%b月%d日 %a"
# calendar/gui/print.c:1856
# calendar/gui/print.c:1856
# calendar/gui/print.c:1856
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
#, c-format
msgid "Selected week (%s - %s)"
msgstr "选中的周 (%s - %s)"
@@ -9642,7 +9974,7 @@ msgstr "选中的周 (%s - %s)"
# calendar/gui/print.c:1864
# calendar/gui/print.c:1864
#. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
msgid "Selected month (%b %Y)"
msgstr "选中的月 (%Y年%b月)"
@@ -9650,68 +9982,14 @@ msgstr "选中的月 (%Y年%b月)"
# calendar/gui/print.c:1871
# calendar/gui/print.c:1871
#. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
msgid "Selected year (%Y)"
msgstr "选中的年 (%Y年)"
-# calendar/gui/print.c:2205
-# calendar/gui/print.c:2205
-# calendar/gui/print.c:2205
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "任务"
-
-# calendar/gui/print.c:2262
-# calendar/gui/print.c:2262
-# calendar/gui/print.c:2262
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "状态:%s"
-
-# calendar/gui/print.c:2280
-# calendar/gui/print.c:2280
-# calendar/gui/print.c:2280
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "优先级:%s"
-
-# calendar/gui/print.c:2294
-# calendar/gui/print.c:2294
-# calendar/gui/print.c:2294
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "完成率:%i"
-
-# calendar/gui/print.c:2306
-# calendar/gui/print.c:2306
-# calendar/gui/print.c:2306
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URL:%s"
-
-# calendar/gui/print.c:2320
-# calendar/gui/print.c:2320
-# calendar/gui/print.c:2320
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "类别:%s"
-
-# calendar/gui/print.c:2331
-# calendar/gui/print.c:2331
-# calendar/gui/print.c:2331
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr "联系人:"
-
# calendar/gui/print.c:2386
# calendar/gui/print.c:2386
# calendar/gui/print.c:2386
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
msgid "Print Calendar"
msgstr "打印日历"
@@ -9724,23 +10002,24 @@ msgstr "打印日历"
# calendar/gui/print.c:2477 calendar/gui/print.c:2569
# 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:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2611 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:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
msgid "Print Preview"
msgstr "打印预览"
# calendar/gui/print.c:2506
# calendar/gui/print.c:2506
# calendar/gui/print.c:2506
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
msgid "Print Item"
msgstr "打印项"
# calendar/gui/print.c:2587
# calendar/gui/print.c:2587
# calendar/gui/print.c:2587
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
msgid "Print Setup"
msgstr "打印设置"
@@ -9755,31 +10034,41 @@ msgstr "无法创建任务预览。请检查您的 ORBit 和 OAF 设置。"
# calendar/gui/tasks-control.c:126
# calendar/gui/tasks-control.c:126
# calendar/gui/tasks-control.c:137
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
msgid "The URI of the tasks folder to display"
msgstr "要显示的任务文件夹的 URI"
# mail/mail-callbacks.c:2135
# mail/mail-callbacks.c:2254
# calendar/gui/tasks-control.c:434
-#: calendar/gui/tasks-control.c:434
+#: calendar/gui/tasks-control.c:456
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
"\n"
"Really erase these tasks?"
msgstr ""
-"该操作将永久删除所有标记为完成的任务。如果您继续,您将无法恢复这些任务。\n"
+"该操作将永久删除所有标记为完成的任务。如果您继续,"
+"将无法恢复这些任务。\n"
"\n"
"确实删除这些任务?"
# 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:441 mail/mail-callbacks.c:2311
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
msgid "Do not ask me again."
msgstr "不要再次询问。"
+# addressbook/printing/e-contact-print.c:1111
+# addressbook/printing/e-contact-print.c:1111
+# addressbook/printing/e-contact-print.c:1115
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "打印卡片"
+
# calendar/gui/tasks-migrate.c:105
# calendar/gui/tasks-migrate.c:105
# calendar/gui/tasks-migrate.c:105
@@ -9788,7 +10077,9 @@ msgid ""
"Evolution has taken the tasks that were in your calendar folder and "
"automatically migrated them to the new tasks folder."
msgstr ""
-"Evolution 已经获得了您日历文件夹中的任务并自动将它们迁移到了新任务文件夹。"
+"Evolution "
+"已经获得了您日历文件夹中的任务并自动将它们迁移到了"
+"任务文件夹。"
# calendar/gui/tasks-migrate.c:108
# calendar/gui/tasks-migrate.c:108
@@ -9800,7 +10091,9 @@ msgid ""
"Some of the tasks could not be migrated, so this process may be attempted "
"again in the future."
msgstr ""
-"Evolution 已经试图从您的日志文件夹中获取任务并把它们迁移到新任务文件夹。\n"
+"Evolution "
+"已经试图从您的日志文件夹中获取任务并把它们迁移到新"
+"务文件夹。\n"
"有些任务无法迁移,所以该过程应在将来再次尝试。"
# calendar/gui/tasks-migrate.c:120
@@ -9811,7 +10104,9 @@ msgstr ""
msgid ""
"Could not open `%s'; no items from the calendar folder will be migrated to "
"the tasks folder."
-msgstr "无法打开“%s”;不会从日志文件夹迁移项目到任务文件夹。"
+msgstr ""
+"无法打开“%s”;不会从日志文件夹迁移项目到任务文件夹"
+"。"
# calendar/gui/tasks-migrate.c:133
# calendar/gui/tasks-migrate.c:133
@@ -9821,7 +10116,9 @@ msgstr "无法打开“%s”;不会从日志文件夹迁移项目到任务文
msgid ""
"The method required to load `%s' is not supported; no items from the "
"calendar folder will be migrated to the tasks folder."
-msgstr "不支持用于装入“%s”的方法;不会从日志文件夹迁移项目到任务文件夹。"
+msgstr ""
+"不支持用于装入“%s”的方法;不会从日志文件夹迁移项目"
+"到任务文件夹。"
# calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
# calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
@@ -9844,175 +10141,218 @@ msgstr "将 iCalendar 文件导入 Evolution 的车间"
msgid "Imports iCalendar files into Evolution"
msgstr "将 iCalendar 文件导入 Evolution"
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "将 iCalendar 文件导入 Evolution"
+
+# 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
+#, fuzzy
+msgid "Calendar Events"
+msgstr "日历消息"
+
+# importers/pine-importer.c:663
+# importers/pine-importer.c:663
+# importers/pine-importer.c:663
+#: calendar/importers/icalendar-importer.c:663
+#, fuzzy
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution 找到 Pine 邮件文件。\n"
+"您是否原意把它们导入 Evolution?"
+
+# 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
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "日历"
+
# calendar/pcs/query.c:246
# calendar/pcs/query.c:246
# calendar/pcs/query.c:246
-#: calendar/pcs/query.c:246
+#: calendar/pcs/query.c:248
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:270
+#: calendar/pcs/query.c:272
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:275
+#: calendar/pcs/query.c:277
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:283
+#: calendar/pcs/query.c:285
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:312
+#: calendar/pcs/query.c:314
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:317
+#: calendar/pcs/query.c:319
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:324
+#: calendar/pcs/query.c:326
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:351
+#: calendar/pcs/query.c:353
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:356
+#: calendar/pcs/query.c:358
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:383
+#: calendar/pcs/query.c:385
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:388
+#: calendar/pcs/query.c:390
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:424
+#: calendar/pcs/query.c:426
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:520
+#: calendar/pcs/query.c:522
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:525
+#: calendar/pcs/query.c:527
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:532
+#: calendar/pcs/query.c:534
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:662
+#: calendar/pcs/query.c:664
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:667
+#: calendar/pcs/query.c:669
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:674
+#: calendar/pcs/query.c:676
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:691
+#: calendar/pcs/query.c:693
msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
-msgstr "contains? 的第一个参数必须是“任意”、“概要”、“描述”之一"
+"contains? expects argument 1 to be one of \"any\", \"summary\", "
+"\"description\""
+msgstr ""
+"contains? "
+"的第一个参数必须是“任意”、“概要”、“描述”之一"
# calendar/pcs/query.c:733
# calendar/pcs/query.c:733
# calendar/pcs/query.c:733
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
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:745
+#: calendar/pcs/query.c:747
msgid ""
"has-categories? expects all arguments to be strings or one and only one "
"argument to be a boolean false (#f)"
-msgstr "has-categories? 的所有参数都应该为字符串或者它唯一的参数为布尔假 (#f)"
+msgstr ""
+"has-categories? "
+"的所有参数都应该为字符串或者它唯一的参数为布尔假 (#f)"
# calendar/pcs/query.c:833
# calendar/pcs/query.c:833
# calendar/pcs/query.c:833
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
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:878
+#: calendar/pcs/query.c:880
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:883
+#: calendar/pcs/query.c:885
msgid "completed-before? expects argument 1 to be a time_t"
msgstr "completed-before? 的第一个参数应该是 time_t"
@@ -12436,14 +12776,14 @@ msgstr "该密码不支持解密"
# mail/mail-ops.c:1870
# mail/mail-ops.c:1872
# camel/camel-data-cache.c:159
-#: camel/camel-data-cache.c:166
+#: camel/camel-data-cache.c:169
msgid "Unable to create cache path"
msgstr "无法创建缓冲路径"
# camel/providers/imap/camel-imap-message-cache.c:154
# camel/providers/imap/camel-imap-message-cache.c:154
# camel/camel-data-cache.c:426
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:441
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "无法删除缓冲条目:%s:%s"
@@ -12493,14 +12833,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:689 camel/camel-filter-driver.c:698
+#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
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:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "解析过滤规则错误: %s: %s"
@@ -12508,7 +12848,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:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "执行过滤规则错误: %s: %s"
@@ -12516,36 +12856,35 @@ 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:865
+#: camel/camel-filter-driver.c:887
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:874
+#: camel/camel-filter-driver.c:896
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:889
-#, c-format
+#: camel/camel-filter-driver.c:911
msgid "Getting message %d (%d%%)"
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:893
+#: camel/camel-filter-driver.c:915
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:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
#, c-format
msgid "Failed on message %d"
msgstr "在消息 %d 失败"
@@ -12553,14 +12892,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:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
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:988
+#: camel/camel-filter-driver.c:1016
#, c-format
msgid "Getting message %d of %d"
msgstr "正在获取第 %d 个消息,共 %d 个"
@@ -12568,7 +12907,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:1003
+#: camel/camel-filter-driver.c:1031
#, c-format
msgid "Failed at message %d of %d"
msgstr "在第 %d 个消息失败,共 %d 个"
@@ -12591,7 +12930,7 @@ msgstr "执行过滤规则搜索错误: %s: %s"
# camel/camel-folder-search.c:332
# camel/camel-folder-search.c:332
# camel/camel-folder-search.c:332
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -12603,7 +12942,7 @@ msgstr ""
# camel/camel-folder-search.c:342
# camel/camel-folder-search.c:342
# camel/camel-folder-search.c:342
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -12615,29 +12954,22 @@ msgstr ""
# camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
# camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
# camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
-#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
+#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
msgid "(match-all) requires a single bool result"
msgstr "(match-all) 需要一个布尔结果"
# camel/camel-folder-search.c:638
# camel/camel-folder-search.c:638
# camel/camel-folder-search.c:638
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
#, c-format
msgid "Performing query on unknown header: %s"
msgstr "正在对未知的头进行查询: %s"
-# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "邮件体内容中的无效类型,应该是字符串"
-
# camel/camel-folder.c:471
# camel/camel-folder.c:471
# camel/camel-folder.c:471
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr "不支持的操作:附加邮件:附加 %s"
@@ -12645,7 +12977,7 @@ msgstr "不支持的操作:附加邮件:附加 %s"
# camel/camel-folder.c:1040
# camel/camel-folder.c:1040
# camel/camel-folder.c:1040
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr "不支持的操作:按表达式搜索:搜索 %s"
@@ -12653,7 +12985,7 @@ msgstr "不支持的操作:按表达式搜索:搜索 %s"
# camel/camel-folder.c:1080
# camel/camel-folder.c:1080
# camel/camel-folder.c:1080
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1078
#, c-format
msgid "Unsupported operation: search by uids: for %s"
msgstr "不支持的操作:按 uid 搜索:搜索 %s"
@@ -12661,7 +12993,7 @@ msgstr "不支持的操作:按 uid 搜索:搜索 %s"
# camel/camel-folder.c:1262
# camel/camel-folder.c:1262
# camel/camel-folder.c:1262
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1260
msgid "Moving messages"
msgstr "正在移动邮件"
@@ -12836,21 +13168,21 @@ msgstr "请输入您的 %s 密码串"
# camel/camel-pgp-context.c:575
# camel/camel-pgp-context.c:575
# camel/camel-pgp-context.c:575
-#: camel/camel-pgp-context.c:575
+#: camel/camel-pgp-context.c:621
msgid "Cannot sign this message: no plaintext to sign"
msgstr "无法签名该邮件:普通文本无法签名"
# camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
# camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
# camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
-#: camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
+#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
msgid "Cannot sign this message: no password provided"
msgstr "无法签名该邮件:没有提供密码"
# camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
# camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
# camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
-#: camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
+#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
#, c-format
msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
msgstr "无法签名该邮件:无法创建到 GPG/PGP 的管道: %s"
@@ -12858,21 +13190,21 @@ msgstr "无法签名该邮件:无法创建到 GPG/PGP 的管道: %s"
# camel/camel-pgp-context.c:755
# camel/camel-pgp-context.c:755
# camel/camel-pgp-context.c:755
-#: camel/camel-pgp-context.c:755
+#: camel/camel-pgp-context.c:795
msgid "Cannot sign this message: no plaintext to clearsign"
msgstr "无法签名该邮件:普通文本无法清晰签名"
# camel/camel-pgp-context.c:953
# camel/camel-pgp-context.c:953
# camel/camel-pgp-context.c:953
-#: camel/camel-pgp-context.c:953
+#: camel/camel-pgp-context.c:987
msgid "Cannot verify this message: no plaintext to verify"
msgstr "无法验证邮件:普通文本无法验证"
# camel/camel-pgp-context.c:959
# camel/camel-pgp-context.c:959
# camel/camel-pgp-context.c:959
-#: camel/camel-pgp-context.c:959
+#: camel/camel-pgp-context.c:993
#, c-format
msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
msgstr "无法验证该邮件:无法创建到 GPG/PGP 的管道: %s"
@@ -12880,7 +13212,7 @@ msgstr "无法验证该邮件:无法创建到 GPG/PGP 的管道: %s"
# camel/camel-pgp-context.c:970
# camel/camel-pgp-context.c:970
# camel/camel-pgp-context.c:970
-#: camel/camel-pgp-context.c:970
+#: camel/camel-pgp-context.c:1004
#, c-format
msgid "Cannot verify this message: couldn't create temp file: %s"
msgstr "无法验证该邮件:无法创建临时文件: %s"
@@ -12888,21 +13220,21 @@ msgstr "无法验证该邮件:无法创建临时文件: %s"
# camel/camel-pgp-context.c:1143
# camel/camel-pgp-context.c:1143
# camel/camel-pgp-context.c:1143
-#: camel/camel-pgp-context.c:1143
+#: camel/camel-pgp-context.c:1177
msgid "Cannot encrypt this message: no plaintext to encrypt"
msgstr "无法加密该邮件: 普通文本无法加密"
# camel/camel-pgp-context.c:1153
# camel/camel-pgp-context.c:1153
# camel/camel-pgp-context.c:1153
-#: camel/camel-pgp-context.c:1153
+#: camel/camel-pgp-context.c:1187
msgid "Cannot encrypt this message: no password provided"
msgstr "无法加密该邮件: 没有提供密码"
# camel/camel-pgp-context.c:1160
# camel/camel-pgp-context.c:1160
# camel/camel-pgp-context.c:1160
-#: camel/camel-pgp-context.c:1160
+#: camel/camel-pgp-context.c:1194
#, c-format
msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
msgstr "无法加密该邮件: 无法创建到 GPG/PGP 的管道: %s"
@@ -12910,116 +13242,42 @@ msgstr "无法加密该邮件: 无法创建到 GPG/PGP 的管道: %s"
# camel/camel-pgp-context.c:1169
# camel/camel-pgp-context.c:1169
# camel/camel-pgp-context.c:1169
-#: camel/camel-pgp-context.c:1169
+#: camel/camel-pgp-context.c:1203
msgid "Cannot encrypt this message: no recipients specified"
msgstr "无法加密该邮件: 没有指明收件人"
# camel/camel-pgp-context.c:1337
# camel/camel-pgp-context.c:1337
# camel/camel-pgp-context.c:1337
-#: camel/camel-pgp-context.c:1337
+#: camel/camel-pgp-context.c:1372
msgid "Cannot decrypt this message: no ciphertext to decrypt"
msgstr "无法解密该邮件: 没有解密的密码"
# camel/camel-pgp-context.c:1345
# camel/camel-pgp-context.c:1345
# camel/camel-pgp-context.c:1345
-#: camel/camel-pgp-context.c:1345
+#: camel/camel-pgp-context.c:1380
msgid "Cannot decrypt this message: no password provided"
msgstr "无法解密该邮件: 没有提供密码"
# camel/camel-pgp-context.c:1352
# camel/camel-pgp-context.c:1352
# camel/camel-pgp-context.c:1352
-#: camel/camel-pgp-context.c:1352
+#: camel/camel-pgp-context.c:1387
#, c-format
msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
msgstr "无法解密该邮件: 无法创建到 GPG/PGP 的管道: %s"
# camel/camel-pgp-mime.c:310
# camel/camel-pgp-mime.c:310
-#: camel/camel-pgp-mime.c:310
+#: camel/camel-pgp-mime.c:354
msgid "This is a digitally signed message part"
msgstr "这是消息的数字签名部分"
-# camel/camel-smime-context.c:173
-# camel/camel-smime-context.c:173
-# camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "情您为 %s 输入密码"
-
-# addressbook/gui/widgets/e-addressbook-util.c:76
-# addressbook/gui/widgets/e-addressbook-util.c:76
-# camel/camel-pkcs7-context.c:213
-#: camel/camel-pkcs7-context.c:213
-msgid "Error hashing password."
-msgstr "杂凑口令出错。"
-
-# shell/evolution-shell-component.c:1013
-# shell/evolution-shell-component.c:1013
-# camel/camel-pkcs7-context.c:222
-#: camel/camel-pkcs7-context.c:222
-msgid "Invalid password."
-msgstr "非法口令。"
-
-# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
-# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
-# camel/camel-pkcs7-context.c:329
-#: camel/camel-pkcs7-context.c:329
-#, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "无法签名:找不到“%s”的证书。"
-
-# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
-# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
-# camel/camel-pkcs7-context.c:378
-#: camel/camel-pkcs7-context.c:378
-#, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "无法清除签名:找不到“%s”的证书。"
-
-# camel/camel-pkcs7-context.c:567
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr "无法加密:创建封装数据失败。"
-
-# mail/mail-crypto.c:113
-# mail/mail-crypto.c:113
-# camel/camel-pkcs7-context.c:590
-#: camel/camel-pkcs7-context.c:590
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "无法加密:创建加密上下文失败。"
-
-# camel/providers/pop3/camel-pop3-store.c:214
-# camel/providers/pop3/camel-pop3-store.c:214
-# camel/camel-pkcs7-context.c:620
-#: camel/camel-pkcs7-context.c:620
-#, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "无法加密数据:非法用户键:“%s”。"
-
-# mail/mail-account-gui.c:962
-# mail/mail-account-gui.c:962
-# camel/camel-pkcs7-context.c:626
-#: camel/camel-pkcs7-context.c:626
-msgid "Could not encrypt: encoding failed."
-msgstr "无法加密:编码失败。"
-
-# camel/camel-pkcs7-context.c:677
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr "无法解密:未知"
-
# camel/camel-provider.c:130
# camel/camel-provider.c:130
# camel/camel-provider.c:130
-#: camel/camel-provider.c:130
+#: camel/camel-provider.c:131
#, c-format
msgid "Could not load %s: Module loading not supported on this system."
msgstr "无法装入 %s: 本系统不支持模块装入。"
@@ -13027,7 +13285,7 @@ msgstr "无法装入 %s: 本系统不支持模块装入。"
# camel/camel-provider.c:139
# camel/camel-provider.c:139
# camel/camel-provider.c:139
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
#, c-format
msgid "Could not load %s: %s"
msgstr "无法装入 %s: %s"
@@ -13035,7 +13293,7 @@ msgstr "无法装入 %s: %s"
# camel/camel-provider.c:147
# camel/camel-provider.c:147
# camel/camel-provider.c:147
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
#, c-format
msgid "Could not load %s: No initialization code in module."
msgstr "无法装入 %s: 模块中没有初始化代码。"
@@ -13043,7 +13301,7 @@ msgstr "无法装入 %s: 模块中没有初始化代码。"
# camel/camel-remote-store.c:203
# camel/camel-remote-store.c:203
# camel/camel-remote-store.c:203
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
#, c-format
msgid "%s server %s"
msgstr "%s 服务器 %s"
@@ -13051,7 +13309,7 @@ msgstr "%s 服务器 %s"
# camel/camel-remote-store.c:207
# camel/camel-remote-store.c:207
# camel/camel-remote-store.c:207
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
#, c-format
msgid "%s service for %s on %s"
msgstr "%s 为 %s 服务,在 %s"
@@ -13059,7 +13317,7 @@ msgstr "%s 为 %s 服务,在 %s"
# camel/camel-remote-store.c:264
# camel/camel-remote-store.c:264
# camel/camel-remote-store.c:264
-#: camel/camel-remote-store.c:264
+#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
msgid "Connection cancelled"
msgstr "连接已取消"
@@ -13069,7 +13327,7 @@ msgstr "连接已取消"
# camel/providers/smtp/camel-smtp-transport.c:273
# camel/camel-remote-store.c:267
# camel/providers/smtp/camel-smtp-transport.c:276
-#: camel/camel-remote-store.c:267
+#: camel/camel-remote-store.c:257 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"
@@ -13078,7 +13336,7 @@ msgstr "无法连接到 %s (端口 %d): %s"
# camel/camel-remote-store.c:268
# camel/camel-remote-store.c:268
# camel/camel-remote-store.c:268
-#: camel/camel-remote-store.c:268
+#: camel/camel-remote-store.c:258
msgid "(unknown host)"
msgstr "(未知的主机)"
@@ -13094,8 +13352,8 @@ msgstr "(未知的主机)"
# camel/camel-remote-store.c:481
# camel/providers/imap/camel-imap-command.c:228
# camel/providers/imap/camel-imap-command.c:409
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
+#: camel/camel-remote-store.c:473
#: camel/providers/imap/camel-imap-command.c:228
#: camel/providers/imap/camel-imap-command.c:409
msgid "Operation cancelled"
@@ -13107,7 +13365,7 @@ msgstr "操作已取消"
# camel/providers/imap/camel-imap-command.c:274
# camel/camel-remote-store.c:484
# camel/providers/imap/camel-imap-command.c:274
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:476
#: camel/providers/imap/camel-imap-command.c:274
#, c-format
msgid "Server unexpectedly disconnected: %s"
@@ -13184,7 +13442,9 @@ msgstr "CRAM-MD5"
msgid ""
"This option will connect to the server using a secure CRAM-MD5 password, if "
"the server supports it."
-msgstr "如果服务器支持的话,该选项将用安全 CRAM-MD5 密码连接到服务器。"
+msgstr ""
+"如果服务器支持的话,该选项将用安全 CRAM-MD5 "
+"密码连接到服务器。"
# camel/camel-sasl-digest-md5.c:43
# camel/camel-sasl-digest-md5.c:43
@@ -13200,7 +13460,9 @@ msgstr "DIGEST-MD5"
msgid ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
-msgstr "如果服务器支持的话,该选项将用安全 DIGEST-MD5 密码连接到服务器。"
+msgstr ""
+"如果服务器支持的话,该选项将用安全 DIGEST-MD5 "
+"密码连接到服务器。"
# camel/camel-sasl-digest-md5.c:810
# camel/camel-sasl-digest-md5.c:810
@@ -13277,7 +13539,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:495
+#: camel/providers/imap/camel-imap-store.c:496
msgid "Bad authentication response from server."
msgstr "来自服务器的无效认证应答。"
@@ -13302,6 +13564,20 @@ msgstr "该选项将以普通密码连接到服务器。"
msgid "Unknown authentication state."
msgstr "未知的认证状态。"
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr ""
+
+# camel/camel-sasl-kerberos4.c:42
+# camel/camel-sasl-kerberos4.c:42
+# camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-ntlm.c:33
+#, fuzzy
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr "该选项将用 Kerberos 4 认证连接到服务器。"
+
# camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
# camel/providers/nntp/camel-nntp-store.c:149
# camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
@@ -13312,8 +13588,8 @@ msgstr "未知的认证状态。"
# camel/providers/nntp/camel-nntp-store.c:149
# camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:60
#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:149
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:61
+#: camel/providers/nntp/camel-nntp-store.c:153
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
msgid "Password"
msgstr "密码"
@@ -13387,7 +13663,7 @@ msgstr "URL “%s” 需要路径组件"
# camel/camel-service.c:611
# camel/camel-service.c:614
# camel/camel-service.c:614
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
#, c-format
msgid "Resolving: %s"
msgstr "正在解析: %s"
@@ -13395,7 +13671,7 @@ msgstr "正在解析: %s"
# camel/camel-service.c:638
# camel/camel-service.c:641
# camel/camel-service.c:641
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
#, c-format
msgid "Failure in name lookup: %s"
msgstr "域名寻找失败: %s"
@@ -13403,7 +13679,7 @@ msgstr "域名寻找失败: %s"
# camel/camel-service.c:663
# camel/camel-service.c:666
# camel/camel-service.c:666
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr "主机寻找失败: %s: 没有找到主机"
@@ -13411,11 +13687,35 @@ msgstr "主机寻找失败: %s: 没有找到主机"
# camel/camel-service.c:665
# camel/camel-service.c:668
# camel/camel-service.c:668
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr "主机寻找失败: %s: 未知的原因"
+# camel/camel-service.c:611
+# camel/camel-service.c:614
+# camel/camel-service.c:614
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "正在解析: %s"
+
+# camel/camel-service.c:663
+# camel/camel-service.c:666
+# camel/camel-service.c:666
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "主机寻找失败: %s: 没有找到主机"
+
+# camel/camel-service.c:665
+# camel/camel-service.c:668
+# camel/camel-service.c:668
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "主机寻找失败: %s: 未知的原因"
+
# camel/camel-session.c:75
# camel/camel-session.c:75
# camel/camel-session.c:75
@@ -13433,7 +13733,7 @@ msgstr "关于将读入邮件作为对另一组文件夹的查询"
# camel/camel-session.c:346 camel/camel-session.c:415
# camel/camel-session.c:346 camel/camel-session.c:415
# camel/camel-session.c:346 camel/camel-session.c:415
-#: camel/camel-session.c:346 camel/camel-session.c:415
+#: camel/camel-session.c:351 camel/camel-session.c:419
#, c-format
msgid "No provider available for protocol `%s'"
msgstr "协议“%s”没有可用的提供者"
@@ -13441,7 +13741,7 @@ msgstr "协议“%s”没有可用的提供者"
# camel/camel-session.c:532
# camel/camel-session.c:532
# camel/camel-session.c:532
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -13450,6 +13750,14 @@ msgstr ""
"无法创建目录 %s:\n"
"%s"
+# camel/camel-smime-context.c:173
+# camel/camel-smime-context.c:173
+# camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "情您为 %s 输入密码"
+
# camel/camel-smime-context.c:203
# camel/camel-smime-context.c:203
# camel/camel-smime-context.c:203
@@ -13509,19 +13817,19 @@ msgstr "验证证书失败。"
# camel/camel-store.c:220
# camel/camel-store.c:220
# camel/camel-store.c:220
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
msgid "Cannot get folder: Invalid operation on this store"
msgstr "无法获取文件夹: 对该存储的无效操作"
# camel/camel-store.c:282
# camel/camel-store.c:282
# camel/camel-store.c:282
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
msgid "Cannot create folder: Invalid operation on this store"
msgstr "无法创建文件夹: 对该存储的无效操作"
# camel/camel-tcp-stream-openssl.c:519
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
#, c-format
msgid ""
"Issuer: %s\n"
@@ -13533,7 +13841,7 @@ 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:524
+#: camel/camel-tcp-stream-openssl.c:619
#, c-format
msgid ""
"Bad certificate from %s:\n"
@@ -13551,7 +13859,7 @@ msgstr ""
# 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:438
+#: camel/camel-tcp-stream-ssl.c:491
#, c-format
msgid ""
"Issuer: %s\n"
@@ -13565,12 +13873,12 @@ msgstr ""
"签名: %s"
# camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
msgid "GOOD"
msgstr "好"
# camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
msgid "BAD"
msgstr "坏"
@@ -13578,7 +13886,7 @@ msgstr "坏"
# 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:447
+#: camel/camel-tcp-stream-ssl.c:500
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -13612,7 +13920,7 @@ msgstr "在 %2$s 中没有消息 %1$s"
# camel/camel-vee-folder.c:749
# camel/camel-vee-folder.c:749
# camel/camel-vee-folder.c:749
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
#, c-format
msgid "No such message: %s"
msgstr "没有邮件: %s"
@@ -13620,7 +13928,7 @@ msgstr "没有邮件: %s"
# camel/camel-vee-store.c:258
# camel/camel-vee-store.c:258
# camel/camel-vee-store.c:258
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "无法删除文件夹: %s: 无效操作"
@@ -13628,7 +13936,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:293
+#: camel/camel-vee-store.c:297
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "无法删除文件夹: %s: 没有该文件夹"
@@ -13636,7 +13944,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:306
+#: camel/camel-vee-store.c:310
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "无法重命名文件夹: %s: 无效操作"
@@ -13644,7 +13952,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:314
+#: camel/camel-vee-store.c:318
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "无法重命名文件夹: %s: 没有该文件夹"
@@ -13698,7 +14006,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:197
+#: camel/providers/imap/camel-imap-folder.c:199
#, c-format
msgid "Could not create directory %s: %s"
msgstr "无法创建目录 %s: %s"
@@ -13706,7 +14014,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:216
+#: camel/providers/imap/camel-imap-folder.c:218
#, c-format
msgid "Could not load summary for %s"
msgstr "无法为 %s 装入概要"
@@ -13714,7 +14022,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:282
+#: camel/providers/imap/camel-imap-folder.c:284
msgid "Folder was destroyed and recreated on server."
msgstr "文件夹已被删除并在服务器上重建了。"
@@ -13722,7 +14030,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:466
+#: camel/providers/imap/camel-imap-folder.c:469
msgid "Scanning for changed messages"
msgstr "正在扫描改变了的邮件"
@@ -13732,8 +14040,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:1632
-#: camel/providers/imap/camel-imap-folder.c:2108
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
msgid "This message is not currently available"
msgstr "该邮件目前不可用"
@@ -13743,29 +14051,29 @@ 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:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
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:1793
+#: camel/providers/imap/camel-imap-folder.c:1799
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:2145
+#: camel/providers/imap/camel-imap-folder.c:2151
msgid "Could not find message body in FETCH response."
msgstr "无法在 FETCH 应答中找到邮件体。"
# camel/providers/imap/camel-imap-message-cache.c:154
# camel/providers/imap/camel-imap-message-cache.c:154
# camel/providers/imap/camel-imap-message-cache.c:154
-#: camel/providers/imap/camel-imap-message-cache.c:154
+#: camel/providers/imap/camel-imap-message-cache.c:155
#, c-format
msgid "Could not open cache directory: %s"
msgstr "无法打开缓冲器目录: %s"
@@ -13782,10 +14090,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:256
-#: 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
#, c-format
msgid "Failed to cache message %s: %s"
msgstr "缓冲邮件 %s 失败: %s"
@@ -13807,7 +14115,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:832
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
msgid "Folders"
msgstr "文件夹"
@@ -13863,7 +14171,7 @@ msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
# 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:518
+#: camel/providers/imap/camel-imap-store.c:519
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
@@ -13874,8 +14182,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:528
-#: camel/providers/smtp/camel-smtp-transport.c:393
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
#, c-format
msgid "No support for authentication type %s"
msgstr "不支持验证类型 %s"
@@ -13883,7 +14191,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:552
+#: camel/providers/imap/camel-imap-store.c:553
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%s请为 %s@%s 输入 IMAP 密码"
@@ -13894,15 +14202,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:567
-#: camel/providers/smtp/camel-smtp-transport.c:434
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
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:596
+#: camel/providers/imap/camel-imap-store.c:597
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -13916,7 +14224,7 @@ 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:900
+#: camel/providers/imap/camel-imap-store.c:901
#, c-format
msgid "No such folder %s"
msgstr "没有文件夹 %s"
@@ -13924,73 +14232,87 @@ msgstr "没有文件夹 %s"
# 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:1275
+#: camel/providers/imap/camel-imap-store.c:1276
msgid "The parent folder is not allowed to contain subfolders"
msgstr "父文件夹不允许含有子文件夹"
# camel/providers/local/camel-local-provider.c:42
# camel/providers/local/camel-local-provider.c:42
# camel/providers/local/camel-local-provider.c:42
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:48
msgid "MH-format mail directories"
msgstr "MH-格式的邮件目录"
# camel/providers/local/camel-local-provider.c:43
# camel/providers/local/camel-local-provider.c:43
# camel/providers/local/camel-local-provider.c:43
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
msgid "For storing local mail in MH-like mail directories."
msgstr "在类似于 MH 的邮件目录中存储本地邮件。"
# camel/providers/local/camel-local-provider.c:52
# camel/providers/local/camel-local-provider.c:52
# camel/providers/local/camel-local-provider.c:52
-#: camel/providers/local/camel-local-provider.c:52
+#: camel/providers/local/camel-local-provider.c:64
msgid "Local delivery"
msgstr "本地发送"
# camel/providers/local/camel-local-provider.c:53
# camel/providers/local/camel-local-provider.c:53
# camel/providers/local/camel-local-provider.c:53
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
msgid "For retrieving local mail from standard mbox formated spools."
-msgstr "在按照标准邮件箱格式化的脱机文件中检索本地邮件。"
+msgstr ""
+"在按照标准邮件箱格式化的脱机文件中检索本地邮件。"
# camel/providers/local/camel-local-provider.c:62
# camel/providers/local/camel-local-provider.c:62
# camel/providers/local/camel-local-provider.c:62
-#: camel/providers/local/camel-local-provider.c:62
+#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:94
msgid "Apply filters to new messages in INBOX"
msgstr "应用过滤规则到收件箱中的新邮件"
# camel/providers/local/camel-local-provider.c:68
# camel/providers/local/camel-local-provider.c:68
# camel/providers/local/camel-local-provider.c:68
-#: camel/providers/local/camel-local-provider.c:68
+#: camel/providers/local/camel-local-provider.c:82
msgid "Maildir-format mail directories"
msgstr "Maildir 格式的邮件目录"
# camel/providers/local/camel-local-provider.c:69
# camel/providers/local/camel-local-provider.c:69
# camel/providers/local/camel-local-provider.c:69
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
msgid "For storing local mail in maildir directories."
msgstr "在 maildir 邮件目录中存储本地邮件。"
# camel/providers/local/camel-local-provider.c:80
# camel/providers/local/camel-local-provider.c:80
# camel/providers/local/camel-local-provider.c:80
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
msgid "Standard Unix mbox spools"
msgstr "标准 Unix 邮件箱"
# camel/providers/local/camel-local-provider.c:81
# camel/providers/local/camel-local-provider.c:81
# camel/providers/local/camel-local-provider.c:81
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:101
msgid "For reading and storing local mail in standard mbox spool files."
msgstr "在标准邮件箱文件中读取和存储本地邮件。"
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+msgid ""
+"For accessing mail storedin an external tree of mbox files.\n"
+"This will allow you to directly access pine and elm folders.\n"
+"NOTE: This provider is still experimental so ensure you backup any mail "
+"folders first."
+msgstr ""
+
# camel/providers/local/camel-local-store.c:138
# camel/providers/local/camel-local-store.c:227
# camel/providers/local/camel-spool-store.c:109
@@ -14000,9 +14322,10 @@ msgstr "在标准邮件箱文件中读取和存储本地邮件。"
# camel/providers/local/camel-local-store.c:138
# camel/providers/local/camel-local-store.c:227
# camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
#: camel/providers/local/camel-spool-store.c:109
+#: camel/providers/local/camel-spoold-store.c:111
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "存储根目录 %s 不是绝对路径"
@@ -14010,7 +14333,7 @@ msgstr "存储根目录 %s 不是绝对路径"
# camel/providers/local/camel-local-store.c:145
# camel/providers/local/camel-local-store.c:145
# camel/providers/local/camel-local-store.c:145
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
#, c-format
msgid "Store root %s is not a regular directory"
msgstr "存储根目录 %s 不是普通目录"
@@ -14024,9 +14347,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: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
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "无法获取文件夹: %s: %s"
@@ -14034,14 +14357,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:184
+#: camel/providers/local/camel-local-store.c:185
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:196
+#: camel/providers/local/camel-local-store.c:197
#, c-format
msgid "Local mail file %s"
msgstr "本地邮件文件 %s"
@@ -14049,15 +14372,23 @@ 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:300 mail/mail-local.c:864
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
#, c-format
msgid "Could not rename folder %s to %s: %s"
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
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+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:374
+#: camel/providers/local/camel-local-store.c:379
#, c-format
msgid "Could not delete folder summary file `%s': %s"
msgstr "无法删除文件夹概要文件 “%s”: %s"
@@ -14065,7 +14396,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:384
+#: camel/providers/local/camel-local-store.c:389
#, c-format
msgid "Could not delete folder index file `%s': %s"
msgstr "无法删除文件夹索引文件 “%s”: %s"
@@ -14073,7 +14404,7 @@ msgstr "无法删除文件夹索引文件 “%s”: %s"
# camel/providers/local/camel-local-summary.c:367
# camel/providers/local/camel-local-summary.c:367
# camel/providers/local/camel-local-summary.c:367
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
#, c-format
msgid "Could not save summary: %s: %s"
msgstr "无法保存概要: %s: %s"
@@ -14084,8 +14415,8 @@ msgstr "无法保存概要: %s: %s"
# camel/providers/local/camel-spool-summary.c:1157
# camel/providers/local/camel-local-summary.c:423
# camel/providers/local/camel-spool-summary.c:1157
-#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1167
msgid "Unable to add message to summary: unknown reason"
msgstr "无法将邮件添加到概要中: 未知的原因"
@@ -14135,7 +14466,7 @@ msgstr "无法将邮件附加到邮件目录文件夹: %s: %s"
#: camel/providers/local/camel-mh-folder.c:198
#: camel/providers/local/camel-mh-folder.c:207
#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:579
+#: camel/providers/local/camel-spool-folder.c:582
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -14159,7 +14490,7 @@ msgstr ""
#: camel/providers/local/camel-maildir-folder.c:209
#: camel/providers/local/camel-mbox-folder.c:331
#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:579
+#: camel/providers/local/camel-spool-folder.c:582
msgid "No such message"
msgstr "没有该邮件"
@@ -14180,7 +14511,7 @@ msgstr "无效的邮件内容"
# camel/providers/local/camel-mh-store.c:89
# camel/providers/local/camel-maildir-store.c:105
# camel/providers/local/camel-mh-store.c:89
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
#: camel/providers/local/camel-mh-store.c:89
#, c-format
msgid ""
@@ -14199,8 +14530,8 @@ msgstr ""
# camel/providers/local/camel-maildir-store.c:109
# camel/providers/local/camel-mbox-store.c:100
# camel/providers/local/camel-mh-store.c:96
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
#: camel/providers/local/camel-mh-store.c:96
#, c-format
msgid "Folder `%s' does not exist."
@@ -14212,7 +14543,7 @@ msgstr "文件夹“%s”不存在。"
# camel/providers/local/camel-mh-store.c:102
# camel/providers/local/camel-maildir-store.c:116
# camel/providers/local/camel-mh-store.c:102
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
#: camel/providers/local/camel-mh-store.c:102
#, c-format
msgid ""
@@ -14225,7 +14556,7 @@ msgstr ""
# camel/providers/local/camel-maildir-store.c:131
# camel/providers/local/camel-maildir-store.c:131
# camel/providers/local/camel-maildir-store.c:131
-#: camel/providers/local/camel-maildir-store.c:131
+#: camel/providers/local/camel-maildir-store.c:132
#, c-format
msgid "`%s' is not a maildir directory."
msgstr "“%s”不是邮件目录。"
@@ -14239,8 +14570,8 @@ msgstr "“%s”不是邮件目录。"
# camel/providers/local/camel-maildir-store.c:166
# camel/providers/local/camel-maildir-store.c:203
# camel/providers/local/camel-mh-store.c:126
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
#: camel/providers/local/camel-mh-store.c:126
#, c-format
msgid "Could not delete folder `%s': %s"
@@ -14249,14 +14580,15 @@ msgstr "无法删除文件夹“%s”: %s"
# camel/providers/local/camel-maildir-store.c:167
# camel/providers/local/camel-maildir-store.c:167
# camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
msgid "not a maildir directory"
msgstr "不是邮件目录"
# camel/providers/local/camel-maildir-store.c:331
# camel/providers/local/camel-maildir-store.c:331
# camel/providers/local/camel-maildir-store.c:331
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
#, c-format
msgid "Could not scan folder `%s': %s"
msgstr "无法扫描文件夹“%s”: %s"
@@ -14267,12 +14599,58 @@ 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: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
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
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
+#, fuzzy
+msgid "Checking folder consistency"
+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
+#, fuzzy
+msgid "Checking for new messages"
+msgstr "正在扫描新邮件"
+
+# camel/providers/local/camel-mbox-summary.c:248
+# camel/providers/local/camel-mbox-summary.c:497
+# camel/providers/local/camel-mbox-summary.c:698
+# 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-mbox-summary.c:248
+# camel/providers/local/camel-mbox-summary.c:497
+# camel/providers/local/camel-mbox-summary.c:698
+# 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-mbox-summary.c:248
+# camel/providers/local/camel-mbox-summary.c:497
+# camel/providers/local/camel-mbox-summary.c:698
+# camel/providers/local/camel-spool-summary.c:378
+# camel/providers/local/camel-spool-summary.c:643
+# camel/providers/local/camel-spool-summary.c:935
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's. This is a bit tricky.
+#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-mbox-summary.c:250
+#: camel/providers/local/camel-mbox-summary.c:499
+#: camel/providers/local/camel-mbox-summary.c:700
+#: camel/providers/local/camel-spool-summary.c:381
+#: camel/providers/local/camel-spool-summary.c:646
+#: camel/providers/local/camel-spool-summary.c:945
+msgid "Storing folder"
+msgstr "正在存储文件夹"
+
# camel/providers/local/camel-mbox-folder.c:151
# camel/providers/local/camel-spool-folder.c:274
# camel/providers/local/camel-mbox-folder.c:151
@@ -14280,7 +14658,7 @@ msgstr "无法打开邮件目录路径: %s: %s"
# camel/providers/local/camel-mbox-folder.c:151
# camel/providers/local/camel-spool-folder.c:274
#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr "无法在 %s 创建文件夹锁: %s"
@@ -14292,7 +14670,7 @@ msgstr "无法在 %s 创建文件夹锁: %s"
# camel/providers/local/camel-mbox-folder.c:208
# camel/providers/local/camel-spool-folder.c:456
#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:456
+#: camel/providers/local/camel-spool-folder.c:459
#, c-format
msgid "Cannot open mailbox: %s: %s\n"
msgstr "无法打开邮件箱: %s: %s\n"
@@ -14333,9 +14711,9 @@ msgstr "无法将邮件附加到邮件箱文件: %s: %s"
#: 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-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
#, c-format
msgid ""
"Cannot get message: %s from folder %s\n"
@@ -14351,7 +14729,7 @@ msgstr ""
# camel/providers/local/camel-mbox-folder.c:380
# camel/providers/local/camel-spool-folder.c:628
#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
msgid "The folder appears to be irrecoverably corrupted."
msgstr "文件夹好像已经被不可恢复地破坏了。"
@@ -14362,14 +14740,14 @@ msgstr "文件夹好像已经被不可恢复地破坏了。"
# camel/providers/local/camel-mbox-folder.c:392
# camel/providers/local/camel-spool-folder.c:640
#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-spool-folder.c:643
msgid "Message construction failed: Corrupt mailbox?"
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:93
+#: camel/providers/local/camel-mbox-store.c:95
#, c-format
msgid ""
"Could not open file `%s':\n"
@@ -14381,7 +14759,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:109
+#: camel/providers/local/camel-mbox-store.c:111
#, c-format
msgid ""
"Could not create file `%s':\n"
@@ -14396,8 +14774,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: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
#, c-format
msgid "`%s' is not a regular file."
msgstr "“%s”并不是普通文件。"
@@ -14408,8 +14786,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: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
#, c-format
msgid ""
"Could not delete folder `%s':\n"
@@ -14421,48 +14799,19 @@ 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:152
+#: camel/providers/local/camel-mbox-store.c:154
#, c-format
msgid "Folder `%s' is not empty. Not deleted."
msgstr "文件夹“%s”非空。没有删除。"
-# camel/providers/local/camel-mbox-summary.c:248
-# camel/providers/local/camel-mbox-summary.c:497
-# camel/providers/local/camel-mbox-summary.c:698
-# 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-mbox-summary.c:248
-# camel/providers/local/camel-mbox-summary.c:497
-# camel/providers/local/camel-mbox-summary.c:698
-# 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-mbox-summary.c:248
-# camel/providers/local/camel-mbox-summary.c:497
-# camel/providers/local/camel-mbox-summary.c:698
-# camel/providers/local/camel-spool-summary.c:378
-# camel/providers/local/camel-spool-summary.c:643
-# camel/providers/local/camel-spool-summary.c:935
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's. This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
-#: camel/providers/local/camel-mbox-summary.c:497
-#: camel/providers/local/camel-mbox-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:378
-#: camel/providers/local/camel-spool-summary.c:643
-#: camel/providers/local/camel-spool-summary.c:935
-msgid "Storing folder"
-msgstr "正在存储文件夹"
-
# camel/providers/local/camel-mbox-summary.c:253
# camel/providers/local/camel-spool-summary.c:383
# camel/providers/local/camel-mbox-summary.c:253
# camel/providers/local/camel-spool-summary.c:383
# camel/providers/local/camel-mbox-summary.c:253
# camel/providers/local/camel-spool-summary.c:383
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "无法打开文件夹: %s: %s"
@@ -14473,8 +14822,8 @@ msgstr "无法打开文件夹: %s: %s"
# camel/providers/local/camel-spool-summary.c:425
# camel/providers/local/camel-mbox-summary.c:295
# camel/providers/local/camel-spool-summary.c:425
-#: camel/providers/local/camel-mbox-summary.c:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
#, c-format
msgid "Fatal mail parser error near position %ld in folder %s"
msgstr "在文件夹 %2$s 中邻近 %1$ld 的位置出现致命的解析错误"
@@ -14485,8 +14834,8 @@ 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:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "无法检查文件夹: %s: %s"
@@ -14500,9 +14849,9 @@ 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:502
-#: camel/providers/local/camel-mbox-summary.c:703
-#: camel/providers/local/camel-spool-summary.c:648
+#: camel/providers/local/camel-mbox-summary.c:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
#, c-format
msgid "Could not open file: %s: %s"
msgstr "无法打开文件: %s: %s"
@@ -14513,8 +14862,8 @@ 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:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "无法打开临时邮件箱: %s"
@@ -14543,14 +14892,14 @@ 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:544
-#: camel/providers/local/camel-mbox-summary.c:552
-#: camel/providers/local/camel-mbox-summary.c:741
-#: camel/providers/local/camel-mbox-summary.c:749
-#: camel/providers/local/camel-spool-summary.c:697
-#: 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:546
+#: camel/providers/local/camel-mbox-summary.c:554
+#: camel/providers/local/camel-mbox-summary.c:743
+#: camel/providers/local/camel-mbox-summary.c:751
+#: camel/providers/local/camel-spool-summary.c:700
+#: camel/providers/local/camel-spool-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:988
+#: camel/providers/local/camel-spool-summary.c:996
msgid "Summary and folder mismatch, even after a sync"
msgstr "即使同步后,概要和文件夹仍然不匹配"
@@ -14560,8 +14909,8 @@ msgstr "即使同步后,概要和文件夹仍然不匹配"
# 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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: camel/providers/local/camel-mbox-summary.c:597
+#: camel/providers/local/camel-spool-summary.c:752
#, c-format
msgid "Error writing to temp mailbox: %s"
msgstr "写入临时文件夹错误: %s"
@@ -14572,8 +14921,8 @@ 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: camel/providers/local/camel-mbox-summary.c:614
+#: camel/providers/local/camel-spool-summary.c:774
#, c-format
msgid "Writing to tmp mailbox failed: %s: %s"
msgstr "写入临时文件夹失败: %s: %s"
@@ -14587,9 +14936,9 @@ msgstr "写入临时文件夹失败: %s: %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:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:801
+#: camel/providers/local/camel-spool-summary.c:1046
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "无法关闭来源文件夹 %s: %s"
@@ -14597,7 +14946,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:639
+#: camel/providers/local/camel-mbox-summary.c:641
#, c-format
msgid "Could not close temp folder: %s"
msgstr "无法关闭临时文件夹: %s"
@@ -14605,7 +14954,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:650
+#: camel/providers/local/camel-mbox-summary.c:652
#, c-format
msgid "Could not rename folder: %s"
msgstr "无法重命名文件夹: %s"
@@ -14619,9 +14968,9 @@ msgstr "无法重命名文件夹: %s"
# 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:873
-#: camel/providers/local/camel-spool-summary.c:544
-#: camel/providers/local/camel-spool-summary.c:1110
+#: camel/providers/local/camel-mbox-summary.c:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
#, c-format
msgid "Unknown error: %s"
msgstr "未知的错误: %s"
@@ -14652,7 +15001,7 @@ msgstr "“%s”不是目录"
# camel/providers/local/camel-mh-summary.c:218
# camel/providers/local/camel-mh-summary.c:218
# camel/providers/local/camel-mh-summary.c:218
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
#, c-format
msgid "Cannot open MH directory path: %s: %s"
msgstr "无法打开 MH 目录: %s: %s"
@@ -14660,7 +15009,7 @@ msgstr "无法打开 MH 目录: %s: %s"
# camel/providers/local/camel-spool-folder.c:512
# camel/providers/local/camel-spool-folder.c:512
# camel/providers/local/camel-spool-folder.c:512
-#: camel/providers/local/camel-spool-folder.c:512
+#: camel/providers/local/camel-spool-folder.c:515
#, c-format
msgid "Cannot append message to spool file: %s: %s"
msgstr "无法将邮件附加到脱机文件: %s: %s"
@@ -14677,6 +15026,7 @@ msgstr "脱机文件“%s”不存在或不是普通文件"
# camel/providers/local/camel-spool-store.c:141
# camel/providers/local/camel-spool-store.c:141
#: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
#, c-format
msgid "Folder `%s/%s' does not exist."
msgstr "文件夹“%s/%s”不存在。"
@@ -14692,14 +15042,16 @@ msgstr "脱机邮件文件 %s"
# camel/providers/local/camel-spool-store.c:209
# camel/providers/local/camel-spool-store.c:209
# camel/providers/local/camel-spool-store.c:209
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
msgid "Spool folders cannot be renamed"
msgstr "脱机文件夹无法改名"
# camel/providers/local/camel-spool-store.c:217
# camel/providers/local/camel-spool-store.c:217
# camel/providers/local/camel-spool-store.c:217
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
msgid "Spool folders cannot be deleted"
msgstr "脱机文件夹无法删除"
@@ -14712,9 +15064,9 @@ msgstr "脱机文件夹无法删除"
# camel/providers/local/camel-spool-summary.c:788
# camel/providers/local/camel-spool-summary.c:797
# camel/providers/local/camel-spool-summary.c:806
-#: camel/providers/local/camel-spool-summary.c:788
-#: camel/providers/local/camel-spool-summary.c:797
-#: camel/providers/local/camel-spool-summary.c:806
+#: camel/providers/local/camel-spool-summary.c:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
#, c-format
msgid "Could not sync temporary folder %s: %s"
msgstr "无法同步临时文件夹 %s: %s"
@@ -14722,7 +15074,7 @@ msgstr "无法同步临时文件夹 %s: %s"
# camel/providers/local/camel-spool-summary.c:821
# camel/providers/local/camel-spool-summary.c:821
# camel/providers/local/camel-spool-summary.c:821
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:831
#, c-format
msgid "Could not sync spool folder %s: %s"
msgstr "无法同步脱机文件夹 %s: %s"
@@ -14736,9 +15088,9 @@ msgstr "无法同步脱机文件夹 %s: %s"
# camel/providers/local/camel-spool-summary.c:851
# camel/providers/local/camel-spool-summary.c:869
# camel/providers/local/camel-spool-summary.c:881
-#: camel/providers/local/camel-spool-summary.c:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
#, c-format
msgid ""
"Could not sync spool folder %s: %s\n"
@@ -14750,117 +15102,30 @@ msgstr ""
# camel/providers/local/camel-spool-summary.c:940
# camel/providers/local/camel-spool-summary.c:940
# camel/providers/local/camel-spool-summary.c:940
-#: camel/providers/local/camel-spool-summary.c:940
+#: camel/providers/local/camel-spool-summary.c:950
#, c-format
msgid "Could not file: %s: %s"
msgstr "无法存档: %s: %s"
-# camel/providers/nntp/camel-nntp-auth.c:44
-# camel/providers/nntp/camel-nntp-auth.c:44
-# camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "请为 %s@%s 输入 NNTP 密码"
-
-# camel/providers/nntp/camel-nntp-auth.c:64
-# camel/providers/nntp/camel-nntp-auth.c:64
-# camel/providers/nntp/camel-nntp-auth.c:64
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "服务器拒绝的用户名"
-
-# camel/providers/nntp/camel-nntp-auth.c:70
-# camel/providers/nntp/camel-nntp-auth.c:70
-# camel/providers/nntp/camel-nntp-auth.c:70
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "将用户名发送到服务器失败"
-
-# camel/providers/nntp/camel-nntp-auth.c:79
-# camel/providers/nntp/camel-nntp-auth.c:79
-# camel/providers/nntp/camel-nntp-auth.c:79
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "服务器拒绝的 用户名/密码"
-
-# camel/providers/nntp/camel-nntp-folder.c:112
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "内部错误:非法格式的 uid:%s"
-
-# camel/providers/local/camel-maildir-folder.c:209
-# camel/providers/local/camel-maildir-folder.c:221
-# camel/providers/local/camel-maildir-folder.c:230
-# camel/providers/local/camel-mbox-folder.c:331
-# camel/providers/local/camel-mh-folder.c:198
-# camel/providers/local/camel-mh-folder.c:207
-# camel/providers/local/camel-mh-folder.c:215
-# camel/providers/local/camel-spool-folder.c:579
-# camel/providers/local/camel-maildir-folder.c:209
-# camel/providers/local/camel-maildir-folder.c:221
-# camel/providers/local/camel-maildir-folder.c:230
-# camel/providers/local/camel-mbox-folder.c:331
-# camel/providers/local/camel-mh-folder.c:198
-# camel/providers/local/camel-mh-folder.c:207
-# camel/providers/local/camel-mh-folder.c:215
-# 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/nntp/camel-nntp-folder.c:153
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:439
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:502
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "无法获取消息 %s:%s"
-
-# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-# camel/camel-remote-store.c:481
-# camel/providers/imap/camel-imap-command.c:228
-# camel/providers/imap/camel-imap-command.c:409
-# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-# camel/camel-remote-store.c:481
-# 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/nntp/camel-nntp-folder.c:157
-#: camel/providers/pop3/camel-pop3-folder.c:278
-#: camel/providers/pop3/camel-pop3-folder.c:437
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:510
-msgid "User cancelled"
-msgstr "用户已取消"
-
-# camel/providers/nntp/camel-nntp-grouplist.c:45
-# camel/providers/nntp/camel-nntp-grouplist.c:45
-# camel/providers/nntp/camel-nntp-grouplist.c:45
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-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
+#: camel/providers/local/camel-spoold-store.c:117
+#, fuzzy, c-format
+msgid "Store `%s' does not exist or is not a directory"
+msgstr "脱机文件“%s”不存在或不是普通文件"
-# camel/providers/nntp/camel-nntp-grouplist.c:98
-# camel/providers/nntp/camel-nntp-grouplist.c:107
-# camel/providers/nntp/camel-nntp-grouplist.c:98
-# camel/providers/nntp/camel-nntp-grouplist.c:107
-# camel/providers/nntp/camel-nntp-grouplist.c:98
-# camel/providers/nntp/camel-nntp-grouplist.c:107
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "无法为 %s 装入组列表文件: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
-# camel/providers/nntp/camel-nntp-grouplist.c:158
-# camel/providers/nntp/camel-nntp-grouplist.c:158
-# camel/providers/nntp/camel-nntp-grouplist.c:158
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "无法为 %s 保存组列表文件: %s"
+# mail/mail-autofilter.c:72
+# mail/mail-autofilter.c:72
+# mail/mail-autofilter.c:72
+#: camel/providers/local/camel-spoold-store.c:173
+#, fuzzy, c-format
+msgid "Mail tree %s"
+msgstr "邮寄给 %s"
# camel/providers/nntp/camel-nntp-provider.c:41
# camel/providers/nntp/camel-nntp-provider.c:41
@@ -14874,12 +15139,14 @@ msgstr "USENET 新闻"
# camel/providers/nntp/camel-nntp-provider.c:43
#: camel/providers/nntp/camel-nntp-provider.c:43
msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "这是一个从 USENET 新闻组和向 USENET 新闻组发布消息的提供者。"
+msgstr ""
+"这是一个从 USENET 新闻组和向 USENET "
+"新闻组发布消息的提供者。"
# camel/providers/nntp/camel-nntp-store.c:144
# camel/providers/nntp/camel-nntp-store.c:144
# camel/providers/nntp/camel-nntp-store.c:144
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/providers/nntp/camel-nntp-store.c:148
#, c-format
msgid "USENET News via %s"
msgstr "USENET 新闻 %s"
@@ -14887,7 +15154,7 @@ msgstr "USENET 新闻 %s"
# camel/providers/nntp/camel-nntp-store.c:151
# camel/providers/nntp/camel-nntp-store.c:151
# camel/providers/nntp/camel-nntp-store.c:151
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
msgid ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
@@ -14963,10 +15230,26 @@ 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:265
+#: camel/providers/pop3/camel-pop3-folder.c:272
msgid "Retrieving POP summary"
msgstr "检索 POP 概要"
+# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+# camel/camel-remote-store.c:481
+# camel/providers/imap/camel-imap-command.c:228
+# camel/providers/imap/camel-imap-command.c:409
+# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+# camel/camel-remote-store.c:481
+# 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
+msgid "User cancelled"
+msgstr "用户已取消"
+
# camel/providers/local/camel-maildir-folder.c:209
# camel/providers/local/camel-maildir-folder.c:221
# camel/providers/local/camel-maildir-folder.c:230
@@ -14985,7 +15268,7 @@ msgstr "检索 POP 概要"
# 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:280
+#: camel/providers/pop3/camel-pop3-folder.c:287
#, c-format
msgid "Cannot get POP summary: %s"
msgstr "无法获取消息 POP 摘要:%s"
@@ -14993,14 +15276,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:316
+#: camel/providers/pop3/camel-pop3-folder.c:325
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:411
+#: camel/providers/pop3/camel-pop3-folder.c:420
#, c-format
msgid "No message with uid %s"
msgstr "没有 uid 为 %s 的邮件"
@@ -15010,15 +15293,41 @@ 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:418
+#: camel/providers/pop3/camel-pop3-folder.c:427
#, c-format
msgid "Retrieving POP message %d"
msgstr "检索 POP 邮件 %d"
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:221
+# camel/providers/local/camel-maildir-folder.c:230
+# camel/providers/local/camel-mbox-folder.c:331
+# camel/providers/local/camel-mh-folder.c:198
+# camel/providers/local/camel-mh-folder.c:207
+# camel/providers/local/camel-mh-folder.c:215
+# camel/providers/local/camel-spool-folder.c:579
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:221
+# camel/providers/local/camel-maildir-folder.c:230
+# camel/providers/local/camel-mbox-folder.c:331
+# camel/providers/local/camel-mh-folder.c:198
+# camel/providers/local/camel-mh-folder.c:207
+# camel/providers/local/camel-mh-folder.c:215
+# 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
+#, c-format
+msgid "Cannot get message %s: %s"
+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:502
+#: camel/providers/pop3/camel-pop3-folder.c:514
msgid "Unknown reason"
msgstr "未知原因"
@@ -15047,7 +15356,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:60
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
msgid "POP"
msgstr "POP"
@@ -15066,8 +15375,9 @@ msgid ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
msgstr ""
-"该选项使 Evolution 在连接到 POP 服务器时使用明文密码。这是许多 POP 服务器唯一"
-"支持的选项。"
+"该选项使 Evolution 在连接到 POP "
+"服务器时使用明文密码。这是许多 POP "
+"服务器唯一支持的选项。"
# camel/providers/pop3/camel-pop3-provider.c:79
# camel/providers/pop3/camel-pop3-provider.c:79
@@ -15078,22 +15388,51 @@ msgid ""
"the APOP protocol. This may not work for all users even on servers that "
"claim to support it."
msgstr ""
-"该选项使 Evolution 在连接到 POP 服务器时使用 APOP 协议。即使是声称支持这一功"
-"能的服务器,也不一定能使所有用户工作。"
+"该选项使 Evolution 在连接到 POP 服务器时使用 APOP "
+"协议。即使是声称支持这一功能的服务器,也不一定能使"
+"有用户工作。"
+
+# 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/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, fuzzy, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
+msgstr ""
+"无法连接到 POP 服务器。\n"
+"发送用户名错误: %s"
+
+# shell/e-storage.c:518
+# shell/e-storage.c:518
+# shell/e-storage.c:518
+#: camel/providers/pop3/camel-pop3-store.c:210
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+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/pop3/camel-pop3-store.c:251
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "认证失败。"
# camel/providers/pop3/camel-pop3-store.c:321
# camel/providers/pop3/camel-pop3-store.c:321
# camel/providers/pop3/camel-pop3-store.c:321
-#: camel/providers/pop3/camel-pop3-store.c:172
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %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:213
-#: camel/providers/pop3/camel-pop3-store.c:316
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
msgid ""
"Unable to connect to POP server.\n"
"No support for requested authentication mechanism."
@@ -15104,19 +15443,19 @@ msgstr ""
# camel/providers/imap/camel-imap-command.c:362
# camel/providers/imap/camel-imap-command.c:362
# camel/providers/imap/camel-imap-command.c:362
-#: camel/providers/pop3/camel-pop3-store.c:229
+#: camel/providers/pop3/camel-pop3-store.c:405
#, c-format
msgid "SASL `%s' Login failed: %s"
msgstr "SASL“%s”登录失败:%s"
-#: camel/providers/pop3/camel-pop3-store.c:240
+#: camel/providers/pop3/camel-pop3-store.c:416
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:255
+#: camel/providers/pop3/camel-pop3-store.c:431
#, c-format
msgid "I/O Error: %s"
msgstr "输入输出错误:%s"
@@ -15124,7 +15463,7 @@ msgstr "输入输出错误:%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:276
+#: camel/providers/pop3/camel-pop3-store.c:452
#, c-format
msgid "%sPlease enter the POP password for %s@%s"
msgstr "%s请为 %s@%s 输入 POP 密码"
@@ -15132,7 +15471,8 @@ 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:327
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
#, c-format
msgid ""
"Unable to connect to POP server.\n"
@@ -15144,7 +15484,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:417
+#: camel/providers/pop3/camel-pop3-store.c:601
#, c-format
msgid "No such folder `%s'."
msgstr "没有文件夹“%s”。"
@@ -15156,7 +15496,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:82
+#: mail/mail-config.glade.h:114
msgid "Sendmail"
msgstr "Sendmail"
@@ -15169,10 +15509,17 @@ msgid ""
"system."
msgstr "将邮件传递到本地系统的“sendmail”来发送邮件。"
+# camel/camel-url.c:288
+# camel/camel-url.c:288
+# camel/providers/sendmail/camel-sendmail-transport.c:226
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+msgid "Could not parse recipient list"
+msgstr "无法解析收件人列表"
+
# camel/providers/sendmail/camel-sendmail-transport.c:106
# camel/providers/sendmail/camel-sendmail-transport.c:106
# camel/providers/sendmail/camel-sendmail-transport.c:107
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
#, c-format
msgid "Could not create pipe to sendmail: %s: mail not sent"
msgstr "无法创建到 sendmail 的管道: %s: 邮件未发送"
@@ -15180,7 +15527,7 @@ msgstr "无法创建到 sendmail 的管道: %s: 邮件未发送"
# camel/providers/sendmail/camel-sendmail-transport.c:123
# camel/providers/sendmail/camel-sendmail-transport.c:123
# camel/providers/sendmail/camel-sendmail-transport.c:124
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:137
#, c-format
msgid "Could not fork sendmail: %s: mail not sent"
msgstr "无法创建 sendmail 进程: %s: 邮件未发送"
@@ -15188,7 +15535,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:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
#, c-format
msgid "Could not send message: %s"
msgstr "无法发送邮件: %s"
@@ -15196,7 +15543,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:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:178
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr "sendmail 以信号 %s 退出: 邮件未发送。"
@@ -15204,7 +15551,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:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:185
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr "无法执行 %s: 邮件未发送。"
@@ -15212,43 +15559,29 @@ 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:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:190
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr "sendmail 以状态码 %d 退出: 邮件未发送。"
-# camel/providers/sendmail/camel-sendmail-transport.c:193
-# camel/providers/sendmail/camel-sendmail-transport.c:193
-# camel/providers/sendmail/camel-sendmail-transport.c:194
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
-msgid "Could not find 'From' address in message"
-msgstr "无法在邮件中找到“收件人”地址"
-
-# camel/camel-url.c:288
-# camel/camel-url.c:288
-# camel/providers/sendmail/camel-sendmail-transport.c:226
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-msgid "Could not parse recipient list"
-msgstr "无法解析收件人列表"
-
# 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:259
+#: camel/providers/sendmail/camel-sendmail-transport.c:204
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:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
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:75
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
msgid "SMTP"
msgstr "SMTP"
@@ -15262,190 +15595,228 @@ msgstr "通过SMTP连接到远程邮件服务器来发送邮件。\n"
# camel/providers/smtp/camel-smtp-transport.c:172
# camel/providers/smtp/camel-smtp-transport.c:172
# camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
msgid "Syntax error, command unrecognized"
msgstr "语法错误,无法识别的命令"
# camel/providers/smtp/camel-smtp-transport.c:174
# camel/providers/smtp/camel-smtp-transport.c:174
# camel/providers/smtp/camel-smtp-transport.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
msgid "Syntax error in parameters or arguments"
msgstr "参数语法错误"
# camel/providers/smtp/camel-smtp-transport.c:176
# camel/providers/smtp/camel-smtp-transport.c:176
# camel/providers/smtp/camel-smtp-transport.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
msgid "Command not implemented"
msgstr "命令尚未实现"
# camel/providers/smtp/camel-smtp-transport.c:178
# camel/providers/smtp/camel-smtp-transport.c:178
# camel/providers/smtp/camel-smtp-transport.c:179
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
msgid "Command parameter not implemented"
msgstr "命令参数尚未实现"
# camel/providers/smtp/camel-smtp-transport.c:180
# camel/providers/smtp/camel-smtp-transport.c:180
# camel/providers/smtp/camel-smtp-transport.c:181
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
msgid "System status, or system help reply"
msgstr "系统状态,或系统求助就绪"
# camel/providers/smtp/camel-smtp-transport.c:182
# camel/providers/smtp/camel-smtp-transport.c:182
# camel/providers/smtp/camel-smtp-transport.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
msgid "Help message"
msgstr "求助消息"
# camel/providers/smtp/camel-smtp-transport.c:184
# camel/providers/smtp/camel-smtp-transport.c:184
# camel/providers/smtp/camel-smtp-transport.c:185
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
msgid "Service ready"
msgstr "服务就绪"
# camel/providers/smtp/camel-smtp-transport.c:186
# camel/providers/smtp/camel-smtp-transport.c:186
# camel/providers/smtp/camel-smtp-transport.c:187
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
msgid "Service closing transmission channel"
msgstr "服务正在关闭传输通道"
# camel/providers/smtp/camel-smtp-transport.c:188
# camel/providers/smtp/camel-smtp-transport.c:188
# camel/providers/smtp/camel-smtp-transport.c:189
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
msgid "Service not available, closing transmission channel"
msgstr "服务不可用,正在关闭传输通道"
# camel/providers/smtp/camel-smtp-transport.c:190
# camel/providers/smtp/camel-smtp-transport.c:190
# camel/providers/smtp/camel-smtp-transport.c:191
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
msgid "Requested mail action okay, completed"
msgstr "邮件动作请求确认,已完成"
# camel/providers/smtp/camel-smtp-transport.c:192
# camel/providers/smtp/camel-smtp-transport.c:192
# camel/providers/smtp/camel-smtp-transport.c:193
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:194
msgid "User not local; will forward to <forward-path>"
msgstr "用户不在本地;将转发到 <转发路径>"
# camel/providers/smtp/camel-smtp-transport.c:194
# camel/providers/smtp/camel-smtp-transport.c:194
# camel/providers/smtp/camel-smtp-transport.c:195
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:196
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "邮件动作请求未发生:邮件箱无效"
# camel/providers/smtp/camel-smtp-transport.c:196
# camel/providers/smtp/camel-smtp-transport.c:196
# camel/providers/smtp/camel-smtp-transport.c:197
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
msgid "Requested action not taken: mailbox unavailable"
msgstr "动作请求未发生:邮件箱无效"
# camel/providers/smtp/camel-smtp-transport.c:198
# camel/providers/smtp/camel-smtp-transport.c:198
# camel/providers/smtp/camel-smtp-transport.c:199
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
msgid "Requested action aborted: error in processing"
msgstr "动作请求已放弃:处理中出错"
# camel/providers/smtp/camel-smtp-transport.c:200
# camel/providers/smtp/camel-smtp-transport.c:200
# camel/providers/smtp/camel-smtp-transport.c:201
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
msgid "User not local; please try <forward-path>"
msgstr "用户不在本地;请尝试 <转发路径>"
# camel/providers/smtp/camel-smtp-transport.c:202
# camel/providers/smtp/camel-smtp-transport.c:202
# camel/providers/smtp/camel-smtp-transport.c:203
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:204
msgid "Requested action not taken: insufficient system storage"
msgstr "动作请求未发生:系统存储空间不足"
# camel/providers/smtp/camel-smtp-transport.c:204
# camel/providers/smtp/camel-smtp-transport.c:204
# camel/providers/smtp/camel-smtp-transport.c:205
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:206
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "邮件动作请求已放弃:超定额德存储分配"
# camel/providers/smtp/camel-smtp-transport.c:206
# camel/providers/smtp/camel-smtp-transport.c:206
# camel/providers/smtp/camel-smtp-transport.c:207
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
msgid "Requested action not taken: mailbox name not allowed"
msgstr "动作请求未发生:不允许的邮件箱名称"
# camel/providers/smtp/camel-smtp-transport.c:208
# camel/providers/smtp/camel-smtp-transport.c:208
# camel/providers/smtp/camel-smtp-transport.c:209
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:210
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "开始输入邮件;以 <CRLF>.<CRLF> 结束"
# camel/providers/smtp/camel-smtp-transport.c:210
# camel/providers/smtp/camel-smtp-transport.c:210
# camel/providers/smtp/camel-smtp-transport.c:211
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
msgid "Transaction failed"
msgstr "事务失败"
# camel/providers/smtp/camel-smtp-transport.c:214
# camel/providers/smtp/camel-smtp-transport.c:214
# camel/providers/smtp/camel-smtp-transport.c:215
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
msgid "A password transition is needed"
msgstr "必须传输密码"
# camel/providers/smtp/camel-smtp-transport.c:216
# camel/providers/smtp/camel-smtp-transport.c:216
# camel/providers/smtp/camel-smtp-transport.c:217
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
msgid "Authentication mechanism is too weak"
msgstr "认证机制太弱"
# camel/providers/smtp/camel-smtp-transport.c:218
# camel/providers/smtp/camel-smtp-transport.c:218
# camel/providers/smtp/camel-smtp-transport.c:219
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
msgid "Encryption required for requested authentication mechanism"
msgstr "请求的认证机制必须加密"
# camel/providers/smtp/camel-smtp-transport.c:220
# camel/providers/smtp/camel-smtp-transport.c:220
# camel/providers/smtp/camel-smtp-transport.c:221
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:222
msgid "Temporary authentication failure"
msgstr "临时认证失败"
# camel/providers/smtp/camel-smtp-transport.c:222
# camel/providers/smtp/camel-smtp-transport.c:222
# camel/providers/smtp/camel-smtp-transport.c:223
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:224
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:320
+#: camel/providers/smtp/camel-smtp-transport.c:300
#, c-format
msgid "Welcome response error: %s: possibly non-fatal"
msgstr "Welcome 应答错误: %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/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, fuzzy, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr ""
+"无法连接到 POP 服务器。\n"
+"发送用户名错误: %s"
+
+# 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:336
+#, fuzzy
+msgid "server does not appear to support SSL"
+msgstr "邮件的格式可能不正确"
+
+# 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:350
+#, fuzzy, c-format
+msgid "STARTTLS 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:1104
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, fuzzy
+msgid "STARTTLS response error"
+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:383
+#: camel/providers/smtp/camel-smtp-transport.c:458
#, c-format
msgid "SMTP server %s does not support requested authentication type %s"
msgstr "SMTP 服务器 %s 并不支持请求的认证类型 %s"
@@ -15453,7 +15824,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:421
+#: camel/providers/smtp/camel-smtp-transport.c:496
#, c-format
msgid "%sPlease enter the SMTP password for %s@%s"
msgstr "%s请为 %s@%s 输入 SMTP 密码"
@@ -15461,7 +15832,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:442
+#: camel/providers/smtp/camel-smtp-transport.c:517
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -15475,7 +15846,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:565
+#: camel/providers/smtp/camel-smtp-transport.c:642
#, c-format
msgid "SMTP server %s"
msgstr "SMTP 服务器 %s"
@@ -15483,57 +15854,50 @@ 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:567
+#: camel/providers/smtp/camel-smtp-transport.c:644
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "通过 %s 发送 SMTP 邮件"
-# camel/providers/smtp/camel-smtp-transport.c:581
-# camel/providers/smtp/camel-smtp-transport.c:581
-# camel/providers/smtp/camel-smtp-transport.c:591
-#: camel/providers/smtp/camel-smtp-transport.c:591
-msgid "Cannot send message: sender address not defined."
-msgstr "无法发送邮件: 发件人地址无定义。"
-
# 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:598
+#: camel/providers/smtp/camel-smtp-transport.c:662
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:603 mail/mail-ops.c:603
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
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:614
+#: camel/providers/smtp/camel-smtp-transport.c:678
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:624
+#: camel/providers/smtp/camel-smtp-transport.c:688
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:798
+#: camel/providers/smtp/camel-smtp-transport.c:838
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:820
+#: camel/providers/smtp/camel-smtp-transport.c:869
#, c-format
msgid "HELO request timed out: %s: non-fatal"
msgstr "HELLO 请求超时: %s: 非致命"
@@ -15541,7 +15905,7 @@ 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:840
+#: camel/providers/smtp/camel-smtp-transport.c:889
#, c-format
msgid "HELO response error: %s: non-fatal"
msgstr "HELLO 应答错误: %s: 非致命"
@@ -15549,14 +15913,14 @@ msgstr "HELLO 应答错误: %s: 非致命"
# 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:883
+#: camel/providers/smtp/camel-smtp-transport.c:937
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:889
+#: camel/providers/smtp/camel-smtp-transport.c:943
msgid "Error creating SASL authentication object."
msgstr "创建 SASL 认证对象错误。"
@@ -15566,8 +15930,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:904
-#: camel/providers/smtp/camel-smtp-transport.c:916
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
#, c-format
msgid "AUTH request timed out: %s"
msgstr "AUTH 请求超时: %s"
@@ -15575,21 +15939,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:925
+#: camel/providers/smtp/camel-smtp-transport.c:981
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:973
+#: camel/providers/smtp/camel-smtp-transport.c:1042
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:999
+#: camel/providers/smtp/camel-smtp-transport.c:1067
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr "MAIL FROM 请求超时: %s: 邮件未发送"
@@ -15597,20 +15961,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:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1081
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:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1105
#, 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:1054
+#: camel/providers/smtp/camel-smtp-transport.c:1121
#, c-format
msgid "RCPT TO <%s> failed"
msgstr "RCPT TO <%s> 失败"
@@ -15618,7 +15982,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:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1157
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr "DATA 请求超时: %s: 邮件未发送"
@@ -15629,7 +15993,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:1104
+#: camel/providers/smtp/camel-smtp-transport.c:1171
msgid "DATA response error"
msgstr "DATA 应答错误"
@@ -15639,8 +16003,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:1144
-#: camel/providers/smtp/camel-smtp-transport.c:1162
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr "DATA 发送超时: 消息终止: %s: 邮件未发送"
@@ -15650,14 +16014,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:1176
+#: camel/providers/smtp/camel-smtp-transport.c:1243
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:1199
+#: camel/providers/smtp/camel-smtp-transport.c:1266
#, c-format
msgid "RSET request timed out: %s"
msgstr "RSET 请求超时: %s"
@@ -15665,14 +16029,14 @@ 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:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1280
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:1236
+#: camel/providers/smtp/camel-smtp-transport.c:1303
#, c-format
msgid "QUIT request timed out: %s: non-fatal"
msgstr "QUIT 请求超时: %s: 非致命"
@@ -15680,7 +16044,7 @@ msgstr "QUIT 请求超时: %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:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1317
msgid "QUIT response error"
msgstr "QUIT 应答错误"
@@ -15727,7 +16091,7 @@ 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:135
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
msgid "attachment"
msgstr "附件"
@@ -15800,14 +16164,14 @@ 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:180
+#: composer/e-msg-composer-select-file.c:156
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:326
+#: composer/e-msg-composer-hdrs.c:333
msgid "Click here for the address book"
msgstr "点击此处以使用地址簿"
@@ -15817,7 +16181,7 @@ msgstr "点击此处以使用地址簿"
#.
#. * From:
#.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:363
msgid "From:"
msgstr "发件人:"
@@ -15827,7 +16191,7 @@ msgstr "发件人:"
#.
#. * Reply-To:
#.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:369
msgid "Reply-To:"
msgstr "回复到:"
@@ -15837,53 +16201,55 @@ msgstr "回复到:"
#.
#. * Subject:
#.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:380
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:387
+#: composer/e-msg-composer-hdrs.c:394
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:388
+#: composer/e-msg-composer-hdrs.c:395
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:391
+#: composer/e-msg-composer-hdrs.c:398
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:392
+#: composer/e-msg-composer-hdrs.c:399
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:395
+#: composer/e-msg-composer-hdrs.c:402
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:396
+#: composer/e-msg-composer-hdrs.c:403
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
-msgstr "输入将接收该邮件副本,但不出现在收件人列表中的收件人地址。"
+msgstr ""
+"输入将接收该邮件副本,但不出现在收件人列表中的收件"
+"地址。"
# composer/e-msg-composer-select-file.c:228
# ui/evolution-message-composer.xml.h:2
@@ -15891,7 +16257,7 @@ msgstr "输入将接收该邮件副本,但不出现在收件人列表中的收
# 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:291
+#: composer/e-msg-composer-select-file.c:267
#: ui/evolution-message-composer.xml.h:2
msgid "Attach a file"
msgstr "附件一个文件"
@@ -15899,7 +16265,7 @@ msgstr "附件一个文件"
# composer/e-msg-composer.c:743
# composer/e-msg-composer.c:747
# composer/e-msg-composer.c:695
-#: composer/e-msg-composer.c:697
+#: composer/e-msg-composer.c:718
#, c-format
msgid ""
"Error while reading file %s:\n"
@@ -15908,31 +16274,24 @@ msgstr ""
"读入文件 %s 时发声错误:\n"
"%s"
-# composer/e-msg-composer.c:943
-# composer/e-msg-composer.c:947
-# composer/e-msg-composer.c:912
-#: composer/e-msg-composer.c:914
-msgid "Save as..."
-msgstr "另存为..."
-
# composer/e-msg-composer.c:952
# composer/e-msg-composer.c:956
# composer/e-msg-composer.c:921
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:967
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:927
+#: composer/e-msg-composer.c:971
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:949
+#: composer/e-msg-composer.c:993
#, c-format
msgid "Error saving file: %s"
msgstr "保存文件错误: %s"
@@ -15940,7 +16299,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:968
+#: composer/e-msg-composer.c:1012
#, c-format
msgid "Error loading file: %s"
msgstr "读入文件错误: %s"
@@ -15948,7 +16307,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:999
+#: composer/e-msg-composer.c:1043
#, c-format
msgid "Error accessing file: %s"
msgstr "访问文件错误: %s"
@@ -15956,14 +16315,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:1007
+#: composer/e-msg-composer.c:1051
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:1014
+#: composer/e-msg-composer.c:1058
#, c-format
msgid ""
"Unable to seek on file: %s\n"
@@ -15975,7 +16334,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:1021
+#: composer/e-msg-composer.c:1065
#, c-format
msgid ""
"Unable to truncate file: %s\n"
@@ -15987,7 +16346,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:1030
+#: composer/e-msg-composer.c:1074
#, c-format
msgid ""
"Error autosaving message: %s\n"
@@ -15999,7 +16358,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:1132
+#: composer/e-msg-composer.c:1176
msgid ""
"Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"
@@ -16010,7 +16369,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:1290
+#: composer/e-msg-composer.c:1334
msgid ""
"This message has not been sent.\n"
"\n"
@@ -16023,35 +16382,35 @@ msgstr ""
# composer/e-msg-composer.c:1412
# composer/e-msg-composer.c:1329
# composer/e-msg-composer.c:1295
-#: composer/e-msg-composer.c:1297
+#: composer/e-msg-composer.c:1341
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:1320
+#: composer/e-msg-composer.c:1364
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:1469
+#: composer/e-msg-composer.c:1513
msgid "Insert File"
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:1855 composer/e-msg-composer.c:2447
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
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:2464
+#: composer/e-msg-composer.c:2665
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
@@ -16062,7 +16421,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:2487 composer/e-msg-composer.c:2542
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
@@ -16073,7 +16432,7 @@ msgstr ""
# composer/evolution-composer.c:367
# composer/evolution-composer.c:367
# composer/evolution-composer.c:367
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:376
msgid ""
"Could not create composer window, because you have not yet\n"
"configured any identities in the mail component."
@@ -16084,7 +16443,7 @@ msgstr ""
# composer/evolution-composer.c:382
# composer/evolution-composer.c:382
# composer/evolution-composer.c:382
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
msgid "Cannot initialize Evolution's composer."
msgstr "无法初始化 Evolution 的撰写器。"
@@ -16172,18 +16531,33 @@ msgstr "主题含有"
msgid "Subject does not contain"
msgstr "主题不含有"
+# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1915
+# mail/mail-display.c:106
+# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:2034
+# 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:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"指定名称的文件已经存在。\n"
+"覆盖它?"
+
# 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:360 mail/mail-session.c:269
+#: e-util/e-passwords.c:363 mail/mail-session.c:269
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:362 mail/mail-session.c:270
+#: e-util/e-passwords.c:365 mail/mail-session.c:270
msgid "Remember this password for the remainder of this session"
msgstr "在本会话中记住该密码"
@@ -16338,322 +16712,50 @@ msgstr "%H:%M"
msgid "%I %p"
msgstr "%I %p"
-# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-# executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "进行概括的 Evolution 组件。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-# executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Evolution 实施概要组件车间。"
-
-# my-evolution/component-factory.c:153
-# my-evolution/component-factory.c:153
-# executive-summary/component/component-factory.c:151
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "无法初始化 Evolution 的实施概要组件。"
-
-# shell/e-shell-importer.c:617
-# shell/e-shell-importer.c:617
-# executive-summary/component/e-summary-callbacks.c:125
-#: executive-summary/component/e-summary-callbacks.c:125
-msgid "Select a service"
-msgstr "选择一个服务"
-
-# executive-summary/component/e-summary-callbacks.c:289
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"您可以为实施概要背景选择一个不同的 HTML 页面。\n"
-"\n"
-"若需默认值使其保持为空即可"
-
-# executive-summary/component/e-summary-url.c:69
-# executive-summary/component/e-summary-url.c:74
-# executive-summary/component/e-summary-url.c:81
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "以默认 GNOME 应用程序打开 %s"
-
-# executive-summary/component/e-summary-url.c:70
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "以默认 GNOME 网络浏览器打开 %s"
-
-# calendar/gui/dialogs/alarm-page.c:381
-# calendar/gui/dialogs/alarm-page.c:381
-# executive-summary/component/e-summary-url.c:71
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "给 %s 发送一封电子邮件"
-
-# ui/evolution.xml.h:3
-# ui/evolution.xml.h:3
-# executive-summary/component/e-summary-url.c:72
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "将视图改变为 %s"
-
-# calendar/gui/print.c:2306
-# calendar/gui/print.c:2306
-# executive-summary/component/e-summary-url.c:73
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "运行 %s"
-
-# ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-# 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-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-# 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
-# executive-summary/component/e-summary-url.c:75
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "关闭 %s"
-
-# ui/evolution.xml.h:17
-# ui/evolution.xml.h:17
-# executive-summary/component/e-summary-url.c:76
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "将 %s 移动到左边"
-
-# executive-summary/component/e-summary-url.c:77
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "将 %s 移动到右边"
-
-# executive-summary/component/e-summary-url.c:78
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "将 %s 移动岛上一行"
-
-# executive-summary/component/e-summary-url.c:79
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "将 %s 移动到下一行"
-
-# mail/mail-local.c:1416
-# mail/mail-local.c:1416
-# executive-summary/component/e-summary-url.c:80
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "配置 %s"
-
-# addressbook/printing/e-contact-print.glade.h:25
-# addressbook/printing/e-contact-print.glade.h:25
-# executive-summary/component/e-summary-url.c:553
-#: executive-summary/component/e-summary-url.c:553
-msgid "page"
-msgstr "页面"
-
-# shell/e-shell-folder-commands.c:488
-# shell/e-shell-folder-commands.c:488
-# executive-summary/component/e-summary.c:925
-#: executive-summary/component/e-summary.c:925
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"无法打开 HTML 文件:\n"
-"%s"
-
-# shell/e-shell-importer.c:474
-# shell/e-shell-importer.c:474
-# executive-summary/component/e-summary.c:939
-#: executive-summary/component/e-summary.c:939
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"读入数据错误:\n"
-"%s"
-
-# executive-summary/component/e-summary.c:957
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr "文件中没有服务空间。\n"
-
-# executive-summary/component/main.c:61
-#: executive-summary/component/main.c:61
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"实施概要组件无法初始化 Bonobo。\n"
-"如果出现关于 RootPOA 的警告信息,可能表明\n"
-"您是与 GOAD 而不是 OAF 一起编译的 Bonobo。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-# executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "RDF 概要车间。"
-
-# 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
-# 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
-# executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF 概要"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "测试 bonobo 组件车间。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "测试组件车间。"
-
-# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "测试 bonobo 服务"
-
-# widgets/misc/e-charset-picker.c:58
-# widgets/misc/e-charset-picker.c:58
-# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "测试服务"
-
-# widgets/misc/e-messagebox.c:166
-# widgets/misc/e-messagebox.c:166
-# executive-summary/test-service/rdf-summary.c:512
-# executive-summary/test-service/rdf-summary.c:549
-# executive-summary/test-service/rdf-summary.c:594
-# widgets/misc/e-messagebox.c:166
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "错误"
-
-# executive-summary/test-service/rdf-summary.c:775
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "自动更新"
-
-# calendar/gui/e-itip-control.c:787
-# calendar/gui/e-itip-control.c:787
-# executive-summary/test-service/rdf-summary.c:785
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "现在更新"
-
-# calendar/gui/e-meeting-time-sel.c:515
-# calendar/gui/e-meeting-time-sel.c:518
-# executive-summary/test-service/rdf-summary.c:795
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "更新间隔 "
-
-# filter/filter-datespec.c:80
#: filter/filter-datespec.c:80
msgid "year"
msgstr "年"
-# filter/filter-datespec.c:80
#: filter/filter-datespec.c:80
msgid "years"
msgstr "年"
-# filter/filter-datespec.c:81
#: filter/filter-datespec.c:81
msgid "month"
msgstr "月"
-# filter/filter-datespec.c:81
#: filter/filter-datespec.c:81
msgid "months"
msgstr "月"
-# filter/filter-datespec.c:82
#: filter/filter-datespec.c:82
msgid "week"
msgstr "周"
-# filter/filter-datespec.c:82
#: filter/filter-datespec.c:82
msgid "weeks"
msgstr "周"
-# filter/filter-datespec.c:84
#: filter/filter-datespec.c:84
msgid "hour"
msgstr "小时"
-# filter/filter-datespec.c:85
#: filter/filter-datespec.c:85
msgid "minute"
msgstr "分钟"
-# filter/filter-datespec.c:86
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "秒"
-
-# filter/filter-datespec.c:86
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
msgid "seconds"
msgstr "秒"
-# filter/filter-datespec.c:194
#: filter/filter-datespec.c:194
msgid "You have forgotten to choose a date."
msgstr "您忘记选择日期了。"
-# filter/filter-datespec.c:196
#: filter/filter-datespec.c:196
msgid "You have chosen an invalid date."
msgstr "您选择了无效的日期。"
-# filter/filter-datespec.c:271
#: filter/filter-datespec.c:271
msgid ""
"The message's date will be compared against\n"
@@ -16664,7 +16766,6 @@ msgstr ""
"日期或者虚拟文件夹打开的\n"
"日期进行比较。"
-# filter/filter-datespec.c:294
#: filter/filter-datespec.c:294
msgid ""
"The message's date will be compared against\n"
@@ -16673,7 +16774,6 @@ msgstr ""
"邮件的日期将与您在这里\n"
"指定的日期进行比较。"
-# filter/filter-datespec.c:334
#: filter/filter-datespec.c:334
msgid ""
"The message's date will be compared against\n"
@@ -16684,77 +16784,63 @@ msgstr ""
"运行的时间进行比较;\n"
"例如:“一周以前”。"
-# filter/filter-datespec.c:369
#. keep in sync with FilterDatespec_type!
#: filter/filter-datespec.c:369
msgid "the current time"
msgstr "当前时间"
-# filter/filter-datespec.c:369
#: filter/filter-datespec.c:369
msgid "a time you specify"
msgstr "您指定的时间"
-# filter/filter-datespec.c:370
#: filter/filter-datespec.c:370
msgid "a time relative to the current time"
msgstr "相对于当前时间的时间"
-# filter/filter-datespec.c:394
#. The dialog
#: filter/filter-datespec.c:394
msgid "Select a time to compare against"
msgstr "选择用于比较的时间"
-# filter/filter-datespec.c:428
#. The label
#: filter/filter-datespec.c:428
msgid "Compare against"
msgstr "比较"
-# filter/filter-datespec.c:546 filter/filter-datespec.c:725
#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
msgid "now"
msgstr "现在"
-# filter/filter-datespec.c:575
#: filter/filter-datespec.c:575
msgid " ago"
msgstr " 过去"
-# filter/filter-datespec.c:621
#: filter/filter-datespec.c:621
msgid "ago"
msgstr "过去"
-# filter/filter-datespec.c:711 mail/message-list.c:973
-#: filter/filter-datespec.c:711 mail/message-list.c:973
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
msgid "%b %d %l:%M %p"
msgstr "%b %d %l:%M %p"
-# filter/filter-datespec.c:722
#: filter/filter-datespec.c:722
msgid "<click here to select a date>"
msgstr "<点击这里以选择日期>"
-# filter/filter-editor.c:132 filter/filter.glade.h:3
#: filter/filter-editor.c:132 filter/filter.glade.h:3
msgid "Filter Rules"
msgstr "过滤规则"
-# filter/filter-filter.c:487
#. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
msgid "Then"
msgstr "则"
-# filter/filter-filter.c:501
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
msgid "Add action"
msgstr "添加动作"
-# filter/filter-folder.c:156
-#: filter/filter-folder.c:156
+#: filter/filter-folder.c:147
msgid ""
"You forgot to choose a folder.\n"
"Please go back and specify a valid folder to deliver mail to."
@@ -16764,24 +16850,12 @@ msgstr ""
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:837
-# filter/filter-folder.c:239 filter/vfolder-rule.c:365
# mail/mail-account-gui.c:834
-#: filter/filter-folder.c:239 filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:834
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
msgid "Select Folder"
msgstr "选择文件夹"
-# filter/filter-folder.c:274
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "输入文件夹 URI"
-
-# filter/filter-folder.c:321
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<点击这里以便选择文件夹>"
-
-# filter/filter-input.c:198
#: filter/filter-input.c:198
#, c-format
msgid ""
@@ -16791,380 +16865,342 @@ msgstr ""
"常规表达式错误 “%s”:\n"
"%s"
-# filter/filter-part.c:488 shell/evolution-test-component.c:41
-#: filter/filter-part.c:488 shell/evolution-test-component.c:41
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
msgid "Test"
msgstr "测试"
-# filter/filter-rule.c:217
#: filter/filter-rule.c:217
msgid "You must name this filter."
msgstr "您必须为该过滤规则命名。"
-# filter/filter-rule.c:720
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
msgid "Rule name: "
msgstr "规则名:"
-# filter/filter-rule.c:724
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
msgid "Untitled"
msgstr "无标题"
-# filter/filter-rule.c:741
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
msgid "If"
msgstr "如果"
-# filter/filter-rule.c:759
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
msgid "Execute actions"
msgstr "执行动作"
-# filter/filter-rule.c:763
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
msgid "if all criteria are met"
msgstr "如果满足所有条件"
-# filter/filter-rule.c:768
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+#, fuzzy
+msgid "if any criterion are met"
msgstr "如果满足任一条件"
-# filter/filter-rule.c:779
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
msgid "Add criterion"
msgstr "添加条件"
-# filter/filter-rule.c:864
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
msgid "incoming"
msgstr "接收"
-# filter/filter-rule.c:864
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
msgid "outgoing"
msgstr "发送"
-# filter/filter.glade.h:1
#: filter/filter.glade.h:1
msgid "Edit Filters"
msgstr "编辑过滤规则"
-# filter/filter.glade.h:2
#: filter/filter.glade.h:2
msgid "Edit VFolders"
msgstr "编辑虚拟文件夹"
-# filter/filter.glade.h:4
#: filter/filter.glade.h:4
msgid "Incoming"
msgstr "接收"
-# filter/filter.glade.h:5
#: filter/filter.glade.h:5
msgid "Outgoing"
msgstr "发送"
-# filter/filter.glade.h:6 filter/vfolder-editor.c:130
#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
msgid "Virtual Folders"
msgstr "虚拟文件夹"
-# filter/filter.glade.h:11
#: filter/filter.glade.h:11
msgid "specific folders only"
msgstr "仅指定文件夹"
-# filter/filter.glade.h:12
#: filter/filter.glade.h:12
msgid "vFolder Sources"
msgstr "虚拟文件夹来源"
-# filter/filter.glade.h:13
#: filter/filter.glade.h:13
msgid "with all active remote folders"
msgstr "以全部活跃远程文件夹"
-# filter/filter.glade.h:14
#: filter/filter.glade.h:14
msgid "with all local and active remote folders"
msgstr "以全部本地和活跃远程文件夹"
-# filter/filter.glade.h:15
#: filter/filter.glade.h:15
msgid "with all local folders"
msgstr "以所有本地文件夹"
-# filter/libfilter-i18n.h:2
#. Automatically generated. Do not edit.
#: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "指定分数"
+
+#: filter/libfilter-i18n.h:3
msgid "Assign Color"
msgstr "指定颜色"
-# filter/libfilter-i18n.h:3
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
msgid "Assign Score"
msgstr "指定分数"
-# filter/libfilter-i18n.h:4
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
msgid "Attachments"
msgstr "附件"
-# filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:5
+# addressbook/gui/contact-editor/fulladdr.glade.h:23
+# addressbook/gui/contact-editor/fulladdr.glade.h:23
+# my-evolution/Locations.h:213
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "伯利兹"
+
+#: filter/libfilter-i18n.h:7
msgid "contains"
msgstr "含有"
-# filter/libfilter-i18n.h:6
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:8
msgid "Copy to Folder"
msgstr "复制到文件夹"
-# filter/libfilter-i18n.h:7
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:9
msgid "Date received"
msgstr "接收日期"
-# filter/libfilter-i18n.h:8
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:10
msgid "Date sent"
msgstr "发送日期"
-# filter/libfilter-i18n.h:10
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:12
msgid "Deleted"
msgstr "已删除"
-# filter/libfilter-i18n.h:11
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:13
msgid "does not contain"
msgstr "不含有"
-# filter/libfilter-i18n.h:12
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:14
msgid "does not end with"
msgstr "不以之结尾"
-# filter/libfilter-i18n.h:13
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:15
msgid "does not exist"
msgstr "不存在"
-# filter/libfilter-i18n.h:14
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:16
msgid "does not sound like"
msgstr "听起来不像"
-# filter/libfilter-i18n.h:15
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:17
msgid "does not start with"
msgstr "不以之开始"
-# filter/libfilter-i18n.h:16
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:18
msgid "Do Not Exist"
msgstr "不存在"
-# filter/libfilter-i18n.h:17
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
msgid "Draft"
msgstr "草稿"
-# filter/libfilter-i18n.h:18
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
msgid "ends with"
msgstr "以之结束"
-# filter/libfilter-i18n.h:19
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
msgid "Execute Shell Command"
msgstr "执行 Shell 命令"
-# filter/libfilter-i18n.h:20
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:22
msgid "Exist"
msgstr "存在"
-# filter/libfilter-i18n.h:21
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
msgid "exists"
msgstr "存在"
-# filter/libfilter-i18n.h:22
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
msgid "Expression"
msgstr "表达式"
-# filter/libfilter-i18n.h:23
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
msgid "Important"
msgstr "重要"
-# filter/libfilter-i18n.h:24
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:27
msgid "is"
msgstr "是"
-# filter/libfilter-i18n.h:25
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:28
msgid "is after"
msgstr "以后"
-# filter/libfilter-i18n.h:26
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:29
msgid "is before"
msgstr "以前"
-# filter/libfilter-i18n.h:27
-#: filter/libfilter-i18n.h:27
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "已标志"
+
+#: filter/libfilter-i18n.h:31
msgid "is greater than"
msgstr "大于"
-# filter/libfilter-i18n.h:28
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:32
msgid "is less than"
msgstr "小于"
-# filter/libfilter-i18n.h:29
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:33
msgid "is not"
msgstr "不是"
-# filter/libfilter-i18n.h:30
-#: filter/libfilter-i18n.h:30
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "已标志"
+
+#: filter/libfilter-i18n.h:35
msgid "Mailing list"
msgstr "邮件列表"
-# filter/libfilter-i18n.h:31
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:36
msgid "Message Body"
msgstr "邮件体"
-# filter/libfilter-i18n.h:32
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:37
msgid "Message Header"
msgstr "邮件头"
-# filter/libfilter-i18n.h:33
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:38
msgid "Move to Folder"
msgstr "移动到文件夹"
-# calendar/gui/e-itip-control.c:986
-# calendar/gui/e-itip-control.c:986
-# filter/libfilter-i18n.h:34 mail/message-list.c:671
-# mail/message-list.etspec.h:4
-#: filter/libfilter-i18n.h:34 mail/message-list.c:671
-#: mail/message-list.etspec.h:4
-msgid "Needs Reply"
-msgstr "需要回复"
+# calendar/gui/dialogs/alarm-options.glade.h:3
+# calendar/gui/dialogs/alarm-options.glade.h:3
+# calendar/gui/dialogs/alarm-options.glade.h:3
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "Play Sound"
+msgstr "播放声音:"
-# filter/libfilter-i18n.h:35
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
msgid "Read"
msgstr "已读"
-# filter/libfilter-i18n.h:36
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:41
msgid "Recipients"
msgstr "收件人"
-# filter/libfilter-i18n.h:37
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:42
msgid "Regex Match"
msgstr "常规表达式匹配"
-# filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:43
msgid "Replied to"
msgstr "已回复"
# mail/message-list.etspec.h:5
# mail/message-list.etspec.h:6
-# filter/libfilter-i18n.h:39 filter/score-rule.c:204 filter/score-rule.c:206
# mail/message-list.etspec.h:6
-#: filter/libfilter-i18n.h:39 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
+#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
msgid "Score"
msgstr "分数"
-# filter/libfilter-i18n.h:40 mail/mail-callbacks.c:1534
-#: filter/libfilter-i18n.h:40 mail/mail-callbacks.c:1548
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
msgid "Sender"
msgstr "发件人"
-# filter/libfilter-i18n.h:41
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:46
msgid "Set Status"
msgstr "设置状态"
-# filter/libfilter-i18n.h:42
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:47
msgid "Size (kB)"
msgstr "大小 (kB)"
-# filter/libfilter-i18n.h:43
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:48
msgid "sounds like"
msgstr "听起来象"
-# filter/libfilter-i18n.h:44
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:49
msgid "Source Account"
msgstr "来源帐号"
-# filter/libfilter-i18n.h:45
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:50
msgid "Specific header"
msgstr "指定邮件头"
-# filter/libfilter-i18n.h:46
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:51
msgid "starts with"
msgstr "以之开始"
-# filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:53
msgid "Stop Processing"
msgstr "停止处理"
# mail/message-list.etspec.h:9
# mail/message-list.etspec.h:10
-# filter/libfilter-i18n.h:49 mail/mail-format.c:932
# mail/message-list.etspec.h:10
-#: filter/libfilter-i18n.h:49 mail/mail-format.c:932
-#: mail/message-list.etspec.h:10
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
msgid "Subject"
msgstr "主题"
-# filter/rule-editor.c:179
#: filter/rule-editor.c:179
msgid "Rules"
msgstr "规则"
-# filter/rule-editor.c:287
-#: filter/rule-editor.c:287
+#: filter/rule-editor.c:286
msgid "Add Rule"
msgstr "添加规则"
-# filter/rule-editor.c:360
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:361
msgid "Edit Rule"
msgstr "编辑规则"
-# filter/score-editor.c:130
#: filter/score-editor.c:130
msgid "Score Rules"
msgstr "计分规则"
-# filter/vfolder-rule.c:204
#: filter/vfolder-rule.c:204
msgid "You must name this vfolder."
msgstr "您必须为该虚拟文件夹命名。"
-# filter/vfolder-rule.c:213
#: filter/vfolder-rule.c:213
msgid "You need to to specify at least one folder as a source."
msgstr "您至少需要把一个文件夹指定为源。"
@@ -17182,7 +17218,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:107
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
#: importers/pine-importer.c:101
msgid "Importing..."
msgstr "正在导入..."
@@ -17193,7 +17229,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:109
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
#: importers/pine-importer.c:103
msgid "Please wait"
msgstr "请等待"
@@ -17204,7 +17240,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:689
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
#: importers/pine-importer.c:365
#, c-format
msgid "Importing %s as %s"
@@ -17216,7 +17252,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:782
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
#: importers/pine-importer.c:471
#, c-format
msgid "Scanning %s"
@@ -17228,8 +17264,8 @@ 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:958
-#: importers/pine-importer.c:637 mail/component-factory.c:100
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/pine-importer.c:637 mail/component-factory.c:101
msgid "Mail"
msgstr "邮件"
@@ -17269,38 +17305,98 @@ msgstr ""
"Evolution 找到了 GnomeCard 文件。\n"
"您是否希望把它们导入 Evolution?"
+# calendar/gui/print.c:2280
+# calendar/gui/print.c:2280
+# calendar/gui/print.c:2280
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "优先级:%s"
+
+#: importers/netscape-importer.c:653
+msgid ""
+"Some of your Netscape email filters are based on\n"
+"email priorities, which are not used in Evolution.\n"
+"Instead, Evolution provides scores in the range of\n"
+"-3 to 3 that can be assigned to emails and filtered\n"
+"accordingly.\n"
+"\n"
+"As a workaround, a set of filters called \"Priority Filter\"\n"
+"was added that converts Netscape's email priorities into\n"
+"Evolution's scores, and the affected filters use scores instead\n"
+"of priorities. Check the imported filters to make sure\n"
+"everything still works as intended."
+msgstr ""
+
+#: importers/netscape-importer.c:677
+msgid ""
+"Some of your Netscape email filters use\n"
+"the \"Ignore Thread\" or \"Watch Thread\"\n"
+"feature, which is not supported in Evolution.\n"
+"These filters will be dropped."
+msgstr ""
+
+#: importers/netscape-importer.c:694
+msgid ""
+"Some of your Netscape email filters test the\n"
+"body of emails for (in)equality to a given string,\n"
+"which is not supported in Evolution. Those filters\n"
+"were modified to test whether that string is or is not\n"
+"contained in the message body."
+msgstr ""
+
# importers/netscape-importer.c:106
# importers/netscape-importer.c:106
# importers/netscape-importer.c:106
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:1220
msgid "Evolution is importing your old Netscape data"
msgstr "Evolution 正在导入您原来的 Netscape 数据"
+# mail/mail-ops.c:1058 shell/e-local-storage.c:178
+# mail/mail-ops.c:1060 shell/e-local-storage.c:178
+# mail/mail-ops.c:1103 shell/e-local-storage.c:178
+#: importers/netscape-importer.c:1865
+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
+#, fuzzy
+msgid "Scanning mail filters"
+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:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2031 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:897
+#: importers/netscape-importer.c:2040
msgid "Starting import"
msgstr "开始导入"
# importers/netscape-importer.c:963
# importers/netscape-importer.c:963
# importers/netscape-importer.c:963
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
msgid "Settings"
msgstr "设置"
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "编辑过滤规则"
+
# importers/netscape-importer.c:984
# importers/netscape-importer.c:984
# importers/netscape-importer.c:984
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2154
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
@@ -17333,76 +17429,141 @@ msgstr ""
msgid "Pine"
msgstr "Pine"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Evolution 撰写器车间。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Evolution 任务控制车间"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Evolution 撰写器车间。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Evolution 撰写器车间。"
+
# mail/GNOME_Evolution_Mail.oaf.in.h:1
# mail/GNOME_Evolution_Mail.oaf.in.h:1
# mail/GNOME_Evolution_Mail.oaf.in.h:1 notes/GNOME_Evolution_Notes.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1 notes/GNOME_Evolution_Notes.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
msgid "Evolution component for handling mail."
msgstr "Evolution 处理邮件组件。"
# mail/GNOME_Evolution_Mail.oaf.in.h:2
# mail/GNOME_Evolution_Mail.oaf.in.h:2
# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
msgid "Evolution mail composer."
msgstr "Evolution 邮件撰写器。"
# mail/GNOME_Evolution_Mail.oaf.in.h:3
# mail/GNOME_Evolution_Mail.oaf.in.h:3
# mail/GNOME_Evolution_Mail.oaf.in.h:3
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
msgid "Evolution mail executive summary component."
msgstr "Evolution 邮件实施概要组件。"
# mail/GNOME_Evolution_Mail.oaf.in.h:4
# mail/GNOME_Evolution_Mail.oaf.in.h:4
# mail/GNOME_Evolution_Mail.oaf.in.h:4
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
msgid "Evolution mail folder display component."
msgstr "Evolution 邮件文件夹显示组件。"
# mail/GNOME_Evolution_Mail.oaf.in.h:5
# mail/GNOME_Evolution_Mail.oaf.in.h:5
# mail/GNOME_Evolution_Mail.oaf.in.h:5
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
msgid "Evolution mail folder factory component."
msgstr "Evolution 邮件文件夹车间组件。"
# mail/GNOME_Evolution_Mail.oaf.in.h:6
# mail/GNOME_Evolution_Mail.oaf.in.h:6
# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
msgid "Factory for the Evolution composer."
msgstr "Evolution 撰写器车间。"
# mail/GNOME_Evolution_Mail.oaf.in.h:7
# mail/GNOME_Evolution_Mail.oaf.in.h:7
# mail/GNOME_Evolution_Mail.oaf.in.h:7
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
msgid "Factory for the Mail Summary component."
msgstr "邮件概要组件车间。"
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+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
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "帐号"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+msgid "Mail Preferences"
+msgstr ""
+
# mail/GNOME_Evolution_Mail.oaf.in.h:8
# mail/GNOME_Evolution_Mail.oaf.in.h:8
# mail/GNOME_Evolution_Mail.oaf.in.h:8
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
msgid "Mail configuration interface"
msgstr "邮件配置界面"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+msgid "This Page can be used to configure the Fonts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+msgid "This page can be used to configure E-Mail Accounts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19
+msgid "This page can be used to configure Mailer preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:20
+msgid "This page can be used to configure the Composer"
+msgstr ""
+
# mail/component-factory.c:100
# mail/component-factory.c:100
# mail/component-factory.c:100
-#: mail/component-factory.c:100
+#: mail/component-factory.c:101
msgid "Folder containing mail"
msgstr "文件夹含有邮件"
-# mail/component-factory.c:101
-# mail/component-factory.c:101
-# mail/component-factory.c:101
-#: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
-msgstr "邮件存储文件夹 (内部)"
-
# mail/component-factory.c:102
# mail/component-factory.c:102
# mail/component-factory.c:102
@@ -17417,57 +17578,57 @@ msgstr "虚拟已删除邮件箱"
msgid "Virtual Trash folder"
msgstr "虚拟已删除邮件文件夹"
-# mail/component-factory.c:129
-# mail/component-factory.c:129
-# mail/component-factory.c:129
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "无法连接到存储: %s"
-
# mail/component-factory.c:147
# mail/component-factory.c:147
# mail/component-factory.c:147
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
msgid "This folder cannot contain messages."
msgstr "该文件夹不能含有邮件。"
# mail/component-factory.c:432
# mail/component-factory.c:432
# mail/component-factory.c:432
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
msgid "Properties..."
msgstr "属性..."
# mail/component-factory.c:432
# mail/component-factory.c:432
# mail/component-factory.c:432
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
msgid "Change this folder's properties"
msgstr "改变该文件夹的属性"
# mail/component-factory.c:783
# mail/component-factory.c:783
# mail/component-factory.c:786
-#: mail/component-factory.c:800
+#: mail/component-factory.c:766
msgid ""
"Some of your mail settings seem corrupt, please check that everything is in "
"order."
-msgstr "您的某些邮件设置好像已崩溃,请按顺序检查所有内容。"
+msgstr ""
+"您的某些邮件设置好像已崩溃,请按顺序检查所有内容。"
+
+# mail/mail-callbacks.c:230
+# mail/mail-callbacks.c:230
+# mail/mail-callbacks.c:187
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr "您还没有设置邮件传输方法"
# mail/component-factory.c:951
# mail/component-factory.c:951
# mail/component-factory.c:955
-#: mail/component-factory.c:969
+#: mail/component-factory.c:967
msgid "New Mail Message"
msgstr "新建邮件"
-# mail/component-factory.c:951
-# mail/component-factory.c:951
-# mail/component-factory.c:955
-#: mail/component-factory.c:969
-msgid "New _Mail Message"
-msgstr "新建邮件(_M)"
+# 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:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "邮件(_M)"
# mail/component-factory.c:975
# mail/component-factory.c:975
@@ -17490,17 +17651,25 @@ msgstr "无法初始化 Evolution 的邮件配置组件。"
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:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "正在连接服务器..."
+
# mail/component-factory.c:1206
# mail/component-factory.c:1206
# mail/component-factory.c:1211
-#: mail/component-factory.c:1225
+#: mail/component-factory.c:1250
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:273
+#: mail/folder-browser-ui.c:342
#, c-format
msgid "Properties for \"%s\""
msgstr "“%s”的属性"
@@ -17508,14 +17677,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:275
+#: mail/folder-browser-ui.c:344
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:298 mail/mail-display.c:298
+#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "无法创建临时目录: %s"
@@ -17523,7 +17692,7 @@ msgstr "无法创建临时目录: %s"
# mail/folder-browser.c:731
# mail/folder-browser.c:751
# mail/folder-browser.c:752
-#: mail/folder-browser.c:752
+#: mail/folder-browser.c:760
#, c-format
msgid "%d new"
msgstr "%d 新"
@@ -17534,21 +17703,21 @@ msgstr "%d 新"
# mail/folder-browser.c:765
# mail/folder-browser.c:755 mail/folder-browser.c:763
# mail/folder-browser.c:766
-#: mail/folder-browser.c:755 mail/folder-browser.c:763
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
msgid ", "
msgstr ", "
# mail/folder-browser.c:735
# mail/folder-browser.c:756
# mail/folder-browser.c:757
-#: mail/folder-browser.c:757
+#: mail/folder-browser.c:765
#, c-format
msgid "%d hidden"
msgstr "隐藏 %d 个"
# mail/folder-browser.c:759
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:767
#, c-format
msgid "%d visible"
msgstr "%d 个可见"
@@ -17556,7 +17725,7 @@ msgstr "%d 个可见"
# mail/folder-browser.c:740
# mail/folder-browser.c:763
# mail/folder-browser.c:764
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:772
#, c-format
msgid "%d selected"
msgstr "选择 %d 个"
@@ -17564,7 +17733,7 @@ msgstr "选择 %d 个"
# mail/folder-browser.c:763
# mail/folder-browser.c:768
# mail/folder-browser.c:769
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:777
#, c-format
msgid "%d unsent"
msgstr "%d 个未发送"
@@ -17572,7 +17741,7 @@ msgstr "%d 个未发送"
# mail/folder-browser.c:765
# mail/folder-browser.c:770
# mail/folder-browser.c:771
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:779
#, c-format
msgid "%d sent"
msgstr "%d 个已发送"
@@ -17580,244 +17749,257 @@ msgstr "%d 个已发送"
# mail/folder-browser.c:767
# mail/folder-browser.c:772
# mail/folder-browser.c:773
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:781
#, c-format
msgid "%d total"
msgstr "共 %d 个"
-# mail/folder-browser.c:1049
-# mail/folder-browser.c:1054
-# mail/folder-browser.c:1055
-#: mail/folder-browser.c:1055
-msgid "Create vFolder from Search"
-msgstr "根据搜索创建虚拟文件夹"
+# ui/evolution-mail-message.xml.h:8
+# ui/evolution-mail-message.xml.h:8
+# ui/evolution-mail-message.xml.h:8
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "从邮件创建虚拟文件夹(_V)"
# mail/folder-browser.c:1430
# mail/folder-browser.c:1437
# mail/folder-browser.c:1438
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1581
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:1439
+#: mail/folder-browser.c:1582
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:1440
+#: mail/folder-browser.c:1583
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:1441
+#: mail/folder-browser.c:1584
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:1445
+#: mail/folder-browser.c:1588
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:1446
+#: mail/folder-browser.c:1589
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:1447
+#: mail/folder-browser.c:1590
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:1448
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
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:1456 ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
msgid "_Edit as New Message..."
msgstr "作为新邮件进行编辑(_E)..."
-# 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
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:107
-msgid "_Save As..."
-msgstr "另存为(_S)..."
-
# mail/folder-browser.c:1450
# mail/folder-browser.c:1457
# mail/folder-browser.c:1458
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1611
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:1462 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
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:1463 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
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:1464 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
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:1465
+#: mail/folder-browser.c:1618
msgid "_Forward"
msgstr "转发(_F)"
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+# calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+# calendar/gui/dialogs/task-details-page.glade.h:4
+# calendar/gui/e-calendar-table.c:480 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/dialogs/task-details-page.glade.h:4
+# calendar/gui/e-calendar-table.c:480 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/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:1623
+#, fuzzy
+msgid "Fla_g Completed"
+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
+# widgets/misc/e-filter-bar.h:95
+# widgets/misc/e-filter-bar.h:95
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "清除"
+
# mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:43
# mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:43
# mail/folder-browser.c:1467 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:1628 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:1468 ui/evolution-mail-message.xml.h:45
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
msgstr "标记为未读(_N)"
# mail/folder-browser.c:1461
# mail/folder-browser.c:1468
# mail/folder-browser.c:1469
-#: mail/folder-browser.c:1469
+#: mail/folder-browser.c:1630
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
# mail/folder-browser.c:1462
# mail/folder-browser.c:1469
# mail/folder-browser.c:1470
-#: mail/folder-browser.c:1470
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
msgstr "标记为不重要(_P)"
-# calendar/gui/e-itip-control.c:896
-# calendar/gui/e-itip-control.c:896
-# mail/folder-browser.c:1471
-#: mail/folder-browser.c:1471
-msgid "Mark as Needing Reply"
-msgstr "标记为需要回复"
-
-# calendar/gui/e-itip-control.c:896
-# calendar/gui/e-itip-control.c:896
-# mail/folder-browser.c:1472
-#: mail/folder-browser.c:1472
-msgid "Mark as Not Needing Reply"
-msgstr "标记为不需要回复"
+# 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:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "反删除(_U)"
# mail/folder-browser.c:1466
# mail/folder-browser.c:1475
# mail/folder-browser.c:1476
-#: mail/folder-browser.c:1476
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
msgstr "移动到文件夹(_M)..."
# mail/folder-browser.c:1467
# mail/folder-browser.c:1476
# mail/folder-browser.c:1477
-#: mail/folder-browser.c:1477
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
msgid "_Copy to Folder..."
msgstr "复制到文件夹..."
-# 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:1479 ui/evolution-mail-message.xml.h:109
-msgid "_Undelete"
-msgstr "反删除(_U)"
+# ui/evolution-mail-message.xml.h:98
+# ui/evolution-mail-message.xml.h:98
+# my-evolution/Locations.h:1192
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+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:1483 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
msgstr "将发件人添加到地址簿"
# mail/folder-browser.c:1476
# mail/folder-browser.c:1485
# mail/folder-browser.c:1486
-#: mail/folder-browser.c:1486
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
msgstr "应用过滤规则"
# mail/folder-browser.c:1478
# mail/folder-browser.c:1487
# mail/folder-browser.c:1488
-#: mail/folder-browser.c:1488
-msgid "Create Ru_le From Message"
-msgstr "从消息创建规则(_L)"
-
-# mail/folder-browser.c:1628
-# mail/folder-browser.c:1656
-# mail/folder-browser.c:1657
#: mail/folder-browser.c:1657
-msgid "Filter on Mailing List"
-msgstr "过滤邮件列表"
+#, fuzzy
+msgid "Crea_te Rule From Message"
+msgstr "从消息创建规则(_L)"
# mail/folder-browser.c:1629
# mail/folder-browser.c:1657
# mail/folder-browser.c:1658
-#: mail/folder-browser.c:1658
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
msgstr "关于邮件列表的虚拟文件夹"
# mail/folder-browser.c:1631
# mail/folder-browser.c:1659
# mail/folder-browser.c:1660
-#: mail/folder-browser.c:1660
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
msgstr "过滤邮件列表 (%s)"
# mail/folder-browser.c:1632
# mail/folder-browser.c:1660
# mail/folder-browser.c:1661
-#: mail/folder-browser.c:1661
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
msgstr "关于邮件列表 (%s) 的虚拟文件夹"
-# mail/mail-config.glade.h:23
-# mail/folder-browser.h:26
-# mail/folder-browser.h:26
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "默认"
-
# mail/folder-info.c:64
# mail/folder-info.c:64
# mail/folder-info.c:64
@@ -17853,45 +18035,32 @@ msgstr "将 Outlook Express 4 的邮件导入 Evolution 的车间"
msgid "Imports Outlook Express 4 files into Evolution"
msgstr "将 Outlook Express 4 文件导入到 Evolution"
-# mail/local-config.glade.h:1
-# mail/local-config.glade.h:1
-# mail/local-config.glade.h:1
-#: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "邮件体内容"
-
# mail/local-config.glade.h:2
# mail/local-config.glade.h:2
# mail/local-config.glade.h:2
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:1
msgid "Current store format:"
msgstr "当前存储格式:"
-# mail/local-config.glade.h:3
-# mail/local-config.glade.h:3
-# mail/local-config.glade.h:3
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "正在建立索引:"
-
-# mail/local-config.glade.h:4
-# mail/local-config.glade.h:4
-# mail/local-config.glade.h:4
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "邮件箱格式"
+# mail/local-config.glade.h:1
+# mail/local-config.glade.h:1
+# mail/local-config.glade.h:1
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "邮件体内容"
# mail/local-config.glade.h:5
# mail/local-config.glade.h:5
# mail/local-config.glade.h:5
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
msgid "New store format:"
msgstr "新存储格式:"
# mail/local-config.glade.h:6
# mail/local-config.glade.h:6
# mail/local-config.glade.h:6
-#: mail/local-config.glade.h:6
+#: mail/local-config.glade.h:4
msgid ""
"Note: When converting between mailbox formats, a failure\n"
"(such as lack of disk space) may not be automatically\n"
@@ -17904,21 +18073,21 @@ msgstr ""
# mail/local-config.glade.h:9
# mail/local-config.glade.h:9
# mail/local-config.glade.h:9
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:7
msgid "maildir"
msgstr "邮件目录"
# mail/local-config.glade.h:10
# mail/local-config.glade.h:10
# mail/local-config.glade.h:10
-#: mail/local-config.glade.h:10
+#: mail/local-config.glade.h:8
msgid "mbox"
msgstr "邮件箱"
# mail/local-config.glade.h:11
# mail/local-config.glade.h:11
# mail/local-config.glade.h:11
-#: mail/local-config.glade.h:11
+#: mail/local-config.glade.h:9
msgid "mh"
msgstr "mh"
@@ -17945,128 +18114,122 @@ msgstr "Evolution 新闻编辑器"
msgid "Evolution Account Editor"
msgstr "Evolution 帐号编辑器"
-# mail/mail-account-gui.c:962
-# mail/mail-account-gui.c:962
-# mail/mail-account-gui.c:959
-#: mail/mail-account-gui.c:959
-msgid "Could not save signature file."
-msgstr "无法保存签名文件。"
+# mail/mail-config.glade.h:104
+# mail/mail-config.glade.h:104
+# mail/mail-config.glade.h:113
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "主机(_H):"
-# mail/mail-account-gui.c:1039
-# mail/mail-account-gui.c:1039
-# mail/mail-account-gui.c:1036
-#: mail/mail-account-gui.c:1036
-msgid "Save signature"
-msgstr "保存签名"
+# mail/mail-config.glade.h:117
+# mail/mail-config.glade.h:117
+# mail/mail-config.glade.h:126
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "用户名(_U):"
-# mail/mail-account-gui.c:1045
-# mail/mail-account-gui.c:1045
-# mail/mail-account-gui.c:1042
-#: mail/mail-account-gui.c:1042
+# mail/mail-config.glade.h:112
+# mail/mail-config.glade.h:112
+# mail/mail-config.glade.h:121
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "路径(_P):"
+
+# addressbook/backend/ebook/e-card-simple.c:82
+# addressbook/gui/contact-editor/e-contact-editor.c:1660
+# addressbook/gui/widgets/e-addressbook-view.c:871
+# addressbook/backend/ebook/e-card-simple.c:82
+# addressbook/gui/contact-editor/e-contact-editor.c:1660
+# addressbook/gui/widgets/e-addressbook-view.c:871
+# addressbook/backend/ebook/e-card-simple.c:82
+# addressbook/gui/contact-editor/e-contact-editor.c:1660
+# addressbook/gui/widgets/e-addressbook-view.c:982
+#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
+#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
+#: mail/mail-config.glade.h:94
+#, fuzzy
+msgid "Random"
+msgstr "收音机"
+
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
msgstr ""
-"该签名已经被改变,但还没有存储。\n"
-"\n"
-"您希望保存改动吗?"
# mail/mail-account-gui.c:1654
# mail/mail-account-gui.c:1654
# mail/mail-account-gui.c:1665
-#: mail/mail-account-gui.c:1665
+#: mail/mail-account-gui.c:1985
msgid "You may not create two accounts with the same name."
msgstr "您不能以相同的名字创建两个帐号。"
-# mail/mail-accounts.c:149
-# mail/mail-accounts.c:149
-# mail/mail-accounts.c:149
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr "(默认)"
-
-# mail/mail-accounts.c:194
-# mail/mail-accounts.c:194
-# mail/mail-accounts.c:194
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "禁用"
-
-# mail/mail-accounts.c:196
-# mail/mail-accounts.c:196
-# mail/mail-accounts.c:196
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "启用"
-
# mail/mail-accounts.c:293
# mail/mail-accounts.c:293
# mail/mail-accounts.c:293
-#: mail/mail-accounts.c:292
+#: mail/mail-accounts.c:212
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:296
+#: mail/mail-accounts.c:216
msgid "Don't delete"
msgstr "不要删除"
# mail/mail-accounts.c:300
# mail/mail-accounts.c:300
# mail/mail-accounts.c:300
-#: mail/mail-accounts.c:299
+#: mail/mail-accounts.c:219
msgid "Really delete account?"
msgstr "确实删除帐号?"
+# mail/mail-accounts.c:194
+# mail/mail-accounts.c:194
+# mail/mail-accounts.c:194
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "禁用"
+
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+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:531 mail/mail-accounts.c:535
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
msgid "Are you sure you want to delete this news account?"
msgstr "您确信您要删除该邮件帐号?"
-# mail/mail-accounts.c:783 mail/mail-config.glade.h:42
-# mail/mail-accounts.c:798 mail/mail-config.glade.h:42
-# mail/mail-accounts.c:824 mail/mail-config.glade.h:49
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:823 mail/mail-config.glade.h:50
-msgid "Mail Settings"
-msgstr "邮件设置"
-
-# mail/mail-autofilter.c:72
-# mail/mail-autofilter.c:72
-# mail/mail-autofilter.c:72
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "邮寄给 %s"
-
-# mail/mail-autofilter.c:215
-# mail/mail-autofilter.c:217
-# mail/mail-autofilter.c:217
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "主题是 %s"
+# mail/mail-config.glade.h:33
+# mail/mail-config.glade.h:33
+# mail/mail-config.glade.h:39
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "已启用"
-# mail/mail-autofilter.c:231
-# mail/mail-autofilter.c:233
-# mail/mail-autofilter.c:233
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "邮件来自 %s"
+# 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:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "帐号名(_A):"
-# mail/mail-autofilter.c:287
-# mail/mail-autofilter.c:289
-# mail/mail-autofilter.c:289
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "%s 邮件列表"
+# addressbook/gui/contact-editor/fulladdr.glade.h:171
+# 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:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "波多黎各"
# mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
# mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
@@ -18078,7 +18241,7 @@ msgstr "添加过滤规则"
# mail/mail-callbacks.c:137
# mail/mail-callbacks.c:137
# mail/mail-callbacks.c:94
-#: mail/mail-callbacks.c:94
+#: mail/mail-callbacks.c:93
msgid ""
"You have not configured the mail client.\n"
"You need to do this before you can send,\n"
@@ -18093,7 +18256,7 @@ msgstr ""
# mail/mail-callbacks.c:186
# mail/mail-callbacks.c:186
# mail/mail-callbacks.c:143
-#: mail/mail-callbacks.c:143
+#: mail/mail-callbacks.c:142
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
@@ -18104,7 +18267,7 @@ msgstr ""
# mail/mail-callbacks.c:200
# mail/mail-callbacks.c:200
# mail/mail-callbacks.c:157
-#: mail/mail-callbacks.c:157
+#: mail/mail-callbacks.c:156
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
@@ -18112,34 +18275,29 @@ msgstr ""
"在您可以撰写邮件之前,\n"
"您需要配置一个邮件传输。"
-# mail/mail-callbacks.c:230
-# mail/mail-callbacks.c:230
-# mail/mail-callbacks.c:187
-#: mail/mail-callbacks.c:187
-msgid "You have not set a mail transport method"
-msgstr "您还没有设置邮件传输方法"
-
# mail/mail-callbacks.c:265
# mail/mail-callbacks.c:265
# mail/mail-callbacks.c:222
#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:194
msgid ""
"You are sending an HTML-formatted message, but the following recipients do "
"not want HTML-formatted mail:\n"
-msgstr "您正在发送 HTML 格式的消息,当以下收件人不希望接收 HTML 格式的邮件:\n"
+msgstr ""
+"您正在发送 HTML 格式的消息,当以下收件人不希望接收 "
+"HTML 格式的邮件:\n"
# mail/mail-callbacks.c:280
# mail/mail-callbacks.c:280
# mail/mail-callbacks.c:237
-#: mail/mail-callbacks.c:237
+#: mail/mail-callbacks.c:209
msgid "Send anyway?"
msgstr "仍然发送?"
# mail/mail-callbacks.c:322
# mail/mail-callbacks.c:322
# mail/mail-callbacks.c:279
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:251
msgid ""
"This message has no subject.\n"
"Really send?"
@@ -18150,25 +18308,25 @@ msgstr ""
# mail/mail-callbacks.c:366
# mail/mail-callbacks.c:366
# mail/mail-callbacks.c:323
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:295
msgid ""
"Since the contact list you are sending to is configured to hide the list's "
"addresses, this message will contain only Bcc recipients."
msgstr ""
-"由于您正在发送的邮件的接收人列表被配置为隐藏列表的地址,该消息将只含有密件抄"
-"送收件人。"
+"由于您正在发送的邮件的接收人列表被配置为隐藏列表的"
+"址,该消息将只含有密件抄送收件人。"
# mail/mail-callbacks.c:370
# mail/mail-callbacks.c:370
# mail/mail-callbacks.c:327
-#: mail/mail-callbacks.c:327
+#: mail/mail-callbacks.c:299
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:331
+#: mail/mail-callbacks.c:303
msgid ""
"It is possible that the mail server may reveal the recipients by adding an "
"Apparently-To header.\n"
@@ -18180,21 +18338,21 @@ msgstr ""
# mail/mail-callbacks.c:504
# mail/mail-callbacks.c:504
# mail/mail-callbacks.c:460
-#: mail/mail-callbacks.c:436
+#: mail/mail-callbacks.c:408
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:525
+#: mail/mail-callbacks.c:497
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:623
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
@@ -18205,35 +18363,35 @@ msgstr ""
# mail/mail-callbacks.c:838
# mail/mail-callbacks.c:928
# mail/mail-callbacks.c:878
-#: mail/mail-callbacks.c:884
+#: mail/mail-callbacks.c:977
msgid "an unknown sender"
msgstr "未知的发件人"
# mail/mail-callbacks.c:843
# mail/mail-callbacks.c:933
# mail/mail-callbacks.c:883
-#: mail/mail-callbacks.c:888
+#: mail/mail-callbacks.c:981
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:1425 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
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:1427 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
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:1928
+#: mail/mail-callbacks.c:2091
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr "您确信您需要编辑所有的 %d 个消息?"
@@ -18241,7 +18399,7 @@ msgstr "您确信您需要编辑所有的 %d 个消息?"
# mail/mail-callbacks.c:1784
# mail/mail-callbacks.c:1903
# mail/mail-callbacks.c:1939
-#: mail/mail-callbacks.c:1953
+#: mail/mail-callbacks.c:2116
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -18252,7 +18410,7 @@ msgstr ""
# mail/mail-callbacks.c:1823
# mail/mail-callbacks.c:1942
# mail/mail-callbacks.c:1978
-#: mail/mail-callbacks.c:1992
+#: mail/mail-callbacks.c:2155
msgid ""
"You may only resend messages\n"
"in the Sent folder."
@@ -18263,7 +18421,7 @@ msgstr ""
# mail/mail-callbacks.c:1837
# mail/mail-callbacks.c:1956
# mail/mail-callbacks.c:1992
-#: mail/mail-callbacks.c:2006
+#: mail/mail-callbacks.c:2169
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr "您确信您希望重新发送所有的 %d 个消息?"
@@ -18271,43 +18429,67 @@ msgstr "您确信您希望重新发送所有的 %d 个消息?"
# mail/mail-callbacks.c:1863
# mail/mail-callbacks.c:1982
# mail/mail-callbacks.c:2018
-#: mail/mail-callbacks.c:2032
+#: mail/mail-callbacks.c:2195
msgid "No Message Selected"
msgstr "没有选择消息"
+# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1908
+# mail/mail-display.c:102
+# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:2027
+# 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:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "覆盖文件?"
+
# mail/mail-callbacks.c:1962
# mail/mail-callbacks.c:2081
# mail/mail-callbacks.c:2117
-#: mail/mail-callbacks.c:2131
+#: mail/mail-callbacks.c:2294
msgid "Save Message As..."
msgstr "消息另存为..."
# mail/mail-callbacks.c:1964
# mail/mail-callbacks.c:2083
# mail/mail-callbacks.c:2119
-#: mail/mail-callbacks.c:2133
+#: mail/mail-callbacks.c:2296
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:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "显示下一个未读文件"
+
+#: mail/mail-callbacks.c:2373
+msgid ""
+"There are no more new messages in this folder.\n"
+"Would you like to go to the next folder?"
+msgstr ""
+
# mail/mail-callbacks.c:2135
# mail/mail-callbacks.c:2254
# mail/mail-callbacks.c:2290
-#: mail/mail-callbacks.c:2304
+#: mail/mail-callbacks.c:2615
msgid ""
"This operation will permanently erase all messages marked as deleted. If you "
"continue, you will not be able to recover these messages.\n"
"\n"
"Really erase these messages?"
msgstr ""
-"该操作将永久删除所有标记为删除的所有消息。如果您继续,您将无法恢复这些消"
-"息。\n"
+"该操作将永久删除所有标记为删除的所有消息。如果您继"
+",您将无法恢复这些消息。\n"
"\n"
"确实删除这些消息?"
# mail/mail-callbacks.c:2250
# mail/mail-callbacks.c:2369
# mail/mail-callbacks.c:2405
-#: mail/mail-callbacks.c:2419
+#: mail/mail-callbacks.c:2728
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -18319,14 +18501,14 @@ msgstr ""
# mail/mail-callbacks.c:2262
# mail/mail-callbacks.c:2381
# mail/mail-callbacks.c:2417
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2740
msgid "Filters"
msgstr "过滤规则"
# camel/camel-filter-driver.c:789
# camel/camel-filter-driver.c:838
# mail/mail-callbacks.c:2490
-#: mail/mail-callbacks.c:2504
+#: mail/mail-callbacks.c:2783
#, c-format
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
@@ -18334,27 +18516,27 @@ msgstr "第 %d 页,共 %d 页"
# mail/mail-callbacks.c:2325
# mail/mail-callbacks.c:2465
# mail/mail-callbacks.c:2542
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2836
msgid "Print Message"
msgstr "打印消息"
# mail/mail-callbacks.c:2492
# mail/mail-callbacks.c:2569
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2863
msgid "US-Letter"
msgstr "美国信纸"
# mail/mail-callbacks.c:2371
# mail/mail-callbacks.c:2531
# mail/mail-callbacks.c:2604
-#: mail/mail-callbacks.c:2618
+#: mail/mail-callbacks.c:2901
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:2784
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr "您确信您希望在单独的窗口中打开所有的 %d 个消息?"
@@ -18368,7 +18550,8 @@ msgid ""
"below do not need to be filled in,\n"
"unless you wish to include this information in email you send."
msgstr ""
-"请在下面输入您的名字和电子邮件地址。“可选”域可以不填写,\n"
+"请在下面输入您的名字和电子邮件地址。“可选”域可以"
+"填写,\n"
"除非您希望在您发送的邮件中含有这些信息。"
# mail/mail-config-druid.c:148
@@ -18380,7 +18563,8 @@ msgid ""
"not sure, ask your system\n"
"administrator or Internet Service Provider."
msgstr ""
-"请在下面输入您的接收邮件服务器的信息。如果您不能确定,\n"
+"请在下面输入您的接收邮件服务器的信息。如果您不能确"
+",\n"
"请询问您的系统管理员或互联网服务提供商。"
# mail/mail-config-druid.c:150
@@ -18415,7 +18599,8 @@ msgid ""
"space below.\n"
"This name will be used for display purposes only."
msgstr ""
-"您基本上完成了邮件配置过程。身份标识、邮件接收服务器和您提供\n"
+"您基本上完成了邮件配置过程。身份标识、邮件接收服务"
+"和您提供\n"
"的邮件发送传输方法将组合起来构成 Evolution 邮件帐号。\n"
"请在下面输入该帐号的名称。\n"
"该名称仅用于显示。"
@@ -18424,22 +18609,46 @@ msgstr ""
# mail/mail-config-druid.c:599
# mail/mail-config-druid.c:599
#. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
msgid "Evolution Account Assistant"
msgstr "Evolution 帐号助手"
-# mail/mail-config.c:326
-# mail/mail-config.c:329
-# mail/mail-config.c:354
-#: mail/mail-config.c:354
-#, c-format
-msgid "Account %d"
-msgstr "帐号 %d"
+# my-evolution/Locations.h:508
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "科克"
+
+# my-evolution/Locations.h:1795
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, 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:77 mail/mail-config.glade.h:127
+#, 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:78 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "之后"
# mail/mail-config.c:1860
# mail/mail-config.c:1902
# mail/mail-config.c:1995
-#: mail/mail-config.c:1995
+#: mail/mail-config.c:2458
#, c-format
msgid ""
"Could not get inbox for new mail store:\n"
@@ -18450,174 +18659,263 @@ msgstr ""
"%s\n"
"没有创建快捷方式。"
-# mail/mail-config.c:1871
-# mail/mail-config.c:1913
-# mail/mail-config.c:2006
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2006
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s:收件箱"
-
# mail/mail-config.c:2113
# mail/mail-config.c:2155
# mail/mail-config.c:2248
-#: mail/mail-config.c:2248
+#: mail/mail-config.c:2719
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:2326 mail/mail-config.c:2330
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
msgid "Connecting to server..."
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-config.c:2999
+#, fuzzy
+msgid "Unnamed"
+msgstr "未命名的联系人"
+
+#: mail/mail-config.c:3177
+msgid "Cannot execute signature script"
+msgstr ""
+
+# mail/folder-browser.c:734 mail/folder-browser.c:739
+# mail/folder-browser.c:761
+# mail/folder-browser.c:754 mail/folder-browser.c:762
+# mail/folder-browser.c:765
+# mail/folder-browser.c:755 mail/folder-browser.c:763
+# mail/folder-browser.c:766
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " "
+msgstr ", "
+
+# addressbook/gui/component/addressbook-config.glade.h:25
+# ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
+# 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:7 ui/evolution-subscribe.xml.h:10
+# ui/evolution-tasks.xml.h:16
+# addressbook/gui/component/addressbook-config.glade.h:25
+# ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
+# 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:7 ui/evolution-subscribe.xml.h:10
+# ui/evolution-tasks.xml.h:16
+# addressbook/gui/component/addressbook-config.glade.h:34
+# ui/evolution-addressbook.xml.h:35 ui/evolution-calendar.xml.h:39
+# 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:7 ui/evolution-subscribe.xml.h:10
+# ui/evolution-tasks.xml.h:19
+#: mail/mail-config.glade.h:2
+#, fuzzy
+msgid " Edit "
+msgstr "编辑(_E)"
+
+# widgets/misc/e-charset-picker.c:101
+# widgets/misc/e-charset-picker.c:101
+# 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
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid " New "
+msgstr "新建"
+
# mail/mail-config.glade.h:1
# mail/mail-config.glade.h:1
# mail/mail-config.glade.h:1
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:4
msgid " _Check for supported types "
msgstr "检查支持的类型(_C) "
-# mail/mail-config.glade.h:2
-# mail/mail-config.glade.h:2
-# mail/mail-config.glade.h:2
-#: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " 颜色"
-
# mail/mail-config.glade.h:3
# mail/mail-config.glade.h:3
# mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
msgid "(SSL is not supported in this build of Evolution)"
msgstr "(在该版本的 evolution 中不支持SSL)"
# mail/mail-config.glade.h:3
# mail/mail-config.glade.h:3
# mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:6
msgid "(SSL is not supported in this build of evolution)"
msgstr "(在该版本的 evolution 中不支持SSL)"
# mail/mail-config.glade.h:4
# mail/mail-config.glade.h:4
# mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:7
msgid "A_lways encrypt to myself when sending encrypted mail"
msgstr "当发送加密邮件时总是对自身加密(_L)"
-# mail/mail-config.glade.h:5
-# mail/mail-config.glade.h:5
-# mail/mail-config.glade.h:5
-#: mail/mail-config.glade.h:6
-msgid "Account"
-msgstr "帐号"
+# mail/mail-config.c:326
+# mail/mail-config.c:329
+# mail/mail-config.c:354
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "帐号 %d"
# mail/mail-config.glade.h:6
# mail/mail-config.glade.h:6
# mail/mail-config.glade.h:6
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
msgid "Account Information"
msgstr "帐号信息"
# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Account Management"
msgstr "帐号管理"
-# mail/mail-config.glade.h:8
-# mail/mail-config.glade.h:8
-# mail/mail-config.glade.h:8
-#: mail/mail-config.glade.h:9
-msgid "Accounts"
-msgstr "帐号"
-
-#: mail/mail-config.glade.h:10
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr ""
-
+# shell/e-activity-handler.c:202
+# shell/e-activity-handler.c:202
+# shell/e-activity-handler.c:202
#: mail/mail-config.glade.h:11
-msgid "Always _carbon-copy (Cc) to:"
-msgstr ""
+#, fuzzy
+msgid "Advanced Options"
+msgstr "取消操作"
-# mail/mail-config.glade.h:9
-# mail/mail-config.glade.h:9
-# mail/mail-config.glade.h:9
+# calendar/zones.h:35
+# my-evolution/Locations.h:123
#: mail/mail-config.glade.h:12
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "当发送加密邮件时总是加密到自身(_E)"
+#, fuzzy
+msgid "Afrikaans"
+msgstr "阿肯色州"
+
+# mail/mail-config.glade.h:4
+# mail/mail-config.glade.h:4
+# mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "当发送加密邮件时总是对自身加密(_L)"
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:4
+# addressbook/gui/contact-editor/fulladdr.glade.h:4
+# my-evolution/Locations.h:45
+#: mail/mail-config.glade.h:14
+#, fuzzy
+msgid "Alerts"
+msgstr "阿尔伯达"
# mail/mail-config.glade.h:10
# mail/mail-config.glade.h:10
# mail/mail-config.glade.h:10
-#: mail/mail-config.glade.h:13
-msgid "Always _sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:15
+#, fuzzy
+msgid "Alwa_ys sign outgoing messages when using this account"
msgstr "当使用该帐号的时候总是签名发送的邮件(_S)"
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:15
+# addressbook/gui/contact-editor/fulladdr.glade.h:15
+# my-evolution/Locations.h:121
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+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
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "把文件附件到邮件"
+
# mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
# mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
# mail/mail-config.glade.h:13 mail/message-list.etspec.h:1
-#: mail/mail-config.glade.h:14 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
msgid "Attachment"
msgstr "附件"
# mail/mail-config.glade.h:12
# mail/mail-config.glade.h:12
# mail/mail-config.glade.h:14
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:22
msgid "Authentication"
msgstr "身份验证"
-# mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:16
-msgid "Beep when new mail arrives"
-msgstr "新邮件到达时鸣笛"
+# mail/mail-config.glade.h:94
+# mail/mail-config.glade.h:94
+# mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "自动检查新邮件(_A)"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+# widgets/misc/e-charset-picker.c:159
+# widgets/misc/e-charset-picker.c:159
+# widgets/misc/e-charset-picker.c:162
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "未知的字符集:%s"
+
+# calendar/gui/alarm-notify/alarm-notify.glade.h:1
+# ui/evolution-comp-editor.xml.h:1
+# calendar/gui/alarm-notify/alarm-notify.glade.h:1
+# ui/evolution-comp-editor.xml.h:1
+# calendar/gui/alarm-notify/alarm-notify.glade.h:1
+# ui/evolution-comp-editor.xml.h:1
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "关闭(_L)"
# mail/mail-config.glade.h:13
# mail/mail-config.glade.h:13
# mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:28
msgid "Checking for New Mail"
msgstr "正在检查新邮件"
-# mail/mail-config.glade.h:14
-# mail/mail-config.glade.h:14
-# mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:18
-msgid "Composer"
-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
# mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:29
msgid "Composing Messages"
msgstr "正在撰写邮件"
# mail/mail-config.glade.h:15
# mail/mail-config.glade.h:15
# mail/mail-config.glade.h:19
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:30
msgid "Configuration"
msgstr "配置"
-# mail/mail-config.glade.h:16
-# mail/mail-config.glade.h:16
-# mail/mail-config.glade.h:20
-#: mail/mail-config.glade.h:21
-msgid "Confirm when Expunging a folder"
-msgstr "当删除文件夹时进行提示"
-
# mail/mail-config.glade.h:17
# mail/mail-config.glade.h:17
# mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:31
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -18633,431 +18931,580 @@ msgstr ""
"\n"
"点击“完成”以便保存您的设置。"
+# addressbook/gui/contact-editor/fulladdr.glade.h:18
+# addressbook/gui/contact-editor/fulladdr.glade.h:18
+# my-evolution/Locations.h:181
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Dari"
+msgstr "巴里"
+
# mail/mail-config.glade.h:23
# mail/mail-config.glade.h:23
# mail/mail-config.glade.h:27
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:38
msgid "De_fault"
msgstr "默认(_F)"
-# mail/mail-config.glade.h:24
-# mail/mail-config.glade.h:24
-# mail/mail-config.glade.h:28
-#: mail/mail-config.glade.h:29
-msgid "Default Forward style is: "
-msgstr "默认转发风格为: "
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/folder-browser.h:26
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "默认"
# mail/mail-config.glade.h:25
# mail/mail-config.glade.h:25
# mail/mail-config.glade.h:29
-#: mail/mail-config.glade.h:30
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
msgstr "默认字符编码: "
-# mail/mail-config.glade.h:23
-# mail/folder-browser.h:26
-# mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:31
-msgid "Defaults"
-msgstr "默认"
+# mail/mail-ops.c:249
+# mail/mail-ops.c:250
+# mail/mail-ops.c:258
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "正在收取邮件"
# mail/mail-config.glade.h:27
# mail/mail-config.glade.h:27
# mail/mail-config.glade.h:32
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:43
msgid "Digital IDs..."
msgstr "数字标识..."
-# mail/mail-config.glade.h:28
-# mail/mail-config.glade.h:28
-# mail/mail-config.glade.h:33
-#: mail/mail-config.glade.h:34
-msgid "Display"
-msgstr "显示"
-
-# mail/mail-config.glade.h:34
-#: mail/mail-config.glade.h:35
-msgid "Do not notify me when new mail arrives"
-msgstr "新邮件到达时不要提醒我"
+# camel/camel-filter-driver.c:692
+# camel/camel-filter-driver.c:741
+# camel/camel-filter-driver.c:893
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "无法打开消息"
# mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
# mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
# mail/mail-config.glade.h:35 shell/glade/evolution-startup-wizard.glade.h:2
-#: mail/mail-config.glade.h:36 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
msgid "Done"
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
-#: mail/mail-config.glade.h:37 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "草稿"
+# mail/mail-config.glade.h:97
+# mail/mail-config.glade.h:97
+# mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "草稿文件夹(_D):"
# mail/mail-config.glade.h:31
# mail/mail-config.glade.h:31
# mail/mail-config.glade.h:37
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
msgid "E_nable"
msgstr "启用(_N)"
-# mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:103
-# mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-# widgets/misc/e-filter-bar.h:103
-# mail/mail-config.glade.h:38 widgets/misc/e-filter-bar.h:96
-# widgets/misc/e-filter-bar.h:103
-#: mail/mail-config.glade.h:39 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "编辑..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
-# mail/mail-config.glade.h:33
-# mail/mail-config.glade.h:33
-# mail/mail-config.glade.h:39
-#: mail/mail-config.glade.h:40
-msgid "Enabled"
-msgstr "已启用"
+# my-evolution/metar.c:65
+# my-evolution/metar.c:65
+# my-evolution/metar.c:65
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "东"
+
+# addressbook/gui/component/addressbook.c:805
+# addressbook/gui/component/addressbook.c:805
+# addressbook/gui/component/addressbook.c:838
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "电子邮件含有"
+
+# mail/mail-config.glade.h:99
+# mail/mail-config.glade.h:99
+# addressbook/gui/component/addressbook-config.glade.h:35
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "电子邮件地址(_E):"
+
+# mail/mail-config.glade.h:100
+# mail/mail-config.glade.h:100
+# mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "退出时清空已删除邮件(_E)"
# mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:53
msgid "Execute Command..."
msgstr "执行命令..."
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "以之结束"
+
+# mail/folder-browser-ui.c:274
+# mail/folder-browser-ui.c:274
+# mail/folder-browser-ui.c:275
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "属性"
+
+# mail/mail-ops.c:1191
+# mail/mail-ops.c:1193
+# mail/mail-ops.c:1236
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "已转发邮件"
+
# mail/mail-config.glade.h:34
# mail/mail-config.glade.h:34
# mail/mail-config.glade.h:41
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:57
msgid "Get Digital ID..."
msgstr "获取数字标识..."
-# mail/mail-config.glade.h:35
-# mail/mail-config.glade.h:35
-# mail/mail-config.glade.h:42
-#: mail/mail-config.glade.h:43
-msgid "HTML signature file:"
-msgstr "HTML 签名文件:"
+# mail/mail-config.glade.h:103
+# mail/mail-config.glade.h:103
+# mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "突出显示引文,使用(_H)"
+
+# calendar/zones.h:358
+# my-evolution/Locations.h:948
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "火奴鲁鲁"
# mail/mail-config.glade.h:36
# mail/mail-config.glade.h:36
# mail/mail-config.glade.h:43
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:60
msgid "IMAPv4 "
msgstr "IMAPv4"
# 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:45 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
msgid "Identity"
msgstr "标识"
-# mail/mail-config.glade.h:38
-# mail/mail-config.glade.h:38
-# mail/mail-config.glade.h:45
-#: mail/mail-config.glade.h:46
-msgid "In HTML mail"
-msgstr "在 HTML 邮件中"
-
# mail/mail-config.glade.h:39
# mail/mail-config.glade.h:39
# mail/mail-config.glade.h:46
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:63
msgid "Inline"
msgstr "嵌入"
# mail/mail-config.glade.h:40
# mail/mail-config.glade.h:40
# mail/mail-config.glade.h:47
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:64
msgid "Kerberos "
msgstr "Kerberos"
+# ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+# ui/evolution-contact-list-editor.xml.h:6
+# ui/evolution-signature-editor.xml.h:4
+# ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+# ui/evolution-contact-list-editor.xml.h:6
+# ui/evolution-signature-editor.xml.h:4
+# ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+# ui/evolution-contact-list-editor.xml.h:6
+# ui/evolution-signature-editor.xml.h:4
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "保存并关闭"
+
+# ui/evolution-mail-message.xml.h:42
+# ui/evolution-mail-message.xml.h:42
+# ui/evolution-mail-message.xml.h:42
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+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:49
+#: mail/mail-config.glade.h:69
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:51
+#: mail/mail-config.glade.h:71
msgid "Mailbox location"
msgstr "邮件箱位置"
-# mail/mail-config.glade.h:44
-# mail/mail-config.glade.h:44
-# mail/mail-config.glade.h:51
-#: mail/mail-config.glade.h:52
-msgid "Make this my _default account"
-msgstr "设置为我的默认帐号(_D)"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+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
+#, fuzzy
+msgid "Message Display"
+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
+#, 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:53
+#: 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:54
+#: mail/mail-config.glade.h:77
msgid "New Mail Notification"
msgstr "新邮件提醒"
-# mail/mail-config.glade.h:46
-# mail/mail-config.glade.h:46
-# mail/mail-config.glade.h:54
-#: mail/mail-config.glade.h:55
-msgid "News"
-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:78
+#, fuzzy
+msgid "News Servers"
+msgstr "新闻来源(_N)"
+
+#: mail/mail-config.glade.h:80
+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:57
+#: mail/mail-config.glade.h:81
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:82
+#, fuzzy
+msgid "Or_ganization:"
+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:59
+#: mail/mail-config.glade.h:83
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:62
+#: mail/mail-config.glade.h:87
msgid "Pick a color"
msgstr "选取一个颜色"
-# mail/mail-config.glade.h:62
-#: mail/mail-config.glade.h:63
-msgid "Play sound file when new mail arrives"
-msgstr "新邮件到达时播放声音文件"
+# mail/mail-config.glade.h:57
+# mail/mail-config.glade.h:57
+# mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+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:64
+#: mail/mail-config.glade.h:89
msgid "Pretty Good Privacy (PGP/GPG)"
msgstr "Pretty Good Privacy (PGP/GPG)"
-# mail/mail-config.glade.h:55
-# mail/mail-config.glade.h:55
-# mail/mail-config.glade.h:64
-#: mail/mail-config.glade.h:65
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-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:66
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "在发送空标题的消息时进行提示(_E)"
-
-# mail/mail-config.glade.h:57
-# mail/mail-config.glade.h:57
-# mail/mail-config.glade.h:66
-#: mail/mail-config.glade.h:67
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "在发送只给出了暗送收件人时进行提示(_B)"
+# ui/evolution-addressbook.xml.h:18
+# ui/evolution-addressbook.xml.h:18
+# ui/evolution-addressbook.xml.h:18
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "打印选中的联系人"
# mail/mail-config.glade.h:58
# mail/mail-config.glade.h:58
# mail/mail-config.glade.h:67
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:91
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:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "无法打开消息"
+
# mail/mail-config.glade.h:59
# mail/mail-config.glade.h:59
# mail/mail-config.glade.h:68
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:93
msgid "Quoted"
msgstr "已引用"
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
# mail/mail-config.glade.h:60
# mail/mail-config.glade.h:60
# mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:96
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
+#, fuzzy
+msgid "Re_ply-To:"
+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:71 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
msgid "Receiving Email"
msgstr "正在接收电子邮件"
-# mail/mail-config.glade.h:62
-# mail/mail-config.glade.h:62
-# mail/mail-config.glade.h:71
-#: mail/mail-config.glade.h:72
-msgid "Receiving Mail"
-msgstr "正在接收邮件"
-
# mail/mail-config.glade.h:63
# mail/mail-config.glade.h:63
# mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:73
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
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
+#, fuzzy
+msgid "Remember this _password"
+msgstr "记住该密码"
+
# mail/mail-config.glade.h:64
# mail/mail-config.glade.h:64
# mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:101
msgid "Required Information"
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
+#, fuzzy
+msgid "S_ecurity"
+msgstr "安全"
+
+# my-evolution/metar.c:137
+# my-evolution/metar.c:137
+# my-evolution/Locations.h:2115
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "Same as text"
+msgstr "骤雨"
+
# mail/mail-config.glade.h:66
# mail/mail-config.glade.h:66
# mail/mail-config.glade.h:75
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:105
msgid "Secure MIME (S/MIME)"
msgstr "安全 MIME (S/MIME)"
-# mail/mail-config.glade.h:67
-# mail/mail-config.glade.h:67
-# mail/mail-config.glade.h:76
-#: mail/mail-config.glade.h:77
-msgid "Security"
-msgstr "安全"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
-# mail/mail-config.glade.h:68
-# mail/mail-config.glade.h:68
-# mail/mail-config.glade.h:77
-#: mail/mail-config.glade.h:78
-msgid "Select Filter Log file..."
-msgstr "选择过滤日志文件..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+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:79
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
msgstr "选择 PGP 二进制数"
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+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:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "删除签名以外的所有内容"
+
# 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:80 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
msgid "Sending Email"
msgstr "正在发送电子邮件"
-# mail/mail-config.glade.h:71
-# mail/mail-config.glade.h:71
-# mail/mail-config.glade.h:80
-#: mail/mail-config.glade.h:81
-msgid "Sending Mail"
-msgstr "正在发送邮件"
-
-# mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-# shell/e-local-storage.c:176
-# mail/mail-config.glade.h:73 mail/message-list.etspec.h:7
-# shell/e-local-storage.c:176
-# mail/mail-config.glade.h:82 mail/message-list.etspec.h:7
-# shell/e-local-storage.c:176
-#: mail/mail-config.glade.h:83 mail/message-list.etspec.h:7
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "已发送"
-
# mail/mail-config.glade.h:74
# mail/mail-config.glade.h:74
# mail/mail-config.glade.h:83
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:115
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:85
+#: mail/mail-config.glade.h:116
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:86
+#: mail/mail-config.glade.h:117
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:87
+#: mail/mail-config.glade.h:118
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:88
+#: mail/mail-config.glade.h:119
msgid "Server _Type: "
msgstr "服务器类型(_T):"
-# mail/mail-config.glade.h:79
-# mail/mail-config.glade.h:79
-# mail/mail-config.glade.h:88
-#: mail/mail-config.glade.h:89
-msgid "Signature file:"
-msgstr "签名文件:"
+# shell/e-shortcuts.c:1043
+# shell/e-shortcuts.c:1043
+# shell/e-shortcuts.c:1043
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "快捷方式"
+
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1036
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "保存签名"
# mail/mail-config.glade.h:80
# mail/mail-config.glade.h:80
# mail/mail-config.glade.h:89
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:122
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:91
+#: mail/mail-config.glade.h:123
msgid "Source Information"
msgstr "来源信息"
-# mail/mail-config.glade.h:82
-# mail/mail-config.glade.h:82
-# mail/mail-config.glade.h:91
-#: mail/mail-config.glade.h:92
-msgid "Sources"
-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:93
-msgid "Specify filename:"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Specify _filename:"
msgstr "指定文件名:"
+#: mail/mail-config.glade.h:125
+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:94
+#: mail/mail-config.glade.h:126
msgid "Standard Unix mbox"
msgstr "标准 Unix mbox"
-# mail/mail-config.glade.h:86
-# mail/mail-config.glade.h:86
-# mail/mail-config.glade.h:95
-#: mail/mail-config.glade.h:96
-msgid "Use s_ecure connection (SSL)"
-msgstr "使用安全连接 (SSL)"
+#: mail/mail-config.glade.h:128
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+
+# mail/mail-config.glade.h:102
+# mail/mail-config.glade.h:102
+# mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "HTML 签名(_H):"
+
+# my-evolution/metar.c:63
+# my-evolution/metar.c:63
+# my-evolution/metar.c:63
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "不定风"
# mail/mail-config.glade.h:87
# mail/mail-config.glade.h:87
# mail/mail-config.glade.h:96
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:133
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -19067,216 +19514,351 @@ msgstr ""
"\n"
"点击 “下一步” 以便开始。"
+# my-evolution/metar.c:65
+# my-evolution/metar.c:65
+# my-evolution/metar.c:65
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "东"
+
# mail/mail-config.glade.h:91
# mail/mail-config.glade.h:91
# mail/mail-config.glade.h:100
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:140
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:102
+#: mail/mail-config.glade.h:141
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:103
+#: mail/mail-config.glade.h:142
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:104
+#: mail/mail-config.glade.h:143
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:105
+#: mail/mail-config.glade.h:144
msgid "_Automatically check for new mail"
msgstr "自动检查新邮件(_A)"
+# mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:145
+#, fuzzy
+msgid "_Beep when new mail arrives"
+msgstr "新邮件到达时鸣笛"
+
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:104
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:146
msgid "_Certificate ID:"
msgstr "证书 ID(_C):"
-# mail/mail-config.glade.h:97
-# mail/mail-config.glade.h:97
-# mail/mail-config.glade.h:106
-#: mail/mail-config.glade.h:108
-msgid "_Drafts folder:"
-msgstr "草稿文件夹(_D):"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
-# mail/mail-config.glade.h:100
-# mail/mail-config.glade.h:100
-# mail/mail-config.glade.h:109
-#: mail/mail-config.glade.h:111
-msgid "_Empty trash folders on exit"
-msgstr "退出时清空已删除邮件(_E)"
+# mail/mail-config.glade.h:16
+# mail/mail-config.glade.h:16
+# mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "当删除文件夹时进行提示"
+
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "默认"
+
+# mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:151
+#, fuzzy
+msgid "_Do not notify me when new mail arrives"
+msgstr "新邮件到达时不要提醒我"
+
+#: mail/mail-config.glade.h:153
+msgid "_Enable spell checking"
+msgstr ""
+
+# shell/e-shell-importer.c:612
+# shell/e-shell-importer.c:612
+# shell/e-shell-importer.c:623
+#: mail/mail-config.glade.h:154
+#, fuzzy
+msgid "_Filename:"
+msgstr "文件名:"
+
+#: mail/mail-config.glade.h:155
+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:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "转发方式"
# mail/mail-config.glade.h:101
# mail/mail-config.glade.h:101
# mail/mail-config.glade.h:110
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:157
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:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "在 HTML 邮件中"
+
# mail/mail-config.glade.h:102
# mail/mail-config.glade.h:102
# mail/mail-config.glade.h:111
-#: mail/mail-config.glade.h:113
-msgid "_HTML signature:"
+#: mail/mail-config.glade.h:160
+#, fuzzy
+msgid "_HTML Signature:"
msgstr "HTML 签名(_H):"
-# mail/mail-config.glade.h:103
-# mail/mail-config.glade.h:103
-# mail/mail-config.glade.h:112
-#: mail/mail-config.glade.h:114
-msgid "_Highlight citations with"
-msgstr "突出显示引文,使用(_H)"
+# 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:162
+#, fuzzy
+msgid "_Identity"
+msgstr "标识"
-# mail/mail-config.glade.h:104
-# mail/mail-config.glade.h:104
-# mail/mail-config.glade.h:113
-#: mail/mail-config.glade.h:115
-msgid "_Host:"
-msgstr "主机(_H):"
+# calendar/gui/dialogs/meeting-page.etspec.h:6
+# calendar/gui/e-meeting-time-sel.etspec.h:6
+# calendar/gui/dialogs/meeting-page.etspec.h:6
+# calendar/gui/e-meeting-time-sel.etspec.h:6
+# calendar/gui/dialogs/meeting-page.etspec.h:6
+# calendar/gui/e-meeting-time-sel.etspec.h:6
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "语言"
# mail/mail-config.glade.h:105
# mail/mail-config.glade.h:105
# mail/mail-config.glade.h:114
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:164
msgid "_Load images if sender is in addressbook"
msgstr "如果发件人在地址簿中就装入图像(_L)"
-# mail/mail-config.glade.h:106
-# mail/mail-config.glade.h:106
-# mail/mail-config.glade.h:115
-#: mail/mail-config.glade.h:117
-msgid "_Log filter actions to:"
-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:165
+#, fuzzy
+msgid "_Make this my default account"
+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:118
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
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:119
+#: mail/mail-config.glade.h:167
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:120
+#: mail/mail-config.glade.h:168
msgid "_Never load images off the net"
msgstr "从不装入图像"
-# mail/mail-config.glade.h:110
-# mail/mail-config.glade.h:110
-# mail/mail-config.glade.h:119
-#: mail/mail-config.glade.h:121
-msgid "_Organization:"
-msgstr "组织(_O):"
-
# mail/mail-config.glade.h:111
# mail/mail-config.glade.h:111
# mail/mail-config.glade.h:120
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:169
msgid "_PGP binary path:"
msgstr "PGP 二进制路径(_P):"
-# mail/mail-config.glade.h:112
-# mail/mail-config.glade.h:112
-# mail/mail-config.glade.h:121
-#: mail/mail-config.glade.h:123
-msgid "_Path:"
-msgstr "路径(_P):"
+# mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Play sound file when new mail arrives"
+msgstr "新邮件到达时播放声音文件"
-# mail/mail-config.glade.h:113
-# mail/mail-config.glade.h:113
-# mail/mail-config.glade.h:122
-#: mail/mail-config.glade.h:124
-msgid "_Remember this password"
-msgstr "记住该密码(_R)"
+# mail/mail-config.glade.h:55
+# mail/mail-config.glade.h:55
+# mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:172
+#, fuzzy
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgstr ""
+"在往不希望接收 HTML 消息的联系人发送 HTML "
+"消息的时候进行提示"
-# mail/mail-config.glade.h:114
-# mail/mail-config.glade.h:114
-# mail/mail-config.glade.h:123
-#: mail/mail-config.glade.h:125
-msgid "_Send mail in HTML format by default."
-msgstr "默认按 HTML 格式发送邮件。(_S)"
+# mail/mail-config.glade.h:56
+# mail/mail-config.glade.h:56
+# mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "在发送空标题的消息时进行提示(_E)"
-# mail/mail-config.glade.h:115
-# mail/mail-config.glade.h:115
-# mail/mail-config.glade.h:124
-#: mail/mail-config.glade.h:126
-msgid "_Server type: "
-msgstr "服务器类型(_S):"
+# addressbook/backend/ebook/e-card-simple.c:82
+# addressbook/gui/contact-editor/e-contact-editor.c:1660
+# addressbook/gui/widgets/e-addressbook-view.c:871
+# addressbook/backend/ebook/e-card-simple.c:82
+# addressbook/gui/contact-editor/e-contact-editor.c:1660
+# addressbook/gui/widgets/e-addressbook-view.c:871
+# addressbook/backend/ebook/e-card-simple.c:82
+# addressbook/gui/contact-editor/e-contact-editor.c:1660
+# addressbook/gui/widgets/e-addressbook-view.c:982
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "收音机"
+
+# mail/mail-config.glade.h:62
+# mail/mail-config.glade.h:62
+# mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+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
+#, fuzzy
+msgid "_Reply style:"
+msgstr "全部回复"
+
+#: mail/mail-config.glade.h:177
+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
+#, fuzzy
+msgid "_Script:"
+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
+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
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "正在发送邮件"
+
+# calendar/gui/dialogs/event-page.glade.h:11
+# calendar/gui/e-calendar-table.etspec.h:13
+# calendar/gui/dialogs/event-page.glade.h:11
+# 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
+#, fuzzy
+msgid "_Show animated images"
+msgstr "按其显示时间"
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:125
-#: mail/mail-config.glade.h:127
-msgid "_Signature file:"
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
msgstr "签名文件(_S):"
-# mail/mail-config.glade.h:117
-# mail/mail-config.glade.h:117
-# mail/mail-config.glade.h:126
-#: mail/mail-config.glade.h:128
-msgid "_Username:"
-msgstr "用户名(_U):"
+# mail/mail-config.glade.h:102
+# mail/mail-config.glade.h:102
+# mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Text Signature:"
+msgstr "HTML 签名(_H):"
+
+# mail/mail-config.glade.h:86
+# mail/mail-config.glade.h:86
+# mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:184
+#, fuzzy
+msgid "_Use secure connection (SSL):"
+msgstr "使用安全连接 (SSL)"
+
+# my-evolution/metar.c:63
+# my-evolution/metar.c:63
+# my-evolution/metar.c:63
+#: mail/mail-config.glade.h:185
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "不定风"
# mail/mail-config.glade.h:118
# mail/mail-config.glade.h:118
# mail/mail-config.glade.h:127
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:186
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:187
+#, fuzzy
+msgid "color"
+msgstr " 颜色"
+
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:128
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:188
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:132
+#: mail/mail-config.glade.h:190
msgid "newswindow1"
msgstr "新闻窗口1"
-# mail/mail-config.glade.h:122
-# mail/mail-config.glade.h:122
-# mail/mail-config.glade.h:131
-#: mail/mail-config.glade.h:133
-msgid "placeholder"
-msgstr "位置记录器"
-
-# mail/mail-config.glade.h:123
-# mail/mail-config.glade.h:123
-# mail/mail-config.glade.h:132
-#: mail/mail-config.glade.h:134
-msgid "seconds."
-msgstr "秒。"
-
# mail/mail-crypto.c:59
# mail/mail-crypto.c:59
# mail/mail-crypto.c:59
@@ -19343,28 +19925,36 @@ msgstr "无法创建 S/MIME 解码上下文。"
# mail/mail-display.c:243
# mail/mail-display.c:242
# mail/mail-display.c:243
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
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
+#, 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:350
+#: mail/mail-display.c:390
msgid "Save to Disk..."
msgstr "保存到磁盘..."
# mail/mail-display.c:352
# mail/mail-display.c:351
# mail/mail-display.c:352
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
msgid "View Inline"
msgstr "嵌入视图"
# mail/mail-display.c:354
# mail/mail-display.c:353
# mail/mail-display.c:354
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
#, c-format
msgid "Open in %s..."
msgstr "在 %s 中打开..."
@@ -19372,7 +19962,7 @@ msgstr "在 %s 中打开..."
# mail/mail-display.c:415
# mail/mail-display.c:414
# mail/mail-display.c:415
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
#, c-format
msgid "View Inline (via %s)"
msgstr "嵌入视图 (通过 %s)"
@@ -19380,56 +19970,56 @@ msgstr "嵌入视图 (通过 %s)"
# mail/mail-display.c:419
# mail/mail-display.c:418
# mail/mail-display.c:419
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
msgid "Hide"
msgstr "隐藏"
# mail/mail-display.c:440
# mail/mail-display.c:439
# mail/mail-display.c:440
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
msgid "External Viewer"
msgstr "外部视图"
# mail/mail-display.c:1133
# mail/mail-display.c:1136
# mail/mail-display.c:1162
-#: mail/mail-display.c:1162
+#: mail/mail-display.c:1265
msgid "Loading message content"
msgstr "装入邮件内容"
# mail/mail-display.c:1602
# mail/mail-display.c:1628
# mail/mail-display.c:1657
-#: mail/mail-display.c:1657
+#: mail/mail-display.c:1832
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:1659
+#: mail/mail-display.c:1833
msgid "Copy Link Location"
msgstr "复制连接位置"
# mail/mail-display.c:1607
# mail/mail-display.c:1633
# mail/mail-display.c:1662
-#: mail/mail-display.c:1662
+#: mail/mail-display.c:1835
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:1665
+#: mail/mail-display.c:1837
msgid "Save Image as..."
msgstr "图像保存为..."
# mail/mail-format.c:635
# mail/mail-format.c:640
# mail/mail-format.c:646
-#: mail/mail-format.c:646
+#: mail/mail-format.c:601
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
@@ -19437,92 +20027,74 @@ msgstr "%s 附件"
# mail/mail-format.c:680
# mail/mail-format.c:686
# mail/mail-format.c:692
-#: mail/mail-format.c:692
+#: mail/mail-format.c:647
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:775
+#: mail/mail-format.c:730 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:867
+#: mail/mail-format.c:822
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:910 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 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:914
+#: mail/mail-format.c:869
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:919 mail/message-list.etspec.h:11
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
msgid "To"
msgstr "收件人"
# mail/mail-format.c:897
# mail/mail-format.c:918
# mail/mail-format.c:924
-#: mail/mail-format.c:924
+#: mail/mail-format.c:879
msgid "Cc"
msgstr "抄送"
# mail/mail-format.c:901
# mail/mail-format.c:923
# mail/mail-format.c:929
-#: mail/mail-format.c:929
+#: mail/mail-format.c:884
msgid "Bcc"
msgstr "密件抄送"
-# mail/mail-format.c:1813
-# mail/mail-format.c:1749
-# mail/mail-format.c:1768
-#: mail/mail-format.c:1767
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
-
-# mail/mail-format.c:1836
-# mail/mail-format.c:1772
-# mail/mail-format.c:1791
-#: mail/mail-format.c:1790
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution 无法识别该类型的带签名邮件。"
-
-# mail/mail-format.c:1844
-# mail/mail-format.c:1780
-# mail/mail-format.c:1799
-#: mail/mail-format.c:1798
-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:1806
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "该邮件有数字签名,但不能证实是可信的。"
+# 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:958
+# 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:915
+#, fuzzy
+msgid "Mailer"
+msgstr "邮件"
# mail/mail-format.c:2068
# mail/mail-format.c:2003
# mail/mail-format.c:2022
-#: mail/mail-format.c:2021
+#: mail/mail-format.c:2106
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
@@ -19530,7 +20102,7 @@ msgstr "指向 FTP 站点 (%s)"
# mail/mail-format.c:2082
# mail/mail-format.c:2017
# mail/mail-format.c:2036
-#: mail/mail-format.c:2035
+#: mail/mail-format.c:2120
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
@@ -19538,7 +20110,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:2040
+#: mail/mail-format.c:2125
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
@@ -19546,7 +20118,7 @@ msgstr "指向本地文件 (%s)"
# mail/mail-format.c:2116
# mail/mail-format.c:2051
# mail/mail-format.c:2070
-#: mail/mail-format.c:2069
+#: mail/mail-format.c:2154
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
@@ -19554,7 +20126,7 @@ msgstr "指向远程数据 (%s)"
# mail/mail-format.c:2124
# mail/mail-format.c:2059
# mail/mail-format.c:2078
-#: mail/mail-format.c:2077
+#: mail/mail-format.c:2162
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
@@ -19562,21 +20134,21 @@ msgstr "指向未知的外部数据 (“%s”类型)"
# mail/mail-format.c:2129
# mail/mail-format.c:2064
# mail/mail-format.c:2083
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2167
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
# mail/mail-local.c:626
# mail/mail-local.c:626
# mail/mail-local.c:626
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
msgid "Reconfiguring folder"
msgstr "正在重新配置文件夹"
# mail/mail-local.c:707
# mail/mail-local.c:707
# mail/mail-local.c:707
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
#, c-format
msgid ""
"Cannot save folder metainfo; you'll probably find you can't\n"
@@ -19588,7 +20160,7 @@ msgstr ""
# mail/mail-local.c:763
# mail/mail-local.c:763
# mail/mail-local.c:763
-#: mail/mail-local.c:763
+#: mail/mail-local.c:762
#, c-format
msgid "Cannot save folder metainfo to %s: %s"
msgstr "无法把文件夹元信息保存到 %s: %s"
@@ -19596,7 +20168,7 @@ msgstr "无法把文件夹元信息保存到 %s: %s"
# mail/mail-local.c:815
# mail/mail-local.c:815
# mail/mail-local.c:815
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
#, c-format
msgid "Cannot delete folder metadata %s: %s"
msgstr "无法删除文件夹元信息 %s: %s"
@@ -19604,7 +20176,7 @@ msgstr "无法删除文件夹元信息 %s: %s"
# mail/mail-local.c:1281
# mail/mail-local.c:1281
# mail/mail-local.c:1281
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr "将文件夹格式从“%s”改为“%s”"
@@ -19612,7 +20184,7 @@ msgstr "将文件夹格式从“%s”改为“%s”"
# mail/mail-local.c:1296
# mail/mail-local.c:1296
# mail/mail-local.c:1296
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
#, c-format
msgid "%s may not be reconfigured because it is not a local folder"
msgstr "由于 %s 不是本地文件夹,因此不能重新配置"
@@ -19620,7 +20192,7 @@ msgstr "由于 %s 不是本地文件夹,因此不能重新配置"
# mail/mail-local.c:1318
# mail/mail-local.c:1318
# mail/mail-local.c:1318
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
@@ -19631,14 +20203,14 @@ msgstr ""
# mail/mail-local.c:1407
# mail/mail-local.c:1407
# mail/mail-local.c:1407
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
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:1416
+#: mail/mail-local.c:1414
#, c-format
msgid "Reconfigure /%s"
msgstr "重新配置 /%s"
@@ -19677,28 +20249,28 @@ msgstr "正在工作"
# mail/mail-ops.c:86
# mail/mail-ops.c:87
# mail/mail-ops.c:87
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:89
msgid "Filtering Folder"
msgstr "正在过滤文件夹"
# mail/mail-ops.c:249
# mail/mail-ops.c:250
# mail/mail-ops.c:258
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:262
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:534 mail/mail-ops.c:563
+#: mail/mail-ops.c:538 mail/mail-ops.c:567
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:599
+#: mail/mail-ops.c:603
#, c-format
msgid "Sending \"%s\""
msgstr "正在发送“%s”"
@@ -19706,7 +20278,7 @@ msgstr "正在发送“%s”"
# mail/mail-ops.c:674
# mail/mail-ops.c:676
# mail/mail-ops.c:719
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:723
#, c-format
msgid "Sending message %d of %d"
msgstr "发送第 %d 个邮件,共 %d 个"
@@ -19714,7 +20286,7 @@ msgstr "发送第 %d 个邮件,共 %d 个"
# mail/mail-ops.c:693
# mail/mail-ops.c:695
# mail/mail-ops.c:738
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:742
#, c-format
msgid "Failed on message %d of %d"
msgstr "在第 %d 个邮件失败,共 %d 个"
@@ -19722,21 +20294,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:740 mail/mail-send-recv.c:545
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
msgid "Complete."
msgstr "完成。"
# mail/mail-ops.c:788
# mail/mail-ops.c:790
# mail/mail-ops.c:833
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:837
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:913
+#: mail/mail-ops.c:917
#, c-format
msgid "Moving messages to %s"
msgstr "把邮件移动到 %s"
@@ -19744,7 +20316,7 @@ msgstr "把邮件移动到 %s"
# mail/mail-ops.c:868
# mail/mail-ops.c:870
# mail/mail-ops.c:913
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
#, c-format
msgid "Copying messages to %s"
msgstr "把邮件复制到 %s"
@@ -19752,44 +20324,36 @@ msgstr "把邮件复制到 %s"
# mail/mail-ops.c:895
# mail/mail-ops.c:897
# mail/mail-ops.c:940
-#: mail/mail-ops.c:940
+#: mail/mail-ops.c:944
msgid "Moving"
msgstr "正在移动"
# mail/mail-ops.c:898
# mail/mail-ops.c:900
# mail/mail-ops.c:943
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:947
msgid "Copying"
msgstr "正在复制"
# mail/mail-ops.c:1008
# mail/mail-ops.c:1010
# mail/mail-ops.c:1053
-#: mail/mail-ops.c:1053
+#: mail/mail-ops.c:1057
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "正在“%s”中扫描文件夹"
-# mail/mail-ops.c:1058 shell/e-local-storage.c:178
-# 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
-#: mail/mail-ops.c:1103 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "已删除"
-
# mail/mail-ops.c:1191
# mail/mail-ops.c:1193
# mail/mail-ops.c:1236
-#: mail/mail-ops.c:1236
+#: mail/mail-ops.c:1240
msgid "Forwarded messages"
msgstr "已转发邮件"
# mail/mail-ops.c:1234
# mail/mail-ops.c:1236
# mail/mail-ops.c:1279
-#: mail/mail-ops.c:1279
+#: mail/mail-ops.c:1283
#, c-format
msgid "Opening folder %s"
msgstr "正在打开文件夹 %s"
@@ -19797,7 +20361,7 @@ msgstr "正在打开文件夹 %s"
# mail/mail-ops.c:1306
# mail/mail-ops.c:1308
# mail/mail-ops.c:1351
-#: mail/mail-ops.c:1351
+#: mail/mail-ops.c:1355
#, c-format
msgid "Opening store %s"
msgstr "正在打开存储 %s"
@@ -19805,7 +20369,7 @@ msgstr "正在打开存储 %s"
# mail/mail-ops.c:1375
# mail/mail-ops.c:1377
# mail/mail-ops.c:1420
-#: mail/mail-ops.c:1420
+#: mail/mail-ops.c:1424
#, c-format
msgid "Removing folder %s"
msgstr "正在删除文件夹“%s”"
@@ -19813,7 +20377,7 @@ msgstr "正在删除文件夹“%s”"
# mail/mail-ops.c:1469
# mail/mail-ops.c:1471
# mail/mail-ops.c:1514
-#: mail/mail-ops.c:1514
+#: mail/mail-ops.c:1518
#, c-format
msgid "Storing folder '%s'"
msgstr "正在存储文件夹“%s”"
@@ -19821,21 +20385,21 @@ msgstr "正在存储文件夹“%s”"
# mail/mail-ops.c:1520
# mail/mail-ops.c:1522
# mail/mail-ops.c:1565
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1569
msgid "Refreshing folder"
msgstr "正在刷新文件夹"
# mail/mail-ops.c:1556
# mail/mail-ops.c:1558
# mail/mail-ops.c:1601
-#: mail/mail-ops.c:1601
+#: mail/mail-ops.c:1605
msgid "Expunging folder"
msgstr "正在删除文件夹"
# mail/mail-ops.c:1605
# mail/mail-ops.c:1607
# mail/mail-ops.c:1650
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1654
#, c-format
msgid "Retrieving message %s"
msgstr "正在检索邮件 %s"
@@ -19843,7 +20407,7 @@ msgstr "正在检索邮件 %s"
# mail/mail-ops.c:1672
# mail/mail-ops.c:1674
# mail/mail-ops.c:1717
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1721
#, c-format
msgid "Retrieving %d message(s)"
msgstr "正在检索 %d 个邮件"
@@ -19851,7 +20415,7 @@ msgstr "正在检索 %d 个邮件"
# mail/mail-ops.c:1758
# mail/mail-ops.c:1760
# mail/mail-ops.c:1803
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1807
#, c-format
msgid "Saving %d messsage(s)"
msgstr "正在保存 %d 个邮件"
@@ -19859,7 +20423,7 @@ msgstr "正在保存 %d 个邮件"
# mail/mail-ops.c:1870
# mail/mail-ops.c:1872
# mail/mail-ops.c:1915
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1919
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -19871,7 +20435,7 @@ msgstr ""
# mail/mail-ops.c:1898
# mail/mail-ops.c:1900
# mail/mail-ops.c:1943
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1947
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -19883,14 +20447,14 @@ msgstr ""
# mail/mail-ops.c:1972
# mail/mail-ops.c:1974
# mail/mail-ops.c:2017
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2021
msgid "Saving attachment"
msgstr "正在保存附件"
# mail/mail-ops.c:1988
# mail/mail-ops.c:1990
# mail/mail-ops.c:2033
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2037
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -19902,7 +20466,7 @@ msgstr ""
# mail/mail-ops.c:2019
# mail/mail-ops.c:2021
# mail/mail-ops.c:2064
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2068
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据: %s"
@@ -19910,7 +20474,7 @@ msgstr "无法写数据: %s"
# mail/mail-ops.c:2088
# mail/mail-ops.c:2090
# mail/mail-ops.c:2133
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2137
#, c-format
msgid "Disconnecting from %s"
msgstr "断开与 %s 的连接"
@@ -19918,13 +20482,13 @@ msgstr "断开与 %s 的连接"
# mail/mail-ops.c:2089
# mail/mail-ops.c:2091
# mail/mail-ops.c:2134
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2138
#, c-format
msgid "Reconnecting to %s"
msgstr "重新与 %s 连接"
# mail/mail-ops.c:2233
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2237
#, c-format
msgid "Executing shell command: %s"
msgstr "正在执行 shell 命令:%s"
@@ -19932,7 +20496,7 @@ 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
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
msgid "_Search"
msgstr "搜索(_S)"
@@ -19995,14 +20559,14 @@ msgstr "匹配:"
# mail/mail-send-recv.c:141
# mail/mail-send-recv.c:143
# mail/mail-send-recv.c:143
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
msgid "Cancelling..."
msgstr "正在取消..."
# mail/mail-send-recv.c:245
# mail/mail-send-recv.c:251
# mail/mail-send-recv.c:251
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
#, c-format
msgid "Server: %s, Type: %s"
msgstr "服务器: %s,类型: %s"
@@ -20010,7 +20574,7 @@ msgstr "服务器: %s,类型: %s"
# mail/mail-send-recv.c:247
# mail/mail-send-recv.c:253
# mail/mail-send-recv.c:253
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
#, c-format
msgid "Path: %s, Type: %s"
msgstr "路径: %s,类型: %s"
@@ -20018,7 +20582,7 @@ msgstr "路径: %s,类型: %s"
# mail/mail-send-recv.c:249
# mail/mail-send-recv.c:255
# mail/mail-send-recv.c:255
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
#, c-format
msgid "Type: %s"
msgstr "类型: %s"
@@ -20026,35 +20590,35 @@ 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:292
+#: mail/mail-send-recv.c:287
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:294
+#: mail/mail-send-recv.c:289
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:354
+#: mail/mail-send-recv.c:349
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:355 mail/mail-send-recv.c:408
+#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
msgid "Waiting..."
msgstr "正在等待..."
# mail/mail-send-recv.c:533
# mail/mail-send-recv.c:541
# mail/mail-send-recv.c:541
-#: mail/mail-send-recv.c:541
+#: mail/mail-send-recv.c:534
msgid "Cancelled."
msgstr "已取消"
@@ -20080,22 +20644,46 @@ msgstr "为 %s 输入密码"
msgid "Enter Password"
msgstr "输入密码"
-# mail/mail-summary.c:109
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr "不完整的消息被写入管道!"
+# mail/mail-account-gui.c:962
+# mail/mail-account-gui.c:962
+# mail/mail-account-gui.c:959
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "无法保存签名文件。"
-# my-evolution/e-summary-mail.c:129
-# my-evolution/e-summary-mail.c:129
-# mail/mail-summary.c:467
-#: mail/mail-summary.c:467
-msgid "Mail Summary"
-msgstr "邮件概要"
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1036
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "保存签名"
+
+# mail/mail-account-gui.c:1045
+# mail/mail-account-gui.c:1045
+# mail/mail-account-gui.c:1042
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"该签名已经被改变,但还没有存储。\n"
+"\n"
+"您希望保存改动吗?"
+
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#: mail/mail-signature-editor.c:357
+#, fuzzy
+msgid "Signature name:"
+msgstr "签名文件:"
# mail/mail-tools.c:255
# mail/mail-tools.c:255
# mail/mail-tools.c:256
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
#, c-format
msgid "Forwarded message - %s"
msgstr "已转发邮件 - %s"
@@ -20103,14 +20691,14 @@ msgstr "已转发邮件 - %s"
# mail/mail-tools.c:259
# mail/mail-tools.c:259
# mail/mail-tools.c:260
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
msgid "Forwarded message"
msgstr "已转发邮件"
# mail/mail-tools.c:393
# mail/mail-tools.c:393
# mail/mail-tools.c:394
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
msgid "Forwarded Message"
msgstr "已转发邮件"
@@ -20142,13 +20730,6 @@ msgid ""
"And have been updated."
msgstr ""
-# mail/mail-vfolder.c:728
-# mail/mail-vfolder.c:728
-# mail/mail-vfolder.c:728
-#: mail/mail-vfolder.c:728
-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
@@ -20181,14 +20762,14 @@ msgstr "新建虚拟文件夹"
# mail/message-browser.c:212
# mail/message-browser.c:212
# mail/message-browser.c:212
-#: mail/message-browser.c:212
+#: 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:214
+#: mail/message-browser.c:212
#, c-format
msgid "%s - Message"
msgstr "%s - 邮件"
@@ -20196,129 +20777,225 @@ msgstr "%s - 邮件"
# mail/message-list.c:639
# mail/message-list.c:645
# mail/message-list.c:662
-#: mail/message-list.c:662
+#: mail/message-list.c:672
msgid "Unseen"
msgstr "不可见"
# mail/message-list.c:640
# mail/message-list.c:646
# mail/message-list.c:663
-#: mail/message-list.c:663
+#: mail/message-list.c:673
msgid "Seen"
msgstr "可见"
# mail/message-list.c:641
# mail/message-list.c:647
# mail/message-list.c:664
-#: mail/message-list.c:664
+#: mail/message-list.c:674
msgid "Answered"
msgstr "已应答"
# mail/message-list.c:642
# mail/message-list.c:648
# mail/message-list.c:665
-#: mail/message-list.c:665
+#: mail/message-list.c:675
msgid "Multiple Unseen Messages"
msgstr "多个不可见邮件"
# mail/message-list.c:643
# mail/message-list.c:649
# mail/message-list.c:666
-#: mail/message-list.c:666
+#: mail/message-list.c:676
msgid "Multiple Messages"
msgstr "多个邮件"
# mail/message-list.c:647
# mail/message-list.c:658
# mail/message-list.c:675
-#: mail/message-list.c:675
+#: mail/message-list.c:680
msgid "Lowest"
msgstr "最低"
# mail/message-list.c:648
# mail/message-list.c:659
# mail/message-list.c:676
-#: mail/message-list.c:676
+#: mail/message-list.c:681
msgid "Lower"
msgstr "较低"
# mail/message-list.c:652
# mail/message-list.c:663
# mail/message-list.c:680
-#: mail/message-list.c:680
+#: mail/message-list.c:685
msgid "Higher"
msgstr "较高"
# mail/message-list.c:653
# mail/message-list.c:664
# mail/message-list.c:681
-#: mail/message-list.c:681
+#: mail/message-list.c:686
msgid "Highest"
msgstr "最高"
# mail/message-list.c:903
# mail/message-list.c:920
# mail/message-list.c:937
-#: mail/message-list.c:937
+#: mail/message-list.c:991
msgid "?"
msgstr "?"
# mail/message-list.c:910
# mail/message-list.c:927
# mail/message-list.c:944
-#: mail/message-list.c:944
+#: mail/message-list.c:998
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:953
+#: mail/message-list.c:1007
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:965
+#: mail/message-list.c:1019
msgid "%a %l:%M %p"
msgstr "%a %l:%m %p"
# mail/message-list.c:941
# mail/message-list.c:958
# mail/message-list.c:975
-#: mail/message-list.c:975
+#: mail/message-list.c:1029
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:2387
+#: mail/message-list.c:2396
msgid "Generating message list"
msgstr "正在生成邮件列表"
+# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "预定 "
+
+# 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:31
+# mail/message-list.etspec.h:8
+# 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:31
+# 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:47
+# mail/message-list.etspec.h:9
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "状态"
+
# mail/message-list.etspec.h:2
# mail/message-list.etspec.h:2
# mail/message-list.etspec.h:2
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:5
msgid "Flagged"
msgstr "已标志"
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
# mail/message-list.etspec.h:4
# mail/message-list.etspec.h:5
# mail/message-list.etspec.h:5
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:8
msgid "Received"
msgstr "已接收"
# mail/message-list.etspec.h:7
# mail/message-list.etspec.h:8
# mail/message-list.etspec.h:8
-#: mail/message-list.etspec.h:8
+#: mail/message-list.etspec.h:10
msgid "Size"
msgstr "大小"
+# 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:958
+# importers/pine-importer.c:637 mail/component-factory.c:100
+# my-evolution/Locations.h:1355
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "邮件"
+
+# ui/evolution-calendar.xml.h:15
+# ui/evolution-calendar.xml.h:15
+# ui/evolution-calendar.xml.h:15
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "前进"
+
+#: mail/message-tag-followup.c:59
+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
+#, fuzzy
+msgid "For Your Information"
+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
+msgid "Forward"
+msgstr "转发"
+
+#: mail/message-tag-followup.c:62
+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
+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
+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
+#, fuzzy
+msgid "Review"
+msgstr "预览"
+
+#: mail/message-tag-followup.c:315
+msgid "Flag to Follow Up"
+msgstr ""
+
# mail/subscribe-dialog.c:219
# mail/subscribe-dialog.c:219
# mail/subscribe-dialog.c:219
@@ -20358,7 +21035,7 @@ msgstr "取消到文件夹“%s”的订阅"
# 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
-#: shell/e-storage-set-view.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
msgid "Folder"
msgstr "文件夹"
@@ -20432,6 +21109,50 @@ msgstr "订阅(_S)"
msgid "_Unsubscribe"
msgstr "退订(_U)"
+# my-evolution/component-factory.c:44
+# my-evolution/component-factory.c:44
+# my-evolution/component-factory.c:44
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "含有 Evolution 概要的文件夹"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Evolution 邮件撰写器。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Evolution 任务控制车间"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+# executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Evolution 实施概要组件车间。"
+
+# my-evolution/e-summary-preferences.c:1502
+# my-evolution/e-summary-preferences.c:1502
+# my-evolution/e-summary-preferences.c:1504
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "概要设置"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+msgid "This page can be used to customize the appearance of the Summary page."
+msgstr ""
+
# calendar/gui/e-calendar-table.etspec.h:3
# calendar/gui/e-calendar-table.etspec.h:3
# my-evolution/Locations.h:1
@@ -35779,59 +36500,68 @@ msgstr "苏黎世"
# my-evolution/component-factory.c:44
# my-evolution/component-factory.c:44
# my-evolution/component-factory.c:44
-#: my-evolution/component-factory.c:44
+#: my-evolution/component-factory.c:51
msgid "Folder containing the Evolution Summary"
msgstr "含有 Evolution 概要的文件夹"
-# my-evolution/component-factory.c:153
-# my-evolution/component-factory.c:153
-# my-evolution/component-factory.c:153
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "无法初始化 Evolution 的概要成员。"
-
# my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
# my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
# my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
+#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
msgid "Appointments"
msgstr "约会"
# my-evolution/e-summary-calendar.c:341
# my-evolution/e-summary-calendar.c:341
# my-evolution/e-summary-calendar.c:341
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
msgid "No appointments"
msgstr "没有约会"
# my-evolution/e-summary-calendar.c:377
# my-evolution/e-summary-calendar.c:377
# my-evolution/e-summary-calendar.c:375
-#: my-evolution/e-summary-calendar.c:375
+#: my-evolution/e-summary-calendar.c:400
msgid "%k:%M %d %B"
msgstr "%B %d %k:%M"
# my-evolution/e-summary-calendar.c:379
# my-evolution/e-summary-calendar.c:379
# my-evolution/e-summary-calendar.c:377
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:402
msgid "%l:%M %d %B"
msgstr "%B %d %l:%M"
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:119
# my-evolution/e-summary-calendar.c:395
-#: my-evolution/e-summary-calendar.c:395
+#: my-evolution/e-summary-calendar.c:420
msgid "No description"
msgstr "无描述"
# my-evolution/e-summary-mail.c:129
# my-evolution/e-summary-mail.c:129
# my-evolution/e-summary-mail.c:129
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-mail.c:151
msgid "Mail summary"
msgstr "邮件概要"
+# mail/mail-vfolder.c:728
+# mail/mail-vfolder.c:728
+# mail/mail-vfolder.c:728
+#. Make this static, saves having to recompute it each time
+#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
+msgid "VFolders"
+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:259 my-evolution/e-summary-mail.c:401
+#: my-evolution/e-summary-mail.c:761
+msgid "Local Folders"
+msgstr "本地文件夹"
+
# my-evolution/e-summary-preferences.c:80
# my-evolution/e-summary-weather.c:661
# my-evolution/e-summary-preferences.c:80
@@ -35843,53 +36573,46 @@ msgstr "邮件概要"
#. stations and their codes in Evolution sources.
#. (evolution/my-evolution/Locations)
#. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:81
-#: my-evolution/e-summary-weather.c:606
+#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-weather.c:603
msgid "KBOS"
msgstr "KBOS"
# my-evolution/e-summary-preferences.c:444
# my-evolution/e-summary-preferences.c:444
# my-evolution/e-summary-preferences.c:445
-#: my-evolution/e-summary-preferences.c:445
+#: my-evolution/e-summary-preferences.c:471
msgid "Dictionary.com Word of the Day"
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:466
+#: my-evolution/e-summary-preferences.c:492
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:946
+#: my-evolution/e-summary-preferences.c:720
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:954
+#: my-evolution/e-summary-preferences.c:728
msgid "Enter the URL of the news feed you wish to add"
msgstr "输入您希望添加的新闻来源的 URL"
# my-evolution/e-summary-preferences.c:956
# my-evolution/e-summary-preferences.c:956
# my-evolution/e-summary-preferences.c:958
-#: my-evolution/e-summary-preferences.c:958
+#: my-evolution/e-summary-preferences.c:732
msgid "Name:"
msgstr "名称:"
-# my-evolution/e-summary-preferences.c:1502
-# my-evolution/e-summary-preferences.c:1502
-# my-evolution/e-summary-preferences.c:1504
-#: my-evolution/e-summary-preferences.c:1504
-msgid "Summary Settings"
-msgstr "概要设置"
-
# my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
# my-evolution/e-summary-rdf.c:415
# my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
@@ -35902,49 +36625,88 @@ msgstr "下载 RDF 错误"
# my-evolution/e-summary-rdf.c:528
# my-evolution/e-summary-rdf.c:528
# my-evolution/e-summary-rdf.c:443
-#: my-evolution/e-summary-rdf.c:443
+#: my-evolution/e-summary-rdf.c:444
msgid "News Feed"
msgstr "新闻来源"
+# my-evolution/Locations.h:1354
+#: my-evolution/e-summary-shown.c:463
+#, fuzzy
+msgid "All"
+msgstr "麦卡伦"
+
+# addressbook/gui/component/addressbook-config.glade.h:24
+# 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:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:24
+# 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:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:31
+# 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:99 my-evolution/my-evolution.glade.h:21
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
+msgstr "添加(_A)"
+
+# my-evolution/my-evolution.glade.h:1
+# my-evolution/my-evolution.glade.h:1
+# my-evolution/my-evolution.glade.h:1
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
+msgstr "删除(_R)"
+
+# my-evolution/Locations.h:2063
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+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:241
+#: my-evolution/e-summary-tasks.c:251
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:281
+#: my-evolution/e-summary-tasks.c:291
msgid "(No Description)"
msgstr "(没有描述)"
# my-evolution/e-summary-weather.c:71
# my-evolution/e-summary-weather.c:71
# my-evolution/e-summary-weather.c:70
-#: my-evolution/e-summary-weather.c:70
+#: my-evolution/e-summary-weather.c:71
msgid "My Weather"
msgstr "天气"
+#: my-evolution/e-summary-weather.c:279
+msgid "There was an error downloading data for"
+msgstr ""
+
# my-evolution/e-summary-weather.c:559
# my-evolution/e-summary-weather.c:559
# my-evolution/e-summary-weather.c:504
-#: my-evolution/e-summary-weather.c:504
+#: my-evolution/e-summary-weather.c:501
msgid "Weather"
msgstr "天气"
-# my-evolution/e-summary-weather.c:722
-# my-evolution/e-summary-weather.c:722
-# my-evolution/e-summary-weather.c:667
-#: my-evolution/e-summary-weather.c:667
-msgid "Regions"
-msgstr "区域"
-
# my-evolution/e-summary.c:193
# my-evolution/e-summary.c:193
# my-evolution/e-summary.c:190
-#: my-evolution/e-summary.c:190
+#: my-evolution/e-summary.c:193
msgid "%A, %B %e %Y"
msgstr "%Y %B %e %A"
@@ -35953,21 +36715,21 @@ msgstr "%Y %B %e %A"
# importers/elm-importer.c:98 importers/netscape-importer.c:109
# importers/pine-importer.c:103
# my-evolution/e-summary.c:475
-#: my-evolution/e-summary.c:475
+#: my-evolution/e-summary.c:488
msgid "Please wait..."
msgstr "请等待..."
# my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
# my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
# my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
-#: my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
msgid "Print Summary"
msgstr "打印概要"
# my-evolution/e-summary.c:626
# my-evolution/e-summary.c:626
# my-evolution/e-summary.c:612
-#: my-evolution/e-summary.c:612
+#: my-evolution/e-summary.c:626
msgid "Printing of Summary failed"
msgstr "打印概要失败"
@@ -35978,58 +36740,6 @@ msgstr "打印概要失败"
msgid "Executive summary component could not initialize Bonobo.\n"
msgstr "实施概要组件无法初始化 Bonobo。\n"
-# my-evolution/metar.c:29
-# my-evolution/metar.c:29
-#: my-evolution/metar.c:29
-msgid " F"
-msgstr " 华氏度"
-
-# my-evolution/metar.c:29
-# my-evolution/metar.c:29
-#: my-evolution/metar.c:29
-msgid " C"
-msgstr " 摄氏度"
-
-# addressbook/printing/e-contact-print.glade.h:8
-# my-evolution/metar.c:33
-# my-evolution/metar.c:33
-#: my-evolution/metar.c:33
-msgid "knots"
-msgstr "节"
-
-# my-evolution/metar.c:33
-# my-evolution/metar.c:33
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "kph"
-
-# mail/mail-ops.c:895
-# my-evolution/metar.c:38
-# my-evolution/metar.c:38
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr "英寸汞柱"
-
-# my-evolution/metar.c:38
-# my-evolution/metar.c:38
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "毫米汞柱"
-
-# mail/mail-callbacks.c:2262
-# my-evolution/metar.c:41
-# my-evolution/metar.c:41
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "英里"
-
-# mail/mail-callbacks.c:2262
-# my-evolution/metar.c:41
-# my-evolution/metar.c:41
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "公里"
-
# my-evolution/metar.c:44
# my-evolution/metar.c:44
# my-evolution/metar.c:44
@@ -38012,276 +38722,207 @@ msgstr "尘卷风"
msgid "Drifting dust whirls"
msgstr "阵尘卷风"
-# my-evolution/my-evolution.glade.h:1
-# my-evolution/my-evolution.glade.h:1
-# my-evolution/my-evolution.glade.h:1
-#: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr "删除(_R)"
-
# my-evolution/my-evolution.glade.h:2
# my-evolution/my-evolution.glade.h:2
# my-evolution/my-evolution.glade.h:2
-#: my-evolution/my-evolution.glade.h:2
+#: my-evolution/my-evolution.glade.h:1
msgid "Add n_ews feed"
msgstr "添加新闻来源(_E)"
-# my-evolution/my-evolution.glade.h:3
-# my-evolution/my-evolution.glade.h:3
-# my-evolution/my-evolution.glade.h:3
-#: my-evolution/my-evolution.glade.h:3
-msgid "Al_l stations:"
-msgstr "所有站点(_L):"
-
-# my-evolution/my-evolution.glade.h:4
-# my-evolution/my-evolution.glade.h:4
-# my-evolution/my-evolution.glade.h:4
-#: my-evolution/my-evolution.glade.h:4
-msgid "All _folders:"
-msgstr "所有文件夹(_F)"
-
-# my-evolution/my-evolution.glade.h:5
-# my-evolution/my-evolution.glade.h:5
-# my-evolution/my-evolution.glade.h:5
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr "所有新闻来源(_F):"
-
# my-evolution/my-evolution.glade.h:6
# my-evolution/my-evolution.glade.h:6
# my-evolution/my-evolution.glade.h:6
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
msgid "C_elsius"
msgstr "摄氏度"
# my-evolution/my-evolution.glade.h:8
# my-evolution/my-evolution.glade.h:8
# my-evolution/my-evolution.glade.h:8
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
msgid "How many days should the calendar display at once?"
msgstr "日历一次应该显示多少日期?"
# my-evolution/my-evolution.glade.h:9
# my-evolution/my-evolution.glade.h:9
# my-evolution/my-evolution.glade.h:9
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:5
msgid "Ma_x number of items shown:"
msgstr "显示项目的最大数(_X):"
# my-evolution/my-evolution.glade.h:10
# my-evolution/my-evolution.glade.h:10
# my-evolution/my-evolution.glade.h:10
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
msgid "News Feed Settings"
msgstr "新闻来源设置"
# my-evolution/my-evolution.glade.h:11
# my-evolution/my-evolution.glade.h:11
# my-evolution/my-evolution.glade.h:11
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
msgid "One mont_h"
msgstr "一个月(_H)"
# my-evolution/my-evolution.glade.h:12
# my-evolution/my-evolution.glade.h:12
# my-evolution/my-evolution.glade.h:12
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
msgid "One w_eek"
msgstr "一周(_E)"
# my-evolution/my-evolution.glade.h:13
# my-evolution/my-evolution.glade.h:13
# my-evolution/my-evolution.glade.h:13
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
msgid "R_efresh time (seconds):"
msgstr "刷新时间 (秒)(_E):"
# my-evolution/my-evolution.glade.h:14
# my-evolution/my-evolution.glade.h:14
# my-evolution/my-evolution.glade.h:14
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
msgid "Refresh _time (seconds):"
msgstr "刷新时间 (秒)(_T):"
# my-evolution/my-evolution.glade.h:15
# my-evolution/my-evolution.glade.h:15
# my-evolution/my-evolution.glade.h:15
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
msgid "S_how full path for folders"
msgstr "显示文件夹的完整路径(_H)"
# my-evolution/my-evolution.glade.h:16
# my-evolution/my-evolution.glade.h:16
# my-evolution/my-evolution.glade.h:16
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
msgid "Show _all tasks"
msgstr "显示所有任务(_A)"
# my-evolution/my-evolution.glade.h:17
# my-evolution/my-evolution.glade.h:17
# my-evolution/my-evolution.glade.h:17
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
msgid "Show _today's tasks"
msgstr "显示今天的任务(_T)"
# my-evolution/my-evolution.glade.h:18
# my-evolution/my-evolution.glade.h:18
# my-evolution/my-evolution.glade.h:18
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
msgid "Show temperatures in:"
msgstr "以之显示温度:"
# my-evolution/my-evolution.glade.h:19
# my-evolution/my-evolution.glade.h:19
# my-evolution/my-evolution.glade.h:19
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
msgid "Tasks "
msgstr "任务 "
# my-evolution/my-evolution.glade.h:20
# my-evolution/my-evolution.glade.h:20
# my-evolution/my-evolution.glade.h:20
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
msgid "Weather settings"
msgstr "天气设置"
-# my-evolution/my-evolution.glade.h:22
-# my-evolution/my-evolution.glade.h:22
-# my-evolution/my-evolution.glade.h:22
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "显示文件夹(_D):"
-
-# my-evolution/my-evolution.glade.h:23
-# my-evolution/my-evolution.glade.h:23
-# my-evolution/my-evolution.glade.h:23
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Display stations:"
-msgstr "显示站点(_D):"
-
-# my-evolution/my-evolution.glade.h:24
-# my-evolution/my-evolution.glade.h:24
-# my-evolution/my-evolution.glade.h:24
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Displayed feeds:"
-msgstr "已显示的来源:"
-
# my-evolution/my-evolution.glade.h:25
# my-evolution/my-evolution.glade.h:25
# my-evolution/my-evolution.glade.h:25
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:17
msgid "_Fahrenheit"
msgstr "华氏(_F)"
# my-evolution/my-evolution.glade.h:26
# my-evolution/my-evolution.glade.h:26
# my-evolution/my-evolution.glade.h:26
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
msgid "_Five days"
msgstr "五天(_F)"
# my-evolution/my-evolution.glade.h:27
# my-evolution/my-evolution.glade.h:27
# my-evolution/my-evolution.glade.h:27
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
msgid "_Mail"
msgstr "邮件(_M)"
# my-evolution/my-evolution.glade.h:28
# my-evolution/my-evolution.glade.h:28
# my-evolution/my-evolution.glade.h:28
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
msgid "_News Feeds"
msgstr "新闻来源(_N)"
# my-evolution/my-evolution.glade.h:29
# my-evolution/my-evolution.glade.h:29
# my-evolution/my-evolution.glade.h:29
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
msgid "_One day"
msgstr "一天(_O)"
# my-evolution/my-evolution.glade.h:30
# my-evolution/my-evolution.glade.h:30
# my-evolution/my-evolution.glade.h:30
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
msgid "_Schedule"
msgstr "调度(_S)"
# my-evolution/my-evolution.glade.h:31
# my-evolution/my-evolution.glade.h:31
# my-evolution/my-evolution.glade.h:31
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
msgid "_Weather"
msgstr "天气(_W)"
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# notes/GNOME_Evolution_Notes.oaf.in.h:3
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-msgid "Factory for the Evolution notes component."
-msgstr "Evolution 便签组件车间。"
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-# notes/GNOME_Evolution_Notes.oaf.in.h:4
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
-msgid "Factory for the Notes control"
-msgstr "便签控制车间"
+# mail/mail-config.glade.h:83
+# mail/mail-config.glade.h:83
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "特殊文件夹"
# shell/GNOME_Evolution_Shell.oaf.in.h:1
# shell/GNOME_Evolution_Shell.oaf.in.h:1
# shell/GNOME_Evolution_Shell.oaf.in.h:1
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
msgid "The Evolution shell."
msgstr "Evolution shell。"
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
# shell/e-activity-handler.c:200
# shell/e-activity-handler.c:200
# shell/e-activity-handler.c:200
-#: shell/e-activity-handler.c:200
+#: shell/e-activity-handler.c:162
msgid "Show Details"
msgstr "显示细节"
# shell/e-activity-handler.c:202
# shell/e-activity-handler.c:202
# shell/e-activity-handler.c:202
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
msgid "Cancel Operation"
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:174 shell/e-shortcuts.c:1052
-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:175
-msgid "Outbox"
-msgstr "发件箱"
-
-# shell/e-local-storage.c:636
-# shell/e-local-storage.c:636
-# shell/e-local-storage.c:636
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "本地文件夹"
-
# shell/e-setup.c:124
# shell/e-setup.c:124
# shell/e-setup.c:124
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
msgid "Evolution installation"
msgstr "安装 Evolution"
# shell/e-setup.c:128
# shell/e-setup.c:128
# shell/e-setup.c:128
-#: shell/e-setup.c:128
+#: shell/e-setup.c:130
msgid ""
"This new version of Evolution needs to install additional files\n"
"into your personal Evolution directory"
@@ -38292,21 +38933,23 @@ msgstr ""
# shell/e-setup.c:129
# shell/e-setup.c:129
# shell/e-setup.c:129
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr "请点击“确认”以安装文件,或者点击“取消”以便退出。"
+msgstr ""
+"请点击“确认”以安装文件,或者点击“取消”以便退出"
+""
# shell/e-setup.c:169
# shell/e-setup.c:169
# shell/e-setup.c:169
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
msgid "Could not update files correctly"
msgstr "无法正确地更新文件"
# shell/e-setup.c:192
# shell/e-setup.c:192
# shell/e-setup.c:192
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
#, c-format
msgid ""
"Cannot create the directory\n"
@@ -38320,7 +38963,7 @@ msgstr ""
# shell/e-setup.c:207
# shell/e-setup.c:207
# shell/e-setup.c:207
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
#, c-format
msgid ""
"An error occurred in copying files into\n"
@@ -38332,7 +38975,7 @@ msgstr ""
# camel/camel-session.c:532
# shell/e-setup.c:280
# shell/e-setup.c:280
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
#, c-format
msgid ""
"Evolution could not create directory\n"
@@ -38345,7 +38988,7 @@ msgstr ""
# shell/e-setup.c:298
# shell/e-setup.c:298
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
#, c-format
msgid ""
"Directory %s\n"
@@ -38358,7 +39001,7 @@ msgstr ""
# shell/e-setup.c:304
# shell/e-setup.c:304
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
#, c-format
msgid ""
"File %s\n"
@@ -38372,7 +39015,7 @@ msgstr ""
# shell/e-setup.c:281
# shell/e-setup.c:327
# shell/e-setup.c:327
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
#, c-format
msgid ""
"The file `%s' is not a directory.\n"
@@ -38385,7 +39028,7 @@ msgstr ""
# shell/e-setup.c:295
# shell/e-setup.c:341
# shell/e-setup.c:341
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
msgid ""
"Evolution has detected an old\n"
"Executive-Summary directory.\n"
@@ -38402,7 +39045,7 @@ msgstr ""
# shell/e-setup.c:320
# shell/e-setup.c:366
# shell/e-setup.c:366
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
#, c-format
msgid ""
"The directory `%s' exists but is not the\n"
@@ -38412,20 +39055,6 @@ msgstr ""
"目录“%s”存在,但不是 Evolution 目录。\n"
"请移走它以便安装 Evolution 用户文件。"
-# shell/e-shell-about-box.c:40
-# shell/e-shell-about-box.c:40
-# shell/e-shell-about-box.c:40
-#: shell/e-shell-about-box.c:40
-msgid "Evolution "
-msgstr "Evolution "
-
-# shell/e-shell-about-box.c:41
-# shell/e-shell-about-box.c:41
-# shell/e-shell-about-box.c:41
-#: shell/e-shell-about-box.c:41
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "版权所有 1999,2000,2001 Ximian 公司。"
-
# shell/e-shell-about-box.c:43
# shell/e-shell-about-box.c:43
# shell/e-shell-about-box.c:43
@@ -38433,31 +39062,52 @@ msgstr "版权所有 1999,2000,2001 Ximian 公司。"
msgid "Brought to you by"
msgstr "制作团队"
+# camel/providers/local/camel-mbox-summary.c:370
+# 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:370
+# camel/providers/local/camel-spool-summary.c:497
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "无法检查文件夹: %s: %s"
+
+# shell/e-shell-folder-commands.c:488
+# shell/e-shell-folder-commands.c:488
+# shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"无法重命名文件夹:\n"
+"%s"
+
# shell/e-shell-folder-commands.c:176
# shell/e-shell-folder-commands.c:176
# shell/e-shell-folder-commands.c:176
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
msgid "Cannot move a folder over itself."
msgstr "无法把文件夹移动到它本身。"
# shell/e-shell-folder-commands.c:178
# shell/e-shell-folder-commands.c:178
# shell/e-shell-folder-commands.c:178
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
msgid "Cannot copy a folder over itself."
msgstr "无法把文件夹复制到它本身。"
# shell/e-shell-folder-commands.c:192
# shell/e-shell-folder-commands.c:192
# shell/e-shell-folder-commands.c:192
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:206
msgid "Cannot move a folder into one of its descendants."
msgstr "无法把文件夹移动到它子目录。"
# shell/e-shell-folder-commands.c:307
# shell/e-shell-folder-commands.c:307
# shell/e-shell-folder-commands.c:307
-#: shell/e-shell-folder-commands.c:307
+#: shell/e-shell-folder-commands.c:321
#, c-format
msgid "Specify a folder to copy folder \"%s\" into:"
msgstr "给出一个文件夹以便将文件夹“%s”复制进去:"
@@ -38465,14 +39115,14 @@ msgstr "给出一个文件夹以便将文件夹“%s”复制进去:"
# shell/e-shell-folder-commands.c:312
# shell/e-shell-folder-commands.c:312
# shell/e-shell-folder-commands.c:312
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
msgid "Copy folder"
msgstr "复制文件夹"
# shell/e-shell-folder-commands.c:354
# shell/e-shell-folder-commands.c:354
# shell/e-shell-folder-commands.c:354
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
#, c-format
msgid "Specify a folder to move folder \"%s\" into:"
msgstr "给出一个文件夹以便将文件夹“%s”移动进去:"
@@ -38480,14 +39130,14 @@ msgstr "给出一个文件夹以便将文件夹“%s”移动进去:"
# shell/e-shell-folder-commands.c:359
# shell/e-shell-folder-commands.c:359
# shell/e-shell-folder-commands.c:359
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
msgid "Move folder"
msgstr "移动文件夹"
# shell/e-shell-folder-commands.c:385
# shell/e-shell-folder-commands.c:385
# shell/e-shell-folder-commands.c:385
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
#, c-format
msgid ""
"Cannot delete folder:\n"
@@ -38499,7 +39149,7 @@ msgstr ""
# shell/e-shell-folder-commands.c:401
# shell/e-shell-folder-commands.c:401
# shell/e-shell-folder-commands.c:401
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
#, c-format
msgid "Delete \"%s\""
msgstr "删除“%s”"
@@ -38508,7 +39158,7 @@ msgstr "删除“%s”"
# shell/e-shell-folder-commands.c:411
# shell/e-shell-folder-commands.c:411
#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: shell/e-shell-folder-commands.c:425
#, c-format
msgid "Are you sure you want to remove the \"%s\" folder?"
msgstr "您确认您要删除文件夹“%s”?"
@@ -38516,7 +39166,7 @@ msgstr "您确认您要删除文件夹“%s”?"
# shell/e-shell-folder-commands.c:488
# shell/e-shell-folder-commands.c:488
# shell/e-shell-folder-commands.c:488
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:502
#, c-format
msgid ""
"Cannot rename folder:\n"
@@ -38528,7 +39178,7 @@ msgstr ""
# shell/e-shell-folder-commands.c:537
# shell/e-shell-folder-commands.c:537
# shell/e-shell-folder-commands.c:537
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "把文件夹“%s”重命名为:"
@@ -38536,7 +39186,7 @@ msgstr "把文件夹“%s”重命名为:"
# shell/e-shell-folder-commands.c:544
# shell/e-shell-folder-commands.c:544
# shell/e-shell-folder-commands.c:544
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
msgid "Rename folder"
msgstr "重命名文件夹"
@@ -38546,7 +39196,7 @@ msgstr "重命名文件夹"
# shell/e-shell-folder-creation-dialog.c:148
# shell/e-shell-folder-commands.c:554
# shell/e-shell-folder-creation-dialog.c:168
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
#: shell/e-shell-folder-creation-dialog.c:168
#, c-format
msgid "The specified folder name is not valid: %s"
@@ -38567,7 +39217,7 @@ msgstr ""
# shell/e-shell-folder-creation-dialog.c:267
# shell/e-shell-folder-creation-dialog.c:267
# shell/e-shell-folder-creation-dialog.c:304
-#: shell/e-shell-folder-creation-dialog.c:304
+#: shell/e-shell-folder-creation-dialog.c:291
msgid "Evolution - Create new folder"
msgstr "Evolution - 创建新文件夹"
@@ -38592,7 +39242,7 @@ 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: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
msgid "(Untitled)"
msgstr "(无标题)"
@@ -38614,9 +39264,11 @@ msgid ""
"You can select \"Automatic\" if you do not know, and Evolution will attempt "
"to work it out."
msgstr ""
-"选择您希望导入到 Evolution 的文件,并从列表中选择文件的类型。\n"
+"选择您希望导入到 Evolution "
+"的文件,并从列表中选择文件的类型。\n"
"\n"
-"如果您不清楚,可以选择“自动”,Evolution 将试图为您确定类型。"
+"如果您不清楚,可以选择“自动”,Evolution "
+"将试图为您确定类型。"
# 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
@@ -38856,8 +39508,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:495
-#: shell/e-shell-user-creatable-items-handler.c:540
+#: shell/e-shell-user-creatable-items-handler.c:506
+#: shell/e-shell-user-creatable-items-handler.c:551
#: widgets/misc/e-charset-picker.c:104
msgid "New"
msgstr "新建"
@@ -38893,99 +39545,84 @@ msgstr "“.”和“..”是保留文件夹名。"
# shell/e-shell-view-menu.c:165
# shell/e-shell-view-menu.c:165
# shell/e-shell-view-menu.c:165
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
msgid "Bug buddy was not found in your $PATH."
msgstr "在您的 $PATH 中找不到 Bug buddy。"
# shell/e-shell-view-menu.c:173
# shell/e-shell-view-menu.c:173
# shell/e-shell-view-menu.c:173
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
msgid "Bug buddy could not be run."
msgstr "无法运行 Bug buddy。"
# shell/e-shell-view-menu.c:215
# shell/e-shell-view-menu.c:215
# shell/e-shell-view-menu.c:215
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
msgid "About Ximian Evolution"
msgstr "关于 Ximian Evolution"
# shell/e-shell-view-menu.c:424
# shell/e-shell-view-menu.c:424
# shell/e-shell-view-menu.c:424
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:444
msgid "Go to folder..."
msgstr "转到文件夹..."
# shell/e-shell-view-menu.c:425
# shell/e-shell-view-menu.c:425
# shell/e-shell-view-menu.c:425
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:445
msgid "Select the folder that you want to open"
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:545
+#: shell/e-shell-view-menu.c:565
msgid "Create a 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:546
+#: shell/e-shell-view-menu.c:566
msgid "Select the folder you want the shortcut to point to:"
msgstr "选择您希望快捷方式指向的文件夹:"
-# shell/e-shell-view-menu.c:577
-# shell/e-shell-view-menu.c:577
-# shell/e-shell-view-menu.c:577
-#: shell/e-shell-view-menu.c:577
-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
-#: shell/e-shell-view-menu.c:585
-#, c-format
-msgid "Error executing %s."
-msgstr "执行 %s 错误。"
-
# 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:688
+#: shell/e-shell-view-menu.c:732
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:701 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
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:714 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
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:215
+#: shell/e-shell-view.c:224
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:1598
+#: shell/e-shell-view.c:1818
#, c-format
msgid "%s (%d)"
msgstr "%s (%d)"
@@ -38993,14 +39630,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:1600
+#: shell/e-shell-view.c:1820
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:1647
+#: shell/e-shell-view.c:1867
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
@@ -39008,22 +39645,37 @@ 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:1654
+#: shell/e-shell-view.c:1874
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:1660
+#: shell/e-shell-view.c:1880
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
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:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"来自激活系统的错误是:\n"
+"%s"
+
# shell/e-shell.c:651
# shell/e-shell.c:651
# shell/e-shell.c:651
-#: shell/e-shell.c:651
+#: shell/e-shell.c:764
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr "无法设置本地存储 -- %s"
@@ -39031,7 +39683,7 @@ msgstr "无法设置本地存储 -- %s"
# shell/e-shell.c:1659
# shell/e-shell.c:1659
# shell/e-shell.c:1660
-#: shell/e-shell.c:1660
+#: shell/e-shell.c:1832
#, c-format
msgid ""
"The Evolution component that handles folders of type \"%s\"\n"
@@ -39042,31 +39694,47 @@ msgstr ""
" 组件已经意外退出了。为了重新访问数据\n"
"您需要退出 Evolution 并重新启动。"
+# calendar/gui/e-itip-control.c:788 calendar/gui/e-itip-control.c:807
+# calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:833
+# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:861
+# shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
+# calendar/gui/e-itip-control.c:788 calendar/gui/e-itip-control.c:807
+# calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:833
+# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:861
+# shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
+# calendar/gui/e-itip-control.c:791 calendar/gui/e-itip-control.c:810
+# 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
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "确定"
+
# shell/e-shell.c:1886
# shell/e-shell.c:1886
# shell/e-shell.c:1887
-#: shell/e-shell.c:1887
+#: shell/e-shell.c:2135
msgid "Invalid arguments"
msgstr "无效参数"
# shell/e-shell.c:1888
# shell/e-shell.c:1888
# shell/e-shell.c:1889
-#: shell/e-shell.c:1889
+#: shell/e-shell.c:2137
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:1891
+#: shell/e-shell.c:2139
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:1893 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
msgid "Generic error"
msgstr "通用错误"
@@ -39267,124 +39935,122 @@ msgstr "从快捷方式栏上删除该快捷方式"
# shell/e-shortcuts.c:640
# shell/e-shortcuts.c:640
# shell/e-shortcuts.c:640
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
msgid "Error saving shortcuts."
msgstr "保存快捷方式错误。"
# shell/e-shortcuts.c:1043
# shell/e-shortcuts.c:1043
# shell/e-shortcuts.c:1043
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
msgid "Shortcuts"
msgstr "快捷方式"
-# shell/e-storage-set-view.c:658
-# shell/e-storage-set-view.c:658
-# shell/e-storage-set-view.c:658
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"无法转移文件夹:\n"
-"%s"
+# 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-shortcuts.c:1033
+msgid "Inbox"
+msgstr "收件箱"
-# shell/e-storage.c:181 shell/e-storage.c:187
-# shell/e-storage.c:181 shell/e-storage.c:187
-# shell/e-storage.c:181 shell/e-storage.c:187
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-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:267 calendar/gui/e-meeting-model.c:284
+# calendar/gui/e-meeting-model.c:794
+# my-evolution/Locations.h:432
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "主席"
# shell/e-storage.c:498
# shell/e-storage.c:498
# shell/e-storage.c:498
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
msgid "No error"
msgstr "无错误"
# shell/e-storage.c:502
# shell/e-storage.c:502
# shell/e-storage.c:502
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
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:504
+#: shell/e-storage.c:491
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:506
+#: shell/e-storage.c:493
msgid "I/O error"
msgstr "输入输出错误"
# shell/e-storage.c:508
# shell/e-storage.c:508
# shell/e-storage.c:508
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
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:510
+#: shell/e-storage.c:497
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:512
+#: shell/e-storage.c:499
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:514
+#: shell/e-storage.c:501
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:518
+#: shell/e-storage.c:505
msgid "Operation not supported"
msgstr "不支持的操作"
# shell/e-storage.c:520
# shell/e-storage.c:520
# shell/e-storage.c:520
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
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:522
+#: shell/e-storage.c:509
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:524
+#: shell/e-storage.c:511
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:526
+#: shell/e-storage.c:513
msgid "Cannot create a folder with that name"
msgstr "无法以那个名字创建文件夹"
@@ -39400,10 +40066,13 @@ msgstr "%s (...)"
# shell/e-task-widget.c:196
# shell/e-task-widget.c:196
#: shell/e-task-widget.c:196
-#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<点击这里以便选择文件夹>"
+
# shell/evolution-shell-component-utils.c:124
# shell/evolution-shell-component-utils.c:124
# shell/evolution-shell-component-utils.c:124
@@ -39453,112 +40122,112 @@ msgstr ""
# shell/evolution-shell-component.c:1009
# shell/evolution-shell-component.c:1009
# shell/evolution-shell-component.c:1022
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1045
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:1024
+#: shell/evolution-shell-component.c:1047
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:1026
+#: shell/evolution-shell-component.c:1049
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:1028
+#: shell/evolution-shell-component.c:1051
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:1030
+#: shell/evolution-shell-component.c:1053
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:1032
+#: shell/evolution-shell-component.c:1055
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:1034
+#: shell/evolution-shell-component.c:1057
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:1036
+#: shell/evolution-shell-component.c:1059
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:1038
+#: shell/evolution-shell-component.c:1061
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:1040
+#: shell/evolution-shell-component.c:1063
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:1044
+#: shell/evolution-shell-component.c:1067
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:1046
+#: shell/evolution-shell-component.c:1069
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:1050
+#: shell/evolution-shell-component.c:1073
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:1052
+#: shell/evolution-shell-component.c:1075
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:1054
+#: shell/evolution-shell-component.c:1077
msgid "Old owner has died"
msgstr "原所有者已死"
# shell/e-shell-importer.c:627
# shell/e-shell-importer.c:627
# shell/evolution-test-component.c:41
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:47
msgid "Test type"
msgstr "测试类型"
@@ -39764,28 +40433,28 @@ msgstr "Evolution 可以从下列文件中导入数据:"
# data/evolution.desktop.in.h:1 shell/main.c:83
# shell/main.c:83
# shell/main.c:83
-#: shell/main.c:83
+#: shell/main.c:89
msgid "Evolution"
msgstr "Evolution"
# shell/main.c:89
# shell/main.c:89
# shell/main.c:89
-#: shell/main.c:89
+#: shell/main.c:95
msgid "Evolution is now exiting ..."
msgstr "Evolution 正在退出 ..."
# shell/main.c:210
# shell/main.c:210
# shell/main.c:210
-#: shell/main.c:210
+#: shell/main.c:227
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:219
+#: shell/main.c:236
#, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "无法初始化 Ximian Evolution shell: %s"
@@ -39793,21 +40462,44 @@ msgstr "无法初始化 Ximian Evolution shell: %s"
# shell/main.c:289
# shell/main.c:289
# shell/main.c:289
-#: shell/main.c:289
+#: shell/main.c:317
msgid "Disable splash screen"
msgstr "禁用启动屏幕"
+# importers/netscape-importer.c:897
+# importers/netscape-importer.c:897
+# importers/netscape-importer.c:897
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+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:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "启动智能导入器"
+
# shell/main.c:290
# shell/main.c:290
# shell/main.c:290
-#: shell/main.c:290
+#: shell/main.c:320
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+" Use %s --help for more information.\n"
+msgstr ""
+
# shell/main.c:332
# shell/main.c:332
# shell/main.c:332
-#: shell/main.c:332
+#: shell/main.c:368
msgid "Cannot initialize the Bonobo component system."
msgstr "无法初始化 Bonobo 成员系统。"
@@ -39847,134 +40539,152 @@ msgstr "输出文件"
msgid "No filename provided."
msgstr "没有提供文件名。"
+# ui/evolution-mail-message.xml.h:7
+# ui/evolution-mail-message.xml.h:7
+# ui/evolution-mail-message.xml.h:7
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "把选中的消息复制到其它文件夹"
+
# ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
# ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
# ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
msgid "Copy the selection"
msgstr "复制选中内容"
+# mail/folder-browser.c:1467
+# mail/folder-browser.c:1476
+# mail/folder-browser.c:1477
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+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: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: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:7 ui/evolution-calendar.xml.h:10
+#: ui/evolution-addressbook.xml.h:9 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:9
+#: ui/evolution-addressbook.xml.h:11
msgid "Delete selected contacts"
msgstr "删除选中的联系人"
-# ui/evolution-addressbook.xml.h:12
-# ui/evolution-addressbook.xml.h:12
-# ui/evolution-addressbook.xml.h:12
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-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
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "把选中的邮件移动到其它文件夹"
+
+# mail/folder-browser.c:1466
+# mail/folder-browser.c:1475
+# mail/folder-browser.c:1476
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+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:14 ui/evolution-calendar.xml.h:23
+#: ui/evolution-addressbook.xml.h:16 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:15
+#: ui/evolution-addressbook.xml.h:17
msgid "Previews the contacts to be printed"
msgstr "预览将要打印的联系人"
# ui/evolution-addressbook.xml.h:18
# ui/evolution-addressbook.xml.h:18
# ui/evolution-addressbook.xml.h:18
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
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:20
+#: ui/evolution-addressbook.xml.h:22
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:21
+#: ui/evolution-addressbook.xml.h:23
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:22
+#: ui/evolution-addressbook.xml.h:24
msgid "Select all contacts"
msgstr "选中所有的联系人"
-# 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:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "给联系人发邮件(_M)..."
-
# ui/evolution-addressbook.xml.h:24
# ui/evolution-addressbook.xml.h:24
# ui/evolution-addressbook.xml.h:24
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
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:25
+#: ui/evolution-addressbook.xml.h:26
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:26
+#: ui/evolution-addressbook.xml.h:27
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:27
+#: ui/evolution-addressbook.xml.h:28
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:28
+#: ui/evolution-addressbook.xml.h:29
msgid "Stop Loading"
msgstr "停止载入"
# ui/evolution-addressbook.xml.h:29
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:30
msgid "View the current contact"
msgstr "查看当前联系人"
@@ -39996,29 +40706,16 @@ 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:30 ui/evolution-calendar.xml.h:34
+#: ui/evolution-addressbook.xml.h:31 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:9
-#: 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-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
+#: ui/evolution.xml.h:35
msgid "_Actions"
msgstr "动作(_A)"
-# ui/evolution-addressbook.xml.h:30
-# ui/evolution-addressbook.xml.h:30
-# ui/evolution-addressbook.xml.h:31
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Addressbook Sources..."
-msgstr "地址簿来源(_A)..."
-
-# ui/evolution-addressbook.xml.h:31
-# ui/evolution-addressbook.xml.h:31
-# ui/evolution-addressbook.xml.h:32
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "联系人(_C)"
-
# ui/evolution-addressbook.xml.h:32
# ui/evolution-addressbook.xml.h:32
# ui/evolution-addressbook.xml.h:33
@@ -40029,249 +40726,173 @@ 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:36 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
msgid "_Forward Contact..."
msgstr "转发联系人(_F)..."
-# ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
-# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:103
-# ui/my-evolution.xml.h:7
-# ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
-# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:103
-# ui/my-evolution.xml.h:7
-# 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
-#: 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
-msgid "_Print..."
-msgstr "打印(_P)..."
+# mail/folder-browser.c:1466
+# mail/folder-browser.c:1475
+# mail/folder-browser.c:1476
+#: ui/evolution-addressbook.xml.h:38
+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:40
+#: ui/evolution-addressbook.xml.h:42
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:41
+#: ui/evolution-addressbook.xml.h:43
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:42
+#: ui/evolution-addressbook.xml.h:44
msgid "_Select All"
msgstr "全选(_S)"
-# ui/evolution-calendar.xml.h:2
-# ui/evolution-calendar.xml.h:2
-# ui/evolution-calendar.xml.h:2
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "配置日历的设置"
-
-# ui/evolution-calendar.xml.h:4
-# ui/evolution-calendar.xml.h:4
-# ui/evolution-calendar.xml.h:4
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "创建一个新的全天事件(_E)"
-
-# ui/evolution-calendar.xml.h:5
-# ui/evolution-calendar.xml.h:5
-# ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "创建新任务(_T)"
-
-# ui/evolution-calendar.xml.h:6
-# ui/evolution-calendar.xml.h:6
-# ui/evolution-calendar.xml.h:6
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "创建新约会(_N)"
-
-# ui/evolution-calendar.xml.h:9
-# ui/evolution-calendar.xml.h:9
-# ui/evolution-calendar.xml.h:9
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr "为一整天创建一个事件"
+# 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
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "给联系人发邮件(_M)..."
# ui/evolution-calendar.xml.h:11
# ui/evolution-calendar.xml.h:11
# ui/evolution-calendar.xml.h:11
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:4
msgid "Day"
msgstr "天"
# ui/evolution-calendar.xml.h:12
# ui/evolution-calendar.xml.h:12
# ui/evolution-calendar.xml.h:12
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
msgid "Delete the appointment"
msgstr "删除约会"
# 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-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
+#: ui/evolution-calendar.xml.h:6
msgid "Go To"
msgstr "转到"
# ui/evolution-calendar.xml.h:14
# ui/evolution-calendar.xml.h:14
# ui/evolution-calendar.xml.h:14
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
msgid "Go back"
msgstr "退回"
# ui/evolution-calendar.xml.h:15
# ui/evolution-calendar.xml.h:15
# ui/evolution-calendar.xml.h:15
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
msgid "Go forward"
msgstr "前进"
# ui/evolution-calendar.xml.h:16
# ui/evolution-calendar.xml.h:16
# ui/evolution-calendar.xml.h:16
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
msgid "Go to _Date"
msgstr "转到日期(_D)"
# ui/evolution-calendar.xml.h:18
# ui/evolution-calendar.xml.h:18
# ui/evolution-calendar.xml.h:18
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
msgid "Go to a specific date"
msgstr "转到指定日期"
# ui/evolution-calendar.xml.h:19
# ui/evolution-calendar.xml.h:19
# ui/evolution-calendar.xml.h:19
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
msgid "Go to today"
msgstr "转到今天"
# ui/evolution-calendar.xml.h:20
# ui/evolution-calendar.xml.h:20
# ui/evolution-calendar.xml.h:20
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
msgid "Month"
msgstr "月"
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-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
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-msgid "New Task"
-msgstr "新建任务"
-
# ui/evolution-calendar.xml.h:24
# ui/evolution-calendar.xml.h:24
# ui/evolution-calendar.xml.h:24
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
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: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
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
msgid "Print this calendar"
msgstr "打印该日历"
# ui/evolution-calendar.xml.h:27
# ui/evolution-calendar.xml.h:27
# ui/evolution-calendar.xml.h:27
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
msgid "Publish Free/Busy information for this calendar"
msgstr "为该日历发布忙闲信息"
# ui/evolution-calendar.xml.h:28
# ui/evolution-calendar.xml.h:28
# ui/evolution-calendar.xml.h:28
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
msgid "Show one day"
msgstr "显示一天"
# ui/evolution-calendar.xml.h:29
# ui/evolution-calendar.xml.h:29
# ui/evolution-calendar.xml.h:29
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
msgid "Show one month"
msgstr "显示一个月"
# ui/evolution-calendar.xml.h:30
# ui/evolution-calendar.xml.h:30
# ui/evolution-calendar.xml.h:30
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
msgid "Show one week"
msgstr "显示一周"
# ui/evolution-calendar.xml.h:31
# ui/evolution-calendar.xml.h:31
# ui/evolution-calendar.xml.h:31
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
msgid "Show the working week"
msgstr "显示工作周"
# ui/evolution-calendar.xml.h:32
# ui/evolution-calendar.xml.h:32
# ui/evolution-calendar.xml.h:32
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
msgid "Week"
msgstr "周"
-# ui/evolution-calendar.xml.h:35
-# ui/evolution-calendar.xml.h:35
-# ui/evolution-calendar.xml.h:35
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "约会(_A)..."
-
-# ui/evolution-calendar.xml.h:36
-# ui/evolution-calendar.xml.h:36
-# ui/evolution-calendar.xml.h:36
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "日历设置(_C)..."
-
-# ui/evolution-calendar.xml.h:42
-# ui/evolution-calendar.xml.h:42
-# ui/evolution-calendar.xml.h:42
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr "发布忙闲信息(_P)"
-
-# ui/evolution-calendar.xml.h:43
-# ui/evolution-calendar.xml.h:43
-# ui/evolution-calendar.xml.h:43
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "任务(_T)..."
-
# ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
# ui/evolution-contact-list-editor.xml.h:1
# ui/evolution-mail-messagedisplay.xml.h:1
@@ -40334,13 +40955,6 @@ msgstr "预览被打印项"
msgid "Print this item"
msgstr "打印该项"
-# ui/evolution-comp-editor.xml.h:11
-# ui/evolution-comp-editor.xml.h:11
-# ui/evolution-comp-editor.xml.h:11
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "打印..."
-
# 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:239
# ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
@@ -40348,10 +40962,20 @@ msgstr "打印..."
# 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:3 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
msgid "Save"
msgstr "保存"
+# calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
+# widgets/misc/e-filter-bar.h:101
+# calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
+# widgets/misc/e-filter-bar.h:101
+# calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
+# widgets/misc/e-filter-bar.h:101
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "另存为..."
+
# ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
# ui/evolution-contact-list-editor.xml.h:6
# ui/evolution-signature-editor.xml.h:4
@@ -40363,7 +40987,7 @@ msgstr "保存"
# ui/evolution-signature-editor.xml.h:4
#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
#: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:6
msgid "Save and Close"
msgstr "保存并关闭"
@@ -40403,8 +41027,8 @@ msgstr "把该项保存到磁盘"
#: 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:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:36
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:40
msgid "_File"
msgstr "文件(_F)"
@@ -40437,6 +41061,13 @@ msgstr "另存为(_A)..."
msgid "Save the contact and close the dialog box"
msgstr "保存联系人并关闭对话框"
+# 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-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "给联系人发邮件(_M)..."
+
# ui/evolution-contact-editor.xml.h:15
# ui/evolution-contact-list-editor.xml.h:12
# ui/evolution-message-composer.xml.h:53
@@ -40452,7 +41083,7 @@ msgstr "保存联系人并关闭对话框"
#: 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:11
+#: ui/evolution-signature-editor.xml.h:14
msgid "_Save"
msgstr "保存(_S)"
@@ -40554,6 +41185,13 @@ msgstr "为此项调度会议"
msgid "Customise My Evolution"
msgstr "定制我的 Evolution"
+# 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
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "取消"
+
# ui/evolution-mail-global.xml.h:2
# ui/evolution-mail-global.xml.h:2
# ui/evolution-mail-global.xml.h:2
@@ -40568,143 +41206,94 @@ msgstr "取消当前邮件操作"
msgid "Compose _New Message"
msgstr "撰写新邮件(_N)"
-# ui/evolution-mail-global.xml.h:4
-# ui/evolution-mail-global.xml.h:4
-# ui/evolution-mail-global.xml.h:4
-#: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "创建或编辑邮件帐号和其它属性"
-
# ui/evolution-mail-global.xml.h:5
# ui/evolution-mail-global.xml.h:5
# ui/evolution-mail-global.xml.h:5
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
msgid "Create or edit rules for filtering new mail"
msgstr "创建或编辑过滤新邮件的规则"
# ui/evolution-mail-global.xml.h:6
# ui/evolution-mail-global.xml.h:6
# ui/evolution-mail-global.xml.h:6
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
msgid "Create or edit virtual folder definitions"
msgstr "创建或编辑虚拟文件夹定义"
# ui/evolution-mail-global.xml.h:7
# ui/evolution-mail-global.xml.h:7
# ui/evolution-mail-global.xml.h:7
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
msgid "Empty _Trash"
msgstr "清空已删除邮件(_T)"
# ui/evolution-mail-global.xml.h:8
# ui/evolution-mail-global.xml.h:8
# ui/evolution-mail-global.xml.h:8
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
msgid "Forget _Passwords"
msgstr "丢弃密码(_P)"
# ui/evolution-mail-global.xml.h:9
# ui/evolution-mail-global.xml.h:9
# ui/evolution-mail-global.xml.h:9
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
msgid "Forget remembered passwords so you will be prompted for them again"
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:10
-msgid "New Message"
-msgstr "新建邮件"
-
# ui/evolution-mail-global.xml.h:11
# ui/evolution-mail-global.xml.h:11
# ui/evolution-mail-global.xml.h:11
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
msgid "Open a window for composing a mail message"
msgstr "打开窗口以书写邮件"
# ui/evolution-mail-global.xml.h:12
# ui/evolution-mail-global.xml.h:12
# ui/evolution-mail-global.xml.h:12
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
msgid "Permanently remove all deleted messages from all folders"
msgstr "永久删除所有文件夹中的所有已删除的邮件"
-# ui/evolution-mail-global.xml.h:13
-# ui/evolution-mail-global.xml.h:13
-# ui/evolution-mail-global.xml.h:13
-#: ui/evolution-mail-global.xml.h:13
-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-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-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:15
+#: ui/evolution-mail-global.xml.h:11
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:16
+#: ui/evolution-mail-global.xml.h:12
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:17
+#: ui/evolution-mail-global.xml.h:13
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:19
+#: ui/evolution-mail-global.xml.h:15
msgid "_Filters..."
msgstr "邮件过滤(_F)..."
-# ui/evolution-mail-global.xml.h:20
-# ui/evolution-mail-global.xml.h:20
-# ui/evolution-mail-global.xml.h:20
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "邮件(_M)"
-
-# ui/evolution-mail-global.xml.h:21
-# ui/evolution-mail-global.xml.h:21
-# ui/evolution-mail-global.xml.h:21
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "邮件设置(_M)..."
-
# 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:22
+#: ui/evolution-mail-global.xml.h:17
msgid "_Preview Pane"
msgstr "预览窗口(_P)"
-# ui/evolution-mail-global.xml.h:23
-# ui/evolution-mail-global.xml.h:23
-# ui/evolution-mail-global.xml.h:23
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "发送和接收(_S)"
-
# 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:24
+#: ui/evolution-mail-global.xml.h:18
msgid "_Subscribe to Folders..."
msgstr "订阅到文件夹(_S)..."
@@ -40866,14 +41455,14 @@ msgstr "按线索编排的邮件列表"
# ui/evolution-mail-list.xml.h:26
# ui/evolution-mail-list.xml.h:26
# ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:20
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:20
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
msgid "_Expunge"
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:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
msgid "_Folder"
msgstr "文件夹(_F)"
@@ -40898,255 +41487,268 @@ msgstr "属性(_P)"
msgid "_Threaded Message List"
msgstr "按线索编排的邮件列表(_T)"
+# 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
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "将发件人添加到地址簿"
+
+# mail/folder-browser.c:1476
+# mail/folder-browser.c:1485
+# mail/folder-browser.c:1486
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+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
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "将发件人添加到地址簿"
+
# ui/evolution-mail-message.xml.h:2
# ui/evolution-mail-message.xml.h:2
# ui/evolution-mail-message.xml.h:2
-#: ui/evolution-mail-message.xml.h:2
+#: ui/evolution-mail-message.xml.h:4
msgid "Apply filter rules to the selected messages"
msgstr "应用过滤规则到选中的邮件"
# ui/evolution-mail-message.xml.h:3
# ui/evolution-mail-message.xml.h:3
# ui/evolution-mail-message.xml.h:3
-#: ui/evolution-mail-message.xml.h:3
+#: ui/evolution-mail-message.xml.h:5
msgid "Compose a reply to all of the recipients of the selected message"
msgstr "为选中邮件的所有收件人撰写回复"
# ui/evolution-mail-message.xml.h:4
# ui/evolution-mail-message.xml.h:4
# ui/evolution-mail-message.xml.h:4
-#: ui/evolution-mail-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:6
msgid "Compose a reply to the mailing list of the selected message"
msgstr "为选中邮件的邮件列表撰写回复"
# ui/evolution-mail-message.xml.h:5
# ui/evolution-mail-message.xml.h:5
# ui/evolution-mail-message.xml.h:5
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-mail-message.xml.h:7
msgid "Compose a reply to the sender of the selected message"
msgstr "为选中邮件的发件人撰写回复"
# ui/evolution-mail-message.xml.h:7
# ui/evolution-mail-message.xml.h:7
# ui/evolution-mail-message.xml.h:7
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:9
msgid "Copy selected messages to another folder"
msgstr "把选中的消息复制到其它文件夹"
# ui/evolution-mail-message.xml.h:8
# ui/evolution-mail-message.xml.h:8
# ui/evolution-mail-message.xml.h:8
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:10
msgid "Create _Virtual Folder From Message"
msgstr "从邮件创建虚拟文件夹(_V)"
# ui/evolution-mail-message.xml.h:9
# ui/evolution-mail-message.xml.h:9
# ui/evolution-mail-message.xml.h:9
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:11
msgid "Create a rule to filter messages from this sender"
msgstr "为来自该发件人的邮件创建邮件过滤规则"
# ui/evolution-mail-message.xml.h:10
# ui/evolution-mail-message.xml.h:10
# ui/evolution-mail-message.xml.h:10
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:12
msgid "Create a rule to filter messages to these recipients"
msgstr "为发送给这些收件人的邮件创建邮件过滤规则"
# ui/evolution-mail-message.xml.h:11
# ui/evolution-mail-message.xml.h:11
# ui/evolution-mail-message.xml.h:11
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:13
msgid "Create a rule to filter messages to this mailing list"
msgstr "为该邮件列表创建邮件过滤规则"
# ui/evolution-mail-message.xml.h:12
# ui/evolution-mail-message.xml.h:12
# ui/evolution-mail-message.xml.h:12
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:14
msgid "Create a rule to filter messages with this subject"
msgstr "为该标题创建邮件过滤规则"
# ui/evolution-mail-message.xml.h:13
# ui/evolution-mail-message.xml.h:13
# ui/evolution-mail-message.xml.h:13
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
msgid "Create a virtual folder for these recipients"
msgstr "为这些收件人创建虚拟文件夹"
# ui/evolution-mail-message.xml.h:14
# ui/evolution-mail-message.xml.h:14
# ui/evolution-mail-message.xml.h:14
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
msgid "Create a virtual folder for this mailing list"
msgstr "为该邮件列表创建虚拟文件夹"
# ui/evolution-mail-message.xml.h:15
# ui/evolution-mail-message.xml.h:15
# ui/evolution-mail-message.xml.h:15
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
msgid "Create a virtual folder for this sender"
msgstr "为该发件人创建虚拟文件夹"
# ui/evolution-mail-message.xml.h:16
# ui/evolution-mail-message.xml.h:16
# ui/evolution-mail-message.xml.h:16
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
msgid "Create a virtual folder for this subject"
msgstr "为该主题创建虚拟文件夹"
# ui/evolution-mail-message.xml.h:17
# ui/evolution-mail-message.xml.h:17
# ui/evolution-mail-message.xml.h:17
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
msgid "Decrease the text size"
msgstr "缩减文本大小"
# ui/evolution-mail-message.xml.h:19
# ui/evolution-mail-message.xml.h:19
# ui/evolution-mail-message.xml.h:19
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:21
msgid "Display the next important message"
msgstr "显示下一个重要邮件"
# ui/evolution-mail-message.xml.h:20
# ui/evolution-mail-message.xml.h:20
# ui/evolution-mail-message.xml.h:20
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:22
msgid "Display the next message"
msgstr "显示下一个邮件"
# ui/evolution-mail-message.xml.h:21
# ui/evolution-mail-message.xml.h:21
# ui/evolution-mail-message.xml.h:21
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:23
msgid "Display the next unread message"
msgstr "显示下一个未读文件"
# ui/evolution-mail-message.xml.h:22
# ui/evolution-mail-message.xml.h:22
# ui/evolution-mail-message.xml.h:22
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:24
msgid "Display the next unread thread"
msgstr "显示下一个未阅读的线索"
# ui/evolution-mail-message.xml.h:23
# ui/evolution-mail-message.xml.h:23
# ui/evolution-mail-message.xml.h:23
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:25
msgid "Display the previous important message"
msgstr "显示上一个重要邮件"
# ui/evolution-mail-message.xml.h:24
# ui/evolution-mail-message.xml.h:24
# ui/evolution-mail-message.xml.h:24
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:26
msgid "Display the previous message"
msgstr "显示上一个邮件"
# ui/evolution-mail-message.xml.h:25
# ui/evolution-mail-message.xml.h:25
# ui/evolution-mail-message.xml.h:25
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:27
msgid "Display the previous unread message"
msgstr "显示上一个未读邮件"
+# ui/evolution-mail-message.xml.h:31
+# ui/evolution-mail-message.xml.h:31
+# ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "转发"
+
# ui/evolution-mail-message.xml.h:26
# ui/evolution-mail-message.xml.h:26
# ui/evolution-mail-message.xml.h:26
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:29
msgid "Filter on Mailing _List..."
msgstr "过滤邮件列表(_L)..."
# ui/evolution-mail-message.xml.h:27
# ui/evolution-mail-message.xml.h:27
# ui/evolution-mail-message.xml.h:27
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:30
msgid "Filter on Se_nder..."
msgstr "过滤发件人(_N)..."
# ui/evolution-mail-message.xml.h:28
# ui/evolution-mail-message.xml.h:28
# ui/evolution-mail-message.xml.h:28
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:31
msgid "Filter on _Recipients..."
msgstr "过滤收件人(_R)..."
# ui/evolution-mail-message.xml.h:29
# ui/evolution-mail-message.xml.h:29
# ui/evolution-mail-message.xml.h:29
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:32
msgid "Filter on _Subject..."
msgstr "过滤标题(_S)..."
-# ui/evolution-mail-message.xml.h:30
-# ui/evolution-mail-message.xml.h:30
-# ui/evolution-mail-message.xml.h:30
-#: ui/evolution-mail-message.xml.h:30
-msgid "Force images in HTML mail to be loaded"
-msgstr "强制装入 HTML 邮件中的图像"
-
-# ui/evolution-mail-message.xml.h:31
-# ui/evolution-mail-message.xml.h:31
-# ui/evolution-mail-message.xml.h:31
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward"
-msgstr "转发"
-
-# ui/evolution-mail-message.xml.h:32
-# ui/evolution-mail-message.xml.h:32
-# ui/evolution-mail-message.xml.h:32
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward As"
-msgstr "转发方式"
-
-# ui/evolution-mail-message.xml.h:33
-# ui/evolution-mail-message.xml.h:33
-# ui/evolution-mail-message.xml.h:33
+# ui/evolution-mail-message.xml.h:51
+# ui/evolution-mail-message.xml.h:51
+# ui/evolution-mail-message.xml.h:51
#: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Attached"
-msgstr "附件方式(_A)"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "为选定的邮件做删除标记"
-# ui/evolution-mail-message.xml.h:34
-# ui/evolution-mail-message.xml.h:34
-# ui/evolution-mail-message.xml.h:34
+# addressbook/gui/contact-editor/contact-editor.glade.h:15
+# addressbook/gui/contact-editor/contact-editor.glade.h:15
+# addressbook/gui/contact-editor/contact-editor.glade.h:15
#: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Inline"
-msgstr "内文方式(_I)"
+#, fuzzy
+msgid "Follow _Up..."
+msgstr "全名(_N)..."
-# ui/evolution-mail-message.xml.h:35
-# ui/evolution-mail-message.xml.h:35
-# ui/evolution-mail-message.xml.h:35
+# ui/evolution-mail-message.xml.h:30
+# ui/evolution-mail-message.xml.h:30
+# ui/evolution-mail-message.xml.h:30
#: ui/evolution-mail-message.xml.h:35
-msgid "Forward _Quoted"
-msgstr "引用方式(_Q)"
+msgid "Force images in HTML mail to be loaded"
+msgstr "强制装入 HTML 邮件中的图像"
# ui/evolution-mail-message.xml.h:36
# ui/evolution-mail-message.xml.h:36
# ui/evolution-mail-message.xml.h:36
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
msgid "Forward the selected message in the body of a new message"
msgstr "在新邮件体中转发选定的邮件"
# ui/evolution-mail-message.xml.h:37
# ui/evolution-mail-message.xml.h:37
# ui/evolution-mail-message.xml.h:37
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
msgid "Forward the selected message quoted like a reply"
msgstr "以类似于回复的引用方式转发选定的邮件"
# ui/evolution-mail-message.xml.h:38
# ui/evolution-mail-message.xml.h:38
# ui/evolution-mail-message.xml.h:38
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
msgid "Forward the selected message to someone"
msgstr "把选定的邮件转发给某人"
# ui/evolution-mail-message.xml.h:39
# ui/evolution-mail-message.xml.h:39
# ui/evolution-mail-message.xml.h:39
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
msgid "Forward the selected message to someone as an attachment"
msgstr "把选定的邮件作为附件转发给某人"
@@ -41171,6 +41773,13 @@ msgstr "装入图像(_I)"
msgid "Mark as I_mportant"
msgstr "标记为重要(_M)"
+# 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
+#: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "标记为未读(_N)"
+
# ui/evolution-mail-message.xml.h:46
# ui/evolution-mail-message.xml.h:46
# ui/evolution-mail-message.xml.h:46
@@ -41182,28 +41791,32 @@ msgstr "标记为不重要(_O)"
# ui/evolution-mail-message.xml.h:47
# ui/evolution-mail-message.xml.h:47
#: ui/evolution-mail-message.xml.h:47
-msgid "Mark the selected messages as having been read"
+#, fuzzy
+msgid "Mark the selected message(s) as having been read"
msgstr "把选定的邮件标记为已读"
# ui/evolution-mail-message.xml.h:48
# ui/evolution-mail-message.xml.h:48
# ui/evolution-mail-message.xml.h:48
#: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected messages as important"
+#, fuzzy
+msgid "Mark the selected message(s) as important"
msgstr "报选定的邮件标记为重要邮件"
# ui/evolution-mail-message.xml.h:49
# ui/evolution-mail-message.xml.h:49
# ui/evolution-mail-message.xml.h:49
#: ui/evolution-mail-message.xml.h:49
-msgid "Mark the selected messages as not having been read"
+#, fuzzy
+msgid "Mark the selected message(s) as not having been read"
msgstr "把选定的邮件标记为未读"
# ui/evolution-mail-message.xml.h:50
# ui/evolution-mail-message.xml.h:50
# ui/evolution-mail-message.xml.h:50
#: ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as unimportant"
+#, fuzzy
+msgid "Mark the selected message(s) as unimportant"
msgstr "把选定的邮件标记为不重要邮件"
# ui/evolution-mail-message.xml.h:51
@@ -41224,7 +41837,8 @@ msgstr "移动"
# ui/evolution-mail-message.xml.h:53
# ui/evolution-mail-message.xml.h:53
#: ui/evolution-mail-message.xml.h:53
-msgid "Move selected messages to another folder"
+#, fuzzy
+msgid "Move selected message(s) to another folder"
msgstr "把选中的邮件移动到其它文件夹"
# ui/evolution-mail-message.xml.h:54
@@ -41238,266 +41852,261 @@ msgstr "下一个"
# ui/evolution-mail-message.xml.h:55
# ui/evolution-mail-message.xml.h:55
#: ui/evolution-mail-message.xml.h:55
-msgid "Next Important Message"
+#, fuzzy
+msgid "Next _Important Message"
msgstr "下一个重要邮件"
-# 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:56
-msgid "Next Message"
-msgstr "下一个邮件"
-
# ui/evolution-mail-message.xml.h:57
# ui/evolution-mail-message.xml.h:57
# ui/evolution-mail-message.xml.h:57
-#: ui/evolution-mail-message.xml.h:57
-msgid "Next Thread"
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Next _Thread"
msgstr "下一个线索"
# ui/evolution-mail-message.xml.h:58
# ui/evolution-mail-message.xml.h:58
# ui/evolution-mail-message.xml.h:58
-#: ui/evolution-mail-message.xml.h:58
-msgid "Next Unread Message"
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Next _Unread Message"
msgstr "下一个未读邮件"
# ui/evolution-mail-message.xml.h:59
# ui/evolution-mail-message.xml.h:59
# ui/evolution-mail-message.xml.h:59
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:58
msgid "Open the selected message in a new window"
msgstr "在新窗口中打开选中的邮件"
# ui/evolution-mail-message.xml.h:60
# ui/evolution-mail-message.xml.h:60
# ui/evolution-mail-message.xml.h:60
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:59
msgid "Open the selected message in the composer to re-send it"
msgstr "在邮件撰写器中打开选中的邮件以便重发"
# ui/evolution-mail-message.xml.h:61
# ui/evolution-mail-message.xml.h:61
# ui/evolution-mail-message.xml.h:61
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:60
msgid "Original Si_ze"
msgstr "原大小(_Z)"
+# ui/evolution-mail-message.xml.h:66
+# ui/evolution-mail-message.xml.h:66
+# ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "P_revious Unread Message"
+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
+#, fuzzy
+msgid "Pr_evious Important Message"
+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:62
+#: ui/evolution-mail-message.xml.h:63
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:63
+#: ui/evolution-mail-message.xml.h:64
msgid "Previous"
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:64
-msgid "Previous Important Message"
-msgstr "上一个重要邮件"
-
-# 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:65
-msgid "Previous Message"
-msgstr "上一个邮件"
-
-# ui/evolution-mail-message.xml.h:66
-# ui/evolution-mail-message.xml.h:66
-# ui/evolution-mail-message.xml.h:66
-#: ui/evolution-mail-message.xml.h:66
-msgid "Previous Unread Message"
-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:69
+#: ui/evolution-mail-message.xml.h:67
msgid "Print this message"
msgstr "打印该邮件"
# ui/evolution-mail-message.xml.h:70
-#: ui/evolution-mail-message.xml.h:70
-msgid "Redirect"
+#: ui/evolution-mail-message.xml.h:68
+#, fuzzy
+msgid "Re_direct"
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:71
+#: ui/evolution-mail-message.xml.h:69
msgid "Redirect (bounce) the selected message to someone"
msgstr "将选定的消息转发(退回)给某人"
-# ui/evolution-mail-message.xml.h:70
-# ui/evolution-mail-message.xml.h:70
-# ui/evolution-mail-message.xml.h:72
-#: 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
-#: ui/evolution-mail-message.xml.h:73
-msgid "Reply to All"
-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:76
+#: ui/evolution-mail-message.xml.h:74
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:77
+#: ui/evolution-mail-message.xml.h:75
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:78
+#: ui/evolution-mail-message.xml.h:76
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:79
+#: ui/evolution-mail-message.xml.h:77
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:80
+#: ui/evolution-mail-message.xml.h:78
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:81
+#: ui/evolution-mail-message.xml.h:79
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:82
+#: ui/evolution-mail-message.xml.h:80
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:83
+#: ui/evolution-mail-message.xml.h:81
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:84
+#: ui/evolution-mail-message.xml.h:82
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:85
+#: ui/evolution-mail-message.xml.h:83
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:86
+#: ui/evolution-mail-message.xml.h:84
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:87
+#: ui/evolution-mail-message.xml.h:85
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:88
+#: ui/evolution-mail-message.xml.h:86
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:89
+#: ui/evolution-mail-message.xml.h:87
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:90
+#: ui/evolution-mail-message.xml.h:88
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:91
+#: ui/evolution-mail-message.xml.h:89
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:92
+#: ui/evolution-mail-message.xml.h:90
msgid "VFolder on _Subject..."
msgstr "关于主题的虚拟文件夹(_S)..."
-# ui/evolution-mail-message.xml.h:92
-# ui/evolution-mail-message.xml.h:92
-# ui/evolution-mail-message.xml.h:94
-#: ui/evolution-mail-message.xml.h:94
-msgid "_Apply Filters"
-msgstr "应用过滤规则(_A)"
+# 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
+#, fuzzy
+msgid "_Attached"
+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:95
+#: ui/evolution-mail-message.xml.h:93
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:96
+#: ui/evolution-mail-message.xml.h:94
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:99
+#: ui/evolution-mail-message.xml.h:97
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
+#, fuzzy
+msgid "_Go To"
+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
+#, fuzzy
+msgid "_Inline"
+msgstr "嵌入"
+
# ui/evolution-mail-message.xml.h:98
# ui/evolution-mail-message.xml.h:98
# ui/evolution-mail-message.xml.h:100
@@ -41519,31 +42128,61 @@ msgstr "邮件显示(_M)"
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
+#, fuzzy
+msgid "_Next Message"
+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:103
+#: ui/evolution-mail-message.xml.h:104
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:104
+#: ui/evolution-mail-message.xml.h:105
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
+#, fuzzy
+msgid "_Previous Message"
+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
+#, fuzzy
+msgid "_Quoted"
+msgstr "已引用"
+
# 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:108 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
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
+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
@@ -41565,8 +42204,8 @@ msgstr "关闭该窗口"
# 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:6 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:33
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:36
msgid "_Close"
msgstr "关闭(_C)"
@@ -41577,7 +42216,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:50
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
msgid "_View"
msgstr "查看(_V)"
@@ -41619,14 +42258,14 @@ msgstr "用您的 S/MIME 加密证书加密该邮件"
# ui/evolution-message-composer.xml.h:8
# ui/evolution-message-composer.xml.h:8
# ui/evolution-message-composer.xml.h:8
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
msgid "For_mat"
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-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
msgid "H_TML"
msgstr "HTML(_T)"
@@ -41651,6 +42290,16 @@ msgstr "把文件作为文本插入邮件"
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
+msgid "Open"
+msgstr "打开"
+
# ui/evolution-message-composer.xml.h:14
# ui/evolution-message-composer.xml.h:14
# ui/evolution-message-composer.xml.h:14
@@ -41714,7 +42363,7 @@ msgstr "保存到文件夹..."
# ui/evolution-message-composer.xml.h:24
# ui/evolution-signature-editor.xml.h:5
#: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:7
msgid "Save the current file"
msgstr "保存当前文件"
@@ -41757,6 +42406,7 @@ 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-signature-editor.xml.h:8
msgid "Send the mail in HTML format"
msgstr "以 HTML 格式发送邮件"
@@ -41879,7 +42529,7 @@ msgstr "发件人域(_F)"
# 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:10
+#: ui/evolution-signature-editor.xml.h:13
msgid "_Insert"
msgstr "插入(_I)"
@@ -41897,17 +42547,10 @@ msgstr "打开(_O)..."
msgid "_Reply-To Field"
msgstr "回复域(_R)"
-# ui/evolution-message-composer.xml.h:54
-# ui/evolution-message-composer.xml.h:54
-# ui/evolution-message-composer.xml.h:54
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "安全(_S)"
-
# 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:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
msgid "_Help"
msgstr "帮助(_H)"
@@ -42002,68 +42645,63 @@ msgstr "获取最新的任务信息"
msgid "Re_fresh Task"
msgstr "刷新任务(_F)"
-# ui/evolution-tasks.xml.h:2
-# ui/evolution-tasks.xml.h:2
-# ui/evolution-tasks.xml.h:2
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "配置任务试图的设置"
-
# ui/evolution-tasks.xml.h:4
# ui/evolution-tasks.xml.h:4
# ui/evolution-tasks.xml.h:4
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
msgid "Copy selected task"
msgstr "复制选中的任务"
# ui/evolution-tasks.xml.h:7
# ui/evolution-tasks.xml.h:7
# ui/evolution-tasks.xml.h:8
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:5
msgid "Cut selected task"
msgstr "剪切选中的任务"
# ui/evolution-tasks.xml.h:9
# ui/evolution-tasks.xml.h:9
# ui/evolution-tasks.xml.h:9
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
msgid "Delete completed tasks"
msgstr "删除已完成的任务"
# ui/evolution-tasks.xml.h:9
# ui/evolution-tasks.xml.h:9
# ui/evolution-tasks.xml.h:10
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
msgid "Delete selected tasks"
msgstr "删除选中的任务"
# calendar/gui/e-calendar-table.c:954
# calendar/gui/e-calendar-table.c:954
# ui/evolution-tasks.xml.h:11
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
msgid "Mar_k as Complete"
msgstr "标记为完成(_K)"
# ui/evolution-tasks.xml.h:12
# ui/evolution-tasks.xml.h:12
# ui/evolution-tasks.xml.h:14
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:10
msgid "Paste task from the clipboard"
msgstr "从剪贴板中粘贴任务"
-# ui/evolution-tasks.xml.h:13
-# ui/evolution-tasks.xml.h:13
-# ui/evolution-tasks.xml.h:15
-#: ui/evolution-tasks.xml.h:15
-msgid "Tasks Settings..."
-msgstr "任务设置..."
+# ui/evolution-addressbook.xml.h:15
+# ui/evolution-addressbook.xml.h:15
+# ui/evolution-addressbook.xml.h:15
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "预览将要打印的联系人"
-# ui/evolution-tasks.xml.h:18
-# ui/evolution-tasks.xml.h:18
-# ui/evolution-tasks.xml.h:22
-#: ui/evolution-tasks.xml.h:22
-msgid "_Task"
-msgstr "任务(_T)"
+# ui/evolution-mail-message.xml.h:69
+# ui/evolution-mail-message.xml.h:69
+# ui/evolution-mail-message.xml.h:69
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "打印该邮件"
# ui/evolution.xml.h:1
# ui/evolution.xml.h:1
@@ -42177,195 +42815,203 @@ msgstr "在新窗口中打开"
msgid "Open this folder in an other window"
msgstr "在另一个窗口中打开该文件夹"
+# 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:21
+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:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "发送编队的邮件并检索新邮件"
+
# ui/evolution.xml.h:21
# ui/evolution.xml.h:21
# ui/evolution.xml.h:21
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
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:22
+#: ui/evolution.xml.h:24
msgid "Submit Bug Report"
msgstr "提交错误报告"
# ui/evolution.xml.h:23
# ui/evolution.xml.h:23
# ui/evolution.xml.h:23
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
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:24
+#: ui/evolution.xml.h:26
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:25
+#: ui/evolution.xml.h:27
msgid "Toggle"
msgstr "反转"
# ui/evolution.xml.h:26
# ui/evolution.xml.h:26
# ui/evolution.xml.h:26
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
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:27
+#: ui/evolution.xml.h:29
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:28
+#: ui/evolution.xml.h:30
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:29
+#: ui/evolution.xml.h:31
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:31
+#: ui/evolution.xml.h:33
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:32
+#: ui/evolution.xml.h:34
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:34
+#: ui/evolution.xml.h:38
msgid "_Copy..."
msgstr "复制(_C)..."
# ui/evolution.xml.h:38
# ui/evolution.xml.h:38
# ui/evolution.xml.h:38
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
msgid "_Folder Bar"
msgstr "文件夹工具栏(_F)"
# ui/evolution.xml.h:39
# ui/evolution.xml.h:39
# ui/evolution.xml.h:39
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
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:41
+#: ui/evolution.xml.h:45
msgid "_Import..."
msgstr "正在导入(_I)..."
# ui/evolution.xml.h:42
# ui/evolution.xml.h:42
# ui/evolution.xml.h:42
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
msgid "_Move..."
msgstr "移动(_M)..."
# ui/evolution.xml.h:43
# ui/evolution.xml.h:43
# ui/evolution.xml.h:43
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
msgid "_New"
msgstr "新建(_N)"
# ui/evolution.xml.h:44
# ui/evolution.xml.h:44
# ui/evolution.xml.h:44
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
msgid "_New Folder"
msgstr "新建文件夹(_N)"
# ui/evolution.xml.h:45
# ui/evolution.xml.h:45
# ui/evolution.xml.h:45
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
msgid "_Pilot Settings..."
msgstr "Pilot 设置(_P)..."
# ui/evolution.xml.h:46
# ui/evolution.xml.h:46
# ui/evolution.xml.h:46
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
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:52
+msgid "_Send / Receive"
+msgstr "发送和接收(_S)"
+
# ui/evolution.xml.h:47
# ui/evolution.xml.h:47
# ui/evolution.xml.h:47
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:53
msgid "_Shortcut"
msgstr "快捷方式(_S)"
# ui/evolution.xml.h:48
# ui/evolution.xml.h:48
# ui/evolution.xml.h:48
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
msgid "_Shortcut Bar"
msgstr "快捷方式栏(_S)"
-# ui/my-evolution.xml.h:1
-# ui/my-evolution.xml.h:1
-# ui/my-evolution.xml.h:1
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "改变关于概要的设置"
-
# ui/my-evolution.xml.h:4
# ui/my-evolution.xml.h:4
# ui/my-evolution.xml.h:4
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
msgid "Print summary"
msgstr "打印概要"
# ui/my-evolution.xml.h:5
# ui/my-evolution.xml.h:5
# ui/my-evolution.xml.h:5
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
msgid "Reload"
msgstr "重新载入"
# ui/my-evolution.xml.h:6
# ui/my-evolution.xml.h:6
# ui/my-evolution.xml.h:6
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
msgid "Reload the view"
msgstr "重新载入视图"
-# ui/my-evolution.xml.h:8
-# ui/my-evolution.xml.h:8
-# ui/my-evolution.xml.h:8
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "概要设置(_S)..."
-
# views/addressbook/galview.xml.h:1
# views/addressbook/galview.xml.h:1
# views/addressbook/galview.xml.h:1
@@ -42387,31 +43033,43 @@ msgstr "按公司"
msgid "Phone List"
msgstr "电话列表"
+# mail/mail-account-gui.c:837
+# mail/mail-account-gui.c:837
+# mail/mail-account-gui.c:834
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "选择文件夹"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
# views/mail/galview.xml.h:1
# views/mail/galview.xml.h:1
# views/mail/galview.xml.h:1
-#: views/mail/galview.xml.h:1
+#: views/mail/galview.xml.h:3
msgid "By Sender"
msgstr "按发件人"
# views/mail/galview.xml.h:2
# views/mail/galview.xml.h:2
# views/mail/galview.xml.h:2
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
msgid "By Status"
msgstr "按状态"
# views/mail/galview.xml.h:3
# views/mail/galview.xml.h:3
# views/mail/galview.xml.h:3
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
msgid "By Subject"
msgstr "按主题"
# views/mail/galview.xml.h:4
# views/mail/galview.xml.h:4
# views/mail/galview.xml.h:4
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
msgid "Messages"
msgstr "邮件"
@@ -42466,14 +43124,27 @@ msgstr ""
# widgets/menus/gal-view-menus.c:195
# widgets/menus/gal-view-menus.c:195
# widgets/menus/gal-view-menus.c:195
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
msgid "_Current View"
msgstr "当前视图(_C)"
+# widgets/menus/gal-view-menus.c:195
+# widgets/menus/gal-view-menus.c:195
+# widgets/menus/gal-view-menus.c:195
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "当前视图(_C)"
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
# widgets/menus/gal-view-menus.c:222
# widgets/menus/gal-view-menus.c:222
# widgets/menus/gal-view-menus.c:222
-#: widgets/menus/gal-view-menus.c:222
+#: widgets/menus/gal-view-menus.c:346
msgid "Define Views"
msgstr "定义视图"
@@ -42629,7 +43300,7 @@ msgstr "可视"
# widgets/misc/e-charset-picker.c:159
# widgets/misc/e-charset-picker.c:159
# widgets/misc/e-charset-picker.c:162
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
#, c-format
msgid "Unknown character set: %s"
msgstr "未知的字符集:%s"
@@ -42637,21 +43308,21 @@ msgstr "未知的字符集:%s"
# widgets/misc/e-charset-picker.c:201
# widgets/misc/e-charset-picker.c:201
# widgets/misc/e-charset-picker.c:204
-#: widgets/misc/e-charset-picker.c:204
+#: widgets/misc/e-charset-picker.c:206
msgid "Enter the character set to use"
msgstr "输入要使用的字符集"
# widgets/misc/e-charset-picker.c:276
# widgets/misc/e-charset-picker.c:276
# widgets/misc/e-charset-picker.c:279
-#: widgets/misc/e-charset-picker.c:279
+#: widgets/misc/e-charset-picker.c:281
msgid "Other..."
msgstr "其它..."
# widgets/misc/e-charset-picker.c:395
# widgets/misc/e-charset-picker.c:395
# widgets/misc/e-charset-picker.c:398
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
msgid "Character Encoding"
msgstr "字符编码"
@@ -42665,39 +43336,33 @@ 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:153
+#: widgets/misc/e-filter-bar.c:146
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:169
+#: widgets/misc/e-filter-bar.c:162
msgid "Save Search"
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.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "保存搜索"
+
+# widgets/misc/e-filter-bar.c:168
# widgets/misc/e-filter-bar.h:94
# widgets/misc/e-filter-bar.h:94
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
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
-# widgets/misc/e-filter-bar.h:95
-# widgets/misc/e-filter-bar.h:95
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "清除"
-
-# widgets/misc/e-filter-bar.h:102
-# widgets/misc/e-filter-bar.h:102
-# widgets/misc/e-filter-bar.h:102
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "全部显示"
-
# widgets/misc/e-messagebox.c:152
# widgets/misc/e-messagebox.c:152
# widgets/misc/e-messagebox.c:152
@@ -42705,6 +43370,16 @@ msgstr "全部显示"
msgid "Information"
msgstr "信息"
+# widgets/misc/e-messagebox.c:166
+# widgets/misc/e-messagebox.c:166
+# executive-summary/test-service/rdf-summary.c:512
+# executive-summary/test-service/rdf-summary.c:549
+# executive-summary/test-service/rdf-summary.c:594
+# widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "错误"
+
# widgets/misc/e-messagebox.c:173
# widgets/misc/e-messagebox.c:173
# widgets/misc/e-messagebox.c:173
@@ -42727,17 +43402,35 @@ msgstr "邮件"
msgid "Don't show this message again."
msgstr "不再显示该邮件。"
-# widgets/misc/e-search-bar.c:334
-# widgets/misc/e-search-bar.c:334
-# widgets/misc/e-search-bar.c:334
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "搜索(_C)"
+# 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:477
+#, fuzzy
+msgid "_Find Now"
+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
+# widgets/misc/e-filter-bar.h:95
+# widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+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
+# widgets/misc/e-filter-bar.h:95
+# widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-search-bar.c:835
+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:460
+#: widgets/misc/e-search-bar.c:837
msgid "Find Now"
msgstr "立即查找"
@@ -42784,6 +43477,1588 @@ msgstr "init_corba(): 无法初始化 GNOME"
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "init_bonobo(): 无法初始化 Bonobo"
+# addressbook/backend/pas/pas-backend-ldap.c:483
+# addressbook/backend/pas/pas-backend-ldap.c:483
+# addressbook/backend/pas/pas-backend-ldap.c:486
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "正在连接 LDAP 服务器..."
+
+# addressbook/backend/pas/pas-backend-ldap.c:509
+# addressbook/backend/pas/pas-backend-ldap.c:509
+# addressbook/backend/pas/pas-backend-ldap.c:512
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "正在等待与 LDAP 服务器的连接..."
+
+# addressbook/gui/component/addressbook-component.c:526
+# addressbook/gui/component/addressbook-component.c:526
+# addressbook/gui/component/addressbook-component.c:527
+#~ msgid "New _Contact"
+#~ msgstr "新建联系人(_C)"
+
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:530
+#~ msgid "New Contact _List"
+#~ msgstr "新建联系人列表(_L)"
+
+# addressbook/gui/component/addressbook-config.c:186
+# addressbook/gui/component/addressbook-config.c:186
+# addressbook/gui/component/addressbook-config.c:223
+#~ msgid "Edit Addressbook"
+#~ msgstr "编辑地址簿"
+
+# camel/providers/smtp/camel-smtp-transport.c:222
+# camel/providers/smtp/camel-smtp-transport.c:222
+# addressbook/gui/component/addressbook-config.glade.h:3
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "以之与服务器进行认证(_U):"
+
+# addressbook/gui/component/addressbook-config.glade.h:2
+# addressbook/gui/component/addressbook-config.glade.h:2
+# addressbook/gui/component/addressbook-config.glade.h:4
+#~ msgid "Account Name"
+#~ msgstr "帐号名"
+
+# addressbook/gui/component/addressbook-config.glade.h:3
+# addressbook/gui/component/addressbook-config.glade.h:3
+# addressbook/gui/component/addressbook-config.glade.h:5
+#~ msgid "Add Addressbook"
+#~ msgstr "添加地址簿"
+
+# addressbook/gui/component/addressbook-config.glade.h:5
+# addressbook/gui/component/addressbook-config.glade.h:5
+# addressbook/gui/component/addressbook-config.glade.h:7
+#~ msgid "Advanced"
+#~ msgstr "高级"
+
+# addressbook/gui/component/addressbook-config.glade.h:6
+# addressbook/gui/component/addressbook-config.glade.h:6
+# addressbook/gui/component/addressbook-config.glade.h:8
+#~ msgid "Base"
+#~ msgstr "起点"
+
+# addressbook/gui/component/addressbook-config.glade.h:26
+# addressbook/gui/component/addressbook-config.glade.h:26
+# addressbook/gui/component/addressbook-config.glade.h:10
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "如果服务器需要您进行认证就监查它。"
+
+# addressbook/gui/component/addressbook-config.glade.h:10
+# addressbook/gui/component/addressbook-config.glade.h:10
+# addressbook/gui/component/addressbook-config.glade.h:14
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with the "
+#~ "server"
+#~ msgstr ""
+#~ "Evolution 将使用该识别姓名 (DN) 在服务器上对您进行认证"
+
+# addressbook/gui/component/addressbook-config.glade.h:14
+# addressbook/gui/component/addressbook-config.glade.h:14
+# addressbook/gui/component/addressbook-config.glade.h:19
+#~ msgid "Server Name"
+#~ msgstr "服务器名"
+
+# addressbook/gui/component/addressbook-config.glade.h:16
+# addressbook/gui/component/addressbook-config.glade.h:16
+# addressbook/gui/component/addressbook-config.glade.h:21
+#~ msgid "The information below is required in order to add an addressbook. "
+#~ msgstr "为添加地址簿,需要以下信息。 "
+
+# addressbook/gui/component/addressbook-config.glade.h:17
+# addressbook/gui/component/addressbook-config.glade.h:17
+# addressbook/gui/component/addressbook-config.glade.h:22
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr "大部分 LDAP 服务器都不需要该信息。"
+
+# addressbook/gui/component/addressbook-config.glade.h:18
+# addressbook/gui/component/addressbook-config.glade.h:18
+# addressbook/gui/component/addressbook-config.glade.h:23
+#~ msgid ""
+#~ "This information is used by your ldap server to specify which nodes are used "
+#~ "in a search. Contact your server administrator for more information."
+#~ msgstr ""
+#~ "您的 LDAP "
+#~ "服务器用该信息来确定在搜索中使用那个节点。详情请咨"
+#~ "您的服务器管理员。"
+
+# Addressbook/gui/component/addressbook-config.glade.h:19
+# addressbook/gui/component/addressbook-config.glade.h:19
+# addressbook/gui/component/addressbook-config.glade.h:24
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact your "
+#~ "server administrator for more information."
+#~ msgstr ""
+#~ "这是您在 LDAP "
+#~ "服务器上进行的所有搜索的基本节点。详情请咨询您的服"
+#~ "器管理员。"
+
+# addressbook/gui/component/addressbook-config.glade.h:20
+# addressbook/gui/component/addressbook-config.glade.h:20
+# addressbook/gui/component/addressbook-config.glade.h:27
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "这是您的地址簿所在的服务器的名称。"
+
+# addressbook/gui/component/addressbook-config.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:28
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "这是您的 LDAP 服务器所使用的端口。"
+
+# addressbook/gui/component/addressbook-storage.c:167
+# addressbook/gui/component/addressbook-storage.c:167
+# addressbook/gui/component/addressbook-storage.c:168
+#~ msgid "Other Contacts"
+#~ msgstr "其他联系人"
+
+# addressbook/gui/component/addressbook.c:804
+# addressbook/gui/component/addressbook.c:804
+# addressbook/gui/component/addressbook.c:837
+#~ msgid "Name contains"
+#~ msgstr "名称含有"
+
+# shell/e-shell-view.c:1587
+# addressbook/gui/component/e-address-popup.c:178
+# addressbook/gui/component/e-address-popup.c:178
+#~ msgid "(none)"
+#~ msgstr "(无)"
+
+# addressbook/gui/component/select-names/select-names.glade.h:1
+# addressbook/gui/component/select-names/select-names.glade.h:1
+# addressbook/gui/component/select-names/select-names.glade.h:1
+#~ msgid "C_ontaining:"
+#~ msgstr "含有(_O):"
+
+# addressbook/gui/component/select-names/select-names.glade.h:5
+# addressbook/gui/component/select-names/select-names.glade.h:5
+# addressbook/gui/component/select-names/select-names.glade.h:4
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "显示符合以下条件的联系人:"
+
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr "您确定要删除该联系人吗?"
+
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#~ msgid "Starting:"
+#~ msgstr "开始:"
+
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#~ msgid "Ending:"
+#~ 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
+#~ msgid "New _Task"
+#~ msgstr "新建任务(_T)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "用默认提醒器创建新约会(_R)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#~ msgid "First day of wee_k:"
+#~ msgstr "每周的第一天(_K):"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#~ msgid "_Other"
+#~ msgstr "其它(_O)"
+
+# calendar/gui/dialogs/meeting-page.etspec.h:2
+# calendar/gui/e-meeting-time-sel.etspec.h:2
+# calendar/gui/dialogs/meeting-page.etspec.h:2
+# calendar/gui/e-meeting-time-sel.etspec.h:2
+# calendar/gui/dialogs/meeting-page.etspec.h:2
+# calendar/gui/e-meeting-time-sel.etspec.h:2
+#~ msgid "Click here to add an attendee"
+#~ msgstr "点击此处添加出席者"
+
+# calendar/gui/e-calendar-table.c:427
+# calendar/gui/e-calendar-table.c:427
+# calendar/gui/e-calendar-table.c:428
+#~ msgid "0%"
+#~ msgstr "0%"
+
+# calendar/gui/e-calendar-table.c:428
+# calendar/gui/e-calendar-table.c:428
+# calendar/gui/e-calendar-table.c:429
+#~ msgid "10%"
+#~ msgstr "10%"
+
+# calendar/gui/e-calendar-table.c:429
+# calendar/gui/e-calendar-table.c:429
+# calendar/gui/e-calendar-table.c:430
+#~ msgid "20%"
+#~ msgstr "20%"
+
+# calendar/gui/e-calendar-table.c:430
+# calendar/gui/e-calendar-table.c:430
+# calendar/gui/e-calendar-table.c:431
+#~ msgid "30%"
+#~ msgstr "30%"
+
+# calendar/gui/e-calendar-table.c:431
+# calendar/gui/e-calendar-table.c:431
+# calendar/gui/e-calendar-table.c:432
+#~ msgid "40%"
+#~ msgstr "40%"
+
+# calendar/gui/e-calendar-table.c:432
+# calendar/gui/e-calendar-table.c:432
+# calendar/gui/e-calendar-table.c:433
+#~ msgid "50%"
+#~ msgstr "50%"
+
+# calendar/gui/e-calendar-table.c:433
+# calendar/gui/e-calendar-table.c:433
+# calendar/gui/e-calendar-table.c:434
+#~ msgid "60%"
+#~ msgstr "60%"
+
+# calendar/gui/e-calendar-table.c:434
+# calendar/gui/e-calendar-table.c:434
+# calendar/gui/e-calendar-table.c:435
+#~ msgid "70%"
+#~ msgstr "70%"
+
+# calendar/gui/e-calendar-table.c:435
+# calendar/gui/e-calendar-table.c:435
+# calendar/gui/e-calendar-table.c:436
+#~ msgid "80%"
+#~ msgstr "80%"
+
+# calendar/gui/e-calendar-table.c:436
+# calendar/gui/e-calendar-table.c:436
+# calendar/gui/e-calendar-table.c:437
+#~ msgid "90%"
+#~ msgstr "90%"
+
+# calendar/gui/e-calendar-table.c:437
+# calendar/gui/e-calendar-table.c:437
+# calendar/gui/e-calendar-table.c:438
+#~ msgid "100%"
+#~ msgstr "100%"
+
+# calendar/gui/e-calendar-table.c:956
+# calendar/gui/e-calendar-table.c:956
+# calendar/gui/e-calendar-table.c:975
+#~ msgid "_Delete this Task"
+#~ msgstr "删除该任务(_D)"
+
+# calendar/gui/e-itip-control.c:532
+# calendar/gui/e-itip-control.c:532
+# calendar/gui/e-itip-control.c:535
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "会议开始:<b>"
+
+# calendar/gui/e-itip-control.c:537
+# calendar/gui/e-itip-control.c:537
+# calendar/gui/e-itip-control.c:540
+#~ msgid "Task begins: <b>"
+#~ msgstr "任务开始:<b>"
+
+# calendar/gui/e-itip-control.c:542
+# calendar/gui/e-itip-control.c:542
+# calendar/gui/e-itip-control.c:545
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "忙闲信息开始于:<b>"
+
+# calendar/gui/e-itip-control.c:546
+# calendar/gui/e-itip-control.c:546
+# calendar/gui/e-itip-control.c:549
+#~ msgid "Begins: <b>"
+#~ msgstr "开始时间:<b>"
+
+# calendar/gui/e-itip-control.c:558
+# calendar/gui/e-itip-control.c:558
+# calendar/gui/e-itip-control.c:561
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "会议结束时间:<b>"
+
+# calendar/gui/e-itip-control.c:561
+# calendar/gui/e-itip-control.c:561
+# calendar/gui/e-itip-control.c:564
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "忙闲信息结束于:<b>"
+
+# calendar/gui/e-itip-control.c:565
+# calendar/gui/e-itip-control.c:565
+# calendar/gui/e-itip-control.c:568
+#~ msgid "Ends: <b>"
+#~ msgstr "结束于:<b>"
+
+# calendar/gui/e-itip-control.c:579
+# calendar/gui/e-itip-control.c:579
+# calendar/gui/e-itip-control.c:582
+#~ msgid "Task Completed: <b>"
+#~ msgstr "任务完成率:<b>"
+
+# calendar/gui/e-itip-control.c:589
+# calendar/gui/e-itip-control.c:589
+# calendar/gui/e-itip-control.c:592
+#~ msgid "Task Due: <b>"
+#~ 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
+#~ msgid "iCalendar Information"
+#~ msgstr "iCalendar 信息"
+
+# calendar/gui/e-itip-control.c:641
+# calendar/gui/e-itip-control.c:641
+# calendar/gui/e-itip-control.c:644
+#~ msgid "iCalendar Error"
+#~ 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
+#~ msgid "An unknown person"
+#~ msgstr "未知的人"
+
+# calendar/gui/e-itip-control.c:729
+# calendar/gui/e-itip-control.c:729
+# calendar/gui/e-itip-control.c:732
+#~ msgid ""
+#~ "<br> Please review the following information, and then select an action from "
+#~ "the menu below."
+#~ msgstr ""
+#~ "<br> 请查看下列信息,并从下面的菜单中选择一个动作。"
+
+# calendar/gui/e-itip-control.c:745
+# calendar/gui/e-itip-control.c:745
+# calendar/gui/e-itip-control.c:748
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>无</i>"
+
+# 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
+#~ msgid "Status:"
+#~ msgstr "状态:"
+
+# calendar/gui/e-itip-control.c:804
+# calendar/gui/e-itip-control.c:804
+# calendar/gui/e-itip-control.c:807
+#~ msgid "Tentatively Accepted"
+#~ msgstr "暂时接受"
+
+# calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:802
+# calendar/gui/e-itip-control.c:818 calendar/gui/e-itip-control.c:831
+# calendar/gui/e-itip-control.c:845 calendar/gui/e-itip-control.c:859
+# calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:802
+# calendar/gui/e-itip-control.c:818 calendar/gui/e-itip-control.c:831
+# calendar/gui/e-itip-control.c:845 calendar/gui/e-itip-control.c:859
+# 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
+#~ 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
+#~ msgid "Update"
+#~ msgstr "更新"
+
+# calendar/gui/e-itip-control.c:803
+# calendar/gui/e-itip-control.c:803
+# calendar/gui/e-itip-control.c:806
+#~ msgid "Accept"
+#~ msgstr "接受"
+
+# calendar/gui/e-itip-control.c:804
+# calendar/gui/e-itip-control.c:804
+# calendar/gui/e-itip-control.c:807
+#~ 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
+#~ msgid "Decline"
+#~ msgstr "否决"
+
+# calendar/gui/e-itip-control.c:819
+# calendar/gui/e-itip-control.c:819
+# calendar/gui/e-itip-control.c:822
+#~ 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
+#~ 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
+#~ msgid "Send Latest Information"
+#~ msgstr "发送最新的信息"
+
+# calendar/gui/e-itip-control.c:875
+# calendar/gui/e-itip-control.c:875
+# calendar/gui/e-itip-control.c:909
+#~ msgid "<b>%s</b> has published meeting information."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> wishes to add to an existing meeting."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ 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
+#~ msgid "Meeting Cancellation"
+#~ msgstr "会议取消"
+
+# calendar/gui/e-itip-control.c:905 calendar/gui/e-itip-control.c:955
+# calendar/gui/e-itip-control.c:990
+# calendar/gui/e-itip-control.c:905 calendar/gui/e-itip-control.c:955
+# 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
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> has published task information."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> wishes to receive the latest task information."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ 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
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ 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
+#~ 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
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ 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
+#~ 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
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "错误的忙闲信息"
+
+# calendar/gui/e-itip-control.c:1083
+# calendar/gui/e-itip-control.c:1083
+# calendar/gui/e-itip-control.c:1157
+#~ 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
+#~ 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
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "附件中没有可查看的日程项目"
+
+# calendar/gui/e-itip-control.c:1581
+# calendar/gui/e-itip-control.c:1581
+# calendar/gui/e-itip-control.c:1648
+#~ msgid "Unable to find any of your identities in the attendees list!\n"
+#~ msgstr "无法在参与者列表中找到您的任何身份!\n"
+
+# 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
+#~ 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
+#~ 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
+#~ 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
+#~ msgid "Free/Busy information"
+#~ msgstr "忙闲信息"
+
+# calendar/gui/itip-utils.c:321
+# calendar/gui/itip-utils.c:321
+# calendar/gui/itip-utils.c:321
+#~ msgid "Calendar information"
+#~ msgstr "日历信息"
+
+# calendar/gui/itip-utils.c:370
+# calendar/gui/itip-utils.c:370
+# calendar/gui/itip-utils.c:370
+#~ msgid "Free/Busy information (%s to %s)"
+#~ msgstr "忙闲信息 (%s 到 %s)"
+
+# calendar/gui/itip-utils.c:382
+# calendar/gui/itip-utils.c:382
+# calendar/gui/itip-utils.c:382
+#~ msgid "iCalendar information"
+#~ msgstr "iCalendar 信息"
+
+# calendar/gui/print.c:2205
+# calendar/gui/print.c:2205
+# calendar/gui/print.c:2205
+#~ msgid "Task"
+#~ msgstr "任务"
+
+# calendar/gui/print.c:2262
+# calendar/gui/print.c:2262
+# calendar/gui/print.c:2262
+#~ msgid "Status: %s"
+#~ msgstr "状态:%s"
+
+# calendar/gui/print.c:2294
+# calendar/gui/print.c:2294
+# calendar/gui/print.c:2294
+#~ msgid "Percent Complete: %i"
+#~ msgstr "完成率:%i"
+
+# calendar/gui/print.c:2306
+# calendar/gui/print.c:2306
+# calendar/gui/print.c:2306
+#~ msgid "URL: %s"
+#~ msgstr "URL:%s"
+
+# calendar/gui/print.c:2320
+# calendar/gui/print.c:2320
+# calendar/gui/print.c:2320
+#~ msgid "Categories: %s"
+#~ msgstr "类别:%s"
+
+# calendar/gui/print.c:2331
+# calendar/gui/print.c:2331
+# calendar/gui/print.c:2331
+#~ msgid "Contacts: "
+#~ msgstr "联系人:"
+
+# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
+# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
+# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
+#~ msgid "Invalid type in body-contains, expecting string"
+#~ msgstr "邮件体内容中的无效类型,应该是字符串"
+
+# addressbook/gui/widgets/e-addressbook-util.c:76
+# addressbook/gui/widgets/e-addressbook-util.c:76
+# camel/camel-pkcs7-context.c:213
+#~ msgid "Error hashing password."
+#~ msgstr "杂凑口令出错。"
+
+# shell/evolution-shell-component.c:1013
+# shell/evolution-shell-component.c:1013
+# camel/camel-pkcs7-context.c:222
+#~ msgid "Invalid password."
+#~ msgstr "非法口令。"
+
+# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+# camel/camel-pkcs7-context.c:329
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "无法签名:找不到“%s”的证书。"
+
+# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+# camel/camel-pkcs7-context.c:378
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "无法清除签名:找不到“%s”的证书。"
+
+# camel/camel-pkcs7-context.c:567
+#~ msgid "Could not encrypt: failed to create enveloped data."
+#~ msgstr "无法加密:创建封装数据失败。"
+
+# mail/mail-crypto.c:113
+# mail/mail-crypto.c:113
+# camel/camel-pkcs7-context.c:590
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr "无法加密:创建加密上下文失败。"
+
+# camel/providers/pop3/camel-pop3-store.c:214
+# camel/providers/pop3/camel-pop3-store.c:214
+# camel/camel-pkcs7-context.c:620
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "无法加密数据:非法用户键:“%s”。"
+
+# mail/mail-account-gui.c:962
+# mail/mail-account-gui.c:962
+# camel/camel-pkcs7-context.c:626
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "无法加密:编码失败。"
+
+# camel/camel-pkcs7-context.c:677
+#~ msgid "Failed to decrypt: Unknown"
+#~ msgstr "无法解密:未知"
+
+# camel/providers/nntp/camel-nntp-auth.c:44
+# camel/providers/nntp/camel-nntp-auth.c:44
+# camel/providers/nntp/camel-nntp-auth.c:44
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "请为 %s@%s 输入 NNTP 密码"
+
+# camel/providers/nntp/camel-nntp-auth.c:64
+# camel/providers/nntp/camel-nntp-auth.c:64
+# camel/providers/nntp/camel-nntp-auth.c:64
+#~ msgid "Server rejected username"
+#~ msgstr "服务器拒绝的用户名"
+
+# camel/providers/nntp/camel-nntp-auth.c:70
+# camel/providers/nntp/camel-nntp-auth.c:70
+# camel/providers/nntp/camel-nntp-auth.c:70
+#~ msgid "Failed to send username to server"
+#~ msgstr "将用户名发送到服务器失败"
+
+# camel/providers/nntp/camel-nntp-auth.c:79
+# camel/providers/nntp/camel-nntp-auth.c:79
+# camel/providers/nntp/camel-nntp-auth.c:79
+#~ msgid "Server rejected username/password"
+#~ msgstr "服务器拒绝的 用户名/密码"
+
+# camel/providers/nntp/camel-nntp-folder.c:112
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "内部错误:非法格式的 uid:%s"
+
+# camel/providers/nntp/camel-nntp-grouplist.c:45
+# camel/providers/nntp/camel-nntp-grouplist.c:45
+# camel/providers/nntp/camel-nntp-grouplist.c:45
+#~ msgid "Could not get group list from server."
+#~ msgstr "无法从服务器获取组列表。"
+
+# camel/providers/nntp/camel-nntp-grouplist.c:98
+# camel/providers/nntp/camel-nntp-grouplist.c:107
+# camel/providers/nntp/camel-nntp-grouplist.c:98
+# camel/providers/nntp/camel-nntp-grouplist.c:107
+# camel/providers/nntp/camel-nntp-grouplist.c:98
+# camel/providers/nntp/camel-nntp-grouplist.c:107
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "无法为 %s 装入组列表文件: %s"
+
+# camel/providers/nntp/camel-nntp-grouplist.c:158
+# camel/providers/nntp/camel-nntp-grouplist.c:158
+# camel/providers/nntp/camel-nntp-grouplist.c:158
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "无法为 %s 保存组列表文件: %s"
+
+# camel/providers/sendmail/camel-sendmail-transport.c:193
+# camel/providers/sendmail/camel-sendmail-transport.c:193
+# camel/providers/sendmail/camel-sendmail-transport.c:194
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "无法在邮件中找到“收件人”地址"
+
+# camel/providers/smtp/camel-smtp-transport.c:581
+# camel/providers/smtp/camel-smtp-transport.c:581
+# camel/providers/smtp/camel-smtp-transport.c:591
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "无法发送邮件: 发件人地址无定义。"
+
+# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+# executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
+# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "进行概括的 Evolution 组件。"
+
+# my-evolution/component-factory.c:153
+# my-evolution/component-factory.c:153
+# executive-summary/component/component-factory.c:151
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "无法初始化 Evolution 的实施概要组件。"
+
+# shell/e-shell-importer.c:617
+# shell/e-shell-importer.c:617
+# executive-summary/component/e-summary-callbacks.c:125
+#~ msgid "Select a service"
+#~ msgstr "选择一个服务"
+
+# executive-summary/component/e-summary-callbacks.c:289
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "您可以为实施概要背景选择一个不同的 HTML 页面。\n"
+#~ "\n"
+#~ "若需默认值使其保持为空即可"
+
+# executive-summary/component/e-summary-url.c:69
+# executive-summary/component/e-summary-url.c:74
+# executive-summary/component/e-summary-url.c:81
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "以默认 GNOME 应用程序打开 %s"
+
+# executive-summary/component/e-summary-url.c:70
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "以默认 GNOME 网络浏览器打开 %s"
+
+# calendar/gui/dialogs/alarm-page.c:381
+# calendar/gui/dialogs/alarm-page.c:381
+# executive-summary/component/e-summary-url.c:71
+#~ msgid "Send an email to %s"
+#~ msgstr "给 %s 发送一封电子邮件"
+
+# calendar/gui/print.c:2306
+# calendar/gui/print.c:2306
+# executive-summary/component/e-summary-url.c:73
+#~ msgid "Run %s"
+#~ msgstr "运行 %s"
+
+# ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+# 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-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+# 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
+# executive-summary/component/e-summary-url.c:75
+#~ msgid "Close %s"
+#~ msgstr "关闭 %s"
+
+# ui/evolution.xml.h:17
+# ui/evolution.xml.h:17
+# executive-summary/component/e-summary-url.c:76
+#~ msgid "Move %s to the left"
+#~ msgstr "将 %s 移动到左边"
+
+# executive-summary/component/e-summary-url.c:77
+#~ msgid "Move %s to the right"
+#~ msgstr "将 %s 移动到右边"
+
+# executive-summary/component/e-summary-url.c:78
+#~ msgid "Move %s into the previous row"
+#~ msgstr "将 %s 移动岛上一行"
+
+# executive-summary/component/e-summary-url.c:79
+#~ msgid "Move %s into the next row"
+#~ msgstr "将 %s 移动到下一行"
+
+# addressbook/printing/e-contact-print.glade.h:25
+# addressbook/printing/e-contact-print.glade.h:25
+# executive-summary/component/e-summary-url.c:553
+#~ msgid "page"
+#~ msgstr "页面"
+
+# shell/e-shell-folder-commands.c:488
+# shell/e-shell-folder-commands.c:488
+# executive-summary/component/e-summary.c:925
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法打开 HTML 文件:\n"
+#~ "%s"
+
+# shell/e-shell-importer.c:474
+# shell/e-shell-importer.c:474
+# executive-summary/component/e-summary.c:939
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "读入数据错误:\n"
+#~ "%s"
+
+# executive-summary/component/e-summary.c:957
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "文件中没有服务空间。\n"
+
+# executive-summary/component/main.c:61
+#~ msgid ""
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
+#~ msgstr ""
+#~ "实施概要组件无法初始化 Bonobo。\n"
+#~ "如果出现关于 RootPOA 的警告信息,可能表明\n"
+#~ "您是与 GOAD 而不是 OAF 一起编译的 Bonobo。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+# executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "RDF 概要车间。"
+
+# 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
+# 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
+# executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
+#~ msgid "RDF Summary"
+#~ msgstr "RDF 概要"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "测试 bonobo 组件车间。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
+#~ msgid "Factory for the test component."
+#~ msgstr "测试组件车间。"
+
+# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
+#~ msgid "Test bonobo service"
+#~ msgstr "测试 bonobo 服务"
+
+# widgets/misc/e-charset-picker.c:58
+# widgets/misc/e-charset-picker.c:58
+# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
+#~ msgid "Test service"
+#~ msgstr "测试服务"
+
+# executive-summary/test-service/rdf-summary.c:775
+#~ msgid "Update automatically"
+#~ msgstr "自动更新"
+
+# calendar/gui/e-itip-control.c:787
+# calendar/gui/e-itip-control.c:787
+# executive-summary/test-service/rdf-summary.c:785
+#~ msgid "Update now"
+#~ msgstr "现在更新"
+
+# calendar/gui/e-meeting-time-sel.c:515
+# calendar/gui/e-meeting-time-sel.c:518
+# executive-summary/test-service/rdf-summary.c:795
+#~ msgid "Update every "
+#~ msgstr "更新间隔 "
+
+#~ msgid "Enter folder URI"
+#~ msgstr "输入文件夹 URI"
+
+# calendar/gui/e-itip-control.c:986
+# calendar/gui/e-itip-control.c:986
+# mail/message-list.etspec.h:4
+#~ msgid "Needs Reply"
+#~ msgstr "需要回复"
+
+# mail/component-factory.c:101
+# mail/component-factory.c:101
+# mail/component-factory.c:101
+#~ 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
+#~ msgid "New _Mail Message"
+#~ msgstr "新建邮件(_M)"
+
+# mail/folder-browser.c:1049
+# mail/folder-browser.c:1054
+# mail/folder-browser.c:1055
+#~ msgid "Create vFolder from Search"
+#~ msgstr "根据搜索创建虚拟文件夹"
+
+# calendar/gui/e-itip-control.c:896
+# calendar/gui/e-itip-control.c:896
+# mail/folder-browser.c:1471
+#~ msgid "Mark as Needing Reply"
+#~ msgstr "标记为需要回复"
+
+# calendar/gui/e-itip-control.c:896
+# calendar/gui/e-itip-control.c:896
+# mail/folder-browser.c:1472
+#~ msgid "Mark as Not Needing Reply"
+#~ msgstr "标记为不需要回复"
+
+# mail/folder-browser.c:1628
+# mail/folder-browser.c:1656
+# mail/folder-browser.c:1657
+#~ msgid "Filter on Mailing List"
+#~ msgstr "过滤邮件列表"
+
+# mail/local-config.glade.h:3
+# mail/local-config.glade.h:3
+# mail/local-config.glade.h:3
+#~ msgid "Indexing:"
+#~ msgstr "正在建立索引:"
+
+# mail/local-config.glade.h:4
+# mail/local-config.glade.h:4
+# mail/local-config.glade.h:4
+#~ msgid "Mailbox Format"
+#~ msgstr "邮件箱格式"
+
+# mail/mail-accounts.c:149
+# mail/mail-accounts.c:149
+# mail/mail-accounts.c:149
+#~ msgid " (default)"
+#~ msgstr "(默认)"
+
+# mail/mail-accounts.c:783 mail/mail-config.glade.h:42
+# mail/mail-accounts.c:798 mail/mail-config.glade.h:42
+# mail/mail-accounts.c:824 mail/mail-config.glade.h:49
+#~ msgid "Mail Settings"
+#~ msgstr "邮件设置"
+
+# mail/mail-autofilter.c:215
+# mail/mail-autofilter.c:217
+# mail/mail-autofilter.c:217
+#~ msgid "Subject is %s"
+#~ msgstr "主题是 %s"
+
+# mail/mail-autofilter.c:231
+# mail/mail-autofilter.c:233
+# mail/mail-autofilter.c:233
+#~ msgid "Mail from %s"
+#~ msgstr "邮件来自 %s"
+
+# mail/mail-autofilter.c:287
+# mail/mail-autofilter.c:289
+# mail/mail-autofilter.c:289
+#~ msgid "%s mailing list"
+#~ msgstr "%s 邮件列表"
+
+# mail/mail-config.c:1871
+# mail/mail-config.c:1913
+# mail/mail-config.c:2006
+#~ msgid "%s: Inbox"
+#~ msgstr "%s:收件箱"
+
+# mail/mail-config.glade.h:5
+# mail/mail-config.glade.h:5
+# mail/mail-config.glade.h:5
+#~ msgid "Account"
+#~ msgstr "帐号"
+
+# mail/mail-config.glade.h:9
+# mail/mail-config.glade.h:9
+# mail/mail-config.glade.h:9
+#~ msgid "Always _encrypt to myself when sending encrypted mail"
+#~ msgstr "当发送加密邮件时总是加密到自身(_E)"
+
+# mail/mail-config.glade.h:14
+# mail/mail-config.glade.h:14
+# mail/mail-config.glade.h:17
+#~ msgid "Composer"
+#~ msgstr "撰写器"
+
+# mail/mail-config.glade.h:24
+# mail/mail-config.glade.h:24
+# mail/mail-config.glade.h:28
+#~ msgid "Default Forward style is: "
+#~ msgstr "默认转发风格为: "
+
+# mail/mail-config.glade.h:28
+# mail/mail-config.glade.h:28
+# mail/mail-config.glade.h:33
+#~ msgid "Display"
+#~ 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
+#~ msgid "Drafts"
+#~ msgstr "草稿"
+
+# mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:103
+# mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+# widgets/misc/e-filter-bar.h:103
+# mail/mail-config.glade.h:38 widgets/misc/e-filter-bar.h:96
+# widgets/misc/e-filter-bar.h:103
+#~ msgid "Edit..."
+#~ msgstr "编辑..."
+
+# mail/mail-config.glade.h:35
+# mail/mail-config.glade.h:35
+# mail/mail-config.glade.h:42
+#~ msgid "HTML signature file:"
+#~ msgstr "HTML 签名文件:"
+
+# mail/mail-config.glade.h:46
+# mail/mail-config.glade.h:46
+# mail/mail-config.glade.h:54
+#~ msgid "News"
+#~ msgstr "新闻"
+
+# mail/mail-config.glade.h:68
+# mail/mail-config.glade.h:68
+# mail/mail-config.glade.h:77
+#~ msgid "Select Filter Log file..."
+#~ msgstr "选择过滤日志文件..."
+
+# mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+# shell/e-local-storage.c:176
+# mail/mail-config.glade.h:73 mail/message-list.etspec.h:7
+# shell/e-local-storage.c:176
+# mail/mail-config.glade.h:82 mail/message-list.etspec.h:7
+# shell/e-local-storage.c:176
+#~ msgid "Sent"
+#~ msgstr "已发送"
+
+# mail/mail-config.glade.h:82
+# mail/mail-config.glade.h:82
+# mail/mail-config.glade.h:91
+#~ msgid "Sources"
+#~ msgstr "来源"
+
+# mail/mail-config.glade.h:106
+# mail/mail-config.glade.h:106
+# mail/mail-config.glade.h:115
+#~ msgid "_Log filter actions to:"
+#~ msgstr "将过滤动作记录到(_L):"
+
+# mail/mail-config.glade.h:110
+# mail/mail-config.glade.h:110
+# mail/mail-config.glade.h:119
+#~ 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
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "默认按 HTML 格式发送邮件。(_S)"
+
+# mail/mail-config.glade.h:115
+# mail/mail-config.glade.h:115
+# mail/mail-config.glade.h:124
+#~ msgid "_Server type: "
+#~ msgstr "服务器类型(_S):"
+
+# mail/mail-config.glade.h:122
+# mail/mail-config.glade.h:122
+# mail/mail-config.glade.h:131
+#~ msgid "placeholder"
+#~ msgstr "位置记录器"
+
+# mail/mail-config.glade.h:123
+# mail/mail-config.glade.h:123
+# mail/mail-config.glade.h:132
+#~ msgid "seconds."
+#~ msgstr "秒。"
+
+# mail/mail-format.c:1813
+# mail/mail-format.c:1749
+# mail/mail-format.c:1768
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more information."
+#~ msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
+
+# mail/mail-format.c:1836
+# mail/mail-format.c:1772
+# mail/mail-format.c:1791
+#~ msgid "Evolution does not recognize this type of signed message."
+#~ msgstr "Evolution 无法识别该类型的带签名邮件。"
+
+# mail/mail-format.c:1844
+# mail/mail-format.c:1780
+# mail/mail-format.c:1799
+#~ 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
+#~ msgid ""
+#~ "This message is digitally signed but can not be proven to be authentic."
+#~ msgstr "该邮件有数字签名,但不能证实是可信的。"
+
+# mail/mail-summary.c:109
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "不完整的消息被写入管道!"
+
+# my-evolution/e-summary-mail.c:129
+# my-evolution/e-summary-mail.c:129
+# mail/mail-summary.c:467
+#~ msgid "Mail Summary"
+#~ msgstr "邮件概要"
+
+# my-evolution/component-factory.c:153
+# my-evolution/component-factory.c:153
+# my-evolution/component-factory.c:153
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "无法初始化 Evolution 的概要成员。"
+
+# my-evolution/e-summary-weather.c:722
+# my-evolution/e-summary-weather.c:722
+# my-evolution/e-summary-weather.c:667
+#~ msgid "Regions"
+#~ msgstr "区域"
+
+# my-evolution/metar.c:29
+# my-evolution/metar.c:29
+#~ msgid " F"
+#~ msgstr " 华氏度"
+
+# my-evolution/metar.c:29
+# my-evolution/metar.c:29
+#~ msgid " C"
+#~ msgstr " 摄氏度"
+
+# addressbook/printing/e-contact-print.glade.h:8
+# my-evolution/metar.c:33
+# my-evolution/metar.c:33
+#~ msgid "knots"
+#~ msgstr "节"
+
+# my-evolution/metar.c:33
+# my-evolution/metar.c:33
+#~ msgid "kph"
+#~ msgstr "kph"
+
+# mail/mail-ops.c:895
+# my-evolution/metar.c:38
+# my-evolution/metar.c:38
+#~ msgid "inHg"
+#~ msgstr "英寸汞柱"
+
+# my-evolution/metar.c:38
+# my-evolution/metar.c:38
+#~ msgid "mmHg"
+#~ msgstr "毫米汞柱"
+
+# mail/mail-callbacks.c:2262
+# my-evolution/metar.c:41
+# my-evolution/metar.c:41
+#~ msgid "miles"
+#~ msgstr "英里"
+
+# mail/mail-callbacks.c:2262
+# my-evolution/metar.c:41
+# my-evolution/metar.c:41
+#~ msgid "kilometers"
+#~ msgstr "公里"
+
+# my-evolution/my-evolution.glade.h:3
+# my-evolution/my-evolution.glade.h:3
+# my-evolution/my-evolution.glade.h:3
+#~ msgid "Al_l stations:"
+#~ msgstr "所有站点(_L):"
+
+# my-evolution/my-evolution.glade.h:4
+# my-evolution/my-evolution.glade.h:4
+# my-evolution/my-evolution.glade.h:4
+#~ msgid "All _folders:"
+#~ msgstr "所有文件夹(_F)"
+
+# my-evolution/my-evolution.glade.h:5
+# my-evolution/my-evolution.glade.h:5
+# my-evolution/my-evolution.glade.h:5
+#~ msgid "All news _feeds:"
+#~ msgstr "所有新闻来源(_F):"
+
+# my-evolution/my-evolution.glade.h:22
+# my-evolution/my-evolution.glade.h:22
+# my-evolution/my-evolution.glade.h:22
+#~ msgid "_Display folders:"
+#~ msgstr "显示文件夹(_D):"
+
+# my-evolution/my-evolution.glade.h:23
+# my-evolution/my-evolution.glade.h:23
+# my-evolution/my-evolution.glade.h:23
+#~ msgid "_Display stations:"
+#~ msgstr "显示站点(_D):"
+
+# my-evolution/my-evolution.glade.h:24
+# my-evolution/my-evolution.glade.h:24
+# my-evolution/my-evolution.glade.h:24
+#~ msgid "_Displayed feeds:"
+#~ msgstr "已显示的来源:"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# notes/GNOME_Evolution_Notes.oaf.in.h:3
+#~ msgid "Factory for the Evolution notes component."
+#~ msgstr "Evolution 便签组件车间。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# notes/GNOME_Evolution_Notes.oaf.in.h:4
+#~ msgid "Factory for the Notes control"
+#~ msgstr "便签控制车间"
+
+# shell/e-local-storage.c:175
+# shell/e-local-storage.c:175
+# shell/e-local-storage.c:175
+#~ msgid "Outbox"
+#~ msgstr "发件箱"
+
+# shell/e-shell-about-box.c:40
+# shell/e-shell-about-box.c:40
+# shell/e-shell-about-box.c:40
+#~ msgid "Evolution "
+#~ msgstr "Evolution "
+
+# shell/e-shell-about-box.c:41
+# shell/e-shell-about-box.c:41
+# shell/e-shell-about-box.c:41
+#~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+#~ msgstr "版权所有 1999,2000,2001 Ximian 公司。"
+
+# shell/e-storage-set-view.c:658
+# shell/e-storage-set-view.c:658
+# shell/e-storage-set-view.c:658
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法转移文件夹:\n"
+#~ "%s"
+
+# shell/e-storage.c:181 shell/e-storage.c:187
+# shell/e-storage.c:181 shell/e-storage.c:187
+# shell/e-storage.c:181 shell/e-storage.c:187
+#~ msgid "(No name)"
+#~ msgstr "(未命名)"
+
+# ui/evolution-addressbook.xml.h:12
+# ui/evolution-addressbook.xml.h:12
+# ui/evolution-addressbook.xml.h:12
+#~ msgid "New List"
+#~ msgstr "新列表"
+
+# ui/evolution-calendar.xml.h:2
+# ui/evolution-calendar.xml.h:2
+# ui/evolution-calendar.xml.h:2
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "配置日历的设置"
+
+# ui/evolution-calendar.xml.h:4
+# ui/evolution-calendar.xml.h:4
+# ui/evolution-calendar.xml.h:4
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "创建一个新的全天事件(_E)"
+
+# ui/evolution-calendar.xml.h:5
+# ui/evolution-calendar.xml.h:5
+# ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
+#~ msgid "Create a New _Task"
+#~ msgstr "创建新任务(_T)"
+
+# ui/evolution-calendar.xml.h:6
+# ui/evolution-calendar.xml.h:6
+# ui/evolution-calendar.xml.h:6
+#~ msgid "Create a _New Appointment"
+#~ msgstr "创建新约会(_N)"
+
+# ui/evolution-calendar.xml.h:9
+# ui/evolution-calendar.xml.h:9
+# ui/evolution-calendar.xml.h:9
+#~ msgid "Create an event for the whole day"
+#~ msgstr "为一整天创建一个事件"
+
+# ui/evolution-calendar.xml.h:35
+# ui/evolution-calendar.xml.h:35
+# ui/evolution-calendar.xml.h:35
+#~ msgid "_Appointment..."
+#~ msgstr "约会(_A)..."
+
+# ui/evolution-calendar.xml.h:36
+# ui/evolution-calendar.xml.h:36
+# ui/evolution-calendar.xml.h:36
+#~ msgid "_Calendar Settings..."
+#~ msgstr "日历设置(_C)..."
+
+# ui/evolution-calendar.xml.h:43
+# ui/evolution-calendar.xml.h:43
+# ui/evolution-calendar.xml.h:43
+#~ msgid "_Task..."
+#~ msgstr "任务(_T)..."
+
+# ui/evolution-mail-global.xml.h:4
+# ui/evolution-mail-global.xml.h:4
+# ui/evolution-mail-global.xml.h:4
+#~ 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
+#~ msgid "_Mail Settings..."
+#~ msgstr "邮件设置(_M)..."
+
+# ui/evolution-mail-message.xml.h:33
+# ui/evolution-mail-message.xml.h:33
+# ui/evolution-mail-message.xml.h:33
+#~ msgid "Forward _Attached"
+#~ msgstr "附件方式(_A)"
+
+# ui/evolution-mail-message.xml.h:34
+# ui/evolution-mail-message.xml.h:34
+# ui/evolution-mail-message.xml.h:34
+#~ msgid "Forward _Inline"
+#~ msgstr "内文方式(_I)"
+
+# ui/evolution-mail-message.xml.h:35
+# ui/evolution-mail-message.xml.h:35
+# ui/evolution-mail-message.xml.h:35
+#~ msgid "Forward _Quoted"
+#~ msgstr "引用方式(_Q)"
+
+# ui/evolution-mail-message.xml.h:92
+# ui/evolution-mail-message.xml.h:92
+# ui/evolution-mail-message.xml.h:94
+#~ msgid "_Apply Filters"
+#~ msgstr "应用过滤规则(_A)"
+
+# ui/evolution-tasks.xml.h:2
+# ui/evolution-tasks.xml.h:2
+# ui/evolution-tasks.xml.h:2
+#~ msgid "Configure the task view's settings"
+#~ msgstr "配置任务试图的设置"
+
+# ui/evolution-tasks.xml.h:13
+# ui/evolution-tasks.xml.h:13
+# ui/evolution-tasks.xml.h:15
+#~ msgid "Tasks Settings..."
+#~ msgstr "任务设置..."
+
+# ui/my-evolution.xml.h:1
+# ui/my-evolution.xml.h:1
+# ui/my-evolution.xml.h:1
+#~ msgid "Change the settings for the summary"
+#~ msgstr "改变关于概要的设置"
+
+# ui/my-evolution.xml.h:8
+# ui/my-evolution.xml.h:8
+# ui/my-evolution.xml.h:8
+#~ msgid "_Summary Settings..."
+#~ msgstr "概要设置(_S)..."
+
+# widgets/misc/e-filter-bar.h:102
+# widgets/misc/e-filter-bar.h:102
+# widgets/misc/e-filter-bar.h:102
+#~ msgid "Show All"
+#~ msgstr "全部显示"
+
+# widgets/misc/e-search-bar.c:334
+# widgets/misc/e-search-bar.c:334
+# widgets/misc/e-search-bar.c:334
+#~ msgid "Sear_ch"
+#~ msgstr "搜索(_C)"
+
# addressbook/backend/ebook/e-card.c:3712
# addressbook/backend/ebook/e-card.c:3712
# addressbook/backend/ebook/e-card.c:3712
@@ -43154,8 +45429,7 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
# camel/providers/pop3/camel-pop3-provider.c:91
# camel/providers/pop3/camel-pop3-provider.c:91
#~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
-#~ "it."
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
#~ msgstr "这将连接到 POP 服务器并使用 Kerberos 4 进行认证。"
# camel/providers/pop3/camel-pop3-store.c:198
@@ -43170,16 +45444,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "Could not connect to server: %s"
#~ msgstr "无法连接到服务器: %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
-#~ msgid ""
-#~ "Unable to connect to POP server.\n"
-#~ "Error sending username: %s"
-#~ msgstr ""
-#~ "无法连接到 POP 服务器。\n"
-#~ "发送用户名错误: %s"
-
# camel/providers/pop3/camel-pop3-store.c:380
# camel/providers/pop3/camel-pop3-store.c:417
# camel/providers/pop3/camel-pop3-store.c:380
@@ -43195,12 +45459,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "Unexpected response from POP server: %s"
#~ msgstr "来自 POP 服务器的意外应答: %s"
-# mail/mail-config.glade.h:99
-# mail/mail-config.glade.h:99
-# mail/mail-config.glade.h:108
-#~ msgid "_Email Address:"
-#~ msgstr "电子邮件地址(_E):"
-
# addressbook/gui/component/select-names/select-names.glade.h:2
# addressbook/gui/component/select-names/select-names.glade.h:2
#~ msgid "Co_ntacts:"
@@ -43308,11 +45566,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "This message contains invalid recipients:"
#~ msgstr "该消息含有无效的收件人:"
-# mail/mail-config.glade.h:83
-# mail/mail-config.glade.h:83
-#~ msgid "Special Folders"
-#~ msgstr "特殊文件夹"
-
# my-evolution/e-summary-weather.c:348
# my-evolution/e-summary-weather.c:348
#~ msgid "<dd><b>The weather server could not be contacted</b></dd>"