aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-09-10 04:06:54 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-09-10 04:06:54 +0800
commitea4eeed27313b0ad0564422424c5dcb58bbbe842 (patch)
tree381990209d2b0c7b4609aca247c1d18575772a12 /po/zh_CN.po
parent6db8b43826423d1f99f7647bafeb773fec3f1826 (diff)
downloadgsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar
gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar.gz
gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar.bz2
gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar.lz
gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar.xz
gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar.zst
gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.zip
Sync for 1.1.1.
svn path=/trunk/; revision=18024
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po2806
1 files changed, 1482 insertions, 1324 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9a5e28ff63..b849f52346 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-08-13 08:06-0400\n"
+"POT-Creation-Date: 2002-09-09 14:39-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,14 @@ 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:335
+#: addressbook/gui/widgets/e-addressbook-view.c:356
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 mail/mail-config.glade.h:74
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
#: my-evolution/e-summary-table.c:59
msgid "Name"
msgstr "名称"
@@ -66,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:337
+#: addressbook/gui/widgets/e-addressbook-view.c:358
msgid "Email"
msgstr "电子邮件"
@@ -77,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:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
msgid "Primary"
msgstr "主要"
@@ -102,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:1729
-#: addressbook/gui/widgets/e-addressbook-view.c:369
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/widgets/e-addressbook-view.c:390
msgid "Assistant"
msgstr "助手"
@@ -125,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:1730
-#: addressbook/gui/contact-editor/e-contact-editor.c:1797
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/contact-editor/e-contact-editor.c:1804
msgid "Business"
msgstr "商务"
@@ -148,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:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
msgid "Callback"
msgstr "反馈"
@@ -159,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:1735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
msgid "Company"
msgstr "公司"
@@ -188,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:1736
-#: addressbook/gui/contact-editor/e-contact-editor.c:1798
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
msgid "Home"
msgstr "家庭"
@@ -200,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:344
+#: addressbook/gui/widgets/e-addressbook-view.c:365
msgid "Organization"
msgstr "组织"
@@ -222,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:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
msgid "Mobile"
msgstr "手机"
@@ -233,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:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
msgid "Car"
msgstr "汽车"
@@ -251,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:1732
-#: addressbook/gui/widgets/e-addressbook-view.c:349
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
+#: addressbook/gui/widgets/e-addressbook-view.c:370
msgid "Business Fax"
msgstr "商务传真"
@@ -273,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:1738
-#: addressbook/gui/widgets/e-addressbook-view.c:350
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/widgets/e-addressbook-view.c:371
msgid "Home Fax"
msgstr "家庭传真"
@@ -285,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:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
msgid "Business 2"
msgstr "商务 2"
@@ -303,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:1737
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
msgid "Home 2"
msgstr "家庭 2"
@@ -317,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:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/widgets/e-addressbook-view.c:374
msgid "ISDN"
msgstr "ISDN"
@@ -339,8 +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:1741
-#: addressbook/gui/contact-editor/e-contact-editor.c:1799
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
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:1742
-#: addressbook/gui/widgets/e-addressbook-view.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/widgets/e-addressbook-view.c:376
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:1743
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.c:377
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:1745
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/widgets/e-addressbook-view.c:378
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:1746
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/widgets/e-addressbook-view.c:379
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:359
+#: addressbook/gui/widgets/e-addressbook-view.c:380
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:1772
-#: addressbook/gui/widgets/e-addressbook-view.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
+#: addressbook/gui/widgets/e-addressbook-view.c:382
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:1773
-#: addressbook/gui/widgets/e-addressbook-view.c:362
+#: addressbook/gui/contact-editor/e-contact-editor.c:1780
+#: addressbook/gui/widgets/e-addressbook-view.c:383
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:363
+#: addressbook/gui/widgets/e-addressbook-view.c:384
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:364
+#: addressbook/gui/widgets/e-addressbook-view.c:385
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:365
+#: addressbook/gui/widgets/e-addressbook-view.c:386
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:366
+#: addressbook/gui/widgets/e-addressbook-view.c:387
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:367
+#: addressbook/gui/widgets/e-addressbook-view.c:388
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:368
+#: addressbook/gui/widgets/e-addressbook-view.c:389
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:370
+#: addressbook/gui/widgets/e-addressbook-view.c:391
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:371
+#: addressbook/gui/widgets/e-addressbook-view.c:392
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:372
+#: addressbook/gui/widgets/e-addressbook-view.c:393
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:373
+#: addressbook/gui/widgets/e-addressbook-view.c:394
msgid "Free-busy URL"
msgstr "忙闲 URL"
@@ -737,7 +737,7 @@ msgstr "%s 的 VCard"
#: addressbook/gui/component/addressbook-factory.c:50
#: calendar/conduits/calendar/calendar-conduit.c:1727
#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
#: tools/evolution-addressbook-abuse.c:132
#: tools/evolution-addressbook-export.c:60
#: tools/evolution-addressbook-import.c:86
@@ -751,7 +751,7 @@ msgstr "无法初始化 Bonobo"
# addressbook/backend/pas/pas-backend-file.c:259
# addressbook/backend/pas/pas-backend-ldap.c:2272
#: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2747
+#: addressbook/backend/pas/pas-backend-ldap.c:2968
msgid "Searching..."
msgstr "搜索..."
@@ -762,46 +762,40 @@ msgstr "搜索..."
msgid "Loading..."
msgstr "装入..."
-# addressbook/backend/pas/pas-backend-file.c:270
-# 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:381
-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:677
+#, fuzzy
+msgid "Reconnecting 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:1138
+#: addressbook/backend/pas/pas-backend-ldap.c:1220
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:1241
+#: addressbook/backend/pas/pas-backend-ldap.c:1326
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:1477
+#: addressbook/backend/pas/pas-backend-ldap.c:1562
+#: addressbook/backend/pas/pas-backend-ldap.c:1565
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:2601
-msgid "Restarting search."
-msgstr "开始搜索,"
-
# addressbook/backend/pas/pas-backend-ldap.c:2214
# addressbook/backend/pas/pas-backend-ldap.c:2214
# addressbook/backend/pas/pas-backend-ldap.c:2217
-#: addressbook/backend/pas/pas-backend-ldap.c:2693
+#: addressbook/backend/pas/pas-backend-ldap.c:2879
msgid "Receiving LDAP search results..."
msgstr "正在接收 LDAP 的搜索结果..."
@@ -811,19 +805,11 @@ msgstr "正在接收 LDAP 的搜索结果..."
# addressbook/gui/widgets/e-addressbook-view.c:1278
# addressbook/gui/widgets/e-addressbook-util.c:95
# addressbook/gui/widgets/e-addressbook-view.c:1389
-#: addressbook/backend/pas/pas-backend-ldap.c:2774
+#: addressbook/backend/pas/pas-backend-ldap.c:2988
#, 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:2798
-#, 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
@@ -913,67 +899,67 @@ msgstr "显示地址簿的 Bonobo 控制示例。"
msgid "Configuration control for the Evolution Addressbook Storages."
msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Configure access to LDAP directory servers here"
+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:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
msgid "Control that displays an Evolution addressbook minicard."
msgstr "显示 Evolution 地址簿小卡片的控制。"
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
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:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
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:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
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:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
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:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
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:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
msgid "Factory for the Addressbook's address popup"
msgstr "地址簿地址对话框车间"
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
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:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
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
@@ -987,7 +973,7 @@ msgstr ""
# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
# shell/e-shortcuts.c:1061
#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:608
+#: addressbook/gui/component/addressbook-component.c:618
#: calendar/gui/dialogs/comp-editor-util.c:310
#: calendar/gui/dialogs/comp-editor-util.c:366
#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
@@ -1022,21 +1008,21 @@ msgstr "含有联系人信息的 LDAP 服务器"
# ui/evolution-addressbook.xml.h:11
# addressbook/gui/component/addressbook-component.c:527
# ui/evolution-addressbook.xml.h:11
-#: addressbook/gui/component/addressbook-component.c:564
+#: addressbook/gui/component/addressbook-component.c:574
msgid "New Contact"
msgstr "新建联系人"
# ui/evolution-addressbook.xml.h:31
# ui/evolution-addressbook.xml.h:31
# ui/evolution-addressbook.xml.h:32
-#: addressbook/gui/component/addressbook-component.c:564
+#: addressbook/gui/component/addressbook-component.c:574
msgid "_Contact"
msgstr "联系人(_C)"
# ui/evolution-addressbook.xml.h:4
# ui/evolution-addressbook.xml.h:4
# ui/evolution-addressbook.xml.h:4
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-component.c:575
#, fuzzy
msgid "Create a new contact"
msgstr "创建新的联系人"
@@ -1044,14 +1030,14 @@ msgstr "创建新的联系人"
# addressbook/gui/component/addressbook-component.c:527
# addressbook/gui/component/addressbook-component.c:527
# addressbook/gui/component/addressbook-component.c:530
-#: addressbook/gui/component/addressbook-component.c:568
+#: 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:568
+#: addressbook/gui/component/addressbook-component.c:578
#, fuzzy
msgid "Contact _List"
msgstr "联系人列表(_C)"
@@ -1059,7 +1045,7 @@ msgstr "联系人列表(_C)"
# ui/evolution-addressbook.xml.h:5
# ui/evolution-addressbook.xml.h:5
# ui/evolution-addressbook.xml.h:5
-#: addressbook/gui/component/addressbook-component.c:569
+#: addressbook/gui/component/addressbook-component.c:579
#, fuzzy
msgid "Create a new contact list"
msgstr "创建新的联系人列表"
@@ -1091,14 +1077,14 @@ msgstr ""
msgid "The server responded with no supported search bases"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:1150
+#: addressbook/gui/component/addressbook-config.c:1154
msgid "This server does not support LDAPv3 schema information"
msgstr ""
# mail/mail-callbacks.c:2250
# mail/mail-callbacks.c:2369
# mail/mail-callbacks.c:2405
-#: addressbook/gui/component/addressbook-config.c:1172
+#: addressbook/gui/component/addressbook-config.c:1176
#, fuzzy
msgid "Error retrieving schema information"
msgstr ""
@@ -1108,7 +1094,7 @@ msgstr ""
# camel/providers/imap/camel-imap-command.c:608
# camel/providers/imap/camel-imap-command.c:608
# camel/providers/imap/camel-imap-command.c:610
-#: addressbook/gui/component/addressbook-config.c:1180
+#: addressbook/gui/component/addressbook-config.c:1184
#, fuzzy
msgid "Server did not respond with valid schema information"
msgstr "IMAP 服务器应答不含有 %s 信息"
@@ -1116,7 +1102,7 @@ msgstr "IMAP 服务器应答不含有 %s 信息"
# mail/mail-config.glade.h:3
# mail/mail-config.glade.h:3
# mail/mail-config.glade.h:3
-#: addressbook/gui/component/addressbook-config.c:1636
+#: addressbook/gui/component/addressbook-config.c:1640
#, fuzzy
msgid "LDAP was not enabled in this build of Evolution"
msgstr "(在该版本的 evolution 中不支持SSL)"
@@ -1128,7 +1114,7 @@ msgstr "(在该版本的 evolution 中不支持SSL)"
# addressbook/gui/component/addressbook-factory.c:70
# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
+#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:142
msgid "Could not initialize gnome-vfs"
msgstr "无法创始化 gnome-vfs"
@@ -1142,18 +1128,30 @@ msgstr "其他联系人"
# addressbook/gui/component/addressbook.c:485
# addressbook/gui/component/addressbook.c:485
# addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c:468
+#: addressbook/gui/component/addressbook.c:471
msgid "Unable to open addressbook"
msgstr "无法打开地址簿"
+# addressbook/gui/component/addressbook.c:507
+# addressbook/gui/component/addressbook.c:507
+# addressbook/gui/component/addressbook.c:521
+#: addressbook/gui/component/addressbook.c:477
+msgid ""
+"We were unable to open this addressbook. Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"我们无法打开该地址簿。 请检查路径是否存在\n"
+"以及您是否有足够的权限访问它。"
+
# addressbook/gui/component/addressbook.c:494
# addressbook/gui/component/addressbook.c:494
# addressbook/gui/component/addressbook.c:508
-#: addressbook/gui/component/addressbook.c:477
+#: addressbook/gui/component/addressbook.c:487
+#, fuzzy
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
+"is unreachable."
msgstr ""
"我们无法打开地址簿。这可能是由于\n"
"您输入了错误的 URI,或是是因为\n"
@@ -1162,7 +1160,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:482
+#: addressbook/gui/component/addressbook.c:492
msgid ""
"This version of Evolution does not have LDAP support\n"
"compiled in to it. If you want to use LDAP in Evolution\n"
@@ -1174,48 +1172,39 @@ msgstr ""
"您必须在从以下连接处获取了程序的\n"
" CVS 源代码之后编译程序。\n"
-# addressbook/gui/component/addressbook.c:507
-# addressbook/gui/component/addressbook.c:507
-# addressbook/gui/component/addressbook.c:521
-#: addressbook/gui/component/addressbook.c:490
+# addressbook/gui/component/addressbook.c:494
+# addressbook/gui/component/addressbook.c:494
+# addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:501
+#, fuzzy
msgid ""
-"We were unable to open this addressbook. Please check that the\n"
-"path exists and that you have permission to access it."
+"We were unable to open this addressbook. This either\n"
+"means you have entered an incorrect URI, or the server\n"
+"is unreachable."
msgstr ""
-"我们无法打开该地址簿。 请检查路径是否存在\n"
-"以及您是否有足够的权限访问它。"
+"我们无法打开地址簿。这可能是由于\n"
+"您输入了错误的 URI,或是是因为\n"
+" LDAP 服务器已经关闭"
# addressbook/gui/component/addressbook.c:640
# addressbook/gui/component/addressbook.c:640
# addressbook/gui/component/addressbook.c:655
# addressbook/gui/component/addressbook.c:658
-#: addressbook/gui/component/addressbook.c:600
-#: addressbook/gui/component/addressbook.c:603
+#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:616
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "为 %s (用户 %s)输入口令"
-#: addressbook/gui/component/addressbook.c:728
+#: addressbook/gui/component/addressbook.c:741
#, fuzzy
msgid "Name begins with"
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:729
+#: addressbook/gui/component/addressbook.c:742
#, fuzzy
-msgid "Email is"
-msgstr "电子邮件 2"
+msgid "Email begins with"
+msgstr "以之结束"
# addressbook/gui/component/addressbook.c:806
# calendar/gui/cal-search-bar.c:59
@@ -1223,7 +1212,7 @@ msgstr "电子邮件 2"
# calendar/gui/cal-search-bar.c:59
# addressbook/gui/component/addressbook.c:839
# calendar/gui/cal-search-bar.c:59
-#: addressbook/gui/component/addressbook.c:730
+#: addressbook/gui/component/addressbook.c:743
#: calendar/gui/cal-search-bar.c:53
msgid "Category is"
msgstr "类别为"
@@ -1235,7 +1224,7 @@ msgstr "类别为"
# addressbook/gui/component/addressbook.c:836
# calendar/gui/cal-search-bar.c:55
#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:731
+#: addressbook/gui/component/addressbook.c:744
#: calendar/gui/cal-search-bar.c:49
msgid "Any field contains"
msgstr "任何域含有"
@@ -1245,10 +1234,38 @@ msgstr "任何域含有"
# widgets/misc/e-filter-bar.h:104
# addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
# widgets/misc/e-filter-bar.h:104
-#: addressbook/gui/component/addressbook.c:732
+#: addressbook/gui/component/addressbook.c:745
msgid "Advanced..."
msgstr "高级..."
+#: addressbook/gui/component/addressbook.c:915
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:921
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook. Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:927
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:930
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:934
+msgid "This query did not complete successfully."
+msgstr ""
+
# addressbook/gui/component/addressbook.c:1025
# calendar/gui/cal-search-bar.c:412
# addressbook/gui/component/addressbook.c:1025
@@ -1256,7 +1273,7 @@ msgstr "高级..."
# addressbook/gui/component/addressbook.c:1067
# calendar/gui/cal-search-bar.c:412
#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:960
+#: addressbook/gui/component/addressbook.c:1009
#: calendar/gui/cal-search-bar.c:382
msgid "Any Category"
msgstr "任何类别"
@@ -1264,7 +1281,7 @@ msgstr "任何类别"
# addressbook/gui/component/addressbook.c:1107
# addressbook/gui/component/addressbook.c:1107
# addressbook/gui/component/addressbook.c:1150
-#: addressbook/gui/component/addressbook.c:1042
+#: addressbook/gui/component/addressbook.c:1091
msgid "The URI that the Folder Browser will display"
msgstr "文件夹浏览器将显示的 URI"
@@ -1291,7 +1308,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:1771
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
msgid "Primary Email"
msgstr "常用电子邮件"
@@ -1384,30 +1401,46 @@ msgstr "开启查询(危险!)"
msgid " S_how Supported Bases "
msgstr "检查支持的类型(_C) "
+# addressbook/printing/e-contact-print.glade.h:23
+# addressbook/printing/e-contact-print.glade.h:23
+# addressbook/printing/e-contact-print.glade.h:23
#: addressbook/gui/component/ldap-config.glade.h:2
+#, fuzzy
+msgid "&lt;&lt; Fewer Options"
+msgstr "选项"
+
+# my-evolution/my-evolution.glade.h:1
+# my-evolution/my-evolution.glade.h:1
+# my-evolution/my-evolution.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "&lt;- _Remove"
+msgstr "删除(_R)"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
msgid "1234"
msgstr ""
# calendar/gui/e-calendar-table.c:437
# calendar/gui/e-calendar-table.c:437
# addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:5
#, fuzzy
msgid "1:00"
msgstr "100"
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:6
msgid "2:30"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:7
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
+#: addressbook/gui/component/ldap-config.glade.h:8
#, fuzzy
msgid "380"
msgstr "80%"
@@ -1415,38 +1448,22 @@ 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
+#: addressbook/gui/component/ldap-config.glade.h:9
msgid "389"
msgstr "389"
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:10
msgid "5:00"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:11
msgid "636"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:12
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 ""
@@ -1597,7 +1614,7 @@ msgstr "边界"
# 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:60
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
#, fuzzy
msgid "Never"
msgstr "每(_E)"
@@ -1669,8 +1686,8 @@ msgstr "搜索范围(_C):"
# calendar/gui/e-week-view.c:1188
#. No time range is set, so don't start a query
#: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
-#: calendar/gui/e-week-view.c:1214
+#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
+#: calendar/gui/e-week-view.c:1215
msgid "Searching"
msgstr "搜索"
@@ -1887,7 +1904,7 @@ msgid "Using email address"
msgstr "电子邮件地址"
#: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
msgid "Whenever Possible"
msgstr ""
@@ -1910,7 +1927,7 @@ msgstr ""
#: 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:14
-#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
msgid "_Add"
msgstr "添加(_A)"
@@ -1931,7 +1948,7 @@ msgstr "添加(_A)"
# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
#: addressbook/gui/component/ldap-config.glade.h:105
#, fuzzy
-msgid "_Add ->"
+msgid "_Add -&gt;"
msgstr "添加(_A)"
#: addressbook/gui/component/ldap-config.glade.h:106
@@ -2003,7 +2020,7 @@ msgstr "下载上限(_D)"
# 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:16
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
+#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
#: ui/evolution-mail-messagedisplay.xml.h:6
#: ui/evolution-message-composer.xml.h:41
@@ -2049,7 +2066,7 @@ msgstr ""
# calendar/gui/e-meeting-time-sel.c:470
#: addressbook/gui/component/ldap-config.glade.h:121
#, fuzzy
-msgid "_More Options >>"
+msgid "_More Options &gt;&gt;"
msgstr "选项(_O)"
# addressbook/gui/component/addressbook-config.glade.h:27
@@ -2183,7 +2200,7 @@ msgstr "地址簿名称选择界面车间"
# composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
#. Fixme: Ditto
#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:677
+#: addressbook/gui/component/select-names/e-select-names.c:698
#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
#: shell/e-shortcuts-view.c:178
@@ -2236,14 +2253,14 @@ msgstr "未命名的联系人"
# addressbook/gui/component/select-names/e-select-names.c:608
# addressbook/gui/component/select-names/e-select-names.c:608
# addressbook/gui/component/select-names/e-select-names.c:671
-#: addressbook/gui/component/select-names/e-select-names.c:511
+#: addressbook/gui/component/select-names/e-select-names.c:520
msgid "Select Contacts from Addressbook"
msgstr "从地址簿中选择联系人"
# default_user/searches.xml.h:6
# default_user/searches.xml.h:6
# default_user/searches.xml.h:6
-#: addressbook/gui/component/select-names/e-select-names.c:544
+#: addressbook/gui/component/select-names/e-select-names.c:560
#, fuzzy
msgid "Find contact in"
msgstr "发件人含有"
@@ -2365,7 +2382,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:1367
+#: addressbook/gui/contact-editor/e-contact-editor.c:1369
msgid "Contact Editor"
msgstr "联系人编辑器"
@@ -2495,9 +2512,9 @@ msgstr "愿意接收 HTML 邮件(_H)"
#: addressbook/gui/contact-editor/contact-editor.glade.h:31
#: calendar/gui/dialogs/alarm-page.glade.h:9
#: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
-#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
-#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3763
+#: calendar/gui/e-week-view.c:3570 filter/filter.glade.h:15
+#: mail/folder-browser.c:1744 mail/mail-config.glade.h:151
#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
@@ -4375,35 +4392,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:825
+#: addressbook/gui/contact-editor/e-contact-editor.c:826
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:832
+#: addressbook/gui/contact-editor/e-contact-editor.c:833
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:1046
+#: addressbook/gui/contact-editor/e-contact-editor.c:1047
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:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
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:2428
+#: addressbook/gui/contact-editor/e-contact-editor.c:2435
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr "无法为域找到构件:“%s”"
@@ -4429,7 +4446,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:336
+#: addressbook/gui/widgets/e-addressbook-view.c:357
msgid "Full Name"
msgstr "全名"
@@ -4692,14 +4709,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:236
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:238
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:430
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
msgid "Save List as VCard"
msgstr "将列表保存为 VCard"
@@ -4803,21 +4820,21 @@ 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:137
+#: addressbook/gui/widgets/e-addressbook-model.c:140
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:140
+#: addressbook/gui/widgets/e-addressbook-model.c:143
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:143
+#: addressbook/gui/widgets/e-addressbook-model.c:146
#, c-format
msgid "%d cards"
msgstr "%d 张卡片"
@@ -4825,7 +4842,7 @@ msgstr "%d 张卡片"
# 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
+#: addressbook/gui/widgets/e-addressbook-model.c:402
#, fuzzy
msgid "Error getting book view"
msgstr "启动 %s 错误"
@@ -4852,7 +4869,7 @@ msgstr "修改卡片错误"
# addressbook/gui/widgets/e-addressbook-util.c:33
# shell/evolution-shell-component.c:1020
#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1090
+#: shell/evolution-shell-component.c:1141
msgid "Success"
msgstr "成功"
@@ -4869,10 +4886,10 @@ msgstr "成功"
# 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:511 shell/e-shell.c:2130
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-command.c:396
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2137
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1180
msgid "Unknown error"
msgstr "未知的错误"
@@ -4890,7 +4907,7 @@ msgstr "仓库离线"
# 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:504
-#: shell/evolution-shell-component.c:1120
+#: shell/evolution-shell-component.c:1171
msgid "Permission denied"
msgstr "没有权限"
@@ -4931,7 +4948,7 @@ msgstr "不支持的协议"
# calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
# camel/camel-service.c:610 camel/camel-service.c:646
#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
#: calendar/gui/dialogs/task-details-page.glade.h:3
#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
#: camel/camel-service.c:738 camel/camel-service.c:778
@@ -5022,7 +5039,7 @@ msgstr "删除列表错误"
# addressbook/gui/widgets/e-addressbook-view.c:1389
#: addressbook/gui/widgets/e-addressbook-util.c:101
#: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:1670
msgid "Error removing card"
msgstr "删除卡片错误"
@@ -5086,112 +5103,112 @@ 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:334
+#: addressbook/gui/widgets/e-addressbook-view.c:355
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:338
+#: addressbook/gui/widgets/e-addressbook-view.c:359
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:339
+#: addressbook/gui/widgets/e-addressbook-view.c:360
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:340
+#: addressbook/gui/widgets/e-addressbook-view.c:361
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:341
+#: addressbook/gui/widgets/e-addressbook-view.c:362
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:342
+#: addressbook/gui/widgets/e-addressbook-view.c:363
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:343
+#: addressbook/gui/widgets/e-addressbook-view.c:364
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:345
+#: addressbook/gui/widgets/e-addressbook-view.c:366
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:346
+#: addressbook/gui/widgets/e-addressbook-view.c:367
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:347
+#: addressbook/gui/widgets/e-addressbook-view.c:368
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:348
+#: addressbook/gui/widgets/e-addressbook-view.c:369
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:351
+#: addressbook/gui/widgets/e-addressbook-view.c:372
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:352
+#: addressbook/gui/widgets/e-addressbook-view.c:373
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:354
+#: addressbook/gui/widgets/e-addressbook-view.c:375
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:360
+#: addressbook/gui/widgets/e-addressbook-view.c:381
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
+#: addressbook/gui/widgets/e-addressbook-view.c:461
#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
msgid "Addressbook"
msgstr "地址簿"
@@ -5214,9 +5231,9 @@ msgstr "地址簿"
# 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
+#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-view.c:911
+#: addressbook/gui/widgets/e-addressbook-view.c:1872
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr "保存为 VCard"
@@ -5227,7 +5244,7 @@ msgstr "保存为 VCard"
# 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
+#: addressbook/gui/widgets/e-addressbook-view.c:898
#, fuzzy
msgid "New Contact..."
msgstr "新建联系人"
@@ -5235,7 +5252,7 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.c:899
#, fuzzy
msgid "New Contact List..."
msgstr "新建联系人列表"
@@ -5243,7 +5260,7 @@ msgstr "新建联系人列表"
# ui/evolution.xml.h:39
# ui/evolution.xml.h:39
# ui/evolution.xml.h:39
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:902
#, fuzzy
msgid "Go to Folder..."
msgstr "转到文件夹(_G)..."
@@ -5251,7 +5268,7 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.c:903
#, fuzzy
msgid "Import..."
msgstr "正在导入(_I)..."
@@ -5259,7 +5276,7 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.c:905
#, fuzzy
msgid "Search for Contacts..."
msgstr "搜索联系人(_S)"
@@ -5267,7 +5284,7 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.c:906
#, fuzzy
msgid "Addressbook Sources..."
msgstr "地址簿来源(_A)..."
@@ -5275,7 +5292,7 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.c:908
#, fuzzy
msgid "Pilot Settings..."
msgstr "Pilot 设置(_P)..."
@@ -5289,7 +5306,7 @@ msgstr "Pilot 设置(_P)..."
# 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
+#: addressbook/gui/widgets/e-addressbook-view.c:912
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "转发联系人"
@@ -5300,7 +5317,7 @@ msgstr "转发联系人"
# 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
+#: addressbook/gui/widgets/e-addressbook-view.c:913
msgid "Send Message to Contact"
msgstr "给联系人发邮件"
@@ -5319,7 +5336,7 @@ msgstr "给联系人发邮件"
# 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
+#: addressbook/gui/widgets/e-addressbook-view.c:914
#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
#: ui/my-evolution.xml.h:1
@@ -5332,14 +5349,14 @@ msgstr "打印"
# 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
+#: addressbook/gui/widgets/e-addressbook-view.c:916
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
+#: addressbook/gui/widgets/e-addressbook-view.c:920
#, fuzzy
msgid "Copy to folder..."
msgstr "复制到文件夹..."
@@ -5347,7 +5364,7 @@ msgstr "复制到文件夹..."
# mail/folder-browser.c:1466
# mail/folder-browser.c:1475
# mail/folder-browser.c:1476
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:921
#, fuzzy
msgid "Move to folder..."
msgstr "移动到文件夹(_M)..."
@@ -5357,7 +5374,7 @@ msgstr "移动到文件夹(_M)..."
# 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
+#: addressbook/gui/widgets/e-addressbook-view.c:924
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "剪切"
@@ -5370,7 +5387,7 @@ msgstr "剪切"
# 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
+#: addressbook/gui/widgets/e-addressbook-view.c:925
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
@@ -5381,7 +5398,7 @@ msgstr "复制"
# 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
+#: addressbook/gui/widgets/e-addressbook-view.c:926
#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
msgid "Paste"
msgstr "粘贴"
@@ -5403,7 +5420,7 @@ msgstr "粘贴"
# mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
# ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
# ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
#: ui/evolution-contact-editor.xml.h:2
@@ -5414,8 +5431,8 @@ 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:3607 calendar/gui/e-week-view.c:3486
+#: addressbook/gui/widgets/e-addressbook-view.c:930
+#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3534
#, fuzzy
msgid "Current View"
msgstr "当前视图(_C)"
@@ -5427,7 +5444,7 @@ msgstr "当前视图(_C)"
#. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:963
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"
@@ -5438,10 +5455,18 @@ 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"
#. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:968
msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+#: addressbook/gui/widgets/e-addressbook-view.c:1372
+#, c-format
+msgid ""
+"The addressbook backend for\n"
+"%s\n"
+"has crashed. You will have to restart Evolution in order to use it again"
+msgstr ""
+
# addressbook/gui/widgets/e-minicard-control.c:185
# addressbook/gui/widgets/e-minicard-control.c:185
# addressbook/gui/widgets/e-minicard-control.c:185
@@ -5657,7 +5682,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
+#: calendar/gui/tasks-control.c:625
msgid "Landscape"
msgstr "横向"
@@ -5692,7 +5717,7 @@ msgstr "列数:"
# addressbook/printing/e-contact-print.glade.h:23
# addressbook/printing/e-contact-print.glade.h:23
# addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
msgid "Options"
msgstr "选项"
@@ -5700,7 +5725,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
+#: calendar/gui/tasks-control.c:612
msgid "Orientation"
msgstr "方向"
@@ -5739,7 +5764,7 @@ msgstr "纸张来源:"
# addressbook/printing/e-contact-print.glade.h:29
#. Portrait
#: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:621
+#: calendar/gui/tasks-control.c:618
msgid "Portrait"
msgstr "纵向"
@@ -5837,7 +5862,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:1221
+#: calendar/cal-util/cal-component.c:1218
msgid "Untitled appointment"
msgstr "无标题约会"
@@ -5852,7 +5877,7 @@ msgstr "无标题约会"
# calendar/gui/e-calendar-table.c:406 mail/message-list.c:679
#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:749
msgid "High"
msgstr "高"
@@ -5869,9 +5894,9 @@ msgstr "高"
# calendar/gui/dialogs/task-details-page.glade.h:9
# calendar/gui/e-calendar-table.c:407 mail/message-list.c:678
#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1715
#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:748
msgid "Normal"
msgstr "中"
@@ -5886,7 +5911,7 @@ msgstr "中"
# calendar/gui/e-calendar-table.c:408 mail/message-list.c:677
#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:747
msgid "Low"
msgstr "低"
@@ -5977,59 +6002,59 @@ msgstr "日历和任务设置"
msgid "Configuration control for the Evolution Calendar."
msgstr "Evolution 撰写器车间。"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
# 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
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
msgid "Evolution calendar iTip/iMip viewer"
msgstr "Evolution 日历 iTip/iMip 查看器"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
msgid "Evolution component for handling the calendar."
msgstr "处理日历的 Evolution 组件。"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
msgid "Factory for the Evolution Tasks control"
msgstr "Evolution 任务控制车间"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
msgid "Factory for the calendar iTip view control"
msgstr "日历 iTip 视图控制车间"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
msgid "Factory for the sample Calendar control"
msgstr "日历控制示例车间"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
msgid "Factory to centralize calendar component editor dialogs"
msgstr "日历组件编辑器对话框集中车间"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
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
@@ -6140,7 +6165,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:754
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
+#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2870
#: widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr "警告"
@@ -6174,21 +6199,14 @@ 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:168 calendar/gui/main.c:62
+#: calendar/gui/alarm-notify/notify-main.c:171 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: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:188
+#: calendar/gui/alarm-notify/notify-main.c:186
msgid "Could not create the alarm notify service factory"
msgstr "无法创建提醒服务车间"
@@ -6216,7 +6234,7 @@ msgstr "注释含有"
# calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1072
# calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1074
# calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1115
msgid "Unmatched"
msgstr "未匹配"
@@ -6236,7 +6254,7 @@ msgstr "%Y %B %d %A"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
msgid "%a %d %b"
msgstr "%b %d %a"
@@ -6347,7 +6365,7 @@ msgstr "西"
# calendar/gui/e-calendar-table.c:457
# calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
# calendar/gui/e-calendar-table.c:458
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
#: calendar/gui/e-calendar-table.c:470
msgid "Free"
msgstr "放假"
@@ -6363,7 +6381,7 @@ msgstr "放假"
# shell/evolution-shell-component.c:1042
#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
#: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1114
+#: shell/evolution-shell-component.c:1165
msgid "Busy"
msgstr "繁忙"
@@ -6376,7 +6394,7 @@ msgstr "繁忙"
# calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
# calendar/gui/dialogs/task-details-page.glade.h:10
# calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2246
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
#: calendar/gui/dialogs/task-details-page.glade.h:11
#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
msgid "Not Started"
@@ -6391,7 +6409,7 @@ msgstr "尚未开始"
# calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
# calendar/gui/dialogs/task-details-page.glade.h:7
# calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
#: calendar/gui/dialogs/task-details-page.glade.h:7
#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
msgid "In Progress"
@@ -6409,7 +6427,7 @@ msgstr "正在进行中"
# calendar/gui/dialogs/task-details-page.glade.h:4
# calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
#: calendar/gui/dialogs/task-details-page.glade.h:4
#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
@@ -6419,7 +6437,7 @@ msgstr "已完成"
# calendar/gui/calendar-model.c:1052
# calendar/gui/calendar-model.c:1052
# calendar/gui/calendar-model.c:1052
-#: calendar/gui/calendar-model.c:1041
+#: calendar/gui/calendar-model.c:1049
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -6451,28 +6469,28 @@ 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:1181 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
-#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: 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:1961
+#: mail/folder-browser.c:1706 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1649 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
+#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
msgid "None"
msgstr "无"
# calendar/gui/calendar-model.c:1713
# calendar/gui/calendar-model.c:1713
# calendar/gui/calendar-model.c:1713
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1717
msgid "Recurring"
msgstr "正在重复"
# calendar/gui/calendar-model.c:1715
# calendar/gui/calendar-model.c:1715
# calendar/gui/calendar-model.c:1715
-#: calendar/gui/calendar-model.c:1711
+#: calendar/gui/calendar-model.c:1719
msgid "Assigned"
msgstr "已分派"
@@ -6485,9 +6503,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:1717 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:850
+#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:566
+#: calendar/gui/e-meeting-model.c:859
msgid "Yes"
msgstr "是"
@@ -6497,8 +6515,8 @@ 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:1717 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:851
+#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:860
msgid "No"
msgstr "否"
@@ -6536,7 +6554,7 @@ msgstr "月视图"
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1365
#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
msgid "Calendar"
@@ -6562,10 +6580,10 @@ msgstr "文件夹含有约会和事件"
# 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:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
#: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
-#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:311
+#: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
#: shell/e-shortcuts.c:1063
msgid "Tasks"
msgstr "任务"
@@ -6580,7 +6598,7 @@ msgstr "文件夹含有 to-do 项"
# ui/evolution-calendar.xml.h:21
# ui/evolution-calendar.xml.h:21
# ui/evolution-calendar.xml.h:21
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:709
#, fuzzy
msgid "New appointment"
msgstr "新建约会"
@@ -6588,7 +6606,7 @@ msgstr "新建约会"
# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:709
#, fuzzy
msgid "_Appointment"
msgstr "约会"
@@ -6596,14 +6614,14 @@ msgstr "约会"
# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:710
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:713
+#: calendar/gui/component-factory.c:714
#, fuzzy
msgid "New meeting"
msgstr "新闻来源设置"
@@ -6617,7 +6635,7 @@ msgstr "新闻来源设置"
# calendar/gui/dialogs/event-editor.c:207
# calendar/gui/dialogs/event-editor.c:263
# calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/component-factory.c:713
+#: calendar/gui/component-factory.c:714
#, fuzzy
msgid "_Meeting"
msgstr "会见"
@@ -6628,7 +6646,7 @@ msgstr "会见"
# ui/evolution-tasks.xml.h:5
# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
# ui/evolution-tasks.xml.h:6
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:715
#, fuzzy
msgid "Create a new meeting request"
msgstr "创建新任务"
@@ -6636,7 +6654,7 @@ 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:718
+#: calendar/gui/component-factory.c:719
#, fuzzy
msgid "New task"
msgstr "新建任务"
@@ -6644,7 +6662,7 @@ msgstr "新建任务"
# ui/evolution-tasks.xml.h:18
# ui/evolution-tasks.xml.h:18
# ui/evolution-tasks.xml.h:22
-#: calendar/gui/component-factory.c:718
+#: calendar/gui/component-factory.c:719
msgid "_Task"
msgstr "任务(_T)"
@@ -6654,14 +6672,14 @@ msgstr "任务(_T)"
# ui/evolution-tasks.xml.h:5
# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
# ui/evolution-tasks.xml.h:6
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:720
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:723
+#: calendar/gui/component-factory.c:724
#, fuzzy
msgid "New All Day Appointment"
msgstr "新建约会"
@@ -6669,7 +6687,7 @@ 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:723
+#: calendar/gui/component-factory.c:724
#, fuzzy
msgid "All _Day Appointment"
msgstr "新建约会(_A)"
@@ -6677,7 +6695,7 @@ msgstr "新建约会(_A)"
# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:725
#, fuzzy
msgid "Create a new all-day appointment"
msgstr "创建新约会"
@@ -7051,7 +7069,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:892 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:774 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "概要:"
@@ -7104,7 +7122,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:184
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
msgid "minute(s)"
msgstr "分钟"
@@ -7417,7 +7435,7 @@ msgstr "星期五(_F)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:158
msgid "_General"
msgstr "常规(_G)"
@@ -7640,23 +7658,23 @@ msgstr "预定 "
# calendar/gui/dialogs/comp-editor.c:303
# calendar/gui/dialogs/comp-editor.c:303
# calendar/gui/dialogs/comp-editor.c:321
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:342
#, fuzzy
msgid "Could not update invalid object"
msgstr "无法更新对象!"
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:345
msgid "Object not found, not updated"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:349
+#: 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:352
+#: calendar/gui/dialogs/comp-editor.c:351
#, fuzzy
msgid "Could not update object"
msgstr "无法更新对象!"
@@ -7664,14 +7682,14 @@ msgstr "无法更新对象!"
# calendar/gui/dialogs/comp-editor.c:678
# calendar/gui/dialogs/comp-editor.c:678
# calendar/gui/dialogs/comp-editor.c:692
-#: calendar/gui/dialogs/comp-editor.c:798
+#: 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:803
+#: calendar/gui/dialogs/comp-editor.c:802
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
@@ -7679,7 +7697,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:806
+#: calendar/gui/dialogs/comp-editor.c:805
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
@@ -7687,7 +7705,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:809
+#: calendar/gui/dialogs/comp-editor.c:808
#, c-format
msgid "Journal entry - %s"
msgstr "日志条目 - %s"
@@ -7695,22 +7713,22 @@ msgstr "日志条目 - %s"
# calendar/gui/dialogs/comp-editor.c:703
# calendar/gui/dialogs/comp-editor.c:703
# calendar/gui/dialogs/comp-editor.c:717
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:822
msgid "No summary"
msgstr "没有概要"
# composer/e-msg-composer.c:943
# composer/e-msg-composer.c:947
# composer/e-msg-composer.c:912
-#: calendar/gui/dialogs/comp-editor.c:1213
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
-#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1220
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3976
+#: calendar/gui/e-week-view.c:3802 composer/e-msg-composer.c:1146
msgid "Save as..."
msgstr "另存为..."
-#: calendar/gui/dialogs/comp-editor.c:1314
-#: calendar/gui/dialogs/comp-editor.c:1338
-#: calendar/gui/dialogs/comp-editor.c:1362
+#: calendar/gui/dialogs/comp-editor.c:1321
+#: calendar/gui/dialogs/comp-editor.c:1345
+#: calendar/gui/dialogs/comp-editor.c:1369
msgid ""
"Changes made to this item may be discarded if an update arrives via email"
msgstr ""
@@ -7718,7 +7736,7 @@ msgstr ""
# calendar/gui/dialogs/comp-editor.c:1272
# calendar/gui/dialogs/comp-editor.c:1272
# calendar/gui/dialogs/comp-editor.c:1277
-#: calendar/gui/dialogs/comp-editor.c:1389
+#: calendar/gui/dialogs/comp-editor.c:1396
msgid "Unable to obtain current version!"
msgstr "无法获取当前版本!"
@@ -7844,7 +7862,7 @@ msgstr "再次发生"
# 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
+#: calendar/gui/dialogs/event-editor.c:407
msgid "Scheduling"
msgstr "正在调度"
@@ -7859,7 +7877,7 @@ msgstr "正在调度"
# 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
+#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
msgid "Meeting"
msgstr "会见"
@@ -8112,7 +8130,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:1010
+#: calendar/gui/e-itip-control.c:898
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
@@ -8506,7 +8524,7 @@ msgstr "完成日期:"
# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
#: calendar/gui/dialogs/task-details-page.glade.h:9
#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/e-meeting-model.c:572 calendar/gui/e-meeting-model.c:872
msgid "Needs Action"
msgstr "需要动作"
@@ -8563,7 +8581,7 @@ msgstr "基本"
# 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
+#: calendar/gui/dialogs/task-editor.c:359
msgid "Assignment"
msgstr "分派"
@@ -8576,7 +8594,7 @@ msgstr "分派"
# calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:757
# calendar/gui/e-itip-control.glade.h:6
# composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:828
#: calendar/gui/e-itip-control.glade.h:6
#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
msgid "Description:"
@@ -8690,8 +8708,8 @@ msgstr "100%"
# calendar/gui/e-week-view.c:1824
# calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
# calendar/gui/e-week-view.c:1828
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
-#: calendar/gui/e-week-view.c:1854
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
+#: calendar/gui/e-week-view.c:1892
msgid "Deleting selected objects"
msgstr "删除选中的对象"
@@ -8704,8 +8722,8 @@ 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:987 calendar/gui/e-day-view.c:3631
-#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3745
+#: calendar/gui/e-week-view.c:3552 mail/folder-browser.c:1717
#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
msgid "_Open"
msgstr "打开(_O)"
@@ -8727,8 +8745,8 @@ msgstr "另存为..."
# ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:41
# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:105
# ui/my-evolution.xml.h:7
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
-#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3747
+#: calendar/gui/e-week-view.c:3526 calendar/gui/e-week-view.c:3554
#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
@@ -8744,8 +8762,8 @@ msgstr "打印(_P)..."
# calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
# calendar/gui/e-week-view.c:3441 ui/evolution-addressbook.xml.h:1
# ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
-#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3752
+#: calendar/gui/e-week-view.c:3559 ui/evolution-addressbook.xml.h:1
#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "剪切(_U)"
@@ -8762,8 +8780,8 @@ msgstr "剪切(_U)"
# calendar/gui/e-week-view.c:3443 ui/evolution-addressbook.xml.h:34
# ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
# ui/evolution-tasks.xml.h:17
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
-#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3753
+#: calendar/gui/e-week-view.c:3560 ui/evolution-addressbook.xml.h:30
#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
#: ui/evolution-tasks.xml.h:15
msgid "_Copy"
@@ -8784,9 +8802,9 @@ msgstr "复制(_C)"
# calendar/gui/e-week-view.c:3445 ui/evolution-addressbook.xml.h:38
# ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
# ui/evolution-tasks.xml.h:21
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
-#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3716
+#: calendar/gui/e-day-view.c:3754 calendar/gui/e-week-view.c:3530
+#: calendar/gui/e-week-view.c:3561 ui/evolution-addressbook.xml.h:37
#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
#: ui/evolution-tasks.xml.h:19
msgid "_Paste"
@@ -8836,8 +8854,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:1274 calendar/gui/e-day-view.c:7502
-#: calendar/gui/e-week-view.c:4255
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7631
+#: calendar/gui/e-week-view.c:4303
msgid "Updating objects"
msgstr "更新对象"
@@ -8948,8 +8966,8 @@ msgstr "URL"
# calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
# e-util/e-time-utils.c:357
#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:357
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
+#: e-util/e-time-utils.c:380
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%Y年%m月%d日 %a %H:%M:%S"
@@ -8960,8 +8978,8 @@ msgstr "%Y年%m月%d日 %a %H:%M:%S"
# calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
# e-util/e-time-utils.c:366
#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:366
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
+#: e-util/e-time-utils.c:389
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%Y年%m月%d日 %a %I:%M%S %p"
@@ -8995,7 +9013,7 @@ msgstr "%02i 分钟分割"
# calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
msgid "%A %d %B"
msgstr "%B %d %A"
@@ -9008,7 +9026,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:1448
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
#: calendar/gui/e-week-view-main-item.c:347
msgid "%d %b"
msgstr "%b %d"
@@ -9020,7 +9038,7 @@ msgstr "%b %d"
# calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:350
# calendar/gui/print.c:768
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:377
#: calendar/gui/print.c:791
msgid "am"
msgstr "上午"
@@ -9032,7 +9050,7 @@ msgstr "上午"
# calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
# calendar/gui/print.c:770
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:380
#: calendar/gui/print.c:793
msgid "pm"
msgstr "下午"
@@ -9040,14 +9058,14 @@ msgstr "下午"
# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-#: calendar/gui/e-day-view.c:3586
+#: calendar/gui/e-day-view.c:3700
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:3588 calendar/gui/e-week-view.c:3472
+#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3520
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
@@ -9060,7 +9078,7 @@ msgstr "新建全天事件(_E)"
# calendar/gui/dialogs/event-editor.c:207
# calendar/gui/dialogs/event-editor.c:263
# calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
+#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3521
#, fuzzy
msgid "New Meeting"
msgstr "会见"
@@ -9068,14 +9086,14 @@ msgstr "会见"
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3522
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:3597 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3711 ui/evolution-comp-editor.xml.h:11
msgid "Print..."
msgstr "打印..."
@@ -9085,7 +9103,7 @@ msgstr "打印..."
# ui/evolution-calendar.xml.h:17
# calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
# ui/evolution-calendar.xml.h:17
-#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3536
#: ui/evolution-calendar.xml.h:10
msgid "Go to _Today"
msgstr "转到今天(_T)"
@@ -9093,14 +9111,14 @@ msgstr "转到今天(_T)"
# calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
# calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3422
# calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3426
-#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3537
msgid "_Go to Date..."
msgstr "转到日期(_G)..."
# ui/evolution-calendar.xml.h:42
# ui/evolution-calendar.xml.h:42
# ui/evolution-calendar.xml.h:42
-#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3541
#: ui/evolution-calendar.xml.h:31
msgid "_Publish Free/Busy Information"
msgstr "发布忙闲信息(_P)"
@@ -9108,7 +9126,7 @@ msgstr "发布忙闲信息(_P)"
# mail/mail-local.c:1416
# mail/mail-local.c:1416
# executive-summary/component/e-summary-url.c:80
-#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3545
#, fuzzy
msgid "_Configure..."
msgstr "配置 %s"
@@ -9116,7 +9134,7 @@ msgstr "配置 %s"
# mail/mail-local.c:1416
# mail/mail-local.c:1416
# executive-summary/component/e-summary-url.c:80
-#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
+#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3546
#, fuzzy
msgid "_Configure Pilot..."
msgstr "配置 %s"
@@ -9124,15 +9142,15 @@ msgstr "配置 %s"
# mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:105
# mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:105
# mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:107
-#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
-#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3553
+#: mail/folder-browser.c:1719 ui/evolution-mail-message.xml.h:112
msgid "_Save As..."
msgstr "另存为(_S)..."
# ui/evolution-event-editor.xml.h:7
# ui/evolution-event-editor.xml.h:7
# ui/evolution-event-editor.xml.h:7
-#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3565
#, fuzzy
msgid "_Schedule Meeting..."
msgstr "调度会议(_M)"
@@ -9140,7 +9158,7 @@ msgstr "调度会议(_M)"
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3566
#, fuzzy
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_C)"
@@ -9148,28 +9166,28 @@ 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:3650 calendar/gui/e-week-view.c:3523
+#: calendar/gui/e-day-view.c:3764 calendar/gui/e-week-view.c:3571
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:3651 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3572
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:3652 calendar/gui/e-week-view.c:3525
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3573
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:4014 calendar/gui/e-week-view.c:3882
+#: calendar/gui/e-day-view.c:4128 calendar/gui/e-week-view.c:3930
#: shell/e-shell-view-menu.c:639
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr "GNOME Pilot 工具好像并未安装到系统中。"
@@ -9177,79 +9195,40 @@ 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:4020 calendar/gui/e-week-view.c:3888
+#: calendar/gui/e-day-view.c:4134 calendar/gui/e-week-view.c:3936
#: shell/e-shell-view-menu.c:647
#, 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: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: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: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: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: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:707
-msgid "Free/Busy info ends: <b>"
-msgstr "忙闲信息结束于:<b>"
+#: calendar/gui/e-itip-control.c:583
+msgid "<b>Starts:</b> "
+msgstr ""
# 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:711
-msgid "Ends: <b>"
+#: calendar/gui/e-itip-control.c:593
+#, fuzzy
+msgid "<b>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:725
-msgid "Task Completed: <b>"
-msgstr "任务完成率:<b>"
+# 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/e-itip-control.c:606
+#, fuzzy
+msgid "<b>Completed:</b> "
+msgstr "已完成 "
-# 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:735
-msgid "Task Due: <b>"
-msgstr "任务到期时间:<b>"
+#: calendar/gui/e-itip-control.c:616
+msgid "<b>Due:</b> "
+msgstr ""
# calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
# calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
# calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:703
msgid "iCalendar Information"
msgstr "iCalendar 信息"
@@ -9257,14 +9236,14 @@ msgstr "iCalendar 信息"
# calendar/gui/e-itip-control.c:641
# calendar/gui/e-itip-control.c:644
#. Title
-#: calendar/gui/e-itip-control.c:787
+#: calendar/gui/e-itip-control.c:668
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:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:734 calendar/gui/e-itip-control.c:750
msgid "An unknown person"
msgstr "未知的人"
@@ -9272,7 +9251,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:876
+#: calendar/gui/e-itip-control.c:757
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
@@ -9281,14 +9260,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:892
+#: calendar/gui/e-itip-control.c:772
msgid "<i>None</i>"
msgstr "<i>无</i>"
# calendar/gui/dialogs/event-page.glade.h:8
# calendar/gui/dialogs/event-page.glade.h:8
# calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:782
#, fuzzy
msgid "Location:"
msgstr "地理位置(_O):"
@@ -9296,7 +9275,7 @@ msgstr "地理位置(_O):"
# calendar/gui/dialogs/task-details-page.glade.h:15
# calendar/gui/dialogs/task-details-page.glade.h:15
# calendar/gui/dialogs/task-details-page.glade.h:15
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:796
msgid "Status:"
msgstr "状态:"
@@ -9306,16 +9285,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:915 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
-#: calendar/gui/itip-utils.c:490
+#: calendar/gui/e-itip-control.c:801 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:873
+#: calendar/gui/itip-utils.c:463
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:919 calendar/gui/itip-utils.c:493
+#: calendar/gui/e-itip-control.c:805 calendar/gui/itip-utils.c:466
msgid "Tentatively Accepted"
msgstr "暂时接受"
@@ -9325,9 +9304,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:923 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
-#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
+#: calendar/gui/e-itip-control.c:809 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:874
+#: calendar/gui/itip-utils.c:469 calendar/gui/itip-utils.c:495
msgid "Declined"
msgstr "否决"
@@ -9350,12 +9329,12 @@ 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:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:813 calendar/gui/e-itip-control.c:1019
#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
-#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
-#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:831
+#: calendar/gui/e-meeting-model.c:847 camel/camel-tcp-stream-openssl.c:629
#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
#: widgets/misc/e-charset-picker.c:444
msgid "Unknown"
@@ -9370,16 +9349,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:978 calendar/gui/e-itip-control.c:1006
-#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:866 calendar/gui/e-itip-control.c:894
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:933
+#: calendar/gui/e-itip-control.c:946 calendar/gui/e-itip-control.c:959
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:979
+#: calendar/gui/e-itip-control.c:867
msgid "Update"
msgstr "更新"
@@ -9395,67 +9374,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:980 calendar/gui/e-itip-control.c:1011
-#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
-#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
-#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:868 calendar/gui/e-itip-control.c:899
+#: calendar/gui/e-itip-control.c:922 calendar/gui/e-itip-control.c:935
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:961
+#: shell/e-shell.c:2127 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:1007
+#: calendar/gui/e-itip-control.c:895
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:1008
+#: calendar/gui/e-itip-control.c:896
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:1009
+#: calendar/gui/e-itip-control.c:897
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:1033
+#: calendar/gui/e-itip-control.c:921
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:1046
+#: calendar/gui/e-itip-control.c:934
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:1059
+#: calendar/gui/e-itip-control.c:947
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:1072 calendar/gui/itip-utils.c:510
-#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:960 calendar/gui/itip-utils.c:483
+#: shell/evolution-shell-component.c:1143 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:1150
+#: calendar/gui/e-itip-control.c:1038
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> 发布了会议信息。"
@@ -9463,14 +9442,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:1151
+#: calendar/gui/e-itip-control.c:1039
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:1155
+#: calendar/gui/e-itip-control.c:1043
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请求您参加一个会议。"
@@ -9478,14 +9457,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:1156
+#: calendar/gui/e-itip-control.c:1044
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:1160
+#: calendar/gui/e-itip-control.c:1048
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> 希望加入到已存的会议。"
@@ -9493,14 +9472,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:1161
+#: calendar/gui/e-itip-control.c:1049
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:1165
+#: calendar/gui/e-itip-control.c:1053
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> 想收到最新的会议信息。"
@@ -9508,14 +9487,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:1166
+#: calendar/gui/e-itip-control.c:1054
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:1173
+#: calendar/gui/e-itip-control.c:1061
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> 已回复一个会议请求。"
@@ -9523,14 +9502,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:1174
+#: calendar/gui/e-itip-control.c:1062
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:1181
+#: calendar/gui/e-itip-control.c:1069
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
@@ -9538,7 +9517,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:1182
+#: calendar/gui/e-itip-control.c:1070
msgid "Meeting Cancellation"
msgstr "会议取消"
@@ -9548,8 +9527,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:1189 calendar/gui/e-itip-control.c:1250
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1173
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> 发送了一个无法理解的信息。"
@@ -9557,14 +9536,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:1190
+#: calendar/gui/e-itip-control.c:1078
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:1211
+#: calendar/gui/e-itip-control.c:1099
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> 发布了任务信息。"
@@ -9572,14 +9551,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:1212
+#: calendar/gui/e-itip-control.c:1100
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:1216
+#: calendar/gui/e-itip-control.c:1104
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请求您完成一个任务。"
@@ -9587,14 +9566,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:1217
+#: calendar/gui/e-itip-control.c:1105
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:1221
+#: calendar/gui/e-itip-control.c:1109
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s<b> 希望加入到已存在的任务。"
@@ -9602,14 +9581,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:1222
+#: calendar/gui/e-itip-control.c:1110
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:1226
+#: calendar/gui/e-itip-control.c:1114
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> 希望获取最新的任务信息。"
@@ -9617,14 +9596,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:1227
+#: calendar/gui/e-itip-control.c:1115
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:1234
+#: calendar/gui/e-itip-control.c:1122
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> 已经回复了任务委派。"
@@ -9632,14 +9611,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:1235
+#: calendar/gui/e-itip-control.c:1123
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:1242
+#: calendar/gui/e-itip-control.c:1130
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> 取消了任务。"
@@ -9647,21 +9626,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:1243
+#: calendar/gui/e-itip-control.c:1131
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:1251
+#: calendar/gui/e-itip-control.c:1139
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:1270
+#: calendar/gui/e-itip-control.c:1158
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> 发布了忙闲信息。"
@@ -9669,14 +9648,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:1271
+#: calendar/gui/e-itip-control.c:1159
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:1275
+#: calendar/gui/e-itip-control.c:1163
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请求您的忙闲信息。"
@@ -9684,14 +9663,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:1276
+#: calendar/gui/e-itip-control.c:1164
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:1280
+#: calendar/gui/e-itip-control.c:1168
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> 应答了忙闲请求。"
@@ -9699,136 +9678,136 @@ msgstr "<b>%s</b> 应答了忙闲请求。"
# calendar/gui/e-itip-control.c:986
# calendar/gui/e-itip-control.c:986
# calendar/gui/e-itip-control.c:1060
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1169
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:1286
+#: calendar/gui/e-itip-control.c:1174
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:1365
+#: calendar/gui/e-itip-control.c:1229
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:1384
+#: calendar/gui/e-itip-control.c:1248
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:1412 calendar/gui/e-itip-control.c:1418
+#: calendar/gui/e-itip-control.c:1276 calendar/gui/e-itip-control.c:1282
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:1443
+#: calendar/gui/e-itip-control.c:1307
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日程项目"
-#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
+#: calendar/gui/e-itip-control.c:1458 calendar/gui/e-itip-control.c:1550
msgid "Object is invalid and cannot be updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
+#: calendar/gui/e-itip-control.c:1461 calendar/gui/e-itip-control.c:1553
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:1584 calendar/gui/e-itip-control.c:1676
+#: calendar/gui/e-itip-control.c:1464 calendar/gui/e-itip-control.c:1556
#, fuzzy
msgid "Object could not be found\n"
msgstr "无法发送项目!\n"
-#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
+#: calendar/gui/e-itip-control.c:1467 calendar/gui/e-itip-control.c:1559
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:1590
+#: calendar/gui/e-itip-control.c:1470
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:1593
+#: calendar/gui/e-itip-control.c:1473
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:1622 calendar/gui/e-itip-control.c:1688
+#: calendar/gui/e-itip-control.c:1502 calendar/gui/e-itip-control.c:1568
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新参与者状态"
-#: calendar/gui/e-itip-control.c:1643
+#: calendar/gui/e-itip-control.c:1523
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:1655
+#: calendar/gui/e-itip-control.c:1535
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新参与者状态!\n"
# calendar/gui/e-itip-control.c:1298
# calendar/gui/e-itip-control.c:1298
# calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1682
+#: calendar/gui/e-itip-control.c:1562
msgid "Attendee status updated\n"
msgstr "更新参与者状态\n"
# calendar/gui/e-itip-control.c:1296
# calendar/gui/e-itip-control.c:1296
# calendar/gui/e-itip-control.c:1370
-#: calendar/gui/e-itip-control.c:1685
+#: calendar/gui/e-itip-control.c:1565
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:1720
+#: calendar/gui/e-itip-control.c:1600
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:1750 calendar/gui/e-itip-control.c:1800
+#: calendar/gui/e-itip-control.c:1630 calendar/gui/e-itip-control.c:1680
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:1752 calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1684
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:834
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1757
#, fuzzy
msgid "Select Calendar Folder"
msgstr "选择文件夹"
@@ -9836,7 +9815,7 @@ msgstr "选择文件夹"
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:834
-#: calendar/gui/e-itip-control.c:1914
+#: calendar/gui/e-itip-control.c:1764
#, fuzzy
msgid "Select Tasks Folder"
msgstr "选择文件夹"
@@ -9915,7 +9894,7 @@ msgstr "主席人员"
# calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1550
# calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
# calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
msgid "Required Participants"
msgstr "必需的参与者"
@@ -9926,12 +9905,16 @@ msgstr "必需的参与者"
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: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:236 calendar/gui/e-meeting-model.c:253
+# calendar/gui/e-meeting-model.c:780
#: calendar/gui/e-meeting-model.c:87
-msgid "Non-Participants"
-msgstr "不参加"
+#, fuzzy
+msgid "Resources"
+msgstr "资源"
# calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
# calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
@@ -9940,7 +9923,7 @@ msgstr "不参加"
# calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
# calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:562 calendar/gui/e-meeting-model.c:827
msgid "Individual"
msgstr "个人"
@@ -9951,7 +9934,7 @@ msgstr "个人"
# calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
# calendar/gui/e-meeting-model.c:779
#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:828
msgid "Group"
msgstr "组"
@@ -9962,7 +9945,7 @@ msgstr "组"
# calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
# calendar/gui/e-meeting-model.c:780
#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:829
msgid "Resource"
msgstr "资源"
@@ -9973,7 +9956,7 @@ msgstr "资源"
# calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
# calendar/gui/e-meeting-model.c:781
#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:821
+#: calendar/gui/e-meeting-model.c:830
msgid "Room"
msgstr "房间"
@@ -9984,7 +9967,7 @@ msgstr "房间"
# calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
# calendar/gui/e-meeting-model.c:794
#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:843
msgid "Chair"
msgstr "主席"
@@ -9995,7 +9978,7 @@ msgstr "主席"
# calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
# calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:844
msgid "Required Participant"
msgstr "必需的参与者"
@@ -10006,7 +9989,7 @@ msgstr "必需的参与者"
# calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
# calendar/gui/e-meeting-model.c:796
#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-meeting-model.c:845
msgid "Optional Participant"
msgstr "可选的参与者"
@@ -10017,7 +10000,7 @@ msgstr "可选的参与者"
# calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
# calendar/gui/e-meeting-model.c:797
#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:837
+#: calendar/gui/e-meeting-model.c:846
msgid "Non-Participant"
msgstr "不参加"
@@ -10028,7 +10011,7 @@ msgstr "不参加"
# calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
# calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:875 calendar/gui/e-meeting-time-sel.c:437
msgid "Tentative"
msgstr "暂时的"
@@ -10039,7 +10022,7 @@ msgstr "暂时的"
# calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
# calendar/gui/e-meeting-model.c:827
#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:867
+#: calendar/gui/e-meeting-model.c:876
msgid "Delegated"
msgstr "被委任的"
@@ -10059,7 +10042,7 @@ msgstr "正在处理"
#. 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:475
-#: calendar/gui/e-meeting-time-sel.c:2107
+#: calendar/gui/e-meeting-time-sel.c:2114
msgid "%A, %B %d, %Y"
msgstr "%Y年%B月%d日 %A"
@@ -10075,8 +10058,8 @@ msgstr "%Y年%B月%d日 %A"
#. 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: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
+#: calendar/gui/e-meeting-time-sel.c:2144 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
msgid "%a %m/%d/%Y"
msgstr "%Y年%m月%d日 %a"
@@ -10088,8 +10071,8 @@ 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:483 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
+#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1597
msgid "%m/%d/%Y"
msgstr "%Y年%m月%d日"
@@ -10201,8 +10184,8 @@ msgstr "会议结束时间(_E):"
# calendar/gui/e-tasks.c:328
# calendar/gui/e-tasks.c:328
# calendar/gui/e-tasks.c:342
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
-#: calendar/gui/gnome-cal.c:1952
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1976
+#: calendar/gui/gnome-cal.c:1987
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
@@ -10226,7 +10209,7 @@ msgstr "不支持装入“%s”必需的方法"
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1493
-#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1546
#, fuzzy, c-format
msgid "You don't have permission to open the folder in `%s'"
msgstr "无法打开“%s”中的文件夹"
@@ -10260,14 +10243,14 @@ 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:3471
+#: calendar/gui/e-week-view.c:3519
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1493
-#: calendar/gui/gnome-cal.c:1522
+#: calendar/gui/gnome-cal.c:1524
#, c-format
msgid "Could not open the folder in `%s'"
msgstr "无法打开“%s”中的文件夹"
@@ -10275,15 +10258,31 @@ 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:1533
+#: calendar/gui/gnome-cal.c:1535
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr "不支持打开“%s”必需的方法"
+#: calendar/gui/gnome-cal.c:1734
+#, c-format
+msgid ""
+"The calendar backend for\n"
+"%s\n"
+" has crashed. You will have to restart Evolution in order to use it again"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1739
+#, c-format
+msgid ""
+"The task backend for\n"
+"%s\n"
+" has crashed. You will have to restart Evolution in order to use it again"
+msgstr ""
+
# calendar/gui/gnome-cal.c:1865
# calendar/gui/gnome-cal.c:1865
# calendar/gui/gnome-cal.c:1859
-#: calendar/gui/gnome-cal.c:1924
+#: calendar/gui/gnome-cal.c:1959
#, c-format
msgid "Opening calendar at %s"
msgstr "从 %s 打开日历"
@@ -10291,7 +10290,7 @@ msgstr "从 %s 打开日历"
# mail/mail-ops.c:1234
# mail/mail-ops.c:1236
# mail/mail-ops.c:1279
-#: calendar/gui/gnome-cal.c:1963
+#: calendar/gui/gnome-cal.c:1998
#, fuzzy
msgid "Opening default tasks folder"
msgstr "正在打开文件夹 %s"
@@ -10397,56 +10396,56 @@ msgstr "九月"
# calendar/gui/itip-utils.c:243
# calendar/gui/itip-utils.c:243
# calendar/gui/itip-utils.c:243
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:356
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:419
+#: calendar/gui/itip-utils.c:392
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:462
+#: calendar/gui/itip-utils.c:435
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:464
+#: calendar/gui/itip-utils.c:437
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:466
+#: calendar/gui/itip-utils.c:439
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:468
+#: calendar/gui/itip-utils.c:441
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:470
+#: calendar/gui/itip-utils.c:443
msgid "Calendar information"
msgstr "日历信息"
# calendar/gui/e-itip-control.c:787
# calendar/gui/e-itip-control.c:787
# calendar/gui/e-itip-control.c:790
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:479
#, fuzzy
msgid "Updated"
msgstr "更新"
@@ -10454,19 +10453,19 @@ msgstr "更新"
# ui/evolution-subscribe.xml.h:3
# ui/evolution-subscribe.xml.h:3
# ui/evolution-subscribe.xml.h:3
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:487
#, fuzzy
msgid "Refresh"
msgstr "刷新列表"
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:491
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:697
+#: calendar/gui/itip-utils.c:678
msgid "You must be an attendee of the event."
msgstr "您必须是事件的参与者。"
@@ -10910,7 +10909,7 @@ msgstr "打印日历"
# mail/mail-callbacks.c:2597 my-evolution/e-summary.c:605
# ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3162
#: my-evolution/e-summary.c:619
msgid "Print Preview"
msgstr "打印预览"
@@ -10947,7 +10946,7 @@ msgstr "要显示的任务文件夹的 URI"
# mail/mail-callbacks.c:2135
# mail/mail-callbacks.c:2254
# calendar/gui/tasks-control.c:434
-#: calendar/gui/tasks-control.c:456
+#: calendar/gui/tasks-control.c:453
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -10961,15 +10960,15 @@ msgstr ""
# mail/mail-callbacks.c:2142
# mail/mail-callbacks.c:2261
# calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2297
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
-#: mail/mail-callbacks.c:2883
+#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2642
+#: mail/mail-callbacks.c:2884
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
+#: calendar/gui/tasks-control.c:609
#, fuzzy
msgid "Print Tasks"
msgstr "打印卡片"
@@ -14019,7 +14018,7 @@ msgstr "正在移动邮件"
msgid "Copying messages"
msgstr "把邮件复制到 %s"
-#: camel/camel-gpg-context.c:705
+#: camel/camel-gpg-context.c:713
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -14027,15 +14026,15 @@ msgid ""
"%s"
msgstr ""
-#: camel/camel-gpg-context.c:719
+#: camel/camel-gpg-context.c:727
msgid "Failed to parse gpg userid hint."
msgstr ""
-#: camel/camel-gpg-context.c:742
+#: camel/camel-gpg-context.c:750
msgid "Failed to parse gpg passphrase request."
msgstr ""
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -14045,20 +14044,20 @@ msgstr ""
# mail/mail-send-recv.c:533
# mail/mail-send-recv.c:541
# mail/mail-send-recv.c:541
-#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
-#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
-#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
+#: camel/camel-gpg-context.c:769 camel/camel-gpg-context.c:1228
+#: camel/camel-gpg-context.c:1336 camel/camel-gpg-context.c:1411
+#: camel/camel-gpg-context.c:1469 mail/mail-send-recv.c:540
msgid "Cancelled."
msgstr "已取消"
-#: camel/camel-gpg-context.c:779
+#: camel/camel-gpg-context.c:787
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:785
+#: camel/camel-gpg-context.c:793
#, fuzzy, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "来自 POP 服务器的意外应答: %s"
@@ -14066,7 +14065,7 @@ msgstr "来自 POP 服务器的意外应答: %s"
# tools/evolution-addressbook-import.c:80
# tools/evolution-addressbook-import.c:80
# tools/evolution-addressbook-import.c:80
-#: camel/camel-gpg-context.c:795
+#: camel/camel-gpg-context.c:803
#, fuzzy
msgid "No data provided"
msgstr "没有提供文件名。"
@@ -14074,7 +14073,7 @@ msgstr "没有提供文件名。"
# camel/camel-pgp-context.c:1169
# camel/camel-pgp-context.c:1169
# camel/camel-pgp-context.c:1169
-#: camel/camel-gpg-context.c:840
+#: camel/camel-gpg-context.c:848
#, fuzzy
msgid "Failed to encrypt: No valid recipients specified."
msgstr "无法加密该邮件: 没有指明收件人"
@@ -14091,7 +14090,7 @@ msgstr "无法加密该邮件: 没有指明收件人"
# camel/providers/imap/camel-imap-message-cache.c:313
# camel/providers/imap/camel-imap-message-cache.c:344
# camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-gpg-context.c:1095
+#: camel/camel-gpg-context.c:1103
#, fuzzy, c-format
msgid ""
"Failed to GPG %s message: %s\n"
@@ -14111,7 +14110,7 @@ msgstr "缓冲邮件 %s 失败: %s"
# camel/providers/imap/camel-imap-message-cache.c:313
# camel/providers/imap/camel-imap-message-cache.c:344
# camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-gpg-context.c:1101
+#: camel/camel-gpg-context.c:1109
#, fuzzy, c-format
msgid "Failed to GPG %s message: %s\n"
msgstr "缓冲邮件 %s 失败: %s"
@@ -14119,8 +14118,17 @@ 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:1211 camel/camel-gpg-context.c:1318
-#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
+#: camel/camel-gpg-context.c:1219
+#, fuzzy, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "解码邮件失败。"
+
+# camel/camel-smime-context.c:810
+# camel/camel-smime-context.c:810
+# camel/camel-smime-context.c:810
+#: camel/camel-gpg-context.c:1249 camel/camel-gpg-context.c:1328
+#: camel/camel-gpg-context.c:1402 camel/camel-gpg-context.c:1432
+#: camel/camel-gpg-context.c:1460 camel/camel-gpg-context.c:1490
#, fuzzy
msgid "Failed to execute gpg."
msgstr "解码邮件失败。"
@@ -14128,7 +14136,7 @@ msgstr "解码邮件失败。"
# camel/camel-pgp-context.c:970
# camel/camel-pgp-context.c:970
# camel/camel-pgp-context.c:970
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1313
#, fuzzy, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr "无法验证该邮件:无法创建临时文件: %s"
@@ -14503,7 +14511,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:1002
+#: camel/providers/imap/camel-imap-store.c:1051
msgid "Bad authentication response from server."
msgstr "来自服务器的无效认证应答。"
@@ -14694,7 +14702,7 @@ msgstr "协议“%s”没有可用的提供者"
# camel/camel-session.c:532
# camel/camel-session.c:532
# camel/camel-session.c:532
-#: camel/camel-session.c:536
+#: camel/camel-session.c:545
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -14770,14 +14778,14 @@ msgstr "验证证书失败。"
# camel/camel-store.c:220
# camel/camel-store.c:220
# camel/camel-store.c:220
-#: camel/camel-store.c:241
+#: camel/camel-store.c:244
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:303
+#: camel/camel-store.c:306
msgid "Cannot create folder: Invalid operation on this store"
msgstr "无法创建文件夹: 对该存储的无效操作"
@@ -15080,10 +15088,10 @@ msgstr "无法重命名文件夹: %s: 没有该文件夹"
# 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:2404
+#: camel/providers/imap/camel-imap-command.c:223
+#: camel/providers/imap/camel-imap-command.c:262
+#: camel/providers/imap/camel-imap-command.c:441
+#: camel/providers/imap/camel-imap-store.c:2578
msgid "Operation cancelled"
msgstr "操作已取消"
@@ -15093,8 +15101,8 @@ msgstr "操作已取消"
# 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:2407
+#: camel/providers/imap/camel-imap-command.c:307
+#: camel/providers/imap/camel-imap-store.c:2581
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "服务器意外地中止了连接: %s"
@@ -15102,7 +15110,7 @@ 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:382
+#: camel/providers/imap/camel-imap-command.c:385
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "来自 IMAP 服务器的意外应答: %s"
@@ -15110,7 +15118,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:392
+#: camel/providers/imap/camel-imap-command.c:395
#, c-format
msgid "IMAP command failed: %s"
msgstr "IMAP 命令失败: %s"
@@ -15118,14 +15126,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:447
+#: camel/providers/imap/camel-imap-command.c:450
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:636
+#: camel/providers/imap/camel-imap-command.c:642
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "IMAP 服务器应答不含有 %s 信息"
@@ -15133,7 +15141,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:672
+#: camel/providers/imap/camel-imap-command.c:678
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr "来自 IMAP 服务器意外的 OK 应答: %s"
@@ -15141,7 +15149,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:219
+#: camel/providers/imap/camel-imap-folder.c:220
#, c-format
msgid "Could not create directory %s: %s"
msgstr "无法创建目录 %s: %s"
@@ -15149,7 +15157,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:238
+#: camel/providers/imap/camel-imap-folder.c:239
#, c-format
msgid "Could not load summary for %s"
msgstr "无法为 %s 装入概要"
@@ -15157,7 +15165,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:304
+#: camel/providers/imap/camel-imap-folder.c:305
msgid "Folder was destroyed and recreated on server."
msgstr "文件夹已被删除并在服务器上重建了。"
@@ -15165,18 +15173,85 @@ 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:535
+#: camel/providers/imap/camel-imap-folder.c:547
msgid "Scanning for changed messages"
msgstr "正在扫描改变了的邮件"
+# camel/camel-smime-context.c:810
+# camel/camel-smime-context.c:810
+# camel/camel-filter-search.c:126
+#: camel/providers/imap/camel-imap-folder.c:1868
+#, fuzzy, c-format
+msgid "Unable to retrieve message: %s"
+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
+# 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/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/imap/camel-imap-folder.c:1904
+#: 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:347
+#: 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"
+" %s"
+msgstr ""
+"无法获取邮件: %s\n"
+" %s"
+
+# 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: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: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/imap/camel-imap-folder.c:1904
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mh-folder.c:201
+msgid "No such message"
+msgstr "没有该邮件"
+
# camel/providers/imap/camel-imap-folder.c:1585
# camel/providers/imap/camel-imap-folder.c:2001
# camel/providers/imap/camel-imap-folder.c:1585
# 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:1909
-#: camel/providers/imap/camel-imap-folder.c:2406
+#: camel/providers/imap/camel-imap-folder.c:1927
+#: camel/providers/imap/camel-imap-folder.c:2424
msgid "This message is not currently available"
msgstr "该邮件目前不可用"
@@ -15186,22 +15261,22 @@ msgstr "该邮件目前不可用"
# camel/providers/imap/camel-imap-folder.c:1821
# camel/providers/imap/camel-imap-folder.c:1787
# camel/providers/imap/camel-imap-folder.c:1861
-#: camel/providers/imap/camel-imap-folder.c:2066
-#: camel/providers/imap/camel-imap-folder.c:2143
+#: camel/providers/imap/camel-imap-folder.c:2084
+#: camel/providers/imap/camel-imap-folder.c:2161
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:2072
+#: camel/providers/imap/camel-imap-folder.c:2090
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:2443
+#: camel/providers/imap/camel-imap-folder.c:2461
msgid "Could not find message body in FETCH response."
msgstr "无法在 FETCH 应答中找到邮件体。"
@@ -15250,7 +15325,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:1043
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
msgid "Folders"
msgstr "文件夹"
@@ -15307,7 +15382,7 @@ msgstr "IMAP 服务器上的邮件的读写。"
# camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:60
#: camel/providers/imap/camel-imap-provider.c:80
#: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
msgid "Password"
msgstr "密码"
@@ -15321,7 +15396,7 @@ msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
# camel/providers/smtp/camel-smtp-transport.c:554
# camel/providers/smtp/camel-smtp-transport.c:554
# camel/providers/smtp/camel-smtp-transport.c:565
-#: camel/providers/imap/camel-imap-store.c:433
+#: camel/providers/imap/camel-imap-store.c:456
#, fuzzy, c-format
msgid "IMAP server %s"
msgstr "SMTP 服务器 %s"
@@ -15329,7 +15404,7 @@ msgstr "SMTP 服务器 %s"
# camel/camel-remote-store.c:207
# camel/camel-remote-store.c:207
# camel/camel-remote-store.c:207
-#: camel/providers/imap/camel-imap-store.c:435
+#: camel/providers/imap/camel-imap-store.c:458
#, fuzzy, c-format
msgid "IMAP service for %s on %s"
msgstr "%s 为 %s 服务,在 %s"
@@ -15337,7 +15412,7 @@ msgstr "%s 为 %s 服务,在 %s"
# camel/camel-remote-store.c:264
# camel/camel-remote-store.c:264
# camel/camel-remote-store.c:264
-#: camel/providers/imap/camel-imap-store.c:554
+#: camel/providers/imap/camel-imap-store.c:583
#: camel/providers/nntp/camel-nntp-store.c:130
#: camel/providers/nntp/camel-nntp-store.c:148
#: camel/providers/pop3/camel-pop3-store.c:180
@@ -15350,7 +15425,7 @@ msgstr "连接已取消"
# camel/providers/smtp/camel-smtp-transport.c:273
# camel/camel-remote-store.c:267
# camel/providers/smtp/camel-smtp-transport.c:276
-#: camel/providers/imap/camel-imap-store.c:557
+#: camel/providers/imap/camel-imap-store.c:586
#: camel/providers/nntp/camel-nntp-store.c:133
#: camel/providers/smtp/camel-smtp-transport.c:276
#, c-format
@@ -15360,8 +15435,8 @@ msgstr "无法连接到 %s (端口 %d): %s"
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
-#: camel/providers/imap/camel-imap-store.c:616
-#: camel/providers/imap/camel-imap-store.c:647
+#: camel/providers/imap/camel-imap-store.c:645
+#: camel/providers/imap/camel-imap-store.c:676
#, fuzzy, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr ""
@@ -15371,7 +15446,7 @@ msgstr ""
# shell/e-storage.c:518
# shell/e-storage.c:518
# shell/e-storage.c:518
-#: camel/providers/imap/camel-imap-store.c:617
+#: camel/providers/imap/camel-imap-store.c:646
#: camel/providers/pop3/camel-pop3-store.c:213
#, fuzzy
msgid "SSL/TLS extension not supported."
@@ -15380,7 +15455,7 @@ 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:648
+#: camel/providers/imap/camel-imap-store.c:677
#: camel/providers/pop3/camel-pop3-store.c:254
#, fuzzy
msgid "SSL negotiations failed"
@@ -15389,7 +15464,7 @@ msgstr "认证失败。"
# shell/e-storage.c:510
# shell/e-storage.c:510
# shell/e-storage.c:510
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:940
#, fuzzy, c-format
msgid "The folder %s no longer exists"
msgstr "文件夹不为空"
@@ -15397,7 +15472,7 @@ 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:1025
+#: camel/providers/imap/camel-imap-store.c:1074
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
@@ -15408,8 +15483,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:1035
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/imap/camel-imap-store.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:479
#, c-format
msgid "No support for authentication type %s"
msgstr "不支持验证类型 %s"
@@ -15417,7 +15492,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:1059
+#: camel/providers/imap/camel-imap-store.c:1108
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%s请为 %s@%s 输入 IMAP 密码"
@@ -15428,15 +15503,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:1074
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/imap/camel-imap-store.c:1123
+#: camel/providers/smtp/camel-smtp-transport.c:520
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:1103
+#: camel/providers/imap/camel-imap-store.c:1152
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -15450,8 +15525,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:1426
-#: camel/providers/imap/camel-imap-store.c:1563
+#: camel/providers/imap/camel-imap-store.c:1450
+#: camel/providers/imap/camel-imap-store.c:1592
#, c-format
msgid "No such folder %s"
msgstr "没有文件夹 %s"
@@ -15459,16 +15534,30 @@ msgstr "没有文件夹 %s"
# shell/e-shell-utils.c:121
# shell/e-shell-utils.c:121
# shell/e-shell-utils.c:121
-#: camel/providers/imap/camel-imap-store.c:1750
+#: camel/providers/imap/camel-imap-store.c:1793
#, fuzzy, c-format
msgid ""
"The folder name \"%s\" is invalid because it containes the character \"%c\""
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/imap/camel-imap-store.c:1805
+#, fuzzy, c-format
+msgid "Unknown parent folder: %s"
+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:1788
+#: camel/providers/imap/camel-imap-store.c:1841
msgid "The parent folder is not allowed to contain subfolders"
msgstr "父文件夹不允许含有子文件夹"
@@ -15702,63 +15791,6 @@ msgstr "邮件目录附加已放弃"
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "无法将邮件附加到邮件目录文件夹: %s: %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/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"
-" %s"
-msgstr ""
-"无法获取邮件: %s\n"
-" %s"
-
-# 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: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: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 "没有该邮件"
-
# camel/providers/local/camel-maildir-folder.c:231
# camel/providers/local/camel-mh-folder.c:216
# camel/providers/local/camel-maildir-folder.c:231
@@ -15938,14 +15970,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:275
+#: camel/providers/local/camel-mbox-folder.c:274
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:278
+#: camel/providers/local/camel-mbox-folder.c:277
#, c-format
msgid "Cannot append message to mbox file: %s: %s"
msgstr "无法将邮件附加到邮件箱文件: %s: %s"
@@ -15968,9 +16000,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:366
-#: camel/providers/local/camel-mbox-folder.c:397
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:396
+#: camel/providers/local/camel-mbox-folder.c:404
#, c-format
msgid ""
"Cannot get message: %s from folder %s\n"
@@ -15985,7 +16017,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:398
+#: camel/providers/local/camel-mbox-folder.c:397
msgid "The folder appears to be irrecoverably corrupted."
msgstr "文件夹好像已经被不可恢复地破坏了。"
@@ -15995,7 +16027,7 @@ 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:406
+#: camel/providers/local/camel-mbox-folder.c:405
msgid "Message construction failed: Corrupt mailbox?"
msgstr "邮件构造失败:邮件箱已损坏?"
@@ -16211,7 +16243,8 @@ msgstr "无法重命名文件夹: %s"
# camel/providers/local/camel-spool-summary.c:749
# camel/providers/local/camel-mbox-summary.c:595
# camel/providers/local/camel-spool-summary.c:749
-#: camel/providers/local/camel-mbox-summary.c:974
+#: camel/providers/local/camel-mbox-summary.c:976
+#: camel/providers/local/camel-mbox-summary.c:1001
#, c-format
msgid "Error writing to temp mailbox: %s"
msgstr "写入临时文件夹错误: %s"
@@ -16222,7 +16255,7 @@ msgstr "写入临时文件夹错误: %s"
# camel/providers/local/camel-spool-summary.c:771
# camel/providers/local/camel-mbox-summary.c:612
# camel/providers/local/camel-spool-summary.c:771
-#: camel/providers/local/camel-mbox-summary.c:991
+#: camel/providers/local/camel-mbox-summary.c:993
#, c-format
msgid "Writing to tmp mailbox failed: %s: %s"
msgstr "写入临时文件夹失败: %s: %s"
@@ -16600,7 +16633,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:83
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
msgid "POP"
msgstr "POP"
@@ -16735,7 +16768,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:109
+#: mail/mail-config.glade.h:110
msgid "Sendmail"
msgstr "Sendmail"
@@ -16820,7 +16853,7 @@ 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:100
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
msgid "SMTP"
msgstr "SMTP"
@@ -17017,8 +17050,8 @@ msgstr "QUIT 应答错误"
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
-#: camel/providers/smtp/camel-smtp-transport.c:340
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:385
#, fuzzy, c-format
msgid "Failed to connect to SMTP server %s in secure mode: %s"
msgstr ""
@@ -17028,7 +17061,7 @@ msgstr ""
# calendar/gui/e-itip-control.c:1064
# calendar/gui/e-itip-control.c:1064
# calendar/gui/e-itip-control.c:1138
-#: camel/providers/smtp/camel-smtp-transport.c:341
+#: camel/providers/smtp/camel-smtp-transport.c:344
#, fuzzy
msgid "server does not appear to support SSL"
msgstr "邮件的格式可能不正确"
@@ -17036,7 +17069,7 @@ msgstr "邮件的格式可能不正确"
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1199
-#: camel/providers/smtp/camel-smtp-transport.c:355
+#: camel/providers/smtp/camel-smtp-transport.c:358
#, fuzzy, c-format
msgid "STARTTLS request timed out: %s"
msgstr "RSET 请求超时: %s"
@@ -17044,7 +17077,7 @@ msgstr "RSET 请求超时: %s"
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1104
-#: camel/providers/smtp/camel-smtp-transport.c:370
+#: camel/providers/smtp/camel-smtp-transport.c:373
#, fuzzy
msgid "STARTTLS response error"
msgstr "DATA 应答错误"
@@ -17052,7 +17085,7 @@ msgstr "DATA 应答错误"
# camel/providers/smtp/camel-smtp-transport.c:379
# camel/providers/smtp/camel-smtp-transport.c:379
# camel/providers/smtp/camel-smtp-transport.c:383
-#: camel/providers/smtp/camel-smtp-transport.c:466
+#: camel/providers/smtp/camel-smtp-transport.c:469
#, fuzzy, c-format
msgid "SMTP server %s does not support requested authentication type %s."
msgstr "SMTP 服务器 %s 并不支持请求的认证类型 %s"
@@ -17060,7 +17093,7 @@ msgstr "SMTP 服务器 %s 并不支持请求的认证类型 %s"
# camel/providers/smtp/camel-smtp-transport.c:417
# camel/providers/smtp/camel-smtp-transport.c:417
# camel/providers/smtp/camel-smtp-transport.c:421
-#: camel/providers/smtp/camel-smtp-transport.c:504
+#: camel/providers/smtp/camel-smtp-transport.c:507
#, c-format
msgid "%sPlease enter the SMTP password for %s@%s"
msgstr "%s请为 %s@%s 输入 SMTP 密码"
@@ -17068,7 +17101,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:525
+#: camel/providers/smtp/camel-smtp-transport.c:528
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -17082,7 +17115,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:658
+#: camel/providers/smtp/camel-smtp-transport.c:661
#, c-format
msgid "SMTP server %s"
msgstr "SMTP 服务器 %s"
@@ -17090,7 +17123,7 @@ msgstr "SMTP 服务器 %s"
# camel/providers/smtp/camel-smtp-transport.c:556
# camel/providers/smtp/camel-smtp-transport.c:556
# camel/providers/smtp/camel-smtp-transport.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:660
+#: camel/providers/smtp/camel-smtp-transport.c:663
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "通过 %s 发送 SMTP 邮件"
@@ -17098,42 +17131,42 @@ msgstr "通过 %s 发送 SMTP 邮件"
# camel/providers/smtp/camel-smtp-transport.c:588
# camel/providers/smtp/camel-smtp-transport.c:588
# camel/providers/smtp/camel-smtp-transport.c:598
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
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:683 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:686 mail/mail-ops.c:622
msgid "Sending message"
msgstr "正在发送邮件"
# camel/providers/smtp/camel-smtp-transport.c:604
# camel/providers/smtp/camel-smtp-transport.c:604
# camel/providers/smtp/camel-smtp-transport.c:614
-#: camel/providers/smtp/camel-smtp-transport.c:697
+#: camel/providers/smtp/camel-smtp-transport.c:700
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:707
+#: camel/providers/smtp/camel-smtp-transport.c:710
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:861
+#: camel/providers/smtp/camel-smtp-transport.c:866
msgid "SMTP Greeting"
msgstr "SMTP 欢迎"
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1199
-#: camel/providers/smtp/camel-smtp-transport.c:892
+#: camel/providers/smtp/camel-smtp-transport.c:912
#, fuzzy, c-format
msgid "HELO request timed out: %s"
msgstr "RSET 请求超时: %s"
@@ -17141,7 +17174,7 @@ msgstr "RSET 请求超时: %s"
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1213
-#: camel/providers/smtp/camel-smtp-transport.c:913
+#: camel/providers/smtp/camel-smtp-transport.c:934
#, fuzzy
msgid "HELO response error"
msgstr "RSET 应答错误"
@@ -17149,14 +17182,14 @@ msgstr "RSET 应答错误"
# camel/providers/smtp/camel-smtp-transport.c:758
# camel/providers/smtp/camel-smtp-transport.c:758
# camel/providers/smtp/camel-smtp-transport.c:883
-#: camel/providers/smtp/camel-smtp-transport.c:979
+#: camel/providers/smtp/camel-smtp-transport.c:1000
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:985
+#: camel/providers/smtp/camel-smtp-transport.c:1006
msgid "Error creating SASL authentication object."
msgstr "创建 SASL 认证对象错误。"
@@ -17166,8 +17199,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:1002
-#: camel/providers/smtp/camel-smtp-transport.c:1014
+#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1035
#, c-format
msgid "AUTH request timed out: %s"
msgstr "AUTH 请求超时: %s"
@@ -17175,21 +17208,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:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1044
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:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1105
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:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1130
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr "MAIL FROM 请求超时: %s: 邮件未发送"
@@ -17197,20 +17230,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:1129
+#: camel/providers/smtp/camel-smtp-transport.c:1150
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:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1174
#, 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:1175
+#: camel/providers/smtp/camel-smtp-transport.c:1196
#, c-format
msgid "RCPT TO <%s> failed"
msgstr "RCPT TO <%s> 失败"
@@ -17218,7 +17251,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:1217
+#: camel/providers/smtp/camel-smtp-transport.c:1238
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr "DATA 请求超时: %s: 邮件未发送"
@@ -17229,7 +17262,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:1237
+#: camel/providers/smtp/camel-smtp-transport.c:1258
msgid "DATA response error"
msgstr "DATA 应答错误"
@@ -17239,8 +17272,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:1277
-#: camel/providers/smtp/camel-smtp-transport.c:1300
+#: camel/providers/smtp/camel-smtp-transport.c:1298
+#: camel/providers/smtp/camel-smtp-transport.c:1321
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr "DATA 发送超时: 消息终止: %s: 邮件未发送"
@@ -17250,14 +17283,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:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1341
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:1343
+#: camel/providers/smtp/camel-smtp-transport.c:1364
#, c-format
msgid "RSET request timed out: %s"
msgstr "RSET 请求超时: %s"
@@ -17265,7 +17298,7 @@ msgstr "RSET 请求超时: %s"
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1213
-#: camel/providers/smtp/camel-smtp-transport.c:1363
+#: camel/providers/smtp/camel-smtp-transport.c:1384
msgid "RSET response error"
msgstr "RSET 应答错误"
@@ -17275,7 +17308,7 @@ msgstr "RSET 应答错误"
# camel/providers/smtp/camel-smtp-transport.c:791
# camel/providers/smtp/camel-smtp-transport.c:904
# camel/providers/smtp/camel-smtp-transport.c:916
-#: camel/providers/smtp/camel-smtp-transport.c:1386
+#: camel/providers/smtp/camel-smtp-transport.c:1407
#, fuzzy, c-format
msgid "QUIT request timed out: %s"
msgstr "AUTH 请求超时: %s"
@@ -17283,7 +17316,7 @@ msgstr "AUTH 请求超时: %s"
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1250
-#: camel/providers/smtp/camel-smtp-transport.c:1406
+#: camel/providers/smtp/camel-smtp-transport.c:1427
msgid "QUIT response error"
msgstr "QUIT 应答错误"
@@ -17410,7 +17443,7 @@ 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:344
+#: composer/e-msg-composer-hdrs.c:347
msgid "Click here for the address book"
msgstr "点击此处以使用地址簿"
@@ -17424,7 +17457,7 @@ msgstr "点击此处以使用地址簿"
#. * because that causes from_changed to be called, which
#. * expects the reply_to fields to be initialized.
#.
-#: composer/e-msg-composer-hdrs.c:378
+#: composer/e-msg-composer-hdrs.c:382
msgid "Reply-To:"
msgstr "回复到:"
@@ -17434,7 +17467,7 @@ msgstr "回复到:"
#.
#. * From
#.
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:393
msgid "From:"
msgstr "发件人:"
@@ -17444,49 +17477,49 @@ msgstr "发件人:"
#.
#. * Subject
#.
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:399
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:409
+#: composer/e-msg-composer-hdrs.c:413
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:410
+#: composer/e-msg-composer-hdrs.c:414
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:413
+#: composer/e-msg-composer-hdrs.c:417
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:414
+#: composer/e-msg-composer-hdrs.c:418
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:417
+#: composer/e-msg-composer-hdrs.c:421
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:418
+#: composer/e-msg-composer-hdrs.c:422
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -17498,11 +17531,19 @@ msgstr "输入将接收该邮件副本,但不出现在收件人列表中的收
#.
#. * Post-To
#.
-#: composer/e-msg-composer-hdrs.c:425
+#: composer/e-msg-composer-hdrs.c:429
#, fuzzy
msgid "Post To:"
msgstr "波尔图"
+# mail/mail-config.glade.h:119
+# mail/mail-config.glade.h:119
+# my-evolution/e-summary-calendar.c:395
+#: composer/e-msg-composer-hdrs.c:431
+#, fuzzy
+msgid "Posting destination"
+msgstr "无描述"
+
# composer/e-msg-composer-select-file.c:228
# ui/evolution-message-composer.xml.h:2
# composer/e-msg-composer-select-file.c:290
@@ -17537,21 +17578,21 @@ msgstr ""
# composer/e-msg-composer.c:952
# composer/e-msg-composer.c:956
# composer/e-msg-composer.c:921
-#: composer/e-msg-composer.c:1157
+#: composer/e-msg-composer.c:1155
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:1161
+#: composer/e-msg-composer.c:1159
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:1183
+#: composer/e-msg-composer.c:1181
#, c-format
msgid "Error saving file: %s"
msgstr "保存文件错误: %s"
@@ -17559,7 +17600,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:1203
+#: composer/e-msg-composer.c:1201
#, c-format
msgid "Error loading file: %s"
msgstr "读入文件错误: %s"
@@ -17567,7 +17608,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:1236
+#: composer/e-msg-composer.c:1234
#, c-format
msgid "Error accessing file: %s"
msgstr "访问文件错误: %s"
@@ -17575,14 +17616,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:1244
+#: composer/e-msg-composer.c:1242
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:1251
+#: composer/e-msg-composer.c:1249
#, c-format
msgid ""
"Unable to seek on file: %s\n"
@@ -17594,7 +17635,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:1258
+#: composer/e-msg-composer.c:1256
#, c-format
msgid ""
"Unable to truncate file: %s\n"
@@ -17606,7 +17647,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:1267
+#: composer/e-msg-composer.c:1265
#, c-format
msgid ""
"Error autosaving message: %s\n"
@@ -17618,7 +17659,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:1367
+#: composer/e-msg-composer.c:1365
msgid ""
"Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"
@@ -17626,70 +17667,43 @@ msgstr ""
"Ximian Evolution 发现上次会话含有未保存的文件。\n"
"您是否希望恢复它们?"
-# composer/e-msg-composer.c:1405
-# composer/e-msg-composer.c:1322
-# composer/e-msg-composer.c:1288
-#: composer/e-msg-composer.c:1516
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"该邮件尚未发送。\n"
-"\n"
-"您是否希望保存修改?"
-
# composer/e-msg-composer.c:1412
# composer/e-msg-composer.c:1329
# composer/e-msg-composer.c:1295
-#: composer/e-msg-composer.c:1523
+#: composer/e-msg-composer.c:1530
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:1553
+#: composer/e-msg-composer.c:1563
msgid "Open file"
msgstr "打开文件"
-#: composer/e-msg-composer.c:1925
-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:1962
+#: composer/e-msg-composer.c:1921
#, fuzzy
msgid "Signature:"
msgstr "签名文件:"
-#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1962 mail/mail-account-gui.c:1230
msgid "Autogenerated"
msgstr ""
-# mail/mail-accounts.c:149
-# mail/mail-accounts.c:149
-# mail/mail-accounts.c:149
-#: composer/e-msg-composer.c:2015
-#, 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:2192 composer/e-msg-composer.c:2797
+#: composer/e-msg-composer.c:2149 composer/e-msg-composer.c:2773
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:2814
+#: composer/e-msg-composer.c:2790
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
@@ -17700,7 +17714,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:2840 composer/e-msg-composer.c:2895
+#: composer/e-msg-composer.c:2816 composer/e-msg-composer.c:2871
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
@@ -17708,7 +17722,7 @@ msgstr ""
"无法创见撰写窗口:\n"
"无法激活 HTML 编辑器组件。"
-#: composer/e-msg-composer.c:3846
+#: composer/e-msg-composer.c:3838
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -17822,7 +17836,7 @@ msgstr "主题不含有"
# mail/mail-display.c:106
# calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2070
# mail/mail-display.c:105
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2509
#: mail/mail-display.c:190
msgid ""
"A file by that name already exists.\n"
@@ -17864,7 +17878,7 @@ msgstr "同步类别:"
# e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
+#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%Y/%m/%d %a %I:%M %p"
@@ -17873,7 +17887,7 @@ msgstr "%Y/%m/%d %a %I:%M %p"
# e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
+#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
msgid "%a %m/%d/%Y %H:%M"
msgstr "%Y/%m/%d %a %H:%M"
@@ -17882,7 +17896,7 @@ msgstr "%Y/%m/%d %a %H:%M"
# e-util/e-time-utils.c:178
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:178
+#: e-util/e-time-utils.c:182
msgid "%a %m/%d/%Y %I %p"
msgstr "%Y/%m/%d %a %I %p"
@@ -17891,7 +17905,7 @@ msgstr "%Y/%m/%d %a %I %p"
# e-util/e-time-utils.c:183
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:183
+#: e-util/e-time-utils.c:187
msgid "%a %m/%d/%Y %H"
msgstr "%Y/%m/%d %a %H"
@@ -17899,7 +17913,7 @@ msgstr "%Y/%m/%d %a %H"
# e-util/e-time-utils.c:194
# e-util/e-time-utils.c:194
#. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:194
+#: e-util/e-time-utils.c:198
msgid "%m/%d/%Y %I:%M:%S %p"
msgstr "%Y/%m/%d %I:%M:%S %p"
@@ -17907,7 +17921,7 @@ msgstr "%Y/%m/%d %I:%M:%S %p"
# e-util/e-time-utils.c:198
# e-util/e-time-utils.c:198
#. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:202
msgid "%m/%d/%Y %H:%M:%S"
msgstr "%Y/%m/%d %H:%M:%S"
@@ -17916,7 +17930,7 @@ msgstr "%Y/%m/%d %H:%M:%S"
# e-util/e-time-utils.c:203
#. strptime format of a date and a time, in 12-hour format,
#. without seconds.
-#: e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:207
msgid "%m/%d/%Y %I:%M %p"
msgstr "%Y/%m/%d %H:%M %p"
@@ -17925,7 +17939,7 @@ msgstr "%Y/%m/%d %H:%M %p"
# e-util/e-time-utils.c:208
#. strptime format of a date and a time, in 24-hour format,
#. without seconds.
-#: e-util/e-time-utils.c:208
+#: e-util/e-time-utils.c:212
msgid "%m/%d/%Y %H:%M"
msgstr "%Y/%m/%d %H:%M"
@@ -17934,7 +17948,7 @@ msgstr "%Y/%m/%d %H:%M"
# e-util/e-time-utils.c:213
#. strptime format of a date and a time, in 12-hour format,
#. without minutes or seconds.
-#: e-util/e-time-utils.c:213
+#: e-util/e-time-utils.c:217
msgid "%m/%d/%Y %I %p"
msgstr "%Y/%m/%d %I %p"
@@ -17943,7 +17957,7 @@ msgstr "%Y/%m/%d %I %p"
# e-util/e-time-utils.c:218
#. strptime format of a date and a time, in 24-hour format,
#. without minutes or seconds.
-#: e-util/e-time-utils.c:218
+#: e-util/e-time-utils.c:222
msgid "%m/%d/%Y %H"
msgstr "%Y/%m/%d %H"
@@ -17951,7 +17965,7 @@ msgstr "%Y/%m/%d %H"
# e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
# e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
#. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
+#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
msgid "%I:%M:%S %p"
msgstr "%I:%M:%S %p"
@@ -17959,7 +17973,7 @@ msgstr "%I:%M:%S %p"
# e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
# e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
+#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
@@ -17971,8 +17985,8 @@ msgstr "%H:%M:%S"
# widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1647
#. strptime format for time of day, without seconds,
#. in 12-hour format.
-#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
-#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1647
+#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
+#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1632
msgid "%I:%M %p"
msgstr "%I:%M %p"
@@ -17983,8 +17997,8 @@ msgstr "%I:%M %p"
# e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
# widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1644
#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1644
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1629
msgid "%H:%M"
msgstr "%H:%M"
@@ -17992,12 +18006,12 @@ msgstr "%H:%M"
# e-util/e-time-utils.c:320
# e-util/e-time-utils.c:320
#. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:320
+#: e-util/e-time-utils.c:343
msgid "%I %p"
msgstr "%I %p"
#: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:186
msgid "seconds"
msgstr "秒"
@@ -18129,22 +18143,22 @@ msgstr ""
"常规表达式错误 “%s”:\n"
"%s"
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:76
+#: mail/mail-config.glade.h:63
msgid "Important"
msgstr "重要"
# my-evolution/Locations.h:508
#. red
-#: filter/filter-label.c:137 mail/mail-config.c:76
-#: mail/mail-config.glade.h:135
+#: filter/filter-label.c:137 mail/mail-config.c:77
+#: mail/mail-config.glade.h:136
#, fuzzy
msgid "Work"
msgstr "科克"
# my-evolution/Locations.h:1795
#. orange
-#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
#, fuzzy
msgid "Personal"
msgstr "波纳尔"
@@ -18153,8 +18167,8 @@ msgstr "波纳尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:209
# addressbook/gui/contact-editor/e-contact-editor-address.c:335
#. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:78
-#: mail/mail-config.glade.h:126
+#: filter/filter-label.c:139 mail/mail-config.c:79
+#: mail/mail-config.glade.h:127
#, fuzzy
msgid "To Do"
msgstr "多哥"
@@ -18163,7 +18177,7 @@ msgstr "多哥"
# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
# calendar/gui/dialogs/alarm-page.glade.h:11
#. blue
-#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
#, fuzzy
msgid "Later"
msgstr "之后"
@@ -18443,7 +18457,7 @@ msgstr "已标志"
# ui/evolution-mail-message.xml.h:98
# ui/evolution-mail-message.xml.h:98
# my-evolution/Locations.h:1192
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
#, fuzzy
msgid "Label"
msgstr "劳雷尔"
@@ -18521,7 +18535,7 @@ msgstr "小于"
msgid "Score"
msgstr "分数"
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
msgid "Sender"
msgstr "发件人"
@@ -18561,7 +18575,7 @@ msgstr "停止处理"
# mail/message-list.etspec.h:9
# mail/message-list.etspec.h:10
# mail/message-list.etspec.h:10
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
#: mail/message-list.etspec.h:13
msgid "Subject"
msgstr "主题"
@@ -18661,7 +18675,7 @@ msgstr "正在扫描 %s"
# importers/pine-importer.c:637 mail/component-factory.c:100
#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
#: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:327
+#: mail/folder-browser-ui.c:339
msgid "Mail"
msgstr "邮件"
@@ -18745,7 +18759,7 @@ msgstr "Evolution 正在导入您原来的 Netscape 数据"
# mail/mail-ops.c:1060 shell/e-local-storage.c:178
# mail/mail-ops.c:1103 shell/e-local-storage.c:178
#. Fill in the new fields
-#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1101
#: shell/e-local-storage.c:183
msgid "Trash"
msgstr "已删除"
@@ -18856,59 +18870,84 @@ msgstr "Evolution 撰写器车间。"
msgid "Configuration control for the Evolution Message Composer."
msgstr "Evolution 撰写器车间。"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Configure spell-checking, signatures, and the message composer here"
+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:8
+#, fuzzy
+msgid "Configure the fonts used by Evolution here"
+msgstr "Evolution 撰写器车间。"
+
+# ui/evolution-mail-global.xml.h:4
+# ui/evolution-mail-global.xml.h:4
+# ui/evolution-mail-global.xml.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "创建或编辑邮件帐号和其它属性"
+
# 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:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
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:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
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:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
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:9
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
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:10
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
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:11
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15
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:12
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
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
+#: mail/GNOME_Evolution_Mail.oaf.in.h:17
#, fuzzy
msgid "Font Preferences"
msgstr "没有循环(_N)"
@@ -18916,38 +18955,22 @@ 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/GNOME_Evolution_Mail.oaf.in.h:18
#, fuzzy
msgid "Mail Accounts"
msgstr "帐号"
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 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:16
+#: mail/GNOME_Evolution_Mail.oaf.in.h:20
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
@@ -18993,7 +19016,7 @@ msgstr "改变该文件夹的属性"
# mail/component-factory.c:783
# mail/component-factory.c:783
# mail/component-factory.c:786
-#: mail/component-factory.c:763
+#: mail/component-factory.c:785
msgid ""
"Some of your mail settings seem corrupt, please check that everything is in "
"order."
@@ -19002,18 +19025,18 @@ msgstr "您的某些邮件设置好像已崩溃,请按顺序检查所有内容
# mail/mail-callbacks.c:230
# mail/mail-callbacks.c:230
# mail/mail-callbacks.c:187
-#: mail/component-factory.c:928
+#: mail/component-factory.c:950
msgid "You have not set a mail transport method"
msgstr "您还没有设置邮件传输方法"
-#: mail/component-factory.c:950
+#: mail/component-factory.c:972
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:956
+#: mail/component-factory.c:978
#, fuzzy
msgid "Warning: Unsent Messages"
msgstr "警告: 已改动的邮件"
@@ -19021,21 +19044,21 @@ msgstr "警告: 已改动的邮件"
# mail/component-factory.c:951
# mail/component-factory.c:951
# mail/component-factory.c:955
-#: mail/component-factory.c:997
+#: mail/component-factory.c:1020
msgid "New Mail Message"
msgstr "新建邮件"
# ui/evolution-mail-global.xml.h:20
# ui/evolution-mail-global.xml.h:20
# ui/evolution-mail-global.xml.h:20
-#: mail/component-factory.c:997
+#: mail/component-factory.c:1020
msgid "_Mail Message"
msgstr "邮件(_M)"
# composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
# composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
# composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2334
-#: mail/component-factory.c:998
+#: mail/component-factory.c:1021
#, fuzzy
msgid "Compose a new mail message"
msgstr "撰写邮件"
@@ -19043,7 +19066,7 @@ msgstr "撰写邮件"
# ui/evolution-mail-global.xml.h:10
# ui/evolution-mail-global.xml.h:10
# ui/evolution-mail-global.xml.h:10
-#: mail/component-factory.c:1006
+#: mail/component-factory.c:1029
#, fuzzy
msgid "New Message Post"
msgstr "新建邮件"
@@ -19051,7 +19074,7 @@ msgstr "新建邮件"
# ui/evolution-mail-message.xml.h:65
# ui/evolution-mail-message.xml.h:65
# ui/evolution-mail-message.xml.h:65
-#: mail/component-factory.c:1006
+#: mail/component-factory.c:1029
#, fuzzy
msgid "_Post Message"
msgstr "上一个邮件"
@@ -19059,7 +19082,7 @@ msgstr "上一个邮件"
# mail/component-factory.c:951
# mail/component-factory.c:951
# mail/component-factory.c:955
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1030
#, fuzzy
msgid "Post a new mail message"
msgstr "新建邮件"
@@ -19067,28 +19090,28 @@ msgstr "新建邮件"
# mail/component-factory.c:975
# mail/component-factory.c:975
# mail/component-factory.c:980
-#: mail/component-factory.c:1035
+#: mail/component-factory.c:1058
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:1044
+#: mail/component-factory.c:1067
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:1050
+#: mail/component-factory.c:1073
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:1275 mail/component-factory.c:1305
+#: mail/component-factory.c:1286 mail/component-factory.c:1316
#, fuzzy
msgid "Connecting..."
msgstr "正在连接服务器..."
@@ -19096,14 +19119,14 @@ msgstr "正在连接服务器..."
# mail/component-factory.c:1206
# mail/component-factory.c:1206
# mail/component-factory.c:1211
-#: mail/component-factory.c:1316
+#: mail/component-factory.c:1327
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:440
+#: mail/folder-browser-ui.c:457
#, c-format
msgid "Properties for \"%s\""
msgstr "“%s”的属性"
@@ -19111,14 +19134,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:442
+#: mail/folder-browser-ui.c:459
msgid "Properties"
msgstr "属性"
# mail/folder-browser.c:297 mail/mail-display.c:298
# mail/folder-browser.c:297 mail/mail-display.c:297
# mail/folder-browser.c:298 mail/mail-display.c:298
-#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
+#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:880
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "无法创建临时目录: %s"
@@ -19126,7 +19149,7 @@ msgstr "无法创建临时目录: %s"
# mail/folder-browser.c:731
# mail/folder-browser.c:751
# mail/folder-browser.c:752
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:764
#, c-format
msgid "%d new"
msgstr "%d 新"
@@ -19137,21 +19160,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:766 mail/folder-browser.c:774
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:767 mail/folder-browser.c:775
+#: mail/folder-browser.c:778
msgid ", "
msgstr ", "
# mail/folder-browser.c:735
# mail/folder-browser.c:756
# mail/folder-browser.c:757
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:769
#, c-format
msgid "%d hidden"
msgstr "隐藏 %d 个"
# mail/folder-browser.c:759
-#: mail/folder-browser.c:770
+#: mail/folder-browser.c:771
#, c-format
msgid "%d visible"
msgstr "%d 个可见"
@@ -19159,7 +19182,7 @@ msgstr "%d 个可见"
# mail/folder-browser.c:740
# mail/folder-browser.c:763
# mail/folder-browser.c:764
-#: mail/folder-browser.c:775
+#: mail/folder-browser.c:776
#, c-format
msgid "%d selected"
msgstr "选择 %d 个"
@@ -19167,7 +19190,7 @@ msgstr "选择 %d 个"
# mail/folder-browser.c:763
# mail/folder-browser.c:768
# mail/folder-browser.c:769
-#: mail/folder-browser.c:780
+#: mail/folder-browser.c:781
#, c-format
msgid "%d unsent"
msgstr "%d 个未发送"
@@ -19175,7 +19198,7 @@ msgstr "%d 个未发送"
# mail/folder-browser.c:765
# mail/folder-browser.c:770
# mail/folder-browser.c:771
-#: mail/folder-browser.c:782
+#: mail/folder-browser.c:783
#, c-format
msgid "%d sent"
msgstr "%d 个已发送"
@@ -19183,7 +19206,7 @@ msgstr "%d 个已发送"
# mail/folder-browser.c:767
# mail/folder-browser.c:772
# mail/folder-browser.c:773
-#: mail/folder-browser.c:784
+#: mail/folder-browser.c:785
#, c-format
msgid "%d total"
msgstr "共 %d 个"
@@ -19191,7 +19214,7 @@ msgstr "共 %d 个"
# 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
+#: mail/folder-browser.c:1107
#, fuzzy
msgid "Create _Virtual Folder From Search..."
msgstr "从邮件创建虚拟文件夹(_V)"
@@ -19199,102 +19222,102 @@ msgstr "从邮件创建虚拟文件夹(_V)"
# mail/folder-browser.c:1430
# mail/folder-browser.c:1437
# mail/folder-browser.c:1438
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1690
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:1652
+#: mail/folder-browser.c:1691
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:1653
+#: mail/folder-browser.c:1692
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:1654
+#: mail/folder-browser.c:1693
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:1658
+#: mail/folder-browser.c:1697
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:1659
+#: mail/folder-browser.c:1698
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:1660
+#: mail/folder-browser.c:1699
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:1661 mail/folder-browser.c:1984
+#: mail/folder-browser.c:1700 mail/folder-browser.c:2023
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:1679
+#: mail/folder-browser.c:1718
msgid "_Edit as New Message..."
msgstr "作为新邮件进行编辑(_E)..."
# mail/folder-browser.c:1450
# mail/folder-browser.c:1457
# mail/folder-browser.c:1458
-#: mail/folder-browser.c:1681
+#: mail/folder-browser.c:1720
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:1685 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1724 ui/evolution-mail-message.xml.h:110
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
# mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:73
# mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:73
# mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:75
-#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1725 ui/evolution-mail-message.xml.h:75
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
# mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:72
# mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:72
# mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:74
-#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1726 ui/evolution-mail-message.xml.h:74
msgid "Reply to _All"
msgstr "回复所有人(_A)"
# mail/folder-browser.c:1457
# mail/folder-browser.c:1464
# mail/folder-browser.c:1465
-#: mail/folder-browser.c:1688
+#: mail/folder-browser.c:1727
msgid "_Forward"
msgstr "转发(_F)"
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1731
msgid "Follo_w Up..."
msgstr ""
@@ -19310,7 +19333,7 @@ msgstr ""
# calendar/gui/dialogs/task-details-page.glade.h:4
# calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1732
#, fuzzy
msgid "Fla_g Completed"
msgstr "已完成"
@@ -19319,7 +19342,7 @@ msgstr "已完成"
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
# widgets/misc/e-filter-bar.h:95
# widgets/misc/e-filter-bar.h:95
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1733
#, fuzzy
msgid "Cl_ear Flag"
msgstr "清除"
@@ -19328,14 +19351,14 @@ msgstr "清除"
# mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:43
# mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:43
#. separator here?
-#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1737 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:1699
+#: mail/folder-browser.c:1738
#, fuzzy
msgid "Mark as _Unread"
msgstr "标记为未读(_N)"
@@ -19343,14 +19366,14 @@ msgstr "标记为未读(_N)"
# mail/folder-browser.c:1461
# mail/folder-browser.c:1468
# mail/folder-browser.c:1469
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1739
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
# ui/evolution-mail-message.xml.h:46
# ui/evolution-mail-message.xml.h:46
# ui/evolution-mail-message.xml.h:46
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1740
#, fuzzy
msgid "_Mark as Unimportant"
msgstr "标记为不重要(_O)"
@@ -19358,7 +19381,7 @@ msgstr "标记为不重要(_O)"
# mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
# mail/folder-browser.c:1478 ui/evolution-mail-message.xml.h:107
# mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:109
-#: mail/folder-browser.c:1706
+#: mail/folder-browser.c:1745
#, fuzzy
msgid "U_ndelete"
msgstr "反删除(_U)"
@@ -19366,7 +19389,7 @@ msgstr "反删除(_U)"
# mail/folder-browser.c:1466
# mail/folder-browser.c:1475
# mail/folder-browser.c:1476
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1749
#, fuzzy
msgid "Mo_ve to Folder..."
msgstr "移动到文件夹(_M)..."
@@ -19374,14 +19397,14 @@ msgstr "移动到文件夹(_M)..."
# mail/folder-browser.c:1467
# mail/folder-browser.c:1476
# mail/folder-browser.c:1477
-#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1750 ui/evolution-addressbook.xml.h:31
msgid "_Copy to Folder..."
msgstr "复制到文件夹..."
# mail/folder-browser.c:1473 ui/evolution-mail-message.xml.h:1
# mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:1
# mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
-#: mail/folder-browser.c:1719
+#: mail/folder-browser.c:1758
#, fuzzy
msgid "Add Sender to Address_book"
msgstr "将发件人添加到地址簿"
@@ -19389,7 +19412,7 @@ msgstr "将发件人添加到地址簿"
# mail/folder-browser.c:1476
# mail/folder-browser.c:1485
# mail/folder-browser.c:1486
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1762
#, fuzzy
msgid "Appl_y Filters"
msgstr "应用过滤规则"
@@ -19397,7 +19420,7 @@ msgstr "应用过滤规则"
# mail/folder-browser.c:1478
# mail/folder-browser.c:1487
# mail/folder-browser.c:1488
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1766
#, fuzzy
msgid "Crea_te Rule From Message"
msgstr "从消息创建规则(_L)"
@@ -19405,7 +19428,7 @@ msgstr "从消息创建规则(_L)"
# mail/folder-browser.c:1629
# mail/folder-browser.c:1657
# mail/folder-browser.c:1658
-#: mail/folder-browser.c:1985
+#: mail/folder-browser.c:2024
#, fuzzy
msgid "VFolder on M_ailing List"
msgstr "关于邮件列表的虚拟文件夹"
@@ -19413,7 +19436,7 @@ msgstr "关于邮件列表的虚拟文件夹"
# mail/folder-browser.c:1631
# mail/folder-browser.c:1659
# mail/folder-browser.c:1660
-#: mail/folder-browser.c:1987
+#: mail/folder-browser.c:2026
#, fuzzy, c-format
msgid "Filter on _Mailing List (%s)"
msgstr "过滤邮件列表 (%s)"
@@ -19421,7 +19444,7 @@ msgstr "过滤邮件列表 (%s)"
# mail/folder-browser.c:1632
# mail/folder-browser.c:1660
# mail/folder-browser.c:1661
-#: mail/folder-browser.c:1988
+#: mail/folder-browser.c:2027
#, fuzzy, c-format
msgid "VFolder on M_ailing List (%s)"
msgstr "关于邮件列表 (%s) 的虚拟文件夹"
@@ -19542,14 +19565,14 @@ msgstr "Evolution 帐号编辑器"
# mail/mail-config.glade.h:104
# mail/mail-config.glade.h:104
# mail/mail-config.glade.h:113
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
msgid "_Host:"
msgstr "主机(_H):"
# mail/mail-config.glade.h:117
# mail/mail-config.glade.h:117
# mail/mail-config.glade.h:126
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
#, fuzzy
msgid "User_name:"
msgstr "用户名(_U):"
@@ -19557,14 +19580,14 @@ msgstr "用户名(_U):"
# mail/mail-config.glade.h:112
# mail/mail-config.glade.h:112
# mail/mail-config.glade.h:121
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
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:1843
+#: mail/mail-account-gui.c:1846
msgid "You may not create two accounts with the same name."
msgstr "您不能以相同的名字创建两个帐号。"
@@ -19611,7 +19634,7 @@ msgstr "启用"
# mail/mail-config.glade.h:33
# mail/mail-config.glade.h:39
#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
msgid "Enabled"
msgstr "已启用"
@@ -19686,7 +19709,7 @@ msgstr ""
# mail/mail-callbacks.c:137
# mail/mail-callbacks.c:137
# mail/mail-callbacks.c:94
-#: mail/mail-callbacks.c:101
+#: mail/mail-callbacks.c:154
msgid ""
"You have not configured the mail client.\n"
"You need to do this before you can send,\n"
@@ -19701,7 +19724,7 @@ msgstr ""
# mail/mail-callbacks.c:186
# mail/mail-callbacks.c:186
# mail/mail-callbacks.c:143
-#: mail/mail-callbacks.c:150
+#: mail/mail-callbacks.c:203
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
@@ -19712,7 +19735,7 @@ msgstr ""
# mail/mail-callbacks.c:200
# mail/mail-callbacks.c:200
# mail/mail-callbacks.c:157
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:217
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
@@ -19724,7 +19747,7 @@ msgstr ""
# mail/mail-callbacks.c:265
# mail/mail-callbacks.c:222
#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:255
msgid ""
"You are sending an HTML-formatted message, but the following recipients do "
"not want HTML-formatted mail:\n"
@@ -19733,14 +19756,14 @@ msgstr "您正在发送 HTML 格式的消息,当以下收件人不希望接收
# mail/mail-callbacks.c:280
# mail/mail-callbacks.c:280
# mail/mail-callbacks.c:237
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:270
msgid "Send anyway?"
msgstr "仍然发送?"
# mail/mail-callbacks.c:322
# mail/mail-callbacks.c:322
# mail/mail-callbacks.c:279
-#: mail/mail-callbacks.c:259
+#: mail/mail-callbacks.c:312
msgid ""
"This message has no subject.\n"
"Really send?"
@@ -19751,7 +19774,7 @@ msgstr ""
# mail/mail-callbacks.c:366
# mail/mail-callbacks.c:366
# mail/mail-callbacks.c:323
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:356
msgid ""
"Since the contact list you are sending to is configured to hide the list's "
"addresses, this message will contain only Bcc recipients."
@@ -19762,14 +19785,14 @@ msgstr ""
# mail/mail-callbacks.c:370
# mail/mail-callbacks.c:370
# mail/mail-callbacks.c:327
-#: mail/mail-callbacks.c:307
+#: mail/mail-callbacks.c:360
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:311
+#: mail/mail-callbacks.c:364
msgid ""
"It is possible that the mail server may reveal the recipients by adding an "
"Apparently-To header.\n"
@@ -19781,14 +19804,14 @@ msgstr ""
# mail/mail-callbacks.c:504
# mail/mail-callbacks.c:504
# mail/mail-callbacks.c:460
-#: mail/mail-callbacks.c:475
+#: mail/mail-callbacks.c:513
msgid "You must specify recipients in order to send this message."
msgstr "您必须指定收件人以便发送该消息。"
# composer/e-msg-composer.c:1068
# mail/mail-callbacks.c:716
# mail/mail-callbacks.c:668
-#: mail/mail-callbacks.c:739
+#: mail/mail-callbacks.c:776
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
@@ -19799,35 +19822,35 @@ msgstr ""
# mail/mail-callbacks.c:838
# mail/mail-callbacks.c:928
# mail/mail-callbacks.c:878
-#: mail/mail-callbacks.c:1154
+#: mail/mail-callbacks.c:1181
msgid "an unknown sender"
msgstr "未知的发件人"
# mail/mail-callbacks.c:843
# mail/mail-callbacks.c:933
# mail/mail-callbacks.c:883
-#: mail/mail-callbacks.c:1158
+#: mail/mail-callbacks.c:1185
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:1680 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1686 mail/message-browser.c:132
msgid "Move message(s) to"
msgstr "将消息移动到"
# mail/mail-callbacks.c:1283 mail/message-browser.c:132
# mail/mail-callbacks.c:1378 mail/message-browser.c:132
# mail/mail-callbacks.c:1413 mail/message-browser.c:132
-#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
msgid "Copy message(s) to"
msgstr "将消息复制到"
# mail/mail-callbacks.c:1759
# mail/mail-callbacks.c:1878
# mail/mail-callbacks.c:1914
-#: mail/mail-callbacks.c:2352
+#: mail/mail-callbacks.c:2353
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr "您确信您需要编辑所有的 %d 个消息?"
@@ -19835,7 +19858,7 @@ msgstr "您确信您需要编辑所有的 %d 个消息?"
# mail/mail-callbacks.c:1784
# mail/mail-callbacks.c:1903
# mail/mail-callbacks.c:1939
-#: mail/mail-callbacks.c:2377
+#: mail/mail-callbacks.c:2378
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -19846,7 +19869,7 @@ msgstr ""
# mail/mail-callbacks.c:1823
# mail/mail-callbacks.c:1942
# mail/mail-callbacks.c:1978
-#: mail/mail-callbacks.c:2416
+#: mail/mail-callbacks.c:2417
msgid ""
"You may only resend messages\n"
"in the Sent folder."
@@ -19857,7 +19880,7 @@ msgstr ""
# mail/mail-callbacks.c:1837
# mail/mail-callbacks.c:1956
# mail/mail-callbacks.c:1992
-#: mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2431
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr "您确信您希望重新发送所有的 %d 个消息?"
@@ -19865,7 +19888,7 @@ msgstr "您确信您希望重新发送所有的 %d 个消息?"
# mail/mail-callbacks.c:1863
# mail/mail-callbacks.c:1982
# mail/mail-callbacks.c:2018
-#: mail/mail-callbacks.c:2456
+#: mail/mail-callbacks.c:2457
msgid "No Message Selected"
msgstr "没有选择消息"
@@ -19875,33 +19898,33 @@ msgstr "没有选择消息"
# mail/mail-display.c:102
# calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
# mail/mail-display.c:101
-#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
msgid "Overwrite file?"
msgstr "覆盖文件?"
# mail/mail-callbacks.c:1962
# mail/mail-callbacks.c:2081
# mail/mail-callbacks.c:2117
-#: mail/mail-callbacks.c:2555
+#: mail/mail-callbacks.c:2556
msgid "Save Message As..."
msgstr "消息另存为..."
# mail/mail-callbacks.c:1964
# mail/mail-callbacks.c:2083
# mail/mail-callbacks.c:2119
-#: mail/mail-callbacks.c:2557
+#: mail/mail-callbacks.c:2558
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:2626
+#: mail/mail-callbacks.c:2627
#, fuzzy
msgid "Go to next folder with unread messages?"
msgstr "显示下一个未读文件"
-#: mail/mail-callbacks.c:2633
+#: mail/mail-callbacks.c:2634
msgid ""
"There are no more new messages in this folder.\n"
"Would you like to go to the next folder?"
@@ -19910,7 +19933,7 @@ msgstr ""
# mail/mail-callbacks.c:2135
# mail/mail-callbacks.c:2254
# mail/mail-callbacks.c:2290
-#: mail/mail-callbacks.c:2876
+#: mail/mail-callbacks.c:2877
msgid ""
"This operation will permanently erase all messages marked as deleted. If you "
"continue, you will not be able to recover these messages.\n"
@@ -19925,7 +19948,7 @@ msgstr ""
# mail/mail-callbacks.c:2250
# mail/mail-callbacks.c:2369
# mail/mail-callbacks.c:2405
-#: mail/mail-callbacks.c:2989
+#: mail/mail-callbacks.c:2990
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -19937,14 +19960,14 @@ msgstr ""
# mail/mail-callbacks.c:2262
# mail/mail-callbacks.c:2381
# mail/mail-callbacks.c:2417
-#: mail/mail-callbacks.c:3001
+#: mail/mail-callbacks.c:3002
msgid "Filters"
msgstr "过滤规则"
# camel/camel-filter-driver.c:789
# camel/camel-filter-driver.c:838
# mail/mail-callbacks.c:2490
-#: mail/mail-callbacks.c:3045
+#: mail/mail-callbacks.c:3046
#, c-format
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
@@ -19952,27 +19975,27 @@ msgstr "第 %d 页,共 %d 页"
# mail/mail-callbacks.c:2325
# mail/mail-callbacks.c:2465
# mail/mail-callbacks.c:2542
-#: mail/mail-callbacks.c:3098
+#: mail/mail-callbacks.c:3101
msgid "Print Message"
msgstr "打印消息"
# mail/mail-callbacks.c:2492
# mail/mail-callbacks.c:2569
-#: mail/mail-callbacks.c:3125
+#: mail/mail-callbacks.c:3128
msgid "US-Letter"
msgstr "美国信纸"
# mail/mail-callbacks.c:2371
# mail/mail-callbacks.c:2531
# mail/mail-callbacks.c:2604
-#: mail/mail-callbacks.c:3164
+#: mail/mail-callbacks.c:3169
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:3335
+#: mail/mail-callbacks.c:3338
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr "您确信您希望在单独的窗口中打开所有的 %d 个消息?"
@@ -19999,7 +20022,7 @@ msgstr ""
# addressbook/gui/component/select-names/e-select-names-popup.c:506
# addressbook/gui/component/select-names/e-select-names-popup.c:506
# addressbook/gui/component/select-names/e-select-names-popup.c:506
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
#, fuzzy
msgid "Unnamed"
msgstr "未命名的联系人"
@@ -20090,14 +20113,14 @@ msgstr ""
# mail/mail-config-druid.c:599
# mail/mail-config-druid.c:599
#. set window title
-#: mail/mail-config-druid.c:632
+#: mail/mail-config-druid.c:633
msgid "Evolution Account Assistant"
msgstr "Evolution 帐号助手"
# mail/mail-config.c:326
# mail/mail-config.c:329
# mail/mail-config.c:354
-#: mail/mail-config.c:632
+#: mail/mail-config.c:635
#, c-format
msgid "Account %d"
msgstr "帐号 %d"
@@ -20105,14 +20128,14 @@ msgstr "帐号 %d"
# mail/mail-config.c:2113
# mail/mail-config.c:2155
# mail/mail-config.c:2248
-#: mail/mail-config.c:2629
+#: mail/mail-config.c:2653
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:2707 mail/mail-config.c:2711
+#: mail/mail-config.c:2731 mail/mail-config.c:2735
msgid "Connecting to server..."
msgstr "正在连接服务器..."
@@ -20373,17 +20396,21 @@ msgstr "数字标识..."
msgid "Do not quote original message"
msgstr "无法打开消息"
+#: mail/mail-config.glade.h:46
+msgid "Don't sign _meeting requests (for Outlook compatibility)"
+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:46 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
msgid "Done"
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
+#: mail/mail-config.glade.h:48
#, fuzzy
msgid "Drafts _folder:"
msgstr "草稿文件夹(_D):"
@@ -20391,14 +20418,14 @@ 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:48
+#: mail/mail-config.glade.h:49
msgid "E_nable"
msgstr "启用(_N)"
# my-evolution/metar.c:65
# my-evolution/metar.c:65
# my-evolution/metar.c:65
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
#, fuzzy
msgid "Emacs"
msgstr "东"
@@ -20406,7 +20433,7 @@ 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
+#: mail/mail-config.glade.h:51
#, fuzzy
msgid "Email Accounts"
msgstr "电子邮件含有"
@@ -20414,7 +20441,7 @@ 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
+#: mail/mail-config.glade.h:52
#, fuzzy
msgid "Email _address:"
msgstr "电子邮件地址(_E):"
@@ -20422,17 +20449,17 @@ 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
+#: mail/mail-config.glade.h:53
#, fuzzy
msgid "Empty _trash folders on exit"
msgstr "退出时清空已删除邮件(_E)"
# mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
msgid "Execute Command..."
msgstr "执行命令..."
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
#, fuzzy
msgid "Fi_xed -width:"
msgstr "以之结束"
@@ -20440,7 +20467,7 @@ 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
+#: mail/mail-config.glade.h:57
#, fuzzy
msgid "Font Properties"
msgstr "属性"
@@ -20448,7 +20475,7 @@ msgstr "属性"
# mail/mail-ops.c:1191
# mail/mail-ops.c:1193
# mail/mail-ops.c:1236
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
#, fuzzy
msgid "Format messages in _HTML"
msgstr "已转发邮件"
@@ -20456,14 +20483,14 @@ msgstr "已转发邮件"
# mail/mail-config.glade.h:34
# mail/mail-config.glade.h:34
# mail/mail-config.glade.h:41
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
msgid "Get Digital ID..."
msgstr "获取数字标识..."
# mail/mail-config.glade.h:103
# mail/mail-config.glade.h:103
# mail/mail-config.glade.h:112
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
#, fuzzy
msgid "Highlight _quotations with"
msgstr "突出显示引文,使用(_H)"
@@ -20471,28 +20498,28 @@ 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:60
+#: mail/mail-config.glade.h:61
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:61 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
msgid "Identity"
msgstr "标识"
# mail/mail-config.glade.h:39
# mail/mail-config.glade.h:39
# mail/mail-config.glade.h:46
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
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:64
+#: mail/mail-config.glade.h:65
msgid "Kerberos "
msgstr "Kerberos"
@@ -20505,7 +20532,7 @@ 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
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
#, fuzzy
msgid "Labels and Colors"
msgstr "保存并关闭"
@@ -20513,7 +20540,7 @@ 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
+#: mail/mail-config.glade.h:68
#, fuzzy
msgid "Loading Images"
msgstr "装入图像(_I)"
@@ -20521,21 +20548,21 @@ msgstr "装入图像(_I)"
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:48
-#: mail/mail-config.glade.h:68
+#: 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:70
+#: mail/mail-config.glade.h:71
msgid "Mailbox location"
msgstr "邮件箱位置"
# views/mail/galview.xml.h:4
# views/mail/galview.xml.h:4
# views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
#, fuzzy
msgid "Message Composer"
msgstr "邮件"
@@ -20543,7 +20570,7 @@ msgstr "邮件"
# ui/evolution-mail-message.xml.h:99
# ui/evolution-mail-message.xml.h:99
# ui/evolution-mail-message.xml.h:101
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
#, fuzzy
msgid "Message Display"
msgstr "邮件显示(_M)"
@@ -20551,7 +20578,7 @@ 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:73
+#: mail/mail-config.glade.h:74
#, fuzzy
msgid "Microsoft"
msgstr "密克罗尼西亚"
@@ -20559,25 +20586,25 @@ msgstr "密克罗尼西亚"
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:53
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
msgid "New Mail Notification"
msgstr "新邮件提醒"
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
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:79
+#: mail/mail-config.glade.h:80
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:81
+#: mail/mail-config.glade.h:82
#, fuzzy
msgid "Or_ganization:"
msgstr "组织(_Z):"
@@ -20585,21 +20612,21 @@ msgstr "组织(_Z):"
# mail/mail-config.glade.h:50
# mail/mail-config.glade.h:50
# mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG 键标识(_K):"
# mail/mail-config.glade.h:53
# mail/mail-config.glade.h:53
# mail/mail-config.glade.h:61
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
msgid "Pick a color"
msgstr "选取一个颜色"
# mail/mail-config.glade.h:57
# mail/mail-config.glade.h:57
# mail/mail-config.glade.h:66
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
#, fuzzy
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr "在发送只给出了暗送收件人时进行提示(_B)"
@@ -20607,14 +20634,14 @@ msgstr "在发送只给出了暗送收件人时进行提示(_B)"
# mail/mail-config.glade.h:54
# mail/mail-config.glade.h:54
# mail/mail-config.glade.h:63
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
msgid "Pretty Good Privacy (PGP/GPG)"
msgstr "Pretty Good Privacy (PGP/GPG)"
# ui/evolution-addressbook.xml.h:18
# ui/evolution-addressbook.xml.h:18
# ui/evolution-addressbook.xml.h:18
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
#, fuzzy
msgid "Printed Fonts"
msgstr "打印选中的联系人"
@@ -20622,14 +20649,14 @@ msgstr "打印选中的联系人"
# mail/mail-config.glade.h:58
# mail/mail-config.glade.h:58
# mail/mail-config.glade.h:67
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
msgid "Qmail maildir "
msgstr "Qmail 邮件目录"
# camel/camel-filter-driver.c:692
# camel/camel-filter-driver.c:741
# camel/camel-filter-driver.c:893
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
#, fuzzy
msgid "Quote original message"
msgstr "无法打开消息"
@@ -20637,21 +20664,21 @@ msgstr "无法打开消息"
# mail/mail-config.glade.h:59
# mail/mail-config.glade.h:59
# mail/mail-config.glade.h:68
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
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:93
+#: mail/mail-config.glade.h:94
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:94
+#: mail/mail-config.glade.h:95
#, fuzzy
msgid "Re_ply-To:"
msgstr "回复到:"
@@ -20659,14 +20686,14 @@ msgstr "回复到:"
# mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
# mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:6
-#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
msgid "Receiving Email"
msgstr "正在接收电子邮件"
# mail/mail-config.glade.h:63
# mail/mail-config.glade.h:63
# mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
#, fuzzy
msgid "Receiving _Options"
msgstr "接收中选项"
@@ -20674,7 +20701,7 @@ msgstr "接收中选项"
# e-util/e-passwords.c:360 mail/mail-session.c:267
# e-util/e-passwords.c:360 mail/mail-session.c:267
# e-util/e-passwords.c:360 mail/mail-session.c:269
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
#, fuzzy
msgid "Remember this _password"
msgstr "记住该密码"
@@ -20682,14 +20709,14 @@ msgstr "记住该密码"
# mail/mail-config.glade.h:64
# mail/mail-config.glade.h:64
# mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
msgid "Required Information"
msgstr "必需的信息"
# mail/mail-config.glade.h:23
# mail/folder-browser.h:26
# mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
#, fuzzy
msgid "Restore Defaults"
msgstr "默认"
@@ -20697,7 +20724,7 @@ msgstr "默认"
# mail/mail-config.glade.h:67
# mail/mail-config.glade.h:67
# mail/mail-config.glade.h:76
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
#, fuzzy
msgid "S_ecurity"
msgstr "安全"
@@ -20705,30 +20732,30 @@ msgstr "安全"
# mail/mail-config.glade.h:66
# mail/mail-config.glade.h:66
# mail/mail-config.glade.h:75
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
msgid "Secure MIME (S/MIME)"
msgstr "安全 MIME (S/MIME)"
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
msgid "Select HTML fixed width font"
msgstr ""
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
msgid "Select HTML fixed width font for printing"
msgstr ""
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
msgid "Select HTML variable width font"
msgstr ""
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
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:107
+#: mail/mail-config.glade.h:108
#, fuzzy
msgid "Select PGP program"
msgstr "选择 PGP 二进制数"
@@ -20736,49 +20763,49 @@ msgstr "选择 PGP 二进制数"
# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
# mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
-#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
msgid "Sending Email"
msgstr "正在发送电子邮件"
# mail/mail-config.glade.h:74
# mail/mail-config.glade.h:74
# mail/mail-config.glade.h:83
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
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:111
+#: mail/mail-config.glade.h:112
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:112
+#: mail/mail-config.glade.h:113
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:113
+#: mail/mail-config.glade.h:114
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:114
+#: mail/mail-config.glade.h:115
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:115
+#: mail/mail-config.glade.h:116
#, fuzzy
msgid "Shortcuts _type:"
msgstr "快捷方式"
@@ -20786,7 +20813,7 @@ msgstr "快捷方式"
# mail/mail-config.glade.h:79
# mail/mail-config.glade.h:79
# mail/mail-config.glade.h:88
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
#, fuzzy
msgid "Signature #1"
msgstr "签名文件:"
@@ -20794,7 +20821,7 @@ msgstr "签名文件:"
# mail/mail-config.glade.h:79
# mail/mail-config.glade.h:79
# mail/mail-config.glade.h:88
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
#, fuzzy
msgid "Signature #2"
msgstr "签名文件:"
@@ -20802,41 +20829,41 @@ 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:118
+#: mail/mail-config.glade.h:119
#, fuzzy
msgid "Specify _filename:"
msgstr "指定文件名:"
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:120
msgid "Spell Checking Language"
msgstr ""
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:121
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:121
+#: mail/mail-config.glade.h:122
msgid "Standard Unix mbox"
msgstr "标准 Unix mbox"
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:123
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:125
+#: mail/mail-config.glade.h:126
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:127
+#: mail/mail-config.glade.h:128
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -20845,7 +20872,7 @@ msgstr ""
# my-evolution/metar.c:63
# my-evolution/metar.c:63
# my-evolution/metar.c:63
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:131
#, fuzzy
msgid "V_ariable-width:"
msgstr "不定风"
@@ -20853,7 +20880,7 @@ msgstr "不定风"
# mail/mail-config.glade.h:87
# mail/mail-config.glade.h:87
# mail/mail-config.glade.h:96
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:132
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -20866,7 +20893,7 @@ msgstr ""
# my-evolution/metar.c:65
# my-evolution/metar.c:65
# my-evolution/metar.c:65
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:137
#, fuzzy
msgid "XEmacs"
msgstr "东"
@@ -20874,7 +20901,7 @@ msgstr "东"
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:125
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:139
#, fuzzy
msgid "_Add Signature"
msgstr "签名文件(_S):"
@@ -20882,48 +20909,48 @@ msgstr "签名文件(_S):"
# mail/mail-config.glade.h:91
# mail/mail-config.glade.h:91
# mail/mail-config.glade.h:100
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:140
msgid "_Always load images off the net"
msgstr "总是离线装入图像(_A)"
# mail/mail-config.glade.h:92
# mail/mail-config.glade.h:92
# mail/mail-config.glade.h:101
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:141
msgid "_Always sign outgoing messages when using this account"
msgstr "当使用该帐号时总是发送签名邮件(_A)"
# mail/mail-config.glade.h:93
# mail/mail-config.glade.h:93
# mail/mail-config.glade.h:102
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:142
msgid "_Authentication Type: "
msgstr "验证类型(_A):"
# mail/mail-config.glade.h:93
# mail/mail-config.glade.h:93
# mail/mail-config.glade.h:102
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:143
msgid "_Authentication type: "
msgstr "验证类型(_A):"
# mail/mail-config.glade.h:94
# mail/mail-config.glade.h:94
# mail/mail-config.glade.h:103
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:144
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:144
+#: mail/mail-config.glade.h:145
#, fuzzy
msgid "_Automatically insert smiley images"
msgstr "自动检查新邮件(_A)"
# mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:146
#, fuzzy
msgid "_Beep when new mail arrives"
msgstr "新邮件到达时鸣笛"
@@ -20931,14 +20958,14 @@ msgstr "新邮件到达时鸣笛"
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:104
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:147
msgid "_Certificate ID:"
msgstr "证书 ID(_C):"
# mail/mail-config.glade.h:16
# mail/mail-config.glade.h:16
# mail/mail-config.glade.h:20
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:148
#, fuzzy
msgid "_Confirm when expunging a folder"
msgstr "当删除文件夹时进行提示"
@@ -20946,7 +20973,7 @@ msgstr "当删除文件夹时进行提示"
# ui/evolution-message-composer.xml.h:5
# ui/evolution-message-composer.xml.h:5
# ui/evolution-message-composer.xml.h:5
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:149
#, fuzzy
msgid "_Default signature:"
msgstr "删除签名以外的所有内容"
@@ -20954,13 +20981,13 @@ msgstr "删除签名以外的所有内容"
# mail/mail-config.glade.h:23
# mail/folder-browser.h:26
# mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:150
#, fuzzy
msgid "_Defaults"
msgstr "默认"
# mail/mail-config.glade.h:34
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:152
#, fuzzy
msgid "_Do not notify me when new mail arrives"
msgstr "新邮件到达时不要提醒我"
@@ -20968,19 +20995,19 @@ msgstr "新邮件到达时不要提醒我"
# mail/mail-accounts.c:196
# mail/mail-accounts.c:196
# mail/mail-accounts.c:196
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:154
#, fuzzy
msgid "_Enable"
msgstr "启用"
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:155
msgid "_Fixed-width:"
msgstr ""
# ui/evolution-mail-message.xml.h:32
# ui/evolution-mail-message.xml.h:32
# ui/evolution-mail-message.xml.h:32
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:156
#, fuzzy
msgid "_Forward style:"
msgstr "转发方式"
@@ -20988,14 +21015,14 @@ msgstr "转发方式"
# mail/mail-config.glade.h:101
# mail/mail-config.glade.h:101
# mail/mail-config.glade.h:110
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:157
msgid "_Full name:"
msgstr "全名(_F):"
# mail/mail-config.glade.h:38
# mail/mail-config.glade.h:38
# mail/mail-config.glade.h:45
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:159
#, fuzzy
msgid "_HTML Mail"
msgstr "在 HTML 邮件中"
@@ -21003,7 +21030,7 @@ msgstr "在 HTML 邮件中"
# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
# mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:161
#, fuzzy
msgid "_Identity"
msgstr "标识"
@@ -21011,14 +21038,14 @@ msgstr "标识"
# mail/mail-config.glade.h:105
# mail/mail-config.glade.h:105
# mail/mail-config.glade.h:114
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:162
msgid "_Load images if sender is in addressbook"
msgstr "如果发件人在地址簿中就装入图像(_L)"
# mail/mail-config.glade.h:44
# mail/mail-config.glade.h:44
# mail/mail-config.glade.h:51
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:163
#, fuzzy
msgid "_Make this my default account"
msgstr "设置为我的默认帐号(_D)"
@@ -21026,7 +21053,7 @@ msgstr "设置为我的默认帐号(_D)"
# mail/mail-config.glade.h:107
# mail/mail-config.glade.h:107
# mail/mail-config.glade.h:116
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:164
#, fuzzy
msgid "_Mark messages as read after"
msgstr "阅读时将邮件标记为已读,延时(_M)"
@@ -21034,26 +21061,26 @@ msgstr "阅读时将邮件标记为已读,延时(_M)"
# mail/mail-config.glade.h:108
# mail/mail-config.glade.h:108
# mail/mail-config.glade.h:117
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
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:165
+#: mail/mail-config.glade.h:166
msgid "_Never load images off the net"
msgstr "从不装入图像"
# mail/mail-config.glade.h:111
# mail/mail-config.glade.h:111
# mail/mail-config.glade.h:120
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
msgid "_PGP binary path:"
msgstr "PGP 二进制路径(_P):"
# mail/mail-config.glade.h:62
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
#, fuzzy
msgid "_Play sound file when new mail arrives"
msgstr "新邮件到达时播放声音文件"
@@ -21061,7 +21088,7 @@ msgstr "新邮件到达时播放声音文件"
# mail/mail-config.glade.h:55
# mail/mail-config.glade.h:55
# mail/mail-config.glade.h:64
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
#, fuzzy
msgid "_Prompt when sending HTML messages to contacts that don't want them"
msgstr "在往不希望接收 HTML 消息的联系人发送 HTML 消息的时候进行提示"
@@ -21069,7 +21096,7 @@ msgstr "在往不希望接收 HTML 消息的联系人发送 HTML 消息的时候
# mail/mail-config.glade.h:56
# mail/mail-config.glade.h:56
# mail/mail-config.glade.h:65
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:171
#, fuzzy
msgid "_Prompt when sending messages with an empty subject line"
msgstr "在发送空标题的消息时进行提示(_E)"
@@ -21077,7 +21104,7 @@ msgstr "在发送空标题的消息时进行提示(_E)"
# mail/mail-config.glade.h:62
# mail/mail-config.glade.h:62
# mail/mail-config.glade.h:71
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
#, fuzzy
msgid "_Receiving Mail"
msgstr "正在接收邮件"
@@ -21085,19 +21112,19 @@ msgstr "正在接收邮件"
# ui/evolution-mail-message.xml.h:71
# ui/evolution-mail-message.xml.h:71
# ui/evolution-mail-message.xml.h:73
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
#, fuzzy
msgid "_Reply style:"
msgstr "全部回复"
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
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:174
+#: mail/mail-config.glade.h:175
#, fuzzy
msgid "_Script:"
msgstr "安全(_S)"
@@ -21105,14 +21132,14 @@ msgstr "安全(_S)"
# ui/evolution-message-composer.xml.h:54
# ui/evolution-message-composer.xml.h:54
# ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
+#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
msgid "_Security"
msgstr "安全(_S)"
# mail/mail-config.glade.h:71
# mail/mail-config.glade.h:71
# mail/mail-config.glade.h:80
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
#, fuzzy
msgid "_Sending Mail"
msgstr "正在发送邮件"
@@ -21123,7 +21150,7 @@ msgstr "正在发送邮件"
# calendar/gui/e-calendar-table.etspec.h:13
# calendar/gui/dialogs/event-page.glade.h:11
# calendar/gui/e-calendar-table.etspec.h:13
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
#, fuzzy
msgid "_Show animated images"
msgstr "按其显示时间"
@@ -21131,7 +21158,7 @@ msgstr "按其显示时间"
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:125
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
#, fuzzy
msgid "_Signatures"
msgstr "签名文件(_S):"
@@ -21139,7 +21166,7 @@ msgstr "签名文件(_S):"
# mail/mail-config.glade.h:86
# mail/mail-config.glade.h:86
# mail/mail-config.glade.h:95
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
#, fuzzy
msgid "_Use secure connection (SSL):"
msgstr "使用安全连接 (SSL)"
@@ -21147,7 +21174,7 @@ msgstr "使用安全连接 (SSL)"
# my-evolution/metar.c:63
# my-evolution/metar.c:63
# my-evolution/metar.c:63
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
#, fuzzy
msgid "_Variable-width:"
msgstr "不定风"
@@ -21155,14 +21182,14 @@ msgstr "不定风"
# mail/mail-config.glade.h:118
# mail/mail-config.glade.h:118
# mail/mail-config.glade.h:127
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
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:182
+#: mail/mail-config.glade.h:183
#, fuzzy
msgid "color"
msgstr " 颜色"
@@ -21170,11 +21197,11 @@ msgstr " 颜色"
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:128
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:184
msgid "description"
msgstr "描述"
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:187
msgid "xxxxxxxxxxxxxxxxxxxx"
msgstr ""
@@ -21291,52 +21318,63 @@ 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:1741
+#: mail/mail-display.c:1756
#, fuzzy
msgid "Overdue:"
msgstr "被延误的任务(_V):"
-#: mail/mail-display.c:1745
+#: mail/mail-display.c:1760
#, fuzzy
msgid "by %B %d, %Y, %l:%M %P"
msgstr "%b %d %l:%M %p"
-#: mail/mail-display.c:1747
+#: mail/mail-display.c:1762
msgid "at your earliest convenience"
msgstr ""
# mail/mail-display.c:1602
# mail/mail-display.c:1628
# mail/mail-display.c:1657
-#: mail/mail-display.c:2069
+#: mail/mail-display.c:2084
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:2070
+#: mail/mail-display.c:2085
msgid "Copy Link Location"
msgstr "复制连接位置"
# mail/mail-display.c:1607
# mail/mail-display.c:1633
# mail/mail-display.c:1662
-#: mail/mail-display.c:2072
+#: mail/mail-display.c:2087
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:2074
+#: mail/mail-display.c:2089
msgid "Save Image as..."
msgstr "图像保存为..."
+# 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/pine-importer.c:471
+# importers/elm-importer.c:375 importers/netscape-importer.c:782
+# importers/pine-importer.c:471
+#: mail/mail-folder-cache.c:743
+#, fuzzy, c-format
+msgid "Pinging %s"
+msgstr "正在扫描 %s"
+
# mail/mail-format.c:635
# mail/mail-format.c:640
# mail/mail-format.c:646
-#: mail/mail-format.c:626
+#: mail/mail-format.c:646
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
@@ -21344,56 +21382,56 @@ msgstr "%s 附件"
# mail/mail-format.c:680
# mail/mail-format.c:686
# mail/mail-format.c:692
-#: mail/mail-format.c:672
+#: mail/mail-format.c:692
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:756 mail/message-list.etspec.h:2
+#: mail/mail-format.c:776 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:843
+#: mail/mail-format.c:863
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:886 mail/message-list.etspec.h:7
+#: mail/mail-format.c:906 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:890
+#: mail/mail-format.c:910
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:895 mail/message-list.etspec.h:14
+#: mail/mail-format.c:915 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:900
+#: mail/mail-format.c:920
msgid "Cc"
msgstr "抄送"
# mail/mail-format.c:901
# mail/mail-format.c:923
# mail/mail-format.c:929
-#: mail/mail-format.c:905
+#: mail/mail-format.c:925
msgid "Bcc"
msgstr "密件抄送"
@@ -21403,7 +21441,7 @@ msgstr "密件抄送"
# importers/pine-importer.c:637 mail/component-factory.c:100
# importers/elm-importer.c:525 importers/netscape-importer.c:958
# importers/pine-importer.c:637 mail/component-factory.c:100
-#: mail/mail-format.c:936
+#: mail/mail-format.c:956
#, fuzzy
msgid "Mailer"
msgstr "邮件"
@@ -21411,7 +21449,7 @@ msgstr "邮件"
# mail/mail-format.c:1813
# mail/mail-format.c:1749
# mail/mail-format.c:1768
-#: mail/mail-format.c:1808
+#: mail/mail-format.c:1840
msgid ""
"This message is digitally signed. Click the lock icon for more information."
msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
@@ -21419,7 +21457,7 @@ msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
# mail/mail-crypto.c:84
# mail/mail-crypto.c:84
# mail/mail-crypto.c:84
-#: mail/mail-format.c:1835
+#: mail/mail-format.c:1867
#, fuzzy
msgid "Could not create a PGP verfication context"
msgstr "无法创建 PGP 验证上下文。"
@@ -21427,21 +21465,21 @@ msgstr "无法创建 PGP 验证上下文。"
# mail/mail-format.c:1844
# mail/mail-format.c:1780
# mail/mail-format.c:1799
-#: mail/mail-format.c:1844
+#: mail/mail-format.c:1876
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:1852
+#: mail/mail-format.c:1884
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:2102
+#: mail/mail-format.c:2134
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
@@ -21449,7 +21487,7 @@ msgstr "指向 FTP 站点 (%s)"
# mail/mail-format.c:2082
# mail/mail-format.c:2017
# mail/mail-format.c:2036
-#: mail/mail-format.c:2116
+#: mail/mail-format.c:2148
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
@@ -21457,7 +21495,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:2121
+#: mail/mail-format.c:2153
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
@@ -21465,7 +21503,7 @@ msgstr "指向本地文件 (%s)"
# mail/mail-format.c:2116
# mail/mail-format.c:2051
# mail/mail-format.c:2070
-#: mail/mail-format.c:2150
+#: mail/mail-format.c:2182
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
@@ -21473,7 +21511,7 @@ msgstr "指向远程数据 (%s)"
# mail/mail-format.c:2124
# mail/mail-format.c:2059
# mail/mail-format.c:2078
-#: mail/mail-format.c:2158
+#: mail/mail-format.c:2190
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
@@ -21481,7 +21519,7 @@ msgstr "指向未知的外部数据 (“%s”类型)"
# mail/mail-format.c:2129
# mail/mail-format.c:2064
# mail/mail-format.c:2083
-#: mail/mail-format.c:2163
+#: mail/mail-format.c:2195
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
@@ -21679,7 +21717,7 @@ msgstr "把邮件复制到 %s"
# mail/mail-ops.c:1008
# mail/mail-ops.c:1010
# mail/mail-ops.c:1053
-#: mail/mail-ops.c:1041
+#: mail/mail-ops.c:1051
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "正在“%s”中扫描文件夹"
@@ -21687,14 +21725,14 @@ msgstr "正在“%s”中扫描文件夹"
# mail/mail-ops.c:1191
# mail/mail-ops.c:1193
# mail/mail-ops.c:1236
-#: mail/mail-ops.c:1224
+#: mail/mail-ops.c:1234
msgid "Forwarded messages"
msgstr "已转发邮件"
# mail/mail-ops.c:1234
# mail/mail-ops.c:1236
# mail/mail-ops.c:1279
-#: mail/mail-ops.c:1267
+#: mail/mail-ops.c:1277
#, c-format
msgid "Opening folder %s"
msgstr "正在打开文件夹 %s"
@@ -21702,7 +21740,7 @@ msgstr "正在打开文件夹 %s"
# mail/mail-ops.c:1306
# mail/mail-ops.c:1308
# mail/mail-ops.c:1351
-#: mail/mail-ops.c:1339
+#: mail/mail-ops.c:1349
#, c-format
msgid "Opening store %s"
msgstr "正在打开存储 %s"
@@ -21710,7 +21748,7 @@ msgstr "正在打开存储 %s"
# mail/mail-ops.c:1375
# mail/mail-ops.c:1377
# mail/mail-ops.c:1420
-#: mail/mail-ops.c:1412
+#: mail/mail-ops.c:1422
#, c-format
msgid "Removing folder %s"
msgstr "正在删除文件夹“%s”"
@@ -21718,7 +21756,7 @@ msgstr "正在删除文件夹“%s”"
# mail/mail-ops.c:1469
# mail/mail-ops.c:1471
# mail/mail-ops.c:1514
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1516
#, c-format
msgid "Storing folder '%s'"
msgstr "正在存储文件夹“%s”"
@@ -21726,21 +21764,21 @@ msgstr "正在存储文件夹“%s”"
# mail/mail-ops.c:1520
# mail/mail-ops.c:1522
# mail/mail-ops.c:1565
-#: mail/mail-ops.c:1557
+#: mail/mail-ops.c:1567
msgid "Refreshing folder"
msgstr "正在刷新文件夹"
# mail/mail-ops.c:1556
# mail/mail-ops.c:1558
# mail/mail-ops.c:1601
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1603
msgid "Expunging folder"
msgstr "正在删除文件夹"
# mail/mail-ops.c:1605
# mail/mail-ops.c:1607
# mail/mail-ops.c:1650
-#: mail/mail-ops.c:1642
+#: mail/mail-ops.c:1652
#, c-format
msgid "Retrieving message %s"
msgstr "正在检索邮件 %s"
@@ -21748,7 +21786,7 @@ msgstr "正在检索邮件 %s"
# mail/mail-ops.c:1672
# mail/mail-ops.c:1674
# mail/mail-ops.c:1717
-#: mail/mail-ops.c:1714
+#: mail/mail-ops.c:1724
#, c-format
msgid "Retrieving %d message(s)"
msgstr "正在检索 %d 个邮件"
@@ -21756,7 +21794,7 @@ msgstr "正在检索 %d 个邮件"
# mail/mail-ops.c:1758
# mail/mail-ops.c:1760
# mail/mail-ops.c:1803
-#: mail/mail-ops.c:1800
+#: mail/mail-ops.c:1810
#, c-format
msgid "Saving %d messsage(s)"
msgstr "正在保存 %d 个邮件"
@@ -21764,7 +21802,7 @@ msgstr "正在保存 %d 个邮件"
# mail/mail-ops.c:1870
# mail/mail-ops.c:1872
# mail/mail-ops.c:1915
-#: mail/mail-ops.c:1912
+#: mail/mail-ops.c:1922
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -21776,7 +21814,7 @@ msgstr ""
# mail/mail-ops.c:1898
# mail/mail-ops.c:1900
# mail/mail-ops.c:1943
-#: mail/mail-ops.c:1940
+#: mail/mail-ops.c:1950
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -21788,14 +21826,14 @@ msgstr ""
# mail/mail-ops.c:1972
# mail/mail-ops.c:1974
# mail/mail-ops.c:2017
-#: mail/mail-ops.c:2014
+#: mail/mail-ops.c:2024
msgid "Saving attachment"
msgstr "正在保存附件"
# mail/mail-ops.c:1988
# mail/mail-ops.c:1990
# mail/mail-ops.c:2033
-#: mail/mail-ops.c:2031
+#: mail/mail-ops.c:2041
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -21807,7 +21845,7 @@ msgstr ""
# mail/mail-ops.c:2019
# mail/mail-ops.c:2021
# mail/mail-ops.c:2064
-#: mail/mail-ops.c:2061
+#: mail/mail-ops.c:2071
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据: %s"
@@ -21815,7 +21853,7 @@ msgstr "无法写数据: %s"
# mail/mail-ops.c:2088
# mail/mail-ops.c:2090
# mail/mail-ops.c:2133
-#: mail/mail-ops.c:2209
+#: mail/mail-ops.c:2219
#, c-format
msgid "Disconnecting from %s"
msgstr "断开与 %s 的连接"
@@ -21823,7 +21861,7 @@ msgstr "断开与 %s 的连接"
# mail/mail-ops.c:2089
# mail/mail-ops.c:2091
# mail/mail-ops.c:2134
-#: mail/mail-ops.c:2209
+#: mail/mail-ops.c:2219
#, c-format
msgid "Reconnecting to %s"
msgstr "重新与 %s 连接"
@@ -21831,7 +21869,7 @@ msgstr "重新与 %s 连接"
# mail/mail-search-dialogue.c:113
# mail/mail-search-dialogue.c:113
# mail/mail-search-dialogue.c:113
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
msgid "_Search"
msgstr "搜索(_S)"
@@ -21953,21 +21991,21 @@ msgstr "正在等待..."
# mail/mail-session.c:220
# mail/mail-session.c:220
# mail/mail-session.c:222
-#: mail/mail-session.c:223
+#: mail/mail-session.c:221
msgid "User canceled operation."
msgstr "用户己取消操作。"
# mail/mail-config.glade.h:113
# mail/mail-config.glade.h:113
# mail/mail-config.glade.h:122
-#: mail/mail-session.c:276
+#: mail/mail-session.c:274
msgid "_Remember this password"
msgstr "记住该密码(_R)"
# e-util/e-passwords.c:362 mail/mail-session.c:268
# e-util/e-passwords.c:362 mail/mail-session.c:268
# e-util/e-passwords.c:362 mail/mail-session.c:270
-#: mail/mail-session.c:277
+#: mail/mail-session.c:275
#, fuzzy
msgid "_Remember this password for the remainder of this session"
msgstr "在本会话中记住该密码"
@@ -21975,7 +22013,7 @@ msgstr "在本会话中记住该密码"
# mail/mail-session.c:319
# mail/mail-session.c:319
# mail/mail-session.c:321
-#: mail/mail-session.c:334
+#: mail/mail-session.c:332
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
@@ -21983,7 +22021,7 @@ msgstr "为 %s 输入密码"
# mail/mail-session.c:322
# mail/mail-session.c:322
# mail/mail-session.c:324
-#: mail/mail-session.c:337
+#: mail/mail-session.c:335
msgid "Enter Password"
msgstr "输入密码"
@@ -22015,44 +22053,21 @@ msgstr ""
"\n"
"您希望保存改动吗?"
-#: mail/mail-signature-editor.c:378
+#: mail/mail-signature-editor.c:371
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:875
+#: mail/mail-signature-editor.c:374 my-evolution/e-summary-preferences.c:875
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:257
+#: mail/mail-tools.c:262
#, c-format
msgid "Forwarded message - %s"
msgstr "已转发邮件 - %s"
@@ -22060,14 +22075,14 @@ msgstr "已转发邮件 - %s"
# mail/mail-tools.c:259
# mail/mail-tools.c:259
# mail/mail-tools.c:260
-#: mail/mail-tools.c:261
+#: mail/mail-tools.c:266
msgid "Forwarded message"
msgstr "已转发邮件"
# mail/mail-tools.c:393
# mail/mail-tools.c:393
# mail/mail-tools.c:394
-#: mail/mail-tools.c:403
+#: mail/mail-tools.c:408
msgid "Forwarded Message"
msgstr "已转发邮件"
@@ -22153,109 +22168,109 @@ msgstr "%s - 邮件"
# mail/message-list.c:639
# mail/message-list.c:645
# mail/message-list.c:662
-#: mail/message-list.c:733
+#: mail/message-list.c:737
msgid "Unseen"
msgstr "不可见"
# mail/message-list.c:640
# mail/message-list.c:646
# mail/message-list.c:663
-#: mail/message-list.c:734
+#: mail/message-list.c:738
msgid "Seen"
msgstr "可见"
# mail/message-list.c:641
# mail/message-list.c:647
# mail/message-list.c:664
-#: mail/message-list.c:735
+#: mail/message-list.c:739
msgid "Answered"
msgstr "已应答"
# mail/message-list.c:642
# mail/message-list.c:648
# mail/message-list.c:665
-#: mail/message-list.c:736
+#: mail/message-list.c:740
msgid "Multiple Unseen Messages"
msgstr "多个不可见邮件"
# mail/message-list.c:643
# mail/message-list.c:649
# mail/message-list.c:666
-#: mail/message-list.c:737
+#: mail/message-list.c:741
msgid "Multiple Messages"
msgstr "多个邮件"
# mail/message-list.c:647
# mail/message-list.c:658
# mail/message-list.c:675
-#: mail/message-list.c:741
+#: mail/message-list.c:745
msgid "Lowest"
msgstr "最低"
# mail/message-list.c:648
# mail/message-list.c:659
# mail/message-list.c:676
-#: mail/message-list.c:742
+#: mail/message-list.c:746
msgid "Lower"
msgstr "较低"
# mail/message-list.c:652
# mail/message-list.c:663
# mail/message-list.c:680
-#: mail/message-list.c:746
+#: mail/message-list.c:750
msgid "Higher"
msgstr "较高"
# mail/message-list.c:653
# mail/message-list.c:664
# mail/message-list.c:681
-#: mail/message-list.c:747
+#: mail/message-list.c:751
msgid "Highest"
msgstr "最高"
# mail/message-list.c:903
# mail/message-list.c:920
# mail/message-list.c:937
-#: mail/message-list.c:1063
+#: 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:1070
+#: 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:1079
+#: 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:1091
+#: mail/message-list.c:1095
msgid "%a %l:%M %p"
msgstr "%a %l:%m %p"
-#: mail/message-list.c:1099
+#: mail/message-list.c:1103
msgid "%b %d %l:%M %p"
msgstr "%b %d %l:%M %p"
# mail/message-list.c:941
# mail/message-list.c:958
# mail/message-list.c:975
-#: mail/message-list.c:1101
+#: 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:2555
+#: mail/message-list.c:2559
msgid "Generating message list"
msgstr "正在生成邮件列表"
@@ -22387,7 +22402,7 @@ msgstr ""
# mail/subscribe-dialog.c:219
# mail/subscribe-dialog.c:219
# mail/subscribe-dialog.c:219
-#: mail/subscribe-dialog.c:219
+#: mail/subscribe-dialog.c:228
#, c-format
msgid "Scanning folders under %s on \"%s\""
msgstr "在“%2$s”上的 %1$s 中扫描文件夹"
@@ -22395,7 +22410,7 @@ msgstr "在“%2$s”上的 %1$s 中扫描文件夹"
# mail/subscribe-dialog.c:221
# mail/subscribe-dialog.c:221
# mail/subscribe-dialog.c:221
-#: mail/subscribe-dialog.c:221
+#: mail/subscribe-dialog.c:230
#, c-format
msgid "Scanning root-level folders on \"%s\""
msgstr "正在扫描“%s”上的根级文件夹"
@@ -22403,7 +22418,7 @@ msgstr "正在扫描“%s”上的根级文件夹"
# mail/subscribe-dialog.c:318
# mail/subscribe-dialog.c:318
# mail/subscribe-dialog.c:318
-#: mail/subscribe-dialog.c:318
+#: mail/subscribe-dialog.c:333
#, c-format
msgid "Subscribing to folder \"%s\""
msgstr "订阅到文件夹 “%s”"
@@ -22411,7 +22426,7 @@ msgstr "订阅到文件夹 “%s”"
# mail/subscribe-dialog.c:320
# mail/subscribe-dialog.c:320
# mail/subscribe-dialog.c:320
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:335
#, c-format
msgid "Unsubscribing to folder \"%s\""
msgstr "取消到文件夹“%s”的订阅"
@@ -22422,78 +22437,128 @@ msgstr "取消到文件夹“%s”的订阅"
# shell/e-storage-set-view.etspec.h:1
# mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
# shell/e-storage-set-view.etspec.h:1
-#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1304 mail/subscribe-dialog.etspec.h:1
#: shell/e-storage-set-view.etspec.h:2
msgid "Folder"
msgstr "文件夹"
+# ui/evolution-message-composer.xml.h:23
+# ui/evolution-message-composer.xml.h:23
+# ui/evolution-message-composer.xml.h:23
+#: mail/subscribe-dialog.c:1483
+#, fuzzy
+msgid "Scanning folders..."
+msgstr "保存到文件夹..."
+
# mail/subscribe-dialog.c:1520
# mail/subscribe-dialog.c:1520
# mail/subscribe-dialog.c:1520
-#: mail/subscribe-dialog.c:1515
+#: mail/subscribe-dialog.c:1590
msgid "No server has been selected"
msgstr "没有选定服务器"
# mail/subscribe-dialog.c:1581
# mail/subscribe-dialog.c:1581
# mail/subscribe-dialog.c:1581
-#: mail/subscribe-dialog.c:1576
+#: mail/subscribe-dialog.c:1654
msgid "Please select a server."
msgstr "请选择服务器。"
-# mail/subscribe-dialog.glade.h:1
-# mail/subscribe-dialog.glade.h:1
-# mail/subscribe-dialog.glade.h:1
-#: mail/subscribe-dialog.glade.h:1
-msgid " _Refresh List "
-msgstr "刷新列表(_R)"
-
# mail/subscribe-dialog.glade.h:2
# mail/subscribe-dialog.glade.h:2
# mail/subscribe-dialog.glade.h:2
-#: mail/subscribe-dialog.glade.h:2
+#: mail/subscribe-dialog.glade.h:1
msgid "All folders"
msgstr "所有文件夹"
+# calendar/gui/goto-dialog.glade.h:1
+# calendar/gui/goto-dialog.glade.h:1
+# calendar/gui/goto-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "Apri file"
+msgstr "四月"
+
+# 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
+# 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
+#: mail/subscribe-dialog.glade.h:3 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:5
+msgid "Close"
+msgstr "关闭"
+
# mail/subscribe-dialog.glade.h:3
# mail/subscribe-dialog.glade.h:3
# mail/subscribe-dialog.glade.h:3
-#: mail/subscribe-dialog.glade.h:3
-msgid "Display options"
+#: mail/subscribe-dialog.glade.h:4
+#, fuzzy
+msgid "Display Options"
msgstr "显示选项"
# mail/subscribe-dialog.glade.h:4
# mail/subscribe-dialog.glade.h:4
# mail/subscribe-dialog.glade.h:4
-#: mail/subscribe-dialog.glade.h:4
+#: mail/subscribe-dialog.glade.h:5
msgid "Folders whose names begin with:"
msgstr "名称以之开头的文件夹:"
# mail/subscribe-dialog.glade.h:5
# mail/subscribe-dialog.glade.h:5
# mail/subscribe-dialog.glade.h:5
-#: mail/subscribe-dialog.glade.h:5
+#: mail/subscribe-dialog.glade.h:6
msgid "Manage Subscriptions"
msgstr "管理订阅"
-# mail/subscribe-dialog.glade.h:6
-# mail/subscribe-dialog.glade.h:6
-# mail/subscribe-dialog.glade.h:6
-#: mail/subscribe-dialog.glade.h:6
-msgid "Show _folders from server: "
-msgstr "从服务器显示文件夹(_F): "
+# ui/evolution-subscribe.xml.h:3
+# ui/evolution-subscribe.xml.h:3
+# ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
+msgid "Refresh List"
+msgstr "刷新列表"
+
+# shell/e-shell-importer.c:617
+# shell/e-shell-importer.c:617
+# executive-summary/component/e-summary-callbacks.c:125
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "S_elect server: "
+msgstr "选择一个服务"
+
+# shell/e-shell-importer.c:617
+# shell/e-shell-importer.c:617
+# shell/e-shell-importer.c:628
+#: mail/subscribe-dialog.glade.h:9
+#, fuzzy
+msgid "Salve file"
+msgstr "选择一个文件"
# mail/subscribe-dialog.glade.h:7
# mail/subscribe-dialog.glade.h:7
# mail/subscribe-dialog.glade.h:7
-#: mail/subscribe-dialog.glade.h:7
+#: mail/subscribe-dialog.glade.h:10
msgid "_Subscribe"
msgstr "订阅(_S)"
# mail/subscribe-dialog.glade.h:8
# mail/subscribe-dialog.glade.h:8
# mail/subscribe-dialog.glade.h:8
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:11
msgid "_Unsubscribe"
msgstr "退订(_U)"
@@ -22505,10 +22570,18 @@ msgstr "退订(_U)"
msgid "Configuration control for the Evolution Summary."
msgstr "含有 Evolution 概要的文件夹"
+# 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:2
+#, fuzzy
+msgid "Configure the appearance of the Evolution Summary here"
+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
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
#, fuzzy
msgid "Evolution Summary component."
msgstr "Evolution 邮件撰写器。"
@@ -22516,7 +22589,7 @@ 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
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
#, fuzzy
msgid "Factory for Evolution Summary's configuration control."
msgstr "Evolution 任务控制车间"
@@ -22524,7 +22597,7 @@ 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
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
#, fuzzy
msgid "Factory for the Evolution Summary component."
msgstr "Evolution 实施概要组件车间。"
@@ -22532,15 +22605,11 @@ 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
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
#, 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
@@ -37886,35 +37955,35 @@ 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:365 my-evolution/e-summary-calendar.c:383
+#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
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:366
+#: my-evolution/e-summary-calendar.c:368
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:400
+#: my-evolution/e-summary-calendar.c:404
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:402
+#: my-evolution/e-summary-calendar.c:406
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:420
+#: my-evolution/e-summary-calendar.c:424
msgid "No description"
msgstr "无描述"
@@ -38019,14 +38088,14 @@ msgstr "雪"
# my-evolution/e-summary-tasks.c:248
# my-evolution/e-summary-tasks.c:248
# my-evolution/e-summary-tasks.c:241
-#: my-evolution/e-summary-tasks.c:300
+#: my-evolution/e-summary-tasks.c:312
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:343
+#: my-evolution/e-summary-tasks.c:357
msgid "(No Description)"
msgstr "(没有描述)"
@@ -38081,7 +38150,7 @@ msgstr "打印概要失败"
# my-evolution/main.c:66
# my-evolution/main.c:66
# my-evolution/main.c:65
-#: my-evolution/main.c:139
+#: my-evolution/main.c:64
msgid "Executive summary component could not initialize Bonobo.\n"
msgstr "实施概要组件无法初始化 Bonobo。\n"
@@ -40286,10 +40355,14 @@ msgstr "天气(_W)"
msgid "Configuration control for Evolution folder settings."
msgstr ""
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+msgid "Configure special folders and offline folder behavior here"
+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
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
#, fuzzy
msgid "Folder Settings"
msgstr "邮件设置"
@@ -40297,14 +40370,10 @@ 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:3
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
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
@@ -40352,7 +40421,7 @@ 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:179 shell/e-shell-view.c:397
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
#: shell/e-shortcuts.c:1055
msgid "Inbox"
msgstr "收件箱"
@@ -41010,7 +41079,7 @@ 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
+#: shell/e-shell-shared-folder-picker-dialog.c:349
#, fuzzy
msgid "Opening Folder"
msgstr "正在打开文件夹 %s"
@@ -41018,7 +41087,7 @@ 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
+#: shell/e-shell-shared-folder-picker-dialog.c:356
#, fuzzy, c-format
msgid "Opening Folder \"%s\""
msgstr "正在打开文件夹 %s"
@@ -41026,7 +41095,7 @@ 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
+#: shell/e-shell-shared-folder-picker-dialog.c:361
#, fuzzy, c-format
msgid "in \"%s\" ..."
msgstr "在 %s 中打开..."
@@ -41034,7 +41103,7 @@ msgstr "在 %s 中打开..."
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
-#: shell/e-shell-shared-folder-picker-dialog.c:470
+#: shell/e-shell-shared-folder-picker-dialog.c:467
#, fuzzy, c-format
msgid "Could not open shared folder: %s."
msgstr "无法重命名文件夹: %s"
@@ -41042,7 +41111,7 @@ 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:542
+#: shell/e-shell-shared-folder-picker-dialog.c:539
#, fuzzy
msgid "Cannot find the specified shared folder."
msgstr ""
@@ -41181,14 +41250,14 @@ msgstr "离线工作"
# shell/e-shell-view.c:214
# shell/e-shell-view.c:214
# shell/e-shell-view.c:215
-#: shell/e-shell-view.c:225
+#: shell/e-shell-view.c:226
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:1841
+#: shell/e-shell-view.c:1838
#, c-format
msgid "%s (%d)"
msgstr "%s (%d)"
@@ -41196,14 +41265,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:1843
+#: shell/e-shell-view.c:1840
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:1890
+#: shell/e-shell-view.c:1887
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
@@ -41211,14 +41280,14 @@ msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
# shell/e-shell-view.c:1641
# shell/e-shell-view.c:1641
# shell/e-shell-view.c:1654
-#: shell/e-shell-view.c:1897
+#: shell/e-shell-view.c:1894
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:1903
+#: shell/e-shell-view.c:1900
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr "Ximian Evolution 目前离线。 点击该按钮则在线工作。"
@@ -41249,7 +41318,7 @@ msgstr "无法设置本地存储 -- %s"
# shell/e-shell.c:1659
# shell/e-shell.c:1659
# shell/e-shell.c:1660
-#: shell/e-shell.c:1821
+#: shell/e-shell.c:1828
#, c-format
msgid ""
"The Evolution component that handles folders of type \"%s\"\n"
@@ -41263,28 +41332,28 @@ msgstr ""
# shell/e-shell.c:1886
# shell/e-shell.c:1886
# shell/e-shell.c:1887
-#: shell/e-shell.c:2122
+#: shell/e-shell.c:2129
msgid "Invalid arguments"
msgstr "无效参数"
# shell/e-shell.c:1888
# shell/e-shell.c:1888
# shell/e-shell.c:1889
-#: shell/e-shell.c:2124
+#: shell/e-shell.c:2131
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:2126
+#: shell/e-shell.c:2133
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:2128 shell/e-storage.c:488
+#: shell/e-shell.c:2135 shell/e-storage.c:488
msgid "Generic error"
msgstr "通用错误"
@@ -41629,7 +41698,7 @@ msgstr "%s (...)"
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
-#: shell/evolution-folder-selector-button.c:86
+#: shell/evolution-folder-selector-button.c:94
msgid "<click here to select a folder>"
msgstr "<点击这里以便选择文件夹>"
@@ -41682,105 +41751,105 @@ msgstr ""
# shell/evolution-shell-component.c:1009
# shell/evolution-shell-component.c:1009
# shell/evolution-shell-component.c:1022
-#: shell/evolution-shell-component.c:1094
+#: shell/evolution-shell-component.c:1145
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:1096
+#: shell/evolution-shell-component.c:1147
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:1098
+#: shell/evolution-shell-component.c:1149
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:1100
+#: shell/evolution-shell-component.c:1151
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:1102
+#: shell/evolution-shell-component.c:1153
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:1104
+#: shell/evolution-shell-component.c:1155
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:1106
+#: shell/evolution-shell-component.c:1157
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:1108
+#: shell/evolution-shell-component.c:1159
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:1110
+#: shell/evolution-shell-component.c:1161
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:1112
+#: shell/evolution-shell-component.c:1163
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:1116
+#: shell/evolution-shell-component.c:1167
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:1118
+#: shell/evolution-shell-component.c:1169
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:1122
+#: shell/evolution-shell-component.c:1173
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:1124
+#: shell/evolution-shell-component.c:1175
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:1126
+#: shell/evolution-shell-component.c:1177
msgid "Old owner has died"
msgstr "原所有者已死"
@@ -41884,42 +41953,34 @@ msgstr "文件夹类型:"
msgid "Specify where to create the folder:"
msgstr "指定在那里创建文件夹:"
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Blah blah."
-msgstr ""
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "Insert some explanatory text here."
-msgstr ""
-
# ui/evolution.xml.h:7
# ui/evolution.xml.h:7
# ui/evolution.xml.h:7
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
#, fuzzy
msgid "Open Other User's Folder"
msgstr "创建新文件夹(_N)..."
+# mail/mail-config.glade.h:5
+# mail/mail-config.glade.h:5
+# mail/mail-config.glade.h:5
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "帐号"
+
# shell/glade/e-shell-folder-creation-dialog.glade.h:1
# shell/glade/e-shell-folder-creation-dialog.glade.h:1
# shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
#, fuzzy
msgid "_Folder Name:"
msgstr "文件夹名称:"
-# addressbook/gui/component/addressbook-config.glade.h:28
-# addressbook/gui/component/addressbook-config.glade.h:28
-# addressbook/gui/component/addressbook-config.glade.h:37
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
-#, fuzzy
-msgid "_Server:"
-msgstr "服务器名(_S):"
-
# mail/mail-config.glade.h:117
# mail/mail-config.glade.h:117
# mail/mail-config.glade.h:126
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
#, fuzzy
msgid "_User:"
msgstr "用户名(_U):"
@@ -42077,18 +42138,18 @@ msgstr "Evolution 可以从下列文件中导入数据:"
# data/evolution.desktop.in.h:1 shell/main.c:83
# shell/main.c:83
# shell/main.c:83
-#: shell/main.c:92
+#: shell/main.c:96
msgid "Evolution"
msgstr "Evolution"
# shell/main.c:89
# shell/main.c:89
# shell/main.c:89
-#: shell/main.c:98
+#: shell/main.c:102
msgid "Evolution is now exiting ..."
msgstr "Evolution 正在退出 ..."
-#: shell/main.c:223
+#: shell/main.c:227
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -42098,7 +42159,7 @@ msgid ""
"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"
+"this version, and install a 1.0.x version instead (1.0.8)\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"
@@ -42111,7 +42172,7 @@ msgstr ""
# ui/evolution.xml.h:31
# data/evolution.desktop.in.h:2
# data/evolution.desktop.in.h:2
-#: shell/main.c:246
+#: shell/main.c:250
#, fuzzy
msgid ""
"Thanks\n"
@@ -42121,7 +42182,7 @@ msgstr "Ximian Evolution"
# shell/importer/intelligent.c:198
# shell/importer/intelligent.c:198
# shell/importer/intelligent.c:198
-#: shell/main.c:255
+#: shell/main.c:259
#, fuzzy
msgid "Don't tell me again"
msgstr "不要再问我"
@@ -42129,14 +42190,14 @@ msgstr "不要再问我"
# shell/main.c:210
# shell/main.c:210
# shell/main.c:210
-#: shell/main.c:348
+#: shell/main.c:394
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:357
+#: shell/main.c:403
#, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "无法初始化 Ximian Evolution shell: %s"
@@ -42144,14 +42205,14 @@ msgstr "无法初始化 Ximian Evolution shell: %s"
# shell/main.c:289
# shell/main.c:289
# shell/main.c:289
-#: shell/main.c:438
+#: shell/main.c:485
msgid "Disable splash screen"
msgstr "禁用启动屏幕"
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
-#: shell/main.c:439
+#: shell/main.c:487
#, fuzzy
msgid "Start in offline mode"
msgstr "开始导入"
@@ -42159,7 +42220,7 @@ msgstr "开始导入"
# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
# shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
-#: shell/main.c:440
+#: shell/main.c:489
#, fuzzy
msgid "Start in online mode"
msgstr "启动智能导入器"
@@ -42167,11 +42228,15 @@ msgstr "启动智能导入器"
# shell/main.c:290
# shell/main.c:290
# shell/main.c:290
-#: shell/main.c:441
+#: shell/main.c:491
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
-#: shell/main.c:459
+#: shell/main.c:493
+msgid "Force upgrading of configuration files from Evolution 1.0.x"
+msgstr ""
+
+#: shell/main.c:511
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -42181,7 +42246,7 @@ msgstr ""
# shell/main.c:332
# shell/main.c:332
# shell/main.c:332
-#: shell/main.c:490
+#: shell/main.c:542
msgid "Cannot initialize the Bonobo component system."
msgstr "无法初始化 Bonobo 成员系统。"
@@ -42555,29 +42620,6 @@ msgstr "显示工作周"
msgid "Week"
msgstr "周"
-# 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
-# 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:5
-msgid "Close"
-msgstr "关闭"
-
# ui/evolution-comp-editor.xml.h:3
# ui/evolution-comp-editor.xml.h:3
# ui/evolution-comp-editor.xml.h:3
@@ -44246,13 +44288,6 @@ msgstr "把文件夹添加到您的订阅文件夹列表中去"
msgid "F_older"
msgstr "文件夹(_O)"
-# ui/evolution-subscribe.xml.h:3
-# ui/evolution-subscribe.xml.h:3
-# ui/evolution-subscribe.xml.h:3
-#: ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "刷新列表"
-
# ui/evolution-subscribe.xml.h:4
# ui/evolution-subscribe.xml.h:4
# ui/evolution-subscribe.xml.h:4
@@ -45198,7 +45233,7 @@ msgstr "不再显示该邮件。"
# widgets/misc/e-search-bar.c:460
# widgets/misc/e-search-bar.c:460
# widgets/misc/e-search-bar.c:460
-#: widgets/misc/e-search-bar.c:519
+#: widgets/misc/e-search-bar.c:520
#, fuzzy
msgid "_Find Now"
msgstr "立即查找"
@@ -45207,7 +45242,7 @@ msgstr "立即查找"
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
# widgets/misc/e-filter-bar.h:95
# widgets/misc/e-filter-bar.h:95
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
#, fuzzy
msgid "_Clear"
msgstr "清除"
@@ -45216,14 +45251,14 @@ msgstr "清除"
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
# widgets/misc/e-filter-bar.h:95
# widgets/misc/e-filter-bar.h:95
-#: widgets/misc/e-search-bar.c:893
+#: widgets/misc/e-search-bar.c:894
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:895
+#: widgets/misc/e-search-bar.c:896
msgid "Find Now"
msgstr "立即查找"
@@ -45270,6 +45305,153 @@ msgstr "init_corba(): 无法初始化 GNOME"
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "init_bonobo(): 无法初始化 Bonobo"
+# addressbook/backend/pas/pas-backend-file.c:270
+# addressbook/backend/pas/pas-backend-file.c:270
+# addressbook/backend/pas/pas-backend-file.c:270
+#~ msgid "Error in search expression."
+#~ msgstr "搜索表达式错误。"
+
+# addressbook/backend/pas/pas-backend-ldap.c:2219
+# addressbook/backend/pas/pas-backend-ldap.c:2219
+# addressbook/backend/pas/pas-backend-ldap.c:2222
+#~ msgid "Restarting search."
+#~ msgstr "开始搜索,"
+
+# camel/camel-url.c:288
+# camel/camel-url.c:288
+# camel/camel-url.c:288
+#, fuzzy
+#~ msgid "Could not parse query string"
+#~ msgstr "无法解析 URL “%s”"
+
+# 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
+#, fuzzy
+#~ msgid "Email is"
+#~ msgstr "电子邮件 2"
+
+# calendar/gui/alarm-notify/notify-main.c:181
+# calendar/gui/alarm-notify/notify-main.c:181
+# calendar/gui/alarm-notify/notify-main.c:181
+#~ msgid "Could not create the alarm notify service"
+#~ msgstr "无法创建提醒服务"
+
+# calendar/gui/e-itip-control.c:532
+# calendar/gui/e-itip-control.c:532
+# calendar/gui/e-itip-control.c:535
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "会议开始:<b>"
+
+# calendar/gui/e-itip-control.c:537
+# calendar/gui/e-itip-control.c:537
+# calendar/gui/e-itip-control.c:540
+#~ msgid "Task begins: <b>"
+#~ msgstr "任务开始:<b>"
+
+# calendar/gui/e-itip-control.c:542
+# calendar/gui/e-itip-control.c:542
+# calendar/gui/e-itip-control.c:545
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "忙闲信息开始于:<b>"
+
+# calendar/gui/e-itip-control.c:546
+# calendar/gui/e-itip-control.c:546
+# calendar/gui/e-itip-control.c:549
+#~ msgid "Begins: <b>"
+#~ msgstr "开始时间:<b>"
+
+# calendar/gui/e-itip-control.c:558
+# calendar/gui/e-itip-control.c:558
+# calendar/gui/e-itip-control.c:561
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "会议结束时间:<b>"
+
+# calendar/gui/e-itip-control.c:561
+# calendar/gui/e-itip-control.c:561
+# calendar/gui/e-itip-control.c:564
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "忙闲信息结束于:<b>"
+
+# calendar/gui/e-itip-control.c:579
+# calendar/gui/e-itip-control.c:579
+# calendar/gui/e-itip-control.c:582
+#~ msgid "Task Completed: <b>"
+#~ msgstr "任务完成率:<b>"
+
+# calendar/gui/e-itip-control.c:589
+# calendar/gui/e-itip-control.c:589
+# calendar/gui/e-itip-control.c:592
+#~ msgid "Task Due: <b>"
+#~ msgstr "任务到期时间:<b>"
+
+# calendar/gui/e-meeting-model.c:98
+# calendar/gui/e-meeting-model.c:98
+# calendar/gui/e-meeting-model.c:98
+#~ msgid "Non-Participants"
+#~ msgstr "不参加"
+
+# composer/e-msg-composer.c:1405
+# composer/e-msg-composer.c:1322
+# composer/e-msg-composer.c:1288
+#~ msgid ""
+#~ "This message has not been sent.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "该邮件尚未发送。\n"
+#~ "\n"
+#~ "您是否希望保存修改?"
+
+# mail/mail-accounts.c:149
+# mail/mail-accounts.c:149
+# mail/mail-accounts.c:149
+#, fuzzy
+#~ msgid "Set as default"
+#~ msgstr "(默认)"
+
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#, fuzzy
+#~ msgid "Signature hint"
+#~ msgstr "签名文件:"
+
+# mail/mail-config.glade.h:35
+# mail/mail-config.glade.h:35
+# mail/mail-config.glade.h:42
+#, fuzzy
+#~ msgid "Hide signature hint"
+#~ msgstr "HTML 签名文件:"
+
+# mail/subscribe-dialog.glade.h:1
+# mail/subscribe-dialog.glade.h:1
+# mail/subscribe-dialog.glade.h:1
+#~ msgid " _Refresh List "
+#~ msgstr "刷新列表(_R)"
+
+# mail/subscribe-dialog.glade.h:6
+# mail/subscribe-dialog.glade.h:6
+# mail/subscribe-dialog.glade.h:6
+#~ msgid "Show _folders from server: "
+#~ msgstr "从服务器显示文件夹(_F): "
+
+# addressbook/gui/component/addressbook-config.glade.h:28
+# addressbook/gui/component/addressbook-config.glade.h:28
+# addressbook/gui/component/addressbook-config.glade.h:37
+#, fuzzy
+#~ msgid "_Server:"
+#~ msgstr "服务器名(_S):"
+
# 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
@@ -45527,12 +45709,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "_Pilot Settings..."
#~ msgstr "Pilot 设置(_P)..."
-# addressbook/backend/pas/pas-backend-ldap.c:483
-# addressbook/backend/pas/pas-backend-ldap.c:483
-# addressbook/backend/pas/pas-backend-ldap.c:486
-#~ 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
@@ -46003,12 +46179,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ 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 "
@@ -46249,12 +46419,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ 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
@@ -46519,12 +46683,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ 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:21
# ui/evolution-mail-global.xml.h:21
# ui/evolution-mail-global.xml.h:21