aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po2342
1 files changed, 1218 insertions, 1124 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ca8de48077..e334e2024c 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-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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,15 +47,16 @@ 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:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
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:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
msgid "Name"
msgstr "名称"
@@ -66,7 +67,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:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
msgid "Email"
msgstr "电子邮件"
@@ -77,7 +78,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:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
msgid "Primary"
msgstr "主要"
@@ -102,8 +103,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:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
msgid "Assistant"
msgstr "助手"
@@ -125,8 +126,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:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
msgid "Business"
msgstr "商务"
@@ -148,7 +149,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:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
msgid "Callback"
msgstr "反馈"
@@ -159,7 +160,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:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
msgid "Company"
msgstr "公司"
@@ -188,8 +189,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:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
msgid "Home"
msgstr "家庭"
@@ -200,7 +201,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:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
msgid "Organization"
msgstr "组织"
@@ -222,7 +223,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:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
msgid "Mobile"
msgstr "手机"
@@ -233,7 +234,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:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
msgid "Car"
msgstr "汽车"
@@ -251,8 +252,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:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
msgid "Business Fax"
msgstr "商务传真"
@@ -273,8 +274,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:1745
-#: addressbook/gui/widgets/e-addressbook-view.c:371
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
msgid "Home Fax"
msgstr "家庭传真"
@@ -285,7 +286,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:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
msgid "Business 2"
msgstr "商务 2"
@@ -303,7 +304,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:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
msgid "Home 2"
msgstr "家庭 2"
@@ -317,8 +318,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:1746
-#: addressbook/gui/widgets/e-addressbook-view.c:374
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
msgid "ISDN"
msgstr "ISDN"
@@ -339,8 +340,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:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
msgid "Other"
msgstr "其它"
@@ -354,8 +355,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:1749
-#: addressbook/gui/widgets/e-addressbook-view.c:376
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
msgid "Other Fax"
msgstr "其它传真"
@@ -369,8 +370,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:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
msgid "Pager"
msgstr "传呼机"
@@ -384,8 +385,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:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
msgid "Radio"
msgstr "收音机"
@@ -399,8 +400,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:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
msgid "Telex"
msgstr "电传"
@@ -411,7 +412,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:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
msgid "TTY"
msgstr "TTY"
@@ -429,8 +430,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:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
msgid "Email 2"
msgstr "电子邮件 2"
@@ -448,8 +449,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:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
msgid "Email 3"
msgstr "电子邮件 3"
@@ -460,7 +461,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:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
msgid "Web Site"
msgstr "网站"
@@ -478,7 +479,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:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
msgid "Department"
msgstr "部门"
@@ -496,7 +497,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:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
msgid "Office"
msgstr "办公室"
@@ -514,7 +515,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:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
msgid "Title"
msgstr "头衔"
@@ -525,7 +526,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:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
msgid "Profession"
msgstr "职业"
@@ -543,7 +544,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:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
msgid "Manager"
msgstr "经理"
@@ -568,7 +569,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:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
msgid "Nickname"
msgstr "绰号"
@@ -586,7 +587,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:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
msgid "Spouse"
msgstr "配偶"
@@ -597,7 +598,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:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
msgid "Note"
msgstr "注释"
@@ -622,7 +623,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:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
msgid "Free-busy URL"
msgstr "忙闲 URL"
@@ -692,14 +693,14 @@ msgstr "未命名的联系人列表"
# addressbook/backend/ebook/e-card.c:4235
# addressbook/backend/ebook/e-card.c:4235
# addressbook/backend/ebook/e-card.c:4235
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
msgid "Multiple VCards"
msgstr "多个 VCard"
# addressbook/backend/ebook/e-card.c:4243
# addressbook/backend/ebook/e-card.c:4243
# addressbook/backend/ebook/e-card.c:4243
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
#, c-format
msgid "VCard for %s"
msgstr "%s 的 VCard"
@@ -1136,11 +1137,25 @@ 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:1640
+#: addressbook/gui/component/addressbook-config.c:1630
#, fuzzy
msgid "LDAP was not enabled in this build of Evolution"
msgstr "(在该版本的 evolution 中不支持SSL)"
+# addressbook/gui/component/addressbook-config.glade.h:2
+# addressbook/gui/component/addressbook-config.glade.h:2
+# addressbook/gui/component/addressbook-config.glade.h:4
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "帐号名"
+
+# addressbook/gui/component/addressbook-config.glade.h:14
+# addressbook/gui/component/addressbook-config.glade.h:14
+# addressbook/gui/component/addressbook-config.glade.h:19
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "服务器名"
+
# addressbook/gui/component/addressbook-factory.c:70
# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
# addressbook/gui/component/addressbook-factory.c:70
@@ -1358,7 +1373,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:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
msgid "Primary Email"
msgstr "常用电子邮件"
@@ -1532,7 +1547,7 @@ msgstr "地址簿资源"
# addressbook/gui/contact-editor/fulladdr.glade.h:3
# my-evolution/Locations.h:43
#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
#, fuzzy
msgid "Always"
msgstr "奥尔巴尼"
@@ -1667,7 +1682,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:76
+#: mail/mail-config.glade.h:75
#, fuzzy
msgid "Never"
msgstr "每(_E)"
@@ -1745,8 +1760,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:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
msgid "Searching"
msgstr "搜索"
@@ -1794,11 +1809,18 @@ msgstr ""
msgid ""
"Selecting this option will let you change Evolution's default settings for "
"LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:66
msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
"Specifying a display name is the last required step in configuring an LDAP "
"server."
msgstr ""
@@ -1806,7 +1828,7 @@ msgstr ""
# mail/mail-config.glade.h:81
# mail/mail-config.glade.h:81
# mail/mail-config.glade.h:90
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
#, fuzzy
msgid "Step 1: Server Information"
msgstr "来源信息"
@@ -1814,35 +1836,35 @@ msgstr "来源信息"
# mail/mail-config.c:2184 mail/mail-config.c:2188
# mail/mail-config.c:2233 mail/mail-config.c:2237
# mail/mail-config.c:2326 mail/mail-config.c:2330
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
#, fuzzy
msgid "Step 2: Connecting to Server"
msgstr "正在连接服务器..."
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
msgid "Step 3: Searching the Directory"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
msgid "Step 4: Display Name"
msgstr ""
# addressbook/gui/component/addressbook-config.glade.h:15
# addressbook/gui/component/addressbook-config.glade.h:15
# addressbook/gui/component/addressbook-config.glade.h:20
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
msgid "Sub"
msgstr ""
# shell/evolution-shell-component.c:1023
# shell/evolution-shell-component.c:1023
# shell/evolution-shell-component.c:1036
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
#, fuzzy
msgid "Supported Search Bases"
msgstr "不支持的方案"
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
msgid ""
"The first step in configuring an LDAP server is to provide its name, and "
"your log in\n"
@@ -1850,7 +1872,7 @@ msgid ""
"information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
msgid ""
"The options on this page control how many entries should be included in "
"your\n"
@@ -1859,7 +1881,7 @@ msgid ""
"need to change these options."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
"searches will \n"
@@ -1867,7 +1889,7 @@ msgid ""
"directory tree."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the \n"
@@ -1877,7 +1899,7 @@ msgid ""
"your base."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
msgid ""
"This assistant will help you to access online directory services\n"
"using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1887,14 +1909,14 @@ msgid ""
"need help finding this information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr ""
# addressbook/gui/component/addressbook-config.glade.h:25
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
#, fuzzy
msgid ""
"This is the maximum number of entries to download. Setting this number to "
@@ -1903,7 +1925,7 @@ msgid ""
msgstr "这是可下载卡片的最大数量。将该数值设定得太大将导致地址本变慢。"
# addressbook/gui/component/addressbook-config.glade.h:26
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
msgid ""
"This is the method evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1915,7 +1937,7 @@ msgstr ""
# addressbook/gui/component/addressbook-config.glade.h:22
# addressbook/gui/component/addressbook-config.glade.h:22
# addressbook/gui/component/addressbook-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
#, fuzzy
msgid ""
"This is the name for this server that will appear in your Evolution folder "
@@ -1923,7 +1945,7 @@ msgid ""
"It is for display purposes only. "
msgstr "这一名称将用于识别您的帐号。它只用于显示。"
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
msgid ""
"This is the port on the LDAP server that Evolution will try to connect to. "
"A \n"
@@ -1931,11 +1953,11 @@ msgid ""
"what port you should specify."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
msgid "This option controls how long a search will be run."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
msgid ""
"To add an attribute to the DN, select it from the list and click the \"Add "
"Attribute\" button.\n"
@@ -1944,12 +1966,12 @@ msgid ""
"that you add to the directory on the LDAP server. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
msgid "U_se SSL/TLS:"
msgstr ""
# addressbook/gui/component/addressbook-config.glade.h:12
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
#, fuzzy
msgid "Using distinguished name (DN)"
msgstr "识别姓名 (DN)"
@@ -1957,13 +1979,13 @@ msgstr "识别姓名 (DN)"
# addressbook/gui/component/addressbook-config.glade.h:9
# addressbook/gui/component/addressbook-config.glade.h:9
# addressbook/gui/component/addressbook-config.glade.h:13
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
#, fuzzy
msgid "Using email address"
msgstr "电子邮件地址"
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
msgid "Whenever Possible"
msgstr ""
@@ -1982,11 +2004,11 @@ msgstr ""
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
#: 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:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
msgid "_Add"
msgstr "添加(_A)"
@@ -2005,17 +2027,17 @@ msgstr "添加(_A)"
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
#, fuzzy
msgid "_Add ->"
msgstr "添加(_A)"
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
#, fuzzy
msgid "_Add Mapping"
msgstr "添加动作"
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
#, fuzzy
msgid "_Add to DN"
msgstr "添加动作"
@@ -2023,7 +2045,7 @@ msgstr "添加动作"
# calendar/gui/e-calendar-table.etspec.h:3
# calendar/gui/e-calendar-table.etspec.h:3
# calendar/gui/e-calendar-table.etspec.h:3
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
#, fuzzy
msgid "_Always"
msgstr "提醒"
@@ -2031,7 +2053,7 @@ msgstr "提醒"
# ui/evolution-message-composer.xml.h:46
# ui/evolution-message-composer.xml.h:46
# ui/evolution-message-composer.xml.h:46
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
#, fuzzy
msgid "_Delete Mapping"
msgstr "全部删除(_D)"
@@ -2039,23 +2061,23 @@ msgstr "全部删除(_D)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
#, fuzzy
msgid "_Display name:"
msgstr "显示(_D)"
# addressbook/gui/component/addressbook-config.glade.h:12
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
#, fuzzy
msgid "_Distinguished Name (DN):"
msgstr "识别姓名 (DN)"
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
msgid "_Don't use SSL/TLS"
msgstr ""
# addressbook/gui/component/addressbook-config.glade.h:33
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
#, fuzzy
msgid "_Download limit:"
msgstr "下载上限(_D)"
@@ -2078,8 +2100,8 @@ msgstr "下载上限(_D)"
# ui/evolution-message-composer.xml.h:47
# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
# ui/evolution-tasks.xml.h:19
-#: addressbook/gui/component/ldap-config.glade.h:116 filter/filter.glade.h:16
-#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 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
@@ -2091,7 +2113,7 @@ msgstr "编辑(_E)"
# calendar/gui/alarm-notify/alarm-notify.glade.h:4
# calendar/gui/alarm-notify/alarm-notify.glade.h:4
# calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
#, fuzzy
msgid "_Edit Mapping"
msgstr "编辑约会(_E)"
@@ -2099,31 +2121,31 @@ msgstr "编辑约会(_E)"
# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
#, fuzzy
msgid "_Evolution attribute:"
msgstr "Evolution 提醒"
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
msgid "_If necessary "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
msgid "_LDAP attribute:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
msgid "_LDAP attributes:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
msgid "_Log in method:"
msgstr ""
# calendar/gui/e-meeting-time-sel.c:467
# calendar/gui/e-meeting-time-sel.c:470
# calendar/gui/e-meeting-time-sel.c:470
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
#, fuzzy
msgid "_More Options >>"
msgstr "选项(_O)"
@@ -2131,7 +2153,7 @@ msgstr "选项(_O)"
# addressbook/gui/component/addressbook-config.glade.h:27
# addressbook/gui/component/addressbook-config.glade.h:27
# addressbook/gui/component/addressbook-config.glade.h:36
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
#, fuzzy
msgid "_Port number:"
msgstr "端口(_P):"
@@ -2139,7 +2161,7 @@ msgstr "端口(_P):"
# mail/mail-config.glade.h:23
# mail/folder-browser.h:26
# mail/mail-config.glade.h:30
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
#, fuzzy
msgid "_Restore Defaults"
msgstr "默认"
@@ -2147,7 +2169,7 @@ msgstr "默认"
# addressbook/gui/component/addressbook-config.glade.h:12
# addressbook/gui/component/addressbook-config.glade.h:12
# addressbook/gui/component/addressbook-config.glade.h:17
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
#, fuzzy
msgid "_Search base:"
msgstr "搜索起点(_B):"
@@ -2155,14 +2177,14 @@ msgstr "搜索起点(_B):"
# addressbook/gui/component/addressbook-config.glade.h:28
# addressbook/gui/component/addressbook-config.glade.h:28
# addressbook/gui/component/addressbook-config.glade.h:37
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
msgid "_Server name:"
msgstr "服务器名(_S):"
# calendar/gui/alarm-notify/alarm-notify.glade.h:3
# calendar/gui/alarm-notify/alarm-notify.glade.h:3
# calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
#, fuzzy
msgid "_Timeout (minutes):"
msgstr "午睡时间(分钟)"
@@ -2170,7 +2192,7 @@ msgstr "午睡时间(分钟)"
# mail/mail-config.c:326
# mail/mail-config.c:329
# mail/mail-config.c:354
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
#, fuzzy
msgid "account-druid"
msgstr "帐号 %d"
@@ -2178,7 +2200,7 @@ msgstr "帐号 %d"
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
#, fuzzy
msgid "account-editor"
msgstr "联系人列表编辑器"
@@ -2186,7 +2208,7 @@ msgstr "联系人列表编辑器"
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
#, fuzzy
msgid "cards"
msgstr "没有卡片"
@@ -2194,32 +2216,32 @@ msgstr "没有卡片"
# mail/mail-ops.c:2089
# mail/mail-ops.c:2091
# mail/mail-ops.c:2134
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
#, fuzzy
msgid "connecting-tab"
msgstr "重新与 %s 连接"
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
msgid "dn-customization-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
msgid "edit_server_window_simple"
msgstr ""
# addressbook/gui/contact-editor/contact-editor.glade.h:16
# addressbook/gui/contact-editor/contact-editor.glade.h:16
# addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
#, fuzzy
msgid "general-tab"
msgstr "常规"
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
msgid "mappings-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
msgid "objectclasses-tab"
msgstr ""
@@ -2229,7 +2251,7 @@ msgstr ""
# calendar/gui/e-week-view.c:1184
# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
# calendar/gui/e-week-view.c:1188
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
#, fuzzy
msgid "searching-tab"
msgstr "搜索"
@@ -2259,9 +2281,9 @@ 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:712
-#: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
#: shell/e-shortcuts-view.c:178
msgid "Remove"
msgstr "删除"
@@ -2312,14 +2334,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:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
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:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
#, fuzzy
msgid "Find contact in"
msgstr "发件人含有"
@@ -2571,9 +2593,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:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
#: 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:48
@@ -4472,14 +4494,14 @@ 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:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
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:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr "无法为域找到构件:“%s”"
@@ -4505,7 +4527,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:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
msgid "Full Name"
msgstr "全名"
@@ -4520,21 +4542,21 @@ msgstr "电子邮件"
# addressbook/gui/contact-editor/e-contact-save-as.c:106
# addressbook/gui/contact-editor/e-contact-save-as.c:106
#. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
msgid "card.vcf"
msgstr "card.vcf"
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# addressbook/gui/contact-editor/e-contact-save-as.c:170
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
msgid "list"
msgstr "列表"
# addressbook/gui/contact-editor/e-contact-save-as.c:201
# addressbook/gui/contact-editor/e-contact-save-as.c:201
# addressbook/gui/contact-editor/e-contact-save-as.c:201
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
#, c-format
msgid ""
"%s already exists\n"
@@ -4798,6 +4820,23 @@ msgstr "联系人列表编辑器"
msgid "Save List as VCard"
msgstr "将列表保存为 VCard"
+# addressbook/gui/component/addressbook-component.c:71
+# calendar/gui/dialogs/comp-editor-util.c:310
+# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+# shell/e-shortcuts.c:1061
+# addressbook/gui/component/addressbook-component.c:71
+# calendar/gui/dialogs/comp-editor-util.c:310
+# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+# shell/e-shortcuts.c:1061
+# addressbook/gui/component/addressbook-component.c:71
+# calendar/gui/dialogs/comp-editor-util.c:310
+# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+# shell/e-shortcuts.c:1061
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "联系人"
+
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
@@ -4898,21 +4937,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:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
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:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
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:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
#, c-format
msgid "%d cards"
msgstr "%d 张卡片"
@@ -4920,7 +4959,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:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
#, fuzzy
msgid "Error getting book view"
msgstr "启动 %s 错误"
@@ -4966,8 +5005,8 @@ msgstr "成功"
#: addressbook/gui/widgets/e-addressbook-util.c:36
#: camel/providers/imap/camel-imap-command.c:309
#: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
-#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
msgid "Unknown error"
msgstr "未知的错误"
@@ -4984,7 +5023,7 @@ msgstr "仓库离线"
# shell/evolution-shell-component.c:1035
# addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
# shell/evolution-shell-component.c:1048
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
#: shell/evolution-shell-component.c:1171
msgid "Permission denied"
msgstr "没有权限"
@@ -5026,11 +5065,13 @@ 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:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
#: 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:739 camel/camel-service.c:779
#: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
msgid "Cancelled"
msgstr "已经取消"
@@ -5117,7 +5158,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
msgid "Error removing card"
msgstr "删除卡片错误"
@@ -5177,115 +5218,10 @@ msgstr "没有卡片"
msgid "Copy cards to"
msgstr "没有卡片"
-# addressbook/gui/widgets/e-addressbook-view.c:848
-# addressbook/gui/widgets/e-addressbook-view.c:848
-# addressbook/gui/widgets/e-addressbook-view.c:959
-#: addressbook/gui/widgets/e-addressbook-view.c: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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:461
+#: addressbook/gui/widgets/e-addressbook-view.c:363
#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
msgid "Addressbook"
msgstr "地址簿"
@@ -5308,9 +5244,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:722
-#: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr "保存为 VCard"
@@ -5321,7 +5257,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:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
#, fuzzy
msgid "New Contact..."
msgstr "新建联系人"
@@ -5329,7 +5265,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:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
#, fuzzy
msgid "New Contact List..."
msgstr "新建联系人列表"
@@ -5337,7 +5273,7 @@ msgstr "新建联系人列表"
# ui/evolution.xml.h:39
# ui/evolution.xml.h:39
# ui/evolution.xml.h:39
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
#, fuzzy
msgid "Go to Folder..."
msgstr "转到文件夹(_G)..."
@@ -5345,7 +5281,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:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
#, fuzzy
msgid "Import..."
msgstr "正在导入(_I)..."
@@ -5353,7 +5289,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:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
#, fuzzy
msgid "Search for Contacts..."
msgstr "搜索联系人(_S)"
@@ -5361,7 +5297,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:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
#, fuzzy
msgid "Addressbook Sources..."
msgstr "地址簿来源(_A)..."
@@ -5369,7 +5305,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:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
#, fuzzy
msgid "Pilot Settings..."
msgstr "Pilot 设置(_P)..."
@@ -5383,7 +5319,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:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "转发联系人"
@@ -5394,7 +5330,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:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
msgid "Send Message to Contact"
msgstr "给联系人发邮件"
@@ -5413,7 +5349,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:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
#: 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
@@ -5426,14 +5362,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:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
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:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
#, fuzzy
msgid "Copy to folder..."
msgstr "复制到文件夹..."
@@ -5441,7 +5377,7 @@ msgstr "复制到文件夹..."
# mail/folder-browser.c:1466
# mail/folder-browser.c:1475
# mail/folder-browser.c:1476
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
#, fuzzy
msgid "Move to folder..."
msgstr "移动到文件夹(_M)..."
@@ -5451,7 +5387,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:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "剪切"
@@ -5464,7 +5400,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:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
@@ -5475,7 +5411,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:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
msgid "Paste"
msgstr "粘贴"
@@ -5497,7 +5433,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:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 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
@@ -5508,8 +5444,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:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
#, fuzzy
msgid "Current View"
msgstr "当前视图(_C)"
@@ -5521,7 +5457,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
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"
@@ -5532,11 +5468,11 @@ 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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
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:1374
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
#, c-format
msgid ""
"The addressbook backend for\n"
@@ -5544,6 +5480,111 @@ msgid ""
"has crashed. You will have to restart Evolution in order to use it again"
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.etspec.h:1
+msgid "* Click here to add a contact *"
+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.etspec.h:3
+msgid "Assistant 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.etspec.h:4
+msgid "Business Address"
+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.etspec.h:6
+msgid "Business 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.etspec.h:7
+msgid "Business Phone 2"
+msgstr "商务电话 2"
+
+# 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.etspec.h:8
+msgid "Callback 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.etspec.h:9
+msgid "Car 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.etspec.h:10
+msgid "Company Phone"
+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.etspec.h:18
+msgid "Home Address"
+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.etspec.h:20
+msgid "Home Phone"
+msgstr "家庭电话"
+
+# 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.etspec.h:21
+msgid "Home Phone 2"
+msgstr "家庭电话 2"
+
+# 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.etspec.h:24
+msgid "Mobile 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.etspec.h:29
+msgid "Other Address"
+msgstr "其它地址"
+
+# 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.etspec.h:31
+msgid "Other Phone"
+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.etspec.h:33
+msgid "Primary Phone"
+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
@@ -5971,7 +6012,7 @@ 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:1715
+#: calendar/gui/calendar-model.c:1721
#: calendar/gui/dialogs/task-details-page.glade.h:10
#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
msgid "Normal"
@@ -6246,7 +6287,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:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
#: widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr "警告"
@@ -6335,7 +6376,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:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
msgid "%a %d %b"
msgstr "%b %d %a"
@@ -6389,7 +6430,7 @@ msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
# calendar/gui/e-calendar-table.c:384
# calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
# calendar/gui/e-calendar-table.c:385
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
#: calendar/gui/e-calendar-table.c:397
msgid "Private"
msgstr "保密"
@@ -6400,7 +6441,7 @@ msgstr "保密"
# calendar/gui/e-calendar-table.c:385
# calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
# calendar/gui/e-calendar-table.c:386
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
#: calendar/gui/e-calendar-table.c:398
msgid "Confidential"
msgstr "机密"
@@ -6408,35 +6449,35 @@ msgstr "机密"
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
msgid "Public"
msgstr "公开"
# calendar/gui/calendar-model.c:536
# calendar/gui/calendar-model.c:536
# calendar/gui/calendar-model.c:536
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
msgid "N"
msgstr "北"
# calendar/gui/calendar-model.c:536
# calendar/gui/calendar-model.c:536
# calendar/gui/calendar-model.c:536
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
msgid "S"
msgstr "南"
# calendar/gui/calendar-model.c:538
# calendar/gui/calendar-model.c:538
# calendar/gui/calendar-model.c:538
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
msgid "E"
msgstr "东"
# calendar/gui/calendar-model.c:538
# calendar/gui/calendar-model.c:538
# calendar/gui/calendar-model.c:538
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
msgid "W"
msgstr "西"
@@ -6446,7 +6487,7 @@ msgstr "西"
# calendar/gui/e-calendar-table.c:457
# calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
# calendar/gui/e-calendar-table.c:458
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
#: calendar/gui/e-calendar-table.c:470
msgid "Free"
msgstr "放假"
@@ -6460,7 +6501,7 @@ msgstr "放假"
# calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
# calendar/gui/e-meeting-time-sel.c:432
# shell/evolution-shell-component.c:1042
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
#: calendar/gui/e-meeting-time-sel.c:438
#: shell/evolution-shell-component.c:1165
msgid "Busy"
@@ -6475,7 +6516,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:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
#: calendar/gui/dialogs/task-details-page.glade.h:11
#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
msgid "Not Started"
@@ -6490,7 +6531,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:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
#: calendar/gui/dialogs/task-details-page.glade.h:7
#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
msgid "In Progress"
@@ -6508,7 +6549,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:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
#: 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
@@ -6518,7 +6559,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:1049
+#: calendar/gui/calendar-model.c:1055
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -6550,11 +6591,11 @@ msgstr ""
# widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
# widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
#: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
@@ -6564,14 +6605,14 @@ msgstr "无"
# calendar/gui/calendar-model.c:1713
# calendar/gui/calendar-model.c:1713
# calendar/gui/calendar-model.c:1713
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
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:1719
+#: calendar/gui/calendar-model.c:1725
msgid "Assigned"
msgstr "已分派"
@@ -6584,7 +6625,7 @@ 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:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
#: calendar/gui/e-meeting-model.c:862
msgid "Yes"
@@ -6596,7 +6637,7 @@ 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:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
#: calendar/gui/e-meeting-model.c:863
msgid "No"
msgstr "否"
@@ -6635,7 +6676,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:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
msgid "Calendar"
@@ -6679,8 +6720,8 @@ msgstr "文件夹含有约会和事件"
#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
#: calendar/importers/icalendar-importer.c:704
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:311
-#: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
#: shell/e-shortcuts.c:1063
msgid "Tasks"
msgstr "任务"
@@ -6711,7 +6752,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:735
+#: calendar/gui/component-factory.c:750
#, fuzzy
msgid "New appointment"
msgstr "新建约会"
@@ -6719,7 +6760,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:735
+#: calendar/gui/component-factory.c:750
#, fuzzy
msgid "_Appointment"
msgstr "约会"
@@ -6727,14 +6768,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:736
+#: calendar/gui/component-factory.c:751
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:740
+#: calendar/gui/component-factory.c:755
#, fuzzy
msgid "New meeting"
msgstr "新闻来源设置"
@@ -6748,7 +6789,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:740
+#: calendar/gui/component-factory.c:755
#, fuzzy
msgid "_Meeting"
msgstr "会见"
@@ -6759,7 +6800,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:741
+#: calendar/gui/component-factory.c:756
#, fuzzy
msgid "Create a new meeting request"
msgstr "创建新任务"
@@ -6767,7 +6808,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:745
+#: calendar/gui/component-factory.c:760
#, fuzzy
msgid "New task"
msgstr "新建任务"
@@ -6775,7 +6816,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:745
+#: calendar/gui/component-factory.c:760
msgid "_Task"
msgstr "任务(_T)"
@@ -6785,14 +6826,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:746
+#: calendar/gui/component-factory.c:761
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:750
+#: calendar/gui/component-factory.c:765
#, fuzzy
msgid "New All Day Appointment"
msgstr "新建约会"
@@ -6800,7 +6841,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:750
+#: calendar/gui/component-factory.c:765
#, fuzzy
msgid "All _Day Appointment"
msgstr "新建约会(_A)"
@@ -6808,7 +6849,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:751
+#: calendar/gui/component-factory.c:766
#, fuzzy
msgid "Create a new all-day appointment"
msgstr "创建新约会"
@@ -7183,7 +7224,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "概要:"
@@ -7236,7 +7277,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:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
msgid "minute(s)"
msgstr "分钟"
@@ -7285,7 +7326,7 @@ msgstr "60 分钟"
# addressbook/gui/contact-editor/fulladdr.glade.h:4
# addressbook/gui/contact-editor/fulladdr.glade.h:4
# my-evolution/Locations.h:45
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
#, fuzzy
msgid "Alerts"
msgstr "阿尔伯达"
@@ -7329,7 +7370,7 @@ msgstr "天数"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
# calendar/gui/dialogs/recurrence-page.c:963
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
msgid "Friday"
msgstr "星期五"
@@ -7354,7 +7395,7 @@ msgstr "分钟"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
# calendar/gui/dialogs/recurrence-page.c:959
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
msgid "Monday"
msgstr "星期一"
@@ -7373,7 +7414,7 @@ msgstr "星期日(_N)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
# calendar/gui/dialogs/recurrence-page.c:964
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
msgid "Saturday"
msgstr "星期六"
@@ -7395,7 +7436,7 @@ msgstr "在日期浏览器中显示周数(_N)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
# calendar/gui/dialogs/recurrence-page.c:965
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
msgid "Sunday"
msgstr "星期日"
@@ -7429,7 +7470,7 @@ msgstr "任务列表(_T)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
# calendar/gui/dialogs/recurrence-page.c:962
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
msgid "Thursday"
msgstr "星期四"
@@ -7461,7 +7502,7 @@ msgstr "时间格式:"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
# calendar/gui/dialogs/recurrence-page.c:960
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
msgid "Tuesday"
msgstr "星期二"
@@ -7476,7 +7517,7 @@ msgstr ""
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
# calendar/gui/dialogs/recurrence-page.c:961
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
msgid "Wednesday"
msgstr "星期三"
@@ -7549,7 +7590,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:158
+#: mail/mail-config.glade.h:155
msgid "_General"
msgstr "常规(_G)"
@@ -7772,23 +7813,23 @@ msgstr "预定 "
# calendar/gui/dialogs/comp-editor.c:303
# calendar/gui/dialogs/comp-editor.c:303
# calendar/gui/dialogs/comp-editor.c:321
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
#, fuzzy
msgid "Could not update invalid object"
msgstr "无法更新对象!"
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
msgid "Object not found, not updated"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
msgid "You don't have permissions to update this object"
msgstr ""
# calendar/gui/dialogs/comp-editor.c:303
# calendar/gui/dialogs/comp-editor.c:303
# calendar/gui/dialogs/comp-editor.c:321
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
#, fuzzy
msgid "Could not update object"
msgstr "无法更新对象!"
@@ -7796,14 +7837,14 @@ msgstr "无法更新对象!"
# calendar/gui/dialogs/comp-editor.c:678
# calendar/gui/dialogs/comp-editor.c:678
# calendar/gui/dialogs/comp-editor.c:692
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
msgid "Edit Appointment"
msgstr "编辑约会"
# calendar/gui/dialogs/comp-editor.c:683
# calendar/gui/dialogs/comp-editor.c:683
# calendar/gui/dialogs/comp-editor.c:697
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
@@ -7811,7 +7852,7 @@ msgstr "约会 - %s"
# calendar/gui/dialogs/comp-editor.c:686
# calendar/gui/dialogs/comp-editor.c:686
# calendar/gui/dialogs/comp-editor.c:700
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
@@ -7819,7 +7860,7 @@ msgstr "任务 - %s"
# calendar/gui/dialogs/comp-editor.c:689
# calendar/gui/dialogs/comp-editor.c:689
# calendar/gui/dialogs/comp-editor.c:703
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
#, c-format
msgid "Journal entry - %s"
msgstr "日志条目 - %s"
@@ -7827,22 +7868,22 @@ msgstr "日志条目 - %s"
# calendar/gui/dialogs/comp-editor.c:703
# calendar/gui/dialogs/comp-editor.c:703
# calendar/gui/dialogs/comp-editor.c:717
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
msgid "No summary"
msgstr "没有概要"
# composer/e-msg-composer.c:943
# composer/e-msg-composer.c:947
# composer/e-msg-composer.c:912
-#: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
-#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
msgid "Save as..."
msgstr "另存为..."
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
msgid ""
"Changes made to this item may be discarded if an update arrives via email"
msgstr ""
@@ -7850,7 +7891,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:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
msgid "Unable to obtain current version!"
msgstr "无法获取当前版本!"
@@ -8244,7 +8285,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:905
+#: calendar/gui/e-itip-control.c:958
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
@@ -8274,7 +8315,7 @@ msgstr "角色"
# mail/message-list.etspec.h:9
#: calendar/gui/dialogs/meeting-page.etspec.h:10
#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
#: mail/message-list.etspec.h:12
msgid "Status"
msgstr "状态"
@@ -8392,22 +8433,26 @@ msgstr ""
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "该约会含有 Evolution 无法编辑的循环。"
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
# calendar/gui/dialogs/recurrence-page.c:932
# calendar/gui/dialogs/recurrence-page.c:932
# calendar/gui/dialogs/recurrence-page.c:932
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:1007
msgid "on"
msgstr "在"
# my-evolution/metar.c:262
# my-evolution/metar.c:262
# my-evolution/metar.c:262
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
#, fuzzy
msgid "first"
msgstr "霭"
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
msgid "second"
msgstr "秒"
@@ -8422,7 +8467,7 @@ msgstr "秒"
# addressbook/gui/contact-editor/e-contact-editor.c:1714
# mail/mail-config.glade.h:49
# my-evolution/Locations.h:1614
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
#, fuzzy
msgid "third"
msgstr "其它"
@@ -8430,7 +8475,7 @@ msgstr "其它"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/metar.c:64
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
#, fuzzy
msgid "fourth"
msgstr "北"
@@ -8438,7 +8483,7 @@ msgstr "北"
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# addressbook/gui/contact-editor/e-contact-save-as.c:170
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
#, fuzzy
msgid "last"
msgstr "列表"
@@ -8452,7 +8497,7 @@ msgstr "列表"
# addressbook/backend/ebook/e-card-simple.c:80
# addressbook/gui/contact-editor/e-contact-editor.c:1657
# addressbook/gui/widgets/e-addressbook-view.c:980
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
#, fuzzy
msgid "Other Date"
msgstr "其它传真"
@@ -8460,21 +8505,21 @@ msgstr "其它传真"
# calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
# calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
# calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
msgid "day"
msgstr "天"
# calendar/gui/dialogs/recurrence-page.c:1088
# calendar/gui/dialogs/recurrence-page.c:1088
# calendar/gui/dialogs/recurrence-page.c:1088
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
msgid "on the"
msgstr "在"
# calendar/gui/dialogs/recurrence-page.c:1269
# calendar/gui/dialogs/recurrence-page.c:1269
# calendar/gui/dialogs/recurrence-page.c:1269
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
msgid "occurrences"
msgstr "循环"
@@ -8656,7 +8701,7 @@ msgstr "进度"
# calendar/gui/dialogs/task-details-page.glade.h:12
# my-evolution/e-summary-preferences.c:966
#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
msgid "URL:"
msgstr "URL:"
@@ -8708,9 +8753,9 @@ msgstr "分派"
# calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:757
# calendar/gui/e-itip-control.glade.h:6
# composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
msgid "Description:"
msgstr "描述:"
@@ -8822,8 +8867,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:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
msgid "Deleting selected objects"
msgstr "删除选中的对象"
@@ -8836,8 +8881,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:3752
-#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
msgid "_Open"
msgstr "打开(_O)"
@@ -8859,8 +8904,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:3754
-#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
#: 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
@@ -8876,8 +8921,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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "剪切(_U)"
@@ -8894,8 +8939,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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 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"
@@ -8916,9 +8961,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:3723
-#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3526
-#: calendar/gui/e-week-view.c:3557 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 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"
@@ -8968,8 +9013,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:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
msgid "Updating objects"
msgstr "更新对象"
@@ -8998,7 +9043,7 @@ msgstr "提醒"
# calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
# camel/camel-filter-driver.c:1026
#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
msgid "Complete"
msgstr "完成"
@@ -9127,7 +9172,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:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
msgid "%A %d %B"
msgstr "%B %d %A"
@@ -9140,7 +9185,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:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
#: calendar/gui/e-week-view-main-item.c:347
msgid "%d %b"
msgstr "%b %d"
@@ -9152,7 +9197,7 @@ msgstr "%b %d"
# calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:350
# calendar/gui/print.c:768
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:377
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
#: calendar/gui/print.c:791
msgid "am"
msgstr "上午"
@@ -9164,7 +9209,7 @@ msgstr "上午"
# calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
# calendar/gui/print.c:770
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
#: calendar/gui/print.c:793
msgid "pm"
msgstr "下午"
@@ -9172,14 +9217,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:3707
+#: calendar/gui/e-day-view.c:3705
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:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
@@ -9192,7 +9237,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:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
#, fuzzy
msgid "New Meeting"
msgstr "会见"
@@ -9200,14 +9245,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:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
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:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
msgid "Print..."
msgstr "打印..."
@@ -9217,7 +9262,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:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
#: ui/evolution-calendar.xml.h:10
msgid "Go to _Today"
msgstr "转到今天(_T)"
@@ -9225,46 +9270,39 @@ 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:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
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:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
#: ui/evolution-calendar.xml.h:31
msgid "_Publish Free/Busy Information"
msgstr "发布忙闲信息(_P)"
-# mail/mail-local.c:1416
-# mail/mail-local.c:1416
-# executive-summary/component/e-summary-url.c:80
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
-#, fuzzy
-msgid "_Configure..."
-msgstr "配置 %s"
-
-# mail/mail-local.c:1416
-# mail/mail-local.c:1416
-# executive-summary/component/e-summary-url.c:80
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
+# ui/evolution-mail-global.xml.h:21
+# ui/evolution-mail-global.xml.h:21
+# ui/evolution-mail-global.xml.h:21
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
#, fuzzy
-msgid "_Configure Pilot..."
-msgstr "配置 %s"
+msgid "_Settings..."
+msgstr "邮件设置(_M)..."
# 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:3753 calendar/gui/e-week-view.c:3549
-#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 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:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
#, fuzzy
msgid "_Schedule Meeting..."
msgstr "调度会议(_M)"
@@ -9272,7 +9310,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:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
#, fuzzy
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_C)"
@@ -9280,49 +9318,32 @@ 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:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
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:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
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:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
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:4138 calendar/gui/e-week-view.c:3893
-#: shell/e-shell-view-menu.c:94
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "GNOME Pilot 工具好像并未安装到系统中。"
-
-# shell/e-shell-view-menu.c:585
-# shell/e-shell-view-menu.c:585
-# shell/e-shell-view-menu.c:585
-#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
-#: shell/e-shell-view-menu.c:102
-#, c-format
-msgid "Error executing %s."
-msgstr "执行 %s 错误。"
-
-#: calendar/gui/e-itip-control.c:590
+#: calendar/gui/e-itip-control.c:615
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:600
+#: calendar/gui/e-itip-control.c:625
#, fuzzy
msgid "<b>Ends:</b> "
msgstr "结束于:<b>"
@@ -9330,19 +9351,19 @@ 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:613
+#: calendar/gui/e-itip-control.c:638
#, fuzzy
msgid "<b>Completed:</b> "
msgstr "已完成 "
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
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:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
msgid "iCalendar Information"
msgstr "iCalendar 信息"
@@ -9350,14 +9371,15 @@ msgstr "iCalendar 信息"
# calendar/gui/e-itip-control.c:641
# calendar/gui/e-itip-control.c:644
#. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
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:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
msgid "An unknown person"
msgstr "未知的人"
@@ -9365,7 +9387,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:764
+#: calendar/gui/e-itip-control.c:817
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
@@ -9374,14 +9396,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:779
+#: calendar/gui/e-itip-control.c:832
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:789
+#: calendar/gui/e-itip-control.c:842
#, fuzzy
msgid "Location:"
msgstr "地理位置(_O):"
@@ -9389,7 +9411,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:803
+#: calendar/gui/e-itip-control.c:856
msgid "Status:"
msgstr "状态:"
@@ -9399,16 +9421,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:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
msgid "Accepted"
msgstr "接受"
# calendar/gui/e-itip-control.c:804
# calendar/gui/e-itip-control.c:804
# calendar/gui/e-itip-control.c:807
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
msgid "Tentatively Accepted"
msgstr "暂时接受"
@@ -9418,9 +9440,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:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
msgid "Declined"
msgstr "否决"
@@ -9443,7 +9465,7 @@ 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:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
#: 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:834
#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -9463,16 +9485,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:873 calendar/gui/e-itip-control.c:901
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:940
-#: calendar/gui/e-itip-control.c:953 calendar/gui/e-itip-control.c:966
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
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:874
+#: calendar/gui/e-itip-control.c:927
msgid "Update"
msgstr "更新"
@@ -9488,59 +9510,59 @@ 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:875 calendar/gui/e-itip-control.c:906
-#: calendar/gui/e-itip-control.c:929 calendar/gui/e-itip-control.c:942
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-itip-control.c:968
-#: shell/e-shell.c:2175 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 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:902
+#: calendar/gui/e-itip-control.c:955
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:903
+#: calendar/gui/e-itip-control.c:956
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:904
+#: calendar/gui/e-itip-control.c:957
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:928
+#: calendar/gui/e-itip-control.c:981
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:941
+#: calendar/gui/e-itip-control.c:994
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:954
+#: calendar/gui/e-itip-control.c:1007
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:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
@@ -9548,7 +9570,7 @@ 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:1045
+#: calendar/gui/e-itip-control.c:1101
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> 发布了会议信息。"
@@ -9556,14 +9578,22 @@ 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:1046
+#: calendar/gui/e-itip-control.c:1102
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:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> 请求您参加一个会议。"
+
+# 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:1109
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请求您参加一个会议。"
@@ -9571,14 +9601,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:1051
+#: calendar/gui/e-itip-control.c:1110
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:1055
+#: calendar/gui/e-itip-control.c:1114
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> 希望加入到已存的会议。"
@@ -9586,14 +9616,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:1056
+#: calendar/gui/e-itip-control.c:1115
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:1060
+#: calendar/gui/e-itip-control.c:1119
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> 想收到最新的会议信息。"
@@ -9601,14 +9631,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:1061
+#: calendar/gui/e-itip-control.c:1120
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:1068
+#: calendar/gui/e-itip-control.c:1127
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> 已回复一个会议请求。"
@@ -9616,14 +9646,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:1069
+#: calendar/gui/e-itip-control.c:1128
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:1076
+#: calendar/gui/e-itip-control.c:1135
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
@@ -9631,7 +9661,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:1077
+#: calendar/gui/e-itip-control.c:1136
msgid "Meeting Cancellation"
msgstr "会议取消"
@@ -9641,8 +9671,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:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> 发送了一个无法理解的信息。"
@@ -9650,14 +9680,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:1085
+#: calendar/gui/e-itip-control.c:1144
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:1106
+#: calendar/gui/e-itip-control.c:1168
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> 发布了任务信息。"
@@ -9665,14 +9695,22 @@ 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:1107
+#: calendar/gui/e-itip-control.c:1169
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:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> 请求您完成一个任务。"
+
+# 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:1176
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请求您完成一个任务。"
@@ -9680,14 +9718,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:1112
+#: calendar/gui/e-itip-control.c:1177
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:1116
+#: calendar/gui/e-itip-control.c:1181
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s<b> 希望加入到已存在的任务。"
@@ -9695,14 +9733,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:1117
+#: calendar/gui/e-itip-control.c:1182
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:1121
+#: calendar/gui/e-itip-control.c:1186
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> 希望获取最新的任务信息。"
@@ -9710,14 +9748,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:1122
+#: calendar/gui/e-itip-control.c:1187
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:1129
+#: calendar/gui/e-itip-control.c:1194
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> 已经回复了任务委派。"
@@ -9725,14 +9763,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:1130
+#: calendar/gui/e-itip-control.c:1195
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:1137
+#: calendar/gui/e-itip-control.c:1202
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> 取消了任务。"
@@ -9740,21 +9778,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:1138
+#: calendar/gui/e-itip-control.c:1203
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:1146
+#: calendar/gui/e-itip-control.c:1211
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:1165
+#: calendar/gui/e-itip-control.c:1230
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> 发布了忙闲信息。"
@@ -9762,14 +9800,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:1166
+#: calendar/gui/e-itip-control.c:1231
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:1170
+#: calendar/gui/e-itip-control.c:1235
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请求您的忙闲信息。"
@@ -9777,14 +9815,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:1171
+#: calendar/gui/e-itip-control.c:1236
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:1175
+#: calendar/gui/e-itip-control.c:1240
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> 应答了忙闲请求。"
@@ -9792,57 +9830,57 @@ 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:1176
+#: calendar/gui/e-itip-control.c:1241
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:1181
+#: calendar/gui/e-itip-control.c:1246
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:1236
+#: calendar/gui/e-itip-control.c:1320
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:1298
+#: calendar/gui/e-itip-control.c:1382
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:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
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:1357
+#: calendar/gui/e-itip-control.c:1441
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日程项目"
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
msgid "Object is invalid and cannot be updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
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:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
#, fuzzy
msgid "Object could not be found\n"
msgstr "无法发送项目!\n"
@@ -9850,7 +9888,7 @@ msgstr "无法发送项目!\n"
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1493
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
#, fuzzy
msgid "You do not have the right permissions to update the calendar\n"
msgstr "无法打开“%s”中的文件夹"
@@ -9858,39 +9896,39 @@ msgstr "无法打开“%s”中的文件夹"
# 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:1520
+#: calendar/gui/e-itip-control.c:1674
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:1523
+#: calendar/gui/e-itip-control.c:1677
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:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新参与者状态"
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
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:1585
+#: calendar/gui/e-itip-control.c:1739
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新参与者状态!\n"
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1493
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
#, fuzzy
msgid "You don't have the right permissions to update the calendar\n"
msgstr "无法打开“%s”中的文件夹"
@@ -9898,42 +9936,42 @@ msgstr "无法打开“%s”中的文件夹"
# 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:1612
+#: calendar/gui/e-itip-control.c:1766
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:1615
+#: calendar/gui/e-itip-control.c:1769
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:1650
+#: calendar/gui/e-itip-control.c:1804
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:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
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:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
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:1807
+#: calendar/gui/e-itip-control.c:1961
#, fuzzy
msgid "Select Calendar Folder"
msgstr "选择文件夹"
@@ -9941,7 +9979,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:1814
+#: calendar/gui/e-itip-control.c:1968
#, fuzzy
msgid "Select Tasks Folder"
msgstr "选择文件夹"
@@ -10310,8 +10348,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:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
@@ -10335,7 +10373,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:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
#, fuzzy, c-format
msgid "You don't have permission to open the folder in `%s'"
msgstr "无法打开“%s”中的文件夹"
@@ -10343,7 +10381,7 @@ msgstr "无法打开“%s”中的文件夹"
# shell/e-shell-importer.c:455
# shell/e-shell-importer.c:455
# shell/e-shell-importer.c:466
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
#, fuzzy, c-format
msgid ""
"Error on %s:\n"
@@ -10379,14 +10417,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:3515
+#: calendar/gui/e-week-view.c:3513
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:1524
+#: calendar/gui/gnome-cal.c:1530
#, c-format
msgid "Could not open the folder in `%s'"
msgstr "无法打开“%s”中的文件夹"
@@ -10394,7 +10432,7 @@ msgstr "无法打开“%s”中的文件夹"
# calendar/gui/gnome-cal.c:1510
# calendar/gui/gnome-cal.c:1510
# calendar/gui/gnome-cal.c:1504
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr "不支持打开“%s”必需的方法"
@@ -10403,12 +10441,12 @@ msgstr "不支持打开“%s”必需的方法"
# calendar/gui/alarm-notify/alarm-notify-dialog.c:371
# calendar/gui/alarm-notify/alarm-notify-dialog.c:371
#. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
#, fuzzy, c-format
msgid "Adding alarms for %s"
msgstr "在 %s 时提醒"
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
#, c-format
msgid ""
"The calendar backend for\n"
@@ -10416,7 +10454,7 @@ msgid ""
" has crashed. You will have to restart Evolution in order to use it again"
msgstr ""
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
#, c-format
msgid ""
"The task backend for\n"
@@ -10427,7 +10465,7 @@ msgstr ""
# calendar/gui/gnome-cal.c:1865
# calendar/gui/gnome-cal.c:1865
# calendar/gui/gnome-cal.c:1859
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
#, c-format
msgid "Opening calendar at %s"
msgstr "从 %s 打开日历"
@@ -10435,7 +10473,7 @@ msgstr "从 %s 打开日历"
# mail/mail-ops.c:1234
# mail/mail-ops.c:1236
# mail/mail-ops.c:1279
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
#, fuzzy
msgid "Opening default tasks folder"
msgstr "正在打开文件夹 %s"
@@ -10541,56 +10579,56 @@ msgstr "九月"
# calendar/gui/itip-utils.c:274
# calendar/gui/itip-utils.c:274
# calendar/gui/itip-utils.c:274
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
msgid "An organizer must be set."
msgstr "必须设定组织者。"
# calendar/gui/itip-utils.c:243
# calendar/gui/itip-utils.c:243
# calendar/gui/itip-utils.c:243
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
msgid "At least one attendee is necessary"
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:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
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:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
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:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
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:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
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:480
+#: calendar/gui/itip-utils.c:470
msgid "Calendar information"
msgstr "日历信息"
# calendar/gui/e-itip-control.c:787
# calendar/gui/e-itip-control.c:787
# calendar/gui/e-itip-control.c:790
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
#, fuzzy
msgid "Updated"
msgstr "更新"
@@ -10598,19 +10636,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:524
+#: calendar/gui/itip-utils.c:514
#, fuzzy
msgid "Refresh"
msgstr "刷新列表"
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
msgid "Counter-proposal"
msgstr ""
# calendar/gui/itip-utils.c:370
# calendar/gui/itip-utils.c:370
# calendar/gui/itip-utils.c:370
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "忙闲信息 (%s 到 %s)"
@@ -10618,14 +10656,14 @@ msgstr "忙闲信息 (%s 到 %s)"
# calendar/gui/itip-utils.c:382
# calendar/gui/itip-utils.c:382
# calendar/gui/itip-utils.c:382
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
msgid "iCalendar information"
msgstr "iCalendar 信息"
# calendar/gui/itip-utils.c:573
# calendar/gui/itip-utils.c:573
# calendar/gui/itip-utils.c:581
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
msgid "You must be an attendee of the event."
msgstr "您必须是事件的参与者。"
@@ -11069,8 +11107,8 @@ msgstr "打印日历"
# mail/mail-callbacks.c:2597 my-evolution/e-summary.c:605
# ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
-#: my-evolution/e-summary.c:619
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
msgid "Print Preview"
msgstr "打印预览"
@@ -11120,8 +11158,8 @@ msgstr ""
# mail/mail-callbacks.c:2142
# mail/mail-callbacks.c:2261
# calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2297
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
msgid "Do not ask me again."
msgstr "不要再次询问。"
@@ -13970,7 +14008,7 @@ msgstr "同步文件夹"
# camel/camel-filter-driver.c:921
# camel/camel-filter-driver.c:970
# camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "解析过滤规则错误: %s: %s"
@@ -13978,7 +14016,7 @@ msgstr "解析过滤规则错误: %s: %s"
# camel/camel-filter-driver.c:927
# camel/camel-filter-driver.c:976
# camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "执行过滤规则错误: %s: %s"
@@ -14023,14 +14061,14 @@ msgstr "在消息 %d 失败"
# camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
# camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:881
# camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
msgid "Syncing folder"
msgstr "正在同步文件夹"
# camel/camel-filter-driver.c:789
# camel/camel-filter-driver.c:838
# camel/camel-filter-driver.c:988
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
#, c-format
msgid "Getting message %d of %d"
msgstr "正在获取第 %d 个消息,共 %d 个"
@@ -14038,7 +14076,7 @@ msgstr "正在获取第 %d 个消息,共 %d 个"
# camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
# camel/camel-filter-driver.c:843 camel/camel-filter-driver.c:861
# camel/camel-filter-driver.c:1003
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
#, c-format
msgid "Failed at message %d of %d"
msgstr "在第 %d 个消息失败,共 %d 个"
@@ -14186,7 +14224,7 @@ msgstr "正在移动邮件"
msgid "Copying messages"
msgstr "把邮件复制到 %s"
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -14194,15 +14232,15 @@ msgid ""
"%s"
msgstr ""
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
msgid "Failed to parse gpg userid hint."
msgstr ""
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
msgid "Failed to parse gpg passphrase request."
msgstr ""
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -14212,20 +14250,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: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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
msgid "Cancelled."
msgstr "已取消"
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
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:793
+#: camel/camel-gpg-context.c:777
#, fuzzy, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "来自 POP 服务器的意外应答: %s"
@@ -14233,7 +14271,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:803
+#: camel/camel-gpg-context.c:787
#, fuzzy
msgid "No data provided"
msgstr "没有提供文件名。"
@@ -14241,7 +14279,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:848
+#: camel/camel-gpg-context.c:830
#, fuzzy
msgid "Failed to encrypt: No valid recipients specified."
msgstr "无法加密该邮件: 没有指明收件人"
@@ -14258,7 +14296,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:1103
+#: camel/camel-gpg-context.c:1082
#, fuzzy, c-format
msgid ""
"Failed to GPG %s message: %s\n"
@@ -14278,7 +14316,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:1109
+#: camel/camel-gpg-context.c:1088
#, fuzzy, c-format
msgid "Failed to GPG %s message: %s\n"
msgstr "缓冲邮件 %s 失败: %s"
@@ -14286,7 +14324,7 @@ 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:1219
+#: camel/camel-gpg-context.c:1197
#, fuzzy, c-format
msgid "Failed to execute gpg: %s"
msgstr "解码邮件失败。"
@@ -14294,9 +14332,9 @@ 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
#, fuzzy
msgid "Failed to execute gpg."
msgstr "解码邮件失败。"
@@ -14304,7 +14342,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:1313
+#: camel/camel-gpg-context.c:1290
#, fuzzy, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr "无法验证该邮件:无法创建临时文件: %s"
@@ -14679,7 +14717,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:1064
+#: camel/providers/imap/camel-imap-store.c:1059
msgid "Bad authentication response from server."
msgstr "来自服务器的无效认证应答。"
@@ -15118,7 +15156,7 @@ msgid "Error in application verification"
msgstr ""
# camel/camel-tcp-stream-ssl.c:438
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
#, c-format
msgid ""
"Issuer: %s\n"
@@ -15132,12 +15170,12 @@ msgstr ""
"签名: %s"
# camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
msgid "GOOD"
msgstr "好"
# camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
msgid "BAD"
msgstr "坏"
@@ -15165,7 +15203,7 @@ msgstr ""
# camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
# camel/camel-tcp-stream-ssl.c:447
#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -15180,6 +15218,40 @@ msgstr ""
"\n"
"您希望接受吗?"
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:104
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "证书 ID(_C):"
+
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:104
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "证书 ID(_C):"
+
# camel/camel-url.c:288
# camel/camel-url.c:288
# camel/camel-url.c:288
@@ -15259,7 +15331,7 @@ msgstr "无法重命名文件夹: %s: 没有该文件夹"
#: camel/providers/imap/camel-imap-command.c:224
#: camel/providers/imap/camel-imap-command.c:263
#: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
msgid "Operation cancelled"
msgstr "操作已取消"
@@ -15270,7 +15342,7 @@ msgstr "操作已取消"
# camel/camel-remote-store.c:484
# camel/providers/imap/camel-imap-command.c:274
#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "服务器意外地中止了连接: %s"
@@ -15514,7 +15586,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:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
msgid "Folders"
msgstr "文件夹"
@@ -15653,7 +15725,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:1087
+#: camel/providers/imap/camel-imap-store.c:1082
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
@@ -15664,7 +15736,7 @@ 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
#: camel/providers/smtp/camel-smtp-transport.c:482
#, c-format
msgid "No support for authentication type %s"
@@ -15673,7 +15745,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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%s请为 %s@%s 输入 IMAP 密码"
@@ -15684,7 +15756,7 @@ 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
#: camel/providers/smtp/camel-smtp-transport.c:523
msgid "You didn't enter a password."
msgstr "您没有输入密码。"
@@ -15692,7 +15764,7 @@ 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -15706,8 +15778,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:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
#, c-format
msgid "No such folder %s"
msgstr "没有文件夹 %s"
@@ -15715,7 +15787,7 @@ 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:1814
+#: camel/providers/imap/camel-imap-store.c:1805
#, fuzzy, c-format
msgid ""
"The folder name \"%s\" is invalid because it containes the character \"%c\""
@@ -15730,7 +15802,7 @@ msgstr "文件夹名不能含有回车符。"
# camel/providers/local/camel-mbox-summary.c:873
# camel/providers/local/camel-spool-summary.c:544
# camel/providers/local/camel-spool-summary.c:1110
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1817
#, fuzzy, c-format
msgid "Unknown parent folder: %s"
msgstr "未知的错误: %s"
@@ -15738,7 +15810,7 @@ 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:1862
+#: camel/providers/imap/camel-imap-store.c:1853
msgid "The parent folder is not allowed to contain subfolders"
msgstr "父文件夹不允许含有子文件夹"
@@ -16898,7 +16970,7 @@ msgstr "无法连接到在 %s 的 POP 服务器。"
# camel/providers/pop3/camel-pop3-store.c:407
# camel/providers/pop3/camel-pop3-store.c:407
#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
#, fuzzy, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -16923,7 +16995,7 @@ msgstr ""
# camel/providers/pop3/camel-pop3-store.c:198
# camel/providers/pop3/camel-pop3-store.c:198
# camel/providers/pop3/camel-pop3-store.c:198
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
#, fuzzy, c-format
msgid "Failed to authenticate on POP server %s: %s"
msgstr "无法认证到 KPOP 服务器: %s"
@@ -16931,7 +17003,7 @@ msgstr "无法认证到 KPOP 服务器: %s"
# camel/providers/pop3/camel-pop3-store.c:360
# camel/providers/pop3/camel-pop3-store.c:360
# camel/providers/pop3/camel-pop3-store.c:360
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
#, c-format
msgid "%sPlease enter the POP password for %s@%s"
msgstr "%s请为 %s@%s 输入 POP 密码"
@@ -16939,8 +17011,8 @@ msgstr "%s请为 %s@%s 输入 POP 密码"
# camel/providers/pop3/camel-pop3-store.c:415
# camel/providers/pop3/camel-pop3-store.c:415
# camel/providers/pop3/camel-pop3-store.c:415
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
#, fuzzy, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -16952,7 +17024,7 @@ msgstr ""
# camel/providers/pop3/camel-pop3-store.c:480
# camel/providers/pop3/camel-pop3-store.c:480
# camel/providers/pop3/camel-pop3-store.c:480
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
#, c-format
msgid "No such folder `%s'."
msgstr "没有文件夹“%s”。"
@@ -16964,7 +17036,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:110
+#: mail/mail-config.glade.h:109
msgid "Sendmail"
msgstr "Sendmail"
@@ -17551,21 +17623,21 @@ msgstr "附件"
# composer/e-msg-composer-attachment-bar.c:500
# composer/e-msg-composer-attachment-bar.c:506
# composer/e-msg-composer-attachment-bar.c:506
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
msgid "Remove selected items from the attachment list"
msgstr "从附件列表中删除选定的条目"
# composer/e-msg-composer-attachment-bar.c:531
# composer/e-msg-composer-attachment-bar.c:537
# composer/e-msg-composer-attachment-bar.c:537
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
msgid "Add attachment..."
msgstr "添加附件..."
# composer/e-msg-composer-attachment-bar.c:532
# composer/e-msg-composer-attachment-bar.c:538
# composer/e-msg-composer-attachment-bar.c:538
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
msgid "Attach a file to the message"
msgstr "把文件附件到邮件"
@@ -17624,7 +17696,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:364
+#: composer/e-msg-composer-hdrs.c:365
msgid "Click here for the address book"
msgstr "点击此处以使用地址簿"
@@ -17638,7 +17710,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:399
+#: composer/e-msg-composer-hdrs.c:400
msgid "Reply-To:"
msgstr "回复到:"
@@ -17648,7 +17720,7 @@ msgstr "回复到:"
#.
#. * From
#.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
msgid "From:"
msgstr "发件人:"
@@ -17658,49 +17730,49 @@ msgstr "发件人:"
#.
#. * Subject
#.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
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:430
+#: composer/e-msg-composer-hdrs.c:431
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:431
+#: composer/e-msg-composer-hdrs.c:432
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:434
+#: composer/e-msg-composer-hdrs.c:435
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:435
+#: composer/e-msg-composer-hdrs.c:436
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:438
+#: composer/e-msg-composer-hdrs.c:439
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:439
+#: composer/e-msg-composer-hdrs.c:440
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -17712,7 +17784,7 @@ msgstr "输入将接收该邮件副本,但不出现在收件人列表中的收
#.
#. * Post-To
#.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
#, fuzzy
msgid "Post To:"
msgstr "波尔图"
@@ -17720,7 +17792,7 @@ 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:448
+#: composer/e-msg-composer-hdrs.c:449
#, fuzzy
msgid "Posting destination"
msgstr "无描述"
@@ -17731,7 +17803,7 @@ msgstr "无描述"
# ui/evolution-message-composer.xml.h:2
# composer/e-msg-composer-select-file.c:291
# ui/evolution-message-composer.xml.h:2
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
#: ui/evolution-message-composer.xml.h:2
msgid "Attach a file"
msgstr "附件一个文件"
@@ -18046,7 +18118,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:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
#: mail/mail-display.c:192
msgid ""
"A file by that name already exists.\n"
@@ -18221,7 +18293,7 @@ msgid "%I %p"
msgstr "%I %p"
#: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
msgid "seconds"
msgstr "秒"
@@ -18354,22 +18426,22 @@ msgstr ""
"常规表达式错误 “%s”:\n"
"%s"
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
msgid "Important"
msgstr "重要"
# my-evolution/Locations.h:508
#. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
#, fuzzy
msgid "Work"
msgstr "科克"
# my-evolution/Locations.h:1795
#. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
#, fuzzy
msgid "Personal"
msgstr "波纳尔"
@@ -18378,8 +18450,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:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
#, fuzzy
msgid "To Do"
msgstr "多哥"
@@ -18388,7 +18460,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:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
#, fuzzy
msgid "Later"
msgstr "之后"
@@ -18553,66 +18625,143 @@ msgid "Beep"
msgstr "伯利兹"
#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "含有"
+
+#: filter/libfilter-i18n.h:8
msgid "Copy to Folder"
msgstr "复制到文件夹"
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
msgid "Date received"
msgstr "接收日期"
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
msgid "Date sent"
msgstr "发送日期"
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
msgid "Deleted"
msgstr "已删除"
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "不含有"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "不以之结尾"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "不存在"
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "不存在"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "听起来不像"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "不以之开始"
+
+#: filter/libfilter-i18n.h:19
msgid "Do Not Exist"
msgstr "不存在"
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
msgid "Draft"
msgstr "草稿"
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "以之结束"
+
+#: filter/libfilter-i18n.h:22
msgid "Exist"
msgstr "存在"
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "存在"
+
+#: filter/libfilter-i18n.h:24
msgid "Expression"
msgstr "表达式"
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
msgid "Follow Up"
msgstr ""
+#: filter/libfilter-i18n.h:27
+msgid "is"
+msgstr "是"
+
+#: filter/libfilter-i18n.h:28
+msgid "is after"
+msgstr "以后"
+
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "以前"
+
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "已标志"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "大于"
+
+#: filter/libfilter-i18n.h:32
+msgid "is less than"
+msgstr "小于"
+
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "不是"
+
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "已标志"
+
# ui/evolution-mail-message.xml.h:98
# ui/evolution-mail-message.xml.h:98
# my-evolution/Locations.h:1192
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
#, fuzzy
msgid "Label"
msgstr "劳雷尔"
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
msgid "Mailing list"
msgstr "邮件列表"
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
msgid "Message Body"
msgstr "邮件体"
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
msgid "Message Header"
msgstr "邮件头"
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
msgid "Move to Folder"
msgstr "移动到文件夹"
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
#, fuzzy
msgid "Pipe Message to Shell Command"
msgstr "执行 Shell 命令"
@@ -18620,186 +18769,105 @@ msgstr "执行 Shell 命令"
# calendar/gui/dialogs/alarm-options.glade.h:3
# calendar/gui/dialogs/alarm-options.glade.h:3
# calendar/gui/dialogs/alarm-options.glade.h:3
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
#, fuzzy
msgid "Play Sound"
msgstr "播放声音:"
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
msgid "Read"
msgstr "已读"
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
msgid "Recipients"
msgstr "收件人"
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
msgid "Regex Match"
msgstr "常规表达式匹配"
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
msgid "Replied to"
msgstr "已回复"
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+# addressbook/backend/ebook/e-card-simple.c:65
+# addressbook/backend/ebook/e-card-simple.c:70
+# addressbook/backend/ebook/e-card-simple.c:65
+# addressbook/backend/ebook/e-card-simple.c:70
+# my-evolution/Locations.h:327
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "伯恩斯"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "大于"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "小于"
# mail/message-list.etspec.h:5
# mail/message-list.etspec.h:6
# mail/message-list.etspec.h:6
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
#: mail/message-list.etspec.h:10
msgid "Score"
msgstr "分数"
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
msgid "Sender"
msgstr "发件人"
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
msgid "Set Status"
msgstr "设置状态"
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
#, fuzzy
msgid "Shell Command"
msgstr "执行 Shell 命令"
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
msgid "Size (kB)"
msgstr "大小 (kB)"
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "听起来象"
+
+#: filter/libfilter-i18n.h:55
msgid "Source Account"
msgstr "来源帐号"
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
msgid "Specific header"
msgstr "指定邮件头"
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "以之开始"
+
+#: filter/libfilter-i18n.h:59
msgid "Stop Processing"
msgstr "停止处理"
# mail/message-list.etspec.h:9
# mail/message-list.etspec.h:10
# mail/message-list.etspec.h:10
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
msgid "Subject"
msgstr "主题"
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
#, fuzzy
msgid "Unset Status"
msgstr "设置状态"
-#: filter/libfilter-i18n.h:41
-msgid "contains"
-msgstr "含有"
-
-#: filter/libfilter-i18n.h:42
-msgid "does not contain"
-msgstr "不含有"
-
-#: filter/libfilter-i18n.h:43
-msgid "does not end with"
-msgstr "不以之结尾"
-
-#: filter/libfilter-i18n.h:44
-msgid "does not exist"
-msgstr "不存在"
-
-#: filter/libfilter-i18n.h:45
-#, fuzzy
-msgid "does not return"
-msgstr "不存在"
-
-#: filter/libfilter-i18n.h:46
-msgid "does not sound like"
-msgstr "听起来不像"
-
-#: filter/libfilter-i18n.h:47
-msgid "does not start with"
-msgstr "不以之开始"
-
-#: filter/libfilter-i18n.h:48
-msgid "ends with"
-msgstr "以之结束"
-
-#: filter/libfilter-i18n.h:49
-msgid "exists"
-msgstr "存在"
-
-# mail/message-list.etspec.h:2
-# mail/message-list.etspec.h:2
-# mail/message-list.etspec.h:2
-#: filter/libfilter-i18n.h:50
-#, fuzzy
-msgid "is Flagged"
-msgstr "已标志"
-
-#: filter/libfilter-i18n.h:51
-msgid "is after"
-msgstr "以后"
-
-#: filter/libfilter-i18n.h:52
-msgid "is before"
-msgstr "以前"
-
-#: filter/libfilter-i18n.h:53
-msgid "is greater than"
-msgstr "大于"
-
-#: filter/libfilter-i18n.h:54
-msgid "is less than"
-msgstr "小于"
-
-# mail/message-list.etspec.h:2
-# mail/message-list.etspec.h:2
-# mail/message-list.etspec.h:2
-#: filter/libfilter-i18n.h:55
-#, fuzzy
-msgid "is not Flagged"
-msgstr "已标志"
-
-#: filter/libfilter-i18n.h:56
-msgid "is not"
-msgstr "不是"
-
-#: filter/libfilter-i18n.h:57
-msgid "is"
-msgstr "是"
-
-#: filter/libfilter-i18n.h:58
-#, fuzzy
-msgid "returns greater than"
-msgstr "大于"
-
-#: filter/libfilter-i18n.h:59
-#, fuzzy
-msgid "returns less than"
-msgstr "小于"
-
-# addressbook/backend/ebook/e-card-simple.c:65
-# addressbook/backend/ebook/e-card-simple.c:70
-# addressbook/backend/ebook/e-card-simple.c:65
-# addressbook/backend/ebook/e-card-simple.c:70
-# my-evolution/Locations.h:327
-#: filter/libfilter-i18n.h:60
-#, fuzzy
-msgid "returns"
-msgstr "伯恩斯"
-
-#: filter/libfilter-i18n.h:61
-msgid "sounds like"
-msgstr "听起来象"
-
-#: filter/libfilter-i18n.h:62
-msgid "starts with"
-msgstr "以之开始"
-
#: filter/rule-editor.c:180
msgid "Rules"
msgstr "规则"
@@ -19175,7 +19243,7 @@ msgstr "没有循环(_N)"
msgid "Mail Accounts"
msgstr "帐号"
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
msgid "Mail Preferences"
msgstr ""
@@ -19343,7 +19411,7 @@ 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:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
#, fuzzy
msgid "Connecting..."
msgstr "正在连接服务器..."
@@ -19351,7 +19419,7 @@ msgstr "正在连接服务器..."
# mail/component-factory.c:1206
# mail/component-factory.c:1206
# mail/component-factory.c:1211
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
msgid "Cannot register storage with shell"
msgstr "无法用 shell 注册存储"
@@ -19446,7 +19514,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:1113
+#: mail/folder-browser.c:1118
#, fuzzy
msgid "Create _Virtual Folder From Search..."
msgstr "从邮件创建虚拟文件夹(_V)"
@@ -19454,102 +19522,102 @@ msgstr "从邮件创建虚拟文件夹(_V)"
# mail/folder-browser.c:1430
# mail/folder-browser.c:1437
# mail/folder-browser.c:1438
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
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:1694
+#: mail/folder-browser.c:1703
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:1695
+#: mail/folder-browser.c:1704
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:1696
+#: mail/folder-browser.c:1705
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:1700
+#: mail/folder-browser.c:1709
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:1701
+#: mail/folder-browser.c:1710
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:1702
+#: mail/folder-browser.c:1711
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:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
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:1721
+#: mail/folder-browser.c:1730
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:1723
+#: mail/folder-browser.c:1732
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:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 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:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 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:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 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:1730
+#: mail/folder-browser.c:1739
msgid "_Forward"
msgstr "转发(_F)"
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
msgid "Follo_w Up..."
msgstr ""
@@ -19565,7 +19633,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:1735
+#: mail/folder-browser.c:1744
#, fuzzy
msgid "Fla_g Completed"
msgstr "已完成"
@@ -19574,7 +19642,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:1736
+#: mail/folder-browser.c:1745
#, fuzzy
msgid "Cl_ear Flag"
msgstr "清除"
@@ -19583,14 +19651,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:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 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:1741
+#: mail/folder-browser.c:1750
#, fuzzy
msgid "Mark as _Unread"
msgstr "标记为未读(_N)"
@@ -19598,14 +19666,14 @@ msgstr "标记为未读(_N)"
# mail/folder-browser.c:1461
# mail/folder-browser.c:1468
# mail/folder-browser.c:1469
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
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:1743
+#: mail/folder-browser.c:1752
#, fuzzy
msgid "_Mark as Unimportant"
msgstr "标记为不重要(_O)"
@@ -19613,7 +19681,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:1748
+#: mail/folder-browser.c:1757
#, fuzzy
msgid "U_ndelete"
msgstr "反删除(_U)"
@@ -19621,7 +19689,7 @@ msgstr "反删除(_U)"
# mail/folder-browser.c:1466
# mail/folder-browser.c:1475
# mail/folder-browser.c:1476
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
#, fuzzy
msgid "Mo_ve to Folder..."
msgstr "移动到文件夹(_M)..."
@@ -19629,14 +19697,14 @@ msgstr "移动到文件夹(_M)..."
# mail/folder-browser.c:1467
# mail/folder-browser.c:1476
# mail/folder-browser.c:1477
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 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:1761
+#: mail/folder-browser.c:1770
#, fuzzy
msgid "Add Sender to Address_book"
msgstr "将发件人添加到地址簿"
@@ -19644,7 +19712,7 @@ msgstr "将发件人添加到地址簿"
# mail/folder-browser.c:1476
# mail/folder-browser.c:1485
# mail/folder-browser.c:1486
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
#, fuzzy
msgid "Appl_y Filters"
msgstr "应用过滤规则"
@@ -19652,7 +19720,7 @@ msgstr "应用过滤规则"
# mail/folder-browser.c:1478
# mail/folder-browser.c:1487
# mail/folder-browser.c:1488
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
#, fuzzy
msgid "Crea_te Rule From Message"
msgstr "从消息创建规则(_L)"
@@ -19660,7 +19728,7 @@ msgstr "从消息创建规则(_L)"
# mail/folder-browser.c:1629
# mail/folder-browser.c:1657
# mail/folder-browser.c:1658
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
#, fuzzy
msgid "VFolder on M_ailing List"
msgstr "关于邮件列表的虚拟文件夹"
@@ -19668,7 +19736,7 @@ msgstr "关于邮件列表的虚拟文件夹"
# mail/folder-browser.c:1631
# mail/folder-browser.c:1659
# mail/folder-browser.c:1660
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
#, fuzzy, c-format
msgid "Filter on _Mailing List (%s)"
msgstr "过滤邮件列表 (%s)"
@@ -19676,7 +19744,7 @@ msgstr "过滤邮件列表 (%s)"
# mail/folder-browser.c:1632
# mail/folder-browser.c:1660
# mail/folder-browser.c:1661
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
#, fuzzy, c-format
msgid "VFolder on M_ailing List (%s)"
msgstr "关于邮件列表 (%s) 的虚拟文件夹"
@@ -19684,7 +19752,7 @@ msgstr "关于邮件列表 (%s) 的虚拟文件夹"
# mail/mail-config.glade.h:23
# mail/folder-browser.h:26
# mail/folder-browser.h:26
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
msgid "Default"
msgstr "默认"
@@ -19797,14 +19865,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:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
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:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
#, fuzzy
msgid "User_name:"
msgstr "用户名(_U):"
@@ -19812,7 +19880,7 @@ 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:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
msgid "_Path:"
msgstr "路径(_P):"
@@ -19848,8 +19916,8 @@ msgstr "确实删除帐号?"
# mail/mail-accounts.c:194
# mail/mail-accounts.c:194
#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
msgid "Disable"
msgstr "禁用"
@@ -19857,8 +19925,8 @@ msgstr "禁用"
# mail/mail-accounts.c:196
# mail/mail-accounts.c:196
#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
msgid "Enable"
msgstr "启用"
@@ -19866,7 +19934,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:54
+#: mail/mail-config.glade.h:53
msgid "Enabled"
msgstr "已启用"
@@ -20055,35 +20123,35 @@ msgstr ""
# mail/mail-callbacks.c:838
# mail/mail-callbacks.c:928
# mail/mail-callbacks.c:878
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
msgid "an unknown sender"
msgstr "未知的发件人"
# mail/mail-callbacks.c:843
# mail/mail-callbacks.c:933
# mail/mail-callbacks.c:883
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 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:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 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:2380
+#: mail/mail-callbacks.c:2381
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr "您确信您需要编辑所有的 %d 个消息?"
@@ -20091,7 +20159,7 @@ msgstr "您确信您需要编辑所有的 %d 个消息?"
# mail/mail-callbacks.c:1784
# mail/mail-callbacks.c:1903
# mail/mail-callbacks.c:1939
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2406
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -20102,7 +20170,7 @@ msgstr ""
# mail/mail-callbacks.c:1823
# mail/mail-callbacks.c:1942
# mail/mail-callbacks.c:1978
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
msgid ""
"You may only resend messages\n"
"in the Sent folder."
@@ -20113,7 +20181,7 @@ msgstr ""
# mail/mail-callbacks.c:1837
# mail/mail-callbacks.c:1956
# mail/mail-callbacks.c:1992
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr "您确信您希望重新发送所有的 %d 个消息?"
@@ -20121,7 +20189,7 @@ msgstr "您确信您希望重新发送所有的 %d 个消息?"
# mail/mail-callbacks.c:1863
# mail/mail-callbacks.c:1982
# mail/mail-callbacks.c:2018
-#: mail/mail-callbacks.c:2484
+#: mail/mail-callbacks.c:2485
msgid "No Message Selected"
msgstr "没有选择消息"
@@ -20131,33 +20199,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:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
msgid "Overwrite file?"
msgstr "覆盖文件?"
# mail/mail-callbacks.c:1962
# mail/mail-callbacks.c:2081
# mail/mail-callbacks.c:2117
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
msgid "Save Message As..."
msgstr "消息另存为..."
# mail/mail-callbacks.c:1964
# mail/mail-callbacks.c:2083
# mail/mail-callbacks.c:2119
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
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:2654
+#: mail/mail-callbacks.c:2655
#, fuzzy
msgid "Go to next folder with unread messages?"
msgstr "显示下一个未读文件"
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
msgid ""
"There are no more new messages in this folder.\n"
"Would you like to go to the next folder?"
@@ -20166,7 +20234,7 @@ msgstr ""
# mail/mail-callbacks.c:2135
# mail/mail-callbacks.c:2254
# mail/mail-callbacks.c:2290
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
msgid ""
"This operation will permanently erase all messages marked as deleted. If you "
"continue, you will not be able to recover these messages.\n"
@@ -20181,7 +20249,7 @@ msgstr ""
# mail/mail-callbacks.c:2250
# mail/mail-callbacks.c:2369
# mail/mail-callbacks.c:2405
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -20193,14 +20261,14 @@ msgstr ""
# mail/mail-callbacks.c:2262
# mail/mail-callbacks.c:2381
# mail/mail-callbacks.c:2417
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
msgid "Filters"
msgstr "过滤规则"
# camel/camel-filter-driver.c:789
# camel/camel-filter-driver.c:838
# mail/mail-callbacks.c:2490
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
#, c-format
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
@@ -20208,27 +20276,27 @@ msgstr "第 %d 页,共 %d 页"
# mail/mail-callbacks.c:2325
# mail/mail-callbacks.c:2465
# mail/mail-callbacks.c:2542
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
msgid "Print Message"
msgstr "打印消息"
# mail/mail-callbacks.c:2492
# mail/mail-callbacks.c:2569
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
msgid "US-Letter"
msgstr "美国信纸"
# mail/mail-callbacks.c:2371
# mail/mail-callbacks.c:2531
# mail/mail-callbacks.c:2604
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
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:3386
+#: mail/mail-callbacks.c:3387
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr "您确信您希望在单独的窗口中打开所有的 %d 个消息?"
@@ -20242,33 +20310,25 @@ msgstr ""
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:119
# my-evolution/e-summary-calendar.c:395
-#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
-#: mail/mail-composer-prefs.c:413
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
#, fuzzy
msgid " [script]"
msgstr "无描述"
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
msgid "Please specify a valid script name"
msgstr ""
# addressbook/gui/component/select-names/e-select-names-popup.c:506
# addressbook/gui/component/select-names/e-select-names-popup.c:506
# addressbook/gui/component/select-names/e-select-names-popup.c:506
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
#, fuzzy
msgid "Unnamed"
msgstr "未命名的联系人"
-# ui/evolution-message-composer.xml.h:27
-# ui/evolution-message-composer.xml.h:27
-# ui/evolution-message-composer.xml.h:27
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "发送"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
#, fuzzy
msgid "Add script signature"
msgstr "添加条件"
@@ -20276,7 +20336,7 @@ msgstr "添加条件"
# mail/mail-account-gui.c:1039
# mail/mail-account-gui.c:1039
# mail/mail-account-gui.c:1036
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
#, fuzzy
msgid "Add Signature"
msgstr "保存签名"
@@ -20346,14 +20406,14 @@ msgstr ""
# mail/mail-config-druid.c:599
# mail/mail-config-druid.c:599
#. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
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:636
+#: mail/mail-config.c:622
#, c-format
msgid "Account %d"
msgstr "帐号 %d"
@@ -20361,60 +20421,53 @@ msgstr "帐号 %d"
# mail/mail-config.c:2113
# mail/mail-config.c:2155
# mail/mail-config.c:2248
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
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:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
msgid "Connecting to server..."
msgstr "正在连接服务器..."
-# my-evolution/metar.c:29
-# my-evolution/metar.c:29
-#: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr " 摄氏度"
-
# mail/mail-config.glade.h:1
# mail/mail-config.glade.h:1
# mail/mail-config.glade.h:1
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:1
msgid " _Check for supported types "
msgstr "检查支持的类型(_C) "
# mail/mail-config.glade.h:3
# mail/mail-config.glade.h:3
# mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
msgid "(SSL is not supported in this build of Evolution)"
msgstr "(在该版本的 evolution 中不支持SSL)"
# mail/mail-config.glade.h:3
# mail/mail-config.glade.h:3
# mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
msgid "(SSL is not supported in this build of evolution)"
msgstr "(在该版本的 evolution 中不支持SSL)"
# mail/mail-config.glade.h:4
# mail/mail-config.glade.h:4
# mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
msgid "A_lways encrypt to myself when sending encrypted mail"
msgstr "当发送加密邮件时总是对自身加密(_L)"
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
msgstr ""
# mail/mail-config.c:326
# mail/mail-config.c:329
# mail/mail-config.c:354
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
#, fuzzy
msgid "Account Editor"
msgstr "帐号 %d"
@@ -20422,18 +20475,18 @@ msgstr "帐号 %d"
# mail/mail-config.glade.h:6
# mail/mail-config.glade.h:6
# mail/mail-config.glade.h:6
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
msgid "Account Information"
msgstr "帐号信息"
# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Account Management"
msgstr "帐号管理"
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
#, fuzzy
msgid "Add Sc_ript"
msgstr "添加条件"
@@ -20441,7 +20494,7 @@ msgstr "添加条件"
# mail/mail-account-gui.c:1039
# mail/mail-account-gui.c:1039
# mail/mail-account-gui.c:1036
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
#, fuzzy
msgid "Add new signature..."
msgstr "保存签名"
@@ -20449,7 +20502,7 @@ msgstr "保存签名"
# mail/mail-config.glade.h:4
# mail/mail-config.glade.h:4
# mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
#, fuzzy
msgid "Al_ways encrypt to myself when sending encrypted mail"
msgstr "当发送加密邮件时总是对自身加密(_L)"
@@ -20457,27 +20510,27 @@ msgstr "当发送加密邮件时总是对自身加密(_L)"
# mail/mail-config.glade.h:10
# mail/mail-config.glade.h:10
# mail/mail-config.glade.h:10
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
#, fuzzy
msgid "Alwa_ys sign outgoing messages when using this account"
msgstr "当使用该帐号的时候总是签名发送的邮件(_S)"
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
msgid "Always _blind carbon-copy (Bcc) to:"
msgstr ""
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
msgid "Always _carbon-copy (Cc) to:"
msgstr ""
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
msgid "Always _trust keys in my keyring when encrypting"
msgstr ""
# composer/e-msg-composer-attachment-bar.c:532
# composer/e-msg-composer-attachment-bar.c:538
# composer/e-msg-composer-attachment-bar.c:538
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
#, fuzzy
msgid "Attach original message"
msgstr "把文件附件到邮件"
@@ -20485,37 +20538,37 @@ msgstr "把文件附件到邮件"
# mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
# mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
# mail/mail-config.glade.h:13 mail/message-list.etspec.h:1
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
msgid "Attachment"
msgstr "附件"
# mail/mail-config.glade.h:12
# mail/mail-config.glade.h:12
# mail/mail-config.glade.h:14
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
msgid "Authentication"
msgstr "身份验证"
# mail/mail-config.glade.h:94
# mail/mail-config.glade.h:94
# mail/mail-config.glade.h:103
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
#, fuzzy
msgid "Automatically _detect links"
msgstr "自动检查新邮件(_A)"
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
msgid "Baltic (ISO-8859-13)"
msgstr ""
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
msgid "Baltic (ISO-8859-4)"
msgstr ""
# widgets/misc/e-charset-picker.c:159
# widgets/misc/e-charset-picker.c:159
# widgets/misc/e-charset-picker.c:162
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
#, fuzzy
msgid "C_haracter set:"
msgstr "未知的字符集:%s"
@@ -20526,26 +20579,26 @@ msgstr "未知的字符集:%s"
# ui/evolution-comp-editor.xml.h:1
# calendar/gui/alarm-notify/alarm-notify.glade.h:1
# ui/evolution-comp-editor.xml.h:1
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
#, fuzzy
msgid "C_olors"
msgstr "关闭(_L)"
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
msgid "Check spelling while I _type"
msgstr ""
# mail/mail-config.glade.h:13
# mail/mail-config.glade.h:13
# mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
msgid "Checking for New Mail"
msgstr "正在检查新邮件"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
#, fuzzy
msgid "Color for _misspelled words:"
msgstr "今天到期任务的颜色"
@@ -20553,21 +20606,21 @@ msgstr "今天到期任务的颜色"
# composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
# composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
# mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
msgid "Composing Messages"
msgstr "正在撰写邮件"
# mail/mail-config.glade.h:15
# mail/mail-config.glade.h:15
# mail/mail-config.glade.h:19
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
msgid "Configuration"
msgstr "配置"
# mail/mail-config.glade.h:17
# mail/mail-config.glade.h:17
# mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -20586,14 +20639,14 @@ msgstr ""
# mail/mail-config.glade.h:23
# mail/mail-config.glade.h:23
# mail/mail-config.glade.h:27
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
msgid "De_fault"
msgstr "默认(_F)"
# mail/mail-config.glade.h:23
# mail/folder-browser.h:26
# mail/folder-browser.h:26
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
#, fuzzy
msgid "Default Behavior"
msgstr "默认"
@@ -20601,7 +20654,7 @@ msgstr "默认"
# mail/mail-config.glade.h:25
# mail/mail-config.glade.h:25
# mail/mail-config.glade.h:29
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
#, fuzzy
msgid "Default character _encoding:"
msgstr "默认字符编码: "
@@ -20609,7 +20662,7 @@ msgstr "默认字符编码: "
# mail/mail-ops.c:249
# mail/mail-ops.c:250
# mail/mail-ops.c:258
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
#, fuzzy
msgid "Deleting Mail"
msgstr "正在收取邮件"
@@ -20617,33 +20670,33 @@ msgstr "正在收取邮件"
# mail/mail-config.glade.h:27
# mail/mail-config.glade.h:27
# mail/mail-config.glade.h:32
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
msgid "Digital IDs..."
msgstr "数字标识..."
# camel/camel-filter-driver.c:692
# camel/camel-filter-driver.c:741
# camel/camel-filter-driver.c:893
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
#, fuzzy
msgid "Do not quote original message"
msgstr "无法打开消息"
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
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:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
msgid "Done"
msgstr "完成"
# mail/mail-config.glade.h:97
# mail/mail-config.glade.h:97
# mail/mail-config.glade.h:106
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
#, fuzzy
msgid "Drafts _folder:"
msgstr "草稿文件夹(_D):"
@@ -20651,14 +20704,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:49
+#: mail/mail-config.glade.h:48
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:50
+#: mail/mail-config.glade.h:49
#, fuzzy
msgid "Emacs"
msgstr "东"
@@ -20666,7 +20719,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:51
+#: mail/mail-config.glade.h:50
#, fuzzy
msgid "Email Accounts"
msgstr "电子邮件含有"
@@ -20674,7 +20727,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:52
+#: mail/mail-config.glade.h:51
#, fuzzy
msgid "Email _address:"
msgstr "电子邮件地址(_E):"
@@ -20682,17 +20735,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:53
+#: mail/mail-config.glade.h:52
#, fuzzy
msgid "Empty _trash folders on exit"
msgstr "退出时清空已删除邮件(_E)"
# mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
msgid "Execute Command..."
msgstr "执行命令..."
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
#, fuzzy
msgid "Fi_xed -width:"
msgstr "以之结束"
@@ -20700,7 +20753,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:57
+#: mail/mail-config.glade.h:56
#, fuzzy
msgid "Font Properties"
msgstr "属性"
@@ -20708,7 +20761,7 @@ msgstr "属性"
# mail/mail-ops.c:1191
# mail/mail-ops.c:1193
# mail/mail-ops.c:1236
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
#, fuzzy
msgid "Format messages in _HTML"
msgstr "已转发邮件"
@@ -20716,14 +20769,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:59
+#: mail/mail-config.glade.h:58
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:60
+#: mail/mail-config.glade.h:59
#, fuzzy
msgid "Highlight _quotations with"
msgstr "突出显示引文,使用(_H)"
@@ -20731,28 +20784,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:61
+#: mail/mail-config.glade.h:60
msgid "IMAPv4 "
msgstr "IMAPv4"
# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
# mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
msgid "Identity"
msgstr "标识"
# mail/mail-config.glade.h:39
# mail/mail-config.glade.h:39
# mail/mail-config.glade.h:46
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
msgid "Inline"
msgstr "嵌入"
# mail/mail-config.glade.h:40
# mail/mail-config.glade.h:40
# mail/mail-config.glade.h:47
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
msgid "Kerberos "
msgstr "Kerberos"
@@ -20765,7 +20818,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:66
+#: mail/mail-config.glade.h:65
#, fuzzy
msgid "Labels and Colors"
msgstr "保存并关闭"
@@ -20773,7 +20826,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:68
+#: mail/mail-config.glade.h:67
#, fuzzy
msgid "Loading Images"
msgstr "装入图像(_I)"
@@ -20781,21 +20834,21 @@ msgstr "装入图像(_I)"
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:48
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
msgid "Mail Configuration"
msgstr "邮件配置"
# mail/mail-config.glade.h:43
# mail/mail-config.glade.h:43
# mail/mail-config.glade.h:50
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
msgid "Mailbox location"
msgstr "邮件箱位置"
# views/mail/galview.xml.h:4
# views/mail/galview.xml.h:4
# views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
#, fuzzy
msgid "Message Composer"
msgstr "邮件"
@@ -20803,7 +20856,7 @@ msgstr "邮件"
# ui/evolution-mail-message.xml.h:99
# ui/evolution-mail-message.xml.h:99
# ui/evolution-mail-message.xml.h:101
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
#, fuzzy
msgid "Message Display"
msgstr "邮件显示(_M)"
@@ -20811,7 +20864,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:74
+#: mail/mail-config.glade.h:73
#, fuzzy
msgid "Microsoft"
msgstr "密克罗尼西亚"
@@ -20819,10 +20872,16 @@ msgstr "密克罗尼西亚"
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:53
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
msgid "New Mail Notification"
msgstr "新邮件提醒"
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
#: mail/mail-config.glade.h:79
msgid "On Screen fonts"
msgstr ""
@@ -20985,118 +21044,94 @@ msgstr ""
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:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "选择 PGP 二进制数"
-
# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
# mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
msgid "Sending Email"
msgstr "正在发送电子邮件"
# mail/mail-config.glade.h:74
# mail/mail-config.glade.h:74
# mail/mail-config.glade.h:83
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
msgid "Sent _messages folder:"
msgstr "发送邮件文件夹(_M):"
# mail/mail-config.glade.h:75
# mail/mail-config.glade.h:75
# mail/mail-config.glade.h:84
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
msgid "Sent and Draft Messages"
msgstr "已发送和草稿邮件"
# mail/mail-config.glade.h:76
# mail/mail-config.glade.h:76
# mail/mail-config.glade.h:85
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
msgid "Ser_ver requires authentication"
msgstr "服务器需要认证(_V)"
# mail/mail-config.glade.h:77
# mail/mail-config.glade.h:77
# mail/mail-config.glade.h:86
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
msgid "Server Configuration"
msgstr "服务器配置"
# mail/mail-config.glade.h:78
# mail/mail-config.glade.h:78
# mail/mail-config.glade.h:87
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
msgid "Server _Type: "
msgstr "服务器类型(_T):"
# shell/e-shortcuts.c:1043
# shell/e-shortcuts.c:1043
# shell/e-shortcuts.c:1043
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
#, fuzzy
msgid "Shortcuts _type:"
msgstr "快捷方式"
-# mail/mail-config.glade.h:79
-# mail/mail-config.glade.h:79
-# mail/mail-config.glade.h:88
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "签名文件:"
-
-# mail/mail-config.glade.h:79
-# mail/mail-config.glade.h:79
-# mail/mail-config.glade.h:88
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-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:119
+#: mail/mail-config.glade.h:116
#, fuzzy
msgid "Specify _filename:"
msgstr "指定文件名:"
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
msgid "Spell Checking Language"
msgstr ""
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
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:122
+#: mail/mail-config.glade.h:119
msgid "Standard Unix mbox"
msgstr "标准 Unix mbox"
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
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:126
+#: mail/mail-config.glade.h:123
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:128
+#: mail/mail-config.glade.h:125
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -21105,7 +21140,7 @@ msgstr ""
# my-evolution/metar.c:63
# my-evolution/metar.c:63
# my-evolution/metar.c:63
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
#, fuzzy
msgid "V_ariable-width:"
msgstr "不定风"
@@ -21113,7 +21148,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:132
+#: mail/mail-config.glade.h:129
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -21126,7 +21161,7 @@ msgstr ""
# my-evolution/metar.c:65
# my-evolution/metar.c:65
# my-evolution/metar.c:65
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
#, fuzzy
msgid "XEmacs"
msgstr "东"
@@ -21134,7 +21169,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:139
+#: mail/mail-config.glade.h:136
#, fuzzy
msgid "_Add Signature"
msgstr "签名文件(_S):"
@@ -21142,48 +21177,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:140
+#: mail/mail-config.glade.h:137
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:141
+#: mail/mail-config.glade.h:138
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:142
+#: mail/mail-config.glade.h:139
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:143
+#: mail/mail-config.glade.h:140
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:144
+#: mail/mail-config.glade.h:141
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:145
+#: mail/mail-config.glade.h:142
#, fuzzy
msgid "_Automatically insert smiley images"
msgstr "自动检查新邮件(_A)"
# mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
#, fuzzy
msgid "_Beep when new mail arrives"
msgstr "新邮件到达时鸣笛"
@@ -21191,14 +21226,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:147
+#: mail/mail-config.glade.h:144
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:148
+#: mail/mail-config.glade.h:145
#, fuzzy
msgid "_Confirm when expunging a folder"
msgstr "当删除文件夹时进行提示"
@@ -21206,7 +21241,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:149
+#: mail/mail-config.glade.h:146
#, fuzzy
msgid "_Default signature:"
msgstr "删除签名以外的所有内容"
@@ -21214,13 +21249,13 @@ msgstr "删除签名以外的所有内容"
# mail/mail-config.glade.h:23
# mail/folder-browser.h:26
# mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
#, fuzzy
msgid "_Defaults"
msgstr "默认"
# mail/mail-config.glade.h:34
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
#, fuzzy
msgid "_Do not notify me when new mail arrives"
msgstr "新邮件到达时不要提醒我"
@@ -21228,19 +21263,19 @@ msgstr "新邮件到达时不要提醒我"
# mail/mail-accounts.c:196
# mail/mail-accounts.c:196
# mail/mail-accounts.c:196
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
#, fuzzy
msgid "_Enable"
msgstr "启用"
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
msgid "_Fixed-width:"
msgstr ""
# ui/evolution-mail-message.xml.h:32
# ui/evolution-mail-message.xml.h:32
# ui/evolution-mail-message.xml.h:32
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
#, fuzzy
msgid "_Forward style:"
msgstr "转发方式"
@@ -21248,14 +21283,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:157
+#: mail/mail-config.glade.h:154
msgid "_Full name:"
msgstr "全名(_F):"
# mail/mail-config.glade.h:38
# mail/mail-config.glade.h:38
# mail/mail-config.glade.h:45
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
#, fuzzy
msgid "_HTML Mail"
msgstr "在 HTML 邮件中"
@@ -21263,7 +21298,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:161
+#: mail/mail-config.glade.h:158
#, fuzzy
msgid "_Identity"
msgstr "标识"
@@ -21271,14 +21306,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:162
+#: mail/mail-config.glade.h:159
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:163
+#: mail/mail-config.glade.h:160
#, fuzzy
msgid "_Make this my default account"
msgstr "设置为我的默认帐号(_D)"
@@ -21286,7 +21321,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:164
+#: mail/mail-config.glade.h:161
#, fuzzy
msgid "_Mark messages as read after"
msgstr "阅读时将邮件标记为已读,延时(_M)"
@@ -21294,26 +21329,19 @@ 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:165
+#: mail/mail-config.glade.h:162
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:166
+#: mail/mail-config.glade.h:163
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:167
-msgid "_PGP binary path:"
-msgstr "PGP 二进制路径(_P):"
-
# mail/mail-config.glade.h:62
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
#, fuzzy
msgid "_Play sound file when new mail arrives"
msgstr "新邮件到达时播放声音文件"
@@ -21321,7 +21349,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:170
+#: mail/mail-config.glade.h:166
#, fuzzy
msgid "_Prompt when sending HTML messages to contacts that don't want them"
msgstr "在往不希望接收 HTML 消息的联系人发送 HTML 消息的时候进行提示"
@@ -21329,7 +21357,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:171
+#: mail/mail-config.glade.h:167
#, fuzzy
msgid "_Prompt when sending messages with an empty subject line"
msgstr "在发送空标题的消息时进行提示(_E)"
@@ -21337,7 +21365,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:172
+#: mail/mail-config.glade.h:168
#, fuzzy
msgid "_Receiving Mail"
msgstr "正在接收邮件"
@@ -21345,34 +21373,27 @@ 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:173
+#: mail/mail-config.glade.h:169
#, fuzzy
msgid "_Reply style:"
msgstr "全部回复"
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
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:175
+#: mail/mail-config.glade.h:171
#, fuzzy
msgid "_Script:"
msgstr "安全(_S)"
-# ui/evolution-message-composer.xml.h:54
-# ui/evolution-message-composer.xml.h:54
-# ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h: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:177
+#: mail/mail-config.glade.h:172
#, fuzzy
msgid "_Sending Mail"
msgstr "正在发送邮件"
@@ -21383,7 +21404,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:178
+#: mail/mail-config.glade.h:173
#, fuzzy
msgid "_Show animated images"
msgstr "按其显示时间"
@@ -21391,7 +21412,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:179
+#: mail/mail-config.glade.h:174
#, fuzzy
msgid "_Signatures"
msgstr "签名文件(_S):"
@@ -21399,7 +21420,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:180
+#: mail/mail-config.glade.h:175
#, fuzzy
msgid "_Use secure connection (SSL):"
msgstr "使用安全连接 (SSL)"
@@ -21407,7 +21428,7 @@ msgstr "使用安全连接 (SSL)"
# my-evolution/metar.c:63
# my-evolution/metar.c:63
# my-evolution/metar.c:63
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
#, fuzzy
msgid "_Variable-width:"
msgstr "不定风"
@@ -21415,14 +21436,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:182
+#: mail/mail-config.glade.h:177
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:183
+#: mail/mail-config.glade.h:178
#, fuzzy
msgid "color"
msgstr " 颜色"
@@ -21430,14 +21451,10 @@ msgstr " 颜色"
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:128
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
msgid "description"
msgstr "描述"
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
# mail/mail-crypto.c:173
# mail/mail-crypto.c:173
# mail/mail-crypto.c:173
@@ -21544,19 +21561,19 @@ msgstr "装入图像(_I)"
# mail/mail-display.c:1133
# mail/mail-display.c:1136
# mail/mail-display.c:1162
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
msgid "Loading message content"
msgstr "装入邮件内容"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
#, fuzzy
msgid "Overdue:"
msgstr "被延误的任务(_V):"
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
#, fuzzy
msgid "by %B %d, %Y, %l:%M %P"
msgstr "%b %d %l:%M %p"
@@ -21564,28 +21581,28 @@ msgstr "%b %d %l:%M %p"
# mail/mail-display.c:1602
# mail/mail-display.c:1628
# mail/mail-display.c:1657
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
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:2113
+#: mail/mail-display.c:2115
msgid "Copy Link Location"
msgstr "复制连接位置"
# mail/mail-display.c:1607
# mail/mail-display.c:1633
# mail/mail-display.c:1662
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
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:2117
+#: mail/mail-display.c:2119
msgid "Save Image as..."
msgstr "图像保存为..."
@@ -21603,7 +21620,7 @@ msgstr "正在扫描 %s"
# mail/mail-format.c:635
# mail/mail-format.c:640
# mail/mail-format.c:646
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
@@ -21611,28 +21628,29 @@ msgstr "%s 附件"
# mail/mail-format.c:680
# mail/mail-format.c:686
# mail/mail-format.c:692
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
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:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
msgid "Date"
msgstr "日期"
# mail/mail-format.c:846
# mail/mail-format.c:861
# mail/mail-format.c:867
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
msgid "Bad Address"
msgstr "无效地址"
# mail/mail-format.c:886 mail/message-list.etspec.h:3
# mail/mail-format.c:904 mail/message-list.etspec.h:3
# mail/mail-format.c:910 mail/message-list.etspec.h:3
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
#: mail/message-tags.glade.h:3
msgid "From"
msgstr "发件人"
@@ -21640,28 +21658,28 @@ msgstr "发件人"
# mail/mail-format.c:889
# mail/mail-format.c:908
# mail/mail-format.c:914
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
msgid "Reply-To"
msgstr "回复至"
# mail/mail-format.c:893 mail/message-list.etspec.h:10
# mail/mail-format.c:913 mail/message-list.etspec.h:11
# mail/mail-format.c:919 mail/message-list.etspec.h:11
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
msgid "To"
msgstr "收件人"
# mail/mail-format.c:897
# mail/mail-format.c:918
# mail/mail-format.c:924
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
msgid "Cc"
msgstr "抄送"
# mail/mail-format.c:901
# mail/mail-format.c:923
# mail/mail-format.c:929
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
msgid "Bcc"
msgstr "密件抄送"
@@ -21671,7 +21689,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:960
+#: mail/mail-format.c:963
#, fuzzy
msgid "Mailer"
msgstr "邮件"
@@ -21679,7 +21697,7 @@ msgstr "邮件"
# mail/mail-format.c:1813
# mail/mail-format.c:1749
# mail/mail-format.c:1768
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
msgid ""
"This message is digitally signed. Click the lock icon for more information."
msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
@@ -21687,7 +21705,7 @@ msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
# mail/mail-crypto.c:84
# mail/mail-crypto.c:84
# mail/mail-crypto.c:84
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
#, fuzzy
msgid "Could not create a PGP verfication context"
msgstr "无法创建 PGP 验证上下文。"
@@ -21695,21 +21713,21 @@ msgstr "无法创建 PGP 验证上下文。"
# mail/mail-format.c:1844
# mail/mail-format.c:1780
# mail/mail-format.c:1799
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
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:1878
+#: mail/mail-format.c:1892
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:2128
+#: mail/mail-format.c:2157
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
@@ -21717,7 +21735,7 @@ msgstr "指向 FTP 站点 (%s)"
# mail/mail-format.c:2082
# mail/mail-format.c:2017
# mail/mail-format.c:2036
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
@@ -21725,7 +21743,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:2147
+#: mail/mail-format.c:2176
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
@@ -21733,7 +21751,7 @@ msgstr "指向本地文件 (%s)"
# mail/mail-format.c:2116
# mail/mail-format.c:2051
# mail/mail-format.c:2070
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
@@ -21741,7 +21759,7 @@ msgstr "指向远程数据 (%s)"
# mail/mail-format.c:2124
# mail/mail-format.c:2059
# mail/mail-format.c:2078
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
@@ -21749,7 +21767,7 @@ msgstr "指向未知的外部数据 (“%s”类型)"
# mail/mail-format.c:2129
# mail/mail-format.c:2064
# mail/mail-format.c:2083
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
@@ -22091,7 +22109,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:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
msgid "_Search"
msgstr "搜索(_S)"
@@ -22275,6 +22293,11 @@ msgstr ""
"\n"
"您希望保存改动吗?"
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "添加条件"
+
#: mail/mail-signature-editor.c:372
msgid "Enter a name for this signature."
msgstr ""
@@ -22282,7 +22305,7 @@ msgstr ""
# my-evolution/e-summary-preferences.c:956
# my-evolution/e-summary-preferences.c:956
# my-evolution/e-summary-preferences.c:958
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
msgid "Name:"
msgstr "名称:"
@@ -22304,7 +22327,7 @@ msgstr "已转发邮件"
# mail/mail-tools.c:393
# mail/mail-tools.c:393
# mail/mail-tools.c:394
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
msgid "Forwarded Message"
msgstr "已转发邮件"
@@ -22339,7 +22362,7 @@ msgstr ""
# mail/mail-vfolder.c:728
# mail/mail-vfolder.c:728
# mail/mail-vfolder.c:728
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
msgid "VFolders"
msgstr "虚拟文件夹"
@@ -22672,7 +22695,7 @@ msgstr "已标志"
# mail/subscribe-dialog.c:219
# mail/subscribe-dialog.c:219
# mail/subscribe-dialog.c:219
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
#, c-format
msgid "Scanning folders under %s on \"%s\""
msgstr "在“%2$s”上的 %1$s 中扫描文件夹"
@@ -22680,7 +22703,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:231
+#: mail/subscribe-dialog.c:233
#, c-format
msgid "Scanning root-level folders on \"%s\""
msgstr "正在扫描“%s”上的根级文件夹"
@@ -22688,7 +22711,7 @@ msgstr "正在扫描“%s”上的根级文件夹"
# mail/subscribe-dialog.c:318
# mail/subscribe-dialog.c:318
# mail/subscribe-dialog.c:318
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
#, c-format
msgid "Subscribing to folder \"%s\""
msgstr "订阅到文件夹 “%s”"
@@ -22696,7 +22719,7 @@ msgstr "订阅到文件夹 “%s”"
# mail/subscribe-dialog.c:320
# mail/subscribe-dialog.c:320
# mail/subscribe-dialog.c:320
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
#, c-format
msgid "Unsubscribing to folder \"%s\""
msgstr "取消到文件夹“%s”的订阅"
@@ -22707,7 +22730,7 @@ msgstr "取消到文件夹“%s”的订阅"
# shell/e-storage-set-view.etspec.h:1
# mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
# shell/e-storage-set-view.etspec.h:1
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
#: shell/e-storage-set-view.etspec.h:2
msgid "Folder"
msgstr "文件夹"
@@ -22715,7 +22738,7 @@ 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:1443
+#: mail/subscribe-dialog.c:1450
#, fuzzy
msgid "Scanning folders..."
msgstr "保存到文件夹..."
@@ -22723,14 +22746,14 @@ msgstr "保存到文件夹..."
# mail/subscribe-dialog.c:1520
# mail/subscribe-dialog.c:1520
# mail/subscribe-dialog.c:1520
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
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:1614
+#: mail/subscribe-dialog.c:1621
msgid "Please select a server."
msgstr "请选择服务器。"
@@ -38225,49 +38248,49 @@ 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:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
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:368
+#: my-evolution/e-summary-calendar.c:382
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:404
+#: my-evolution/e-summary-calendar.c:418
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:406
+#: my-evolution/e-summary-calendar.c:420
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:424
+#: my-evolution/e-summary-calendar.c:438
msgid "No description"
msgstr "无描述"
# my-evolution/e-summary-mail.c:129
# my-evolution/e-summary-mail.c:129
# my-evolution/e-summary-mail.c:129
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
msgid "Mail summary"
msgstr "邮件概要"
# shell/e-local-storage.c:636
# shell/e-local-storage.c:636
# shell/e-local-storage.c:636
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
#: shell/e-local-storage.c:1102
msgid "Local Folders"
msgstr "本地文件夹"
@@ -38305,14 +38328,14 @@ msgstr "每日引用"
# my-evolution/e-summary-preferences.c:944
# my-evolution/e-summary-preferences.c:944
# my-evolution/e-summary-preferences.c:946
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
msgid "Add a news feed"
msgstr "添加新闻来源"
# my-evolution/e-summary-preferences.c:952
# my-evolution/e-summary-preferences.c:952
# my-evolution/e-summary-preferences.c:954
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
msgid "Enter the URL of the news feed you wish to add"
msgstr "输入您希望添加的新闻来源的 URL"
@@ -38321,19 +38344,19 @@ msgstr "输入您希望添加的新闻来源的 URL"
# my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
# my-evolution/e-summary-rdf.c:415
# my-evolution/e-summary-rdf.c:300
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
msgid "Error downloading RDF"
msgstr "下载 RDF 错误"
# my-evolution/e-summary-rdf.c:528
# my-evolution/e-summary-rdf.c:528
# my-evolution/e-summary-rdf.c:443
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
msgid "News Feed"
msgstr "新闻来源"
# my-evolution/Locations.h:1354
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
#, fuzzy
msgid "All"
msgstr "麦卡伦"
@@ -38342,7 +38365,7 @@ msgstr "麦卡伦"
# calendar/gui/dialogs/recurrence-page.glade.h:1
# calendar/gui/dialogs/recurrence-page.glade.h:1
#. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
#, fuzzy
msgid "Add"
msgstr "添加(_D)"
@@ -38350,7 +38373,7 @@ msgstr "添加(_D)"
# my-evolution/metar.c:157
# my-evolution/metar.c:157
# my-evolution/metar.c:157
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
#, fuzzy
msgid "Shown"
msgstr "雪"
@@ -38358,25 +38381,25 @@ 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:312
+#: my-evolution/e-summary-tasks.c:328
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:357
+#: my-evolution/e-summary-tasks.c:372
msgid "(No Description)"
msgstr "(没有描述)"
# my-evolution/e-summary-weather.c:71
# my-evolution/e-summary-weather.c:71
# my-evolution/e-summary-weather.c:70
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
msgid "My Weather"
msgstr "天气"
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
msgid "There was an error downloading data for"
msgstr ""
@@ -38390,7 +38413,7 @@ msgstr "天气"
# my-evolution/e-summary.c:193
# my-evolution/e-summary.c:193
# my-evolution/e-summary.c:190
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
msgid "%A, %B %e %Y"
msgstr "%Y %B %e %A"
@@ -38399,28 +38422,28 @@ msgstr "%Y %B %e %A"
# importers/elm-importer.c:98 importers/netscape-importer.c:109
# importers/pine-importer.c:103
# my-evolution/e-summary.c:475
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
msgid "Please wait..."
msgstr "请等待..."
# my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
# my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
# my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
msgid "Print Summary"
msgstr "打印概要"
# my-evolution/e-summary.c:626
# my-evolution/e-summary.c:626
# my-evolution/e-summary.c:612
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
msgid "Printing of Summary failed"
msgstr "打印概要失败"
# my-evolution/main.c:66
# my-evolution/main.c:66
# my-evolution/main.c:65
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
msgid "Executive summary component could not initialize Bonobo.\n"
msgstr "实施概要组件无法初始化 Bonobo。\n"
@@ -40699,7 +40722,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:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
#: shell/e-shortcuts.c:1055
msgid "Inbox"
msgstr "收件箱"
@@ -41357,7 +41380,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:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
#, fuzzy
msgid "Opening Folder"
msgstr "正在打开文件夹 %s"
@@ -41365,7 +41388,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:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
#, fuzzy, c-format
msgid "Opening Folder \"%s\""
msgstr "正在打开文件夹 %s"
@@ -41373,7 +41396,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:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
#, fuzzy, c-format
msgid "in \"%s\" ..."
msgstr "在 %s 中打开..."
@@ -41381,7 +41404,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:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
#, fuzzy, c-format
msgid "Could not open shared folder: %s."
msgstr "无法重命名文件夹: %s"
@@ -41389,7 +41412,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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
#, fuzzy
msgid "Cannot find the specified shared folder."
msgstr ""
@@ -41454,6 +41477,21 @@ msgstr "文件夹名不能含有斜线。"
msgid "'.' and '..' are reserved folder names."
msgstr "“.”和“..”是保留文件夹名。"
+# shell/e-shell-view-menu.c:577
+# shell/e-shell-view-menu.c:577
+# shell/e-shell-view-menu.c:577
+#: shell/e-shell-view-menu.c:94
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "GNOME Pilot 工具好像并未安装到系统中。"
+
+# shell/e-shell-view-menu.c:585
+# shell/e-shell-view-menu.c:585
+# shell/e-shell-view-menu.c:585
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "执行 %s 错误。"
+
# shell/e-shell-view-menu.c:165
# shell/e-shell-view-menu.c:165
# shell/e-shell-view-menu.c:165
@@ -41507,21 +41545,21 @@ msgstr "选择您希望快捷方式指向的文件夹:"
# shell/e-shell-view-menu.c:688
# shell/e-shell-view-menu.c:688
# shell/e-shell-view-menu.c:688
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
msgid "_Work Online"
msgstr "在线工作(_W)"
# shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
# shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
# shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
msgid "_Work Offline"
msgstr "离线工作(_W)"
# shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
# shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
# shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
msgid "Work Offline"
msgstr "离线工作"
@@ -41535,7 +41573,7 @@ msgstr "(未显示文件夹)"
# shell/e-shell-view.c:1585
# shell/e-shell-view.c:1585
# shell/e-shell-view.c:1598
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
#, c-format
msgid "%s (%d)"
msgstr "%s (%d)"
@@ -41543,14 +41581,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:1849
+#: shell/e-shell-view.c:1863
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:1896
+#: shell/e-shell-view.c:1910
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
@@ -41558,14 +41596,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:1903
+#: shell/e-shell-view.c:1917
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:1909
+#: shell/e-shell-view.c:1923
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr "Ximian Evolution 目前离线。 点击该按钮则在线工作。"
@@ -41596,7 +41634,7 @@ msgstr "无法设置本地存储 -- %s"
# shell/e-shell.c:1659
# shell/e-shell.c:1659
# shell/e-shell.c:1660
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
#, c-format
msgid ""
"The Evolution component that handles folders of type \"%s\"\n"
@@ -41610,28 +41648,28 @@ msgstr ""
# shell/e-shell.c:1886
# shell/e-shell.c:1886
# shell/e-shell.c:1887
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
msgid "Invalid arguments"
msgstr "无效参数"
# shell/e-shell.c:1888
# shell/e-shell.c:1888
# shell/e-shell.c:1889
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
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:2181
+#: shell/e-shell.c:2182
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:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
msgid "Generic error"
msgstr "通用错误"
@@ -41872,95 +41910,95 @@ msgstr "主席"
# shell/e-storage.c:498
# shell/e-storage.c:498
# shell/e-storage.c:498
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
msgid "No error"
msgstr "无错误"
# shell/e-storage.c:502
# shell/e-storage.c:502
# shell/e-storage.c:502
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
msgid "A folder with the same name already exists"
msgstr "已经有一个同名文件夹存在"
# shell/e-storage.c:504
# shell/e-storage.c:504
# shell/e-storage.c:504
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
msgid "The specified folder type is not valid"
msgstr "指定的文件夹类型无效"
# shell/e-storage.c:506
# shell/e-storage.c:506
# shell/e-storage.c:506
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
msgid "I/O error"
msgstr "输入输出错误"
# shell/e-storage.c:508
# shell/e-storage.c:508
# shell/e-storage.c:508
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
msgid "Not enough space to create the folder"
msgstr "没有足够的空间创建文件夹"
# shell/e-storage.c:510
# shell/e-storage.c:510
# shell/e-storage.c:510
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
msgid "The folder is not empty"
msgstr "文件夹不为空"
# shell/e-storage.c:512
# shell/e-storage.c:512
# shell/e-storage.c:512
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
msgid "The specified folder was not found"
msgstr "找不到指定的文件夹"
# shell/e-storage.c:514
# shell/e-storage.c:514
# shell/e-storage.c:514
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
msgid "Function not implemented in this storage"
msgstr "在该存储中没有实现该功能"
# shell/e-storage.c:518
# shell/e-storage.c:518
# shell/e-storage.c:518
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
msgid "Operation not supported"
msgstr "不支持的操作"
# shell/e-storage.c:520
# shell/e-storage.c:520
# shell/e-storage.c:520
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
msgid "The specified type is not supported in this storage"
msgstr "在该存储中不支持指定的类型"
# shell/e-storage.c:522
# shell/e-storage.c:522
# shell/e-storage.c:522
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
msgid "The specified folder cannot be modified or removed"
msgstr "无法修改或删除指定的文件夹"
# shell/e-storage.c:524
# shell/e-storage.c:524
# shell/e-storage.c:524
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
msgid "Cannot make a folder a child of one of its descendants"
msgstr "无法使文件夹成为它的子目录的子目录"
# shell/e-storage.c:526
# shell/e-storage.c:526
# shell/e-storage.c:526
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
msgid "Cannot create a folder with that name"
msgstr "无法以那个名字创建文件夹"
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
msgid "This operation cannot be performed in off-line mode"
msgstr ""
@@ -43295,12 +43333,13 @@ msgstr "预览窗口(_P)"
msgid "Change the properties of this folder"
msgstr "改变该文件夹的属性"
-# ui/evolution-mail-list.xml.h:2
-# ui/evolution-mail-list.xml.h:2
-# ui/evolution-mail-list.xml.h:2
+# ui/evolution-mail-message.xml.h:7
+# ui/evolution-mail-message.xml.h:7
+# ui/evolution-mail-message.xml.h:7
#: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "复制选中的邮件"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "把选中的消息复制到其它文件夹"
# ui/evolution-mail-list.xml.h:3
# ui/evolution-mail-list.xml.h:3
@@ -43309,12 +43348,13 @@ msgstr "复制选中的邮件"
msgid "Cu_t"
msgstr "剪切(_T)"
-# ui/evolution-mail-list.xml.h:4
-# ui/evolution-mail-list.xml.h:4
-# ui/evolution-mail-list.xml.h:4
+# ui/evolution-mail-list.xml.h:11
+# ui/evolution-mail-list.xml.h:11
+# ui/evolution-mail-list.xml.h:11
#: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "剪切选中的邮件"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "粘贴剪贴板中的邮件"
# ui/evolution-mail-list.xml.h:5
# ui/evolution-mail-list.xml.h:5
@@ -43363,7 +43403,8 @@ msgstr "把所由可见的邮件标记为已读"
# ui/evolution-mail-list.xml.h:11
# ui/evolution-mail-list.xml.h:11
#: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
msgstr "粘贴剪贴板中的邮件"
# ui/evolution-mail-list.xml.h:12
@@ -44523,6 +44564,13 @@ msgstr "打开(_O)..."
msgid "_Reply-To Field"
msgstr "回复域(_R)"
+# ui/evolution-message-composer.xml.h:54
+# ui/evolution-message-composer.xml.h:54
+# ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "安全(_S)"
+
# ui/evolution-message-composer.xml.h:9
# ui/evolution-message-composer.xml.h:9
# ui/evolution-message-composer.xml.h:9
@@ -45053,14 +45101,6 @@ msgstr "重命名(_R)..."
msgid "_Send / Receive"
msgstr "发送和接收(_S)"
-# ui/evolution-mail-global.xml.h:21
-# ui/evolution-mail-global.xml.h:21
-# ui/evolution-mail-global.xml.h:21
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "邮件设置(_M)..."
-
# ui/evolution.xml.h:48
# ui/evolution.xml.h:48
# ui/evolution.xml.h:48
@@ -45544,7 +45584,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:520
+#: widgets/misc/e-search-bar.c:521
#, fuzzy
msgid "_Find Now"
msgstr "立即查找"
@@ -45553,7 +45593,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:521
+#: widgets/misc/e-search-bar.c:522
#, fuzzy
msgid "_Clear"
msgstr "清除"
@@ -45562,14 +45602,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:894
+#: widgets/misc/e-search-bar.c:895
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:896
+#: widgets/misc/e-search-bar.c:897
msgid "Find Now"
msgstr "立即查找"
@@ -45616,6 +45656,72 @@ msgstr "init_corba(): 无法初始化 GNOME"
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "init_bonobo(): 无法初始化 Bonobo"
+# mail/mail-local.c:1416
+# mail/mail-local.c:1416
+# executive-summary/component/e-summary-url.c:80
+#, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "配置 %s"
+
+# mail/mail-local.c:1416
+# mail/mail-local.c:1416
+# executive-summary/component/e-summary-url.c:80
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "配置 %s"
+
+# ui/evolution-message-composer.xml.h:27
+# ui/evolution-message-composer.xml.h:27
+# ui/evolution-message-composer.xml.h:27
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "发送"
+
+# my-evolution/metar.c:29
+# my-evolution/metar.c:29
+#, fuzzy
+#~ msgid " "
+#~ msgstr " 摄氏度"
+
+# mail/mail-config.glade.h:69
+# mail/mail-config.glade.h:69
+# mail/mail-config.glade.h:78
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "选择 PGP 二进制数"
+
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "签名文件:"
+
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "签名文件:"
+
+# mail/mail-config.glade.h:111
+# mail/mail-config.glade.h:111
+# mail/mail-config.glade.h:120
+#~ msgid "_PGP binary path:"
+#~ msgstr "PGP 二进制路径(_P):"
+
+# ui/evolution-mail-list.xml.h:2
+# ui/evolution-mail-list.xml.h:2
+# ui/evolution-mail-list.xml.h:2
+#~ msgid "Copy selected messages"
+#~ msgstr "复制选中的邮件"
+
+# ui/evolution-mail-list.xml.h:4
+# ui/evolution-mail-list.xml.h:4
+# ui/evolution-mail-list.xml.h:4
+#~ msgid "Cut selected messages"
+#~ msgstr "剪切选中的邮件"
+
# my-evolution/my-evolution.glade.h:1
# my-evolution/my-evolution.glade.h:1
# my-evolution/my-evolution.glade.h:1
@@ -46127,12 +46233,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "A_uthenticate with server using:"
#~ msgstr "以之与服务器进行认证(_U):"
-# addressbook/gui/component/addressbook-config.glade.h:2
-# addressbook/gui/component/addressbook-config.glade.h:2
-# addressbook/gui/component/addressbook-config.glade.h:4
-#~ msgid "Account Name"
-#~ msgstr "帐号名"
-
# addressbook/gui/component/addressbook-config.glade.h:3
# addressbook/gui/component/addressbook-config.glade.h:3
# addressbook/gui/component/addressbook-config.glade.h:5
@@ -46165,12 +46265,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ "the server"
#~ msgstr "Evolution 将使用该识别姓名 (DN) 在服务器上对您进行认证"
-# addressbook/gui/component/addressbook-config.glade.h:14
-# addressbook/gui/component/addressbook-config.glade.h:14
-# addressbook/gui/component/addressbook-config.glade.h:19
-#~ msgid "Server Name"
-#~ msgstr "服务器名"
-
# addressbook/gui/component/addressbook-config.glade.h:16
# addressbook/gui/component/addressbook-config.glade.h:16
# addressbook/gui/component/addressbook-config.glade.h:21