aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorJP Rosevear <jpr@src.gnome.org>2002-06-28 03:55:39 +0800
committerJP Rosevear <jpr@src.gnome.org>2002-06-28 03:55:39 +0800
commitc1db57e712495e431304076a1aa412c56bb1205a (patch)
treefe57b2b20d5dea6f76a8e28c487e2bb2ef08a3cf /po/zh_CN.po
parentf0dc3ef38791ae35e2712284431a66c6e95fafd1 (diff)
downloadgsoc2013-evolution-c1db57e712495e431304076a1aa412c56bb1205a.tar.gz
gsoc2013-evolution-c1db57e712495e431304076a1aa412c56bb1205a.tar.zst
gsoc2013-evolution-c1db57e712495e431304076a1aa412c56bb1205a.zip
Update .po files.
svn path=/trunk/; revision=17317
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po14926
1 files changed, 8963 insertions, 5963 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 24d9131492..4ed4818e18 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-06-27 14:13-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,14 +47,15 @@ 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 ""
# addressbook/backend/ebook/e-card-simple.c:61
# addressbook/backend/ebook/e-card-simple.c:61
# addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: 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 "电子邮件"
@@ -76,7 +77,7 @@ msgstr "电子邮件"
# addressbook/backend/ebook/e-card-simple.c:63
# addressbook/gui/contact-editor/e-contact-editor.c:1659
#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
msgid "Primary"
msgstr "主要"
@@ -101,8 +102,8 @@ msgstr "主要"
# addressbook/gui/widgets/e-addressbook-view.c:994
#: 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/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/widgets/e-addressbook-view.c:369
msgid "Assistant"
msgstr "助手"
@@ -124,8 +125,8 @@ msgstr "助手"
#: addressbook/backend/ebook/e-card-simple.c:65
#: addressbook/backend/ebook/e-card-simple.c:70
#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
msgid "Business"
msgstr "商务"
@@ -147,7 +148,7 @@ msgstr "商务"
# addressbook/backend/ebook/e-card-simple.c:66
# addressbook/gui/contact-editor/e-contact-editor.c:1648
#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
msgid "Callback"
msgstr "反馈"
@@ -158,7 +159,7 @@ msgstr "反馈"
# addressbook/backend/ebook/e-card-simple.c:67
# addressbook/gui/contact-editor/e-contact-editor.c:1650
#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
msgid "Company"
msgstr "公司"
@@ -187,8 +188,8 @@ msgstr "公司"
#: addressbook/backend/ebook/e-card-simple.c:68
#: addressbook/backend/ebook/e-card-simple.c:71
#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
msgid "Home"
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 "组织"
@@ -221,7 +222,7 @@ msgstr "组织"
# addressbook/gui/contact-editor/e-contact-editor.c:1655
#: addressbook/backend/ebook/e-card-simple.c:72
#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
msgid "Mobile"
msgstr "手机"
@@ -232,7 +233,7 @@ msgstr "手机"
# addressbook/backend/ebook/e-card-simple.c:73
# addressbook/gui/contact-editor/e-contact-editor.c:1649
#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
msgid "Car"
msgstr "汽车"
@@ -250,8 +251,8 @@ msgstr "汽车"
# addressbook/gui/widgets/e-addressbook-view.c:974
#: 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/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/widgets/e-addressbook-view.c:349
msgid "Business Fax"
msgstr "商务传真"
@@ -272,8 +273,8 @@ msgstr "商务传真"
# addressbook/gui/contact-editor/e-contact-editor.c:1653
# 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/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/widgets/e-addressbook-view.c:350
msgid "Home Fax"
msgstr "家庭传真"
@@ -284,7 +285,7 @@ msgstr "家庭传真"
# addressbook/backend/ebook/e-card-simple.c:76
# addressbook/gui/contact-editor/e-contact-editor.c:1646
#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
msgid "Business 2"
msgstr "商务 2"
@@ -302,7 +303,7 @@ msgstr "商务 2"
# addressbook/backend/ebook/e-card-simple.c:77
# addressbook/gui/contact-editor/e-contact-editor.c:1652
#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
msgid "Home 2"
msgstr "家庭 2"
@@ -316,8 +317,8 @@ msgstr "家庭 2"
# addressbook/gui/contact-editor/e-contact-editor.c:1654
# 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/contact-editor/e-contact-editor.c:1739
+#: addressbook/gui/widgets/e-addressbook-view.c:353
msgid "ISDN"
msgstr "ISDN"
@@ -338,9 +339,8 @@ msgstr "ISDN"
# mail/mail-config.glade.h:57
#: addressbook/backend/ebook/e-card-simple.c:79
#: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
msgid "Other"
msgstr "其它"
@@ -354,8 +354,8 @@ msgstr "其它"
# addressbook/gui/contact-editor/e-contact-editor.c:1657
# 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/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/widgets/e-addressbook-view.c:355
msgid "Other Fax"
msgstr "其它传真"
@@ -369,8 +369,8 @@ msgstr "其它传真"
# addressbook/gui/contact-editor/e-contact-editor.c:1658
# 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/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/widgets/e-addressbook-view.c:356
msgid "Pager"
msgstr "传呼机"
@@ -384,8 +384,8 @@ msgstr "传呼机"
# addressbook/gui/contact-editor/e-contact-editor.c:1660
# 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/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/widgets/e-addressbook-view.c:357
msgid "Radio"
msgstr "收音机"
@@ -399,8 +399,8 @@ msgstr "收音机"
# addressbook/gui/contact-editor/e-contact-editor.c:1661
# 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/contact-editor/e-contact-editor.c:1746
+#: 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"
@@ -429,8 +429,8 @@ msgstr "TTY"
# addressbook/gui/widgets/e-addressbook-view.c:986
#: 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/contact-editor/e-contact-editor.c:1772
+#: addressbook/gui/widgets/e-addressbook-view.c:361
msgid "Email 2"
msgstr "电子邮件 2"
@@ -448,8 +448,8 @@ msgstr "电子邮件 2"
# addressbook/gui/widgets/e-addressbook-view.c:987
#: 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/contact-editor/e-contact-editor.c:1773
+#: 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:173 calendar/gui/main.c:67
#: 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:2735
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:1126
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:1229
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:1465
msgid "Modifying card from LDAP server..."
msgstr "正在修改 LDAP 服务器上的卡片..."
+# addressbook/backend/pas/pas-backend-ldap.c:2219
+# addressbook/backend/pas/pas-backend-ldap.c:2219
+# addressbook/backend/pas/pas-backend-ldap.c:2222
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
+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:2681
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:2762
+#, 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:2786
+#, 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,74 @@ 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/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Configuration control for the Evolution Addressbook Storages."
+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:5
msgid "Control that displays an Evolution addressbook minicard."
msgstr "显示 Evolution 地址簿小卡片的控制。"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+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:7
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:8
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:9
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:10
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:11
msgid "Factory for the Addressbook's address popup"
msgstr "地址簿地址对话框车间"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+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:13
msgid "Factory for the sample Addressbook control"
msgstr "示例地址簿控制车间"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+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,383 +986,125 @@ 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:73
+#: addressbook/gui/component/addressbook-component.c:620
#: 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-local-storage.c:173
+#: 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:73
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:75
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:75
msgid "LDAP server containing contact information"
msgstr "含有联系人信息的 LDAP 服务器"
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "新建联系人列表"
+
+# ui/evolution-addressbook.xml.h:32
+# ui/evolution-addressbook.xml.h:32
+# ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "联系人列表(_C)"
+
# addressbook/gui/component/addressbook-component.c:526
# ui/evolution-addressbook.xml.h:11
# addressbook/gui/component/addressbook-component.c:526
# ui/evolution-addressbook.xml.h:11
# addressbook/gui/component/addressbook-component.c:527
# ui/evolution-addressbook.xml.h:11
-#: addressbook/gui/component/addressbook-component.c:527
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:581
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)"
-
-# 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 "新建联系人列表"
-
-# 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) 在服务器上对您进行认证"
+# ui/evolution-addressbook.xml.h:31
+# ui/evolution-addressbook.xml.h:31
+# ui/evolution-addressbook.xml.h:32
+#: addressbook/gui/component/addressbook-component.c:581
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "联系人(_C)"
-# 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/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 服务器。"
-# 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"
+# 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:216
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
msgstr ""
+"无法认证到 IMAP 服务器。\n"
+"%s\n"
+"\n"
-# 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"
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
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."
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
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."
+#: addressbook/gui/component/addressbook-config.c:1152
+msgid "This server does not support LDAPv3 schema 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."
+# mail/mail-callbacks.c:2250
+# mail/mail-callbacks.c:2369
+# mail/mail-callbacks.c:2405
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
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):"
+"装入过滤规则信息错误:\n"
+"%s"
-# 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):"
+# camel/providers/imap/camel-imap-command.c:608
+# camel/providers/imap/camel-imap-command.c:608
+# camel/providers/imap/camel-imap-command.c:610
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP 服务器应答不含有 %s 信息"
-# 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):"
+# mail/mail-config.glade.h:3
+# mail/mail-config.glade.h:3
+# mail/mail-config.glade.h:3
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(在该版本的 evolution 中不支持SSL)"
# addressbook/gui/component/addressbook-factory.c:70
# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
@@ -1349,8 +1112,8 @@ 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:176 calendar/gui/main.c:139
msgid "Could not initialize gnome-vfs"
msgstr "无法创始化 gnome-vfs"
@@ -1364,14 +1127,14 @@ msgstr "其他联系人"
# addressbook/gui/component/addressbook.c:485
# addressbook/gui/component/addressbook.c:485
# addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c: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 +1147,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 +1162,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 +1174,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:648
+#: addressbook/gui/component/addressbook.c:651
#, 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:776
+#, 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:777
+#, fuzzy
+msgid "Email is"
+msgstr "电子邮件 2"
# addressbook/gui/component/addressbook.c:806
# calendar/gui/cal-search-bar.c:59
@@ -1448,19 +1208,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:778
+#: 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:779
+#: 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:780
msgid "Advanced..."
msgstr "高级..."
@@ -1471,15 +1241,15 @@ 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:1008
+#: 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:1090
msgid "The URI that the Folder Browser will display"
msgstr "文件夹浏览器将显示的 URI"
@@ -1506,7 +1276,7 @@ msgstr "(无)"
# addressbook/gui/contact-editor/e-contact-editor.c:1686
#: 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:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
msgid "Primary Email"
msgstr "常用电子邮件"
@@ -1591,6 +1361,788 @@ msgstr "关闭查询"
msgid "Enable Queries (Dangerous!)"
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/gui/component/ldap-config.glade.h:2
+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:3
+#, fuzzy
+msgid "1:00"
+msgstr "100"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+msgid "3268"
+msgstr ""
+
+# calendar/gui/e-calendar-table.c:435
+# calendar/gui/e-calendar-table.c:435
+# calendar/gui/e-calendar-table.c:436
+#: addressbook/gui/component/ldap-config.glade.h:6
+#, fuzzy
+msgid "380"
+msgstr "80%"
+
+# 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:7
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "666"
+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:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "删除(_R)"
+
+# 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:12
+#, fuzzy
+msgid "<< Fewer Options"
+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 "地址簿资源"
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:3
+# addressbook/gui/contact-editor/fulladdr.glade.h:3
+# my-evolution/Locations.h:43
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
+#, 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:59
+#: mail/mail-config.glade.h:77
+#, 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:58 mail/mail-config.glade.h:138
+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:141
+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:156 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 +2166,12 @@ 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
+#. Fixme: Ditto
#: 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 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
msgid "Remove"
msgstr "删除"
@@ -1665,10 +2218,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 +2248,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 +2263,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):"
@@ -1813,7 +2392,7 @@ msgstr "合作"
# addressbook/gui/contact-editor/e-contact-editor.c:1293
#. Construct the app
#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
msgid "Contact Editor"
msgstr "联系人编辑器"
@@ -1831,7 +2410,7 @@ msgstr "部门(_E):"
# addressbook/gui/contact-editor/contact-editor.glade.h:12
# calendar/gui/dialogs/task-editor.c:183
#: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
msgid "Details"
msgstr "细节"
@@ -1856,13 +2435,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
@@ -1949,10 +2521,12 @@ 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:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
msgid "_Delete"
msgstr "删除(_D)"
@@ -2003,7 +2577,7 @@ msgstr "网页地址(_W):"
# addressbook/gui/contact-editor/e-contact-editor-address.c:128
# my-evolution/Locations.h:2343
#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
msgid "United States"
msgstr "美国"
@@ -2899,7 +3473,6 @@ msgstr "老挝"
# addressbook/gui/contact-editor/e-contact-editor-address.c:243
# my-evolution/Locations.h:1190
#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
msgid "Latvia"
msgstr "拉脱维亚"
@@ -2908,7 +3481,7 @@ msgstr "拉脱维亚"
# addressbook/gui/contact-editor/e-contact-editor-address.c:244
# my-evolution/Locations.h:1198
#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
msgid "Lebanon"
msgstr "黎巴嫩"
@@ -2924,7 +3497,7 @@ msgstr "莱索托"
# addressbook/gui/contact-editor/e-contact-editor-address.c:246
# my-evolution/Locations.h:1218
#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
msgid "Liberia"
msgstr "利比里亚"
@@ -2940,7 +3513,7 @@ msgstr "列支敦士登"
# addressbook/gui/contact-editor/e-contact-editor-address.c:248
# my-evolution/Locations.h:1234
#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
msgid "Lithuania"
msgstr "立陶宛"
@@ -2949,7 +3522,7 @@ msgstr "立陶宛"
# addressbook/gui/contact-editor/e-contact-editor-address.c:249
# my-evolution/Locations.h:1268
#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
msgid "Luxembourg"
msgstr "卢森堡"
@@ -3007,7 +3580,7 @@ msgstr "马里"
# addressbook/gui/contact-editor/e-contact-editor-address.c:257
# my-evolution/Locations.h:1297
#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
msgid "Malta"
msgstr "马耳他"
@@ -3051,7 +3624,7 @@ msgstr "马约特岛"
# addressbook/gui/contact-editor/e-contact-editor-address.c:263
# my-evolution/Locations.h:1387
#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
msgid "Mexico"
msgstr "墨西哥"
@@ -3095,7 +3668,7 @@ msgstr "蒙特塞拉特群岛"
# addressbook/gui/contact-editor/e-contact-editor-address.c:269
# my-evolution/Locations.h:1470
#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
msgid "Morocco"
msgstr "摩洛哥"
@@ -3139,7 +3712,7 @@ msgstr "尼泊尔"
# addressbook/gui/contact-editor/e-contact-editor-address.c:275
# my-evolution/Locations.h:1531
#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
msgid "Netherlands"
msgstr "荷兰"
@@ -3162,7 +3735,7 @@ msgstr "新喀里多尼亚"
# addressbook/gui/contact-editor/e-contact-editor-address.c:278
# my-evolution/Locations.h:1560
#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
msgid "New Zealand"
msgstr "新西兰"
@@ -3171,7 +3744,7 @@ msgstr "新西兰"
# addressbook/gui/contact-editor/e-contact-editor-address.c:279
# my-evolution/Locations.h:1562
#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
msgid "Nicaragua"
msgstr "尼加拉瓜"
@@ -3201,7 +3774,7 @@ msgstr "纽埃岛"
# addressbook/gui/contact-editor/e-contact-editor-address.c:283
# my-evolution/Locations.h:1574
#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
msgid "Norfolk Island"
msgstr "诺福克岛"
@@ -3217,7 +3790,7 @@ msgstr "北马里亚那群岛"
# addressbook/gui/contact-editor/e-contact-editor-address.c:285
# my-evolution/Locations.h:1587
#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
msgid "Norway"
msgstr "挪威"
@@ -3226,7 +3799,7 @@ msgstr "挪威"
# addressbook/gui/contact-editor/e-contact-editor-address.c:286
# my-evolution/Locations.h:1632
#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
msgid "Oman"
msgstr "阿曼"
@@ -3235,7 +3808,7 @@ msgstr "阿曼"
# addressbook/gui/contact-editor/e-contact-editor-address.c:287
# my-evolution/Locations.h:1673
#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
msgid "Pakistan"
msgstr "巴基斯坦"
@@ -3258,7 +3831,7 @@ msgstr "巴勒斯坦地区"
# addressbook/gui/contact-editor/e-contact-editor-address.c:290
# my-evolution/Locations.h:1683
#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
msgid "Panama"
msgstr "巴拿马"
@@ -3274,7 +3847,7 @@ msgstr "巴布亚新几内亚"
# addressbook/gui/contact-editor/e-contact-editor-address.c:292
# my-evolution/Locations.h:1688
#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
msgid "Paraguay"
msgstr "巴拉圭"
@@ -3283,7 +3856,7 @@ msgstr "巴拉圭"
# addressbook/gui/contact-editor/e-contact-editor-address.c:293
# my-evolution/Locations.h:1723
#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
msgid "Peru"
msgstr "秘鲁"
@@ -3306,7 +3879,7 @@ msgstr "皮特克恩岛"
# addressbook/gui/contact-editor/e-contact-editor-address.c:296
# my-evolution/Locations.h:1764
#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
msgid "Poland"
msgstr "波兰"
@@ -3315,7 +3888,7 @@ msgstr "波兰"
# addressbook/gui/contact-editor/e-contact-editor-address.c:297
# my-evolution/Locations.h:1791
#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
msgid "Portugal"
msgstr "葡萄牙"
@@ -3324,7 +3897,7 @@ msgstr "葡萄牙"
# addressbook/gui/contact-editor/e-contact-editor-address.c:298
# my-evolution/Locations.h:1824
#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
msgid "Puerto Rico"
msgstr "波多黎各"
@@ -3333,7 +3906,7 @@ msgstr "波多黎各"
# addressbook/gui/contact-editor/e-contact-editor-address.c:299
# my-evolution/Locations.h:1836
#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
msgid "Qatar"
msgstr "卡塔尔"
@@ -3349,7 +3922,7 @@ msgstr "留尼汪"
# addressbook/gui/contact-editor/e-contact-editor-address.c:301
# my-evolution/Locations.h:1912
#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
msgid "Romania"
msgstr "罗马尼亚"
@@ -3414,7 +3987,7 @@ msgstr "圣多美和普林西比"
# addressbook/gui/contact-editor/e-contact-editor-address.c:310
# my-evolution/Locations.h:2035
#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
msgid "Saudi Arabia"
msgstr "沙特阿拉伯"
@@ -3444,7 +4017,7 @@ msgstr "塞拉利昂"
# addressbook/gui/contact-editor/e-contact-editor-address.c:314
# my-evolution/Locations.h:2090
#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
msgid "Singapore"
msgstr "新加坡"
@@ -3453,7 +4026,7 @@ msgstr "新加坡"
# addressbook/gui/contact-editor/e-contact-editor-address.c:315
# my-evolution/Locations.h:2103
#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
msgid "Slovakia"
msgstr "斯洛伐克"
@@ -3462,7 +4035,7 @@ msgstr "斯洛伐克"
# addressbook/gui/contact-editor/e-contact-editor-address.c:316
# my-evolution/Locations.h:2104
#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
msgid "Slovenia"
msgstr "斯洛文尼亚"
@@ -3485,7 +4058,7 @@ msgstr "索马里"
# addressbook/gui/contact-editor/e-contact-editor-address.c:319
# my-evolution/Locations.h:2119
#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
msgid "South Africa"
msgstr "南非"
@@ -3501,7 +4074,7 @@ msgstr "南乔治亚和南三文治群岛"
# addressbook/gui/contact-editor/e-contact-editor-address.c:321
# my-evolution/Locations.h:2127
#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
msgid "Spain"
msgstr "西班牙"
@@ -3538,7 +4111,7 @@ msgstr "苏丹"
# addressbook/gui/contact-editor/e-contact-editor-address.c:326
# my-evolution/Locations.h:2176
#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
msgid "Suriname"
msgstr "苏里南"
@@ -3561,7 +4134,7 @@ msgstr "斯威士兰"
# addressbook/gui/contact-editor/e-contact-editor-address.c:329
# my-evolution/Locations.h:2181
#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
msgid "Sweden"
msgstr "瑞典"
@@ -3570,7 +4143,7 @@ msgstr "瑞典"
# addressbook/gui/contact-editor/e-contact-editor-address.c:330
# my-evolution/Locations.h:2183
#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
msgid "Switzerland"
msgstr "瑞士"
@@ -3579,7 +4152,7 @@ msgstr "瑞士"
# addressbook/gui/contact-editor/e-contact-editor-address.c:331
# my-evolution/Locations.h:2205
#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
msgid "Taiwan"
msgstr "台湾"
@@ -3644,7 +4217,7 @@ msgstr "突尼斯"
# addressbook/gui/contact-editor/e-contact-editor-address.c:340
# my-evolution/Locations.h:2321
#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
msgid "Turkey"
msgstr "土耳其"
@@ -3681,7 +4254,7 @@ msgstr "乌干达"
# addressbook/gui/contact-editor/e-contact-editor-address.c:345
# my-evolution/Locations.h:2334
#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
msgid "Ukraine"
msgstr "乌克兰"
@@ -3697,7 +4270,7 @@ msgstr "阿拉伯联合酋长国"
# addressbook/gui/contact-editor/e-contact-editor-address.c:347
# my-evolution/Locations.h:2342
#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
msgid "United Kingdom"
msgstr "英国"
@@ -3713,7 +4286,7 @@ msgstr "美国小型外岛"
# addressbook/gui/contact-editor/e-contact-editor-address.c:349
# my-evolution/Locations.h:2348
#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
msgid "Uruguay"
msgstr "乌拉圭"
@@ -3736,7 +4309,7 @@ msgstr "努瓦阿图"
# addressbook/gui/contact-editor/e-contact-editor-address.c:352
# my-evolution/Locations.h:2380
#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
msgid "Venezuela"
msgstr "委内瑞拉"
@@ -3745,7 +4318,7 @@ msgstr "委内瑞拉"
# addressbook/gui/contact-editor/e-contact-editor-address.c:353
# my-evolution/Locations.h:2392
#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
msgid "Viet Nam"
msgstr "越南"
@@ -3782,7 +4355,7 @@ msgstr "西撒哈拉"
# addressbook/gui/contact-editor/e-contact-editor-address.c:358
# my-evolution/Locations.h:2512
#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
msgid "Yemen"
msgstr "也门"
@@ -3791,7 +4364,7 @@ msgstr "也门"
# addressbook/gui/contact-editor/e-contact-editor-address.c:359
# my-evolution/Locations.h:2524
#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
msgid "Yugoslavia"
msgstr "南斯拉夫"
@@ -3828,35 +4401,35 @@ msgstr "删除联系人?"
# addressbook/gui/contact-editor/e-contact-editor.c:757
# addressbook/gui/contact-editor/e-contact-editor.c:757
# addressbook/gui/contact-editor/e-contact-editor.c:757
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
msgid "Category editor not available."
msgstr "类别编辑器不可用。"
# addressbook/gui/contact-editor/e-contact-editor.c:764
# addressbook/gui/contact-editor/e-contact-editor.c:764
# addressbook/gui/contact-editor/e-contact-editor.c:764
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
msgid "This contact belongs to these categories:"
msgstr "该联系人属于这些范畴:"
# addressbook/gui/contact-editor/e-contact-editor.c:978
# addressbook/gui/contact-editor/e-contact-editor.c:978
# addressbook/gui/contact-editor/e-contact-editor.c:978
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
msgid "Save Contact as VCard"
msgstr "将联系人保存为 VCard"
# addressbook/gui/contact-editor/e-contact-editor.c:1662
# addressbook/gui/contact-editor/e-contact-editor.c:1662
# addressbook/gui/contact-editor/e-contact-editor.c:1662
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
msgid "TTY/TDD"
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:2428
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr "无法为域找到构件:“%s”"
@@ -3882,7 +4455,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 "全名"
@@ -3904,14 +4477,14 @@ msgstr "card.vcf"
# 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
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
msgid "list"
msgstr "列表"
# addressbook/gui/contact-editor/e-contact-save-as.c:201
# addressbook/gui/contact-editor/e-contact-save-as.c:201
# addressbook/gui/contact-editor/e-contact-save-as.c:201
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
#, c-format
msgid ""
"%s already exists\n"
@@ -4145,14 +4718,14 @@ msgstr "联系人列表编辑器"
# addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
# addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
msgid "Contact List Editor"
msgstr "联系人列表编辑器"
# addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
# addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
# addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
msgid "Save List as VCard"
msgstr "将列表保存为 VCard"
@@ -4238,7 +4811,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 +4829,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 +4866,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:90
#: addressbook/gui/widgets/e-minicard.c:475
msgid "Error modifying card"
msgstr "修改卡片错误"
@@ -4456,8 +4877,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:1079
msgid "Success"
msgstr "成功"
@@ -4473,17 +4894,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
-#: 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:36
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
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 +4915,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:1109
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 +4956,39 @@ 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/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
msgid "Cancelled"
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
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+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
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "必须认证"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+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:46
msgid "Other error"
msgstr "其它错误"
@@ -4555,7 +4998,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:62
#: calendar/gui/dialogs/save-comp.c:50
msgid "Do you want to save changes?"
msgstr "您希望保存修改吗?"
@@ -4563,28 +5006,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:81
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:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
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:90
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:100
msgid "Error removing list"
msgstr "删除列表错误"
@@ -4594,27 +5038,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:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
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:207
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:208
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:212
#, c-format
msgid ""
"You have requested that %d cards be cards. This will cause %d new windows to "
@@ -4624,132 +5069,397 @@ 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"
+# mail/mail-callbacks.c:1281 mail/message-browser.c:130
+# mail/mail-callbacks.c:1376 mail/message-browser.c:130
+# mail/mail-callbacks.c:1411 mail/message-browser.c:130
+#: addressbook/gui/widgets/e-addressbook-util.c:347
+#, 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"
+# ui/evolution-tasks.xml.h:4
+# ui/evolution-tasks.xml.h:4
+# ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, 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:352
+#, 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:354
+#, 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 "其它地址"
+# importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+# importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+# importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+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:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
+#: 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:877
+#, 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:878
+#, 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:881
+#, 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:882
+#, 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:884
+#, 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:885
+#, 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:887
+#, 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:891
+#: 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:892
+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:893
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/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:895
+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:899
+#, 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:900
+#, 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:903
+#: 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:904
+#: 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:905
+#: 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:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: 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:909
+#: 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:942
+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:947
+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 +5485,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 +5500,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 +5675,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 "横向"
@@ -4982,7 +5710,7 @@ msgstr "列数:"
# addressbook/printing/e-contact-print.glade.h:23
# addressbook/printing/e-contact-print.glade.h:23
# addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
msgid "Options"
msgstr "选项"
@@ -4990,6 +5718,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 "方向"
@@ -4998,7 +5727,7 @@ msgstr "方向"
# addressbook/printing/e-contact-print.glade.h:25
# my-evolution/Locations.h:1672
#: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
msgid "Page"
msgstr "页面"
@@ -5026,7 +5755,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 "纵向"
@@ -5124,7 +5855,7 @@ msgstr "字体(_F)..."
# calendar/cal-util/cal-component.c:1202
# calendar/cal-util/cal-component.c:1202
# calendar/cal-util/cal-component.c:1207
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
msgid "Untitled appointment"
msgstr "无标题约会"
@@ -5137,9 +5868,9 @@ 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/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:679
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
msgid "High"
msgstr "高"
@@ -5155,10 +5886,10 @@ 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/e-calendar-table.c:419 mail/message-list.c:731
msgid "Normal"
msgstr "中"
@@ -5171,9 +5902,9 @@ 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/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:677
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
msgid "Low"
msgstr "低"
@@ -5187,9 +5918,9 @@ 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
+#: calendar/gui/e-calendar-table.c:421
msgid "Undefined"
msgstr "未定义"
@@ -5200,7 +5931,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 +5946,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,34 +5979,36 @@ msgstr "显示任务列表的 Bonobo 控制。"
msgid "A sample Bonobo control which displays an calendar."
msgstr "显示日历的示例 Bonobo 控制。"
-# 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/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
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution 日历实施概要组件。"
+#, 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: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:5
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:6
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
-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
@@ -5303,6 +6044,10 @@ msgstr "日历组件编辑器对话框集中车间"
msgid "Factory to create a component editor factory"
msgstr "创建组件编辑车间的车间"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+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
@@ -5413,7 +6158,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:2658
#: widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr "警告"
@@ -5447,56 +6192,56 @@ 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:168 calendar/gui/main.c:62
msgid "Could not initialize GNOME"
msgstr "无法初始化 GNOME"
# calendar/gui/alarm-notify/notify-main.c:181
# calendar/gui/alarm-notify/notify-main.c:181
# calendar/gui/alarm-notify/notify-main.c:181
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
msgid "Could not create the alarm notify service"
msgstr "无法创建提醒服务"
# calendar/gui/alarm-notify/notify-main.c:186
# calendar/gui/alarm-notify/notify-main.c:186
# calendar/gui/alarm-notify/notify-main.c:186
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
msgid "Could not create the alarm notify service factory"
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 mail/mail-ops.c:1089
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 +6253,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 +6264,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 +6275,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 +6289,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 +6309,7 @@ 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
+#: calendar/gui/e-calendar-table.c:397
msgid "Private"
msgstr "保密"
@@ -5575,14 +6320,14 @@ 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
+#: calendar/gui/e-calendar-table.c:398
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 calendar/gui/e-calendar-table.c:396
msgid "Public"
msgstr "公开"
@@ -5621,7 +6366,7 @@ 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
+#: calendar/gui/e-calendar-table.c:470
msgid "Free"
msgstr "放假"
@@ -5634,9 +6379,9 @@ 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-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
msgid "Busy"
msgstr "繁忙"
@@ -5651,7 +6396,7 @@ 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
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
msgid "Not Started"
msgstr "尚未开始"
@@ -5666,7 +6411,7 @@ 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
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
msgid "In Progress"
msgstr "正在进行中"
@@ -5684,8 +6429,8 @@ 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-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
msgid "Completed"
msgstr "已完成"
@@ -5724,10 +6469,12 @@ msgstr ""
# widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
# widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c: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/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
#: 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 +6504,9 @@ msgstr "已分派"
# calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:301
# calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
# calendar/gui/e-meeting-model.c:810
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:301
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
-#: calendar/gui/e-meeting-model.c:810
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
msgid "Yes"
msgstr "是"
@@ -5769,23 +6516,11 @@ 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:314
+#: calendar/gui/e-meeting-model.c:849
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 +6555,16 @@ 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:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
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:70
msgid "Folder containing appointments and events"
msgstr "文件夹含有约会和事件"
@@ -5844,59 +6580,114 @@ 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
-#: views/tasks/galview.xml.h:1
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
msgid "Tasks"
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:75
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:704
+#, 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:704
+#, 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:708
+#, 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:708
+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:712
+#, 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:712
+#, 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:716
+#, 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:716
+#, 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
@@ -6010,10 +6801,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 +7031,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.c:891 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "概要:"
@@ -6296,7 +7084,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:188
msgid "minute(s)"
msgstr "分钟"
@@ -6342,48 +7130,46 @@ msgstr "30 分钟"
msgid "60 minutes"
msgstr "60 分钟"
+# addressbook/gui/contact-editor/fulladdr.glade.h:4
+# addressbook/gui/contact-editor/fulladdr.glade.h:4
+# my-evolution/Locations.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "阿尔伯达"
+
# 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/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
msgid "Calendar and Tasks Settings"
msgstr "日历和任务设置"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
msgid "Color for overdue tasks"
msgstr "被延误任务的颜色"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
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
+msgid "Day _ends:"
+msgstr ""
# 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:11
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
@@ -6391,7 +7177,7 @@ 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/recurrence-page.c:1125
msgid "Friday"
msgstr "星期五"
@@ -6416,16 +7202,17 @@ msgstr "分钟"
# 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/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: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:16
-msgid "O_verdue tasks:"
-msgstr "被延误的任务(_V):"
+#, fuzzy
+msgid "S_un"
+msgstr "星期日(_N)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
# calendar/gui/dialogs/recurrence-page.c:964
@@ -6434,16 +7221,13 @@ 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/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)"
+msgid "Sh_ow a reminder"
+msgstr ""
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
@@ -6452,51 +7236,39 @@ msgstr "在周视图和月视图中显示约会结束时间(_E)"
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
-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
-msgid "Su_n"
-msgstr "星期日(_N)"
-
# 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: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:20
+#: 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:21
+#, 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:22
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
-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 +7276,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,19 +7308,23 @@ 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 "星期二"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
# 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: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:30
+#: calendar/gui/dialogs/recurrence-page.c:1123
msgid "Wednesday"
msgstr "星期三"
@@ -6565,39 +7334,51 @@ 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:31
+#: ui/evolution-calendar.xml.h:24
msgid "Work Week"
msgstr "一周工作日"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+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:33
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:34
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:35
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:36
msgid "_Compress weekends in month view"
msgstr "不在月视图中显示周末(_C)"
+# calendar/gui/e-itip-control.c:537
+# calendar/gui/e-itip-control.c:537
+# calendar/gui/e-itip-control.c:540
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "任务开始:<b>"
+
# 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
@@ -6605,74 +7386,87 @@ msgstr "不在月视图中显示周末(_C)"
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
-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:39
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:40
+#: mail/mail-config.glade.h:161
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:41
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:42
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:43
+#, 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:44
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: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:45
+#, 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:46
-msgid "_Task List"
-msgstr "任务列表(_T)"
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "时间分割(_V):"
+
+# 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:47
+#, fuzzy
+msgid "_Tue"
+msgstr "星期二(_U)"
# 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:48
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
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
msgstr "在约会开始以前"
# calendar/gui/dialogs/cancel-comp.c:51
@@ -6780,56 +7574,73 @@ 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
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "无法更新对象!"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+# calendar/gui/dialogs/comp-editor.c:303
+# calendar/gui/dialogs/comp-editor.c:303
+# calendar/gui/dialogs/comp-editor.c:321
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+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:797
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:802
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
@@ -6837,7 +7648,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:805
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
@@ -6845,7 +7656,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:808
#, c-format
msgid "Journal entry - %s"
msgstr "日志条目 - %s"
@@ -6853,51 +7664,30 @@ 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:822
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 "覆盖文件?"
+# composer/e-msg-composer.c:943
+# composer/e-msg-composer.c:947
+# composer/e-msg-composer.c:912
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+msgid "Save as..."
+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
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+"Changes made to this item may be discarded if an update arrives via email"
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..."
-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:1374
msgid "Unable to obtain current version!"
msgstr "无法获取当前版本!"
@@ -6994,21 +7784,21 @@ 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:194 calendar/gui/print.c:2247
msgid "Appointment"
msgstr "约会"
# calendar/gui/dialogs/event-editor.c:190
# calendar/gui/dialogs/event-editor.c:190
# calendar/gui/dialogs/event-editor.c:190
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
msgid "Reminder"
msgstr "提醒"
# calendar/gui/dialogs/event-editor.c:195
# calendar/gui/dialogs/event-editor.c:195
# calendar/gui/dialogs/event-editor.c:195
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
msgid "Recurrence"
msgstr "再次发生"
@@ -7021,9 +7811,9 @@ msgstr "再次发生"
# 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:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:363
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
msgid "Scheduling"
msgstr "正在调度"
@@ -7036,9 +7826,9 @@ 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:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
msgid "Meeting"
msgstr "会见"
@@ -7179,28 +7969,28 @@ msgstr "开始时间(_S):"
# calendar/gui/dialogs/meeting-page.c:425
# calendar/gui/dialogs/meeting-page.c:425
# calendar/gui/dialogs/meeting-page.c:425
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
msgid "An organizer is required."
msgstr "需要一名组织者。"
# calendar/gui/dialogs/meeting-page.c:446
# calendar/gui/dialogs/meeting-page.c:446
# calendar/gui/dialogs/meeting-page.c:446
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
msgid "At least one attendee is required."
msgstr "需要至少一个参加者。"
# calendar/gui/dialogs/meeting-page.c:626
# calendar/gui/dialogs/meeting-page.c:626
# calendar/gui/dialogs/meeting-page.c:626
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
msgid "That person is already attending the meeting!"
msgstr "那个人已经参加了会议!"
# calendar/gui/dialogs/meeting-page.c:701
# calendar/gui/dialogs/meeting-page.c:701
# calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
msgid "_Delegate To..."
msgstr "授权于(_D)..."
@@ -7291,7 +8081,7 @@ msgstr "成员"
# calendar/gui/e-itip-control.c:809
# calendar/gui/e-meeting-time-sel.etspec.h:8
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:1003
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
@@ -7321,8 +8111,8 @@ msgstr "角色"
# mail/message-list.etspec.h:9
#: calendar/gui/dialogs/meeting-page.etspec.h:10
#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:47
-#: mail/message-list.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
msgid "Status"
msgstr "状态"
@@ -7340,7 +8130,7 @@ msgstr "状态"
# 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/e-meeting-time-sel.etspec.h:11
#: shell/glade/e-active-connection-dialog.glade.h:5
msgid "Type"
msgstr "类型"
@@ -7370,56 +8160,158 @@ 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:456
msgid "_Invite Others..."
msgstr "邀请其他人(_I)..."
-# calendar/gui/dialogs/meeting-page.glade.h:5
-# calendar/gui/dialogs/meeting-page.glade.h:5
-# calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-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 "在"
+# my-evolution/metar.c:262
+# my-evolution/metar.c:262
+# my-evolution/metar.c:262
+#: 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
+# my-evolution/Locations.h:1614
+#: 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 +8481,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:887
msgid "URL:"
msgstr "URL:"
@@ -7607,6 +8499,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:182
+msgid "Basic"
+msgstr "基本"
+
# calendar/gui/dialogs/task-editor.c:190
# calendar/gui/dialogs/task-editor.c:227
# calendar/gui/dialogs/task-editor.c:322
@@ -7616,9 +8518,9 @@ msgstr "状态(_S):"
# 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:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:322
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
msgid "Assignment"
msgstr "分派"
@@ -7631,9 +8533,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.c:934
#: 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:43
msgid "Description:"
msgstr "描述:"
@@ -7654,7 +8556,7 @@ 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
+#: calendar/gui/e-calendar-table.c:440
#, c-format
msgid "0%"
msgstr "0%"
@@ -7662,7 +8564,7 @@ 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
+#: calendar/gui/e-calendar-table.c:441
#, c-format
msgid "10%"
msgstr "10%"
@@ -7670,7 +8572,7 @@ 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
+#: calendar/gui/e-calendar-table.c:442
#, c-format
msgid "20%"
msgstr "20%"
@@ -7678,7 +8580,7 @@ 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
+#: calendar/gui/e-calendar-table.c:443
#, c-format
msgid "30%"
msgstr "30%"
@@ -7686,7 +8588,7 @@ 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
+#: calendar/gui/e-calendar-table.c:444
#, c-format
msgid "40%"
msgstr "40%"
@@ -7694,7 +8596,7 @@ 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
+#: calendar/gui/e-calendar-table.c:445
#, c-format
msgid "50%"
msgstr "50%"
@@ -7702,7 +8604,7 @@ 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
+#: calendar/gui/e-calendar-table.c:446
#, c-format
msgid "60%"
msgstr "60%"
@@ -7710,7 +8612,7 @@ 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
+#: calendar/gui/e-calendar-table.c:447
#, c-format
msgid "70%"
msgstr "70%"
@@ -7718,7 +8620,7 @@ 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
+#: calendar/gui/e-calendar-table.c:448
#, c-format
msgid "80%"
msgstr "80%"
@@ -7726,7 +8628,7 @@ 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
+#: calendar/gui/e-calendar-table.c:449
#, c-format
msgid "90%"
msgstr "90%"
@@ -7734,7 +8636,7 @@ 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
+#: calendar/gui/e-calendar-table.c:450
#, c-format
msgid "100%"
msgstr "100%"
@@ -7745,8 +8647,8 @@ msgstr "100%"
# calendar/gui/e-week-view.c:1824
# calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
# calendar/gui/e-week-view.c:1828
-#: calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
-#: calendar/gui/e-week-view.c:1828
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-week-view.c:1853
msgid "Deleting selected objects"
msgstr "删除选中的对象"
@@ -7759,12 +8661,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:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
msgid "_Open"
msgstr "打开(_O)"
+# composer/e-msg-composer.c:943
+# composer/e-msg-composer.c:947
+# composer/e-msg-composer.c:912
+#: calendar/gui/e-calendar-table.c:985
+#, 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:986 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
+#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: 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 +8701,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:990 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 +8719,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:991 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 +8741,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:992 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
+#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: 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:996
+#, 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:997
+#, 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:998
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:999
+#, 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:1004
msgid "_Delete Selected Tasks"
msgstr "删除选定的任务(_D)"
@@ -7856,8 +8793,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:1271 calendar/gui/e-day-view.c:7418
+#: calendar/gui/e-week-view.c:4194
msgid "Updating objects"
msgstr "更新对象"
@@ -7867,7 +8804,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.c:1354
#: calendar/gui/e-calendar-table.etspec.h:6
msgid "Click to add a task"
msgstr "点击以添加任务"
@@ -7885,8 +8822,8 @@ msgstr "提醒"
# camel/camel-filter-driver.c:886
# calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
# camel/camel-filter-driver.c:1026
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
-#: camel/camel-filter-driver.c:1026
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
msgid "Complete"
msgstr "完成"
@@ -7944,8 +8881,8 @@ msgstr "开始日期"
#. 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
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
msgid "Summary"
msgstr "概要"
@@ -8017,8 +8954,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 +8967,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 +8979,8 @@ 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
+#: calendar/gui/print.c:791
msgid "am"
msgstr "上午"
@@ -8054,131 +8991,225 @@ 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
+#: calendar/gui/print.c:793
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:39
+#, 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:1678 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)"
+# shell/e-shell-view-menu.c:577
+# shell/e-shell-view-menu.c:577
+# shell/e-shell-view-menu.c:577
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:638
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "GNOME Pilot 工具好像并未安装到系统中。"
+
+# shell/e-shell-view-menu.c:585
+# shell/e-shell-view-menu.c:585
+# shell/e-shell-view-menu.c:585
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:646
+#, c-format
+msgid "Error executing %s."
+msgstr "执行 %s 错误。"
+
# 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
+#: calendar/gui/e-itip-control.c:678
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
+#: calendar/gui/e-itip-control.c:683
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
+#: calendar/gui/e-itip-control.c:688
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
+#: calendar/gui/e-itip-control.c:692
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
+#: calendar/gui/e-itip-control.c:704
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
+#: calendar/gui/e-itip-control.c:707
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
+#: calendar/gui/e-itip-control.c:711
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
+#: calendar/gui/e-itip-control.c:725
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
+#: calendar/gui/e-itip-control.c:735
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
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
msgid "iCalendar Information"
msgstr "iCalendar 信息"
@@ -8186,14 +9217,14 @@ msgstr "iCalendar 信息"
# calendar/gui/e-itip-control.c:641
# calendar/gui/e-itip-control.c:644
#. Title
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:787
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
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
msgid "An unknown person"
msgstr "未知的人"
@@ -8201,7 +9232,7 @@ msgstr "未知的人"
# calendar/gui/e-itip-control.c:729
# calendar/gui/e-itip-control.c:732
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:875
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
@@ -8210,14 +9241,14 @@ 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
+#: calendar/gui/e-itip-control.c:891
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
+#: calendar/gui/e-itip-control.c:903
msgid "Status:"
msgstr "状态:"
@@ -8227,15 +9258,16 @@ msgstr "状态:"
# calendar/gui/e-meeting-model.c:824
# calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
# calendar/gui/e-meeting-model.c:824
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-meeting-model.c:321
-#: calendar/gui/e-meeting-model.c:344 calendar/gui/e-meeting-model.c:824
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
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
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
msgid "Tentatively Accepted"
msgstr "暂时接受"
@@ -8245,8 +9277,9 @@ msgstr "暂时接受"
# calendar/gui/e-meeting-model.c:825
# calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
# calendar/gui/e-meeting-model.c:825
-#: calendar/gui/e-itip-control.c:773 calendar/gui/e-meeting-model.c:323
-#: calendar/gui/e-meeting-model.c:346 calendar/gui/e-meeting-model.c:825
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
msgid "Declined"
msgstr "否决"
@@ -8269,13 +9302,14 @@ 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:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
+#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:444
msgid "Unknown"
msgstr "未知"
@@ -8288,16 +9322,16 @@ msgstr "未知"
# calendar/gui/e-itip-control.c:789 calendar/gui/e-itip-control.c:805
# calendar/gui/e-itip-control.c:821 calendar/gui/e-itip-control.c:834
# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:860
-#: calendar/gui/e-itip-control.c: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
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
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
+#: calendar/gui/e-itip-control.c:972
msgid "Update"
msgstr "更新"
@@ -8313,66 +9347,67 @@ msgstr "更新"
# calendar/gui/e-itip-control.c:823 calendar/gui/e-itip-control.c:836
# calendar/gui/e-itip-control.c:849 calendar/gui/e-itip-control.c:862
# shell/e-shell.c:1885 widgets/misc/e-cell-date-edit.c:258
-#: calendar/gui/e-itip-control.c: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
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
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
+#: calendar/gui/e-itip-control.c:1000
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
+#: calendar/gui/e-itip-control.c:1001
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
+#: calendar/gui/e-itip-control.c:1002
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
+#: calendar/gui/e-itip-control.c:1026
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
+#: calendar/gui/e-itip-control.c:1039
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
+#: calendar/gui/e-itip-control.c:1052
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
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
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
+#: calendar/gui/e-itip-control.c:1117
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> 发布了会议信息。"
@@ -8380,14 +9415,14 @@ msgstr "<b>%s</b> 发布了会议信息。"
# calendar/gui/e-itip-control.c:876
# calendar/gui/e-itip-control.c:876
# calendar/gui/e-itip-control.c:910
-#: calendar/gui/e-itip-control.c:944
+#: calendar/gui/e-itip-control.c:1118
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
+#: calendar/gui/e-itip-control.c:1122
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请求您参加一个会议。"
@@ -8395,14 +9430,14 @@ msgstr "<b>%s</b> 请求您参加一个会议。"
# calendar/gui/e-itip-control.c:881
# calendar/gui/e-itip-control.c:881
# calendar/gui/e-itip-control.c:915
-#: calendar/gui/e-itip-control.c:949
+#: calendar/gui/e-itip-control.c:1123
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
+#: calendar/gui/e-itip-control.c:1127
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> 希望加入到已存的会议。"
@@ -8410,14 +9445,14 @@ msgstr "<b>%s</b> 希望加入到已存的会议。"
# calendar/gui/e-itip-control.c:886
# calendar/gui/e-itip-control.c:886
# calendar/gui/e-itip-control.c:920
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1128
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
+#: calendar/gui/e-itip-control.c:1132
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> 想收到最新的会议信息。"
@@ -8425,14 +9460,14 @@ msgstr "<b>%s</b> 想收到最新的会议信息。"
# calendar/gui/e-itip-control.c:891
# calendar/gui/e-itip-control.c:891
# calendar/gui/e-itip-control.c:925
-#: calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:1133
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
+#: calendar/gui/e-itip-control.c:1156
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> 已回复一个会议请求。"
@@ -8440,14 +9475,14 @@ msgstr "<b>%s</b> 已回复一个会议请求。"
# calendar/gui/e-itip-control.c:896
# calendar/gui/e-itip-control.c:896
# calendar/gui/e-itip-control.c:949
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:1157
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
+#: calendar/gui/e-itip-control.c:1161
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
@@ -8455,7 +9490,7 @@ msgstr "<b>%s</b> 取消了一个会议。"
# calendar/gui/e-itip-control.c:901
# calendar/gui/e-itip-control.c:901
# calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:988
+#: calendar/gui/e-itip-control.c:1162
msgid "Meeting Cancellation"
msgstr "会议取消"
@@ -8465,8 +9500,8 @@ msgstr "会议取消"
# calendar/gui/e-itip-control.c:990
# calendar/gui/e-itip-control.c:958 calendar/gui/e-itip-control.c:1029
# calendar/gui/e-itip-control.c:1064
-#: calendar/gui/e-itip-control.c:992 calendar/gui/e-itip-control.c:1063
-#: calendar/gui/e-itip-control.c:1098
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> 发送了一个无法理解的信息。"
@@ -8474,14 +9509,14 @@ msgstr "<b>%s</b> 发送了一个无法理解的信息。"
# calendar/gui/e-itip-control.c:906
# calendar/gui/e-itip-control.c:906
# calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1167
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
+#: calendar/gui/e-itip-control.c:1189
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> 发布了任务信息。"
@@ -8489,14 +9524,14 @@ msgstr "<b>%s</b> 发布了任务信息。"
# calendar/gui/e-itip-control.c:926
# calendar/gui/e-itip-control.c:926
# calendar/gui/e-itip-control.c:980
-#: calendar/gui/e-itip-control.c:1014
+#: calendar/gui/e-itip-control.c:1190
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
+#: calendar/gui/e-itip-control.c:1194
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请求您完成一个任务。"
@@ -8504,14 +9539,14 @@ msgstr "<b>%s</b> 请求您完成一个任务。"
# calendar/gui/e-itip-control.c:931
# calendar/gui/e-itip-control.c:931
# calendar/gui/e-itip-control.c:985
-#: calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:1195
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
+#: calendar/gui/e-itip-control.c:1199
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s<b> 希望加入到已存在的任务。"
@@ -8519,14 +9554,14 @@ msgstr "<b>%s<b> 希望加入到已存在的任务。"
# calendar/gui/e-itip-control.c:936
# calendar/gui/e-itip-control.c:936
# calendar/gui/e-itip-control.c:990
-#: calendar/gui/e-itip-control.c:1024
+#: calendar/gui/e-itip-control.c:1200
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
+#: calendar/gui/e-itip-control.c:1204
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> 希望获取最新的任务信息。"
@@ -8534,14 +9569,14 @@ msgstr "<b>%s</b> 希望获取最新的任务信息。"
# calendar/gui/e-itip-control.c:941
# calendar/gui/e-itip-control.c:941
# calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1029
+#: calendar/gui/e-itip-control.c:1205
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
+#: calendar/gui/e-itip-control.c:1229
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> 已经回复了任务委派。"
@@ -8549,14 +9584,14 @@ msgstr "<b>%s</b> 已经回复了任务委派。"
# calendar/gui/e-itip-control.c:946
# calendar/gui/e-itip-control.c:946
# calendar/gui/e-itip-control.c:1020
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1230
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
+#: calendar/gui/e-itip-control.c:1234
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> 取消了任务。"
@@ -8564,21 +9599,21 @@ msgstr "<b>%s</b> 取消了任务。"
# calendar/gui/e-itip-control.c:951
# calendar/gui/e-itip-control.c:951
# calendar/gui/e-itip-control.c:1025
-#: calendar/gui/e-itip-control.c:1059
+#: calendar/gui/e-itip-control.c:1235
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
+#: calendar/gui/e-itip-control.c:1240
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
+#: calendar/gui/e-itip-control.c:1259
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> 发布了忙闲信息。"
@@ -8586,14 +9621,14 @@ msgstr "<b>%s</b> 发布了忙闲信息。"
# calendar/gui/e-itip-control.c:976
# calendar/gui/e-itip-control.c:976
# calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1260
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
+#: calendar/gui/e-itip-control.c:1264
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请求您的忙闲信息。"
@@ -8601,14 +9636,14 @@ msgstr "<b>%s</b> 请求您的忙闲信息。"
# calendar/gui/e-itip-control.c:981
# calendar/gui/e-itip-control.c:981
# calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1089
+#: calendar/gui/e-itip-control.c:1265
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
+#: calendar/gui/e-itip-control.c:1269
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> 应答了忙闲请求。"
@@ -8616,114 +9651,147 @@ 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
+#: calendar/gui/e-itip-control.c:1270
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
+#: calendar/gui/e-itip-control.c:1275
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
+#: calendar/gui/e-itip-control.c:1354
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
+#: calendar/gui/e-itip-control.c:1373
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
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
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
+#: calendar/gui/e-itip-control.c:1432
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
-msgid "Calendar file could not be updated!\n"
-msgstr "无法更新日历文件!\n"
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+# calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
+# calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
+# calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "无法发送项目!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
# calendar/gui/e-itip-control.c:1243
# calendar/gui/e-itip-control.c:1243
# calendar/gui/e-itip-control.c:1317
-#: calendar/gui/e-itip-control.c:1351
+#: calendar/gui/e-itip-control.c:1579
msgid "Update complete\n"
msgstr "更新完成\n"
+# calendar/gui/e-itip-control.c:1241
+# calendar/gui/e-itip-control.c:1241
+# calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "无法更新日历文件!\n"
+
+# calendar/gui/e-itip-control.c:1300
+# calendar/gui/e-itip-control.c:1300
+# calendar/gui/e-itip-control.c:1374
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "由于条目不再存在而无法更新参与者状态"
+
+#: calendar/gui/e-itip-control.c:1632
+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:1644
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
-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:1671
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:1296
+# calendar/gui/e-itip-control.c:1296
+# calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "无法更新参与者状态!\n"
# calendar/gui/e-itip-control.c:1328
# calendar/gui/e-itip-control.c:1328
# calendar/gui/e-itip-control.c:1402
-#: calendar/gui/e-itip-control.c:1436
+#: calendar/gui/e-itip-control.c:1709
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:1739 calendar/gui/e-itip-control.c:1789
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:1741 calendar/gui/e-itip-control.c:1793
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:1896
+#, 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:1903
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "选择文件夹"
# calendar/gui/e-itip-control.glade.h:2
# calendar/gui/e-itip-control.glade.h:2
@@ -8792,28 +9860,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:84
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:85 calendar/gui/e-meeting-model.c:1748
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:86
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:87
msgid "Non-Participants"
msgstr "不参加"
@@ -8823,8 +9891,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:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
msgid "Individual"
msgstr "个人"
@@ -8834,8 +9902,8 @@ 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:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
msgid "Group"
msgstr "组"
@@ -8845,8 +9913,8 @@ 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:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
msgid "Resource"
msgstr "资源"
@@ -8856,8 +9924,8 @@ 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:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
msgid "Room"
msgstr "房间"
@@ -8867,8 +9935,8 @@ 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:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
msgid "Chair"
msgstr "主席"
@@ -8878,8 +9946,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:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
msgid "Required Participant"
msgstr "必需的参与者"
@@ -8889,8 +9957,8 @@ 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:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
msgid "Optional Participant"
msgstr "可选的参与者"
@@ -8900,8 +9968,8 @@ 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:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
msgid "Non-Participant"
msgstr "不参加"
@@ -8911,8 +9979,8 @@ 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:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
msgid "Needs Action"
msgstr "需要动作"
@@ -8922,8 +9990,8 @@ msgstr "需要动作"
# 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:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
msgid "Tentative"
msgstr "暂时的"
@@ -8933,15 +10001,15 @@ 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:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
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:332 calendar/gui/e-meeting-model.c:355
msgid "In Process"
msgstr "正在处理"
@@ -8953,8 +10021,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:2107
msgid "%A, %B %d, %Y"
msgstr "%Y年%B月%d日 %A"
@@ -8969,8 +10037,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:2137 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 +10051,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 +10059,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:439
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:440
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:478
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:495
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:508
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:526
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:544
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:561
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:575
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:592
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:605
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:618
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:631
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:654
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:673
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 +10172,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 +10180,63 @@ 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/gnome-cal.c:1499
+# calendar/gui/gnome-cal.c:1499
+# calendar/gui/gnome-cal.c:1493
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "无法打开“%s”中的文件夹"
+
+# calendar/gui/e-calendar-table.etspec.h:8
+# calendar/gui/e-calendar-table.etspec.h:8
+# calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-tasks.c:558
+#, 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:581
+#, 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:674
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:1522
#, c-format
msgid "Could not open the folder in `%s'"
msgstr "无法打开“%s”中的文件夹"
@@ -9142,7 +10244,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:1533
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr "不支持打开“%s”必需的方法"
@@ -9150,7 +10252,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:1918
#, c-format
msgid "Opening calendar at %s"
msgstr "从 %s 打开日历"
@@ -9256,344 +10358,349 @@ 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:280
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:311
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
+#: calendar/gui/itip-utils.c:354
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
+#: calendar/gui/itip-utils.c:356
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
+#: calendar/gui/itip-utils.c:358
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
+#: calendar/gui/itip-utils.c:360
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
+#: calendar/gui/itip-utils.c:362
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/e-itip-control.c:787
+# calendar/gui/e-itip-control.c:787
+# calendar/gui/e-itip-control.c:790
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "更新"
-# 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 信息"
+# ui/evolution-subscribe.xml.h:3
+# ui/evolution-subscribe.xml.h:3
+# ui/evolution-subscribe.xml.h:3
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "刷新列表"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
# calendar/gui/itip-utils.c:573
# calendar/gui/itip-utils.c:573
# calendar/gui/itip-utils.c:581
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:660
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:96
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 +10708,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 +10732,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 +10749,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,21 +10757,21 @@ 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
+#: calendar/gui/print.c:2249
msgid "Task"
msgstr "任务"
# calendar/gui/print.c:2262
# calendar/gui/print.c:2262
# calendar/gui/print.c:2262
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2306
#, c-format
msgid "Status: %s"
msgstr "状态:%s"
@@ -9672,7 +10779,7 @@ msgstr "状态:%s"
# calendar/gui/print.c:2280
# calendar/gui/print.c:2280
# calendar/gui/print.c:2280
-#: calendar/gui/print.c:2280
+#: calendar/gui/print.c:2324
#, c-format
msgid "Priority: %s"
msgstr "优先级:%s"
@@ -9680,7 +10787,7 @@ msgstr "优先级:%s"
# calendar/gui/print.c:2294
# calendar/gui/print.c:2294
# calendar/gui/print.c:2294
-#: calendar/gui/print.c:2294
+#: calendar/gui/print.c:2338
#, c-format
msgid "Percent Complete: %i"
msgstr "完成率:%i"
@@ -9688,7 +10795,7 @@ msgstr "完成率:%i"
# calendar/gui/print.c:2306
# calendar/gui/print.c:2306
# calendar/gui/print.c:2306
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2350
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
@@ -9696,7 +10803,7 @@ msgstr "URL:%s"
# calendar/gui/print.c:2320
# calendar/gui/print.c:2320
# calendar/gui/print.c:2320
-#: calendar/gui/print.c:2320
+#: calendar/gui/print.c:2364
#, c-format
msgid "Categories: %s"
msgstr "类别:%s"
@@ -9704,14 +10811,14 @@ msgstr "类别:%s"
# calendar/gui/print.c:2331
# calendar/gui/print.c:2331
# calendar/gui/print.c:2331
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2375
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 +10831,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:2945
+#: 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,14 +10863,14 @@ 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"
@@ -9776,10 +10884,19 @@ msgstr ""
# mail/mail-callbacks.c:2142
# mail/mail-callbacks.c:2261
# calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2297
-#: calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2311
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
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
@@ -9844,136 +10961,183 @@ 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/dialogs/event-editor.c:190
+# calendar/gui/dialogs/event-editor.c:190
+# calendar/gui/dialogs/event-editor.c:190
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "提醒"
+
+# calendar/gui/e-itip-control.glade.h:4
+# calendar/gui/e-itip-control.glade.h:4
+# calendar/gui/e-itip-control.glade.h:4
+#: calendar/importers/icalendar-importer.c:638
+#, 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"
"\""
@@ -9982,14 +11146,14 @@ 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)"
@@ -9998,21 +11162,21 @@ msgstr "has-categories? 的所有参数都应该为字符串或者它唯一的
# 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"
@@ -11441,15 +12605,29 @@ msgstr "亚洲/科威特"
msgid "Asia/Macao"
msgstr "亚洲/澳门"
+# calendar/zones.h:229
+# calendar/zones.h:229
+#: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "亚洲/澳门"
+
# calendar/zones.h:230
# calendar/zones.h:230
-#: calendar/zones.h:230
+#: calendar/zones.h:231
msgid "Asia/Magadan"
msgstr ""
+# calendar/zones.h:223
+# calendar/zones.h:223
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "亚洲/喀什葛尔"
+
# calendar/zones.h:231
# calendar/zones.h:231
-#: calendar/zones.h:231
+#: calendar/zones.h:233
msgid "Asia/Manila"
msgstr "亚洲/马尼拉"
@@ -11459,991 +12637,998 @@ msgstr "亚洲/马尼拉"
# addressbook/gui/widgets/e-addressbook-view.c:883
# calendar/zones.h:232
# calendar/zones.h:232
-#: calendar/zones.h:232
+#: calendar/zones.h:234
msgid "Asia/Muscat"
msgstr "亚洲/马斯喀特"
# calendar/zones.h:233
# calendar/zones.h:233
-#: calendar/zones.h:233
+#: calendar/zones.h:235
msgid "Asia/Nicosia"
msgstr "亚洲/尼科西亚"
# calendar/zones.h:234
# calendar/zones.h:234
-#: calendar/zones.h:234
+#: calendar/zones.h:236
msgid "Asia/Novosibirsk"
msgstr "亚洲/新西伯利亚"
# ui/evolution-task-editor.xml.h:1
# calendar/zones.h:235
# calendar/zones.h:235
-#: calendar/zones.h:235
+#: calendar/zones.h:237
msgid "Asia/Omsk"
msgstr "亚洲/鄂木斯克"
+# calendar/zones.h:220
+# calendar/zones.h:220
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "亚洲/喀布尔"
+
# calendar/zones.h:236
# calendar/zones.h:236
-#: calendar/zones.h:236
+#: calendar/zones.h:239
msgid "Asia/Phnom_Penh"
msgstr "亚洲/金边"
# calendar/zones.h:237
# calendar/zones.h:237
-#: calendar/zones.h:237
+#: calendar/zones.h:240
msgid "Asia/Pontianak"
msgstr "亚洲/坤甸"
# calendar/zones.h:238
# calendar/zones.h:238
-#: calendar/zones.h:238
+#: calendar/zones.h:241
msgid "Asia/Pyongyang"
msgstr "亚洲/平壤"
# addressbook/gui/contact-editor/fulladdr.glade.h:172
# calendar/zones.h:239
# calendar/zones.h:239
-#: calendar/zones.h:239
+#: calendar/zones.h:242
msgid "Asia/Qatar"
msgstr "亚洲/卡塔尔"
+# calendar/zones.h:211
+# calendar/zones.h:211
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "亚洲/加沙"
+
# calendar/zones.h:240
# calendar/zones.h:240
-#: calendar/zones.h:240
+#: calendar/zones.h:244
msgid "Asia/Rangoon"
msgstr "亚洲/仰光"
# calendar/zones.h:241
# calendar/zones.h:241
-#: calendar/zones.h:241
+#: calendar/zones.h:245
msgid "Asia/Riyadh"
msgstr "亚洲/利雅得"
# calendar/zones.h:242
# calendar/zones.h:242
-#: calendar/zones.h:242
+#: calendar/zones.h:246
msgid "Asia/Saigon"
msgstr "亚洲/西贡"
# calendar/zones.h:243
# calendar/zones.h:243
-#: calendar/zones.h:243
+#: calendar/zones.h:247
msgid "Asia/Sakhalin"
msgstr "亚洲/库页岛"
# calendar/zones.h:244
# calendar/zones.h:244
-#: calendar/zones.h:244
+#: calendar/zones.h:248
msgid "Asia/Samarkand"
msgstr "亚洲/撒马尔罕"
# calendar/zones.h:245
# calendar/zones.h:245
-#: calendar/zones.h:245
+#: calendar/zones.h:249
msgid "Asia/Seoul"
msgstr "亚洲/汉城"
# calendar/zones.h:246
# calendar/zones.h:246
-#: calendar/zones.h:246
+#: calendar/zones.h:250
msgid "Asia/Shanghai"
msgstr "亚洲/上海"
# addressbook/gui/contact-editor/fulladdr.glade.h:189
# calendar/zones.h:247
# calendar/zones.h:247
-#: calendar/zones.h:247
+#: calendar/zones.h:251
msgid "Asia/Singapore"
msgstr "亚洲/新加坡"
# calendar/zones.h:248
# calendar/zones.h:248
-#: calendar/zones.h:248
+#: calendar/zones.h:252
msgid "Asia/Taipei"
msgstr "亚洲/台北"
# calendar/zones.h:249
# calendar/zones.h:249
-#: calendar/zones.h:249
+#: calendar/zones.h:253
msgid "Asia/Tashkent"
msgstr "亚洲/塔什干"
# calendar/zones.h:250
# calendar/zones.h:250
-#: calendar/zones.h:250
+#: calendar/zones.h:254
msgid "Asia/Tbilisi"
msgstr "亚洲/第比利斯"
# calendar/zones.h:251
# calendar/zones.h:251
-#: calendar/zones.h:251
+#: calendar/zones.h:255
msgid "Asia/Tehran"
msgstr "亚洲/德黑兰"
# calendar/zones.h:252
# calendar/zones.h:252
-#: calendar/zones.h:252
+#: calendar/zones.h:256
msgid "Asia/Thimphu"
msgstr "亚洲/廷布"
# calendar/zones.h:253
# calendar/zones.h:253
-#: calendar/zones.h:253
+#: calendar/zones.h:257
msgid "Asia/Tokyo"
msgstr "亚洲/东京"
# calendar/zones.h:254
# calendar/zones.h:254
-#: calendar/zones.h:254
+#: calendar/zones.h:258
msgid "Asia/Ujung_Pandang"
msgstr ""
# calendar/zones.h:255
# calendar/zones.h:255
-#: calendar/zones.h:255
+#: calendar/zones.h:259
msgid "Asia/Ulaanbaatar"
msgstr "亚洲/乌兰巴托"
# calendar/zones.h:256
# calendar/zones.h:256
-#: calendar/zones.h:256
+#: calendar/zones.h:260
msgid "Asia/Urumqi"
msgstr "亚洲/乌鲁木齐"
# calendar/zones.h:257
# calendar/zones.h:257
-#: calendar/zones.h:257
+#: calendar/zones.h:261
msgid "Asia/Vientiane"
msgstr "亚洲/万象"
# calendar/zones.h:258
# calendar/zones.h:258
-#: calendar/zones.h:258
+#: calendar/zones.h:262
msgid "Asia/Vladivostok"
msgstr "亚洲/符拉迪沃斯托克"
# calendar/zones.h:259
# calendar/zones.h:259
-#: calendar/zones.h:259
+#: calendar/zones.h:263
msgid "Asia/Yakutsk"
msgstr "亚洲/雅库茨克"
# calendar/zones.h:260
# calendar/zones.h:260
-#: calendar/zones.h:260
+#: calendar/zones.h:264
msgid "Asia/Yekaterinburg"
msgstr ""
# calendar/zones.h:261
# calendar/zones.h:261
-#: calendar/zones.h:261
+#: calendar/zones.h:265
msgid "Asia/Yerevan"
msgstr "亚洲/耶列万"
# calendar/zones.h:262
# calendar/zones.h:262
-#: calendar/zones.h:262
+#: calendar/zones.h:266
msgid "Atlantic/Azores"
msgstr "大西洋/亚述尔群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:25
# calendar/zones.h:263
# calendar/zones.h:263
-#: calendar/zones.h:263
+#: calendar/zones.h:267
msgid "Atlantic/Bermuda"
msgstr "大西洋/百慕大"
# calendar/zones.h:264
# calendar/zones.h:264
-#: calendar/zones.h:264
+#: calendar/zones.h:268
msgid "Atlantic/Canary"
msgstr "大西洋/卡内里"
# addressbook/gui/contact-editor/fulladdr.glade.h:41
# calendar/zones.h:265
# calendar/zones.h:265
-#: calendar/zones.h:265
+#: calendar/zones.h:269
msgid "Atlantic/Cape_Verde"
msgstr "大西洋/佛得角"
# calendar/zones.h:266
# calendar/zones.h:266
-#: calendar/zones.h:266
+#: calendar/zones.h:270
msgid "Atlantic/Faeroe"
msgstr "大西洋/法罗"
# calendar/zones.h:267
# calendar/zones.h:267
-#: calendar/zones.h:267
+#: calendar/zones.h:271
msgid "Atlantic/Jan_Mayen"
msgstr ""
# calendar/zones.h:268
# calendar/zones.h:268
-#: calendar/zones.h:268
+#: calendar/zones.h:272
msgid "Atlantic/Madeira"
msgstr "大西洋/马德拉群岛"
# calendar/zones.h:269
# calendar/zones.h:269
-#: calendar/zones.h:269
+#: calendar/zones.h:273
msgid "Atlantic/Reykjavik"
msgstr "大西洋/雷克雅未克"
# calendar/zones.h:270
# calendar/zones.h:270
-#: calendar/zones.h:270
+#: calendar/zones.h:274
msgid "Atlantic/South_Georgia"
msgstr "大西洋/南乔治亚"
# calendar/zones.h:271
# calendar/zones.h:271
-#: calendar/zones.h:271
+#: calendar/zones.h:275
msgid "Atlantic/St_Helena"
msgstr "大西洋/圣海伦娜"
# calendar/zones.h:272
# calendar/zones.h:272
-#: calendar/zones.h:272
+#: calendar/zones.h:276
msgid "Atlantic/Stanley"
msgstr "大西洋/斯坦利"
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# calendar/zones.h:273
# calendar/zones.h:273
-#: calendar/zones.h:273
+#: calendar/zones.h:277
msgid "Australia/Adelaide"
msgstr "澳大利亚/阿德莱德"
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# calendar/zones.h:274
# calendar/zones.h:274
-#: calendar/zones.h:274
+#: calendar/zones.h:278
msgid "Australia/Brisbane"
msgstr "澳大利亚/布里斯班"
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# calendar/zones.h:275
# calendar/zones.h:275
-#: calendar/zones.h:275
+#: calendar/zones.h:279
msgid "Australia/Broken_Hill"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# calendar/zones.h:276
# calendar/zones.h:276
-#: calendar/zones.h:276
+#: calendar/zones.h:280
msgid "Australia/Darwin"
msgstr "澳大利亚/达尔文"
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# calendar/zones.h:277
# calendar/zones.h:277
-#: calendar/zones.h:277
+#: calendar/zones.h:281
msgid "Australia/Hobart"
msgstr "澳大利亚/霍巴特"
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# calendar/zones.h:278
# calendar/zones.h:278
-#: calendar/zones.h:278
+#: calendar/zones.h:282
msgid "Australia/Lindeman"
msgstr "澳大利亚/林德曼"
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# calendar/zones.h:279
# calendar/zones.h:279
-#: calendar/zones.h:279
+#: calendar/zones.h:283
msgid "Australia/Lord_Howe"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# calendar/zones.h:280
# calendar/zones.h:280
-#: calendar/zones.h:280
+#: calendar/zones.h:284
msgid "Australia/Melbourne"
msgstr "澳洲/墨尔本"
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# calendar/zones.h:281
# calendar/zones.h:281
-#: calendar/zones.h:281
+#: calendar/zones.h:285
msgid "Australia/Perth"
msgstr "澳大利亚/珀斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# calendar/zones.h:282
# calendar/zones.h:282
-#: calendar/zones.h:282
+#: calendar/zones.h:286
msgid "Australia/Sydney"
msgstr "澳洲/悉尼"
# calendar/zones.h:283
# calendar/zones.h:283
-#: calendar/zones.h:283
+#: calendar/zones.h:287
msgid "Europe/Amsterdam"
msgstr "欧洲/阿姆斯特丹"
# addressbook/gui/contact-editor/fulladdr.glade.h:6
# calendar/zones.h:284
# calendar/zones.h:284
-#: calendar/zones.h:284
+#: calendar/zones.h:288
msgid "Europe/Andorra"
msgstr "欧洲/安道尔"
# mail/folder-browser-ui.c:274
# calendar/zones.h:285
# calendar/zones.h:285
-#: calendar/zones.h:285
+#: calendar/zones.h:289
msgid "Europe/Athens"
msgstr "欧洲/雅典"
# calendar/zones.h:286
# calendar/zones.h:286
-#: calendar/zones.h:286
+#: calendar/zones.h:290
msgid "Europe/Belfast"
msgstr "欧洲/贝尔法斯特"
# calendar/zones.h:287
# calendar/zones.h:287
-#: calendar/zones.h:287
+#: calendar/zones.h:291
msgid "Europe/Belgrade"
msgstr "欧洲/贝尔格莱德"
# calendar/zones.h:288
# calendar/zones.h:288
-#: calendar/zones.h:288
+#: calendar/zones.h:292
msgid "Europe/Berlin"
msgstr "欧洲/柏林"
# calendar/zones.h:289
# calendar/zones.h:289
-#: calendar/zones.h:289
+#: calendar/zones.h:293
msgid "Europe/Bratislava"
msgstr "欧洲/布拉迪斯拉发"
# calendar/zones.h:290
# calendar/zones.h:290
-#: calendar/zones.h:290
+#: calendar/zones.h:294
msgid "Europe/Brussels"
msgstr "欧洲/布鲁塞尔"
# calendar/zones.h:291
# calendar/zones.h:291
-#: calendar/zones.h:291
+#: calendar/zones.h:295
msgid "Europe/Bucharest"
msgstr "欧洲/布加勒斯特"
# calendar/zones.h:292
# calendar/zones.h:292
-#: calendar/zones.h:292
+#: calendar/zones.h:296
msgid "Europe/Budapest"
msgstr "欧洲/布达佩斯"
# calendar/zones.h:293
# calendar/zones.h:293
-#: calendar/zones.h:293
+#: calendar/zones.h:297
msgid "Europe/Chisinau"
msgstr ""
# calendar/zones.h:294
# calendar/zones.h:294
-#: calendar/zones.h:294
+#: calendar/zones.h:298
msgid "Europe/Copenhagen"
msgstr "欧洲/哥本哈根"
# calendar/zones.h:295
# calendar/zones.h:295
-#: calendar/zones.h:295
+#: calendar/zones.h:299
msgid "Europe/Dublin"
msgstr "欧洲/都柏林"
# addressbook/gui/contact-editor/fulladdr.glade.h:86
# calendar/zones.h:296
# calendar/zones.h:296
-#: calendar/zones.h:296
+#: calendar/zones.h:300
msgid "Europe/Gibraltar"
msgstr "欧洲/直布罗陀"
# calendar/zones.h:297
# calendar/zones.h:297
-#: calendar/zones.h:297
+#: calendar/zones.h:301
msgid "Europe/Helsinki"
msgstr "欧洲/赫尔辛基"
# calendar/zones.h:298
# calendar/zones.h:298
-#: calendar/zones.h:298
+#: calendar/zones.h:302
msgid "Europe/Istanbul"
msgstr "欧洲/伊斯坦布尔"
# calendar/zones.h:299
# calendar/zones.h:299
-#: calendar/zones.h:299
+#: calendar/zones.h:303
msgid "Europe/Kaliningrad"
msgstr "欧洲/加里宁格勒"
# calendar/zones.h:300
# calendar/zones.h:300
-#: calendar/zones.h:300
+#: calendar/zones.h:304
msgid "Europe/Kiev"
msgstr "欧洲/基辅"
# calendar/zones.h:301
# calendar/zones.h:301
-#: calendar/zones.h:301
+#: calendar/zones.h:305
msgid "Europe/Lisbon"
msgstr "欧洲/里斯本"
# calendar/zones.h:302
# calendar/zones.h:302
-#: calendar/zones.h:302
+#: calendar/zones.h:306
msgid "Europe/Ljubljana"
msgstr "欧洲/卢布尔雅纳"
# calendar/zones.h:303
# calendar/zones.h:303
-#: calendar/zones.h:303
+#: calendar/zones.h:307
msgid "Europe/London"
msgstr "欧洲/伦敦"
# addressbook/gui/contact-editor/fulladdr.glade.h:123
# calendar/zones.h:304
# calendar/zones.h:304
-#: calendar/zones.h:304
+#: calendar/zones.h:308
msgid "Europe/Luxembourg"
msgstr "欧洲/卢森堡"
# calendar/zones.h:305
# calendar/zones.h:305
-#: calendar/zones.h:305
+#: calendar/zones.h:309
msgid "Europe/Madrid"
msgstr "欧洲/马德里"
# calendar/zones.h:306
# calendar/zones.h:306
-#: calendar/zones.h:306
+#: calendar/zones.h:310
msgid "Europe/Malta"
msgstr "欧洲/马耳他"
# calendar/zones.h:307
# calendar/zones.h:307
-#: calendar/zones.h:307
+#: calendar/zones.h:311
msgid "Europe/Minsk"
msgstr "欧洲/明斯克"
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# calendar/zones.h:308
# calendar/zones.h:308
-#: calendar/zones.h:308
+#: calendar/zones.h:312
msgid "Europe/Monaco"
msgstr "欧洲/摩纳哥"
# calendar/zones.h:309
# calendar/zones.h:309
-#: calendar/zones.h:309
+#: calendar/zones.h:313
msgid "Europe/Moscow"
msgstr "欧洲/莫斯科"
# calendar/zones.h:310
# calendar/zones.h:310
-#: calendar/zones.h:310
+#: calendar/zones.h:314
msgid "Europe/Nicosia"
msgstr "欧洲/尼科西亚"
# calendar/zones.h:311
# calendar/zones.h:311
-#: calendar/zones.h:311
+#: calendar/zones.h:315
msgid "Europe/Oslo"
msgstr "欧洲/奥斯路"
# mail/folder-browser-ui.c:274
# calendar/zones.h:312
# calendar/zones.h:312
-#: calendar/zones.h:312
+#: calendar/zones.h:316
msgid "Europe/Paris"
msgstr "欧洲/巴黎"
# calendar/zones.h:313
# calendar/zones.h:313
-#: calendar/zones.h:313
+#: calendar/zones.h:317
msgid "Europe/Prague"
msgstr "欧洲/布拉格"
# calendar/zones.h:314
# calendar/zones.h:314
-#: calendar/zones.h:314
+#: calendar/zones.h:318
msgid "Europe/Riga"
msgstr "欧洲/里加"
# calendar/zones.h:315
# calendar/zones.h:315
-#: calendar/zones.h:315
+#: calendar/zones.h:319
msgid "Europe/Rome"
msgstr "欧洲/罗马"
# calendar/zones.h:316
# calendar/zones.h:316
-#: calendar/zones.h:316
+#: calendar/zones.h:320
msgid "Europe/Samara"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# calendar/zones.h:317
# calendar/zones.h:317
-#: calendar/zones.h:317
+#: calendar/zones.h:321
msgid "Europe/San_Marino"
msgstr "欧洲/圣马力诺"
# calendar/zones.h:318
# calendar/zones.h:318
-#: calendar/zones.h:318
+#: calendar/zones.h:322
msgid "Europe/Sarajevo"
msgstr "欧洲/萨拉热窝"
# calendar/zones.h:319
# calendar/zones.h:319
-#: calendar/zones.h:319
+#: calendar/zones.h:323
msgid "Europe/Simferopol"
msgstr "欧洲/辛菲罗波尔"
# calendar/zones.h:320
# calendar/zones.h:320
-#: calendar/zones.h:320
+#: calendar/zones.h:324
msgid "Europe/Skopje"
msgstr "欧洲/斯科普里"
# calendar/zones.h:321
# calendar/zones.h:321
-#: calendar/zones.h:321
+#: calendar/zones.h:325
msgid "Europe/Sofia"
msgstr "欧洲/索非亚"
# calendar/zones.h:322
# calendar/zones.h:322
-#: calendar/zones.h:322
+#: calendar/zones.h:326
msgid "Europe/Stockholm"
msgstr "欧洲/斯德哥尔摩"
# calendar/zones.h:323
# calendar/zones.h:323
-#: calendar/zones.h:323
+#: calendar/zones.h:327
msgid "Europe/Tallinn"
msgstr "欧洲/塔林"
# calendar/zones.h:324
# calendar/zones.h:324
-#: calendar/zones.h:324
+#: calendar/zones.h:328
msgid "Europe/Tirane"
msgstr "欧洲/地拉那"
# calendar/zones.h:325
# calendar/zones.h:325
-#: calendar/zones.h:325
+#: calendar/zones.h:329
msgid "Europe/Uzhgorod"
msgstr ""
# calendar/zones.h:326
# calendar/zones.h:326
-#: calendar/zones.h:326
+#: calendar/zones.h:330
msgid "Europe/Vaduz"
msgstr "欧洲/瓦杜兹"
# calendar/zones.h:327
# calendar/zones.h:327
-#: calendar/zones.h:327
+#: calendar/zones.h:331
msgid "Europe/Vatican"
msgstr "欧洲/梵蒂冈"
# calendar/zones.h:328
# calendar/zones.h:328
-#: calendar/zones.h:328
+#: calendar/zones.h:332
msgid "Europe/Vienna"
msgstr "欧洲/维也纳"
# calendar/zones.h:329
# calendar/zones.h:329
-#: calendar/zones.h:329
+#: calendar/zones.h:333
msgid "Europe/Vilnius"
msgstr "欧洲/维尔纽斯"
# calendar/zones.h:330
# calendar/zones.h:330
-#: calendar/zones.h:330
+#: calendar/zones.h:334
msgid "Europe/Warsaw"
msgstr "欧洲/华沙"
# calendar/zones.h:331
# calendar/zones.h:331
-#: calendar/zones.h:331
+#: calendar/zones.h:335
msgid "Europe/Zagreb"
msgstr "欧洲/萨格勒布"
# calendar/zones.h:332
# calendar/zones.h:332
-#: calendar/zones.h:332
+#: calendar/zones.h:336
msgid "Europe/Zaporozhye"
msgstr ""
# calendar/zones.h:333
# calendar/zones.h:333
-#: calendar/zones.h:333
+#: calendar/zones.h:337
msgid "Europe/Zurich"
msgstr "欧洲/苏黎世"
# calendar/zones.h:334
# calendar/zones.h:334
-#: calendar/zones.h:334
+#: calendar/zones.h:338
msgid "Indian/Antananarivo"
msgstr ""
# calendar/zones.h:335
# calendar/zones.h:335
-#: calendar/zones.h:335
+#: calendar/zones.h:339
msgid "Indian/Chagos"
msgstr "印度洋/查戈斯群岛"
# calendar/zones.h:336
# calendar/zones.h:336
-#: calendar/zones.h:336
+#: calendar/zones.h:340
msgid "Indian/Christmas"
msgstr "印度洋/圣诞岛"
# calendar/zones.h:337
# calendar/zones.h:337
-#: calendar/zones.h:337
+#: calendar/zones.h:341
msgid "Indian/Cocos"
msgstr "印度洋/科科斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:51
# calendar/zones.h:338
# calendar/zones.h:338
-#: calendar/zones.h:338
+#: calendar/zones.h:342
msgid "Indian/Comoro"
msgstr "印度洋/科摩罗"
# calendar/zones.h:339
# calendar/zones.h:339
-#: calendar/zones.h:339
+#: calendar/zones.h:343
msgid "Indian/Kerguelen"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:103
# calendar/zones.h:340
# calendar/zones.h:340
-#: calendar/zones.h:340
+#: calendar/zones.h:344
msgid "Indian/Mahe"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:129
# calendar/zones.h:341
# calendar/zones.h:341
-#: calendar/zones.h:341
+#: calendar/zones.h:345
msgid "Indian/Maldives"
msgstr "印度洋/马尔代夫"
# addressbook/gui/contact-editor/fulladdr.glade.h:135
# calendar/zones.h:342
# calendar/zones.h:342
-#: calendar/zones.h:342
+#: calendar/zones.h:346
msgid "Indian/Mauritius"
msgstr "印度洋/毛里求斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:136
# calendar/zones.h:343
# calendar/zones.h:343
-#: calendar/zones.h:343
+#: calendar/zones.h:347
msgid "Indian/Mayotte"
msgstr "印度洋/马约特岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:175
# calendar/zones.h:344
# calendar/zones.h:344
-#: calendar/zones.h:344
+#: calendar/zones.h:348
msgid "Indian/Reunion"
msgstr "印度洋/留尼汪"
# calendar/zones.h:345
# calendar/zones.h:345
-#: calendar/zones.h:345
+#: calendar/zones.h:349
msgid "Pacific/Apia"
msgstr "太平洋/阿皮亚"
# calendar/zones.h:346
# calendar/zones.h:346
-#: calendar/zones.h:346
+#: calendar/zones.h:350
msgid "Pacific/Auckland"
msgstr "太平洋/奥克兰"
# calendar/zones.h:347
# calendar/zones.h:347
-#: calendar/zones.h:347
+#: calendar/zones.h:351
msgid "Pacific/Chatham"
msgstr "太平洋/查塔姆群岛"
# calendar/zones.h:348
# calendar/zones.h:348
-#: calendar/zones.h:348
+#: calendar/zones.h:352
msgid "Pacific/Easter"
msgstr "太平洋/复活节岛"
# calendar/zones.h:349
# calendar/zones.h:349
-#: calendar/zones.h:349
+#: calendar/zones.h:353
msgid "Pacific/Efate"
msgstr "太平洋/埃法特岛"
# calendar/zones.h:350
# calendar/zones.h:350
-#: calendar/zones.h:350
+#: calendar/zones.h:354
msgid "Pacific/Enderbury"
msgstr ""
# calendar/zones.h:351
# calendar/zones.h:351
-#: calendar/zones.h:351
+#: calendar/zones.h:355
msgid "Pacific/Fakaofo"
msgstr ""
# calendar/zones.h:352
# calendar/zones.h:352
-#: calendar/zones.h:352
+#: calendar/zones.h:356
msgid "Pacific/Fiji"
msgstr "太平洋/斐济"
# calendar/zones.h:353
# calendar/zones.h:353
-#: calendar/zones.h:353
+#: calendar/zones.h:357
msgid "Pacific/Funafuti"
msgstr "太平洋/富纳富提"
# calendar/zones.h:354
# calendar/zones.h:354
-#: calendar/zones.h:354
+#: calendar/zones.h:358
msgid "Pacific/Galapagos"
msgstr "太平洋/加拉帕哥斯群岛"
# calendar/zones.h:355
# calendar/zones.h:355
-#: calendar/zones.h:355
+#: calendar/zones.h:359
msgid "Pacific/Gambier"
msgstr ""
# calendar/zones.h:356
# calendar/zones.h:356
-#: calendar/zones.h:356
+#: calendar/zones.h:360
msgid "Pacific/Guadalcanal"
msgstr "太平洋/瓜达卡纳尔岛"
# calendar/zones.h:357
# calendar/zones.h:357
-#: calendar/zones.h:357
+#: calendar/zones.h:361
msgid "Pacific/Guam"
msgstr "太平洋/关岛"
# calendar/zones.h:358
# calendar/zones.h:358
-#: calendar/zones.h:358
+#: calendar/zones.h:362
msgid "Pacific/Honolulu"
msgstr "太平洋/火奴鲁鲁"
# calendar/zones.h:359
# calendar/zones.h:359
-#: calendar/zones.h:359
+#: calendar/zones.h:363
msgid "Pacific/Johnston"
msgstr "太平洋/约翰斯顿"
# calendar/zones.h:360
# calendar/zones.h:360
-#: calendar/zones.h:360
+#: calendar/zones.h:364
msgid "Pacific/Kiritimati"
msgstr ""
# calendar/zones.h:361
# calendar/zones.h:361
-#: calendar/zones.h:361
+#: calendar/zones.h:365
msgid "Pacific/Kosrae"
msgstr ""
# calendar/zones.h:362
# calendar/zones.h:362
-#: calendar/zones.h:362
+#: calendar/zones.h:366
msgid "Pacific/Kwajalein"
msgstr "太平洋/夸贾林环礁"
# calendar/zones.h:363
# calendar/zones.h:363
-#: calendar/zones.h:363
+#: calendar/zones.h:367
msgid "Pacific/Majuro"
msgstr ""
# calendar/zones.h:364
# calendar/zones.h:364
-#: calendar/zones.h:364
+#: calendar/zones.h:368
msgid "Pacific/Marquesas"
msgstr "太平洋/马克萨斯群岛"
# calendar/zones.h:365
# calendar/zones.h:365
-#: calendar/zones.h:365
+#: calendar/zones.h:369
msgid "Pacific/Midway"
msgstr "太平洋/中途岛"
# calendar/zones.h:366
# calendar/zones.h:366
-#: calendar/zones.h:366
+#: calendar/zones.h:370
msgid "Pacific/Nauru"
msgstr "太平洋/瑙鲁"
# calendar/zones.h:367
# calendar/zones.h:367
-#: calendar/zones.h:367
+#: calendar/zones.h:371
msgid "Pacific/Niue"
msgstr "太平洋/纽埃岛"
# calendar/zones.h:368
# calendar/zones.h:368
-#: calendar/zones.h:368
+#: calendar/zones.h:372
msgid "Pacific/Norfolk"
msgstr "太平洋/诺福克"
# calendar/zones.h:369
# calendar/zones.h:369
-#: calendar/zones.h:369
+#: calendar/zones.h:373
msgid "Pacific/Noumea"
msgstr "太平洋/努美阿"
# calendar/zones.h:370
# calendar/zones.h:370
-#: calendar/zones.h:370
+#: calendar/zones.h:374
msgid "Pacific/Pago_Pago"
msgstr "太平洋/帕果-帕果"
# calendar/zones.h:371
# calendar/zones.h:371
-#: calendar/zones.h:371
+#: calendar/zones.h:375
msgid "Pacific/Palau"
msgstr "太平洋/帕劳"
# addressbook/gui/contact-editor/fulladdr.glade.h:168
# calendar/zones.h:372
# calendar/zones.h:372
-#: calendar/zones.h:372
+#: calendar/zones.h:376
msgid "Pacific/Pitcairn"
msgstr "太平洋/皮特克恩岛"
# calendar/zones.h:373
# calendar/zones.h:373
-#: calendar/zones.h:373
+#: calendar/zones.h:377
msgid "Pacific/Ponape"
msgstr ""
# calendar/zones.h:374
# calendar/zones.h:374
-#: calendar/zones.h:374
+#: calendar/zones.h:378
msgid "Pacific/Port_Moresby"
msgstr "太平洋/莫尔斯比港"
# calendar/zones.h:375
# calendar/zones.h:375
-#: calendar/zones.h:375
+#: calendar/zones.h:379
msgid "Pacific/Rarotonga"
msgstr "太平洋/拉罗汤加岛"
# calendar/zones.h:376
# calendar/zones.h:376
-#: calendar/zones.h:376
+#: calendar/zones.h:380
msgid "Pacific/Saipan"
msgstr "太平洋/塞班岛"
# calendar/zones.h:377
# calendar/zones.h:377
-#: calendar/zones.h:377
+#: calendar/zones.h:381
msgid "Pacific/Tahiti"
msgstr "太平洋/塔希提"
# calendar/zones.h:378
# calendar/zones.h:378
-#: calendar/zones.h:378
+#: calendar/zones.h:382
msgid "Pacific/Tarawa"
msgstr "太平洋/塔拉瓦岛"
# calendar/zones.h:379
# calendar/zones.h:379
-#: calendar/zones.h:379
+#: calendar/zones.h:383
msgid "Pacific/Tongatapu"
msgstr ""
# calendar/zones.h:380
# calendar/zones.h:380
-#: calendar/zones.h:380
+#: calendar/zones.h:384
msgid "Pacific/Truk"
msgstr "太平洋/特鲁克"
# calendar/zones.h:381
# calendar/zones.h:381
-#: calendar/zones.h:381
+#: calendar/zones.h:385
msgid "Pacific/Wake"
msgstr "太平洋/威克岛"
# calendar/zones.h:382
# calendar/zones.h:382
-#: calendar/zones.h:382
+#: calendar/zones.h:386
msgid "Pacific/Wallis"
msgstr "太平洋/沃利斯"
# calendar/zones.h:383
# calendar/zones.h:383
-#: calendar/zones.h:383
+#: calendar/zones.h:387
msgid "Pacific/Yap"
msgstr ""
# camel/camel-cipher-context.c:171
# camel/camel-cipher-context.c:169
# camel/camel-cipher-context.c:169
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
msgid "Signing is not supported by this cipher"
msgstr "该密码不支持签名"
-# camel/camel-cipher-context.c:211
-# camel/camel-cipher-context.c:209
-# camel/camel-cipher-context.c:209
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "该密码不支持清晰签名"
-
# camel/camel-cipher-context.c:251
# camel/camel-cipher-context.c:249
# camel/camel-cipher-context.c:249
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
msgid "Verifying is not supported by this cipher"
msgstr "该密码不支持验证"
# camel/camel-cipher-context.c:294
# camel/camel-cipher-context.c:292
# camel/camel-cipher-context.c:292
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
msgid "Encryption is not supported by this cipher"
msgstr "该密码不支持加密"
# camel/camel-cipher-context.c:336
# camel/camel-cipher-context.c:334
# camel/camel-cipher-context.c:334
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
msgid "Decryption is not supported by this cipher"
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:443
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "无法删除缓冲条目:%s:%s"
@@ -12451,7 +13636,7 @@ msgstr "无法删除缓冲条目:%s:%s"
# camel/camel-disco-diary.c:180
# camel/camel-disco-diary.c:180
# camel/camel-disco-diary.c:180
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
#, c-format
msgid ""
"Could not write log entry: %s\n"
@@ -12465,7 +13650,7 @@ msgstr ""
# camel/camel-disco-diary.c:243
# camel/camel-disco-diary.c:243
# camel/camel-disco-diary.c:243
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
#, c-format
msgid ""
"Could not open `%s':\n"
@@ -12479,28 +13664,36 @@ msgstr ""
# camel/camel-disco-diary.c:277
# camel/camel-disco-diary.c:277
# camel/camel-disco-diary.c:277
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
msgid "Resynchronizing with server"
msgstr "重新与服务器同步"
+# mail/mail-ops.c:1469
+# mail/mail-ops.c:1471
+# mail/mail-ops.c:1514
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "正在存储文件夹“%s”"
+
# camel/camel-disco-store.c:343
# camel/camel-disco-store.c:343
# camel/camel-disco-store.c:343
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-store.c:367
msgid "You must be working online to complete this operation"
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:808 camel/camel-filter-driver.c:1194
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "解析过滤规则错误: %s: %s"
@@ -12508,7 +13701,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:817 camel/camel-filter-driver.c:1200
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "执行过滤规则错误: %s: %s"
@@ -12516,21 +13709,21 @@ msgstr "执行过滤规则错误: %s: %s"
# camel/camel-filter-driver.c:664
# camel/camel-filter-driver.c:713
# camel/camel-filter-driver.c:865
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:884
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:893
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
+#: camel/camel-filter-driver.c:908
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "获取邮件 %d (%d%%)"
@@ -12538,14 +13731,14 @@ msgstr "获取邮件 %d (%d%%)"
# camel/camel-filter-driver.c:692
# camel/camel-filter-driver.c:741
# camel/camel-filter-driver.c:893
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:912
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:913 camel/camel-filter-driver.c:925
#, c-format
msgid "Failed on message %d"
msgstr "在消息 %d 失败"
@@ -12553,14 +13746,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:939 camel/camel-filter-driver.c:1046
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:1013
#, c-format
msgid "Getting message %d of %d"
msgstr "正在获取第 %d 个消息,共 %d 个"
@@ -12568,7 +13761,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:1028
#, c-format
msgid "Failed at message %d of %d"
msgstr "在第 %d 个消息失败,共 %d 个"
@@ -12576,14 +13769,48 @@ msgstr "在第 %d 个消息失败,共 %d 个"
# camel/camel-smime-context.c:810
# camel/camel-smime-context.c:810
# camel/camel-filter-search.c:126
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
msgid "Failed to retrieve message"
msgstr "检索消息失败。"
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# 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: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/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "缓冲邮件 %s 失败: %s"
+
+# 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: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: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/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "缓冲邮件 %s 失败: %s"
+
# camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
# camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
# camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "执行过滤规则搜索错误: %s: %s"
@@ -12591,7 +13818,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 +13830,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 +13842,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:583
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr "不支持的操作:附加邮件:附加 %s"
@@ -12645,7 +13865,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:1161
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr "不支持的操作:按表达式搜索:搜索 %s"
@@ -12653,7 +13873,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:1201
#, c-format
msgid "Unsupported operation: search by uids: for %s"
msgstr "不支持的操作:按 uid 搜索:搜索 %s"
@@ -12661,10 +13881,132 @@ 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:1317
msgid "Moving messages"
msgstr "正在移动邮件"
+# mail/mail-ops.c:868
+# mail/mail-ops.c:870
+# mail/mail-ops.c:913
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "把邮件复制到 %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+# mail/mail-send-recv.c:533
+# mail/mail-send-recv.c:541
+# mail/mail-send-recv.c:541
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "已取消"
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+# camel/providers/pop3/camel-pop3-store.c:563
+# camel/providers/pop3/camel-pop3-store.c:563
+# camel/providers/pop3/camel-pop3-store.c:563
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "来自 POP 服务器的意外应答: %s"
+
+# tools/evolution-addressbook-import.c:80
+# tools/evolution-addressbook-import.c:80
+# tools/evolution-addressbook-import.c:80
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "没有提供文件名。"
+
+# camel/camel-pgp-context.c:1169
+# camel/camel-pgp-context.c:1169
+# camel/camel-pgp-context.c:1169
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "无法加密该邮件: 没有指明收件人"
+
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# 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: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/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "缓冲邮件 %s 失败: %s"
+
+# 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: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: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/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "缓冲邮件 %s 失败: %s"
+
+# camel/camel-smime-context.c:810
+# camel/camel-smime-context.c:810
+# camel/camel-smime-context.c:810
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "解码邮件失败。"
+
+# camel/camel-pgp-context.c:970
+# camel/camel-pgp-context.c:970
+# camel/camel-pgp-context.c:970
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "无法验证该邮件:无法创建临时文件: %s"
+
# camel/camel-lock-client.c:111
# camel/camel-lock-client.c:111
# camel/camel-lock-client.c:111
@@ -12817,209 +14159,34 @@ msgstr "写入邮件临时文件错误: %s"
msgid "Error copying mail temp file: %s"
msgstr "复制邮件临时文件错误: %s"
-# camel/camel-pgp-context.c:193
-# camel/camel-pgp-context.c:193
-# camel/camel-pgp-context.c:193
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "请为 %2$s 输入您的 %1$s 密码串"
-
-# camel/camel-pgp-context.c:196
-# camel/camel-pgp-context.c:196
-# camel/camel-pgp-context.c:196
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-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
-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
-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
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-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
-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
-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
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-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
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-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
-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
-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
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-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
-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
-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
-msgid "Cannot decrypt this message: no password provided"
-msgstr "无法解密该邮件: 没有提供密码"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
+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
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "无法解密该邮件: 无法创建到 GPG/PGP 的管道: %s"
+# camel/camel-pkcs7-context.c:677
+#: camel/camel-multipart-encrypted.c:325
+#, fuzzy
+msgid "Failed to decrypt MIME part: parse error"
+msgstr "无法解密:未知"
# camel/camel-pgp-mime.c:310
# camel/camel-pgp-mime.c:310
-#: camel/camel-pgp-mime.c:310
+#: camel/camel-multipart-signed.c:624
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 "无法解密:未知"
+# addressbook/gui/widgets/e-addressbook-util.c:41
+# addressbook/gui/widgets/e-addressbook-util.c:41
+# addressbook/gui/widgets/e-addressbook-util.c:41
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+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 +14194,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,84 +14202,11 @@ 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: 模块中没有初始化代码。"
-# camel/camel-remote-store.c:203
-# camel/camel-remote-store.c:203
-# camel/camel-remote-store.c:203
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s server %s"
-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
-#, c-format
-msgid "%s service for %s on %s"
-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
-msgid "Connection cancelled"
-msgstr "连接已取消"
-
-# camel/camel-remote-store.c:267
-# camel/providers/smtp/camel-smtp-transport.c:273
-# camel/camel-remote-store.c:267
-# camel/providers/smtp/camel-smtp-transport.c:273
-# camel/camel-remote-store.c:267
-# camel/providers/smtp/camel-smtp-transport.c:276
-#: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-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
-msgid "(unknown host)"
-msgstr "(未知的主机)"
-
-# 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/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
-msgid "Operation cancelled"
-msgstr "操作已取消"
-
-# camel/camel-remote-store.c:484
-# 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/providers/imap/camel-imap-command.c:274
-#: camel/camel-remote-store.c:484
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "服务器意外地中止了连接: %s"
-
# camel/camel-sasl-anonymous.c:33
# camel/camel-sasl-anonymous.c:33
# camel/camel-sasl-anonymous.c:33
@@ -13277,7 +14371,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:846
msgid "Bad authentication response from server."
msgstr "来自服务器的无效认证应答。"
@@ -13302,20 +14396,23 @@ msgstr "该选项将以普通密码连接到服务器。"
msgid "Unknown authentication state."
msgstr "未知的认证状态。"
-# 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
-# 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
-# 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: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
-msgid "Password"
-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
+msgid "PLAIN"
+msgstr ""
# camel/camel-sasl-popb4smtp.c:34
# camel/camel-sasl-popb4smtp.c:34
@@ -13363,7 +14460,7 @@ msgstr "常规表达式编译失败: %s: %s"
# camel/camel-service.c:157
# camel/camel-service.c:157
# camel/camel-service.c:157
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL “%s” 需要用户名组件"
@@ -13371,7 +14468,7 @@ msgstr "URL “%s” 需要用户名组件"
# camel/camel-service.c:165
# camel/camel-service.c:165
# camel/camel-service.c:165
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL “%s” 需要主机组件"
@@ -13379,7 +14476,7 @@ msgstr "URL “%s” 需要主机组件"
# camel/camel-service.c:173
# camel/camel-service.c:173
# camel/camel-service.c:173
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL “%s” 需要路径组件"
@@ -13387,7 +14484,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:742
#, c-format
msgid "Resolving: %s"
msgstr "正在解析: %s"
@@ -13395,7 +14492,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:773 camel/camel-service.c:884
#, c-format
msgid "Failure in name lookup: %s"
msgstr "域名寻找失败: %s"
@@ -13403,7 +14500,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:798
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr "主机寻找失败: %s: 没有找到主机"
@@ -13411,11 +14508,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:800
#, 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:850
+#, 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:912
+#, 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:915
+#, 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 +14554,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 +14562,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 +14571,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 +14638,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:241
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:303
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 +14662,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 +14680,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:495
#, c-format
msgid ""
"Issuer: %s\n"
@@ -13565,12 +14694,12 @@ msgstr ""
"签名: %s"
# camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:501
msgid "GOOD"
msgstr "好"
# camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:501
msgid "BAD"
msgstr "坏"
@@ -13578,7 +14707,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:504
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -13604,23 +14733,23 @@ msgstr "无法解析 URL “%s”"
# camel/camel-vee-folder.c:588
# camel/camel-vee-folder.c:588
# camel/camel-vee-folder.c:588
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
#, c-format
msgid "No such message %s in %s"
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
-#, c-format
-msgid "No such message: %s"
-msgstr "没有邮件: %s"
+# camel/providers/imap/camel-imap-provider.c:45
+# camel/providers/imap/camel-imap-provider.c:45
+# camel/providers/imap/camel-imap-provider.c:45
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "在所有文件夹中检查新邮件"
# 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 +14757,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 +14765,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,22 +14773,46 @@ 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: 没有该文件夹"
-# camel/camel-vtrash-folder.c:117
-# camel/camel-vtrash-folder.c:117
-# camel/camel-vtrash-folder.c:117
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "您无法从该废件文件夹复制邮件。"
+# 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/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/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "操作已取消"
+
+# camel/camel-remote-store.c:484
+# 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/providers/imap/camel-imap-command.c:274
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "服务器意外地中止了连接: %s"
# camel/providers/imap/camel-imap-command.c:352
# camel/providers/imap/camel-imap-command.c:352
# camel/providers/imap/camel-imap-command.c:352
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:382
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "来自 IMAP 服务器的意外应答: %s"
@@ -13667,7 +14820,7 @@ msgstr "来自 IMAP 服务器的意外应答: %s"
# 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/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
#, c-format
msgid "IMAP command failed: %s"
msgstr "IMAP 命令失败: %s"
@@ -13675,14 +14828,14 @@ msgstr "IMAP 命令失败: %s"
# camel/providers/imap/camel-imap-command.c:417
# camel/providers/imap/camel-imap-command.c:417
# camel/providers/imap/camel-imap-command.c:417
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
msgid "Server response ended too soon."
msgstr "服务器应答结束太快。"
# camel/providers/imap/camel-imap-command.c:608
# camel/providers/imap/camel-imap-command.c:608
# camel/providers/imap/camel-imap-command.c:610
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "IMAP 服务器应答不含有 %s 信息"
@@ -13690,7 +14843,7 @@ msgstr "IMAP 服务器应答不含有 %s 信息"
# camel/providers/imap/camel-imap-command.c:644
# camel/providers/imap/camel-imap-command.c:644
# camel/providers/imap/camel-imap-command.c:646
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr "来自 IMAP 服务器意外的 OK 应答: %s"
@@ -13698,7 +14851,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:215
#, c-format
msgid "Could not create directory %s: %s"
msgstr "无法创建目录 %s: %s"
@@ -13706,7 +14859,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:234
#, c-format
msgid "Could not load summary for %s"
msgstr "无法为 %s 装入概要"
@@ -13714,7 +14867,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:300
msgid "Folder was destroyed and recreated on server."
msgstr "文件夹已被删除并在服务器上重建了。"
@@ -13722,7 +14875,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:525
msgid "Scanning for changed messages"
msgstr "正在扫描改变了的邮件"
@@ -13732,8 +14885,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:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
msgid "This message is not currently available"
msgstr "该邮件目前不可用"
@@ -13743,29 +14896,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:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
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:2005
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:2360
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 +14935,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 +14960,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 "文件夹"
@@ -13853,6 +15006,21 @@ msgstr "IMAP"
msgid "For reading and storing mail on IMAP servers."
msgstr "IMAP 服务器上的邮件的读写。"
+# 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
+# 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
+# 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:60
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "密码"
+
# camel/providers/imap/camel-imap-provider.c:82
# camel/providers/imap/camel-imap-provider.c:82
# camel/providers/imap/camel-imap-provider.c:82
@@ -13860,10 +15028,79 @@ msgstr "IMAP 服务器上的邮件的读写。"
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
+# camel/providers/smtp/camel-smtp-transport.c:554
+# camel/providers/smtp/camel-smtp-transport.c:554
+# camel/providers/smtp/camel-smtp-transport.c:565
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP 服务器 %s"
+
+# camel/camel-remote-store.c:207
+# camel/camel-remote-store.c:207
+# camel/camel-remote-store.c:207
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s 为 %s 服务,在 %s"
+
+# camel/camel-remote-store.c:264
+# camel/camel-remote-store.c:264
+# camel/camel-remote-store.c:264
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "连接已取消"
+
+# camel/camel-remote-store.c:267
+# camel/providers/smtp/camel-smtp-transport.c:273
+# camel/camel-remote-store.c:267
+# camel/providers/smtp/camel-smtp-transport.c:273
+# camel/camel-remote-store.c:267
+# camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "无法连接到 %s (端口 %d): %s"
+
+# camel/providers/pop3/camel-pop3-store.c:377
+# camel/providers/pop3/camel-pop3-store.c:377
+# camel/providers/pop3/camel-pop3-store.c:377
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP 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/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, 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/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "认证失败。"
+
# camel/providers/imap/camel-imap-store.c:518
# camel/providers/imap/camel-imap-store.c:518
# camel/providers/imap/camel-imap-store.c:518
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:869
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
@@ -13874,8 +15111,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:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
#, c-format
msgid "No support for authentication type %s"
msgstr "不支持验证类型 %s"
@@ -13883,7 +15120,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:903
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%s请为 %s@%s 输入 IMAP 密码"
@@ -13894,15 +15131,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:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
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:947
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -13916,7 +15153,8 @@ 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:1269
+#: camel/providers/imap/camel-imap-store.c:1388
#, c-format
msgid "No such folder %s"
msgstr "没有文件夹 %s"
@@ -13924,71 +15162,115 @@ 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:1656
msgid "The parent folder is not allowed to contain subfolders"
msgstr "父文件夹不允许含有子文件夹"
+# shell/e-shell-view.c:1585
+# shell/e-shell-view.c:1585
+# shell/e-shell-view.c:1598
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+# 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-mbox-folder.c:208
+# camel/providers/local/camel-spool-folder.c:456
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "无法打开邮件箱: %s: %s\n"
+
+# shell/e-shell-view.c:1585
+# shell/e-shell-view.c:1585
+# shell/e-shell-view.c:1598
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+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:49
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:50
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:65
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:66
msgid "For retrieving local mail from standard mbox formated spools."
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:77
+#: 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:83
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:84
msgid "For storing local mail in maildir directories."
msgstr "在 maildir 邮件目录中存储本地邮件。"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
+
# 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
-msgid "Standard Unix mbox spools"
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
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
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
+msgid ""
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
msgstr "在标准邮件箱文件中读取和存储本地邮件。"
# camel/providers/local/camel-local-store.c:138
@@ -14000,9 +15282,9 @@ 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-spool-store.c:109
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-spool-store.c:110
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "存储根目录 %s 不是绝对路径"
@@ -14010,7 +15292,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 +15306,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 +15316,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 +15331,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:908
#, 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 +15355,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 +15363,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:406
#, c-format
msgid "Could not save summary: %s: %s"
msgstr "无法保存概要: %s: %s"
@@ -14084,22 +15374,21 @@ 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:462
msgid "Unable to add message to summary: unknown reason"
msgstr "无法将邮件添加到概要中: 未知的原因"
# camel/providers/local/camel-maildir-folder.c:181
# camel/providers/local/camel-maildir-folder.c:181
# camel/providers/local/camel-maildir-folder.c:181
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
msgid "Maildir append message cancelled"
msgstr "邮件目录附加已放弃"
# camel/providers/local/camel-maildir-folder.c:184
# camel/providers/local/camel-maildir-folder.c:184
# camel/providers/local/camel-maildir-folder.c:184
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
#, c-format
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "无法将邮件附加到邮件目录文件夹: %s: %s"
@@ -14128,14 +15417,13 @@ msgstr "无法将邮件附加到邮件目录文件夹: %s: %s"
# 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/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -14156,10 +15444,9 @@ msgstr ""
# 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-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-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
msgid "No such message"
msgstr "没有该邮件"
@@ -14169,8 +15456,8 @@ msgstr "没有该邮件"
# camel/providers/local/camel-mh-folder.c:216
# camel/providers/local/camel-maildir-folder.c:231
# camel/providers/local/camel-mh-folder.c:216
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
msgid "Invalid message contents"
msgstr "无效的邮件内容"
@@ -14180,8 +15467,8 @@ 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-mh-store.c:89
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mh-store.c:202
#, c-format
msgid ""
"Could not open folder `%s':\n"
@@ -14199,9 +15486,9 @@ 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-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mh-store.c:209
#, c-format
msgid "Folder `%s' does not exist."
msgstr "文件夹“%s”不存在。"
@@ -14212,8 +15499,8 @@ 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-mh-store.c:102
+#: camel/providers/local/camel-maildir-store.c:117
+#: camel/providers/local/camel-mh-store.c:216
#, c-format
msgid ""
"Could not create folder `%s':\n"
@@ -14225,7 +15512,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,9 +15526,9 @@ 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-mh-store.c:126
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-mh-store.c:252
#, c-format
msgid "Could not delete folder `%s': %s"
msgstr "无法删除文件夹“%s”: %s"
@@ -14249,14 +15536,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:335
+#: camel/providers/local/camel-spool-store.c:252
#, c-format
msgid "Could not scan folder `%s': %s"
msgstr "无法扫描文件夹“%s”: %s"
@@ -14267,20 +15555,62 @@ 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
+#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
+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
# 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-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr "无法在 %s 创建文件夹锁: %s"
@@ -14291,8 +15621,7 @@ msgstr "无法在 %s 创建文件夹锁: %s"
# 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-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:456
+#: camel/providers/local/camel-mbox-folder.c:215
#, c-format
msgid "Cannot open mailbox: %s: %s\n"
msgstr "无法打开邮件箱: %s: %s\n"
@@ -14300,14 +15629,14 @@ msgstr "无法打开邮件箱: %s: %s\n"
# camel/providers/local/camel-mbox-folder.c:265
# camel/providers/local/camel-mbox-folder.c:265
# camel/providers/local/camel-mbox-folder.c:265
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
msgid "Mail append cancelled"
msgstr "邮件附加取消"
# camel/providers/local/camel-mbox-folder.c:268
# camel/providers/local/camel-mbox-folder.c:268
# camel/providers/local/camel-mbox-folder.c:268
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
#, c-format
msgid "Cannot append message to mbox file: %s: %s"
msgstr "无法将邮件附加到邮件箱文件: %s: %s"
@@ -14330,12 +15659,9 @@ msgstr "无法将邮件附加到邮件箱文件: %s: %s"
# camel/providers/local/camel-spool-folder.c:595
# camel/providers/local/camel-spool-folder.c:627
# camel/providers/local/camel-spool-folder.c:639
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
#, c-format
msgid ""
"Cannot get message: %s from folder %s\n"
@@ -14350,8 +15676,7 @@ msgstr ""
# 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-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-mbox-folder.c:398
msgid "The folder appears to be irrecoverably corrupted."
msgstr "文件夹好像已经被不可恢复地破坏了。"
@@ -14361,15 +15686,14 @@ msgstr "文件夹好像已经被不可恢复地破坏了。"
# 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-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-mbox-folder.c:406
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 +15705,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 +15720,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 +15732,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 +15745,18 @@ 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:350
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "无法打开文件夹: %s: %s"
@@ -14473,8 +15767,7 @@ 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:398
#, c-format
msgid "Fatal mail parser error near position %ld in folder %s"
msgstr "在文件夹 %2$s 中邻近 %1$ld 的位置出现致命的解析错误"
@@ -14485,8 +15778,7 @@ msgstr "在文件夹 %2$s 中邻近 %1$ld 的位置出现致命的解析错误"
# camel/providers/local/camel-spool-summary.c:497
# camel/providers/local/camel-mbox-summary.c:370
# camel/providers/local/camel-spool-summary.c:497
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:452
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "无法检查文件夹: %s: %s"
@@ -14500,9 +15792,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:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
#, c-format
msgid "Could not open file: %s: %s"
msgstr "无法打开文件: %s: %s"
@@ -14513,12 +15805,43 @@ 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:599
+#: camel/providers/local/camel-spool-summary.c:169
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "无法打开临时邮件箱: %s"
+# camel/providers/local/camel-mbox-summary.c:630
+# camel/providers/local/camel-mbox-summary.c:799
+# camel/providers/local/camel-spool-summary.c:1036
+# camel/providers/local/camel-mbox-summary.c: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:611
+#: camel/providers/local/camel-mbox-summary.c:773
+#, c-format
+msgid "Could not close source folder %s: %s"
+msgstr "无法关闭来源文件夹 %s: %s"
+
+# camel/providers/local/camel-mbox-summary.c:639
+# camel/providers/local/camel-mbox-summary.c:639
+# camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:620
+#, c-format
+msgid "Could not close temp folder: %s"
+msgstr "无法关闭临时文件夹: %s"
+
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:631
+#, c-format
+msgid "Could not rename folder: %s"
+msgstr "无法重命名文件夹: %s"
+
# camel/providers/local/camel-mbox-summary.c:544
# camel/providers/local/camel-mbox-summary.c:552
# camel/providers/local/camel-mbox-summary.c:741
@@ -14543,25 +15866,43 @@ 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:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
msgid "Summary and folder mismatch, even after a sync"
msgstr "即使同步后,概要和文件夹仍然不匹配"
+# camel/providers/local/camel-mbox-summary.c:873
+# camel/providers/local/camel-spool-summary.c:544
+# camel/providers/local/camel-spool-summary.c:1110
+# camel/providers/local/camel-mbox-summary.c: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:847
+#: camel/providers/local/camel-spool-summary.c:332
+#, c-format
+msgid "Unknown error: %s"
+msgstr "未知的错误: %s"
+
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "无法重命名文件夹: %s"
+
# 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: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:973
#, c-format
msgid "Error writing to temp mailbox: %s"
msgstr "写入临时文件夹错误: %s"
@@ -14572,71 +15913,22 @@ 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:990
#, c-format
msgid "Writing to tmp mailbox failed: %s: %s"
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: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
-#, c-format
-msgid "Could not close source folder %s: %s"
-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
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "无法关闭临时文件夹: %s"
-
-# camel/providers/local/camel-mbox-summary.c:650
-# camel/providers/local/camel-mbox-summary.c:650
-# camel/providers/local/camel-mbox-summary.c:650
-#: camel/providers/local/camel-mbox-summary.c:650
-#, c-format
-msgid "Could not rename folder: %s"
-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: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
-#, c-format
-msgid "Unknown error: %s"
-msgstr "未知的错误: %s"
-
# camel/providers/local/camel-mh-folder.c:172
# camel/providers/local/camel-mh-folder.c:172
# camel/providers/local/camel-mh-folder.c:172
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mh-folder.c:175
msgid "MH append message cancelled"
msgstr "已取消 MH 附件邮件"
# camel/providers/local/camel-mh-folder.c:175
# camel/providers/local/camel-mh-folder.c:175
# camel/providers/local/camel-mh-folder.c:175
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
#, c-format
msgid "Cannot append message to mh folder: %s: %s"
msgstr "无法将邮件附加到 mh 文件夹: %s: %s"
@@ -14644,7 +15936,7 @@ msgstr "无法将邮件附加到 mh 文件夹: %s: %s"
# camel/providers/local/camel-mh-store.c:109
# camel/providers/local/camel-mh-store.c:109
# camel/providers/local/camel-mh-store.c:109
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
#, c-format
msgid "`%s' is not a directory."
msgstr "“%s”不是目录"
@@ -14652,39 +15944,43 @@ 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:243
#, c-format
msgid "Cannot open MH directory path: %s: %s"
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
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "无法将邮件附加到脱机文件: %s: %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:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+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-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-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-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+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-spool-store.c:141
+#: camel/providers/local/camel-spool-store.c:145
#, c-format
msgid "Folder `%s/%s' does not exist."
msgstr "文件夹“%s/%s”不存在。"
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
# camel/providers/local/camel-spool-store.c:163
# camel/providers/local/camel-spool-store.c:163
# camel/providers/local/camel-spool-store.c:163
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:174
#, c-format
msgid "Spool mail file %s"
msgstr "脱机邮件文件 %s"
@@ -14692,14 +15988,22 @@ 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:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "脱机文件夹无法改名"
+
+# 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:182
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:190
msgid "Spool folders cannot be deleted"
msgstr "脱机文件夹无法删除"
@@ -14712,9 +16016,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:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
#, c-format
msgid "Could not sync temporary folder %s: %s"
msgstr "无法同步临时文件夹 %s: %s"
@@ -14722,7 +16026,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:214
#, c-format
msgid "Could not sync spool folder %s: %s"
msgstr "无法同步脱机文件夹 %s: %s"
@@ -14736,9 +16040,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:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
#, c-format
msgid ""
"Could not sync spool folder %s: %s\n"
@@ -14747,121 +16051,6 @@ msgstr ""
"无法同步脱机文件夹 %s: %s\n"
"文件夹可能已损坏,副本保存在“%s”"
-# 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
-#, 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/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/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"
-
# camel/providers/nntp/camel-nntp-provider.c:41
# camel/providers/nntp/camel-nntp-provider.c:41
# camel/providers/nntp/camel-nntp-provider.c:41
@@ -14876,10 +16065,23 @@ msgstr "USENET 新闻"
msgid "This is a provider for reading from and posting toUSENET newsgroups."
msgstr "这是一个从 USENET 新闻组和向 USENET 新闻组发布消息的提供者。"
+# 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/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "无法创建目录 %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
# 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:262
#, c-format
msgid "USENET News via %s"
msgstr "USENET 新闻 %s"
@@ -14887,7 +16089,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:269
msgid ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
@@ -14963,10 +16165,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 +16203,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 +16211,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 +16228,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 +16291,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:86
msgid "POP"
msgstr "POP"
@@ -15081,19 +16325,31 @@ msgstr ""
"该选项使 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:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
+#, fuzzy, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
+msgstr ""
+"无法连接到 POP 服务器。\n"
+"发送用户名错误: %s"
+
# 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:351
+#, 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:392
+#: camel/providers/pop3/camel-pop3-store.c:495
msgid ""
"Unable to connect to POP server.\n"
"No support for requested authentication mechanism."
@@ -15104,19 +16360,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:408
#, 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:419
msgid "SASL Protocol error"
msgstr "SASL 协议错误"
# shell/e-storage.c:506
# shell/e-storage.c:506
# shell/e-storage.c:506
-#: camel/providers/pop3/camel-pop3-store.c:255
+#: camel/providers/pop3/camel-pop3-store.c:434
#, c-format
msgid "I/O Error: %s"
msgstr "输入输出错误:%s"
@@ -15124,7 +16380,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:455
#, c-format
msgid "%sPlease enter the POP password for %s@%s"
msgstr "%s请为 %s@%s 输入 POP 密码"
@@ -15132,7 +16388,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:507
+#: camel/providers/pop3/camel-pop3-store.c:511
#, c-format
msgid ""
"Unable to connect to POP server.\n"
@@ -15144,7 +16401,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:604
#, c-format
msgid "No such folder `%s'."
msgstr "没有文件夹“%s”。"
@@ -15156,7 +16413,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:111
msgid "Sendmail"
msgstr "Sendmail"
@@ -15169,10 +16426,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 +16444,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 +16452,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 +16460,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 +16468,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 +16476,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,198 +16512,233 @@ 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:302
#, 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:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
+#, 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:338
+#, fuzzy
+msgid "server does not appear to support SSL"
+msgstr "邮件的格式可能不正确"
+
+# camel/providers/smtp/camel-smtp-transport.c:1091
+# camel/providers/smtp/camel-smtp-transport.c:1091
+# camel/providers/smtp/camel-smtp-transport.c:1199
+#: camel/providers/smtp/camel-smtp-transport.c:352
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "RSET 请求超时: %s"
+
+# camel/providers/smtp/camel-smtp-transport.c:1110
+# camel/providers/smtp/camel-smtp-transport.c:1110
+# camel/providers/smtp/camel-smtp-transport.c:1104
+#: camel/providers/smtp/camel-smtp-transport.c:367
+#, 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
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
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:499
#, c-format
msgid "%sPlease enter the SMTP password for %s@%s"
msgstr "%s请为 %s@%s 输入 SMTP 密码"
@@ -15461,7 +16746,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:520
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -15475,7 +16760,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:645
#, c-format
msgid "SMTP server %s"
msgstr "SMTP 服务器 %s"
@@ -15483,57 +16768,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:647
#, 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:665
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:670 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:681
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:691
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:841
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:872
#, c-format
msgid "HELO request timed out: %s: non-fatal"
msgstr "HELLO 请求超时: %s: 非致命"
@@ -15541,7 +16819,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:892
#, c-format
msgid "HELO response error: %s: non-fatal"
msgstr "HELLO 应答错误: %s: 非致命"
@@ -15549,14 +16827,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:940
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:946
msgid "Error creating SASL authentication object."
msgstr "创建 SASL 认证对象错误。"
@@ -15566,8 +16844,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:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
#, c-format
msgid "AUTH request timed out: %s"
msgstr "AUTH 请求超时: %s"
@@ -15575,21 +16853,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:984
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:1045
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:1070
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr "MAIL FROM 请求超时: %s: 邮件未发送"
@@ -15597,20 +16875,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:1084
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:1108
#, 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:1124
#, c-format
msgid "RCPT TO <%s> failed"
msgstr "RCPT TO <%s> 失败"
@@ -15618,7 +16896,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:1160
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr "DATA 请求超时: %s: 邮件未发送"
@@ -15629,7 +16907,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:1174
msgid "DATA response error"
msgstr "DATA 应答错误"
@@ -15639,8 +16917,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:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr "DATA 发送超时: 消息终止: %s: 邮件未发送"
@@ -15650,14 +16928,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:1246
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:1269
#, c-format
msgid "RSET request timed out: %s"
msgstr "RSET 请求超时: %s"
@@ -15665,14 +16943,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:1283
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:1306
#, c-format
msgid "QUIT request timed out: %s: non-fatal"
msgstr "QUIT 请求超时: %s: 非致命"
@@ -15680,7 +16958,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:1320
msgid "QUIT response error"
msgstr "QUIT 应答错误"
@@ -15727,7 +17005,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 +17078,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:340
msgid "Click here for the address book"
msgstr "点击此处以使用地址簿"
@@ -15817,7 +17095,7 @@ msgstr "点击此处以使用地址簿"
#.
#. * From:
#.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:370
msgid "From:"
msgstr "发件人:"
@@ -15827,7 +17105,7 @@ msgstr "发件人:"
#.
#. * Reply-To:
#.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:376
msgid "Reply-To:"
msgstr "回复到:"
@@ -15837,49 +17115,49 @@ msgstr "回复到:"
#.
#. * Subject:
#.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:387
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:401
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:402
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:405
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:406
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:409
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:410
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -15891,15 +17169,23 @@ 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 "附件一个文件"
+# mail/mail-crypto.c:59
+# mail/mail-crypto.c:59
+# mail/mail-crypto.c:59
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "无法创建 PGP 签名上下文。"
+
# composer/e-msg-composer.c:743
# composer/e-msg-composer.c:747
# composer/e-msg-composer.c:695
-#: composer/e-msg-composer.c:697
+#: composer/e-msg-composer.c:774
#, c-format
msgid ""
"Error while reading file %s:\n"
@@ -15908,31 +17194,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:1026
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:1030
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:1052
#, c-format
msgid "Error saving file: %s"
msgstr "保存文件错误: %s"
@@ -15940,7 +17219,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:1071
#, c-format
msgid "Error loading file: %s"
msgstr "读入文件错误: %s"
@@ -15948,7 +17227,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:1102
#, c-format
msgid "Error accessing file: %s"
msgstr "访问文件错误: %s"
@@ -15956,14 +17235,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:1110
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:1117
#, c-format
msgid ""
"Unable to seek on file: %s\n"
@@ -15975,7 +17254,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:1124
#, c-format
msgid ""
"Unable to truncate file: %s\n"
@@ -15987,7 +17266,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:1133
#, c-format
msgid ""
"Error autosaving message: %s\n"
@@ -15999,7 +17278,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:1235
msgid ""
"Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"
@@ -16010,7 +17289,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:1381
msgid ""
"This message has not been sent.\n"
"\n"
@@ -16023,35 +17302,61 @@ 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:1388
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:1420
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:1569
msgid "Insert File"
msgstr "插入文件"
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "签名文件:"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+# mail/mail-accounts.c:149
+# mail/mail-accounts.c:149
+# mail/mail-accounts.c:149
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+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:2129 composer/e-msg-composer.c:2742
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:2759
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
@@ -16062,7 +17367,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:2785 composer/e-msg-composer.c:2840
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
@@ -16070,10 +17375,16 @@ msgstr ""
"无法创见撰写窗口:\n"
"无法激活 HTML 编辑器组件。"
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+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 +17395,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 +17483,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:2295
+#: 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 +17664,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:190
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 +17718,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 +17726,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 +17736,87 @@ 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:1103
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
+# addressbook/printing/e-contact-print.glade.h:38
+# addressbook/printing/e-contact-print.glade.h:38
+# mail/mail-config.glade.h:92
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "指定文件名:"
+
+# camel/providers/local/camel-spool-store.c:115
+# camel/providers/local/camel-spool-store.c:115
+# camel/providers/local/camel-spool-store.c:115
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "脱机文件“%s”不存在或不是普通文件"
+
+# ui/evolution-message-composer.xml.h:14
+# ui/evolution-message-composer.xml.h:14
+# ui/evolution-message-composer.xml.h:14
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "打开文件"
+
#. 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 +17826,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:1443 mail/mail-account-gui.c:1457
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 +17841,364 @@ 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-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
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
+#: filter/filter-rule.c:769
msgid "if any criteria 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 "伯利兹"
+
+# addressbook/backend/ebook/e-card-simple.c:67
+# addressbook/gui/contact-editor/e-contact-editor.c:1650
+# addressbook/backend/ebook/e-card-simple.c:67
+# addressbook/gui/contact-editor/e-contact-editor.c:1650
+# addressbook/backend/ebook/e-card-simple.c:67
+# addressbook/gui/contact-editor/e-contact-editor.c:1650
+#: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "公司"
+
+#: filter/libfilter-i18n.h:8
msgid "contains"
msgstr "含有"
-# filter/libfilter-i18n.h:6
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
msgid "Copy to Folder"
msgstr "复制到文件夹"
-# filter/libfilter-i18n.h:7
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
msgid "Date received"
msgstr "接收日期"
-# filter/libfilter-i18n.h:8
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:11
msgid "Date sent"
msgstr "发送日期"
-# filter/libfilter-i18n.h:10
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
msgid "Deleted"
msgstr "已删除"
-# filter/libfilter-i18n.h:11
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:14
msgid "does not contain"
msgstr "不含有"
-# filter/libfilter-i18n.h:12
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:15
msgid "does not end with"
msgstr "不以之结尾"
-# filter/libfilter-i18n.h:13
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:16
msgid "does not exist"
msgstr "不存在"
-# filter/libfilter-i18n.h:14
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:17
msgid "does not sound like"
msgstr "听起来不像"
-# filter/libfilter-i18n.h:15
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:18
msgid "does not start with"
msgstr "不以之开始"
-# filter/libfilter-i18n.h:16
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:19
msgid "Do Not Exist"
msgstr "不存在"
-# filter/libfilter-i18n.h:17
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:20
msgid "Draft"
msgstr "草稿"
-# filter/libfilter-i18n.h:18
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:21
msgid "ends with"
msgstr "以之结束"
-# filter/libfilter-i18n.h:19
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:22
msgid "Execute Shell Command"
msgstr "执行 Shell 命令"
-# filter/libfilter-i18n.h:20
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:23
msgid "Exist"
msgstr "存在"
-# filter/libfilter-i18n.h:21
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:24
msgid "exists"
msgstr "存在"
-# filter/libfilter-i18n.h:22
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:25
msgid "Expression"
msgstr "表达式"
-# filter/libfilter-i18n.h:23
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:26
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
msgid "Important"
msgstr "重要"
-# filter/libfilter-i18n.h:24
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:28
msgid "is"
msgstr "是"
-# filter/libfilter-i18n.h:25
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:29
msgid "is after"
msgstr "以后"
-# filter/libfilter-i18n.h:26
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:30
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:31
+#, fuzzy
+msgid "is Flagged"
+msgstr "已标志"
+
+#: filter/libfilter-i18n.h:32
msgid "is greater than"
msgstr "大于"
-# filter/libfilter-i18n.h:28
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:33
msgid "is less than"
msgstr "小于"
-# filter/libfilter-i18n.h:29
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:34
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:35
+#, fuzzy
+msgid "is not Flagged"
+msgstr "已标志"
+
+# ui/evolution-mail-message.xml.h:98
+# ui/evolution-mail-message.xml.h:98
+# my-evolution/Locations.h:1192
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "劳雷尔"
+
+#: filter/libfilter-i18n.h:37
msgid "Mailing list"
msgstr "邮件列表"
-# filter/libfilter-i18n.h:31
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:38
msgid "Message Body"
msgstr "邮件体"
-# filter/libfilter-i18n.h:32
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:39
msgid "Message Header"
msgstr "邮件头"
-# filter/libfilter-i18n.h:33
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:40
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:41
+#, fuzzy
+msgid "Play Sound"
+msgstr "播放声音:"
-# filter/libfilter-i18n.h:35
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
msgid "Read"
msgstr "已读"
-# filter/libfilter-i18n.h:36
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:43
msgid "Recipients"
msgstr "收件人"
-# filter/libfilter-i18n.h:37
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:44
msgid "Regex Match"
msgstr "常规表达式匹配"
-# filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:45
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:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
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:47 mail/mail-callbacks.c:1600
msgid "Sender"
msgstr "发件人"
-# filter/libfilter-i18n.h:41
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:48
msgid "Set Status"
msgstr "设置状态"
-# filter/libfilter-i18n.h:42
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:49
msgid "Size (kB)"
msgstr "大小 (kB)"
-# filter/libfilter-i18n.h:43
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:50
msgid "sounds like"
msgstr "听起来象"
-# filter/libfilter-i18n.h:44
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:51
msgid "Source Account"
msgstr "来源帐号"
-# filter/libfilter-i18n.h:45
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:52
msgid "Specific header"
msgstr "指定邮件头"
-# filter/libfilter-i18n.h:46
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:53
msgid "starts with"
msgstr "以之开始"
-# filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:55
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:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
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 +18216,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 +18227,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 +18238,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 +18250,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 +18262,9 @@ msgstr "正在扫描 %s"
# importers/pine-importer.c:637 mail/component-factory.c:100
# importers/elm-importer.c:525 importers/netscape-importer.c:958
# importers/pine-importer.c:637 mail/component-factory.c:100
-#: importers/elm-importer.c:525 importers/netscape-importer.c: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:102
+#: mail/folder-browser-ui.c:229
msgid "Mail"
msgstr "邮件"
@@ -17251,13 +18286,6 @@ msgstr ""
msgid "Elm"
msgstr "Elm"
-# importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-# importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-# importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "地址簿"
-
# importers/evolution-gnomecard-importer.c:246
# importers/evolution-gnomecard-importer.c:246
# importers/evolution-gnomecard-importer.c:246
@@ -17269,38 +18297,100 @@ 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
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
+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,174 +18423,258 @@ 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:102
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
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
msgid "Virtual Trash"
msgstr "虚拟已删除邮件箱"
# mail/component-factory.c:102
# mail/component-factory.c:102
# mail/component-factory.c:102
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
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:119
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:404
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:404
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:767
msgid ""
"Some of your mail settings seem corrupt, please check that everything is in "
"order."
msgstr "您的某些邮件设置好像已崩溃,请按顺序检查所有内容。"
+# mail/mail-callbacks.c:230
+# mail/mail-callbacks.c:230
+# mail/mail-callbacks.c:187
+#: mail/component-factory.c:929
+msgid "You have not set a mail transport method"
+msgstr "您还没有设置邮件传输方法"
+
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+# composer/e-msg-composer.c:1412
+# composer/e-msg-composer.c:1329
+# composer/e-msg-composer.c:1295
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+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:998
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:998 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "邮件(_M)"
# mail/component-factory.c:975
# mail/component-factory.c:975
# mail/component-factory.c:980
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
msgid "Cannot initialize Evolution's mail component."
msgstr "无法初始化 Evolution 的邮件组件。"
# mail/component-factory.c:984
# mail/component-factory.c:984
# mail/component-factory.c:989
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
msgid "Cannot initialize Evolution's mail config component."
msgstr "无法初始化 Evolution 的邮件配置组件。"
# mail/component-factory.c:990
# mail/component-factory.c:990
# mail/component-factory.c:995
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
msgid "Cannot initialize Evolution's folder info component."
msgstr "无法初始化 Evolution 的文件夹信息组件。"
+# mail/mail-config.c:2184 mail/mail-config.c:2188
+# mail/mail-config.c:2233 mail/mail-config.c:2237
+# mail/mail-config.c:2326 mail/mail-config.c:2330
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#, 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:1277
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:344
#, c-format
msgid "Properties for \"%s\""
msgstr "“%s”的属性"
@@ -17508,14 +18682,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:346
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:308 mail/mail-display.c:334 mail/mail-display.c:840
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "无法创建临时目录: %s"
@@ -17523,7 +18697,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:763
#, c-format
msgid "%d new"
msgstr "%d 新"
@@ -17534,21 +18708,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:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
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:768
#, c-format
msgid "%d hidden"
msgstr "隐藏 %d 个"
# mail/folder-browser.c:759
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:770
#, c-format
msgid "%d visible"
msgstr "%d 个可见"
@@ -17556,7 +18730,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:775
#, c-format
msgid "%d selected"
msgstr "选择 %d 个"
@@ -17564,7 +18738,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:780
#, c-format
msgid "%d unsent"
msgstr "%d 个未发送"
@@ -17572,7 +18746,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:782
#, c-format
msgid "%d sent"
msgstr "%d 个已发送"
@@ -17580,248 +18754,260 @@ 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:784
#, 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:1091
+#, 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:1649
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:1650
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:1651
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:1652
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:1656
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:1657
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:1658
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:1659 mail/folder-browser.c:1989
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:1677 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:1679
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:1683 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:1684 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:1685 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:1686
msgid "_Forward"
msgstr "转发(_F)"
+#: mail/folder-browser.c:1690
+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:1691
+#, 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:1692
+#, 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:1696 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:1697
+#, 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:1698
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"
-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 "标记为需要回复"
+# ui/evolution-mail-message.xml.h:46
+# ui/evolution-mail-message.xml.h:46
+# ui/evolution-mail-message.xml.h:46
+#: mail/folder-browser.c:1699
+#, fuzzy
+msgid "_Mark as Unimportant"
+msgstr "标记为不重要(_O)"
-# 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:1704
+#, 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:1708
+#, 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:1709 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)"
-
# 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:1717
+#, 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:1721
+#, 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"
+#: mail/folder-browser.c:1725
+#, fuzzy
+msgid "Crea_te Rule 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 "过滤邮件列表"
-
# 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:1990
+#, 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:1992
+#, 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:1993
+#, 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
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
msgid "Default"
msgstr "默认"
# mail/folder-info.c:64
# mail/folder-info.c:64
# mail/folder-info.c:64
-#: mail/folder-info.c:64
+#: mail/folder-info.c:71
msgid "Getting Folder Information"
msgstr "获取文件夹信息"
@@ -17853,45 +19039,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,28 +19077,28 @@ 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"
# mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
# mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
# mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
msgid "You have not filled in all of the required information."
msgstr "您还没有填写所有必须的信息。"
@@ -17941,105 +19114,114 @@ msgstr "Evolution 新闻编辑器"
# mail/mail-account-editor.c:160
# mail/mail-account-editor.c:160
#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
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:741 mail/mail-config.glade.h:163
+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:745 mail/mail-config.glade.h:133
+#, 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
-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:112
+# mail/mail-config.glade.h:112
+# mail/mail-config.glade.h:121
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+msgid "_Path:"
+msgstr "路径(_P):"
# mail/mail-account-gui.c:1654
# mail/mail-account-gui.c:1654
# mail/mail-account-gui.c:1665
-#: mail/mail-account-gui.c:1665
+#: mail/mail-account-gui.c:1818
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:215
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:219
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:222
msgid "Really delete account?"
msgstr "确实删除帐号?"
+# mail/mail-accounts.c:194
+# mail/mail-accounts.c:194
+# mail/mail-accounts.c:194
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
+msgid "Disable"
+msgstr "禁用"
+
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
+msgid "Enable"
+msgstr "启用"
+
# mail/mail-accounts.c:532 mail/mail-accounts.c:536
# mail/mail-accounts.c:532 mail/mail-accounts.c:536
# mail/mail-accounts.c:532 mail/mail-accounts.c:536
-#: mail/mail-accounts.c:531 mail/mail-accounts.c:535
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
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-config.glade.h:33
+# mail/mail-config.glade.h:33
+# mail/mail-config.glade.h:39
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
+msgid "Enabled"
+msgstr "已启用"
+
+# addressbook/gui/component/addressbook-config.glade.h:23
+# addressbook/gui/component/addressbook-config.glade.h:23
+# addressbook/gui/component/addressbook-config.glade.h:30
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "帐号名(_A):"
+
+# 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:739 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "波多黎各"
# mail/mail-autofilter.c:72
# mail/mail-autofilter.c:72
# mail/mail-autofilter.c:72
-#: mail/mail-autofilter.c:72
+#: mail/mail-autofilter.c:78
#, c-format
msgid "Mail to %s"
msgstr "邮寄给 %s"
@@ -18047,7 +19229,7 @@ msgstr "邮寄给 %s"
# mail/mail-autofilter.c:215
# mail/mail-autofilter.c:217
# mail/mail-autofilter.c:217
-#: mail/mail-autofilter.c:217
+#: mail/mail-autofilter.c:223
#, c-format
msgid "Subject is %s"
msgstr "主题是 %s"
@@ -18055,7 +19237,7 @@ msgstr "主题是 %s"
# mail/mail-autofilter.c:231
# mail/mail-autofilter.c:233
# mail/mail-autofilter.c:233
-#: mail/mail-autofilter.c:233
+#: mail/mail-autofilter.c:239
#, c-format
msgid "Mail from %s"
msgstr "邮件来自 %s"
@@ -18063,7 +19245,7 @@ msgstr "邮件来自 %s"
# mail/mail-autofilter.c:287
# mail/mail-autofilter.c:289
# mail/mail-autofilter.c:289
-#: mail/mail-autofilter.c:289
+#: mail/mail-autofilter.c:295
#, c-format
msgid "%s mailing list"
msgstr "%s 邮件列表"
@@ -18071,14 +19253,26 @@ msgstr "%s 邮件列表"
# mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
# mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
# mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
msgid "Add Filter Rule"
msgstr "添加过滤规则"
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+" '%s'\n"
+"And have been updated."
+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:95
msgid ""
"You have not configured the mail client.\n"
"You need to do this before you can send,\n"
@@ -18093,7 +19287,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:144
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
@@ -18104,7 +19298,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:158
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
@@ -18112,18 +19306,11 @@ 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:196
msgid ""
"You are sending an HTML-formatted message, but the following recipients do "
"not want HTML-formatted mail:\n"
@@ -18132,14 +19319,14 @@ msgstr "您正在发送 HTML 格式的消息,当以下收件人不希望接收
# mail/mail-callbacks.c:280
# mail/mail-callbacks.c:280
# mail/mail-callbacks.c:237
-#: mail/mail-callbacks.c:237
+#: mail/mail-callbacks.c:211
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:253
msgid ""
"This message has no subject.\n"
"Really send?"
@@ -18150,7 +19337,7 @@ 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:297
msgid ""
"Since the contact list you are sending to is configured to hide the list's "
"addresses, this message will contain only Bcc recipients."
@@ -18161,14 +19348,14 @@ 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:301
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:305
msgid ""
"It is possible that the mail server may reveal the recipients by adding an "
"Apparently-To header.\n"
@@ -18180,14 +19367,14 @@ 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:417
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:499
msgid "You must configure an account before you can send this email."
msgstr "在您能够发送该邮件之前您必须配置一个帐号。"
@@ -18205,35 +19392,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:1025
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:1029
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:1481 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:1483 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:2139
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr "您确信您需要编辑所有的 %d 个消息?"
@@ -18241,7 +19428,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:2164
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -18252,7 +19439,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:2203
msgid ""
"You may only resend messages\n"
"in the Sent folder."
@@ -18263,7 +19450,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:2217
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr "您确信您希望重新发送所有的 %d 个消息?"
@@ -18271,28 +19458,52 @@ 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:2243
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:2288 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:2342
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:2344
msgid "Save Messages As..."
msgstr "消息另存为..."
+# ui/evolution-mail-message.xml.h:21
+# ui/evolution-mail-message.xml.h:21
+# ui/evolution-mail-message.xml.h:21
+#: mail/mail-callbacks.c:2415
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "显示下一个未读文件"
+
+#: mail/mail-callbacks.c:2422
+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:2665
msgid ""
"This operation will permanently erase all messages marked as deleted. If you "
"continue, you will not be able to recover these messages.\n"
@@ -18307,7 +19518,7 @@ msgstr ""
# mail/mail-callbacks.c:2250
# mail/mail-callbacks.c:2369
# mail/mail-callbacks.c:2405
-#: mail/mail-callbacks.c:2419
+#: mail/mail-callbacks.c:2778
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -18319,14 +19530,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:2790
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:2833
#, c-format
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
@@ -18334,31 +19545,79 @@ 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:2886
msgid "Print Message"
msgstr "打印消息"
# mail/mail-callbacks.c:2492
# mail/mail-callbacks.c:2569
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2913
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:2952
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:3139 mail/mail-callbacks.c:3179
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr "您确信您希望在单独的窗口中打开所有的 %d 个消息?"
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+# mail/mail-config.glade.h:119
+# mail/mail-config.glade.h:119
+# my-evolution/e-summary-calendar.c:395
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "无描述"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+# addressbook/gui/component/select-names/e-select-names-popup.c:506
+# addressbook/gui/component/select-names/e-select-names-popup.c:506
+# addressbook/gui/component/select-names/e-select-names-popup.c:506
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "未命名的联系人"
+
+# ui/evolution-message-composer.xml.h:27
+# ui/evolution-message-composer.xml.h:27
+# ui/evolution-message-composer.xml.h:27
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "发送"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "添加条件"
+
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1036
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "保存签名"
+
# mail/mail-config-druid.c:146
# mail/mail-config-druid.c:146
# mail/mail-config-druid.c:146
@@ -18424,71 +19683,78 @@ 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:627
msgid "Evolution Account Assistant"
msgstr "Evolution 帐号助手"
+# my-evolution/Locations.h:508
+#. red
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
+#, fuzzy
+msgid "Work"
+msgstr "科克"
+
+# my-evolution/Locations.h:1795
+#. orange
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Personal"
+msgstr "波纳尔"
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:209
+# addressbook/gui/contact-editor/fulladdr.glade.h:209
+# addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#. forest green
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
+#, fuzzy
+msgid "To Do"
+msgstr "多哥"
+
+# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
+# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
+# calendar/gui/dialogs/alarm-page.glade.h:11
+#. blue
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "之后"
+
# mail/mail-config.c:326
# mail/mail-config.c:329
# mail/mail-config.c:354
-#: mail/mail-config.c:354
+#: mail/mail-config.c:625
#, c-format
msgid "Account %d"
msgstr "帐号 %d"
-# mail/mail-config.c:1860
-# mail/mail-config.c:1902
-# mail/mail-config.c:1995
-#: mail/mail-config.c:1995
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"无法为新邮件存储创建收件箱:\n"
-"%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:2555
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:2633 mail/mail-config.c:2637
msgid "Connecting to server..."
msgstr "正在连接服务器..."
+# my-evolution/metar.c:29
+# my-evolution/metar.c:29
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " "
+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:2
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
@@ -18510,114 +19776,167 @@ msgstr "(在该版本的 evolution 中不支持SSL)"
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 "帐号"
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+# mail/mail-config.c:326
+# mail/mail-config.c:329
+# mail/mail-config.c:354
+#: mail/mail-config.glade.h:7
+#, 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:8
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:9 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 ""
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "添加条件"
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1036
#: mail/mail-config.glade.h:11
-msgid "Always _carbon-copy (Cc) to:"
-msgstr ""
+#, fuzzy
+msgid "Add new signature..."
+msgstr "保存签名"
-# mail/mail-config.glade.h:9
-# mail/mail-config.glade.h:9
-# mail/mail-config.glade.h:9
+# mail/mail-config.glade.h:4
+# mail/mail-config.glade.h:4
+# mail/mail-config.glade.h:4
#: mail/mail-config.glade.h:12
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "当发送加密邮件时总是加密到自身(_E)"
+#, fuzzy
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "当发送加密邮件时总是对自身加密(_L)"
# 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:14
+#, fuzzy
+msgid "Alwa_ys sign outgoing messages when using this account"
msgstr "当使用该帐号的时候总是签名发送的邮件(_S)"
+#: mail/mail-config.glade.h:16
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:17
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+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:19
+#, 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:20 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:21
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:22
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "自动检查新邮件(_A)"
+
+#: mail/mail-config.glade.h:23
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:24
+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:25
+#, 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:26
+#, fuzzy
+msgid "C_olors"
+msgstr "关闭(_L)"
+
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
# 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 "撰写器"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+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:30
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:31
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:32
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -18636,428 +19955,551 @@ 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:40
+#, 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:41
+#, 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:42
+#, 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:44
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:45
+#, 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:46 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:47
+#, 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:48
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 "编辑..."
+# 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 "东"
-# 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 "已启用"
+# 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:54
msgid "Execute Command..."
msgstr "执行命令..."
+#: mail/mail-config.glade.h:55
+#, 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:56
+#, 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:57
+#, 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:58
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:59
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "突出显示引文,使用(_H)"
# 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)"
+# views/mail/galview.xml.h:4
+# views/mail/galview.xml.h:4
+# views/mail/galview.xml.h:4
+#: 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:78
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:79
+#, fuzzy
+msgid "News Servers"
+msgstr "新闻来源(_N)"
+
+#: mail/mail-config.glade.h:81
+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:82
msgid "Optional Information"
msgstr "可选的信息"
+# addressbook/gui/contact-editor/contact-editor.glade.h:23
+# addressbook/gui/contact-editor/contact-editor.glade.h:23
+# addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: mail/mail-config.glade.h:84
+#, 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:85
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:89
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:90
+#, 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:91
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:92
+#, 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:93
msgid "Qmail maildir "
msgstr "Qmail 邮件目录"
+# camel/camel-filter-driver.c:692
+# camel/camel-filter-driver.c:741
+# camel/camel-filter-driver.c:893
+#: mail/mail-config.glade.h:94
+#, 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:95
msgid "Quoted"
msgstr "已引用"
# mail/mail-config.glade.h:60
# mail/mail-config.glade.h:60
# mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h: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 "安全"
+
# 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:104
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:105
+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:106
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+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:109
+#, fuzzy
+msgid "Select PGP program"
msgstr "选择 PGP 二进制数"
# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
# mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
-#: mail/mail-config.glade.h:80 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 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:112
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:113
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:114
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:115
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:116
msgid "Server _Type: "
msgstr "服务器类型(_T):"
+# shell/e-shortcuts.c:1043
+# shell/e-shortcuts.c:1043
+# shell/e-shortcuts.c:1043
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "快捷方式"
+
# 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:"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Signature #1"
+msgstr "签名文件:"
+
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
msgstr "签名文件:"
# mail/mail-config.glade.h:80
# mail/mail-config.glade.h:80
# mail/mail-config.glade.h:89
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:120
msgid "Source"
msgstr "来源"
# mail/mail-config.glade.h:81
# mail/mail-config.glade.h:81
# mail/mail-config.glade.h:90
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:121
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:122
+#, fuzzy
+msgid "Specify _filename:"
msgstr "指定文件名:"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
+msgstr ""
+
+#: mail/mail-config.glade.h:124
+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:125
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:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+
+# my-evolution/metar.c:63
+# my-evolution/metar.c:63
+# my-evolution/metar.c:63
+#: mail/mail-config.glade.h:134
+#, 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:135
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -19067,304 +20509,396 @@ msgstr ""
"\n"
"点击 “下一步” 以便开始。"
+# my-evolution/metar.c:65
+# my-evolution/metar.c:65
+# my-evolution/metar.c:65
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "XEmacs"
+msgstr "东"
+
+# mail/mail-config.glade.h:116
+# mail/mail-config.glade.h:116
+# mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "签名文件(_S):"
+
# mail/mail-config.glade.h:91
# mail/mail-config.glade.h:91
# mail/mail-config.glade.h:100
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:143
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:144
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:145
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:146
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:147
msgid "_Automatically check for new mail"
msgstr "自动检查新邮件(_A)"
+# mail/mail-config.glade.h:94
+# mail/mail-config.glade.h:94
+# mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "自动检查新邮件(_A)"
+
+# mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:149
+#, 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:150
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:16
+# mail/mail-config.glade.h:16
+# mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:151
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+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)"
+# ui/evolution-message-composer.xml.h:5
+# ui/evolution-message-composer.xml.h:5
+# ui/evolution-message-composer.xml.h:5
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "删除签名以外的所有内容"
+
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:153
+#, fuzzy
+msgid "_Defaults"
+msgstr "默认"
+
+# mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Do not notify me when new mail arrives"
+msgstr "新邮件到达时不要提醒我"
+
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Enable"
+msgstr "启用"
+
+#: mail/mail-config.glade.h:158
+msgid "_Fixed-width:"
+msgstr ""
+
+# ui/evolution-mail-message.xml.h:32
+# ui/evolution-mail-message.xml.h:32
+# ui/evolution-mail-message.xml.h:32
+#: mail/mail-config.glade.h:159
+#, 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:160
msgid "_Full name:"
msgstr "全名(_F):"
-# 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:"
-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:38
+# mail/mail-config.glade.h:38
+# mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "在 HTML 邮件中"
-# 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):"
+# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+# mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:164
+#, fuzzy
+msgid "_Identity"
+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:165
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:166
+#, 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:167
+#, 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:168
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:169
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:170
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:172
+#, 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:173
+#, 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:174
+#, 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):"
+# 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:86
+# mail/mail-config.glade.h:86
+# mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:183
+#, 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:184
+#, 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:185
msgid "_every"
msgstr "每(_E)"
+# mail/mail-config.glade.h:2
+# mail/mail-config.glade.h:2
+# mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:186
+#, 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:187
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:189
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
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "无法创建 PGP 签名上下文。"
-
-# mail/mail-crypto.c:84
-# mail/mail-crypto.c:84
-# mail/mail-crypto.c:84
-#: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "无法创建 PGP 验证上下文。"
-
-# mail/mail-crypto.c:113
-# mail/mail-crypto.c:113
-# mail/mail-crypto.c:113
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "无法创建 PGP 加密上下文。"
-
-# mail/mail-crypto.c:138
-# mail/mail-crypto.c:138
-# mail/mail-crypto.c:138
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "无法创建 PGP 解密上下文。"
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
# mail/mail-crypto.c:173
# mail/mail-crypto.c:173
# mail/mail-crypto.c:173
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:84
msgid "Could not create a S/MIME signature context."
msgstr "无法创建 S/MIME 签名上下文。"
# mail/mail-crypto.c:205
# mail/mail-crypto.c:205
# mail/mail-crypto.c:205
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
msgid "Could not create a S/MIME certsonly context."
msgstr ""
# mail/mail-crypto.c:236
# mail/mail-crypto.c:236
# mail/mail-crypto.c:236
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
msgid "Could not create a S/MIME encryption context."
msgstr "无法创建 S/MIME 加密上下文。"
# mail/mail-crypto.c:267
# mail/mail-crypto.c:267
# mail/mail-crypto.c:267
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
msgid "Could not create a S/MIME envelope context."
msgstr "无法创建 S/MIME 信封上下文。"
# mail/mail-crypto.c:297
# mail/mail-crypto.c:297
# mail/mail-crypto.c:297
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
msgid "Could not create a S/MIME decode context."
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 +20906,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 +20914,64 @@ 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 "装入邮件内容"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "被延误的任务(_V):"
+
# mail/mail-display.c:1602
# mail/mail-display.c:1628
# mail/mail-display.c:1657
-#: mail/mail-display.c:1657
+#: mail/mail-display.c:1833
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:1834
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:1836
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:1838
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:631
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
@@ -19437,92 +20979,112 @@ 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:677
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:760 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:852
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:895 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:899
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:904 mail/message-list.etspec.h:14
msgid "To"
msgstr "收件人"
# mail/mail-format.c:897
# mail/mail-format.c:918
# mail/mail-format.c:924
-#: mail/mail-format.c:924
+#: mail/mail-format.c:909
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:914
msgid "Bcc"
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:945
+#, fuzzy
+msgid "Mailer"
+msgstr "邮件"
+
+# mail/mail-callbacks.c:1962
+# mail/mail-callbacks.c:2081
+# mail/mail-callbacks.c:2117
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "消息另存为..."
+
# mail/mail-format.c:1813
# mail/mail-format.c:1749
# mail/mail-format.c:1768
-#: mail/mail-format.c:1767
+#: mail/mail-format.c:1832
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-crypto.c:84
+# mail/mail-crypto.c:84
+# mail/mail-crypto.c:84
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "无法创建 PGP 验证上下文。"
# mail/mail-format.c:1844
# mail/mail-format.c:1780
# mail/mail-format.c:1799
-#: mail/mail-format.c:1798
+#: mail/mail-format.c:1868
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
+#: mail/mail-format.c:1876
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr "该邮件有数字签名,但不能证实是可信的。"
# mail/mail-format.c:2068
# mail/mail-format.c:2003
# mail/mail-format.c:2022
-#: mail/mail-format.c:2021
+#: mail/mail-format.c:2126
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
@@ -19530,7 +21092,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:2140
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
@@ -19538,7 +21100,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:2145
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
@@ -19546,7 +21108,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:2174
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
@@ -19554,7 +21116,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:2182
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
@@ -19562,21 +21124,29 @@ 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:2187
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "本地文件夹"
+
# mail/mail-local.c:626
# mail/mail-local.c:626
# mail/mail-local.c:626
-#: mail/mail-local.c:626
+#: mail/mail-local.c:670
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:751
#, c-format
msgid ""
"Cannot save folder metainfo; you'll probably find you can't\n"
@@ -19588,7 +21158,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:807
#, c-format
msgid "Cannot save folder metainfo to %s: %s"
msgstr "无法把文件夹元信息保存到 %s: %s"
@@ -19596,7 +21166,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:859
#, c-format
msgid "Cannot delete folder metadata %s: %s"
msgstr "无法删除文件夹元信息 %s: %s"
@@ -19604,7 +21174,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:1324
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr "将文件夹格式从“%s”改为“%s”"
@@ -19612,7 +21182,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:1339
#, c-format
msgid "%s may not be reconfigured because it is not a local folder"
msgstr "由于 %s 不是本地文件夹,因此不能重新配置"
@@ -19620,7 +21190,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:1361
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
@@ -19631,14 +21201,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:1450
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:1459
#, c-format
msgid "Reconfigure /%s"
msgstr "重新配置 /%s"
@@ -19677,28 +21247,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 +21276,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 +21284,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 +21292,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:838
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:918
#, c-format
msgid "Moving messages to %s"
msgstr "把邮件移动到 %s"
@@ -19744,52 +21314,30 @@ 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:918
#, c-format
msgid "Copying messages to %s"
msgstr "把邮件复制到 %s"
-# mail/mail-ops.c:895
-# mail/mail-ops.c:897
-# mail/mail-ops.c:940
-#: mail/mail-ops.c:940
-msgid "Moving"
-msgstr "正在移动"
-
-# mail/mail-ops.c:898
-# mail/mail-ops.c:900
-# mail/mail-ops.c:943
-#: mail/mail-ops.c:943
-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:1025
#, 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:1208
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:1251
#, c-format
msgid "Opening folder %s"
msgstr "正在打开文件夹 %s"
@@ -19797,7 +21345,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:1323
#, c-format
msgid "Opening store %s"
msgstr "正在打开存储 %s"
@@ -19805,7 +21353,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:1392
#, c-format
msgid "Removing folder %s"
msgstr "正在删除文件夹“%s”"
@@ -19813,7 +21361,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:1486
#, c-format
msgid "Storing folder '%s'"
msgstr "正在存储文件夹“%s”"
@@ -19821,21 +21369,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:1537
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:1573
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:1622
#, c-format
msgid "Retrieving message %s"
msgstr "正在检索邮件 %s"
@@ -19843,7 +21391,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:1689
#, c-format
msgid "Retrieving %d message(s)"
msgstr "正在检索 %d 个邮件"
@@ -19851,7 +21399,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:1775
#, c-format
msgid "Saving %d messsage(s)"
msgstr "正在保存 %d 个邮件"
@@ -19859,7 +21407,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:1887
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -19871,7 +21419,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:1915
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -19883,14 +21431,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:1989
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:2006
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -19902,7 +21450,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:2036
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据: %s"
@@ -19910,7 +21458,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:2184
#, c-format
msgid "Disconnecting from %s"
msgstr "断开与 %s 的连接"
@@ -19918,13 +21466,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:2184
#, c-format
msgid "Reconnecting to %s"
msgstr "重新与 %s 连接"
# mail/mail-ops.c:2233
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2265
#, c-format
msgid "Executing shell command: %s"
msgstr "正在执行 shell 命令:%s"
@@ -19932,7 +21480,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 widgets/misc/e-search-bar.c:506
msgid "_Search"
msgstr "搜索(_S)"
@@ -19995,14 +21543,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 +21558,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 +21566,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,38 +21574,31 @@ 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
-msgid "Cancelled."
-msgstr "已取消"
-
# mail/mail-session.c:220
# mail/mail-session.c:220
# mail/mail-session.c:222
@@ -20080,22 +21621,72 @@ 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:81
+#, 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:174
+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:180
+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-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+# my-evolution/e-summary-preferences.c:956
+# my-evolution/e-summary-preferences.c:956
+# my-evolution/e-summary-preferences.c:958
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "名称:"
+
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#: mail/mail-signature-editor.c:397
+#, fuzzy
+msgid "Signature hint"
+msgstr "签名文件:"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+# mail/mail-config.glade.h:35
+# mail/mail-config.glade.h:35
+# mail/mail-config.glade.h:42
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "HTML 签名文件:"
# 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,21 +21694,21 @@ 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 "已转发邮件"
# mail/mail-vfolder.c:85
# mail/mail-vfolder.c:85
# mail/mail-vfolder.c:85
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
#, c-format
msgid "Setting up vfolder: %s"
msgstr "设置虚拟文件夹: %s"
@@ -20125,7 +21716,7 @@ msgstr "设置虚拟文件夹: %s"
# mail/mail-vfolder.c:203
# mail/mail-vfolder.c:203
# mail/mail-vfolder.c:203
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
#, c-format
msgid "Updating vfolders for uri: %s"
msgstr "为 uri 更新虚拟文件夹: %s"
@@ -20133,7 +21724,7 @@ msgstr "为 uri 更新虚拟文件夹: %s"
# mail/mail-vfolder.c:419
# mail/mail-vfolder.c:419
# mail/mail-vfolder.c:419
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
#, c-format
msgid ""
"The following vFolder(s):\n"
@@ -20145,28 +21736,29 @@ msgstr ""
# mail/mail-vfolder.c:728
# mail/mail-vfolder.c:728
# mail/mail-vfolder.c:728
-#: mail/mail-vfolder.c:728
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
msgid "VFolders"
msgstr "虚拟文件夹"
# camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
# mail/mail-vfolder.c:785
# mail/mail-vfolder.c:785
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:784
msgid "vFolders"
msgstr "虚拟文件夹"
# mail/mail-vfolder.c:824
# mail/mail-vfolder.c:825
# mail/mail-vfolder.c:825
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
msgid "Edit VFolder"
msgstr "编辑虚拟文件夹"
# mail/mail-vfolder.c:840
# mail/mail-vfolder.c:841
# mail/mail-vfolder.c:841
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
#, c-format
msgid "Trying to edit a vfolder '%s' which doesn't exist."
msgstr "试图编辑并不存在的虚拟文件夹“%s”。"
@@ -20174,21 +21766,21 @@ msgstr "试图编辑并不存在的虚拟文件夹“%s”。"
# mail/mail-vfolder.c:894
# mail/mail-vfolder.c:895
# mail/mail-vfolder.c:895
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
msgid "New VFolder"
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:209
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:211
#, c-format
msgid "%s - Message"
msgstr "%s - 邮件"
@@ -20196,129 +21788,233 @@ 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:720
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:721
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:722
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:723
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:724
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:728
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:729
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:733
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:734
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:1067
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:1074
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:1083
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:1095
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:1105
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:2537
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 ""
+
+# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+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:9
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:11
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-mail-message.xml.h:31
+# ui/evolution-mail-message.xml.h:31
+# ui/evolution-mail-message.xml.h:31
+#: mail/message-tag-followup.c:58
+#, 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 +22054,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 +22128,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
@@ -27558,93 +29298,93 @@ msgid "Latrobe"
msgstr ""
# my-evolution/Locations.h:1191
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
msgid "Laughlin"
msgstr ""
# ui/evolution-mail-message.xml.h:98
# ui/evolution-mail-message.xml.h:98
# my-evolution/Locations.h:1192
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
msgid "Laurel"
msgstr "劳雷尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:41
# addressbook/gui/contact-editor/fulladdr.glade.h:41
# my-evolution/Locations.h:1193
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
#, fuzzy
msgid "La Verne"
msgstr "佛得角"
# my-evolution/Locations.h:1194
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
msgid "Lawrence"
msgstr "劳伦斯"
# calendar/gui/dialogs/event-page.glade.h:8
# calendar/gui/dialogs/event-page.glade.h:8
# my-evolution/Locations.h:1195
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
#, fuzzy
msgid "Lawton"
msgstr "地理位置(_O):"
# my-evolution/Locations.h:1196
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
msgid "Leadville"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:119
# addressbook/gui/contact-editor/fulladdr.glade.h:119
# my-evolution/Locations.h:1197
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
#, fuzzy
msgid "Learmouth"
msgstr "莱索托"
# my-evolution/Locations.h:1199
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
msgid "Lecce"
msgstr ""
# my-evolution/Locations.h:1200
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
msgid "Leeds and Bradford"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:123
# addressbook/gui/contact-editor/fulladdr.glade.h:123
# my-evolution/Locations.h:1201
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
#, fuzzy
msgid "Leesburg"
msgstr "卢森堡"
# my-evolution/Locations.h:1202
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
msgid "Leeuwarden"
msgstr ""
# my-evolution/Locations.h:1203
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
msgid "Le Havre-Octeville"
msgstr "勒阿弗尔-Octeville"
# my-evolution/Locations.h:1204
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
msgid "Leipzig-Schkeuditz"
msgstr "莱比锡-Schkeuditz"
# my-evolution/Locations.h:1205
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
msgid "Leknes"
msgstr ""
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/backend/ebook/e-card-simple.c:93
# my-evolution/Locations.h:1206
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
#, fuzzy
msgid "Le Mans"
msgstr "经理"
@@ -27652,7 +29392,7 @@ msgstr "经理"
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1207
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
#, fuzzy
msgid "Le Marine"
msgstr "圣马力诺"
@@ -27660,7 +29400,7 @@ msgstr "圣马力诺"
# addressbook/gui/contact-editor/fulladdr.glade.h:118
# addressbook/gui/contact-editor/fulladdr.glade.h:118
# my-evolution/Locations.h:1208
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
#, fuzzy
msgid "Lemmon"
msgstr "黎巴嫩"
@@ -27672,23 +29412,23 @@ msgstr "黎巴嫩"
# addressbook/gui/component/select-names/e-select-names.c:777
# composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
# my-evolution/Locations.h:1209
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
#, fuzzy
msgid "Lemoore"
msgstr "删除"
# my-evolution/Locations.h:1210
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
msgid "Leticia/Vasquez Cobo"
msgstr ""
# my-evolution/Locations.h:1211
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
msgid "Le Touquet"
msgstr ""
# my-evolution/Locations.h:1212
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
#, fuzzy
msgid "Leuchars"
msgstr "年"
@@ -27696,7 +29436,7 @@ msgstr "年"
# addressbook/gui/contact-editor/fulladdr.glade.h:123
# addressbook/gui/contact-editor/fulladdr.glade.h:123
# my-evolution/Locations.h:1213
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
#, fuzzy
msgid "Lewisburg"
msgstr "卢森堡"
@@ -27704,7 +29444,7 @@ msgstr "卢森堡"
# addressbook/gui/contact-editor/fulladdr.glade.h:119
# addressbook/gui/contact-editor/fulladdr.glade.h:119
# my-evolution/Locations.h:1214
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
#, fuzzy
msgid "Lewiston"
msgstr "莱索托"
@@ -27712,7 +29452,7 @@ msgstr "莱索托"
# addressbook/gui/contact-editor/fulladdr.glade.h:119
# addressbook/gui/contact-editor/fulladdr.glade.h:119
# my-evolution/Locations.h:1215
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
#, fuzzy
msgid "Lewistown"
msgstr "莱索托"
@@ -27720,14 +29460,14 @@ msgstr "莱索托"
# addressbook/gui/contact-editor/fulladdr.glade.h:118
# addressbook/gui/contact-editor/fulladdr.glade.h:118
# my-evolution/Locations.h:1216
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
msgid "Lexington"
msgstr "列克星敦"
# addressbook/gui/contact-editor/fulladdr.glade.h:120
# addressbook/gui/contact-editor/fulladdr.glade.h:120
# my-evolution/Locations.h:1217
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
#, fuzzy
msgid "Liberal"
msgstr "利比里亚"
@@ -27735,24 +29475,24 @@ msgstr "利比里亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:120
# addressbook/gui/contact-editor/fulladdr.glade.h:120
# my-evolution/Locations.h:1219
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
msgid "Libya"
msgstr "利比亚"
# my-evolution/Locations.h:1220
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
msgid "Lichtenburg"
msgstr ""
# my-evolution/Locations.h:1221
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
msgid "Lidgerwood"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:153
# addressbook/gui/contact-editor/fulladdr.glade.h:153
# my-evolution/Locations.h:1222
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
#, fuzzy
msgid "Liege"
msgstr "尼日尔"
@@ -27760,25 +29500,25 @@ msgstr "尼日尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:155
# addressbook/gui/contact-editor/fulladdr.glade.h:155
# my-evolution/Locations.h:1223
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
#, fuzzy
msgid "Lihue"
msgstr "纽埃岛"
# my-evolution/Locations.h:1224
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
msgid "Lille-Lesquin"
msgstr "里尔-Lesquin"
# my-evolution/Locations.h:1225
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
msgid "Lima-Callao"
msgstr "利马-卡亚俄"
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# my-evolution/Locations.h:1226
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
#, fuzzy
msgid "Limnos"
msgstr "老挝"
@@ -27786,30 +29526,30 @@ msgstr "老挝"
# mail/message-list.c:647
# mail/message-list.c:658
# my-evolution/Locations.h:1227
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
msgid "Limoges"
msgstr "里摩日"
# my-evolution/Locations.h:1228
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
#, fuzzy
msgid "Limon"
msgstr "月"
# my-evolution/Locations.h:1229
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
msgid "Lincoln"
msgstr "林肯"
# my-evolution/Locations.h:1230
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
msgid "Linz"
msgstr "林茨"
# addressbook/gui/contact-editor/fulladdr.glade.h:120
# addressbook/gui/contact-editor/fulladdr.glade.h:120
# my-evolution/Locations.h:1231
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
#, fuzzy
msgid "Lisboa"
msgstr "利比里亚"
@@ -27817,7 +29557,7 @@ msgstr "利比里亚"
# my-evolution/metar.c:262
# my-evolution/metar.c:262
# my-evolution/Locations.h:1232
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
#, fuzzy
msgid "Lista"
msgstr "霭"
@@ -27825,204 +29565,204 @@ msgstr "霭"
# my-evolution/metar.c:219 my-evolution/metar.c:234
# my-evolution/metar.c:219 my-evolution/metar.c:234
# my-evolution/Locations.h:1233
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
#, fuzzy
msgid "Litchfield"
msgstr "小冰雹"
# my-evolution/Locations.h:1235
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
msgid "Little Rock"
msgstr "小石城"
# my-evolution/Locations.h:1236
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
msgid "Little Rock AFB"
msgstr "小石城空军基地"
# my-evolution/Locations.h:1237
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
msgid "Livermore"
msgstr ""
# my-evolution/Locations.h:1238
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
msgid "Liverpool"
msgstr "利物浦"
# my-evolution/Locations.h:1239
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
msgid "Livingston"
msgstr "利文斯敦"
# calendar/zones.h:302
# my-evolution/Locations.h:1240
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
msgid "Ljubljana"
msgstr "卢布尔雅纳"
# camel/camel-sasl-login.c:32
# camel/camel-sasl-login.c:32
# my-evolution/Locations.h:1241
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
msgid "Logan"
msgstr "洛根"
# my-evolution/Locations.h:1242
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
msgid "Lolland Falster"
msgstr "洛兰岛 Falster"
# addressbook/backend/ebook/e-card-simple.c:67
# addressbook/backend/ebook/e-card-simple.c:67
# my-evolution/Locations.h:1243
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
#, fuzzy
msgid "Lompoc"
msgstr "公司"
# calendar/zones.h:303
# my-evolution/Locations.h:1244
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
msgid "London"
msgstr "伦敦"
# my-evolution/Locations.h:1245
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
msgid "London/City"
msgstr "伦敦/城"
# my-evolution/Locations.h:1246
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
msgid "London/Gatwick"
msgstr "伦敦/Gatwick"
# my-evolution/Locations.h:1247
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
msgid "London/Heathrow"
msgstr "伦敦/Heathrow"
# my-evolution/Locations.h:1248
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
msgid "London/Stansted"
msgstr "伦敦/Stansted"
# addressbook/gui/contact-editor/fulladdr.glade.h:99
# addressbook/gui/contact-editor/fulladdr.glade.h:99
# my-evolution/Locations.h:1249
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
#, fuzzy
msgid "Londrina"
msgstr "洪都拉斯"
# my-evolution/Locations.h:1250
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
msgid "Lone Rock"
msgstr ""
# my-evolution/Locations.h:1251
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
msgid "Long Beach"
msgstr ""
# my-evolution/Locations.h:1252
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
msgid "Longview"
msgstr ""
# my-evolution/Locations.h:1253
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
msgid "Lorient-Lann-Bihoue"
msgstr ""
# calendar/gui/e-calendar-table.etspec.h:3
# calendar/gui/e-calendar-table.etspec.h:3
# my-evolution/Locations.h:1254
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
msgid "Los Alamos"
msgstr "洛斯阿拉莫斯"
# calendar/zones.h:121
# my-evolution/Locations.h:1255
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
msgid "Los Angeles"
msgstr "洛杉矶"
# my-evolution/Locations.h:1256
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
msgid "Los Mochis"
msgstr ""
# my-evolution/Locations.h:1257
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
msgid "Lossiemouth"
msgstr ""
# my-evolution/Locations.h:1258
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
msgid "Louisville"
msgstr "路易斯维尔"
# my-evolution/Locations.h:1259
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
msgid "Louisville-Standiford Field"
msgstr "路易斯维尔-Standiford Field"
# addressbook/gui/contact-editor/fulladdr.glade.h:29
# addressbook/gui/contact-editor/fulladdr.glade.h:29
# my-evolution/Locations.h:1260
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
#, fuzzy
msgid "Lousiana"
msgstr "博茨瓦纳"
# my-evolution/Locations.h:1261
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
msgid "Lovelock"
msgstr ""
# my-evolution/Locations.h:1262
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
msgid "Lubbock"
msgstr ""
# my-evolution/Locations.h:1263
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
msgid "Lubeck-Blankensee"
msgstr ""
# my-evolution/Locations.h:1264
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
msgid "Lufkin"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:118
# addressbook/gui/contact-editor/fulladdr.glade.h:118
# my-evolution/Locations.h:1265
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
#, fuzzy
msgid "Lugano"
msgstr "黎巴嫩"
# my-evolution/Locations.h:1266
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
msgid "Luqa"
msgstr ""
# my-evolution/Locations.h:1267
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
msgid "Luton"
msgstr "卢顿"
# my-evolution/Locations.h:1269
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
msgid "Luxeuil"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:123
# addressbook/gui/contact-editor/fulladdr.glade.h:123
# my-evolution/Locations.h:1270
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
#, fuzzy
msgid "Luxor"
msgstr "卢森堡"
@@ -28030,35 +29770,35 @@ msgstr "卢森堡"
# addressbook/gui/contact-editor/fulladdr.glade.h:117
# addressbook/gui/contact-editor/fulladdr.glade.h:117
# my-evolution/Locations.h:1271
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
#, fuzzy
msgid "Lviv"
msgstr "拉脱维亚"
# my-evolution/Locations.h:1272
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
msgid "Lynchburg"
msgstr ""
# my-evolution/Locations.h:1273
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
msgid "Lyneham"
msgstr ""
# my-evolution/Locations.h:1274
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
msgid "Lyon-Bron"
msgstr "里昂-Bron"
# my-evolution/Locations.h:1275
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
msgid "Lyon-Satolas"
msgstr "里昂-Satolas"
# calendar/gui/goto-dialog.glade.h:10
# calendar/gui/goto-dialog.glade.h:10
# my-evolution/Locations.h:1276
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
#, fuzzy
msgid "Maastricht"
msgstr "三月"
@@ -28066,7 +29806,7 @@ msgstr "三月"
# addressbook/gui/contact-editor/fulladdr.glade.h:124
# addressbook/gui/contact-editor/fulladdr.glade.h:124
# my-evolution/Locations.h:1277
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
#, fuzzy
msgid "Macae"
msgstr "澳门"
@@ -28074,7 +29814,7 @@ msgstr "澳门"
# addressbook/gui/contact-editor/fulladdr.glade.h:124
# addressbook/gui/contact-editor/fulladdr.glade.h:124
# my-evolution/Locations.h:1278
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
#, fuzzy
msgid "Macapa"
msgstr "澳门"
@@ -28082,7 +29822,7 @@ msgstr "澳门"
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# my-evolution/Locations.h:1279
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
#, fuzzy
msgid "Maceio"
msgstr "摩纳哥"
@@ -28090,14 +29830,14 @@ msgstr "摩纳哥"
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/backend/ebook/e-card-simple.c:93
# my-evolution/Locations.h:1280
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
msgid "Macon"
msgstr "梅肯"
# addressbook/gui/contact-editor/fulladdr.glade.h:125
# addressbook/gui/contact-editor/fulladdr.glade.h:125
# my-evolution/Locations.h:1281
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
#, fuzzy
msgid "Madinah"
msgstr "马其顿"
@@ -28105,59 +29845,59 @@ msgstr "马其顿"
# addressbook/gui/contact-editor/fulladdr.glade.h:129
# addressbook/gui/contact-editor/fulladdr.glade.h:129
# my-evolution/Locations.h:1282
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
msgid "Madison"
msgstr "麦迪逊"
# my-evolution/Locations.h:1283
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
msgid "Madras/Minambakkam"
msgstr "马德拉斯/Minambakkam"
# my-evolution/Locations.h:1284
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
msgid "Madrid (Barajas)"
msgstr "马德里 (Barajas)"
# my-evolution/Locations.h:1285
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
msgid "Madrid (Cuatro Vientos)"
msgstr "马德里 (Cuatro Vientos)"
# addressbook/gui/contact-editor/fulladdr.glade.h:40
# addressbook/gui/contact-editor/fulladdr.glade.h:40
# my-evolution/Locations.h:1286
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
#, fuzzy
msgid "Magadan"
msgstr "加拿大"
# my-evolution/Locations.h:1287
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
msgid "Magdalena"
msgstr "马各达林"
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/backend/ebook/e-card-simple.c:93
# my-evolution/Locations.h:1288
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
msgid "Maine"
msgstr "缅因州"
# my-evolution/Locations.h:1289
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
msgid "Makhachkala"
msgstr "马哈奇卡拉"
# my-evolution/Locations.h:1290
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
msgid "Makkah"
msgstr "麦加"
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/backend/ebook/e-card-simple.c:93
# my-evolution/Locations.h:1291
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
#, fuzzy
msgid "Makung"
msgstr "经理"
@@ -28165,7 +29905,7 @@ msgstr "经理"
# addressbook/gui/contact-editor/fulladdr.glade.h:127
# addressbook/gui/contact-editor/fulladdr.glade.h:127
# my-evolution/Locations.h:1292
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
#, fuzzy
msgid "Malad City"
msgstr "马拉维"
@@ -28173,7 +29913,7 @@ msgstr "马拉维"
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# my-evolution/Locations.h:1293
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
#, fuzzy
msgid "Malaga"
msgstr "马耳他"
@@ -28181,23 +29921,23 @@ msgstr "马耳他"
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# my-evolution/Locations.h:1294
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
#, fuzzy
msgid "Malatya"
msgstr "马耳他"
# my-evolution/Locations.h:1295
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
msgid "Maldonado/Punta Est"
msgstr ""
# my-evolution/Locations.h:1296
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
msgid "Malmo/Sturup"
msgstr ""
# my-evolution/Locations.h:1298
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
msgid "Mammoth Lakes"
msgstr ""
@@ -28206,52 +29946,52 @@ msgstr ""
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/gui/widgets/e-addressbook-view.c:882
# my-evolution/Locations.h:1299
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
msgid "Managua"
msgstr "马那瓜"
# addressbook/gui/contact-editor/fulladdr.glade.h:128
# addressbook/gui/contact-editor/fulladdr.glade.h:128
# my-evolution/Locations.h:1300
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
msgid "Manassas"
msgstr "马那萨斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:124
# addressbook/gui/contact-editor/fulladdr.glade.h:124
# my-evolution/Locations.h:1301
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
msgid "Manaus"
msgstr "马瑙斯"
# mail/mail-search.c:346
# mail/mail-search.c:346
# my-evolution/Locations.h:1302
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
msgid "Manchester"
msgstr "曼彻斯特"
# my-evolution/Locations.h:1303
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
msgid "Mangilsan Ab"
msgstr ""
# my-evolution/Locations.h:1304
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
msgid "Manhattan"
msgstr "曼哈顿"
# addressbook/gui/contact-editor/fulladdr.glade.h:125
# addressbook/gui/contact-editor/fulladdr.glade.h:125
# my-evolution/Locations.h:1305
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
msgid "Manisa"
msgstr "马尼萨"
# my-evolution/metar.c:262
# my-evolution/metar.c:262
# my-evolution/Locations.h:1306
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
#, fuzzy
msgid "Manistee"
msgstr "霭"
@@ -28261,19 +30001,19 @@ msgstr "霭"
# ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
# ui/evolution.xml.h:16
# my-evolution/Locations.h:1307
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
msgid "Manitoba"
msgstr "马尼托巴"
# my-evolution/Locations.h:1308
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
msgid "Manitowoc"
msgstr "马尼托沃克"
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# my-evolution/Locations.h:1309
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
msgid "Mankato"
msgstr "曼凯托"
@@ -28282,64 +30022,64 @@ msgstr "曼凯托"
# importers/elm-importer.c:525 importers/netscape-importer.c:958
# importers/pine-importer.c:637 mail/component-factory.c:100
# my-evolution/Locations.h:1310
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
msgid "Mansfield"
msgstr "曼斯菲尔德"
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# my-evolution/Locations.h:1311
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
#, fuzzy
msgid "Manta"
msgstr "马耳他"
# my-evolution/Locations.h:1312
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
msgid "Manzanillo"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# my-evolution/Locations.h:1313
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
#, fuzzy
msgid "Maraba"
msgstr "毛里塔尼亚"
# my-evolution/Locations.h:1314
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
msgid "Maracaibo-La Chinita"
msgstr "马拉开波-La Chinita"
# my-evolution/Locations.h:1315
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
msgid "Maracay-B.A.Sucre"
msgstr "马拉凯-B.A.Sucre"
# calendar/gui/goto-dialog.glade.h:10
# calendar/gui/goto-dialog.glade.h:10
# my-evolution/Locations.h:1316
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
msgid "Marathon"
msgstr "马拉松"
# my-evolution/Locations.h:1317
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
msgid "Mar Del Plata"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# my-evolution/Locations.h:1318
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
msgid "Margarita"
msgstr "玛格丽塔"
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# my-evolution/Locations.h:1319
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
msgid "Marianna"
msgstr "马里亚纳群岛"
@@ -28348,82 +30088,82 @@ msgstr "马里亚纳群岛"
# importers/elm-importer.c:525 importers/netscape-importer.c:958
# importers/pine-importer.c:637 mail/component-factory.c:100
# my-evolution/Locations.h:1320
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
#, fuzzy
msgid "Marib"
msgstr "邮件"
# my-evolution/Locations.h:1321
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
msgid "Maribor"
msgstr "马里博尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# my-evolution/Locations.h:1322
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
msgid "Marietta"
msgstr "玛丽埃塔"
# my-evolution/Locations.h:1323
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
msgid "Marino di Ravenna"
msgstr ""
# addressbook/printing/e-contact-print.glade.h:21
# addressbook/printing/e-contact-print.glade.h:21
# my-evolution/Locations.h:1324
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
msgid "Marion"
msgstr "马里恩"
# my-evolution/Locations.h:1325
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
msgid "Marion-Wytheville"
msgstr "马里恩-Wytheville"
# addressbook/gui/contact-editor/fulladdr.glade.h:133
# addressbook/gui/contact-editor/fulladdr.glade.h:133
# my-evolution/Locations.h:1326
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
#, fuzzy
msgid "Marquette"
msgstr "马提尼可岛"
# my-evolution/Locations.h:1327
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
msgid "Marseille-Provence"
msgstr "马赛-普罗旺斯"
# my-evolution/Locations.h:1328
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
msgid "Marseilles"
msgstr "马赛"
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# my-evolution/Locations.h:1329
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
msgid "Marshall"
msgstr "马绍尔群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# my-evolution/Locations.h:1330
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
#, fuzzy
msgid "Marshalltown"
msgstr "马绍尔群岛"
# my-evolution/Locations.h:1331
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
msgid "Marshfield"
msgstr ""
# mail/mail-format.c:763
# mail/mail-format.c:769
# my-evolution/Locations.h:1332
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
#, fuzzy
msgid "Marte"
msgstr "日期"
@@ -28431,7 +30171,7 @@ msgstr "日期"
# mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:45
# mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:45
# my-evolution/Locations.h:1333
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
#, fuzzy
msgid "Marthas Vineyard"
msgstr "标记为未读(_N)"
@@ -28439,7 +30179,7 @@ msgstr "标记为未读(_N)"
# addressbook/printing/e-contact-print.glade.h:21
# addressbook/printing/e-contact-print.glade.h:21
# my-evolution/Locations.h:1334
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
#, fuzzy
msgid "Martinsburg"
msgstr "边界"
@@ -28447,7 +30187,7 @@ msgstr "边界"
# addressbook/gui/contact-editor/fulladdr.glade.h:133
# addressbook/gui/contact-editor/fulladdr.glade.h:133
# my-evolution/Locations.h:1335
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
#, fuzzy
msgid "Martinsville"
msgstr "马提尼可岛"
@@ -28455,47 +30195,47 @@ msgstr "马提尼可岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# my-evolution/Locations.h:1336
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
msgid "Maryland"
msgstr "马里兰"
# my-evolution/Locations.h:1337
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
msgid "Marysville"
msgstr ""
# my-evolution/Locations.h:1338
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
msgid "Marysville-Beale AFB"
msgstr ""
# my-evolution/Locations.h:1339
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
msgid "Mashhad"
msgstr "马什哈德"
# calendar/gui/goto-dialog.glade.h:10
# calendar/gui/goto-dialog.glade.h:10
# my-evolution/Locations.h:1340
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
#, fuzzy
msgid "Masirah"
msgstr "三月"
# my-evolution/Locations.h:1341
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
msgid "Mason City"
msgstr "梅森城"
# my-evolution/Locations.h:1342
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
msgid "Massachusetts"
msgstr "麻萨诸塞州"
# addressbook/gui/contact-editor/fulladdr.glade.h:125
# addressbook/gui/contact-editor/fulladdr.glade.h:125
# my-evolution/Locations.h:1343
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
#, fuzzy
msgid "Massena"
msgstr "马其顿"
@@ -28503,29 +30243,29 @@ msgstr "马其顿"
# addressbook/gui/contact-editor/fulladdr.glade.h:51
# addressbook/gui/contact-editor/fulladdr.glade.h:51
# my-evolution/Locations.h:1344
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
msgid "Matamoros"
msgstr "马塔莫罗斯"
# my-evolution/Locations.h:1345
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
msgid "Matsumoto Airport"
msgstr "松本机场"
# my-evolution/Locations.h:1346
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
msgid "Matsushima Ab"
msgstr ""
# my-evolution/Locations.h:1347
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
msgid "Matsuyama Airport"
msgstr "松山机场"
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/backend/ebook/e-card-simple.c:93
# my-evolution/Locations.h:1348
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
#, fuzzy
msgid "Mattoon"
msgstr "经理"
@@ -28535,7 +30275,7 @@ msgstr "经理"
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/gui/widgets/e-addressbook-view.c:882
# my-evolution/Locations.h:1349
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
#, fuzzy
msgid "Mayaguez"
msgstr "经理"
@@ -28543,7 +30283,7 @@ msgstr "经理"
# addressbook/gui/contact-editor/fulladdr.glade.h:136
# addressbook/gui/contact-editor/fulladdr.glade.h:136
# my-evolution/Locations.h:1350
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
#, fuzzy
msgid "Mayport"
msgstr "马约特岛"
@@ -28551,7 +30291,7 @@ msgstr "马约特岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# calendar/zones.h:127
# my-evolution/Locations.h:1351
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
#, fuzzy
msgid "Mazatlan"
msgstr "美洲萨摩亚"
@@ -28559,17 +30299,17 @@ msgstr "美洲萨摩亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:124
# addressbook/gui/contact-editor/fulladdr.glade.h:124
# my-evolution/Locations.h:1352
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
msgid "Mazu"
msgstr "马祖"
# my-evolution/Locations.h:1353
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
msgid "McAlester"
msgstr ""
# my-evolution/Locations.h:1354
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
msgid "McAllen"
msgstr "麦卡伦"
@@ -28578,7 +30318,7 @@ msgstr "麦卡伦"
# importers/elm-importer.c:525 importers/netscape-importer.c:958
# importers/pine-importer.c:637 mail/component-factory.c:100
# my-evolution/Locations.h:1355
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
#, fuzzy
msgid "McCall"
msgstr "邮件"
@@ -28586,7 +30326,7 @@ msgstr "邮件"
# calendar/gui/goto-dialog.glade.h:10
# calendar/gui/goto-dialog.glade.h:10
# my-evolution/Locations.h:1356
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
#, fuzzy
msgid "McCarthy"
msgstr "三月"
@@ -28594,37 +30334,37 @@ msgstr "三月"
# addressbook/gui/contact-editor/fulladdr.glade.h:102
# addressbook/gui/contact-editor/fulladdr.glade.h:102
# my-evolution/Locations.h:1357
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
msgid "McClellan"
msgstr "麦克莱伦"
# addressbook/backend/ebook/e-card-simple.c:67
# addressbook/backend/ebook/e-card-simple.c:67
# my-evolution/Locations.h:1358
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
#, fuzzy
msgid "McComb"
msgstr "公司"
# my-evolution/Locations.h:1359
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
msgid "McCook"
msgstr ""
# my-evolution/Locations.h:1360
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
msgid "McGrath"
msgstr ""
# my-evolution/Locations.h:1361
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
msgid "Mc Gregor"
msgstr ""
# calendar/gui/goto-dialog.glade.h:10
# calendar/gui/goto-dialog.glade.h:10
# my-evolution/Locations.h:1362
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
#, fuzzy
msgid "Meacham"
msgstr "三月"
@@ -28632,89 +30372,89 @@ msgstr "三月"
# calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
# calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
# my-evolution/Locations.h:1363
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
#, fuzzy
msgid "Medford"
msgstr "之前"
# my-evolution/Locations.h:1364
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
msgid "Medicine Lodge"
msgstr ""
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/backend/ebook/e-card-simple.c:93
# my-evolution/Locations.h:1365
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
#, fuzzy
msgid "Mehamn"
msgstr "经理"
# my-evolution/Locations.h:1366
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
msgid "Mekoryuk"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# calendar/zones.h:280
# my-evolution/Locations.h:1367
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
msgid "Melbourne"
msgstr "墨尔本"
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# my-evolution/Locations.h:1368
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
#, fuzzy
msgid "Melfa"
msgstr "马耳他"
# my-evolution/Locations.h:1369
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
msgid "Melilla"
msgstr "梅利利亚"
# my-evolution/Locations.h:1370
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
msgid "Memambetsu Airport"
msgstr ""
# my-evolution/Locations.h:1371
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
msgid "Memphis"
msgstr "孟斐斯"
# my-evolution/Locations.h:1372
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
msgid "Memphis-NAS"
msgstr "孟斐斯-国家科学院"
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# calendar/zones.h:128
# my-evolution/Locations.h:1373
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
#, fuzzy
msgid "Mendoza"
msgstr "美洲萨摩亚"
# my-evolution/Locations.h:1374
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
msgid "Mene Grande"
msgstr ""
# my-evolution/Locations.h:1375
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
msgid "Menominee"
msgstr ""
# my-evolution/Locations.h:1376
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
msgid "Menorca"
msgstr "米诺卡"
# my-evolution/Locations.h:1377
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
msgid "Merced"
msgstr ""
@@ -28723,53 +30463,53 @@ msgstr ""
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
# calendar/gui/dialogs/recurrence-page.c:963
# my-evolution/Locations.h:1378
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
#, fuzzy
msgid "Merida"
msgstr "星期五"
# my-evolution/Locations.h:1379
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
msgid "Meridian"
msgstr ""
# my-evolution/Locations.h:1380
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
msgid "Meridian-Lauderdale"
msgstr ""
# ui/evolution-message-composer.xml.h:49
# ui/evolution-message-composer.xml.h:49
# my-evolution/Locations.h:1381
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
#, fuzzy
msgid "Merril Field"
msgstr "发件人域(_F)"
# my-evolution/Locations.h:1382
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
msgid "Mersa Matruh"
msgstr ""
# my-evolution/Locations.h:1383
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
msgid "Mesa-Falcon Field"
msgstr ""
# my-evolution/Locations.h:1384
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
msgid "Metabaru Ab"
msgstr ""
# my-evolution/Locations.h:1385
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
msgid "Metz-Frescaty"
msgstr "梅斯-Frescaty"
# addressbook/gui/contact-editor/fulladdr.glade.h:137
# addressbook/gui/contact-editor/fulladdr.glade.h:137
# my-evolution/Locations.h:1386
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
msgid "Mexicali"
msgstr "墨西卡利"
@@ -28778,43 +30518,43 @@ msgstr "墨西卡利"
# importers/elm-importer.c:525 importers/netscape-importer.c:958
# importers/pine-importer.c:637 mail/component-factory.c:100
# my-evolution/Locations.h:1388
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
msgid "Miami"
msgstr "迈阿密"
# my-evolution/Locations.h:1389
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
msgid "Miami-Kendall"
msgstr "迈阿密-肯德尔"
# my-evolution/Locations.h:1390
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
msgid "Miami-Opa Locka"
msgstr "迈阿密-Opa Locka"
# my-evolution/Locations.h:1391
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
msgid "Michigan"
msgstr "密歇根州"
# addressbook/gui/contact-editor/fullname.glade.h:15
# addressbook/gui/contact-editor/fullname.glade.h:15
# my-evolution/Locations.h:1392
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
msgid "Middle East"
msgstr "中东"
# addressbook/gui/contact-editor/fulladdr.glade.h:192
# addressbook/gui/contact-editor/fulladdr.glade.h:192
# my-evolution/Locations.h:1393
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
msgid "Middleton Island"
msgstr "米德尔顿岛"
# addressbook/gui/contact-editor/fullname.glade.h:15
# addressbook/gui/contact-editor/fullname.glade.h:15
# my-evolution/Locations.h:1394
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
#, fuzzy
msgid "Middletown"
msgstr "中间名(_M):"
@@ -28822,146 +30562,146 @@ msgstr "中间名(_M):"
# addressbook/gui/contact-editor/fulladdr.glade.h:76
# addressbook/gui/contact-editor/fulladdr.glade.h:76
# my-evolution/Locations.h:1395
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
msgid "Midland"
msgstr ""
# my-evolution/Locations.h:1396
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
msgid "Miho Ab"
msgstr ""
# my-evolution/Locations.h:1397
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
msgid "Milano/Linate"
msgstr "米兰/Linate"
# addressbook/gui/contact-editor/fulladdr.glade.h:129
# calendar/zones.h:341
# my-evolution/Locations.h:1398
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
msgid "Milano/Malpensa"
msgstr "米兰/Malpensa"
# shell/e-shell-importer.c:627
# shell/e-shell-importer.c:627
# my-evolution/Locations.h:1399
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
msgid "Miles City"
msgstr "迈尔斯城"
# my-evolution/Locations.h:1400
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
msgid "Milford"
msgstr "米尔福德"
# my-evolution/Locations.h:1401
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
msgid "Millinocket"
msgstr ""
# my-evolution/Locations.h:1402
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
msgid "Millville"
msgstr ""
# mail/mail-autofilter.c:72
# mail/mail-autofilter.c:72
# my-evolution/Locations.h:1403
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
msgid "Milton"
msgstr "米尔顿"
# my-evolution/Locations.h:1404
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
msgid "Milwaukee"
msgstr "密尔沃基"
# my-evolution/Locations.h:1405
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
msgid "Milwaukee-Timmerman"
msgstr "密尔沃基-Timmerman"
# my-evolution/Locations.h:1406
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
msgid "Minamitorishima"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# my-evolution/Locations.h:1407
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
#, fuzzy
msgid "Minatitlan"
msgstr "毛里塔尼亚"
# my-evolution/Locations.h:1408
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
#, fuzzy
msgid "Minchumina"
msgstr "接收"
# my-evolution/Locations.h:1409
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
msgid "Mineralnye Vody"
msgstr ""
# my-evolution/Locations.h:1410
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
msgid "Mineral Wells"
msgstr ""
# my-evolution/Locations.h:1411
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
msgid "Minneapolis"
msgstr "明尼阿波利斯"
# my-evolution/Locations.h:1412
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
msgid "Minneapolis [2]"
msgstr "明尼阿波利斯 [2]"
# my-evolution/Locations.h:1413
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
msgid "Minneapolis [3]"
msgstr "明尼阿波利斯 [3]"
# addressbook/gui/contact-editor/fulladdr.glade.h:138
# addressbook/gui/contact-editor/fulladdr.glade.h:138
# my-evolution/Locations.h:1414
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
msgid "Minnesota"
msgstr "明尼苏达州"
# my-evolution/Locations.h:1415
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
msgid "Minocqua"
msgstr ""
# my-evolution/Locations.h:1416
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
msgid "Minot"
msgstr "迈诺特"
# my-evolution/Locations.h:1417
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
msgid "Minot AFB"
msgstr "迈诺特空军基地"
# my-evolution/Locations.h:1418
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
msgid "Misawa Ab"
msgstr ""
# my-evolution/Locations.h:1419
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
msgid "Mississippi"
msgstr "密西西比"
# addressbook/gui/contact-editor/fullname.glade.h:8
# addressbook/gui/contact-editor/fullname.glade.h:8
# my-evolution/Locations.h:1420
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
#, fuzzy
msgid "Missoula"
msgstr "小姐"
@@ -28969,37 +30709,37 @@ msgstr "小姐"
# addressbook/gui/contact-editor/fullname.glade.h:8
# addressbook/gui/contact-editor/fullname.glade.h:8
# my-evolution/Locations.h:1421
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
msgid "Missouri"
msgstr "密苏里州"
# mail/mail-search.c:346
# mail/mail-search.c:346
# my-evolution/Locations.h:1422
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
msgid "Mitchell"
msgstr "米切尔"
# my-evolution/Locations.h:1423
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
#, fuzzy
msgid "Mitilini"
msgstr "邮件列表"
# my-evolution/Locations.h:1424
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
msgid "Miyakejima Airport"
msgstr ""
# my-evolution/Locations.h:1425
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
msgid "Miyazaki Airport"
msgstr "宫崎机场"
# calendar/gui/print.c:498
# calendar/gui/print.c:498
# my-evolution/Locations.h:1426
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
#, fuzzy
msgid "Moa"
msgstr "一"
@@ -29007,13 +30747,13 @@ msgstr "一"
# addressbook/gui/widgets/e-addressbook-view.c:861
# addressbook/gui/widgets/e-addressbook-view.c:861
# my-evolution/Locations.h:1427
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
#, fuzzy
msgid "Mobile Downtown"
msgstr "手机"
# my-evolution/Locations.h:1428
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
msgid "Mobile Regional Airport"
msgstr ""
@@ -29024,7 +30764,7 @@ msgstr ""
# addressbook/gui/contact-editor/contact-editor.glade.h:20
# addressbook/gui/contact-editor/e-contact-editor.c:1655
# my-evolution/Locations.h:1429
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
#, fuzzy
msgid "Mobridge"
msgstr "手机"
@@ -29032,20 +30772,20 @@ msgstr "手机"
# my-evolution/metar.c:280
# my-evolution/metar.c:280
# my-evolution/Locations.h:1430
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
#, fuzzy
msgid "Modesto"
msgstr "中雾"
# my-evolution/Locations.h:1431
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
msgid "Mo I Rana"
msgstr ""
# ui/evolution-mail-message.xml.h:52
# ui/evolution-mail-message.xml.h:52
# my-evolution/Locations.h:1432
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
msgid "Mojave"
msgstr "莫哈韦"
@@ -29056,7 +30796,7 @@ msgstr "莫哈韦"
# addressbook/gui/contact-editor/contact-editor.glade.h:20
# addressbook/gui/contact-editor/e-contact-editor.c:1655
# my-evolution/Locations.h:1433
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
#, fuzzy
msgid "Molde"
msgstr "手机"
@@ -29066,36 +30806,36 @@ msgstr "手机"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
# calendar/gui/dialogs/recurrence-page.c:959
# my-evolution/Locations.h:1434
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
msgid "Moldova"
msgstr "摩尔多瓦"
# my-evolution/Locations.h:1435
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
msgid "Moline-Quad Cities"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:127
# addressbook/gui/contact-editor/fulladdr.glade.h:127
# my-evolution/Locations.h:1436
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
msgid "Molokai"
msgstr "莫洛凯岛"
# my-evolution/Locations.h:1437
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
msgid "Mombetsu Airport"
msgstr ""
# my-evolution/Locations.h:1438
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
msgid "Monchengladbach"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# my-evolution/Locations.h:1439
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
#, fuzzy
msgid "Monclova"
msgstr "摩纳哥"
@@ -29103,7 +30843,7 @@ msgstr "摩纳哥"
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# my-evolution/Locations.h:1440
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
#, fuzzy
msgid "Moncton"
msgstr "摩纳哥"
@@ -29113,20 +30853,20 @@ msgstr "摩纳哥"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
# calendar/gui/dialogs/recurrence-page.c:959
# my-evolution/Locations.h:1441
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
#, fuzzy
msgid "Monida"
msgstr "星期一"
# my-evolution/Locations.h:1442
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
msgid "Monpellier-Mediterrannee"
msgstr "Monpellier-地中海"
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# my-evolution/Locations.h:1443
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
msgid "Monroe"
msgstr "门罗"
@@ -29135,7 +30875,7 @@ msgstr "门罗"
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/gui/widgets/e-addressbook-view.c:882
# my-evolution/Locations.h:1444
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
#, fuzzy
msgid "Montague"
msgstr "经理"
@@ -29143,37 +30883,37 @@ msgstr "经理"
# ui/evolution-calendar.xml.h:20
# ui/evolution-calendar.xml.h:20
# my-evolution/Locations.h:1445
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
msgid "Montana"
msgstr "蒙大拿"
# my-evolution/Locations.h:1446
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
msgid "Mont-de-Marsan"
msgstr ""
# my-evolution/Locations.h:1447
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
msgid "Monte Argentario"
msgstr ""
# my-evolution/metar.c:160
# my-evolution/metar.c:160
# my-evolution/Locations.h:1448
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
#, fuzzy
msgid "Monte Bisbino"
msgstr "中雪"
# my-evolution/Locations.h:1449
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
msgid "Monte Calamita"
msgstr ""
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# my-evolution/Locations.h:1450
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
#, fuzzy
msgid "Monte Cimone"
msgstr "月视图"
@@ -29181,20 +30921,20 @@ msgstr "月视图"
# addressbook/gui/contact-editor/fulladdr.glade.h:140
# addressbook/gui/contact-editor/fulladdr.glade.h:140
# my-evolution/Locations.h:1451
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
#, fuzzy
msgid "Montego Bay"
msgstr "蒙古"
# my-evolution/Locations.h:1452
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
msgid "Monte Malanotte"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# my-evolution/Locations.h:1453
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
#, fuzzy
msgid "Monterey"
msgstr "蒙特塞拉特群岛"
@@ -29202,43 +30942,43 @@ msgstr "蒙特塞拉特群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# my-evolution/Locations.h:1454
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
#, fuzzy
msgid "Monterrey"
msgstr "蒙特塞拉特群岛"
# my-evolution/Locations.h:1455
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
msgid "Monte Scuro"
msgstr ""
# my-evolution/Locations.h:1456
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
msgid "Monte Terminillo"
msgstr ""
# my-evolution/Locations.h:1457
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
msgid "Montevideo/Carrasco"
msgstr "蒙德维的亚/Carrasco"
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# my-evolution/Locations.h:1458
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
#, fuzzy
msgid "Montgomery"
msgstr "蒙特塞拉特群岛"
# my-evolution/Locations.h:1459
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
msgid "Montgomery-Maxwell AFB"
msgstr "蒙哥马利-麦克斯维尔空军基地"
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# my-evolution/Locations.h:1460
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
#, fuzzy
msgid "Monticello"
msgstr "摩纳哥"
@@ -29246,42 +30986,42 @@ msgstr "摩纳哥"
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# my-evolution/Locations.h:1461
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
msgid "Montpelier"
msgstr "蒙比利埃"
# my-evolution/Locations.h:1462
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
msgid "Montreal Dorval"
msgstr "蒙特利尔 Dorval"
# my-evolution/Locations.h:1463
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
msgid "Montreal Mirabel"
msgstr "蒙特利尔 米拉贝尔"
# my-evolution/Locations.h:1464
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
msgid "Montreal Saint-Hubert"
msgstr "蒙特利尔 圣休伯特"
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# my-evolution/Locations.h:1465
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
#, fuzzy
msgid "Montrose"
msgstr "蒙特塞拉特群岛"
# my-evolution/Locations.h:1466
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
msgid "Montrose (2)"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:140
# addressbook/gui/contact-editor/fulladdr.glade.h:140
# my-evolution/Locations.h:1467
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
msgid "Morelia"
msgstr "莫雷利亚"
@@ -29290,7 +31030,7 @@ msgstr "莫雷利亚"
# addressbook/backend/ebook/e-card-simple.c:69
# addressbook/gui/widgets/e-addressbook-view.c:858
# my-evolution/Locations.h:1468
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
#, fuzzy
msgid "Morgantown"
msgstr "组织"
@@ -29300,28 +31040,28 @@ msgstr "组织"
# addressbook/backend/ebook/e-card-simple.c:63
# addressbook/gui/contact-editor/e-contact-editor.c:1659
# my-evolution/Locations.h:1469
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
#, fuzzy
msgid "Moriarty"
msgstr "主要"
# my-evolution/Locations.h:1471
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
msgid "Morristown"
msgstr ""
# my-evolution/Locations.h:1472
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
msgid "Moscow Domodedovo"
msgstr "莫斯科 Domodedovo"
# my-evolution/Locations.h:1473
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
msgid "Moscow Sheremetyevo"
msgstr "莫斯科 Sheremetyevo"
# my-evolution/Locations.h:1474
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
msgid "Moses Lake"
msgstr "摩西湖"
@@ -29332,48 +31072,48 @@ msgstr "摩西湖"
# addressbook/gui/contact-editor/contact-editor.glade.h:20
# addressbook/gui/contact-editor/e-contact-editor.c:1655
# my-evolution/Locations.h:1475
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
#, fuzzy
msgid "Mosinee"
msgstr "手机"
# my-evolution/Locations.h:1476
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
msgid "Mosjoen"
msgstr ""
# my-evolution/Locations.h:1477
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
msgid "Moultrie"
msgstr ""
# my-evolution/Locations.h:1478
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
msgid "Mountain Home"
msgstr ""
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# my-evolution/Locations.h:1479
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
#, fuzzy
msgid "Mountain View"
msgstr "月视图"
# my-evolution/Locations.h:1480
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
msgid "Mount Clemens"
msgstr ""
# my-evolution/Locations.h:1481
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
msgid "Mount Holly"
msgstr ""
# my-evolution/metar.c:65
# my-evolution/metar.c:65
# my-evolution/Locations.h:1482
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
#, fuzzy
msgid "Mount Shasta"
msgstr "东南"
@@ -29381,79 +31121,79 @@ msgstr "东南"
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# my-evolution/Locations.h:1483
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
#, fuzzy
msgid "Mount Vernon"
msgstr "月视图"
# my-evolution/Locations.h:1484
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
msgid "Mount Wilson"
msgstr ""
# my-evolution/Locations.h:1485
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
msgid "Mt Washington"
msgstr "Mt 华盛顿"
# my-evolution/Locations.h:1486
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
msgid "Mugla/Dalaman"
msgstr ""
# my-evolution/Locations.h:1487
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
msgid "Muir"
msgstr ""
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/backend/ebook/e-card-simple.c:93
# my-evolution/Locations.h:1488
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
#, fuzzy
msgid "Mullan"
msgstr "经理"
# my-evolution/Locations.h:1489
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
msgid "Mullen"
msgstr ""
# my-evolution/Locations.h:1490
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
msgid "Munchen"
msgstr ""
# calendar/gui/goto-dialog.glade.h:9
# calendar/gui/goto-dialog.glade.h:9
# my-evolution/Locations.h:1491
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
#, fuzzy
msgid "Muncie"
msgstr "六月"
# my-evolution/Locations.h:1492
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
msgid "Munster/Osnabruck"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# my-evolution/Locations.h:1493
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
#, fuzzy
msgid "Murcia"
msgstr "毛里塔尼亚"
# my-evolution/Locations.h:1494
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
msgid "Murmansk"
msgstr "摩尔曼斯克"
# addressbook/gui/contact-editor/fullname.glade.h:11
# addressbook/gui/contact-editor/fullname.glade.h:11
# my-evolution/Locations.h:1495
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
#, fuzzy
msgid "Mus"
msgstr "女士"
@@ -29461,126 +31201,126 @@ msgstr "女士"
# addressbook/gui/contact-editor/fulladdr.glade.h:133
# addressbook/gui/contact-editor/fulladdr.glade.h:133
# my-evolution/Locations.h:1496
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
#, fuzzy
msgid "Muscatine"
msgstr "马提尼可岛"
# my-evolution/Locations.h:1497
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
msgid "Muscle Shoals"
msgstr ""
# my-evolution/Locations.h:1498
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
msgid "Muskegon"
msgstr ""
# addressbook/printing/e-contact-print.glade.h:8
# my-evolution/metar.c:33
# my-evolution/Locations.h:1499
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
#, fuzzy
msgid "Mykonos"
msgstr "节"
# my-evolution/Locations.h:1500
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
msgid "Myrtle Beach"
msgstr ""
# my-evolution/Locations.h:1501
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
msgid "Nabesna/Devil Mt."
msgstr ""
# my-evolution/Locations.h:1502
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
msgid "Nacogdoches"
msgstr ""
# my-evolution/Locations.h:1503
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
msgid "Nagasaki Airport"
msgstr "长崎机场"
# my-evolution/Locations.h:1504
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
msgid "Nagoya Airport"
msgstr "名古屋机场"
# my-evolution/Locations.h:1505
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
msgid "Nagpur Sonegaon"
msgstr "那格浦尔 Sonegaon"
# my-evolution/Locations.h:1506
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
msgid "Naha Airport"
msgstr "那霸机场"
# addressbook/gui/contact-editor/fulladdr.glade.h:18
# addressbook/gui/contact-editor/fulladdr.glade.h:18
# my-evolution/Locations.h:1507
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
#, fuzzy
msgid "Najran"
msgstr "巴林岛"
# my-evolution/Locations.h:1508
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
msgid "Nakashibetsu Airport"
msgstr ""
# my-evolution/Locations.h:1509
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
msgid "Nalchik"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# my-evolution/Locations.h:1510
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
#, fuzzy
msgid "Namsos"
msgstr "老挝"
# my-evolution/Locations.h:1511
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
msgid "Nancy-Essey"
msgstr ""
# my-evolution/Locations.h:1512
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
msgid "Nancy-Ochey"
msgstr ""
# my-evolution/Locations.h:1513
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
msgid "Nankishirahama Airport"
msgstr ""
# mail/mail-callbacks.c:2128 widgets/misc/e-messagebox.c:159
# mail/mail-callbacks.c:2247 widgets/misc/e-messagebox.c:159
# my-evolution/Locations.h:1514
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
msgid "Nanning"
msgstr "南宁"
# my-evolution/Locations.h:1515
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
msgid "Nantes Adlantique"
msgstr "南特 Adlantique"
# my-evolution/Locations.h:1516
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
msgid "Nantucket"
msgstr "楠塔基特"
# addressbook/gui/contact-editor/fulladdr.glade.h:147
# addressbook/gui/contact-editor/fulladdr.glade.h:147
# my-evolution/Locations.h:1517
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
#, fuzzy
msgid "Napa"
msgstr "尼泊尔"
@@ -29588,163 +31328,163 @@ msgstr "尼泊尔"
# mail/mail-config.glade.h:46
# mail/mail-config.glade.h:46
# my-evolution/Locations.h:1518
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
msgid "Naples"
msgstr "那不勒斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:130
# addressbook/gui/contact-editor/fulladdr.glade.h:130
# my-evolution/Locations.h:1519
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
msgid "Napoli"
msgstr "那不勒斯"
# addressbook/backend/ebook/e-card-simple.c:95
# addressbook/backend/ebook/e-card-simple.c:95
# my-evolution/Locations.h:1520
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
msgid "Narvik"
msgstr "纳尔维克"
# my-evolution/Locations.h:1521
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
msgid "Nasa Shuttle"
msgstr ""
# my-evolution/Locations.h:1522
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
msgid "Nashua"
msgstr ""
# my-evolution/Locations.h:1523
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
msgid "Nashville"
msgstr "纳什维尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# calendar/zones.h:137
# my-evolution/Locations.h:1524
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
msgid "Nassau"
msgstr "拿骚"
# addressbook/gui/contact-editor/fulladdr.glade.h:172
# addressbook/gui/contact-editor/fulladdr.glade.h:172
# my-evolution/Locations.h:1525
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
msgid "Natal"
msgstr "纳塔耳"
# mail/mail-search.c:346
# mail/mail-search.c:346
# my-evolution/Locations.h:1526
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
msgid "Natchez"
msgstr "纳齐兹"
# my-evolution/Locations.h:1527
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
msgid "Nawabshah"
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
# my-evolution/Locations.h:1528
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
msgid "Nebraska"
msgstr "内布拉斯加州"
# my-evolution/Locations.h:1529
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
msgid "Needles"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:89
# addressbook/gui/contact-editor/fulladdr.glade.h:89
# my-evolution/Locations.h:1530
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
#, fuzzy
msgid "Nenana"
msgstr "格林纳达"
# my-evolution/Locations.h:1532
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
msgid "Neuquen"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:89
# addressbook/gui/contact-editor/fulladdr.glade.h:89
# my-evolution/Locations.h:1533
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
msgid "Nevada"
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
# my-evolution/Locations.h:1534
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
msgid "Newark"
msgstr "内瓦克"
# my-evolution/e-summary-rdf.c:528
# my-evolution/e-summary-rdf.c:528
# my-evolution/Locations.h:1535
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
msgid "New Bedford"
msgstr "新贝德福德"
# ui/evolution.xml.h:44
# ui/evolution.xml.h:44
# my-evolution/Locations.h:1536
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
msgid "New Bern"
msgstr "新伯尔尼"
# my-evolution/Locations.h:1537
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
msgid "New Braunfels"
msgstr ""
# my-evolution/Locations.h:1538
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
msgid "New Brunswick"
msgstr ""
# my-evolution/Locations.h:1539
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
msgid "Newburgh"
msgstr ""
# mail/mail-config.glade.h:46
# mail/mail-config.glade.h:46
# my-evolution/Locations.h:1540
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
msgid "Newcastle"
msgstr "纽卡斯尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:151
# addressbook/gui/contact-editor/fulladdr.glade.h:151
# my-evolution/Locations.h:1541
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
msgid "New Delhi/Palam"
msgstr "新德里/Palam"
# addressbook/gui/contact-editor/fulladdr.glade.h:151
# addressbook/gui/contact-editor/fulladdr.glade.h:151
# my-evolution/Locations.h:1542
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
msgid "Newfoundland"
msgstr "纽芬兰"
# my-evolution/Locations.h:1543
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
msgid "New Hampshire"
msgstr "新汉普郡"
# addressbook/gui/contact-editor/fulladdr.glade.h:150
# addressbook/gui/contact-editor/fulladdr.glade.h:150
# my-evolution/Locations.h:1544
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
#, fuzzy
msgid "New Haven"
msgstr "新喀里多尼亚"
@@ -29752,144 +31492,144 @@ msgstr "新喀里多尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:150
# addressbook/gui/contact-editor/fulladdr.glade.h:150
# my-evolution/Locations.h:1545
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
msgid "New Iberia"
msgstr "新伊比利亚"
# ui/evolution-mail-global.xml.h:10
# ui/evolution-mail-global.xml.h:10
# my-evolution/Locations.h:1546
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
msgid "New Jersey"
msgstr "新泽西州"
# addressbook/gui/contact-editor/fulladdr.glade.h:137
# addressbook/gui/contact-editor/fulladdr.glade.h:137
# my-evolution/Locations.h:1547
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
msgid "New Mexico"
msgstr "新墨西哥州"
# addressbook/gui/contact-editor/fulladdr.glade.h:151
# addressbook/gui/contact-editor/fulladdr.glade.h:151
# my-evolution/Locations.h:1548
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
msgid "New Orleans"
msgstr "新奥尔良"
# my-evolution/Locations.h:1549
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
msgid "New Orleans-Lakefront"
msgstr "新奥尔良-Lakefront"
# my-evolution/Locations.h:1550
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
msgid "New Orleans NAS"
msgstr "新奥尔良国家科学院"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/Locations.h:1551
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
#, fuzzy
msgid "Newport"
msgstr "北"
# my-evolution/Locations.h:1552
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
msgid "Newport News"
msgstr ""
# my-evolution/Locations.h:1553
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
msgid "New Port Richey"
msgstr ""
# ui/evolution.xml.h:44
# ui/evolution.xml.h:44
# my-evolution/Locations.h:1554
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
#, fuzzy
msgid "New River"
msgstr "新建文件夹(_N)"
# my-evolution/Locations.h:1555
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
msgid "New Tokyo International Airport"
msgstr "东京新国际机场"
# widgets/misc/e-charset-picker.c:101
# widgets/misc/e-charset-picker.c:101
# my-evolution/Locations.h:1556
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
msgid "Newton"
msgstr "牛顿"
# ui/evolution.xml.h:44
# ui/evolution.xml.h:44
# my-evolution/Locations.h:1557
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
msgid "New York"
msgstr "纽约"
# my-evolution/Locations.h:1558
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
msgid "New York-JFK Arpt"
msgstr "纽约-JFK Arpt"
# my-evolution/Locations.h:1559
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
msgid "New York-La Guardia"
msgstr "纽约-La Guardia"
# my-evolution/Locations.h:1561
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
msgid "Niagara Falls"
msgstr "尼亚加拉瀑布"
# my-evolution/Locations.h:1563
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
msgid "Nice-Cote d'Azur"
msgstr ""
# my-evolution/Locations.h:1564
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
msgid "Niigata Airport"
msgstr "新滹机场"
# addressbook/printing/e-contact-print.glade.h:6
# addressbook/printing/e-contact-print.glade.h:6
# my-evolution/Locations.h:1565
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
msgid "Nimes-Garons"
msgstr "尼姆-Garons"
# addressbook/gui/contact-editor/fulladdr.glade.h:196
# addressbook/gui/contact-editor/fulladdr.glade.h:196
# my-evolution/Locations.h:1566
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
#, fuzzy
msgid "Nipawin"
msgstr "西班牙"
# my-evolution/Locations.h:1567
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
#, fuzzy
msgid "Nis"
msgstr "是"
# my-evolution/Locations.h:1568
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
msgid "Nizhny Novgorod"
msgstr ""
# my-evolution/Locations.h:1569
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
msgid "N Las Vegas"
msgstr ""
# my-evolution/Locations.h:1570
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
msgid "N Myrtle Beach"
msgstr ""
@@ -29902,7 +31642,7 @@ msgstr ""
# calendar/gui/dialogs/task-details-page.glade.h:9
# calendar/gui/e-calendar-table.c:406 mail/message-list.c:661
# my-evolution/Locations.h:1571
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
#, fuzzy
msgid "Nogales"
msgstr "中"
@@ -29910,28 +31650,28 @@ msgstr "中"
# addressbook/backend/ebook/e-card-simple.c:61
# addressbook/backend/ebook/e-card-simple.c:61
# my-evolution/Locations.h:1572
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
msgid "Nome"
msgstr "诺母"
# addressbook/gui/contact-editor/fulladdr.glade.h:156
# addressbook/gui/contact-editor/fulladdr.glade.h:156
# my-evolution/Locations.h:1573
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
msgid "Norfolk"
msgstr "诺福克"
# addressbook/gui/contact-editor/fulladdr.glade.h:156
# addressbook/gui/contact-editor/fulladdr.glade.h:156
# my-evolution/Locations.h:1575
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
msgid "Norfolk NAS"
msgstr "诺福克国家科学院"
# mail/mail-mt.c:901
# mail/mail-mt.c:901
# my-evolution/Locations.h:1576
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
#, fuzzy
msgid "Norrkoping"
msgstr "正在工作"
@@ -29939,27 +31679,27 @@ msgstr "正在工作"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/Locations.h:1577
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
msgid "North Adams"
msgstr "北亚当斯"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/Locations.h:1578
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
#, fuzzy
msgid "North Bend"
msgstr "北"
# my-evolution/Locations.h:1579
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
msgid "North Carolina"
msgstr "北卡罗莱纳州"
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# my-evolution/Locations.h:1580
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
#, fuzzy
msgid "North Conway"
msgstr "挪威"
@@ -29967,31 +31707,31 @@ msgstr "挪威"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/Locations.h:1581
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
msgid "North Dakota"
msgstr "北达科他"
# my-evolution/Locations.h:1582
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
msgid "Northeast Philadelphia"
msgstr "东北费城"
# my-evolution/Locations.h:1583
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
msgid "North Kingstown"
msgstr "北金斯敦"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/Locations.h:1584
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
msgid "North Platte"
msgstr "北普拉特"
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# my-evolution/Locations.h:1585
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
#, fuzzy
msgid "Northway"
msgstr "挪威"
@@ -29999,7 +31739,7 @@ msgstr "挪威"
# addressbook/gui/contact-editor/fulladdr.glade.h:80
# addressbook/gui/contact-editor/fulladdr.glade.h:80
# my-evolution/Locations.h:1586
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
#, fuzzy
msgid "Northwest Territories"
msgstr "法属南部地区"
@@ -30007,7 +31747,7 @@ msgstr "法属南部地区"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/Locations.h:1588
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
#, fuzzy
msgid "Norwich"
msgstr "北"
@@ -30015,7 +31755,7 @@ msgstr "北"
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# my-evolution/Locations.h:1589
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
#, fuzzy
msgid "Norwood"
msgstr "挪威"
@@ -30025,33 +31765,33 @@ msgstr "挪威"
# addressbook/backend/ebook/e-card-simple.c:97
# addressbook/gui/widgets/e-addressbook-view.c:886
# my-evolution/Locations.h:1590
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
#, fuzzy
msgid "Notodden"
msgstr "注释"
# my-evolution/Locations.h:1591
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
msgid "Novara/Cameri"
msgstr "诺瓦蜡/Cameri"
# my-evolution/Locations.h:1592
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
msgid "Nova Scotia"
msgstr "新斯科舍"
# my-evolution/Locations.h:1593
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
msgid "Novosibirsk"
msgstr "新西伯利亚"
# my-evolution/Locations.h:1594
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
msgid "Nueva Gerona"
msgstr ""
# my-evolution/Locations.h:1595
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
msgid "Nueva Ocotepeque"
msgstr ""
@@ -30062,60 +31802,60 @@ msgstr ""
# calendar/gui/dialogs/task-details-page.glade.h:10
# calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
# my-evolution/Locations.h:1596
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
#, fuzzy
msgid "Nuevo Laredo"
msgstr "尚未开始"
# my-evolution/Locations.h:1597
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
msgid "Nurnberg"
msgstr ""
# my-evolution/Locations.h:1598
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
msgid "Nyutabaru Ab"
msgstr ""
# my-evolution/Locations.h:1599
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
msgid "Oahu"
msgstr "瓦胡岛"
# my-evolution/Locations.h:1600
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
msgid "Oak Harbor"
msgstr "橡树湾"
# addressbook/gui/contact-editor/fulladdr.glade.h:208
# addressbook/gui/contact-editor/fulladdr.glade.h:208
# my-evolution/Locations.h:1601
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
msgid "Oakland"
msgstr "奥克兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:108
# addressbook/gui/contact-editor/fulladdr.glade.h:108
# my-evolution/Locations.h:1602
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
#, fuzzy
msgid "Oaxaca"
msgstr "牙买加"
# my-evolution/Locations.h:1603
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
msgid "Oberpfaffenhofen"
msgstr ""
# my-evolution/Locations.h:1604
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
msgid "Obihiro Airport"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# my-evolution/Locations.h:1605
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
#, fuzzy
msgid "Ocala"
msgstr "帕劳群岛"
@@ -30123,7 +31863,7 @@ msgstr "帕劳群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:102
# addressbook/gui/contact-editor/fulladdr.glade.h:102
# my-evolution/Locations.h:1606
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
#, fuzzy
msgid "Oceanside"
msgstr "冰岛"
@@ -30133,7 +31873,7 @@ msgstr "冰岛"
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
# ui/evolution-message-composer.xml.h:13
# my-evolution/Locations.h:1607
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
msgid "Odense"
msgstr "欧登塞"
@@ -30142,7 +31882,7 @@ msgstr "欧登塞"
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
# ui/evolution-message-composer.xml.h:13
# my-evolution/Locations.h:1608
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
#, fuzzy
msgid "Odesa"
msgstr "打开"
@@ -30150,7 +31890,7 @@ msgstr "打开"
# mail/message-list.c:640
# mail/message-list.c:646
# my-evolution/Locations.h:1609
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
#, fuzzy
msgid "Oelwen"
msgstr "可见"
@@ -30160,22 +31900,22 @@ msgstr "可见"
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
# ui/evolution-message-composer.xml.h:13
# my-evolution/Locations.h:1610
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
msgid "Ogden"
msgstr "奥格登"
# my-evolution/Locations.h:1611
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
msgid "Ogden-Hill AFB"
msgstr "奥格登山空军基地"
# my-evolution/Locations.h:1612
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
msgid "Ogdensburg"
msgstr ""
# my-evolution/Locations.h:1613
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
msgid "Ohio"
msgstr "俄亥俄州"
@@ -30190,63 +31930,63 @@ msgstr "俄亥俄州"
# addressbook/gui/contact-editor/e-contact-editor.c:1714
# mail/mail-config.glade.h:49
# my-evolution/Locations.h:1614
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
#, fuzzy
msgid "Ohrid"
msgstr "其它"
# my-evolution/Locations.h:1615
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
msgid "Oita Airport"
msgstr "大分机场"
# addressbook/gui/contact-editor/fulladdr.glade.h:53
# addressbook/gui/contact-editor/fulladdr.glade.h:53
# my-evolution/Locations.h:1616
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
#, fuzzy
msgid "Ojika Island"
msgstr "库克群岛"
# my-evolution/Locations.h:1617
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
msgid "Okayama Airport"
msgstr "冈山机场"
# my-evolution/Locations.h:1618
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
msgid "Oki Airport"
msgstr ""
# my-evolution/Locations.h:1619
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
msgid "Okinoerabu"
msgstr ""
# my-evolution/Locations.h:1620
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
msgid "Oklahoma"
msgstr "俄克拉荷马州"
# my-evolution/Locations.h:1621
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
msgid "Oklahoma City"
msgstr "俄克拉荷马城"
# my-evolution/Locations.h:1622
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
msgid "Oklahoma City-Bethany"
msgstr "俄克拉荷马城-Bethany"
# my-evolution/Locations.h:1623
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
msgid "Oklahoma City-Midwest City"
msgstr "俄克拉荷马城-中西部城市"
# addressbook/gui/contact-editor/fulladdr.glade.h:33
# addressbook/gui/contact-editor/fulladdr.glade.h:33
# my-evolution/Locations.h:1624
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
#, fuzzy
msgid "Okushiri Island"
msgstr "不列颠处女群岛"
@@ -30262,68 +32002,68 @@ msgstr "不列颠处女群岛"
# addressbook/gui/contact-editor/e-contact-editor.c:1714
# mail/mail-config.glade.h:49
# my-evolution/Locations.h:1625
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
#, fuzzy
msgid "Olathe"
msgstr "其它"
# my-evolution/Locations.h:1626
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
msgid "Olathe/Ind."
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:3
# addressbook/gui/contact-editor/fulladdr.glade.h:3
# my-evolution/Locations.h:1627
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
#, fuzzy
msgid "Olbia"
msgstr "阿尔巴尼亚"
# my-evolution/Locations.h:1628
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
msgid "Olympia"
msgstr "奥林匹亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:159
# addressbook/gui/contact-editor/fulladdr.glade.h:159
# my-evolution/Locations.h:1629
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
msgid "Omaha"
msgstr "奥马哈"
# my-evolution/Locations.h:1630
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
msgid "Omaha-Bellevue"
msgstr "奥马哈-Bellevue"
# addressbook/gui/contact-editor/fulladdr.glade.h:159
# addressbook/gui/contact-editor/fulladdr.glade.h:159
# my-evolution/Locations.h:1631
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
#, fuzzy
msgid "Omak"
msgstr "阿曼"
# my-evolution/Locations.h:1633
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
msgid "Ominato Ab"
msgstr ""
# my-evolution/Locations.h:1634
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
msgid "Omsk"
msgstr "鄂木斯克"
# my-evolution/Locations.h:1635
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
msgid "O'Neill"
msgstr ""
# addressbook/printing/e-contact-print.glade.h:24
# addressbook/printing/e-contact-print.glade.h:24
# my-evolution/Locations.h:1636
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
msgid "Ontario"
msgstr "安大略"
@@ -30332,55 +32072,55 @@ msgstr "安大略"
# calendar/gui/dialogs/meeting-page.etspec.h:1
# calendar/gui/e-meeting-time-sel.etspec.h:1
# my-evolution/Locations.h:1637
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
msgid "Oostende"
msgstr "奥斯坦德"
# addressbook/gui/contact-editor/fulladdr.glade.h:159
# addressbook/gui/contact-editor/fulladdr.glade.h:159
# my-evolution/Locations.h:1638
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
msgid "Oran"
msgstr "奥兰"
# my-evolution/Locations.h:1639
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
msgid "Oran/Es Senia"
msgstr "奥兰/Es Senia"
# addressbook/gui/contact-editor/fulladdr.glade.h:77
# addressbook/gui/contact-editor/fulladdr.glade.h:77
# my-evolution/Locations.h:1640
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
msgid "Orange"
msgstr "奥林奇"
# my-evolution/Locations.h:1641
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
msgid "Orange City"
msgstr "奥林奇城"
# my-evolution/Locations.h:1642
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
msgid "Ord-Sharp"
msgstr ""
# addressbook/backend/ebook/e-card-simple.c:69
# addressbook/backend/ebook/e-card-simple.c:69
# my-evolution/Locations.h:1643
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
msgid "Oregon"
msgstr "俄勒冈州"
# my-evolution/Locations.h:1644
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
msgid "Orenburg"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# my-evolution/Locations.h:1645
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
#, fuzzy
msgid "Orland"
msgstr "爱尔兰"
@@ -30388,153 +32128,153 @@ msgstr "爱尔兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# my-evolution/Locations.h:1646
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
msgid "Orlando"
msgstr "奥兰多"
# my-evolution/Locations.h:1647
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
msgid "Orlando (Orlando International)"
msgstr "奥兰多 (奥兰多国际)"
# my-evolution/Locations.h:1648
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
msgid "Orsta-Volda"
msgstr ""
# widgets/misc/e-messagebox.c:166
# widgets/misc/e-messagebox.c:166
# my-evolution/Locations.h:1649
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
msgid "Oruro"
msgstr "奥鲁罗"
# my-evolution/Locations.h:1650
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
msgid "Osaka International Airport"
msgstr "大阪国际机场"
# my-evolution/Locations.h:1651
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
msgid "Osan Ab"
msgstr ""
# my-evolution/Locations.h:1652
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
#, fuzzy
msgid "Oscoda"
msgstr "秒"
# my-evolution/Locations.h:1653
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
msgid "Oseberg A"
msgstr ""
# my-evolution/Locations.h:1654
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
msgid "Oshima Airport"
msgstr ""
# my-evolution/Locations.h:1655
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
msgid "Oshkosh"
msgstr ""
# my-evolution/Locations.h:1656
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
msgid "Oslo/Gardenmoen"
msgstr "奥斯陆/Gardenmoen"
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# my-evolution/Locations.h:1657
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
msgid "Ostrava"
msgstr "俄斯特拉发"
# my-evolution/Locations.h:1658
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
msgid "Ottawa"
msgstr "渥太华"
# my-evolution/Locations.h:1659
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
msgid "Ottumwa"
msgstr ""
# my-evolution/Locations.h:1660
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
msgid "Owensboro"
msgstr ""
# my-evolution/Locations.h:1661
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
#, fuzzy
msgid "Owyhee"
msgstr "周"
# my-evolution/Locations.h:1662
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
msgid "Oxford"
msgstr "牛津"
# my-evolution/Locations.h:1663
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
msgid "Oxnard"
msgstr ""
# my-evolution/Locations.h:1664
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
msgid "Ozark"
msgstr "奥扎克"
# my-evolution/Locations.h:1665
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
msgid "Ozuki Ab"
msgstr ""
# my-evolution/Locations.h:1666
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
msgid "Paderborn-Haxterberg"
msgstr "帕德伯恩-Haxterberg"
# my-evolution/Locations.h:1667
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
msgid "Padova"
msgstr "帕多瓦"
# my-evolution/Locations.h:1668
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
msgid "Paducah"
msgstr ""
# my-evolution/Locations.h:1669
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
msgid "Paekado"
msgstr ""
# my-evolution/Locations.h:1670
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
msgid "Paengnyongdo Ab"
msgstr ""
# addressbook/printing/e-contact-print.glade.h:25
# addressbook/printing/e-contact-print.glade.h:25
# my-evolution/Locations.h:1671
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
#, fuzzy
msgid "Paganella"
msgstr "页面"
# my-evolution/Locations.h:1674
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
msgid "Pa Kuei/Bakuai"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# my-evolution/Locations.h:1675
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
#, fuzzy
msgid "Palacios"
msgstr "帕劳群岛"
@@ -30542,19 +32282,19 @@ msgstr "帕劳群岛"
# addressbook/printing/e-contact-print.glade.h:27
# addressbook/printing/e-contact-print.glade.h:27
# my-evolution/Locations.h:1676
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
msgid "Palermo"
msgstr "巴勒莫"
# my-evolution/Locations.h:1677
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
msgid "Palma de Mallorca"
msgstr "帕尔马 德 马略卡"
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# my-evolution/Locations.h:1678
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
#, fuzzy
msgid "Palmdale"
msgstr "帕劳群岛"
@@ -30566,27 +32306,27 @@ msgstr "帕劳群岛"
# addressbook/gui/contact-editor/e-contact-editor.c:1658
# addressbook/gui/widgets/e-addressbook-view.c:870
# my-evolution/Locations.h:1679
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
msgid "Palmer"
msgstr "帕默"
# mail/mail-accounts.c:783 mail/mail-config.glade.h:42
# mail/mail-accounts.c:798 mail/mail-config.glade.h:42
# my-evolution/Locations.h:1680
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
#, fuzzy
msgid "Palm Springs"
msgstr "邮件设置"
# my-evolution/Locations.h:1681
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
msgid "Palo Alto"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# my-evolution/Locations.h:1682
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
#, fuzzy
msgid "Pamplona"
msgstr "帕劳群岛"
@@ -30594,7 +32334,7 @@ msgstr "帕劳群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:163
# addressbook/gui/contact-editor/fulladdr.glade.h:163
# my-evolution/Locations.h:1684
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
msgid "Panama City"
msgstr "巴拿马城"
@@ -30609,7 +32349,7 @@ msgstr "巴拿马城"
# calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
# camel/camel-service.c:610 camel/camel-service.c:646
# my-evolution/Locations.h:1685
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
#, fuzzy
msgid "Pantelleria"
msgstr "已经取消"
@@ -30617,7 +32357,7 @@ msgstr "已经取消"
# addressbook/printing/e-contact-print.glade.h:27
# addressbook/printing/e-contact-print.glade.h:27
# my-evolution/Locations.h:1686
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
#, fuzzy
msgid "Papa"
msgstr "纸张"
@@ -30625,7 +32365,7 @@ msgstr "纸张"
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# my-evolution/Locations.h:1687
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
#, fuzzy
msgid "Paphos"
msgstr "老挝"
@@ -30633,29 +32373,29 @@ msgstr "老挝"
# addressbook/printing/e-contact-print.glade.h:21
# addressbook/printing/e-contact-print.glade.h:21
# my-evolution/Locations.h:1689
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
msgid "Paris"
msgstr "巴黎"
# my-evolution/Locations.h:1690
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
msgid "Paris/Charles De Gaulle"
msgstr "巴黎/Charles De Gaulle"
# my-evolution/Locations.h:1691
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
msgid "Paris/Le Bourget"
msgstr "巴黎/Le Bourget"
# my-evolution/metar.c:359
# my-evolution/metar.c:359
# my-evolution/Locations.h:1692
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
msgid "Paris/Orly"
msgstr "巴黎/Orly"
# my-evolution/Locations.h:1693
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
msgid "Parkersburg"
msgstr ""
@@ -30666,72 +32406,72 @@ msgstr ""
# camel/providers/nntp/camel-nntp-store.c:149
# camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
# my-evolution/Locations.h:1694
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
#, fuzzy
msgid "Pasco"
msgstr "密码"
# my-evolution/Locations.h:1695
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
msgid "Paso De Los Libres"
msgstr ""
# my-evolution/Locations.h:1696
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
msgid "Paso Robles"
msgstr ""
# my-evolution/Locations.h:1697
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
msgid "Passo dei Giovi"
msgstr ""
# my-evolution/Locations.h:1698
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
msgid "Passo della Cisa"
msgstr ""
# my-evolution/Locations.h:1699
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
msgid "Passo Resia"
msgstr ""
# my-evolution/Locations.h:1700
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
msgid "Passo Rolle"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:163
# addressbook/gui/contact-editor/fulladdr.glade.h:163
# my-evolution/Locations.h:1701
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
msgid "Patna"
msgstr "巴特纳"
# my-evolution/Locations.h:1702
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
msgid "Patterson"
msgstr "帕特森"
# my-evolution/Locations.h:1703
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
msgid "Patuxent River"
msgstr ""
# my-evolution/Locations.h:1704
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
msgid "Pau/Pyrenees"
msgstr "Pau/比利牛斯山脉"
# my-evolution/Locations.h:1705
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
msgid "Paxson"
msgstr ""
# my-evolution/metar.c:326
# my-evolution/metar.c:326
# my-evolution/Locations.h:1706
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
#, fuzzy
msgid "Paysandu"
msgstr "重沙尘"
@@ -30739,7 +32479,7 @@ msgstr "重沙尘"
# calendar/gui/dialogs/alarm-options.glade.h:3
# calendar/gui/dialogs/alarm-options.glade.h:3
# my-evolution/Locations.h:1707
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
#, fuzzy
msgid "Payson"
msgstr "播放声音:"
@@ -30747,7 +32487,7 @@ msgstr "播放声音:"
# widgets/misc/e-messagebox.c:173
# widgets/misc/e-messagebox.c:173
# my-evolution/Locations.h:1708
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
#, fuzzy
msgid "Pellston"
msgstr "问题"
@@ -30755,7 +32495,7 @@ msgstr "问题"
# ui/my-evolution.xml.h:5
# ui/my-evolution.xml.h:5
# my-evolution/Locations.h:1709
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
#, fuzzy
msgid "Pelotas"
msgstr "重新载入"
@@ -30763,124 +32503,124 @@ msgstr "重新载入"
# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
# my-evolution/Locations.h:1710
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
#, fuzzy
msgid "Pendleton"
msgstr "选择:"
# my-evolution/Locations.h:1711
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
msgid "Pennsylvania"
msgstr "宾西法尼亚州"
# my-evolution/Locations.h:1712
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
msgid "Penn Yan"
msgstr "佩恩 Yan"
# my-evolution/Locations.h:1713
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
msgid "Pensacola"
msgstr ""
# my-evolution/Locations.h:1714
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
msgid "Pensacola NAS"
msgstr ""
# my-evolution/Locations.h:1715
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
msgid "People's Republic of China"
msgstr "中华人民共和国"
# addressbook/gui/contact-editor/fulladdr.glade.h:83
# addressbook/gui/contact-editor/fulladdr.glade.h:83
# my-evolution/Locations.h:1716
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
#, fuzzy
msgid "Peoria"
msgstr "格鲁吉亚"
# my-evolution/Locations.h:1717
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
msgid "Pequot Lakes"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# calendar/zones.h:127
# my-evolution/Locations.h:1718
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
msgid "Pereira/Matecana"
msgstr "佩雷拉/Matecana"
# addressbook/backend/ebook/e-card-simple.c:63
# addressbook/backend/ebook/e-card-simple.c:63
# my-evolution/Locations.h:1719
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
#, fuzzy
msgid "Perm"
msgstr "主要"
# my-evolution/Locations.h:1720
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
msgid "Perpignan-Rivesaltes"
msgstr ""
# my-evolution/Locations.h:1721
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
msgid "Perry-Foley"
msgstr "佩里-福利"
# addressbook/gui/contact-editor/fulladdr.glade.h:166
# addressbook/gui/contact-editor/fulladdr.glade.h:166
# my-evolution/Locations.h:1722
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
msgid "Perth"
msgstr "珀斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:166
# addressbook/gui/contact-editor/fulladdr.glade.h:166
# my-evolution/Locations.h:1724
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
msgid "Perugia"
msgstr "佩鲁贾"
# my-evolution/Locations.h:1725
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
msgid "Pescara"
msgstr "佩斯卡拉"
# my-evolution/Locations.h:1726
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
msgid "Petersburg"
msgstr "彼得斯堡"
# my-evolution/Locations.h:1727
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
msgid "Petropavlovsk-Kamchatsky"
msgstr ""
# my-evolution/Locations.h:1728
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
msgid "Petrozavodsk"
msgstr "彼得罗扎沃茨克"
# my-evolution/Locations.h:1729
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
msgid "Philadelphia"
msgstr "费城"
# addressbook/gui/contact-editor/fulladdr.glade.h:167
# addressbook/gui/contact-editor/fulladdr.glade.h:167
# my-evolution/Locations.h:1730
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
msgid "Philip"
msgstr "菲利普"
# addressbook/gui/contact-editor/fulladdr.glade.h:167
# addressbook/gui/contact-editor/fulladdr.glade.h:167
# my-evolution/Locations.h:1731
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
#, fuzzy
msgid "Philipsburg"
msgstr "菲利宾"
@@ -30888,145 +32628,145 @@ msgstr "菲利宾"
# addressbook/gui/contact-editor/fulladdr.glade.h:167
# addressbook/gui/contact-editor/fulladdr.glade.h:167
# my-evolution/Locations.h:1732
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
msgid "Phillips"
msgstr "菲利普"
# calendar/zones.h:146
# my-evolution/Locations.h:1733
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
msgid "Phoenix"
msgstr "凤凰城"
# my-evolution/Locations.h:1734
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
msgid "Phoenix-Deer Valley"
msgstr "凤凰城-鹿谷"
# my-evolution/Locations.h:1735
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
msgid "Phoenix-Goodyear"
msgstr "凤凰城-古德伊尔"
# my-evolution/Locations.h:1736
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
msgid "Phoenix-Luke AFB"
msgstr "凤凰城-卢克空军基地"
# my-evolution/Locations.h:1737
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
msgid "Piacenza"
msgstr ""
# my-evolution/Locations.h:1738
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
msgid "Pian Rosa"
msgstr ""
# my-evolution/Locations.h:1739
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
msgid "Piedras Negras"
msgstr ""
# importers/pine-importer.c:691
# importers/pine-importer.c:691
# my-evolution/Locations.h:1740
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
msgid "Pierre"
msgstr "皮埃尔"
# my-evolution/Locations.h:1741
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
msgid "Pietersburg"
msgstr ""
# calendar/gui/dialogs/recurrence-page.glade.h:6
# calendar/gui/dialogs/recurrence-page.glade.h:6
# my-evolution/Locations.h:1742
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
#, fuzzy
msgid "Pikeville"
msgstr "预览"
# my-evolution/Locations.h:1743
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
msgid "Pine Bluff"
msgstr ""
# my-evolution/Locations.h:1744
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
msgid "Pingtung North"
msgstr ""
# my-evolution/Locations.h:1745
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
msgid "Pingtung South"
msgstr ""
# my-evolution/Locations.h:1746
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
msgid "Pirassununga"
msgstr ""
# my-evolution/Locations.h:1747
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
msgid "Pisa"
msgstr "比萨"
# my-evolution/Locations.h:1748
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
msgid "Pisco"
msgstr "皮斯科"
# my-evolution/Locations.h:1749
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
msgid "Pittsburgh"
msgstr "匹兹堡"
# my-evolution/Locations.h:1750
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
msgid "Pittsburgh-West Mifflin"
msgstr "匹兹堡-West Mifflin"
# my-evolution/Locations.h:1751
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
msgid "Plattsburg"
msgstr ""
# my-evolution/Locations.h:1752
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
msgid "Plovdiv"
msgstr "普罗夫迪夫"
# my-evolution/Locations.h:1753
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
msgid "Plymouth"
msgstr "普利茅斯"
# my-evolution/Locations.h:1754
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
msgid "Pocatello"
msgstr ""
# my-evolution/Locations.h:1755
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
msgid "Pocos De Caldas"
msgstr ""
# my-evolution/Locations.h:1756
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
msgid "Podgorica"
msgstr "波德戈里查"
# my-evolution/metar.c:449
# my-evolution/metar.c:449
# my-evolution/Locations.h:1757
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
msgid "Podgorica Titograd"
msgstr "波德戈里查 铁托格勒"
# my-evolution/Locations.h:1758
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
msgid "Pohang Ab"
msgstr ""
@@ -31035,7 +32775,7 @@ msgstr ""
# addressbook/printing/e-contact-print-envelope.c:215
# addressbook/printing/e-contact-print-envelope.c:236
# my-evolution/Locations.h:1759
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
#, fuzzy
msgid "Point Hope"
msgstr "打印信封"
@@ -31043,7 +32783,7 @@ msgstr "打印信封"
# ui/my-evolution.xml.h:4
# ui/my-evolution.xml.h:4
# my-evolution/Locations.h:1760
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
#, fuzzy
msgid "Point Lay"
msgstr "打印概要"
@@ -31051,70 +32791,70 @@ msgstr "打印概要"
# mail/mail-callbacks.c:2325
# mail/mail-callbacks.c:2465
# my-evolution/Locations.h:1761
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
#, fuzzy
msgid "Point Mugu"
msgstr "打印消息"
# my-evolution/Locations.h:1762
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
msgid "Point Piedras Blanca"
msgstr ""
# mail/mail-callbacks.c:2262
# mail/mail-callbacks.c:2381
# my-evolution/Locations.h:1763
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
#, fuzzy
msgid "Poitiers"
msgstr "过滤规则"
# my-evolution/Locations.h:1765
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
msgid "Pompano Beach"
msgstr ""
# views/addressbook/galview.xml.h:3
# views/addressbook/galview.xml.h:3
# my-evolution/Locations.h:1766
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
msgid "Ponca City"
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
# my-evolution/Locations.h:1767
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
msgid "Ponce"
msgstr "庞塞"
# my-evolution/Locations.h:1768
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
msgid "Ponta Pora"
msgstr ""
# ui/evolution-addressbook.xml.h:31
# ui/evolution-addressbook.xml.h:31
# my-evolution/Locations.h:1769
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
#, fuzzy
msgid "Pontiac"
msgstr "联系人(_C)"
# my-evolution/Locations.h:1770
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
msgid "Pope AFB"
msgstr ""
# my-evolution/Locations.h:1771
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
msgid "Poplar Bluff"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# my-evolution/Locations.h:1772
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
#, fuzzy
msgid "Poprad"
msgstr "波兰"
@@ -31122,12 +32862,12 @@ msgstr "波兰"
# calendar/gui/print.c:2386
# calendar/gui/print.c:2386
# my-evolution/Locations.h:1773
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
msgid "Port Alexander"
msgstr "亚历山大港"
# my-evolution/Locations.h:1774
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
msgid "Port Alsworth"
msgstr ""
@@ -31136,26 +32876,26 @@ msgstr ""
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
# addressbook/gui/widgets/e-addressbook-view.c:738
# my-evolution/Locations.h:1775
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
#, fuzzy
msgid "Port Angeles"
msgstr "打印信封"
# calendar/zones.h:147
# my-evolution/Locations.h:1776
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
msgid "Port-Au-Prince"
msgstr "太子港"
# my-evolution/Locations.h:1777
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
msgid "Port Elizabeth"
msgstr "伊丽莎白港"
# calendar/gui/dialogs/recurrence-page.glade.h:6
# calendar/gui/dialogs/recurrence-page.glade.h:6
# my-evolution/Locations.h:1778
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
#, fuzzy
msgid "Porterville"
msgstr "预览"
@@ -31165,54 +32905,54 @@ msgstr "预览"
# addressbook/printing/e-contact-print.c:1171
# addressbook/printing/e-contact-print.c:1193
# my-evolution/Locations.h:1779
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
msgid "Port Hardy"
msgstr "哈代港"
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# my-evolution/Locations.h:1780
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
#, fuzzy
msgid "Port Hedland"
msgstr "波兰"
# my-evolution/Locations.h:1781
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
msgid "Port Heiden"
msgstr "海顿港"
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# my-evolution/Locations.h:1782
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
msgid "Portland"
msgstr "波特兰"
# addressbook/gui/component/addressbook-config.glade.h:27
# addressbook/gui/component/addressbook-config.glade.h:27
# my-evolution/Locations.h:1783
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
msgid "Porto"
msgstr "波尔图"
# calendar/gui/dialogs/task-details-page.glade.h:11
# calendar/gui/dialogs/task-details-page.glade.h:11
# my-evolution/Locations.h:1784
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
#, fuzzy
msgid "Porto Alegre"
msgstr "进度"
# my-evolution/Locations.h:1785
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
msgid "Porto Alegre Apt"
msgstr ""
# addressbook/printing/e-contact-print.glade.h:29
# addressbook/printing/e-contact-print.glade.h:29
# my-evolution/Locations.h:1786
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
#, fuzzy
msgid "Portoroz"
msgstr "纵向"
@@ -31220,56 +32960,56 @@ msgstr "纵向"
# addressbook/printing/e-contact-print.glade.h:29
# addressbook/printing/e-contact-print.glade.h:29
# my-evolution/Locations.h:1787
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
#, fuzzy
msgid "Porto Santo"
msgstr "纵向"
# my-evolution/Locations.h:1788
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
msgid "Porto Velho"
msgstr ""
# addressbook/printing/e-contact-print.glade.h:29
# addressbook/printing/e-contact-print.glade.h:29
# my-evolution/Locations.h:1789
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
#, fuzzy
msgid "Port Said"
msgstr "纵向"
# my-evolution/Locations.h:1790
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
msgid "Portsmouth"
msgstr "朴次茅斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# my-evolution/Locations.h:1792
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
#, fuzzy
msgid "Posadas"
msgstr "波兰"
# my-evolution/Locations.h:1793
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
msgid "Potosi"
msgstr ""
# my-evolution/Locations.h:1794
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
msgid "Poughkeepsie"
msgstr ""
# my-evolution/Locations.h:1795
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
msgid "Pownal"
msgstr "波纳尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:54
# addressbook/gui/contact-editor/fulladdr.glade.h:54
# my-evolution/Locations.h:1796
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
#, fuzzy
msgid "Poza Rica"
msgstr "哥斯达黎加"
@@ -31277,14 +33017,14 @@ msgstr "哥斯达黎加"
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# my-evolution/Locations.h:1797
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
msgid "Poznan"
msgstr "波兹南"
# addressbook/gui/contact-editor/fulladdr.glade.h:165
# addressbook/gui/contact-editor/fulladdr.glade.h:165
# my-evolution/Locations.h:1798
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
#, fuzzy
msgid "Praha"
msgstr "巴拉圭"
@@ -31292,13 +33032,13 @@ msgstr "巴拉圭"
# my-evolution/metar.c:134
# my-evolution/metar.c:134
# my-evolution/Locations.h:1799
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
#, fuzzy
msgid "Pratica di Mare"
msgstr "部分细雨"
# my-evolution/Locations.h:1800
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
msgid "Prescott"
msgstr "普雷斯科特"
@@ -31309,31 +33049,31 @@ msgstr "普雷斯科特"
# mail/mail-callbacks.c:2524 my-evolution/e-summary.c:619
# ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
# my-evolution/Locations.h:1801
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
msgid "Presidente Prudente"
msgstr "Presidente 普鲁登斯"
# my-evolution/Locations.h:1802
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
msgid "Presque Isle"
msgstr ""
# my-evolution/Locations.h:1803
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
msgid "Prestwick"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:83
# addressbook/gui/contact-editor/fulladdr.glade.h:83
# my-evolution/Locations.h:1804
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
msgid "Pretoria"
msgstr "比勒陀利亚"
# calendar/gui/dialogs/recurrence-page.glade.h:6
# calendar/gui/dialogs/recurrence-page.glade.h:6
# my-evolution/Locations.h:1805
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
#, fuzzy
msgid "Preveza"
msgstr "预览"
@@ -31341,7 +33081,7 @@ msgstr "预览"
# addressbook/gui/contact-editor/fulladdr.glade.h:168
# addressbook/gui/contact-editor/fulladdr.glade.h:168
# my-evolution/Locations.h:1806
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
#, fuzzy
msgid "Price-Carbon"
msgstr "皮特克恩岛"
@@ -31349,7 +33089,7 @@ msgstr "皮特克恩岛"
# widgets/misc/e-charset-picker.c:84
# widgets/misc/e-charset-picker.c:84
# my-evolution/Locations.h:1807
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
#, fuzzy
msgid "Pristina"
msgstr "繁体"
@@ -31357,14 +33097,14 @@ msgstr "繁体"
# addressbook/gui/contact-editor/fulladdr.glade.h:240
# addressbook/gui/contact-editor/fulladdr.glade.h:240
# my-evolution/Locations.h:1808
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
msgid "Providence"
msgstr "普罗维登斯"
# calendar/gui/dialogs/recurrence-page.glade.h:6
# calendar/gui/dialogs/recurrence-page.glade.h:6
# my-evolution/Locations.h:1809
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
#, fuzzy
msgid "Provincetown"
msgstr "预览"
@@ -31372,33 +33112,33 @@ msgstr "预览"
# addressbook/backend/ebook/e-card-simple.c:92
# addressbook/backend/ebook/e-card-simple.c:92
# my-evolution/Locations.h:1810
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
#, fuzzy
msgid "Provo"
msgstr "职业"
# my-evolution/Locations.h:1811
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
msgid "Pskov"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# my-evolution/Locations.h:1812
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
#, fuzzy
msgid "Pucallpa"
msgstr "帕劳群岛"
# my-evolution/Locations.h:1813
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
msgid "Pudahuel"
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
# my-evolution/Locations.h:1814
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
#, fuzzy
msgid "Puebla"
msgstr "公开"
@@ -31406,27 +33146,27 @@ 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
# my-evolution/Locations.h:1815
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
msgid "Pueblo"
msgstr "普韦布洛"
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# my-evolution/Locations.h:1816
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
#, fuzzy
msgid "Puerto Barrios"
msgstr "波多黎各"
# my-evolution/Locations.h:1817
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
msgid "Puerto Cabezas"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# my-evolution/Locations.h:1818
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
#, fuzzy
msgid "Puerto Escondido"
msgstr "波多黎各"
@@ -31434,7 +33174,7 @@ msgstr "波多黎各"
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# my-evolution/Locations.h:1819
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
#, fuzzy
msgid "Puerto Lempira"
msgstr "波多黎各"
@@ -31442,7 +33182,7 @@ msgstr "波多黎各"
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# my-evolution/Locations.h:1820
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
#, fuzzy
msgid "Puerto Limon"
msgstr "波多黎各"
@@ -31450,7 +33190,7 @@ msgstr "波多黎各"
# my-evolution/metar.c:449
# my-evolution/metar.c:449
# my-evolution/Locations.h:1821
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
#, fuzzy
msgid "Puerto Maldonado"
msgstr "局部地区性龙卷风"
@@ -31458,7 +33198,7 @@ msgstr "局部地区性龙卷风"
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# my-evolution/Locations.h:1822
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
#, fuzzy
msgid "Puerto Montt"
msgstr "波多黎各"
@@ -31466,7 +33206,7 @@ msgstr "波多黎各"
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# my-evolution/Locations.h:1823
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
#, fuzzy
msgid "Puerto Plata"
msgstr "波多黎各"
@@ -31474,74 +33214,74 @@ 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/Locations.h:1825
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
#, fuzzy
msgid "Puerto Suarez"
msgstr "打印概要"
# my-evolution/Locations.h:1826
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
msgid "Puerto Vallarta"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# my-evolution/Locations.h:1827
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
msgid "Pula"
msgstr "普拉"
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# my-evolution/Locations.h:1828
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
#, fuzzy
msgid "Pullman"
msgstr "波兰"
# my-evolution/Locations.h:1829
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
msgid "Punta Arenas"
msgstr ""
# calendar/gui/print.c:2386
# calendar/gui/print.c:2386
# my-evolution/Locations.h:1830
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
#, fuzzy
msgid "Punta Cana"
msgstr "打印日历"
# my-evolution/Locations.h:1831
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
msgid "Punta Gorda"
msgstr ""
# my-evolution/Locations.h:1832
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
msgid "Puntilla Lake"
msgstr ""
# my-evolution/Locations.h:1833
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
msgid "Pusan/Kimhae"
msgstr "釜山/Kimhae"
# my-evolution/Locations.h:1834
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
msgid "Pyongtaek Ab"
msgstr ""
# calendar/zones.h:238
# my-evolution/Locations.h:1835
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
msgid "Pyongyang"
msgstr "平壤"
# widgets/misc/e-messagebox.c:173
# widgets/misc/e-messagebox.c:173
# my-evolution/Locations.h:1837
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
#, fuzzy
msgid "Quantico"
msgstr "问题"
@@ -31549,85 +33289,85 @@ msgstr "问题"
# mail/message-list.etspec.h:9
# mail/message-list.etspec.h:10
# my-evolution/Locations.h:1838
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
msgid "Quebec"
msgstr "魁北克"
# my-evolution/Locations.h:1839
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
msgid "Quebec City"
msgstr "魁北克城"
# my-evolution/Locations.h:1840
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
msgid "Queretaro"
msgstr ""
# my-evolution/Locations.h:1841
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
msgid "Quillayute"
msgstr ""
# my-evolution/Locations.h:1842
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
msgid "Quimper"
msgstr ""
# my-evolution/Locations.h:1843
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
msgid "Quincy"
msgstr "昆西"
# my-evolution/Locations.h:1844
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
msgid "Quito/Mariscal Sucre"
msgstr "基多/Mariscal Sucre"
# my-evolution/Locations.h:1845
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
msgid "Rabat"
msgstr "拉巴特"
# my-evolution/Locations.h:1846
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
msgid "Raduzhny"
msgstr ""
# my-evolution/Locations.h:1847
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
msgid "Rafha"
msgstr ""
# my-evolution/Locations.h:1848
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
msgid "Raleigh-Durham"
msgstr "Raleigh-德拉谟"
# my-evolution/Locations.h:1849
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
msgid "Randolph AFB"
msgstr "伦道夫空军基地"
# my-evolution/Locations.h:1850
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
#, fuzzy
msgid "Rapid City"
msgstr "已回复"
# my-evolution/Locations.h:1851
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
msgid "Rapid City-Ellsworth AFB"
msgstr ""
# my-evolution/Locations.h:1852
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
msgid "Ras Al Khaimah"
msgstr ""
# my-evolution/metar.c:142
# my-evolution/metar.c:142
# my-evolution/Locations.h:1853
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
#, fuzzy
msgid "Rawlins"
msgstr "雨"
@@ -31635,14 +33375,14 @@ msgstr "雨"
# addressbook/printing/e-contact-print.glade.h:13
# addressbook/printing/e-contact-print.glade.h:13
# my-evolution/Locations.h:1854
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
msgid "Reading"
msgstr "雷丁"
# addressbook/gui/contact-editor/fulladdr.glade.h:30
# addressbook/gui/contact-editor/fulladdr.glade.h:30
# my-evolution/Locations.h:1855
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
#, fuzzy
msgid "Rebun Island"
msgstr "布维岛"
@@ -31650,25 +33390,25 @@ msgstr "布维岛"
# mail/message-list.etspec.h:4
# mail/message-list.etspec.h:5
# my-evolution/Locations.h:1856
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
msgid "Recife"
msgstr "累西腓"
# my-evolution/Locations.h:1857
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
msgid "Red Bluff"
msgstr ""
# addressbook/printing/e-contact-print.glade.h:13
# addressbook/printing/e-contact-print.glade.h:13
# my-evolution/Locations.h:1858
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
#, fuzzy
msgid "Redding"
msgstr "标题"
# my-evolution/Locations.h:1859
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
#, fuzzy
msgid "Redig"
msgstr "已读"
@@ -31676,67 +33416,67 @@ msgstr "已读"
# calendar/gui/dialogs/event-editor.c:190
# calendar/gui/dialogs/event-editor.c:190
# my-evolution/Locations.h:1860
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
msgid "Redmond"
msgstr "雷德蒙"
# my-evolution/Locations.h:1861
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
msgid "Red Oak"
msgstr ""
# my-evolution/Locations.h:1862
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
msgid "Redwood Falls"
msgstr ""
# my-evolution/Locations.h:1863
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
msgid "Reggio Calabria"
msgstr "勒佐卡拉布里亚"
# my-evolution/e-summary-weather.c:722
# my-evolution/e-summary-weather.c:722
# my-evolution/Locations.h:1864
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
#, fuzzy
msgid "Regina"
msgstr "区域"
# my-evolution/Locations.h:1865
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
msgid "Reims-Champagne"
msgstr "兰斯-Champagne"
# calendar/gui/dialogs/alarm-page.glade.h:5
# calendar/gui/dialogs/alarm-page.glade.h:5
# my-evolution/Locations.h:1866
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
msgid "Rennes"
msgstr "雷恩"
# addressbook/gui/contact-editor/fulladdr.glade.h:175
# addressbook/gui/contact-editor/fulladdr.glade.h:175
# my-evolution/Locations.h:1867
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
msgid "Reno"
msgstr "里诺"
# addressbook/gui/contact-editor/fulladdr.glade.h:175
# addressbook/gui/contact-editor/fulladdr.glade.h:175
# my-evolution/Locations.h:1868
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
#, fuzzy
msgid "Renton"
msgstr "留尼汪"
# my-evolution/Locations.h:1869
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
msgid "Resistencia"
msgstr "雷西斯膝西亚"
# my-evolution/Locations.h:1870
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
#, fuzzy
msgid "Reus"
msgstr "规则"
@@ -31744,28 +33484,28 @@ msgstr "规则"
# ui/evolution-mail-message.xml.h:70
# ui/evolution-mail-message.xml.h:70
# my-evolution/Locations.h:1871
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
#, fuzzy
msgid "Reyes"
msgstr "回复"
# calendar/zones.h:269
# my-evolution/Locations.h:1872
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
msgid "Reykjavik"
msgstr "雷克雅未克"
# ui/my-evolution.xml.h:5
# ui/my-evolution.xml.h:5
# my-evolution/Locations.h:1873
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
msgid "Reynosa"
msgstr "雷萨诺"
# addressbook/gui/contact-editor/fulladdr.glade.h:76
# addressbook/gui/contact-editor/fulladdr.glade.h:76
# my-evolution/Locations.h:1874
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
#, fuzzy
msgid "Rhinelander"
msgstr "芬兰"
@@ -31773,20 +33513,20 @@ msgstr "芬兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:74
# addressbook/gui/contact-editor/fulladdr.glade.h:74
# my-evolution/Locations.h:1875
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
msgid "Rhode Island"
msgstr "罗得岛州"
# addressbook/gui/contact-editor/fulladdr.glade.h:86
# addressbook/gui/contact-editor/fulladdr.glade.h:86
# my-evolution/Locations.h:1876
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
#, fuzzy
msgid "Riberalta"
msgstr "直布罗陀"
# my-evolution/Locations.h:1877
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
msgid "Richmond"
msgstr ""
@@ -31795,7 +33535,7 @@ msgstr ""
# addressbook/backend/ebook/e-card-simple.c:95
# addressbook/gui/widgets/e-addressbook-view.c:884
# my-evolution/Locations.h:1878
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
#, fuzzy
msgid "Rickenbacker"
msgstr "绰号"
@@ -31803,7 +33543,7 @@ msgstr "绰号"
# addressbook/gui/contact-editor/fulladdr.glade.h:96
# addressbook/gui/contact-editor/fulladdr.glade.h:96
# my-evolution/Locations.h:1879
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
#, fuzzy
msgid "Rieti"
msgstr "海地"
@@ -31813,42 +33553,35 @@ msgstr "海地"
# calendar/gui/dialogs/meeting-page.etspec.h:9
# calendar/gui/e-meeting-time-sel.etspec.h:9
# my-evolution/Locations.h:1880
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
#, fuzzy
msgid "Rifle"
msgstr "角色"
-# addressbook/printing/e-contact-print.glade.h:33
-# addressbook/printing/e-contact-print.glade.h:33
-# my-evolution/Locations.h:1881
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "里加"
-
# my-evolution/Locations.h:1882
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
msgid "Rijeka"
msgstr "里耶卡"
# addressbook/gui/contact-editor/fulladdr.glade.h:176
# addressbook/gui/contact-editor/fulladdr.glade.h:176
# my-evolution/Locations.h:1883
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
msgid "Rimini"
msgstr "里米尼"
# my-evolution/Locations.h:1884
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
msgid "Rio De Janeiro"
msgstr "里约热内卢"
# my-evolution/Locations.h:1885
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
msgid "Rio Gallegos"
msgstr ""
# my-evolution/Locations.h:1886
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
msgid "Rio Grande"
msgstr "格兰德河"
@@ -31859,63 +33592,63 @@ msgstr "格兰德河"
# addressbook/gui/contact-editor/e-contact-editor.c:1660
# addressbook/gui/widgets/e-addressbook-view.c:871
# my-evolution/Locations.h:1887
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
msgid "Rioja"
msgstr "里奥哈"
# addressbook/gui/contact-editor/fulladdr.glade.h:152
# addressbook/gui/contact-editor/fulladdr.glade.h:152
# my-evolution/Locations.h:1888
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
#, fuzzy
msgid "Rio / Jacarepagua"
msgstr "尼加拉瓜"
# my-evolution/Locations.h:1889
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
msgid "Rionegro/J.M.Cordova"
msgstr "Rionegro/J.M. 科尔多瓦"
# addressbook/gui/contact-editor/fulladdr.glade.h:33
# addressbook/gui/contact-editor/fulladdr.glade.h:33
# my-evolution/Locations.h:1890
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
#, fuzzy
msgid "Rishiri Island"
msgstr "不列颠处女群岛"
# my-evolution/Locations.h:1891
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
msgid "Rivas"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:120
# addressbook/gui/contact-editor/fulladdr.glade.h:120
# my-evolution/Locations.h:1892
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
#, fuzzy
msgid "Rivera"
msgstr "利比里亚"
# my-evolution/Locations.h:1893
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
msgid "Riverside"
msgstr ""
# my-evolution/Locations.h:1894
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
msgid "Riverside/March AFB"
msgstr ""
# my-evolution/Locations.h:1895
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
msgid "Riverton"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:120
# addressbook/gui/contact-editor/fulladdr.glade.h:120
# my-evolution/Locations.h:1896
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
#, fuzzy
msgid "Rivne"
msgstr "利比里亚"
@@ -31923,26 +33656,26 @@ msgstr "利比里亚"
# data/evolution.desktop.in.h:1 shell/main.c:83
# shell/main.c:83
# my-evolution/Locations.h:1897
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
#, fuzzy
msgid "Rivolto"
msgstr "Evolution"
# calendar/zones.h:241
# my-evolution/Locations.h:1898
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
msgid "Riyadh"
msgstr "利雅得"
# my-evolution/Locations.h:1899
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
msgid "Roanoke"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:57
# addressbook/gui/contact-editor/fulladdr.glade.h:57
# my-evolution/Locations.h:1900
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
#, fuzzy
msgid "Roatan"
msgstr "克罗地亚"
@@ -31950,41 +33683,41 @@ msgstr "克罗地亚"
# calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
# calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
# my-evolution/Locations.h:1901
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
#, fuzzy
msgid "Robore"
msgstr "之前"
# my-evolution/Locations.h:1902
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
msgid "Rochester"
msgstr ""
# my-evolution/Locations.h:1903
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
msgid "Rockford"
msgstr "罗克福德"
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# my-evolution/Locations.h:1904
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
#, fuzzy
msgid "Rockland"
msgstr "波兰"
# my-evolution/Locations.h:1905
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
msgid "Rockport"
msgstr ""
# my-evolution/Locations.h:1906
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
msgid "Rock Springs"
msgstr ""
# my-evolution/Locations.h:1907
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
msgid "Rocky Mount"
msgstr ""
@@ -31993,7 +33726,7 @@ msgstr ""
# calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
# calendar/gui/e-meeting-model.c:781
# my-evolution/Locations.h:1908
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
#, fuzzy
msgid "Rodos"
msgstr "房间"
@@ -32001,44 +33734,44 @@ 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
# my-evolution/Locations.h:1909
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
msgid "Rogers"
msgstr "罗杰斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:176
# addressbook/gui/contact-editor/fulladdr.glade.h:176
# my-evolution/Locations.h:1910
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
msgid "Roma/Ciampino"
msgstr "罗马/Ciampino"
# my-evolution/Locations.h:1911
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
msgid "Roma/Fiumicino"
msgstr "罗马/Fiumicino"
# my-evolution/Locations.h:1913
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
msgid "Roma/Urbe"
msgstr "罗马/Urbe"
# my-evolution/Locations.h:1914
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
msgid "Rome-Russell"
msgstr "罗马-拉塞尔"
# my-evolution/Locations.h:1915
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
msgid "Ronchi de' Legionari"
msgstr ""
# my-evolution/Locations.h:1916
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
msgid "Ronneby"
msgstr ""
# my-evolution/Locations.h:1917
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
msgid "Roosevelt"
msgstr "罗斯福"
@@ -32047,13 +33780,13 @@ msgstr "罗斯福"
# calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
# calendar/gui/e-meeting-model.c:781
# my-evolution/Locations.h:1918
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
#, fuzzy
msgid "Roros"
msgstr "房间"
# my-evolution/Locations.h:1919
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
msgid "Rorvik/Ryum"
msgstr ""
@@ -32064,12 +33797,12 @@ msgstr ""
# addressbook/gui/contact-editor/e-contact-editor.c:1660
# addressbook/gui/widgets/e-addressbook-view.c:871
# my-evolution/Locations.h:1920
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
msgid "Rosario"
msgstr "罗萨里奥"
# my-evolution/Locations.h:1921
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
msgid "Roseburg"
msgstr ""
@@ -32078,7 +33811,7 @@ msgstr ""
# calendar/gui/dialogs/meeting-page.etspec.h:9
# calendar/gui/e-meeting-time-sel.etspec.h:9
# my-evolution/Locations.h:1922
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
#, fuzzy
msgid "Roseglen"
msgstr "角色"
@@ -32086,131 +33819,131 @@ msgstr "角色"
# shell/glade/e-active-connection-dialog.glade.h:3
# shell/glade/e-active-connection-dialog.glade.h:3
# my-evolution/Locations.h:1923
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
#, fuzzy
msgid "Rost"
msgstr "主机"
# my-evolution/Locations.h:1924
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
msgid "Rostov-Na-Donu"
msgstr "罗斯托夫-Na-Donu"
# my-evolution/Locations.h:1925
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
msgid "Roswell"
msgstr ""
# my-evolution/Locations.h:1926
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
msgid "Rotterdam"
msgstr "鹿特丹"
# my-evolution/Locations.h:1927
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
msgid "Rouen-Valle de Seine"
msgstr "鲁昂-Valle de Seine"
# my-evolution/Locations.h:1928
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
msgid "Ruidoso-Sierra Blanca"
msgstr ""
# calendar/gui/dialogs/event-editor.c:195
# calendar/gui/dialogs/event-editor.c:195
# my-evolution/Locations.h:1929
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
#, fuzzy
msgid "Rurrenabaque"
msgstr "再次发生"
# my-evolution/Locations.h:1930
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
msgid "Russell"
msgstr "拉塞尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:15
# addressbook/gui/contact-editor/fulladdr.glade.h:15
# my-evolution/Locations.h:1931
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
msgid "Russia"
msgstr "俄罗斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:26
# addressbook/gui/contact-editor/fulladdr.glade.h:26
# my-evolution/Locations.h:1932
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
msgid "Rutland"
msgstr "拉特兰郡"
# my-evolution/Locations.h:1933
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
msgid "Rygge"
msgstr ""
# my-evolution/Locations.h:1934
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
msgid "Rzeszow"
msgstr ""
# my-evolution/Locations.h:1935
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
msgid "Saarbrucken"
msgstr ""
# my-evolution/Locations.h:1936
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
msgid "Sabine Pass"
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
# my-evolution/Locations.h:1937
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
msgid "Sacramento"
msgstr "萨克拉曼多"
# my-evolution/Locations.h:1938
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
msgid "Sacramento-Woodland"
msgstr "萨克拉曼多-Woodland"
# my-evolution/Locations.h:1939
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
msgid "Safford-Municipal Airport"
msgstr "萨克拉曼多-市政机场"
# addressbook/gui/contact-editor/fulladdr.glade.h:196
# addressbook/gui/contact-editor/fulladdr.glade.h:196
# my-evolution/Locations.h:1940
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
msgid "Saginaw"
msgstr "萨吉诺"
# my-evolution/Locations.h:1941
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
msgid "Saint Anthony"
msgstr "圣安东尼"
# my-evolution/Locations.h:1942
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
msgid "Saint-Brieuc-Armor"
msgstr ""
# my-evolution/Locations.h:1943
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
msgid "Saint-Dizier-Robinson"
msgstr ""
# my-evolution/Locations.h:1944
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
msgid "Saint-Etienne-Boutheon"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1945
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
#, fuzzy
msgid "Saint Mary's"
msgstr "圣马力诺"
@@ -32218,20 +33951,20 @@ msgstr "圣马力诺"
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1946
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
#, fuzzy
msgid "Saint Mawgan"
msgstr "圣马力诺"
# my-evolution/Locations.h:1947
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
msgid "Saint-Nazaire-Montoir"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# my-evolution/Locations.h:1948
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
#, fuzzy
msgid "Saint Paul"
msgstr "圣卢西亚岛"
@@ -32239,7 +33972,7 @@ msgstr "圣卢西亚岛"
# calendar/gui/print.c:499
# calendar/gui/print.c:499
# my-evolution/Locations.h:1949
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
#, fuzzy
msgid "Saiq"
msgstr "六"
@@ -32247,7 +33980,7 @@ msgstr "六"
# my-evolution/metar.c:382
# my-evolution/metar.c:382
# my-evolution/Locations.h:1950
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
#, fuzzy
msgid "Salalah"
msgstr "暴风"
@@ -32257,27 +33990,27 @@ 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
# my-evolution/Locations.h:1951
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
msgid "Salem"
msgstr "赛伦"
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# my-evolution/Locations.h:1952
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
#, fuzzy
msgid "Salida"
msgstr "索马里"
# my-evolution/Locations.h:1953
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
msgid "Salida-Harriet"
msgstr "Salida-哈里特"
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# my-evolution/Locations.h:1954
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
#, fuzzy
msgid "Salina"
msgstr "索马里"
@@ -32285,75 +34018,75 @@ msgstr "索马里"
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# my-evolution/Locations.h:1955
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
#, fuzzy
msgid "Salinas"
msgstr "索马里"
# my-evolution/Locations.h:1956
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
msgid "Salisbury"
msgstr "索尔兹伯里"
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# my-evolution/Locations.h:1957
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
#, fuzzy
msgid "Salmon"
msgstr "萨摩亚"
# my-evolution/Locations.h:1958
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
msgid "Salmon (2)"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# my-evolution/Locations.h:1959
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
msgid "Salta"
msgstr "萨尔塔"
# my-evolution/Locations.h:1960
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
msgid "Saltillo"
msgstr "萨尔提略"
# my-evolution/Locations.h:1961
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
msgid "Salt Lake City"
msgstr "盐湖城"
# ui/evolution-addressbook.xml.h:27
# ui/evolution-addressbook.xml.h:27
# my-evolution/Locations.h:1962
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
#, fuzzy
msgid "Salto"
msgstr "停止"
# my-evolution/Locations.h:1963
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
msgid "Salt point"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:68
# addressbook/gui/contact-editor/fulladdr.glade.h:68
# my-evolution/Locations.h:1964
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
msgid "Salvador"
msgstr "萨尔瓦多"
# my-evolution/Locations.h:1965
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
msgid "Salzburg"
msgstr "萨尔茨堡"
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# my-evolution/Locations.h:1966
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
#, fuzzy
msgid "Samara"
msgstr "萨摩亚"
@@ -32361,14 +34094,14 @@ msgstr "萨摩亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# my-evolution/Locations.h:1967
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
msgid "Samos"
msgstr "萨摩斯"
# my-evolution/metar.c:322
# my-evolution/metar.c:322
# my-evolution/Locations.h:1968
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
#, fuzzy
msgid "Samsun"
msgstr "沙尘"
@@ -32376,60 +34109,60 @@ msgstr "沙尘"
# my-evolution/metar.c:322
# my-evolution/metar.c:322
# my-evolution/Locations.h:1969
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
#, fuzzy
msgid "Sana'A"
msgstr "沙尘"
# my-evolution/Locations.h:1970
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
msgid "San Andres Isla/Sesquicentenario"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1971
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
msgid "San Angelo"
msgstr "圣安吉罗"
# my-evolution/Locations.h:1972
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
msgid "San Antonio"
msgstr "圣安东妮亚"
# my-evolution/Locations.h:1973
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
msgid "San Antonio Del Tachira"
msgstr ""
# my-evolution/Locations.h:1974
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
msgid "San Antonio-Kelly AFB"
msgstr "圣安东妮亚-凯利空军基地"
# my-evolution/Locations.h:1975
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
msgid "San Antonio-Stinson"
msgstr "圣安东妮亚-Stinson"
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1976
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
msgid "San Carlos"
msgstr "圣卡洛斯"
# my-evolution/metar.c:322
# my-evolution/metar.c:322
# my-evolution/Locations.h:1977
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
#, fuzzy
msgid "Sandane"
msgstr "沙尘"
# my-evolution/Locations.h:1978
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
#, fuzzy
msgid "Sandberg"
msgstr "发件人"
@@ -32437,7 +34170,7 @@ msgstr "发件人"
# my-evolution/metar.c:397
# my-evolution/metar.c:397
# my-evolution/Locations.h:1979
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
#, fuzzy
msgid "Sanderson"
msgstr "沙暴"
@@ -32445,84 +34178,84 @@ msgstr "沙暴"
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1980
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
msgid "San Diego"
msgstr "圣迭哥"
# my-evolution/Locations.h:1981
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
msgid "San Diego-Brown"
msgstr "圣迭哥-Brown"
# my-evolution/Locations.h:1982
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
msgid "San Diego-Miramar"
msgstr "圣迭哥-Miramar"
# my-evolution/Locations.h:1983
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
msgid "San Diego-Montgomery"
msgstr "圣迭哥-Montgomery"
# my-evolution/Locations.h:1984
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
msgid "San Diego-North Island"
msgstr "圣迭哥-北岛"
# my-evolution/Locations.h:1985
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
msgid "San Diego-Santee"
msgstr "圣迭哥-Santee"
# my-evolution/Locations.h:1986
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
msgid "Sandnessjoen/Stokka"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1987
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
#, fuzzy
msgid "Sand Point"
msgstr "圣马力诺"
# my-evolution/Locations.h:1988
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
msgid "San Fernando De Apure"
msgstr ""
# my-evolution/metar.c:322
# my-evolution/metar.c:322
# my-evolution/Locations.h:1989
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
msgid "Sanford"
msgstr "桑福德"
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1990
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
msgid "San Francisco"
msgstr "旧金山"
# addressbook/printing/e-contact-print.glade.h:35
# addressbook/printing/e-contact-print.glade.h:35
# my-evolution/Locations.h:1991
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
#, fuzzy
msgid "Sangju"
msgstr "阴影"
# my-evolution/Locations.h:1992
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
msgid "San Ignacio De Velasco"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1993
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
#, fuzzy
msgid "San Joaquin"
msgstr "圣马力诺"
@@ -32534,60 +34267,60 @@ msgstr "圣马力诺"
# ui/evolution-contact-list-editor.xml.h:6
# ui/evolution-signature-editor.xml.h:4
# my-evolution/Locations.h:1994
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
#, fuzzy
msgid "San Jose"
msgstr "保存并关闭"
# my-evolution/Locations.h:1995
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
msgid "San Jose De Chiquitos"
msgstr ""
# my-evolution/Locations.h:1996
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
msgid "San Jose del Cabo"
msgstr ""
# my-evolution/Locations.h:1997
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
msgid "San Jose-Santa Clara"
msgstr "圣何塞-Santa Clara"
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1998
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
msgid "San Juan"
msgstr "圣胡安"
# my-evolution/Locations.h:1999
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
msgid "Sankt-Peterburg"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# my-evolution/Locations.h:2000
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
#, fuzzy
msgid "Sanliurfa"
msgstr "索马里"
# my-evolution/Locations.h:2001
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
msgid "San Luis Obispo"
msgstr ""
# my-evolution/Locations.h:2002
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
msgid "San Luis Potosi"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:2003
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
#, fuzzy
msgid "San Miguel"
msgstr "圣马力诺"
@@ -32595,69 +34328,69 @@ msgstr "圣马力诺"
# addressbook/gui/contact-editor/fulladdr.glade.h:156
# addressbook/gui/contact-editor/fulladdr.glade.h:156
# my-evolution/Locations.h:2004
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
msgid "San Nicholas Island"
msgstr "圣尼古拉斯岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:68
# addressbook/gui/contact-editor/fulladdr.glade.h:68
# my-evolution/Locations.h:2005
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
msgid "San Salvador"
msgstr "圣萨尔瓦多"
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:2006
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
msgid "San Sebastian"
msgstr "圣塞巴斯蒂安"
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# my-evolution/Locations.h:2007
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
#, fuzzy
msgid "Santa Ana"
msgstr "圣卢西亚岛"
# my-evolution/Locations.h:2008
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
msgid "Santa Barbara"
msgstr ""
# my-evolution/Locations.h:2009
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
msgid "Santa Cruz"
msgstr ""
# my-evolution/Locations.h:2010
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
msgid "Santa Fe"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:2011
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
msgid "Santa Maria"
msgstr "圣玛丽亚"
# my-evolution/Locations.h:2012
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
msgid "Santa Marta/Simon Bolivar"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# my-evolution/Locations.h:2013
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
#, fuzzy
msgid "Santa Monica"
msgstr "圣卢西亚岛"
# my-evolution/Locations.h:2014
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
#, fuzzy
msgid "Santander"
msgstr "发件人"
@@ -32665,42 +34398,42 @@ msgstr "发件人"
# my-evolution/metar.c:397
# my-evolution/metar.c:397
# my-evolution/Locations.h:2015
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
#, fuzzy
msgid "Santarem"
msgstr "沙暴"
# my-evolution/Locations.h:2016
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
msgid "Santa Rosa"
msgstr ""
# my-evolution/Locations.h:2017
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
msgid "Santa Rosa de Copan"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# calendar/zones.h:157
# my-evolution/Locations.h:2018
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
msgid "Santiago"
msgstr "圣地亚哥"
# my-evolution/Locations.h:2019
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
msgid "Santiago de Cuba"
msgstr ""
# my-evolution/Locations.h:2020
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
msgid "Santiago Del Estero"
msgstr ""
# my-evolution/metar.c:397
# my-evolution/metar.c:397
# my-evolution/Locations.h:2021
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
#, fuzzy
msgid "Santorini"
msgstr "沙暴"
@@ -32708,19 +34441,19 @@ msgstr "沙暴"
# my-evolution/metar.c:397
# my-evolution/metar.c:397
# my-evolution/Locations.h:2022
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
msgid "Santos"
msgstr "桑托斯"
# my-evolution/Locations.h:2023
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
msgid "Sao Jose Dos Campo"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# my-evolution/Locations.h:2024
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
#, fuzzy
msgid "Sao Luiz"
msgstr "圣卢西亚岛"
@@ -32728,86 +34461,86 @@ msgstr "圣卢西亚岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# calendar/zones.h:159
# my-evolution/Locations.h:2025
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
#, fuzzy
msgid "Sao Paulo"
msgstr "美洲萨摩亚"
# my-evolution/Locations.h:2026
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
msgid "Sapporo Ab"
msgstr "札幌 Ab"
# calendar/zones.h:318
# my-evolution/Locations.h:2027
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
msgid "Sarajevo"
msgstr "萨拉热窝"
# my-evolution/Locations.h:2028
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
msgid "Saranac Lake"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# my-evolution/Locations.h:2029
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
msgid "Sarasota"
msgstr "萨拉索塔"
# my-evolution/Locations.h:2030
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
msgid "Saratov"
msgstr "萨拉托夫"
# addressbook/gui/contact-editor/fulladdr.glade.h:197
# addressbook/gui/contact-editor/fulladdr.glade.h:197
# my-evolution/Locations.h:2031
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
#, fuzzy
msgid "Sarzana"
msgstr "斯里兰卡"
# my-evolution/Locations.h:2032
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
msgid "Saskatchewan"
msgstr "萨斯喀彻温省"
# my-evolution/Locations.h:2033
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
msgid "Saskatoon"
msgstr ""
# my-evolution/Locations.h:2034
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
msgid "Sauce Viejo"
msgstr ""
# my-evolution/Locations.h:2036
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
msgid "Sault Ste Marie"
msgstr ""
# my-evolution/Locations.h:2037
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
msgid "Savannah"
msgstr ""
# my-evolution/Locations.h:2038
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
msgid "Savannah-Hunter AAF"
msgstr ""
# my-evolution/Locations.h:2039
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
msgid "Sawyer AFB"
msgstr ""
# my-evolution/metar.c:322
# my-evolution/metar.c:322
# my-evolution/Locations.h:2040
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
#, fuzzy
msgid "Sayun"
msgstr "沙尘"
@@ -32821,33 +34554,33 @@ msgstr "沙尘"
# calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:31
# mail/message-list.etspec.h:9
# my-evolution/Locations.h:2041
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
#, fuzzy
msgid "Scatsta"
msgstr "状态"
# my-evolution/Locations.h:2042
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
msgid "Schaffen"
msgstr ""
# my-evolution/Locations.h:2043
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
msgid "Schenectady"
msgstr ""
# my-evolution/Locations.h:2044
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
msgid "Scilly Isles"
msgstr ""
# my-evolution/Locations.h:2045
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
msgid "Scottsbluff"
msgstr ""
# my-evolution/Locations.h:2046
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
msgid "Scottsdale"
msgstr ""
@@ -32856,27 +34589,27 @@ msgstr ""
# addressbook/backend/ebook/e-card-simple.c:69
# addressbook/gui/widgets/e-addressbook-view.c:858
# my-evolution/Locations.h:2047
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
msgid "Scranton"
msgstr "斯克兰顿"
# mail/mail-callbacks.c:2492
# my-evolution/Locations.h:2048
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
msgid "Seattle"
msgstr "西雅图"
# importers/netscape-importer.c:963
# importers/netscape-importer.c:963
# my-evolution/Locations.h:2049
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
msgid "Seattle-Boeing"
msgstr "西雅图-Boeing"
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# my-evolution/Locations.h:2050
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
#, fuzzy
msgid "Sedalia"
msgstr "索马里"
@@ -32884,50 +34617,50 @@ msgstr "索马里"
# mail/message-list.c:640
# mail/message-list.c:646
# my-evolution/Locations.h:2051
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
#, fuzzy
msgid "Seeb"
msgstr "可见"
# my-evolution/Locations.h:2052
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
msgid "Selanik"
msgstr ""
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
# my-evolution/Locations.h:2053
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
msgid "Sendai Airport"
msgstr "仙台机场"
# my-evolution/Locations.h:2054
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
msgid "Seoul E Ab"
msgstr "汉城 E Ab"
# my-evolution/Locations.h:2055
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
msgid "Seoul/Kimp'O International Airport"
msgstr "汉城/Kimp'O 国际机场"
# my-evolution/Locations.h:2056
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
msgid "Seoul/Yongdungp'O Rokaf Wc"
msgstr "汉城/Yongdungp'O Rokaf Wc"
# my-evolution/Locations.h:2057
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
msgid "Sept-Iles"
msgstr ""
# my-evolution/Locations.h:2058
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
msgid "Seul Choix Pt"
msgstr ""
# my-evolution/Locations.h:2059
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
msgid "Sevilla"
msgstr ""
@@ -32936,23 +34669,23 @@ msgstr ""
# addressbook/gui/search/e-addressbook-search-dialog.c:151
# mail/mail-search.c:263
# my-evolution/Locations.h:2060
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
msgid "Seward"
msgstr "苏厄德"
# my-evolution/Locations.h:2061
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
msgid "Sexton Summit"
msgstr ""
# calendar/zones.h:246
# my-evolution/Locations.h:2062
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
msgid "Shanghai"
msgstr "上海"
# my-evolution/Locations.h:2063
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
msgid "Shannon"
msgstr "香农"
@@ -32961,13 +34694,13 @@ msgstr "香农"
# addressbook/gui/search/e-addressbook-search-dialog.c:151
# mail/mail-search.c:263
# my-evolution/Locations.h:2064
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
#, fuzzy
msgid "Sharjah"
msgstr "搜索"
# my-evolution/Locations.h:2065
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
msgid "Sharm El Sheikhintl"
msgstr ""
@@ -32976,7 +34709,7 @@ msgstr ""
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
# calendar/gui/dialogs/recurrence-page.c:964
# my-evolution/Locations.h:2066
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
#, fuzzy
msgid "Sharurah"
msgstr "星期六"
@@ -32986,7 +34719,7 @@ msgstr "星期六"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
# calendar/gui/dialogs/recurrence-page.c:964
# my-evolution/Locations.h:2067
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
#, fuzzy
msgid "Shawbury"
msgstr "星期六"
@@ -32994,83 +34727,83 @@ msgstr "星期六"
# calendar/gui/e-calendar-table.etspec.h:14
# calendar/gui/e-calendar-table.etspec.h:14
# my-evolution/Locations.h:2068
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
#, fuzzy
msgid "Shearwater"
msgstr "开始日期"
# my-evolution/Locations.h:2069
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
msgid "Sheboygan"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:204
# addressbook/gui/contact-editor/fulladdr.glade.h:204
# my-evolution/Locations.h:2070
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
msgid "Sheldon"
msgstr "谢尔登"
# my-evolution/Locations.h:2071
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
msgid "Shelter Cove"
msgstr ""
# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
# my-evolution/Locations.h:2072
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
msgid "Shelton"
msgstr "谢尔顿"
# my-evolution/Locations.h:2073
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
msgid "Shenandoah"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:200
# addressbook/gui/contact-editor/fulladdr.glade.h:200
# my-evolution/Locations.h:2074
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
msgid "Sheridan"
msgstr "谢里丹"
# my-evolution/Locations.h:2075
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
msgid "Sherman-Denison"
msgstr "谢尔曼-Denison"
# my-evolution/Locations.h:2076
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
msgid "Shimofusa Ab"
msgstr ""
# my-evolution/Locations.h:2077
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
msgid "Shingle Point"
msgstr ""
# mail/message-list.etspec.h:7
# mail/message-list.etspec.h:8
# my-evolution/Locations.h:2078
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
msgid "Shiraz"
msgstr "设拉子"
# my-evolution/Locations.h:2079
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
msgid "Shishmaref"
msgstr ""
# my-evolution/Locations.h:2080
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
msgid "Shizuhama Ab"
msgstr ""
# mail/message-list.etspec.h:5
# mail/message-list.etspec.h:6
# my-evolution/Locations.h:2081
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
#, fuzzy
msgid "Shoreham"
msgstr "分数"
@@ -33078,42 +34811,42 @@ msgstr "分数"
# my-evolution/metar.c:162
# my-evolution/metar.c:162
# my-evolution/Locations.h:2082
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
#, fuzzy
msgid "Show Low"
msgstr "微雪"
# my-evolution/Locations.h:2083
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
msgid "Shreveport Downtown"
msgstr "什里夫波特市区"
# my-evolution/Locations.h:2084
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
msgid "Shreveport Regional"
msgstr "什里夫波特地区"
# mail/message-list.etspec.h:7
# mail/message-list.etspec.h:8
# my-evolution/Locations.h:2085
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
msgid "Sidney"
msgstr "西德尼"
# my-evolution/Locations.h:2086
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
msgid "Sigonella"
msgstr ""
# my-evolution/Locations.h:2087
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
msgid "Siloam Springs"
msgstr ""
# mail/mail-config.glade.h:67
# mail/mail-config.glade.h:67
# my-evolution/Locations.h:2088
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
#, fuzzy
msgid "Silver City"
msgstr "安全"
@@ -33123,48 +34856,48 @@ msgstr "安全"
# camel/providers/sendmail/camel-sendmail-provider.c:36
# mail/mail-config.glade.h:72
# my-evolution/Locations.h:2089
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
#, fuzzy
msgid "Sindal"
msgstr "Sendmail"
# my-evolution/Locations.h:2091
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
msgid "Sioux City"
msgstr ""
# my-evolution/Locations.h:2092
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
msgid "Sioux Falls"
msgstr ""
# my-evolution/Locations.h:2093
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
msgid "Sitka"
msgstr ""
# my-evolution/Locations.h:2094
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
msgid "Sivas"
msgstr ""
# my-evolution/Locations.h:2095
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
msgid "Sivrihisar"
msgstr ""
# my-evolution/Locations.h:2096
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
msgid "Skagway"
msgstr ""
# my-evolution/Locations.h:2097
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
msgid "Skiathos"
msgstr ""
# my-evolution/Locations.h:2098
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
msgid "Skien/Geiteryggen"
msgstr ""
@@ -33173,14 +34906,14 @@ 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
# my-evolution/Locations.h:2099
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
#, fuzzy
msgid "Skive"
msgstr "保存"
# calendar/zones.h:320
# my-evolution/Locations.h:2100
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
msgid "Skopje"
msgstr "斯科普里"
@@ -33189,7 +34922,7 @@ msgstr "斯科普里"
# mail/mail-config.glade.h:73 mail/message-list.etspec.h:7
# shell/e-local-storage.c:176
# my-evolution/Locations.h:2101
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
#, fuzzy
msgid "Skwentna"
msgstr "已发送"
@@ -33197,7 +34930,7 @@ msgstr "已发送"
# my-evolution/metar.c:322
# my-evolution/metar.c:322
# my-evolution/Locations.h:2102
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
#, fuzzy
msgid "Slana"
msgstr "沙尘"
@@ -33205,20 +34938,20 @@ msgstr "沙尘"
# my-evolution/metar.c:137
# my-evolution/metar.c:137
# my-evolution/Locations.h:2105
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
#, fuzzy
msgid "Smithers"
msgstr "骤雨"
# my-evolution/Locations.h:2106
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
msgid "Smyrna"
msgstr "士麦纳"
# my-evolution/metar.c:167
# my-evolution/metar.c:167
# my-evolution/Locations.h:2107
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
#, fuzzy
msgid "Snowshoe Lake"
msgstr "骤雪"
@@ -33226,14 +34959,14 @@ msgstr "骤雪"
# my-evolution/metar.c:66
# my-evolution/metar.c:66
# my-evolution/Locations.h:2108
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
msgid "Sochi"
msgstr "索契"
# mail/message-list.etspec.h:5
# mail/message-list.etspec.h:6
# my-evolution/Locations.h:2109
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
#, fuzzy
msgid "Socorro"
msgstr "分数"
@@ -33241,14 +34974,14 @@ msgstr "分数"
# mail/message-list.etspec.h:5
# mail/message-list.etspec.h:6
# my-evolution/Locations.h:2110
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
msgid "Socotra"
msgstr "索科特拉岛"
# my-evolution/metar.c:172
# my-evolution/metar.c:172
# my-evolution/Locations.h:2111
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
#, fuzzy
msgid "Soda Springs"
msgstr "冰雪"
@@ -33256,7 +34989,7 @@ msgstr "冰雪"
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# my-evolution/Locations.h:2112
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
msgid "Sofia"
msgstr "索非亚"
@@ -33265,7 +34998,7 @@ msgstr "索非亚"
# camel/providers/sendmail/camel-sendmail-provider.c:36
# mail/mail-config.glade.h:72
# my-evolution/Locations.h:2113
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
#, fuzzy
msgid "Sogndal"
msgstr "Sendmail"
@@ -33273,7 +35006,7 @@ msgstr "Sendmail"
# addressbook/gui/contact-editor/fulladdr.glade.h:191
# addressbook/gui/contact-editor/fulladdr.glade.h:191
# my-evolution/Locations.h:2114
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
#, fuzzy
msgid "Soldotna"
msgstr "斯洛文尼亚"
@@ -33281,38 +35014,38 @@ msgstr "斯洛文尼亚"
# my-evolution/metar.c:137
# my-evolution/metar.c:137
# my-evolution/Locations.h:2115
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
#, fuzzy
msgid "Somerset"
msgstr "骤雨"
# my-evolution/Locations.h:2116
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
#, fuzzy
msgid "Sonderborg"
msgstr "发件人"
# my-evolution/Locations.h:2117
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
msgid "Songmu Ab"
msgstr ""
# my-evolution/Locations.h:2118
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
msgid "Sorkjosen"
msgstr ""
# my-evolution/metar.c:65
# my-evolution/metar.c:65
# my-evolution/Locations.h:2120
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
msgid "Southampton"
msgstr "南安普敦"
# my-evolution/metar.c:66
# my-evolution/metar.c:66
# my-evolution/Locations.h:2121
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
#, fuzzy
msgid "South Bend"
msgstr "南"
@@ -33320,21 +35053,21 @@ msgstr "南"
# addressbook/gui/contact-editor/fulladdr.glade.h:194
# addressbook/gui/contact-editor/fulladdr.glade.h:194
# my-evolution/Locations.h:2122
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
msgid "South Carolina"
msgstr "南卡罗莱纳州"
# my-evolution/metar.c:65
# my-evolution/metar.c:65
# my-evolution/Locations.h:2123
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
msgid "South Dakota"
msgstr "南达科塔"
# my-evolution/metar.c:66
# my-evolution/metar.c:66
# my-evolution/Locations.h:2124
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
#, fuzzy
msgid "Southend"
msgstr "南"
@@ -33342,98 +35075,98 @@ msgstr "南"
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# my-evolution/Locations.h:2125
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
#, fuzzy
msgid "South Marsh Island"
msgstr "马绍尔群岛"
# my-evolution/Locations.h:2126
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
msgid "South Timbalier"
msgstr ""
# my-evolution/Locations.h:2128
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
msgid "Sparrevohn"
msgstr ""
# my-evolution/Locations.h:2129
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
msgid "Spencer"
msgstr "斯宾塞"
# my-evolution/Locations.h:2130
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
msgid "Spickard"
msgstr ""
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# my-evolution/Locations.h:2131
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
msgid "Split"
msgstr "斯普利特"
# my-evolution/metar.c:292
# my-evolution/metar.c:292
# my-evolution/Locations.h:2132
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
#, fuzzy
msgid "Spokane"
msgstr "烟霞"
# my-evolution/Locations.h:2133
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
msgid "Spokane-Parkwater"
msgstr ""
# my-evolution/Locations.h:2134
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
msgid "Springbok"
msgstr ""
# widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
# widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
# my-evolution/Locations.h:2135
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
#, fuzzy
msgid "Springfield"
msgstr "简体"
# my-evolution/Locations.h:2136
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
msgid "Stampede Pass"
msgstr ""
# calendar/gui/dialogs/task-details-page.glade.h:5
# calendar/gui/dialogs/task-details-page.glade.h:5
# my-evolution/Locations.h:2137
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
msgid "State College"
msgstr "州立学院"
# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
# my-evolution/Locations.h:2138
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
#, fuzzy
msgid "Stauning"
msgstr "开始:"
# my-evolution/Locations.h:2139
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
msgid "Staunton"
msgstr "斯托顿"
# my-evolution/Locations.h:2140
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
msgid "Stavanger/Sola"
msgstr "斯塔万格/Sola"
# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
# my-evolution/Locations.h:2141
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
#, fuzzy
msgid "Staverton"
msgstr "开始:"
@@ -33441,25 +35174,25 @@ msgstr "开始:"
# ui/evolution-addressbook.xml.h:27
# ui/evolution-addressbook.xml.h:27
# my-evolution/Locations.h:2142
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
#, fuzzy
msgid "Stavropol"
msgstr "停止"
# my-evolution/Locations.h:2143
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
msgid "St Cloud"
msgstr ""
# my-evolution/Locations.h:2144
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
msgid "Steamboat Springs"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:187
# addressbook/gui/contact-editor/fulladdr.glade.h:187
# my-evolution/Locations.h:2145
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
#, fuzzy
msgid "Stephenville"
msgstr "塞舌尔"
@@ -33467,30 +35200,30 @@ msgstr "塞舌尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:198
# addressbook/gui/contact-editor/fulladdr.glade.h:198
# my-evolution/Locations.h:2146
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
#, fuzzy
msgid "St. George"
msgstr "圣赫勒拿岛"
# my-evolution/Locations.h:2147
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
msgid "Stillwater"
msgstr ""
# my-evolution/Locations.h:2148
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
msgid "St. John's"
msgstr ""
# my-evolution/Locations.h:2149
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
msgid "St Johnsbury"
msgstr ""
# ui/evolution-addressbook.xml.h:27
# ui/evolution-addressbook.xml.h:27
# my-evolution/Locations.h:2150
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
#, fuzzy
msgid "St Joseph"
msgstr "停止"
@@ -33498,44 +35231,44 @@ msgstr "停止"
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# my-evolution/Locations.h:2151
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
msgid "St Louis"
msgstr "圣路易斯"
# my-evolution/Locations.h:2152
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
msgid "St Louis-Spirit"
msgstr "圣路易斯-Spirit"
# my-evolution/Locations.h:2153
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
msgid "Stockholm (Arlanda)"
msgstr "斯德哥尔摩 (Arlanda)"
# my-evolution/Locations.h:2154
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
msgid "Stockholm (Bromma)"
msgstr "斯德哥尔摩 (Bromma)"
# my-evolution/Locations.h:2155
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
msgid "Stockton"
msgstr ""
# my-evolution/Locations.h:2156
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
msgid "Stokmarknes/Skagen"
msgstr ""
# my-evolution/Locations.h:2157
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
msgid "Stord/Sorstokken"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:197
# addressbook/gui/contact-editor/fulladdr.glade.h:197
# my-evolution/Locations.h:2158
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
#, fuzzy
msgid "Storm Lake"
msgstr "斯里兰卡"
@@ -33543,7 +35276,7 @@ msgstr "斯里兰卡"
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# my-evolution/Locations.h:2159
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
#, fuzzy
msgid "Stornoway"
msgstr "挪威"
@@ -33557,39 +35290,39 @@ msgstr "挪威"
# calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:31
# mail/message-list.etspec.h:9
# my-evolution/Locations.h:2160
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
msgid "St Paul"
msgstr "圣保罗"
# my-evolution/Locations.h:2161
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
msgid "St Petersburg"
msgstr "圣彼得堡"
# my-evolution/Locations.h:2162
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
msgid "St Petersburg / Clearwater"
msgstr "圣彼得堡 / Clearwater"
# my-evolution/Locations.h:2163
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
msgid "Strasbourg"
msgstr "斯特拉斯堡"
# my-evolution/Locations.h:2164
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
msgid "Strevell"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:192
# addressbook/gui/contact-editor/fulladdr.glade.h:192
# my-evolution/Locations.h:2165
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
msgid "St Simon's Island"
msgstr "圣西蒙岛"
# my-evolution/Locations.h:2166
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
msgid "Stumpy Point"
msgstr ""
@@ -33598,26 +35331,26 @@ msgstr ""
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
# calendar/gui/dialogs/recurrence-page.c:964
# my-evolution/Locations.h:2167
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
msgid "Sturgeon Bay"
msgstr "鲟鱼湾"
# my-evolution/Locations.h:2168
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
msgid "Stuttgart"
msgstr "斯图加特"
# mail/message-list.etspec.h:5
# mail/message-list.etspec.h:6
# my-evolution/Locations.h:2169
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
msgid "Sucre"
msgstr "苏克雷"
# addressbook/gui/contact-editor/fulladdr.glade.h:123
# addressbook/gui/contact-editor/fulladdr.glade.h:123
# my-evolution/Locations.h:2170
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
#, fuzzy
msgid "Sumburgh"
msgstr "卢森堡"
@@ -33629,170 +35362,170 @@ msgstr "卢森堡"
# my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
# shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
# my-evolution/Locations.h:2171
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
#, fuzzy
msgid "Sumter"
msgstr "概要"
# my-evolution/Locations.h:2172
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
msgid "Sumter (2)"
msgstr ""
# my-evolution/Locations.h:2173
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
msgid "Sundsvall-Harnosand"
msgstr "松兹瓦尔-Harnosand"
# calendar/zones.h:248
# my-evolution/Locations.h:2174
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
msgid "Sungshan/Taipei"
msgstr "Sungshan/台北"
# my-evolution/Locations.h:2175
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
msgid "Superior"
msgstr ""
# ui/evolution-addressbook.xml.h:27
# ui/evolution-addressbook.xml.h:27
# my-evolution/Locations.h:2177
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
msgid "Sutton"
msgstr "萨顿"
# my-evolution/Locations.h:2178
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
msgid "Suwon Ab"
msgstr ""
# my-evolution/Locations.h:2179
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
msgid "Svalbard"
msgstr "斯瓦尔巴特"
# my-evolution/Locations.h:2180
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
msgid "Svolvaer/Helle"
msgstr ""
# my-evolution/Locations.h:2182
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
msgid "Swift Current"
msgstr ""
# my-evolution/Locations.h:2184
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
msgid "Sydney"
msgstr "悉尼"
# my-evolution/Locations.h:2185
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
msgid "Syktyvkar"
msgstr ""
# ui/evolution-addressbook.xml.h:27
# ui/evolution-addressbook.xml.h:27
# my-evolution/Locations.h:2186
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
#, fuzzy
msgid "Sympheropol"
msgstr "停止"
# my-evolution/Locations.h:2187
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
msgid "Syracuse"
msgstr "锡拉库扎"
# my-evolution/Locations.h:2188
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
msgid "Szczecin"
msgstr "什切青"
# my-evolution/Locations.h:2189
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
msgid "Szombathely"
msgstr ""
# widgets/misc/e-charset-picker.c:84
# widgets/misc/e-charset-picker.c:84
# my-evolution/Locations.h:2190
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
#, fuzzy
msgid "Tabatinga"
msgstr "繁体"
# my-evolution/Locations.h:2191
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
msgid "Tabriz"
msgstr "大不里士"
# calendar/gui/print.c:2205
# calendar/gui/print.c:2205
# my-evolution/Locations.h:2192
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
#, fuzzy
msgid "Tabuk"
msgstr "任务"
# my-evolution/Locations.h:2193
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
msgid "Tachikawa Ab"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:211
# addressbook/gui/contact-editor/fulladdr.glade.h:211
# my-evolution/Locations.h:2194
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
#, fuzzy
msgid "Tacna"
msgstr "汤加"
# my-evolution/Locations.h:2195
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
msgid "Tacoma"
msgstr "塔科马"
# my-evolution/Locations.h:2196
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
msgid "Tacoma-Lakewood"
msgstr "塔科马-Lakewood"
# my-evolution/Locations.h:2197
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
msgid "Tacuarembo"
msgstr ""
# my-evolution/Locations.h:2198
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
msgid "Taegu"
msgstr "大丘"
# my-evolution/Locations.h:2199
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
msgid "Taegu Ab"
msgstr "大丘 Ab"
# my-evolution/Locations.h:2200
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
msgid "Taejon"
msgstr "大田"
# my-evolution/Locations.h:2201
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
msgid "Tahoe Valley"
msgstr "塔霍谷"
# my-evolution/Locations.h:2202
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
msgid "Taichung"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2203
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
#, fuzzy
msgid "Taif"
msgstr "台湾"
@@ -33800,111 +35533,111 @@ msgstr "台湾"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2204
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
msgid "Tainan"
msgstr "台南"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2206
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
msgid "Taiyuan"
msgstr "太原"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2207
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
msgid "Taiz"
msgstr "塔伊兹"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2208
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
#, fuzzy
msgid "Tajima"
msgstr "台湾"
# my-evolution/Locations.h:2209
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
msgid "Takamatsu Airport"
msgstr "高松机场"
# my-evolution/Locations.h:2210
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
msgid "Talara"
msgstr ""
-# addressbook/gui/contact-editor/fulladdr.glade.h:206
-# addressbook/gui/contact-editor/fulladdr.glade.h:206
-# my-evolution/Locations.h:2211
-#: my-evolution/Locations.h:2211
-#, fuzzy
-msgid "Talinn"
-msgstr "台湾"
-
# my-evolution/Locations.h:2212
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
msgid "Talkeetna"
msgstr ""
# my-evolution/Locations.h:2213
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
msgid "Tallahassee"
msgstr "塔拉哈西"
+# addressbook/gui/contact-editor/fulladdr.glade.h:206
+# addressbook/gui/contact-editor/fulladdr.glade.h:206
+# my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "台湾"
+
# my-evolution/Locations.h:2214
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2212
msgid "Tamanrasset"
msgstr ""
# my-evolution/Locations.h:2215
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
msgid "Tamanrasset/Aguenna"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# my-evolution/Locations.h:2216
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
msgid "Tampa"
msgstr "坦帕"
# my-evolution/Locations.h:2217
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
msgid "Tampa-Macdill AFB"
msgstr "坦帕-Macdill 空军基地"
# addressbook/printing/e-contact-print.glade.h:27
# addressbook/printing/e-contact-print.glade.h:27
# my-evolution/Locations.h:2218
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
msgid "Tampere"
msgstr "坦佩雷"
# my-evolution/Locations.h:2219
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
msgid "Tampico"
msgstr "坦皮科"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2220
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
#, fuzzy
msgid "Tanana"
msgstr "台湾"
# my-evolution/Locations.h:2221
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
msgid "Tanegashima Airport"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# my-evolution/Locations.h:2222
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
#, fuzzy
msgid "Taos"
msgstr "老挝"
@@ -33912,24 +35645,24 @@ msgstr "老挝"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2223
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
msgid "Taoyuan"
msgstr ""
# my-evolution/Locations.h:2224
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
msgid "Tapachula"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2225
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
msgid "Taranto"
msgstr "塔兰托"
# my-evolution/Locations.h:2226
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
#, fuzzy
msgid "Tarbes"
msgstr "测试"
@@ -33937,59 +35670,59 @@ msgstr "测试"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2227
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
#, fuzzy
msgid "Tarija"
msgstr "台湾"
# my-evolution/Locations.h:2228
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
msgid "Tarvisio"
msgstr ""
# widgets/misc/e-charset-picker.c:84
# widgets/misc/e-charset-picker.c:84
# my-evolution/Locations.h:2229
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
#, fuzzy
msgid "Tatalina"
msgstr "繁体"
# my-evolution/Locations.h:2230
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
msgid "Tateyama Ab"
msgstr ""
# my-evolution/Locations.h:2231
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
msgid "Taunton"
msgstr ""
# my-evolution/Locations.h:2232
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
msgid "Tebessa"
msgstr ""
# my-evolution/Locations.h:2233
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
msgid "Tees-Side"
msgstr ""
# calendar/zones.h:168
# my-evolution/Locations.h:2234
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
msgid "Tegucigalpa"
msgstr "特古西加尔巴"
# my-evolution/Locations.h:2235
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
msgid "Tehran-Mehrabad"
msgstr "德黑兰-Mehrabad"
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# my-evolution/Locations.h:2236
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
#, fuzzy
msgid "Tela"
msgstr "托克劳群岛"
@@ -34001,70 +35734,70 @@ msgstr "托克劳群岛"
# addressbook/gui/contact-editor/e-contact-editor.c:1661
# addressbook/gui/widgets/e-addressbook-view.c:872
# my-evolution/Locations.h:2237
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
msgid "Temple"
msgstr "坦普尔"
# my-evolution/Locations.h:2238
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
msgid "Tennessee"
msgstr "田纳西"
# my-evolution/Locations.h:2239
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
msgid "Tepic"
msgstr "特皮克"
# my-evolution/Locations.h:2240
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
msgid "Teresina"
msgstr "特雷西纳"
# my-evolution/Locations.h:2241
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
msgid "Terre Haute"
msgstr ""
# my-evolution/Locations.h:2242
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
msgid "Terrell"
msgstr "特雷尔"
# my-evolution/Locations.h:2243
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
msgid "Teterboro"
msgstr ""
# my-evolution/Locations.h:2244
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
msgid "Texarkana"
msgstr ""
# my-evolution/Locations.h:2245
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
msgid "Texas"
msgstr "德克萨斯州"
# addressbook/gui/contact-editor/fulladdr.glade.h:187
# addressbook/gui/contact-editor/fulladdr.glade.h:187
# my-evolution/Locations.h:2246
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
#, fuzzy
msgid "The Dalles"
msgstr "塞舌尔"
# my-evolution/Locations.h:2247
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
msgid "Thessaloniki"
msgstr "萨洛尼卡"
# my-evolution/Locations.h:2248
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
msgid "Thief River Falls"
msgstr ""
# my-evolution/Locations.h:2249
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
msgid "Thiruvananthapuram"
msgstr ""
@@ -34073,13 +35806,13 @@ msgstr ""
# addressbook/backend/ebook/e-card-simple.c:91
# addressbook/gui/widgets/e-addressbook-view.c:880
# my-evolution/Locations.h:2250
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
#, fuzzy
msgid "Thisted"
msgstr "头衔"
# my-evolution/Locations.h:2251
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
msgid "Thompson Falls"
msgstr "汤普森瀑布"
@@ -34088,7 +35821,7 @@ msgstr "汤普森瀑布"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
# calendar/gui/dialogs/recurrence-page.c:962
# my-evolution/Locations.h:2252
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
#, fuzzy
msgid "Thumrait"
msgstr "星期四"
@@ -34096,31 +35829,31 @@ msgstr "星期四"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2253
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
msgid "Tianjin"
msgstr "天津"
# addressbook/gui/contact-editor/fulladdr.glade.h:16
# calendar/zones.h:171
# my-evolution/Locations.h:2254
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
msgid "Tijuana"
msgstr "提华纳"
# my-evolution/Locations.h:2255
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
msgid "Timisoara"
msgstr ""
# my-evolution/Locations.h:2256
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
msgid "Tin City"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2257
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
#, fuzzy
msgid "Tirana"
msgstr "台湾"
@@ -34128,18 +35861,18 @@ msgstr "台湾"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
# my-evolution/Locations.h:2258
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
#, fuzzy
msgid "Tiree"
msgstr "时间"
# my-evolution/Locations.h:2259
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
msgid "Tirgu Mures"
msgstr ""
# my-evolution/Locations.h:2260
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
msgid "Tiruchchirapalli"
msgstr ""
@@ -34148,7 +35881,7 @@ msgstr ""
# addressbook/backend/ebook/e-card-simple.c:91
# addressbook/gui/widgets/e-addressbook-view.c:880
# my-evolution/Locations.h:2261
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
#, fuzzy
msgid "Titusville"
msgstr "头衔"
@@ -34158,81 +35891,81 @@ msgstr "头衔"
# calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
# calendar/gui/e-calendar-table.c:384
# my-evolution/Locations.h:2262
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
#, fuzzy
msgid "Tivat"
msgstr "保密"
# my-evolution/Locations.h:2263
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
msgid "Tlemcen Zenata"
msgstr ""
# my-evolution/Locations.h:2264
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
msgid "Tobias Bolanos"
msgstr "托拜厄斯 Bolanos"
# my-evolution/Locations.h:2265
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
msgid "Tocumen"
msgstr ""
# my-evolution/Locations.h:2266
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
msgid "Togiak Village"
msgstr ""
# my-evolution/Locations.h:2267
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
msgid "Tokachi GSDF"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:48
# addressbook/gui/contact-editor/fulladdr.glade.h:48
# my-evolution/Locations.h:2268
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
msgid "Tokunoshima Island"
msgstr ""
# my-evolution/Locations.h:2269
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
msgid "Tokushima Ab"
msgstr "德岛 Ab"
# my-evolution/Locations.h:2270
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
msgid "Tokyo Heliport"
msgstr "东京直升机场"
# my-evolution/Locations.h:2271
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
msgid "Tokyo International Airport"
msgstr "东京国际机场"
# my-evolution/Locations.h:2272
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
msgid "Tokyo New International Airport"
msgstr "东京新机场"
# ui/evolution.xml.h:25
# ui/evolution.xml.h:25
# my-evolution/Locations.h:2273
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
msgid "Toledo"
msgstr "托莱多"
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# my-evolution/Locations.h:2274
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
msgid "Toluca"
msgstr "托卢卡"
# addressbook/gui/contact-editor/fulladdr.glade.h:211
# addressbook/gui/contact-editor/fulladdr.glade.h:211
# my-evolution/Locations.h:2275
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
#, fuzzy
msgid "Tonopah"
msgstr "汤加"
@@ -34240,36 +35973,36 @@ msgstr "汤加"
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# my-evolution/Locations.h:2276
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
msgid "Topeka"
msgstr "托皮卡"
# my-evolution/Locations.h:2277
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
msgid "Topeka-Forbes Field"
msgstr "托皮卡-Forbes Field"
# my-evolution/Locations.h:2278
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
msgid "Torino/Bric Della Croce"
msgstr "托里诺/Bric Della Croce"
# my-evolution/Locations.h:2279
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
msgid "Torino/Caselle"
msgstr "托里诺/Caselle"
# my-evolution/metar.c:442 my-evolution/metar.c:451
# my-evolution/metar.c:442 my-evolution/metar.c:451
# my-evolution/Locations.h:2280
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
msgid "Toronto"
msgstr "多伦多"
# addressbook/printing/e-contact-print.glade.h:39
# addressbook/printing/e-contact-print.glade.h:39
# my-evolution/Locations.h:2281
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
#, fuzzy
msgid "Torp"
msgstr "顶部:"
@@ -34277,14 +36010,14 @@ msgstr "顶部:"
# addressbook/gui/contact-editor/fulladdr.glade.h:77
# addressbook/gui/contact-editor/fulladdr.glade.h:77
# my-evolution/Locations.h:2282
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
msgid "Torrance"
msgstr "托兰斯"
# widgets/misc/e-charset-picker.c:64
# widgets/misc/e-charset-picker.c:64
# my-evolution/Locations.h:2283
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
#, fuzzy
msgid "Torreon"
msgstr "韩语"
@@ -34292,7 +36025,7 @@ msgstr "韩语"
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
# my-evolution/Locations.h:2284
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
#, fuzzy
msgid "Tottori Airport"
msgstr "开始导入"
@@ -34308,39 +36041,39 @@ msgstr "开始导入"
# ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
# ui/evolution.xml.h:4
# my-evolution/Locations.h:2285
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
msgid "Toulouse"
msgstr "图鲁兹"
# my-evolution/Locations.h:2286
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
msgid "Toul-Rosieres"
msgstr ""
# my-evolution/Locations.h:2287
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
msgid "Tours-St-Symphorien"
msgstr "图尔斯-St-Symphorien"
# my-evolution/Locations.h:2288
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
msgid "Toussus-Le Noble"
msgstr ""
# my-evolution/Locations.h:2289
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
msgid "Townsville"
msgstr "汤斯维尔"
# my-evolution/Locations.h:2290
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
msgid "Toyama Airport"
msgstr "富山机场"
# addressbook/gui/contact-editor/fulladdr.glade.h:81
# addressbook/gui/contact-editor/fulladdr.glade.h:81
# my-evolution/Locations.h:2291
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
#, fuzzy
msgid "Trabzon"
msgstr "加蓬"
@@ -34348,12 +36081,12 @@ msgstr "加蓬"
# addressbook/gui/contact-editor/fulladdr.glade.h:109
# addressbook/gui/contact-editor/fulladdr.glade.h:109
# my-evolution/Locations.h:2292
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
msgid "Trapani"
msgstr "特拉帕尼"
# my-evolution/Locations.h:2293
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
msgid "Traverse City"
msgstr ""
@@ -34364,7 +36097,7 @@ msgstr ""
# addressbook/gui/contact-editor/e-contact-editor.c:1661
# addressbook/gui/widgets/e-addressbook-view.c:872
# my-evolution/Locations.h:2294
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
#, fuzzy
msgid "Trelew"
msgstr "电传"
@@ -34372,116 +36105,116 @@ msgstr "电传"
# addressbook/printing/e-contact-print.glade.h:24
# addressbook/printing/e-contact-print.glade.h:24
# my-evolution/Locations.h:2295
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
msgid "Trenton"
msgstr "特伦顿"
# ui/evolution-mail-message.xml.h:63
# ui/evolution-mail-message.xml.h:63
# my-evolution/Locations.h:2296
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
#, fuzzy
msgid "Trevico"
msgstr "上一个"
# my-evolution/Locations.h:2297
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
msgid "Treviso/Istrana"
msgstr ""
# my-evolution/Locations.h:2298
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
msgid "Treviso/S.Angelo"
msgstr ""
# my-evolution/Locations.h:2299
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
msgid "Trieste"
msgstr "的里雅斯特"
# my-evolution/metar.c:442 my-evolution/metar.c:451
# my-evolution/metar.c:442 my-evolution/metar.c:451
# my-evolution/Locations.h:2300
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
msgid "Trinidad"
msgstr "特立尼达"
# calendar/zones.h:56
# my-evolution/Locations.h:2301
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
msgid "Tripoli"
msgstr "的黎波里"
# my-evolution/Locations.h:2302
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
msgid "Tromso/Langnes"
msgstr "特罗姆兹/Langnes"
# my-evolution/Locations.h:2303
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
msgid "Trondheim/Vaernes"
msgstr "特隆赫姆/Vaernes"
# my-evolution/Locations.h:2304
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
msgid "Troutdale"
msgstr ""
# my-evolution/Locations.h:2305
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
msgid "Troyes/Barberey"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:214
# addressbook/gui/contact-editor/fulladdr.glade.h:214
# my-evolution/Locations.h:2306
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
#, fuzzy
msgid "Truckee"
msgstr "土耳其"
# my-evolution/Locations.h:2307
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
msgid "Truth or Consequences"
msgstr ""
# my-evolution/Locations.h:2308
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
msgid "Tsuiki Ab"
msgstr ""
# my-evolution/Locations.h:2309
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
msgid "Tsushima Airport"
msgstr "对马机场"
# my-evolution/Locations.h:2310
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
msgid "Tucson"
msgstr "图森"
# my-evolution/Locations.h:2311
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
msgid "Tucson-Davis AFB"
msgstr "图森-戴维斯空军基地"
# my-evolution/Locations.h:2312
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
msgid "Tucuman"
msgstr ""
# my-evolution/Locations.h:2313
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
msgid "Tucumcari"
msgstr ""
# my-evolution/Locations.h:2314
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
msgid "Tucurui"
msgstr ""
# my-evolution/Locations.h:2315
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
msgid "Tulancingo"
msgstr ""
@@ -34490,7 +36223,7 @@ msgstr ""
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
# calendar/gui/dialogs/recurrence-page.c:960
# my-evolution/Locations.h:2316
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
#, fuzzy
msgid "Tulcea"
msgstr "星期二"
@@ -34500,7 +36233,7 @@ msgstr "星期二"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
# calendar/gui/dialogs/recurrence-page.c:960
# my-evolution/Locations.h:2317
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
msgid "Tulsa"
msgstr "塔尔萨"
@@ -34513,7 +36246,7 @@ msgstr "塔尔萨"
# calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
# shell/glade/e-active-connection-dialog.glade.h:5
# my-evolution/Locations.h:2318
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
#, fuzzy
msgid "Tupelo"
msgstr "类型"
@@ -34521,7 +36254,7 @@ msgstr "类型"
# widgets/misc/e-charset-picker.c:65
# widgets/misc/e-charset-picker.c:65
# my-evolution/Locations.h:2319
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
#, fuzzy
msgid "Turaif"
msgstr "土耳其语"
@@ -34529,24 +36262,24 @@ msgstr "土耳其语"
# widgets/misc/e-charset-picker.c:65
# widgets/misc/e-charset-picker.c:65
# my-evolution/Locations.h:2320
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
msgid "Turin"
msgstr "都灵"
# addressbook/gui/contact-editor/fulladdr.glade.h:214
# addressbook/gui/contact-editor/fulladdr.glade.h:214
# my-evolution/Locations.h:2322
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
msgid "Turku"
msgstr "土尔库"
# my-evolution/Locations.h:2323
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
msgid "Tuscaloosa"
msgstr ""
# my-evolution/Locations.h:2324
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
msgid "Tuxtla Gutierrez"
msgstr ""
@@ -34555,105 +36288,105 @@ msgstr ""
# calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
# calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
# my-evolution/Locations.h:2325
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
#, fuzzy
msgid "Twenthe"
msgstr "暂时的"
# my-evolution/Locations.h:2326
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
msgid "Twentynine Palms"
msgstr ""
# my-evolution/Locations.h:2327
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
msgid "Twin Falls"
msgstr ""
# my-evolution/Locations.h:2328
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
msgid "Tyler"
msgstr "泰勒"
# my-evolution/Locations.h:2329
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
msgid "Tyndall AFB"
msgstr "廷德尔空军基地"
# my-evolution/Locations.h:2330
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
msgid "Tyumen"
msgstr "秋明"
# my-evolution/Locations.h:2331
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
msgid "Uberaba"
msgstr ""
# my-evolution/Locations.h:2332
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
msgid "Ufa"
msgstr ""
# my-evolution/Locations.h:2333
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
msgid "Ukiah"
msgstr ""
# my-evolution/Locations.h:2335
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
msgid "Ulan-Ude"
msgstr ""
# my-evolution/Locations.h:2336
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
msgid "Ulsan"
msgstr ""
# my-evolution/Locations.h:2337
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
msgid "Ulyanovsk"
msgstr "乌里扬诺夫斯克"
# my-evolution/Locations.h:2338
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
msgid "Umea"
msgstr ""
# my-evolution/Locations.h:2339
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
msgid "Umiat"
msgstr ""
# my-evolution/Locations.h:2340
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
msgid "Unalakleet"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:221
# addressbook/gui/contact-editor/fulladdr.glade.h:221
# my-evolution/Locations.h:2341
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
msgid "United Arab Emirates "
msgstr "阿拉伯联合酋长国 "
# mail/message-list.c:639
# mail/message-list.c:645
# my-evolution/Locations.h:2344
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
#, fuzzy
msgid "Unst"
msgstr "不可见"
# my-evolution/Locations.h:2345
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
msgid "Upington"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:109
# addressbook/gui/contact-editor/fulladdr.glade.h:109
# my-evolution/Locations.h:2346
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
#, fuzzy
msgid "Uruapan"
msgstr "日本"
@@ -34661,39 +36394,39 @@ msgstr "日本"
# addressbook/gui/contact-editor/fulladdr.glade.h:226
# addressbook/gui/contact-editor/fulladdr.glade.h:226
# my-evolution/Locations.h:2347
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
msgid "Uruguaiana"
msgstr "乌拉圭亚纳"
# my-evolution/Locations.h:2349
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
msgid "Urumqi"
msgstr ""
# ui/evolution-message-composer.xml.h:1
# ui/evolution-message-composer.xml.h:1
# my-evolution/Locations.h:2350
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
msgid "Utah"
msgstr "犹他州"
# my-evolution/Locations.h:2351
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
msgid "Utica"
msgstr "尤蒂卡"
# my-evolution/Locations.h:2352
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
msgid "Utrecht/Soesterberg"
msgstr "乌德勒支/Soesterberg"
# my-evolution/Locations.h:2353
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
msgid "Utsunomiya Ab"
msgstr "宇都宫 Ab"
# my-evolution/Locations.h:2354
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
msgid "Uzhgorod"
msgstr ""
@@ -34704,7 +36437,7 @@ msgstr ""
# addressbook/gui/contact-editor/e-contact-editor.c:1660
# addressbook/gui/widgets/e-addressbook-view.c:871
# my-evolution/Locations.h:2355
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
#, fuzzy
msgid "Vadso"
msgstr "收音机"
@@ -34712,7 +36445,7 @@ msgstr "收音机"
# my-evolution/metar.c:63
# my-evolution/metar.c:63
# my-evolution/Locations.h:2356
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
#, fuzzy
msgid "Vaerlose"
msgstr "不定风"
@@ -34720,139 +36453,139 @@ msgstr "不定风"
# addressbook/gui/contact-editor/fulladdr.glade.h:172
# addressbook/gui/contact-editor/fulladdr.glade.h:172
# my-evolution/Locations.h:2357
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
msgid "Vagar"
msgstr "瓦尔迪兹"
# my-evolution/Locations.h:2358
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
msgid "Valdez 2"
msgstr "瓦尔迪兹 2"
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# my-evolution/Locations.h:2359
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
#, fuzzy
msgid "Valdosta"
msgstr "马耳他"
# my-evolution/Locations.h:2360
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
msgid "Valdosta-Moody AFB"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:191
# addressbook/gui/contact-editor/fulladdr.glade.h:191
# my-evolution/Locations.h:2361
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
msgid "Valencia"
msgstr "巴伦西亚"
# calendar/zones.h:257
# my-evolution/Locations.h:2362
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
msgid "Valentine"
msgstr "瓦伦丁"
# my-evolution/Locations.h:2363
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
msgid "Valera*"
msgstr "瓦勒拉"
# my-evolution/Locations.h:2364
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
msgid "Valkenburg"
msgstr ""
# my-evolution/Locations.h:2365
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
msgid "Valley"
msgstr ""
# my-evolution/Locations.h:2366
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
msgid "Valparaiso"
msgstr "瓦尔帕莱索"
# my-evolution/Locations.h:2367
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
msgid "Valparaiso-Eglin AFB"
msgstr "瓦尔帕莱索-Eglin 空军基地"
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/backend/ebook/e-card-simple.c:93
# my-evolution/Locations.h:2368
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
#, fuzzy
msgid "Van"
msgstr "经理"
# my-evolution/Locations.h:2369
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
msgid "Vancouver"
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
# my-evolution/Locations.h:2370
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
#, fuzzy
msgid "Vandel"
msgstr "取消"
# my-evolution/Locations.h:2371
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
msgid "Vandenberg AFB"
msgstr "范登堡空军基地"
# my-evolution/Locations.h:2372
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
msgid "Vandenberg Range"
msgstr "范登堡山脉"
# my-evolution/Locations.h:2373
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
msgid "Van Nuys"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:20
# addressbook/gui/contact-editor/fulladdr.glade.h:20
# my-evolution/Locations.h:2374
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
#, fuzzy
msgid "Varadero"
msgstr "巴巴多斯岛"
# my-evolution/Locations.h:2375
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
msgid "Varanasi/Babatpur"
msgstr "瓦蜡纳西/Babatpur"
# addressbook/gui/contact-editor/fulladdr.glade.h:228
# addressbook/gui/contact-editor/fulladdr.glade.h:228
# my-evolution/Locations.h:2376
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
msgid "Varna"
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
# my-evolution/Locations.h:2377
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
#, fuzzy
msgid "Vasteras"
msgstr "之后"
# my-evolution/Locations.h:2378
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
msgid "Vaxjo"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:229
# addressbook/gui/contact-editor/fulladdr.glade.h:229
# my-evolution/Locations.h:2379
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
#, fuzzy
msgid "Venezia"
msgstr "委内瑞拉"
@@ -34860,186 +36593,186 @@ msgstr "委内瑞拉"
# widgets/misc/e-charset-picker.c:66
# widgets/misc/e-charset-picker.c:66
# my-evolution/Locations.h:2381
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
#, fuzzy
msgid "Venice"
msgstr "Unicode"
# my-evolution/Locations.h:2382
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
msgid "Veracruz"
msgstr "韦拉克鲁斯"
# my-evolution/Locations.h:2383
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
msgid "Vermillion"
msgstr ""
# my-evolution/Locations.h:2384
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
msgid "Vermont"
msgstr "佛蒙特州"
# addressbook/gui/contact-editor/contact-editor.glade.h:16
# addressbook/gui/contact-editor/contact-editor.glade.h:16
# my-evolution/Locations.h:2385
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
#, fuzzy
msgid "Vernal"
msgstr "常规"
# my-evolution/Locations.h:2386
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
msgid "Vero Beach"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:229
# addressbook/gui/contact-editor/fulladdr.glade.h:229
# my-evolution/Locations.h:2387
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
msgid "Vicenza"
msgstr "维琴察"
# my-evolution/Locations.h:2388
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
msgid "Vichy-Charmeil"
msgstr "维希-Charmeil"
# my-evolution/Locations.h:2389
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
msgid "Vichy-Rolla"
msgstr "维希-Rolla"
# my-evolution/Locations.h:2390
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
msgid "Vicksburg"
msgstr ""
# my-evolution/Locations.h:2391
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
msgid "Victoria"
msgstr "维多利亚"
# my-evolution/Locations.h:2393
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
msgid "Vigo"
msgstr "比戈"
# shell/e-shell-importer.c:612
# shell/e-shell-importer.c:612
# my-evolution/Locations.h:2394
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
#, fuzzy
msgid "Vilhena"
msgstr "文件名:"
# my-evolution/Locations.h:2395
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
msgid "Villacoublay"
msgstr ""
# my-evolution/Locations.h:2396
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
msgid "Villafranca"
msgstr ""
# my-evolution/Locations.h:2397
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
msgid "Villahermosa"
msgstr ""
# my-evolution/Locations.h:2398
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
msgid "Villamontes"
msgstr ""
# my-evolution/Locations.h:2399
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
msgid "Villa Reynolds"
msgstr ""
# calendar/zones.h:329
# my-evolution/Locations.h:2400
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
msgid "Vilnius"
msgstr "维尔纽斯"
# my-evolution/Locations.h:2401
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
msgid "Virginia"
msgstr "维吉尼亚"
# my-evolution/Locations.h:2402
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
msgid "Virginia Beach"
msgstr "维吉尼亚海岸"
# my-evolution/Locations.h:2403
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
msgid "Virginia Tech Airport"
msgstr "维吉尼亚 Tech 机场"
# my-evolution/Locations.h:2404
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
msgid "Viru-Viru"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# my-evolution/Locations.h:2405
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
#, fuzzy
msgid "Visalia"
msgstr "澳大利亚"
# my-evolution/Locations.h:2406
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
msgid "Visby"
msgstr "维斯比"
# my-evolution/Locations.h:2407
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
msgid "Viterbo"
msgstr ""
# my-evolution/Locations.h:2408
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
msgid "Vitoria"
msgstr "维多利亚"
# my-evolution/Locations.h:2409
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
msgid "Vladikavkaz"
msgstr ""
# calendar/zones.h:258
# my-evolution/Locations.h:2410
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
msgid "Vladivostok"
msgstr "符拉迪沃斯托克"
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# my-evolution/Locations.h:2411
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
#, fuzzy
msgid "Vlieland"
msgstr "爱尔兰"
# my-evolution/Locations.h:2412
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
msgid "Vojens/Skrydstrup"
msgstr ""
# my-evolution/Locations.h:2413
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
msgid "Volgograd"
msgstr "伏尔加格勒"
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# my-evolution/Locations.h:2414
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
#, fuzzy
msgid "Volkel"
msgstr "托克劳群岛"
@@ -35047,20 +36780,20 @@ msgstr "托克劳群岛"
# ui/evolution-message-composer.xml.h:49
# ui/evolution-message-composer.xml.h:49
# my-evolution/Locations.h:2415
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
#, fuzzy
msgid "Volk Field"
msgstr "发件人域(_F)"
# my-evolution/Locations.h:2416
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
msgid "Voronezh"
msgstr "沃罗涅什"
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# my-evolution/Locations.h:2417
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
#, fuzzy
msgid "Voslau"
msgstr "托克劳群岛"
@@ -35068,94 +36801,94 @@ msgstr "托克劳群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# my-evolution/Locations.h:2418
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
msgid "Waco"
msgstr "韦科"
# my-evolution/Locations.h:2419
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
msgid "Wadi Al Dawasser Airport"
msgstr ""
# my-evolution/Locations.h:2420
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
msgid "Wainwright"
msgstr ""
# my-evolution/Locations.h:2421
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
msgid "Wakefield"
msgstr "韦克菲尔德"
# my-evolution/Locations.h:2422
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
msgid "Wakkanai Airport"
msgstr ""
# my-evolution/Locations.h:2423
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
msgid "Walla Walla"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# my-evolution/Locations.h:2424
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
#, fuzzy
msgid "Wallops Island"
msgstr "马绍尔群岛"
# my-evolution/Locations.h:2425
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
msgid "Walnut Ridge"
msgstr ""
# mail/mail-callbacks.c:2128 widgets/misc/e-messagebox.c:159
# mail/mail-callbacks.c:2247 widgets/misc/e-messagebox.c:159
# my-evolution/Locations.h:2426
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
#, fuzzy
msgid "Warner Robins"
msgstr "警告"
# my-evolution/Locations.h:2427
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
msgid "Warroad"
msgstr ""
# my-evolution/Locations.h:2428
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
msgid "Warszawa"
msgstr "华沙"
# my-evolution/Locations.h:2429
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
msgid "Washington"
msgstr "华盛顿"
# my-evolution/Locations.h:2430
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
msgid "Washington/Dulles"
msgstr "华盛顿/杜勒斯"
# my-evolution/e-summary-weather.c:559
# my-evolution/e-summary-weather.c:559
# my-evolution/Locations.h:2431
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
msgid "Waterbury"
msgstr "沃特伯里"
# my-evolution/e-summary-weather.c:559
# my-evolution/e-summary-weather.c:559
# my-evolution/Locations.h:2432
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
msgid "Waterloo"
msgstr "滑铁卢"
# my-evolution/e-summary-weather.c:559
# my-evolution/e-summary-weather.c:559
# my-evolution/Locations.h:2433
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
#, fuzzy
msgid "Watertown"
msgstr "天气"
@@ -35165,31 +36898,31 @@ msgstr "天气"
# addressbook/backend/ebook/e-card-simple.c:104
# calendar/gui/e-calendar-table.etspec.h:4
# my-evolution/Locations.h:2434
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
#, fuzzy
msgid "Waterville"
msgstr "类别"
# my-evolution/Locations.h:2435
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
msgid "Waukesha"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:228
# addressbook/gui/contact-editor/fulladdr.glade.h:228
# my-evolution/Locations.h:2436
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
#, fuzzy
msgid "Wausau"
msgstr "努瓦阿图"
# my-evolution/Locations.h:2437
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
msgid "Waycross"
msgstr ""
# my-evolution/Locations.h:2438
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
msgid "Waynesboro"
msgstr ""
@@ -35198,46 +36931,46 @@ msgstr ""
# addressbook/backend/ebook/e-card-simple.c:88
# addressbook/gui/widgets/e-addressbook-view.c:877
# my-evolution/Locations.h:2439
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
msgid "Webster City"
msgstr "韦伯斯特城"
# calendar/gui/print.c:498
# calendar/gui/print.c:498
# my-evolution/Locations.h:2440
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
#, fuzzy
msgid "Wejh"
msgstr "三"
# my-evolution/Locations.h:2441
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
msgid "Wellington"
msgstr "惠灵顿"
# my-evolution/e-summary-weather.c:559
# my-evolution/e-summary-weather.c:559
# my-evolution/Locations.h:2442
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
#, fuzzy
msgid "Wenatchee"
msgstr "天气"
# my-evolution/Locations.h:2443
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
#, fuzzy
msgid "Wendover"
msgstr "发件人"
# my-evolution/Locations.h:2444
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
msgid "West Atlanta"
msgstr "西亚特兰大"
# widgets/misc/e-charset-picker.c:67
# widgets/misc/e-charset-picker.c:67
# my-evolution/Locations.h:2445
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
#, fuzzy
msgid "West Burke"
msgstr "西欧"
@@ -35245,7 +36978,7 @@ msgstr "西欧"
# addressbook/gui/contact-editor/fulladdr.glade.h:148
# addressbook/gui/contact-editor/fulladdr.glade.h:148
# my-evolution/Locations.h:2446
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
#, fuzzy
msgid "Westerland"
msgstr "荷兰"
@@ -35253,33 +36986,33 @@ msgstr "荷兰"
# my-evolution/metar.c:67
# my-evolution/metar.c:67
# my-evolution/Locations.h:2447
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
#, fuzzy
msgid "Westfield"
msgstr "西"
# my-evolution/Locations.h:2448
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
msgid "Westhampton"
msgstr ""
# my-evolution/Locations.h:2449
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
msgid "West Palm Beach"
msgstr ""
# my-evolution/Locations.h:2450
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
msgid "West Virginia"
msgstr "西维吉尼亚"
# my-evolution/Locations.h:2451
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
msgid "West Yellowstone"
msgstr "西黄石国家公园"
# my-evolution/Locations.h:2452
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
msgid "West Yellowstone (2)"
msgstr "西黄石国家公园 (2)"
@@ -35290,7 +37023,7 @@ msgstr "西黄石国家公园 (2)"
# calendar/gui/dialogs/event-editor.c:263
# calendar/gui/dialogs/event-editor.c:366
# my-evolution/Locations.h:2453
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
#, fuzzy
msgid "Wheeling"
msgstr "会见"
@@ -35298,55 +37031,55 @@ msgstr "会见"
# addressbook/gui/contact-editor/fulladdr.glade.h:48
# addressbook/gui/contact-editor/fulladdr.glade.h:48
# my-evolution/Locations.h:2454
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
#, fuzzy
msgid "Whidbey Island"
msgstr "圣诞岛"
# my-evolution/Locations.h:2455
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
msgid "Whitefield"
msgstr "怀特菲尔德"
# my-evolution/Locations.h:2456
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
msgid "White Plains"
msgstr ""
# my-evolution/Locations.h:2457
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
msgid "White Sulphur"
msgstr ""
# my-evolution/Locations.h:2458
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
msgid "Whittier"
msgstr "惠蒂尔"
# my-evolution/Locations.h:2459
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
msgid "Wichita"
msgstr ""
# my-evolution/Locations.h:2460
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
msgid "Wichita Falls"
msgstr ""
# my-evolution/Locations.h:2461
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
msgid "Wichita-Jabara"
msgstr ""
# my-evolution/Locations.h:2462
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
msgid "Wichita-McConnell AFB"
msgstr ""
# addressbook/backend/ebook/e-card-simple.c:95
# addressbook/backend/ebook/e-card-simple.c:95
# my-evolution/Locations.h:2463
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
#, fuzzy
msgid "Wick"
msgstr "绰号"
@@ -35354,147 +37087,147 @@ msgstr "绰号"
# calendar/gui/print.c:498
# calendar/gui/print.c:498
# my-evolution/Locations.h:2464
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
msgid "Wien"
msgstr "维也纳"
# my-evolution/Locations.h:2465
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
msgid "Wildwood"
msgstr ""
# my-evolution/Locations.h:2466
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
msgid "Wilkes - Barre"
msgstr "威尔克斯地 - Barre"
# my-evolution/Locations.h:2467
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
msgid "Williams Field"
msgstr ""
# my-evolution/Locations.h:2468
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
msgid "Williamsport"
msgstr ""
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# my-evolution/Locations.h:2469
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
#, fuzzy
msgid "Williston"
msgstr "列表"
# my-evolution/Locations.h:2470
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
msgid "Willoughby"
msgstr "威洛比"
# my-evolution/Locations.h:2471
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
msgid "Willow Airport"
msgstr ""
# my-evolution/Locations.h:2472
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
msgid "Wilmington"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:121
# addressbook/gui/contact-editor/fulladdr.glade.h:121
# my-evolution/Locations.h:2473
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
msgid "Winchester"
msgstr "温彻斯特"
# my-evolution/metar.c:397
# my-evolution/metar.c:397
# my-evolution/Locations.h:2474
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
msgid "Windsor"
msgstr "温莎"
# my-evolution/Locations.h:2475
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
msgid "Windsor Locks"
msgstr ""
# my-evolution/Locations.h:2476
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
msgid "Wink"
msgstr ""
# my-evolution/Locations.h:2477
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
msgid "Winnemucca"
msgstr ""
# calendar/zones.h:175
# my-evolution/Locations.h:2478
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
msgid "Winnipeg"
msgstr "温尼伯"
# my-evolution/Locations.h:2479
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
msgid "Winslow"
msgstr "温斯洛"
# my-evolution/Locations.h:2480
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
msgid "Winston-Salem"
msgstr "温斯顿-塞伦"
# my-evolution/Locations.h:2481
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
msgid "Winter Haven"
msgstr ""
# mail/mail-session.c:322
# mail/mail-session.c:322
# my-evolution/Locations.h:2482
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
msgid "Winter Park"
msgstr "冬季公园"
# my-evolution/Locations.h:2483
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
msgid "Wiscasset"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:138
# addressbook/gui/contact-editor/fulladdr.glade.h:138
# my-evolution/Locations.h:2484
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
msgid "Wisconsin"
msgstr "威斯康星州"
# my-evolution/Locations.h:2485
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
msgid "Wisconsin Rapids"
msgstr ""
# my-evolution/Locations.h:2486
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
#, fuzzy
msgid "Wise"
msgstr "是"
# my-evolution/Locations.h:2487
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
msgid "Woensdrecht"
msgstr ""
# my-evolution/Locations.h:2488
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
msgid "Wolf Point"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:100
# addressbook/gui/contact-editor/fulladdr.glade.h:100
# my-evolution/Locations.h:2489
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
#, fuzzy
msgid "Woong Cheon"
msgstr "香港"
@@ -35502,7 +37235,7 @@ msgstr "香港"
# addressbook/printing/e-contact-print.glade.h:9
# addressbook/printing/e-contact-print.glade.h:9
# my-evolution/Locations.h:2490
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
#, fuzzy
msgid "Wooster"
msgstr "脚注:"
@@ -35510,14 +37243,14 @@ msgstr "脚注:"
# calendar/gui/dialogs/recurrence-page.glade.h:16
# calendar/gui/dialogs/recurrence-page.glade.h:16
# my-evolution/Locations.h:2491
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
msgid "Worcester"
msgstr "伍斯特"
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# my-evolution/Locations.h:2492
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
#, fuzzy
msgid "Worland"
msgstr "波兰"
@@ -35525,190 +37258,190 @@ msgstr "波兰"
# mail/mail-mt.c:901
# mail/mail-mt.c:901
# my-evolution/Locations.h:2493
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
#, fuzzy
msgid "Worthington"
msgstr "正在工作"
# my-evolution/Locations.h:2494
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
msgid "Wrangell"
msgstr "兰格尔"
# my-evolution/Locations.h:2495
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
msgid "Wrightstown / Mcguire AFB"
msgstr ""
# my-evolution/Locations.h:2496
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
msgid "Wuchia Observatory"
msgstr ""
# mail/mail-mt.c:901
# mail/mail-mt.c:901
# my-evolution/Locations.h:2497
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
msgid "Wyoming"
msgstr "怀俄明州"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
# my-evolution/Locations.h:2498
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
msgid "Xiamen"
msgstr "厦门"
# my-evolution/Locations.h:2499
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
msgid "Yacuiba"
msgstr ""
# my-evolution/Locations.h:2500
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
msgid "Yakima"
msgstr "雅吉瓦"
# my-evolution/Locations.h:2501
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
msgid "Yakushima"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# calendar/zones.h:176
# my-evolution/Locations.h:2502
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
#, fuzzy
msgid "Yakutat"
msgstr "美洲萨摩亚"
# my-evolution/Locations.h:2503
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
msgid "Yakutsk"
msgstr "雅库茨克"
# my-evolution/Locations.h:2504
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
msgid "Yamagata Airport"
msgstr ""
# my-evolution/Locations.h:2505
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
msgid "Yamaguchi Ube Airport"
msgstr ""
# my-evolution/Locations.h:2506
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
msgid "Yankton"
msgstr ""
# shell/importer/intelligent.c:196
# shell/importer/intelligent.c:196
# my-evolution/Locations.h:2507
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
#, fuzzy
msgid "Yao Airport"
msgstr "不要导入"
# my-evolution/Locations.h:2508
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
msgid "Yechon Ab"
msgstr ""
# my-evolution/Locations.h:2509
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
msgid "Yekaterinburg"
msgstr ""
# my-evolution/Locations.h:2510
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
msgid "Yellowknife"
msgstr "耶洛奈夫"
# my-evolution/Locations.h:2511
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
msgid "Yellowstone"
msgstr "黄石国家公园"
# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
# my-evolution/Locations.h:2513
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
msgid "Yenbo"
msgstr "延布"
# my-evolution/Locations.h:2514
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
msgid "Yeoju Range"
msgstr ""
# my-evolution/Locations.h:2515
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
msgid "Yeonpyeungdo"
msgstr ""
# my-evolution/Locations.h:2516
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
msgid "Yeovilton"
msgstr ""
# my-evolution/Locations.h:2517
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
msgid "Yokosuka Fwf"
msgstr "横须贺 Fwf"
# my-evolution/Locations.h:2518
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
msgid "Yokota Ab"
msgstr ""
# my-evolution/Locations.h:2519
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
msgid "Yongsan/H-208 Hp"
msgstr ""
# my-evolution/Locations.h:2520
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
msgid "Yoro"
msgstr ""
# my-evolution/Locations.h:2521
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
msgid "Yosu"
msgstr ""
# my-evolution/Locations.h:2522
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
msgid "Youngstown"
msgstr "扬斯敦"
# my-evolution/Locations.h:2523
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
msgid "Ypsilanti"
msgstr ""
# my-evolution/Locations.h:2525
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
msgid "Yukon"
msgstr "育空"
# my-evolution/Locations.h:2526
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
msgid "Yuma MCAS"
msgstr "尤马 MCAS"
# my-evolution/Locations.h:2527
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
msgid "Yurimaguas"
msgstr ""
# my-evolution/Locations.h:2528
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
msgid "Yuzhno-Sakhalinsk"
msgstr ""
# my-evolution/Locations.h:2529
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
msgid "Zacatecas"
msgstr "萨卡特卡斯"
@@ -35717,23 +37450,23 @@ 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
# my-evolution/Locations.h:2530
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
msgid "Zadar"
msgstr "扎达尔"
# calendar/zones.h:331
# my-evolution/Locations.h:2531
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
msgid "Zagreb"
msgstr "萨格勒布"
# my-evolution/Locations.h:2532
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
msgid "Zakinthos"
msgstr ""
# my-evolution/Locations.h:2533
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
msgid "Zama Airfield"
msgstr ""
@@ -35748,7 +37481,7 @@ msgstr ""
# calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
# camel/camel-service.c:610 camel/camel-service.c:646
# my-evolution/Locations.h:2534
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
#, fuzzy
msgid "Zanesville"
msgstr "已经取消"
@@ -35756,82 +37489,83 @@ msgstr "已经取消"
# addressbook/gui/contact-editor/fulladdr.glade.h:165
# addressbook/gui/contact-editor/fulladdr.glade.h:165
# my-evolution/Locations.h:2535
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
msgid "Zaragoza"
msgstr "萨拉戈萨"
# my-evolution/Locations.h:2536
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
msgid "Zell Am See"
msgstr ""
# my-evolution/Locations.h:2537
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
msgid "Zuni Pueblo"
msgstr "祖尼 普维布洛"
# calendar/zones.h:333
# my-evolution/Locations.h:2538
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
msgid "Zurich"
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:152
msgid "Mail summary"
msgstr "邮件概要"
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+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,108 +37577,114 @@ 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:108
+#: 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:578
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:599
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:867
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:875
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
-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
# my-evolution/e-summary-rdf.c:415
# my-evolution/e-summary-rdf.c:300
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
msgid "Error downloading RDF"
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:448
msgid "News Feed"
msgstr "新闻来源"
+# my-evolution/Locations.h:1354
+#: my-evolution/e-summary-shown.c:536
+#, fuzzy
+msgid "All"
+msgstr "麦卡伦"
+
+# calendar/gui/dialogs/recurrence-page.glade.h:1
+# calendar/gui/dialogs/recurrence-page.glade.h:1
+# calendar/gui/dialogs/recurrence-page.glade.h:1
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:545
+#, fuzzy
+msgid "Add"
+msgstr "添加(_D)"
+
+# my-evolution/metar.c:157
+# my-evolution/metar.c:157
+# my-evolution/metar.c:157
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#, 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,28 +37693,28 @@ 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 "打印概要失败"
# my-evolution/main.c:66
# my-evolution/main.c:66
# my-evolution/main.c:65
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
msgid "Executive summary component could not initialize Bonobo.\n"
msgstr "实施概要组件无法初始化 Bonobo。\n"
@@ -38012,276 +39752,271 @@ 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:5
+# my-evolution/my-evolution.glade.h:5
+# my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "所有新闻来源(_F):"
+
# 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:5
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:6
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:7
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:8
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:9
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:10
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:11
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:12
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:13
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:14
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:15
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:16
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:17
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:18
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:19
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:20
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:21
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:22
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:23
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:24
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 folder settings."
+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-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
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Folder Settings"
+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 various folder settings"
+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-storage-set-view.c:658
+# shell/e-storage-set-view.c:658
+# shell/e-storage-set-view.c:658
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"无法转移文件夹:\n"
+"%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
+# mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+# shell/e-storage-set-view.etspec.h:1
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "文件夹"
+
+# mail/mail-config.glade.h:30 shell/e-local-storage.c:173
+# mail/mail-config.glade.h:30 shell/e-local-storage.c:173
+# mail/mail-config.glade.h:36 shell/e-local-storage.c:173
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "草稿"
+
# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
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
+#: shell/e-local-storage.c:176
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 "本地文件夹"
+# 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
+#: shell/e-local-storage.c:177
+msgid "Sent"
+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 +40027,21 @@ 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 "请点击“确认”以安装文件,或者点击“取消”以便退出。"
# 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 +40055,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 +40067,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 +40080,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 +40093,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 +40107,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 +40120,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 +40137,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 +40147,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 +40154,91 @@ msgstr "版权所有 1999,2000,2001 Ximian 公司。"
msgid "Brought to you by"
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
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "完成日期"
+
+# shell/e-shell-importer.c:1014
+# shell/e-shell-importer.c:1014
+# shell/e-shell-importer.c:1027
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "选择文件夹"
+
+# mail/mail-config.glade.h:83
+# mail/mail-config.glade.h:83
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "特殊文件夹"
+
+# mail/mail-ops.c:86
+# mail/mail-ops.c:87
+# mail/mail-ops.c:87
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "正在过滤文件夹"
+
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+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 +40246,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:325
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:365
#, c-format
msgid "Specify a folder to move folder \"%s\" into:"
msgstr "给出一个文件夹以便将文件夹“%s”移动进去:"
@@ -38480,14 +40261,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:369
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:393
#, c-format
msgid ""
"Cannot delete folder:\n"
@@ -38499,19 +40280,20 @@ 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:406
#, c-format
msgid "Delete \"%s\""
msgstr "删除“%s”"
-# shell/e-shell-folder-commands.c:411
-# 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
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "您确认您要删除文件夹“%s”?"
+# 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:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"无法删除文件夹:\n"
+"%s"
# shell/e-shell-folder-commands.c:488
# shell/e-shell-folder-commands.c:488
@@ -38528,7 +40310,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:535
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "把文件夹“%s”重命名为:"
@@ -38536,7 +40318,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:542
msgid "Rename folder"
msgstr "重命名文件夹"
@@ -38546,7 +40328,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:552
#: shell/e-shell-folder-creation-dialog.c:168
#, c-format
msgid "The specified folder name is not valid: %s"
@@ -38567,14 +40349,14 @@ 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 - 创建新文件夹"
# shell/e-shell-folder-selection-dialog.c:98
# shell/e-shell-folder-selection-dialog.c:98
# shell/e-shell-folder-selection-dialog.c:98
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
msgid ""
"The type of the selected folder is not valid for\n"
"the requested operation."
@@ -38585,14 +40367,14 @@ msgstr ""
# shell/e-shell-folder-selection-dialog.c:376
# shell/e-shell-folder-selection-dialog.c:376
# shell/e-shell-folder-selection-dialog.c:376
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
msgid "New..."
msgstr "正在新建..."
# shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
# shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
# shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
-#: shell/e-shell-folder-title-bar.c: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 "(无标题)"
@@ -38653,10 +40435,18 @@ msgstr ""
"正在导入 %s\n"
"正在导入项目 %d。"
+# mail/mail-account-gui.c:837
+# mail/mail-account-gui.c:837
+# mail/mail-account-gui.c:834
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "选择文件夹"
+
# shell/e-shell-importer.c:397
# shell/e-shell-importer.c:397
# shell/e-shell-importer.c:409
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:498
#, c-format
msgid "File %s does not exist"
msgstr "文件 %s 不存在"
@@ -38665,22 +40455,22 @@ msgstr "文件 %s 不存在"
# shell/e-shell-about-box.c:40
# shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
# shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
msgid "Evolution Error"
msgstr "Evolution 错误"
# shell/e-shell-importer.c:409
# shell/e-shell-importer.c:409
# shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
msgid "You may only import to local folders"
msgstr "您只能导入到本地文件夹"
# shell/e-shell-importer.c:424
# shell/e-shell-importer.c:424
# shell/e-shell-importer.c:435
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
#, c-format
msgid ""
"There is no importer that is able to handle\n"
@@ -38692,14 +40482,14 @@ msgstr ""
# shell/e-shell-importer.c:434
# shell/e-shell-importer.c:434
# shell/e-shell-importer.c:445
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
msgid "Importing"
msgstr "正在导入"
# shell/e-shell-importer.c:442
# shell/e-shell-importer.c:442
# shell/e-shell-importer.c:453
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
#, c-format
msgid ""
"Importing %s.\n"
@@ -38711,7 +40501,7 @@ msgstr ""
# shell/e-shell-importer.c:455
# shell/e-shell-importer.c:455
# shell/e-shell-importer.c:466
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
#, c-format
msgid "Error starting %s"
msgstr "启动 %s 错误"
@@ -38719,7 +40509,7 @@ msgstr "启动 %s 错误"
# shell/e-shell-importer.c:474
# shell/e-shell-importer.c:474
# shell/e-shell-importer.c:485
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
#, c-format
msgid "Error loading %s"
msgstr "装入 %s 错误"
@@ -38727,7 +40517,7 @@ msgstr "装入 %s 错误"
# shell/e-shell-importer.c:491
# shell/e-shell-importer.c:491
# shell/e-shell-importer.c:502
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
#, c-format
msgid ""
"Importing %s\n"
@@ -38739,49 +40529,49 @@ msgstr ""
# shell/e-shell-importer.c:561
# shell/e-shell-importer.c:561
# shell/e-shell-importer.c:572
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
msgid "Automatic"
msgstr "自动"
# shell/e-shell-importer.c:612
# shell/e-shell-importer.c:612
# shell/e-shell-importer.c:623
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
msgid "Filename:"
msgstr "文件名:"
# shell/e-shell-importer.c:617
# shell/e-shell-importer.c:617
# shell/e-shell-importer.c:628
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
msgid "Select a file"
msgstr "选择一个文件"
# shell/e-shell-importer.c:627
# shell/e-shell-importer.c:627
# shell/e-shell-importer.c:638
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
msgid "File type:"
msgstr "文件类型:"
# shell/e-shell-importer.c:652
# shell/e-shell-importer.c:652
# shell/e-shell-importer.c:663
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
msgid "Import data and settings from older programs"
msgstr "从老版程序中导入数据和设置"
# shell/e-shell-importer.c:656
# shell/e-shell-importer.c:656
# shell/e-shell-importer.c:667
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
msgid "Import a single file"
msgstr "导入单个文件"
# shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:628
# shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:628
# shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
msgid ""
"Please wait...\n"
"Scanning for existing setups"
@@ -38792,14 +40582,14 @@ msgstr ""
# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
# shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
msgid "Starting Intelligent Importers"
msgstr "启动智能导入器"
# shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:754
# shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:754
# shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
#, c-format
msgid "From %s:"
msgstr "从 %s:"
@@ -38807,31 +40597,99 @@ msgstr "从 %s:"
# shell/e-shell-importer.c:1014
# shell/e-shell-importer.c:1014
# shell/e-shell-importer.c:1027
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
msgid "Select folder"
msgstr "选择文件夹"
# shell/e-shell-importer.c:1015
# shell/e-shell-importer.c:1015
# shell/e-shell-importer.c:1028
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
msgid "Select a destination folder for importing this data"
msgstr "为导入的数据选择目标文件夹"
# shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
# shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
# shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
msgid "Import"
msgstr "导入"
# shell/e-shell-offline-handler.c:572
# shell/e-shell-offline-handler.c:572
# shell/e-shell-offline-handler.c:572
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
msgid "Closing connections..."
msgstr "正在关闭连接..."
+# mail/mail-mt.c:254
+# mail/mail-mt.c:254
+# mail/mail-mt.c:254
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"当“%s”时错误:\n"
+"%s"
+
+# 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
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "正在同步文件夹"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+# shell/e-shell-about-box.c:40
+# shell/e-shell-about-box.c:40
+# shell/e-shell-about-box.c:40
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution "
+
+# mail/mail-ops.c:1234
+# mail/mail-ops.c:1236
+# mail/mail-ops.c:1279
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "正在打开文件夹 %s"
+
+# mail/mail-ops.c:1234
+# mail/mail-ops.c:1236
+# mail/mail-ops.c:1279
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "正在打开文件夹 %s"
+
+# mail/mail-display.c:354
+# mail/mail-display.c:353
+# mail/mail-display.c:354
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "在 %s 中打开..."
+
+# shell/e-shell-folder-creation-dialog.c:111
+# shell/e-shell-folder-creation-dialog.c:111
+# shell/e-shell-folder-creation-dialog.c:125
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"无法创建指定的文件夹:\n"
+"%s"
+
# shell/e-shell-startup-wizard.c:159
# shell/e-shell-startup-wizard.c:159
# shell/e-shell-startup-wizard.c:159
@@ -38856,8 +40714,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:537
+#: shell/e-shell-user-creatable-items-handler.c:582
#: widgets/misc/e-charset-picker.c:104
msgid "New"
msgstr "新建"
@@ -38893,99 +40751,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:178
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:186
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:230
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:473
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:474
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:594
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:595
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:762
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:775 ui/evolution.xml.h:58
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:788 ui/evolution.xml.h:34
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 +40836,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 +40851,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:171
+#, 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:765
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr "无法设置本地存储 -- %s"
@@ -39031,7 +40889,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:1853
#, c-format
msgid ""
"The Evolution component that handles folders of type \"%s\"\n"
@@ -39045,28 +40903,28 @@ 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:2156
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:2158
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:2160
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:2162 shell/e-storage.c:487
msgid "Generic error"
msgstr "通用错误"
@@ -39106,285 +40964,276 @@ msgstr "不删除"
# shell/e-shortcuts-view.c:209
# shell/e-shortcuts-view.c:209
# shell/e-shortcuts-view.c:209
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
msgid "Rename Shortcut Group"
msgstr "重命名快捷方式组"
# shell/e-shortcuts-view.c:210
# shell/e-shortcuts-view.c:210
# shell/e-shortcuts-view.c:210
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
msgid "Rename selected shortcut group to:"
msgstr "把选中的快捷方式组重命名为:"
# shell/e-shortcuts-view.c:224
# shell/e-shortcuts-view.c:224
# shell/e-shortcuts-view.c:224
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
msgid "_Small Icons"
msgstr "小图标(_S)"
# shell/e-shortcuts-view.c:225
# shell/e-shortcuts-view.c:225
# shell/e-shortcuts-view.c:225
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
msgid "Show the shortcuts as small icons"
msgstr "用小图标显示快捷方式"
# shell/e-shortcuts-view.c:227
# shell/e-shortcuts-view.c:227
# shell/e-shortcuts-view.c:227
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
msgid "_Large Icons"
msgstr "大图标(_L)"
# shell/e-shortcuts-view.c:228
# shell/e-shortcuts-view.c:228
# shell/e-shortcuts-view.c:228
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
msgid "Show the shortcuts as large icons"
msgstr "用大图标显示快捷方式"
# shell/e-shortcuts-view.c:239
# shell/e-shortcuts-view.c:239
# shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
msgid "_New Group..."
msgstr "新组(_N)..."
# shell/e-shortcuts-view.c:240
# shell/e-shortcuts-view.c:240
# shell/e-shortcuts-view.c:240
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
msgid "Create a new shortcut group"
msgstr "创建新快捷方式组"
# shell/e-shortcuts-view.c:242
# shell/e-shortcuts-view.c:242
# shell/e-shortcuts-view.c:242
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
msgid "_Remove this Group..."
msgstr "删除该组(_R)..."
# shell/e-shortcuts-view.c:243
# shell/e-shortcuts-view.c:243
# shell/e-shortcuts-view.c:243
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
msgid "Remove this shortcut group"
msgstr "删除该快捷方式组"
# shell/e-shortcuts-view.c:245
# shell/e-shortcuts-view.c:245
# shell/e-shortcuts-view.c:245
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
msgid "Re_name this Group..."
msgstr "重命名该组(_N)..."
# shell/e-shortcuts-view.c:246
# shell/e-shortcuts-view.c:246
# shell/e-shortcuts-view.c:246
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
msgid "Rename this shortcut group"
msgstr "重命名该快捷方式组"
# shell/e-shortcuts-view.c:251
# shell/e-shortcuts-view.c:251
# shell/e-shortcuts-view.c:251
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
msgid "_Hide the Shortcut Bar"
msgstr "隐藏快捷方式栏(_H)"
# shell/e-shortcuts-view.c:252
# shell/e-shortcuts-view.c:252
# shell/e-shortcuts-view.c:252
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
msgid "Hide the shortcut bar"
msgstr "隐藏快捷方式栏"
# shell/e-shortcuts-view.c:371
# shell/e-shortcuts-view.c:371
# shell/e-shortcuts-view.c:371
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
msgid "Rename shortcut"
msgstr "重命名快捷方式"
# shell/e-shortcuts-view.c:372
# shell/e-shortcuts-view.c:372
# shell/e-shortcuts-view.c:372
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
msgid "Rename selected shortcut to:"
msgstr "把快捷方式重命名为:"
# shell/e-shortcuts-view.c:384
# shell/e-shortcuts-view.c:384
# shell/e-shortcuts-view.c:384
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
msgid "Open the folder linked to this shortcut"
msgstr "打开连接到该快捷方式的文件夹"
# shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
# shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
# shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
msgid "Open in New _Window"
msgstr "在新窗口中打开(_W)"
# shell/e-shortcuts-view.c:386
# shell/e-shortcuts-view.c:386
# shell/e-shortcuts-view.c:386
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
msgid "Open the folder linked to this shortcut in a new window"
msgstr "在新窗口中打开连接到该快捷方式的文件夹"
# shell/e-shortcuts-view.c:389
# shell/e-shortcuts-view.c:389
# shell/e-shortcuts-view.c:389
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
msgid "_Rename"
msgstr "重命名(_R)"
# shell/e-shortcuts-view.c:389
# shell/e-shortcuts-view.c:389
# shell/e-shortcuts-view.c:389
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
msgid "Rename this shortcut"
msgstr "重命名该快捷方式"
# shell/e-shortcuts-view.c:391
# shell/e-shortcuts-view.c:391
# shell/e-shortcuts-view.c:391
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
msgid "Re_move"
msgstr "删除(_M)"
# shell/e-shortcuts-view.c:391
# shell/e-shortcuts-view.c:391
# shell/e-shortcuts-view.c:391
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
msgid "Remove this shortcut from the shortcut bar"
msgstr "从快捷方式栏上删除该快捷方式"
# shell/e-shortcuts.c:640
# shell/e-shortcuts.c:640
# shell/e-shortcuts.c:640
-#: shell/e-shortcuts.c: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-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 "无法以那个名字创建文件夹"
@@ -39404,6 +41253,10 @@ msgstr "%s (...)"
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
+#: shell/evolution-folder-selector-button.c:86
+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 +41306,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:1083
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:1085
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:1087
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:1089
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:1091
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:1093
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:1095
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:1097
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:1099
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:1101
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:1105
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:1107
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:1111
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:1113
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:1115
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:49
msgid "Test type"
msgstr "测试类型"
@@ -39764,28 +41617,66 @@ 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:91
msgid "Evolution"
msgstr "Evolution"
# shell/main.c:89
# shell/main.c:89
# shell/main.c:89
-#: shell/main.c:89
+#: shell/main.c:97
msgid "Evolution is now exiting ..."
msgstr "Evolution 正在退出 ..."
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi. Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+# ui/evolution.xml.h:31
+# data/evolution.desktop.in.h:2
+# data/evolution.desktop.in.h:2
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+# shell/importer/intelligent.c:198
+# shell/importer/intelligent.c:198
+# shell/importer/intelligent.c:198
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "不要再问我"
+
# shell/main.c:210
# shell/main.c:210
# shell/main.c:210
-#: shell/main.c:210
+#: shell/main.c:347
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:356
#, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "无法初始化 Ximian Evolution shell: %s"
@@ -39793,21 +41684,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:437
msgid "Disable splash screen"
msgstr "禁用启动屏幕"
+# importers/netscape-importer.c:897
+# importers/netscape-importer.c:897
+# importers/netscape-importer.c:897
+#: shell/main.c:438
+#, 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:439
+#, 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:440
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
+#: shell/main.c:458
+#, 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:488
msgid "Cannot initialize the Bonobo component system."
msgstr "无法初始化 Bonobo 成员系统。"
@@ -39847,134 +41761,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 +41928,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-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
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 +41948,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
@@ -40315,8 +42158,8 @@ msgstr "删除这一项"
# ui/evolution.xml.h:16
# ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
# ui/evolution.xml.h:16
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
msgid "Main toolbar"
msgstr "主工具栏"
@@ -40334,13 +42177,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 +42184,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 +42209,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 +42249,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:42
msgid "_File"
msgstr "文件(_F)"
@@ -40437,6 +42283,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 +42305,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)"
@@ -40522,28 +42375,28 @@ msgstr "通过电子邮件转发该项"
# ui/evolution-event-editor.xml.h:5
# ui/evolution-event-editor.xml.h:5
# ui/evolution-event-editor.xml.h:5
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
msgid "Obtain the latest meeting information"
msgstr "获取最新的会议信息"
# ui/evolution-event-editor.xml.h:6
# ui/evolution-event-editor.xml.h:6
# ui/evolution-event-editor.xml.h:6
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
msgid "Re_fresh Meeting"
msgstr "刷新会议(_F)"
# ui/evolution-event-editor.xml.h:7
# ui/evolution-event-editor.xml.h:7
# ui/evolution-event-editor.xml.h:7
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
msgid "Schedule _Meeting"
msgstr "调度会议(_M)"
# ui/evolution-event-editor.xml.h:8
# ui/evolution-event-editor.xml.h:8
# ui/evolution-event-editor.xml.h:8
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
msgid "Schedule a meeting for this item"
msgstr "为此项调度会议"
@@ -40568,143 +42421,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 +42670,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:43
msgid "_Folder"
msgstr "文件夹(_F)"
@@ -40898,255 +42702,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 +42988,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 +43006,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 +43052,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 +43067,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 +43343,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:56
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 +43419,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:38
msgid "_Close"
msgstr "关闭(_C)"
@@ -41577,7 +43431,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:57
msgid "_View"
msgstr "查看(_V)"
@@ -41619,14 +43473,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 +43505,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 +43578,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 +43621,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 +43744,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 +43762,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:46
msgid "_Help"
msgstr "帮助(_H)"
@@ -42002,68 +43860,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
@@ -42163,209 +44016,229 @@ msgstr "从其它程序导入数据"
msgid "Move this folder to another place"
msgstr "把该文件夹移到其它位置"
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+#: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "创建新文件夹(_N)..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
# ui/evolution.xml.h:18
# ui/evolution.xml.h:18
# ui/evolution.xml.h:18
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
msgid "Open in New Window"
msgstr "在新窗口中打开"
# ui/evolution.xml.h:20
# ui/evolution.xml.h:20
# ui/evolution.xml.h:20
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
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:23
+msgid "Send / Receive"
+msgstr "发送和接收"
+
+# ui/evolution-mail-global.xml.h:14
+# ui/evolution-mail-global.xml.h:14
+# ui/evolution-mail-global.xml.h:14
+#: ui/evolution.xml.h:24
+#, 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:25
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:26
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:27
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:28
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:29
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:30
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:31
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:32
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:33
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:35
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:36
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:40
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:44
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:45
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:47
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:48
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:49
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:50
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:51
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:52
msgid "_Rename..."
msgstr "重命名(_R)..."
+# ui/evolution-mail-global.xml.h:23
+# ui/evolution-mail-global.xml.h:23
+# ui/evolution-mail-global.xml.h:23
+#: ui/evolution.xml.h:53
+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:54
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:55
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 +44260,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 +44351,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:295
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:357
+#, fuzzy
+msgid "Custom View"
+msgstr "当前视图(_C)"
+
+#: widgets/menus/gal-view-menus.c:366
+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:379
msgid "Define Views"
msgstr "定义视图"
@@ -42629,7 +44527,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 +44535,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,38 +44563,42 @@ 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:91 widgets/misc/e-filter-bar.h:98
+#, 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:92 widgets/misc/e-filter-bar.h:99
+#, 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 "全部显示"
+# 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
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "高级..."
# widgets/misc/e-messagebox.c:152
# widgets/misc/e-messagebox.c:152
@@ -42705,6 +44607,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 +44639,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:512
+#, 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:513
+#, 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:875
+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:877
msgid "Find Now"
msgstr "立即查找"
@@ -42784,6 +44714,1103 @@ 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.c:804
+# addressbook/gui/component/addressbook.c:804
+# addressbook/gui/component/addressbook.c:837
+#~ msgid "Name contains"
+#~ 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 "显示符合以下条件的联系人:"
+
+# 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
+#~ msgid "Evolution calendar executive summary component."
+#~ 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
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "日历概要组件车间。"
+
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+#~ msgid "Create a new appointment"
+#~ msgstr "创建新约会"
+
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:6
+#~ msgid "Create a new task"
+#~ msgstr "创建新任务"
+
+# calendar/gui/component-factory.c:649
+# calendar/gui/component-factory.c:649
+# calendar/gui/component-factory.c:649
+#~ 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:20
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#~ msgid "Sta_rt of day:"
+#~ msgstr "每天的开始(_R):"
+
+# 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
+#~ msgid "_End of day:"
+#~ msgstr "每天的结束(_E):"
+
+# 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.glade.h:5
+# calendar/gui/dialogs/meeting-page.glade.h:5
+# calendar/gui/dialogs/meeting-page.glade.h:5
+#~ msgid "_Other Organizer"
+#~ msgstr "其他组织者(_O)"
+
+# 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: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: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 信息"
+
+# camel/camel-cipher-context.c:211
+# camel/camel-cipher-context.c:209
+# camel/camel-cipher-context.c:209
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ 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 "邮件体内容中的无效类型,应该是字符串"
+
+# camel/camel-pgp-context.c:193
+# camel/camel-pgp-context.c:193
+# camel/camel-pgp-context.c:193
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "请为 %2$s 输入您的 %1$s 密码串"
+
+# camel/camel-pgp-context.c:196
+# camel/camel-pgp-context.c:196
+# camel/camel-pgp-context.c:196
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "请输入您的 %s 密码串"
+
+# camel/camel-pgp-context.c:575
+# camel/camel-pgp-context.c:575
+# camel/camel-pgp-context.c:575
+#~ 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
+#~ 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
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "无法签名该邮件:无法创建到 GPG/PGP 的管道: %s"
+
+# camel/camel-pgp-context.c:755
+# camel/camel-pgp-context.c:755
+# camel/camel-pgp-context.c:755
+#~ 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
+#~ 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
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "无法验证该邮件:无法创建到 GPG/PGP 的管道: %s"
+
+# camel/camel-pgp-context.c:1143
+# camel/camel-pgp-context.c:1143
+# camel/camel-pgp-context.c:1143
+#~ 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
+#~ 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
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "无法加密该邮件: 无法创建到 GPG/PGP 的管道: %s"
+
+# camel/camel-pgp-context.c:1337
+# camel/camel-pgp-context.c:1337
+# camel/camel-pgp-context.c:1337
+#~ 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
+#~ 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
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "无法解密该邮件: 无法创建到 GPG/PGP 的管道: %s"
+
+# 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-remote-store.c:203
+# camel/camel-remote-store.c:203
+# camel/camel-remote-store.c:203
+#~ msgid "%s server %s"
+#~ msgstr "%s 服务器 %s"
+
+# camel/camel-remote-store.c:268
+# camel/camel-remote-store.c:268
+# camel/camel-remote-store.c:268
+#~ msgid "(unknown host)"
+#~ msgstr "(未知的主机)"
+
+# camel/camel-vee-folder.c:749
+# camel/camel-vee-folder.c:749
+# camel/camel-vee-folder.c:749
+#~ msgid "No such message: %s"
+#~ msgstr "没有邮件: %s"
+
+# camel/camel-vtrash-folder.c:117
+# camel/camel-vtrash-folder.c:117
+# camel/camel-vtrash-folder.c:117
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "您无法从该废件文件夹复制邮件。"
+
+# camel/providers/local/camel-spool-folder.c:512
+# camel/providers/local/camel-spool-folder.c:512
+# camel/providers/local/camel-spool-folder.c:512
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "无法将邮件附加到脱机文件: %s: %s"
+
+# camel/providers/local/camel-spool-summary.c:940
+# camel/providers/local/camel-spool-summary.c:940
+# camel/providers/local/camel-spool-summary.c:940
+#~ 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
+#~ 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 "根据搜索创建虚拟文件夹"
+
+# mail/folder-browser.c:1462
+# mail/folder-browser.c:1469
+# mail/folder-browser.c:1470
+#~ msgid "Mark as Unim_portant"
+#~ msgstr "标记为不重要(_P)"
+
+# 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-config.c:1860
+# mail/mail-config.c:1902
+# mail/mail-config.c:1995
+#~ msgid ""
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
+#~ msgstr ""
+#~ "无法为新邮件存储创建收件箱:\n"
+#~ "%s\n"
+#~ "没有创建快捷方式。"
+
+# 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: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: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:82
+# mail/mail-config.glade.h:82
+# mail/mail-config.glade.h:91
+#~ msgid "Sources"
+#~ msgstr "来源"
+
+# mail/mail-config.glade.h:102
+# mail/mail-config.glade.h:102
+# mail/mail-config.glade.h:111
+#~ msgid "_HTML signature:"
+#~ msgstr "HTML 签名(_H):"
+
+# 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-crypto.c:113
+# mail/mail-crypto.c:113
+# mail/mail-crypto.c:113
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "无法创建 PGP 加密上下文。"
+
+# mail/mail-crypto.c:138
+# mail/mail-crypto.c:138
+# mail/mail-crypto.c:138
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "无法创建 PGP 解密上下文。"
+
+# 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-ops.c:895
+# mail/mail-ops.c:897
+# mail/mail-ops.c:940
+#~ msgid "Moving"
+#~ msgstr "正在移动"
+
+# mail/mail-ops.c:898
+# mail/mail-ops.c:900
+# mail/mail-ops.c:943
+#~ msgid "Copying"
+#~ 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 "邮件概要"
+
+# addressbook/printing/e-contact-print.glade.h:33
+# addressbook/printing/e-contact-print.glade.h:33
+# my-evolution/Locations.h:1881
+#~ msgid "Riga"
+#~ 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/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: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-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-folder-commands.c:411
+# shell/e-shell-folder-commands.c:411
+# shell/e-shell-folder-commands.c:411
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "您确认您要删除文件夹“%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
@@ -43170,16 +46197,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
@@ -43189,18 +46206,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "(Unknown)"
#~ msgstr "(未知)"
-# camel/providers/pop3/camel-pop3-store.c:563
-# camel/providers/pop3/camel-pop3-store.c:563
-# camel/providers/pop3/camel-pop3-store.c:563
-#~ 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 +46313,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>"