aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-05-22 02:51:10 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-05-22 02:51:10 +0800
commit6d3b09473200276fbb4fbc157b355c84e77c41de (patch)
treee981a6ff4d949938325c85e884620a059759d14c /po/zh_CN.po
parentca392b70a1450b5bfaa2626c11c96aa384bd3f45 (diff)
downloadgsoc2013-evolution-6d3b09473200276fbb4fbc157b355c84e77c41de.tar.gz
gsoc2013-evolution-6d3b09473200276fbb4fbc157b355c84e77c41de.tar.zst
gsoc2013-evolution-6d3b09473200276fbb4fbc157b355c84e77c41de.zip
1.3.91.
svn path=/trunk/; revision=21311
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po2354
1 files changed, 1266 insertions, 1088 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 085cfc60f9..65f1c650e4 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: 2003-04-29 16:32-0400\n"
+"POT-Creation-Date: 2003-05-21 13:52-0400\n"
"PO-Revision-Date: 2003-04-15 11:02+0800\n"
"Last-Translator: Wang Li <charles@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -87,7 +87,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:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
msgid "Primary"
msgstr "主要"
@@ -113,7 +113,7 @@ msgstr "主要"
#: addressbook/backend/ebook/e-card-simple.c:64
#: addressbook/backend/ebook/e-card-simple.c:94
#: addressbook/backend/ebook/e-card.c:1404
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
msgid "Assistant"
msgstr "助手"
@@ -135,9 +135,8 @@ msgstr "助手"
# addressbook/gui/contact-editor/e-contact-editor.c:1712
#: addressbook/backend/ebook/e-card-simple.c:65
#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1804
msgid "Business"
msgstr "商务"
@@ -159,7 +158,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:1737
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
msgid "Callback"
msgstr "反馈"
@@ -170,7 +169,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:1739
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
msgid "Company"
msgstr "公司"
@@ -198,9 +197,8 @@ msgstr "公司"
# addressbook/gui/contact-editor/e-contact-editor.c:1713
#: 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:1740
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
msgid "Home"
msgstr "家庭"
@@ -233,8 +231,7 @@ msgstr "组织"
# addressbook/gui/contact-editor/contact-editor.glade.h:20
# 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:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
msgid "Mobile"
msgstr "手机"
@@ -245,7 +242,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:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
msgid "Car"
msgstr "汽车"
@@ -262,8 +259,7 @@ msgstr "汽车"
# addressbook/gui/contact-editor/e-contact-editor.c:1647
# addressbook/gui/widgets/e-addressbook-view.c:974
#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
msgid "Business Fax"
msgstr "商务传真"
@@ -285,7 +281,7 @@ 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:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
msgid "Home Fax"
msgstr "家庭传真"
@@ -297,7 +293,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:1735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
msgid "Business 2"
msgstr "商务 2"
@@ -315,7 +311,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:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
msgid "Home 2"
msgstr "家庭 2"
@@ -329,7 +325,7 @@ 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:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
msgid "ISDN"
msgstr "ISDN"
@@ -351,8 +347,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:1745
-#: addressbook/gui/contact-editor/e-contact-editor.c:1807
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
msgid "Other"
msgstr "其它"
@@ -366,7 +362,7 @@ 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:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
msgid "Other Fax"
msgstr "其它传真"
@@ -381,7 +377,7 @@ 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:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
msgid "Pager"
msgstr "传呼机"
@@ -396,7 +392,7 @@ 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:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
msgid "Radio"
msgstr "收音机"
@@ -411,7 +407,7 @@ 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:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
msgid "Telex"
msgstr "电传"
@@ -441,7 +437,7 @@ 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:488
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
msgid "Email 2"
msgstr "电子邮件 2"
@@ -460,7 +456,7 @@ 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:498
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
msgid "Email 3"
msgstr "电子邮件 3"
@@ -742,7 +738,7 @@ msgstr "未命名的列表"
# addressbook/gui/contact-editor/e-contact-quick-add.c:326
# addressbook/gui/widgets/e-addressbook-view.c:961
#: addressbook/backend/ebook/e-card.c:1308
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/contact-editor/fullname.glade.h:4
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
msgid "Full Name"
msgstr "全名"
@@ -965,7 +961,7 @@ msgstr "无法初始化 Bonobo"
# addressbook/backend/pas/pas-backend-file.c:259
# addressbook/backend/pas/pas-backend-ldap.c:2272
#: addressbook/backend/pas/pas-backend-file.c:464
-#: addressbook/backend/pas/pas-backend-ldap.c:3046
+#: addressbook/backend/pas/pas-backend-ldap.c:3047
msgid "Searching..."
msgstr "搜索..."
@@ -1022,7 +1018,7 @@ msgstr "正在修改 LDAP 服务器上的卡片..."
# addressbook/backend/pas/pas-backend-ldap.c:2214
# addressbook/backend/pas/pas-backend-ldap.c:2214
# addressbook/backend/pas/pas-backend-ldap.c:2217
-#: addressbook/backend/pas/pas-backend-ldap.c:2957
+#: addressbook/backend/pas/pas-backend-ldap.c:2958
msgid "Receiving LDAP search results..."
msgstr "正在接收 LDAP 的搜索结果..."
@@ -1032,7 +1028,7 @@ msgstr "正在接收 LDAP 的搜索结果..."
# addressbook/gui/widgets/e-addressbook-view.c:1278
# addressbook/gui/widgets/e-addressbook-util.c:95
# addressbook/gui/widgets/e-addressbook-view.c:1389
-#: addressbook/backend/pas/pas-backend-ldap.c:3066
+#: addressbook/backend/pas/pas-backend-ldap.c:3067
msgid "Error performing search"
msgstr "执行搜索错误"
@@ -1175,7 +1171,7 @@ msgstr "Evolution 地址簿小卡片显示器"
# 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:76
-#: addressbook/gui/component/addressbook-component.c:605
+#: addressbook/gui/component/addressbook-component.c:620
#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
msgid "Contacts"
@@ -1231,42 +1227,42 @@ msgstr "公共文件夹含有联系人信息"
# ui/evolution-addressbook.xml.h:11
# addressbook/gui/component/addressbook-component.c:527
# ui/evolution-addressbook.xml.h:11
-#: addressbook/gui/component/addressbook-component.c:564
+#: addressbook/gui/component/addressbook-component.c:574
msgid "New Contact"
msgstr "新建联系人"
# ui/evolution-addressbook.xml.h:31
# ui/evolution-addressbook.xml.h:31
# ui/evolution-addressbook.xml.h:32
-#: addressbook/gui/component/addressbook-component.c:564
+#: addressbook/gui/component/addressbook-component.c:574
msgid "_Contact"
msgstr "联系人(_C)"
# ui/evolution-addressbook.xml.h:4
# ui/evolution-addressbook.xml.h:4
# ui/evolution-addressbook.xml.h:4
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-component.c:575
msgid "Create a new contact"
msgstr "创建一个新联系人"
# addressbook/gui/component/addressbook-component.c:527
# addressbook/gui/component/addressbook-component.c:527
# addressbook/gui/component/addressbook-component.c:530
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:578
msgid "New Contact List"
msgstr "新建联系人列表"
# ui/evolution-addressbook.xml.h:32
# ui/evolution-addressbook.xml.h:32
# ui/evolution-addressbook.xml.h:33
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:578
msgid "Contact _List"
msgstr "联系人列表(_L)"
# ui/evolution-addressbook.xml.h:5
# ui/evolution-addressbook.xml.h:5
# ui/evolution-addressbook.xml.h:5
-#: addressbook/gui/component/addressbook-component.c:569
+#: addressbook/gui/component/addressbook-component.c:579
msgid "Create a new contact list"
msgstr "创建一个新的联系人列表"
@@ -1334,14 +1330,14 @@ msgstr "在本次 Evolution 创建中未打开 LDAP 支持"
# addressbook/gui/component/addressbook-storage.c:167
# addressbook/gui/component/addressbook-storage.c:167
# addressbook/gui/component/addressbook-storage.c:168
-#: addressbook/gui/component/addressbook-storage.c:169
+#: addressbook/gui/component/addressbook-storage.c:178
msgid "Other Contacts"
msgstr "其他联系人"
# addressbook/gui/component/addressbook.c:507
# addressbook/gui/component/addressbook.c:507
# addressbook/gui/component/addressbook.c:521
-#: addressbook/gui/component/addressbook.c:512
+#: addressbook/gui/component/addressbook.c:502
msgid ""
"We were unable to open this addressbook. Please check that the\n"
"path exists and that you have permission to access it."
@@ -1352,7 +1348,7 @@ msgstr ""
# addressbook/gui/component/addressbook.c:494
# addressbook/gui/component/addressbook.c:494
# addressbook/gui/component/addressbook.c:508
-#: addressbook/gui/component/addressbook.c:522
+#: addressbook/gui/component/addressbook.c:512
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the LDAP server\n"
@@ -1365,7 +1361,7 @@ msgstr ""
# addressbook/gui/component/addressbook.c:499
# addressbook/gui/component/addressbook.c:499
# addressbook/gui/component/addressbook.c:513
-#: addressbook/gui/component/addressbook.c:527
+#: addressbook/gui/component/addressbook.c:517
msgid ""
"This version of Evolution does not have LDAP support\n"
"compiled in to it. If you want to use LDAP in Evolution\n"
@@ -1380,7 +1376,7 @@ msgstr ""
# addressbook/gui/component/addressbook.c:494
# addressbook/gui/component/addressbook.c:494
# addressbook/gui/component/addressbook.c:508
-#: addressbook/gui/component/addressbook.c:537
+#: addressbook/gui/component/addressbook.c:527
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the server\n"
@@ -1393,18 +1389,18 @@ msgstr ""
# addressbook/gui/component/addressbook.c:485
# addressbook/gui/component/addressbook.c:485
# addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:547
msgid "Unable to open addressbook"
msgstr "无法打开地址簿"
-#: addressbook/gui/component/addressbook.c:622
+#: addressbook/gui/component/addressbook.c:607
msgid "Accessing LDAP Server anonymously"
msgstr "匿名访问 LDAP 服务器"
# camel/providers/imap/camel-imap-store.c:596
# camel/providers/imap/camel-imap-store.c:596
# camel/providers/imap/camel-imap-store.c:596
-#: addressbook/gui/component/addressbook.c:667
+#: addressbook/gui/component/addressbook.c:652
msgid "Failed to authenticate.\n"
msgstr "认证失败。\n"
@@ -1412,17 +1408,17 @@ msgstr "认证失败。\n"
# addressbook/gui/component/addressbook.c:640
# addressbook/gui/component/addressbook.c:655
# addressbook/gui/component/addressbook.c:658
-#: addressbook/gui/component/addressbook.c:675
-#: addressbook/gui/component/addressbook.c:678
+#: addressbook/gui/component/addressbook.c:660
+#: addressbook/gui/component/addressbook.c:663
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%s为 %s 输入口令 (用户 %s)"
-#: addressbook/gui/component/addressbook.c:813
+#: addressbook/gui/component/addressbook.c:794
msgid "Name begins with"
msgstr "姓名以此开头"
-#: addressbook/gui/component/addressbook.c:814
+#: addressbook/gui/component/addressbook.c:795
msgid "Email begins with"
msgstr "邮件以此开头"
@@ -1432,7 +1428,7 @@ msgstr "邮件以此开头"
# calendar/gui/cal-search-bar.c:59
# addressbook/gui/component/addressbook.c:839
# calendar/gui/cal-search-bar.c:59
-#: addressbook/gui/component/addressbook.c:815
+#: addressbook/gui/component/addressbook.c:796
#: calendar/gui/cal-search-bar.c:53
msgid "Category is"
msgstr "类别为"
@@ -1444,7 +1440,7 @@ msgstr "类别为"
# addressbook/gui/component/addressbook.c:836
# calendar/gui/cal-search-bar.c:55
#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:816
+#: addressbook/gui/component/addressbook.c:797
#: calendar/gui/cal-search-bar.c:49
msgid "Any field contains"
msgstr "任何域含有"
@@ -1454,11 +1450,11 @@ msgstr "任何域含有"
# widgets/misc/e-filter-bar.h:104
# addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
# widgets/misc/e-filter-bar.h:104
-#: addressbook/gui/component/addressbook.c:817
+#: addressbook/gui/component/addressbook.c:798
msgid "Advanced..."
msgstr "高级..."
-#: addressbook/gui/component/addressbook.c:987
+#: addressbook/gui/component/addressbook.c:955
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -1466,7 +1462,7 @@ msgid ""
"the directory server preferences for this addressbook."
msgstr ""
-#: addressbook/gui/component/addressbook.c:993
+#: addressbook/gui/component/addressbook.c:961
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
"you have configured for this addressbook. Please make your search\n"
@@ -1474,15 +1470,15 @@ msgid ""
"preferences for this addressbook."
msgstr ""
-#: addressbook/gui/component/addressbook.c:999
+#: addressbook/gui/component/addressbook.c:967
msgid "The backend for this addressbook was unable to parse this query."
msgstr "该地址本的后端无法解析该查询。"
-#: addressbook/gui/component/addressbook.c:1002
+#: addressbook/gui/component/addressbook.c:970
msgid "The backend for this addressbook refused to perform this query."
msgstr "该地址本的后端拒绝执行该查询。"
-#: addressbook/gui/component/addressbook.c:1006
+#: addressbook/gui/component/addressbook.c:974
msgid "This query did not complete successfully."
msgstr "该查询尚未成功完成。"
@@ -1493,7 +1489,7 @@ msgstr "该查询尚未成功完成。"
# addressbook/gui/component/addressbook.c:1067
# calendar/gui/cal-search-bar.c:412
#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1089
+#: addressbook/gui/component/addressbook.c:1059
#: calendar/gui/cal-search-bar.c:354
msgid "Any Category"
msgstr "任何类别"
@@ -1501,7 +1497,7 @@ msgstr "任何类别"
# addressbook/gui/component/addressbook.c:1107
# addressbook/gui/component/addressbook.c:1107
# addressbook/gui/component/addressbook.c:1150
-#: addressbook/gui/component/addressbook.c:1169
+#: addressbook/gui/component/addressbook.c:1139
msgid "The URI that the Folder Browser will display"
msgstr "文件夹浏览器将显示的 URI"
@@ -1527,8 +1523,7 @@ msgstr "(无)"
# addressbook/gui/contact-editor/contact-editor.glade.h:26
# addressbook/gui/contact-editor/e-contact-editor.c:1686
#: addressbook/gui/component/e-address-popup.c:478
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:1777
+#: addressbook/gui/contact-editor/e-contact-editor.c:1776
msgid "Primary Email"
msgstr "常用电子邮件"
@@ -1594,7 +1589,7 @@ msgstr "添加到联系人"
# addressbook/gui/component/e-address-popup.c:1046
# addressbook/gui/component/e-address-popup.c:1046
# addressbook/gui/component/e-address-popup.c:1046
-#: addressbook/gui/component/e-address-popup.c:1052
+#: addressbook/gui/component/e-address-popup.c:1053
msgid "Merge E-Mail Address"
msgstr "合并电子邮件地址"
@@ -1627,7 +1622,7 @@ msgstr " 显示支持的数据库(_H) "
#: addressbook/gui/component/ldap-config.glade.h:4
#: addressbook/gui/component/select-names/select-names.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
#: addressbook/gui/contact-editor/fulladdr.glade.h:1
#: addressbook/gui/contact-editor/fullname.glade.h:1
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
@@ -1638,6 +1633,7 @@ msgstr " 显示支持的数据库(_H) "
#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
#: mail/message-tags.glade.h:1
#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
msgid "*"
msgstr ""
@@ -1717,44 +1713,38 @@ msgstr ""
msgid "Connecting"
msgstr "正在连接"
-# addressbook/gui/component/addressbook-config.glade.h:8
-# addressbook/gui/component/addressbook-config.glade.h:8
-# addressbook/gui/component/addressbook-config.glade.h:11
-#: addressbook/gui/component/ldap-config.glade.h:20
-msgid "De_lete"
-msgstr "删除(_L)"
-
# addressbook/gui/component/addressbook-config.glade.h:32
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
msgid "Distinguished _name:"
msgstr "已识别的姓名(_D):"
# addressbook/gui/component/addressbook-component.c:73
# addressbook/gui/component/addressbook-component.c:73
# addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
#, fuzzy
msgid "Edit LDAP Server"
msgstr "LDAP 服务器"
# mail/mail-config.glade.h:99
# mail/mail-config.glade.h:99
-# mail/mail-config.glade.h:108
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Email Address:"
-msgstr "电子邮件地址:"
+# addressbook/gui/component/addressbook-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Email address:"
+msgstr "电子邮件地址(_A):"
# addressbook/gui/component/addressbook-config.glade.h:10
# addressbook/gui/component/addressbook-config.glade.h:10
# addressbook/gui/component/addressbook-config.glade.h:15
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
msgid "Evolution will use this DN to authenticate you with the server"
msgstr "Evolution 将使用该已识别的名字在服务器上对您进行认证"
# addressbook/gui/component/addressbook-config.glade.h:10
# addressbook/gui/component/addressbook-config.glade.h:10
# addressbook/gui/component/addressbook-config.glade.h:15
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
msgid ""
"Evolution will use this email address to authenticate you with the server"
msgstr "Evolution 将使用该电子邮件地址在服务器上对您进行认证"
@@ -1762,34 +1752,34 @@ msgstr "Evolution 将使用该电子邮件地址在服务器上对您进行认
# addressbook/gui/component/select-names/select-names.glade.h:3
# addressbook/gui/component/select-names/select-names.glade.h:3
# addressbook/gui/component/select-names/select-names.glade.h:2
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
msgid "Finished"
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:27
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
msgid "General"
msgstr "常规"
# mail/mail-config.glade.h:15
# mail/mail-config.glade.h:15
# mail/mail-config.glade.h:19
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
msgid "LDAP Configuration Assistant"
msgstr "LDAP 配置助手"
# mail/mail-config.glade.h:118
# mail/mail-config.glade.h:118
# mail/mail-config.glade.h:127
-#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:74
msgid "Never"
msgstr "从不"
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:29
msgid ""
"Now, you must specify how you want to connect to the LDAP server. The SSL "
"(Secure Sockets Layer)\n"
@@ -1802,14 +1792,14 @@ msgstr ""
# addressbook/gui/component/addressbook-config.glade.h:11
# addressbook/gui/component/addressbook-config.glade.h:11
# addressbook/gui/component/addressbook-config.glade.h:16
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:32
msgid "One"
msgstr ""
# addressbook/gui/component/addressbook-config.glade.h:13
# addressbook/gui/component/addressbook-config.glade.h:13
# addressbook/gui/component/addressbook-config.glade.h:18
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
msgid "S_earch scope: "
msgstr "搜索范围(_E):"
@@ -1820,17 +1810,17 @@ msgstr "搜索范围(_E):"
# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
# calendar/gui/e-week-view.c:1188
#. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:35
-#: calendar/gui/calendar-model.c:1982 calendar/gui/e-day-view.c:1666
-#: calendar/gui/e-week-view.c:1237
+#: addressbook/gui/component/ldap-config.glade.h:34
+#: calendar/gui/calendar-model.c:1982 calendar/gui/e-day-view.c:1686
+#: calendar/gui/e-week-view.c:1252
msgid "Searching"
msgstr "搜索"
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:35
msgid "Selected:"
msgstr "已选择:"
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:36
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if\n"
@@ -1839,7 +1829,7 @@ msgstr ""
"选中该选项意味着 Evolution 只在您的 LDAP 服务器支持\n"
"SSL 或 TLS 时才连接到您的 LDAP 服务器。"
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:38
msgid ""
"Selecting this option means that Evolution will only try to use SSL/TLS if "
"you are in a \n"
@@ -1850,7 +1840,7 @@ msgid ""
"secure."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:42
msgid ""
"Selecting this option means that your server does not support either SSL or "
"TLS. This \n"
@@ -1859,14 +1849,14 @@ msgid ""
"exploits. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:45
msgid ""
"Selecting this option will let you change Evolution's default settings for "
"LDAP\n"
"searches, and for creating and editing contacts. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:47
msgid ""
"Specifying a display name is the last required step in configuring an LDAP "
"server."
@@ -1875,40 +1865,40 @@ 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:49
+#: addressbook/gui/component/ldap-config.glade.h:48
msgid "Step 1: Server Information"
msgstr "第一步:服务器信息"
# mail/mail-config.c:2184 mail/mail-config.c:2188
# mail/mail-config.c:2233 mail/mail-config.c:2237
# mail/mail-config.c:2326 mail/mail-config.c:2330
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:49
msgid "Step 2: Connecting to Server"
msgstr "第二步:连接服务器"
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:50
msgid "Step 3: Searching the Directory"
msgstr "第三步:搜索目录"
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:51
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:53
+#: addressbook/gui/component/ldap-config.glade.h:52
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:54
+#: addressbook/gui/component/ldap-config.glade.h:53
msgid "Supported Search Bases"
msgstr "支持的搜索起点"
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:54
msgid ""
"The first step in configuring an LDAP server is to provide its name, and "
"your log in\n"
@@ -1916,7 +1906,7 @@ msgid ""
"information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:56
msgid ""
"The options on this page control how many entries should be included in "
"your\n"
@@ -1925,7 +1915,7 @@ msgid ""
"need to change these options."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:59
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
"searches will \n"
@@ -1933,7 +1923,7 @@ msgid ""
"directory tree."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:61
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the \n"
@@ -1943,24 +1933,24 @@ msgid ""
"your base.\n"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:65
msgid ""
"This assistant will help you to access online directory services\n"
"using LDAP (Lightweight Directory Access Protocol) servers. \n"
"\n"
-"Adding a new LDAP server requires some specialized information\n"
-"about the server. Please contact your system administrator if you \n"
-"need help finding this information."
+"Adding a new LDAP server requires some specialized information about the "
+"server. Please contact your system administrator if you need help finding "
+"this information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:69
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr "这是您的 LDAP 服务器的完整名字。例如,“ldap.mycompany.com”。"
# addressbook/gui/component/addressbook-config.glade.h:25
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:70
msgid ""
"This is the maximum number of entries to download. Setting this number to "
"be \n"
@@ -1970,7 +1960,7 @@ msgstr ""
"得太大将导致地址本变慢。"
# addressbook/gui/component/addressbook-config.glade.h:26
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:72
msgid ""
"This is the method evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1982,7 +1972,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:76
+#: addressbook/gui/component/ldap-config.glade.h:73
msgid ""
"This is the name for this server that will appear in your Evolution folder "
"list.\n"
@@ -1991,7 +1981,7 @@ msgstr ""
"这是该服务器在 Evolution 文件夹列表中显示的名子。\n"
"它只用于显示。"
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:75
msgid ""
"This is the port on the LDAP server that Evolution will try to connect to. "
"A \n"
@@ -1999,61 +1989,40 @@ msgid ""
"what port you should specify."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:78
msgid "This option controls how long a search will be run."
msgstr "该选项控制搜索将运行多长时间。"
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:79
msgid "U_se SSL/TLS:"
msgstr "使用 SSL/TLS (_S):"
# addressbook/gui/component/addressbook-config.glade.h:12
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:80
msgid "Using distinguished name (DN)"
msgstr "使用已识别的姓名 (DN)"
# addressbook/gui/component/addressbook-config.glade.h:9
# addressbook/gui/component/addressbook-config.glade.h:9
# addressbook/gui/component/addressbook-config.glade.h:13
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:81
msgid "Using email address"
msgstr "使用电子邮件地址"
-#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
-#: mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:128
msgid "Whenever Possible"
msgstr ""
-# addressbook/gui/component/addressbook-config.glade.h:24
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:24
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:31
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
-#: addressbook/gui/component/ldap-config.glade.h:86
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "_Add"
-msgstr "添加(_A)"
-
# 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:87
+#: addressbook/gui/component/ldap-config.glade.h:83
msgid "_Display name:"
msgstr "显示姓名(_D):"
# addressbook/gui/component/addressbook-config.glade.h:33
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:84
msgid "_Download limit:"
msgstr "下载上限(_D):"
@@ -2075,8 +2044,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:89 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
#: ui/evolution-message-composer.xml.h:41
@@ -2085,56 +2054,56 @@ msgstr "下载上限(_D):"
msgid "_Edit"
msgstr "编辑(_E)"
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:86
msgid "_Log in method:"
msgstr ""
# 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:91
+#: addressbook/gui/component/ldap-config.glade.h:87
msgid "_Port number:"
msgstr "端口号(_P):"
# 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:92
+#: addressbook/gui/component/ldap-config.glade.h:88
msgid "_Search base:"
msgstr "搜索起点(_S):"
# addressbook/gui/component/addressbook-config.glade.h:28
# addressbook/gui/component/addressbook-config.glade.h:28
# addressbook/gui/component/addressbook-config.glade.h:37
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:89
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:94
+#: addressbook/gui/component/ldap-config.glade.h:90
msgid "_Timeout (minutes):"
msgstr "超时(分钟)(_T):"
# 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:95
+#: addressbook/gui/component/ldap-config.glade.h:91
msgid "cards"
msgstr "卡片"
# mail/mail-ops.c:2089
# mail/mail-ops.c:2091
# mail/mail-ops.c:2134
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:92
msgid "connecting-tab"
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:97
+#: addressbook/gui/component/ldap-config.glade.h:93
msgid "general-tab"
msgstr "常规-页"
@@ -2144,7 +2113,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:98
+#: addressbook/gui/component/ldap-config.glade.h:94
msgid "searching-tab"
msgstr "搜索-页"
@@ -2173,7 +2142,7 @@ msgstr "全部删除"
# addressbook/gui/component/select-names/e-select-names.c:830
# composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
#: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: addressbook/gui/component/select-names/e-select-names.c:692
+#: addressbook/gui/component/select-names/e-select-names.c:694
#: composer/e-msg-composer-attachment-bar.c:507
msgid "Remove"
msgstr "删除"
@@ -2226,14 +2195,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:505
+#: addressbook/gui/component/select-names/e-select-names.c:509
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:648
+#: addressbook/gui/component/select-names/e-select-names.c:650
msgid "Find contact in"
msgstr "在其中寻找联系人"
@@ -2297,53 +2266,76 @@ msgstr "类别(_C):"
msgid "_Folder:"
msgstr "文件夹(_F):"
-# addressbook/gui/contact-editor/contact-editor.glade.h:1
-# addressbook/gui/contact-editor/contact-editor.glade.h:1
-# addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "A_ssistant's name:"
-msgstr "助手姓名(_S):"
+# 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:1645
+# addressbook/gui/contact-editor/e-contact-editor.c:1712
+# 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:1645
+# addressbook/gui/contact-editor/e-contact-editor.c:1712
+# 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:1645
+# addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#, fuzzy
+msgid " B_usiness:"
+msgstr "商务"
# addressbook/gui/contact-editor/contact-editor.glade.h:2
# addressbook/gui/contact-editor/contact-editor.glade.h:2
# addressbook/gui/contact-editor/contact-editor.glade.h:2
#: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "Add_ress..."
+#, fuzzy
+msgid "A_ddress..."
msgstr "地址(_R)..."
+# addressbook/gui/contact-editor/contact-editor.glade.h:1
+# addressbook/gui/contact-editor/contact-editor.glade.h:1
+# addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+msgid "A_ssistant's name:"
+msgstr "助手姓名(_S):"
+
# addressbook/gui/contact-editor/contact-editor.glade.h:3
# addressbook/gui/contact-editor/contact-editor.glade.h:3
# addressbook/gui/contact-editor/contact-editor.glade.h:3
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
msgid "Anni_versary:"
msgstr "周年(_V):"
# addressbook/gui/contact-editor/contact-editor.glade.h:4
# addressbook/gui/contact-editor/contact-editor.glade.h:4
# addressbook/gui/contact-editor/contact-editor.glade.h:4
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
msgid "Birthda_y:"
msgstr "生日(_Y):"
-# addressbook/gui/contact-editor/contact-editor.glade.h:8
-# calendar/gui/dialogs/event-page.glade.h:3
-# calendar/gui/dialogs/task-page.glade.h:1
-# addressbook/gui/contact-editor/contact-editor.glade.h:8
-# calendar/gui/dialogs/event-page.glade.h:3
-# calendar/gui/dialogs/task-page.glade.h:1
-# addressbook/gui/contact-editor/contact-editor.glade.h:8
-# calendar/gui/dialogs/event-page.glade.h:3
-# calendar/gui/dialogs/task-page.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "类别(_T)..."
+# 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:1647
+# addressbook/gui/widgets/e-addressbook-view.c:863
+# 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:1647
+# addressbook/gui/widgets/e-addressbook-view.c:863
+# 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:1647
+# addressbook/gui/widgets/e-addressbook-view.c:974
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#, fuzzy
+msgid "Business fa_x:"
+msgstr "商务传真"
# addressbook/gui/contact-editor/contact-editor.glade.h:9
# addressbook/gui/contact-editor/contact-editor.glade.h:9
# addressbook/gui/contact-editor/contact-editor.glade.h:9
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
msgid "Collaboration"
msgstr "合作"
@@ -2354,15 +2346,15 @@ msgstr "合作"
# addressbook/gui/contact-editor/contact-editor.glade.h:10
# addressbook/gui/contact-editor/e-contact-editor.c:1293
#. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1335
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/e-contact-editor.c:1334
msgid "Contact Editor"
msgstr "联系人编辑器"
# addressbook/gui/contact-editor/contact-editor.glade.h:11
# addressbook/gui/contact-editor/contact-editor.glade.h:11
# addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
msgid "D_epartment:"
msgstr "部门(_E):"
@@ -2372,7 +2364,7 @@ msgstr "部门(_E):"
# calendar/gui/dialogs/task-editor.c:183
# addressbook/gui/contact-editor/contact-editor.glade.h:12
# calendar/gui/dialogs/task-editor.c:183
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
#: calendar/gui/dialogs/task-editor.c:197
msgid "Details"
msgstr "细节"
@@ -2380,28 +2372,29 @@ msgstr "细节"
# addressbook/gui/contact-editor/contact-editor.glade.h:13
# addressbook/gui/contact-editor/contact-editor.glade.h:13
# addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
msgid "F_ree/Busy URL:"
msgstr "忙闲 URL(_R):"
# addressbook/gui/contact-editor/contact-editor.glade.h:14
# addressbook/gui/contact-editor/contact-editor.glade.h:14
# addressbook/gui/contact-editor/contact-editor.glade.h:14
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
-msgid "File A_s:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#, fuzzy
+msgid "File a_s:"
msgstr "文件另存为(_S):"
# addressbook/gui/contact-editor/contact-editor.glade.h:15
# addressbook/gui/contact-editor/contact-editor.glade.h:15
# addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
msgid "Full _Name..."
msgstr "全名(_N)..."
# addressbook/gui/contact-editor/contact-editor.glade.h:18
# addressbook/gui/contact-editor/contact-editor.glade.h:18
# addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
msgid ""
"If this person publishes free/busy or other calendar information on the "
"Internet, enter the address\n"
@@ -2411,52 +2404,112 @@ msgstr "如果此人把忙闲信息或其它日历信息发布到互联网上,
# addressbook/gui/contact-editor/contact-editor.glade.h:21
# addressbook/gui/contact-editor/contact-editor.glade.h:21
# addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
msgid "New phone type"
msgstr "新电话类型"
# addressbook/gui/contact-editor/contact-editor.glade.h:22
# addressbook/gui/contact-editor/contact-editor.glade.h:22
# addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
msgid "No_tes:"
msgstr "注释(_T):"
# addressbook/gui/contact-editor/contact-editor.glade.h:23
# addressbook/gui/contact-editor/contact-editor.glade.h:23
# addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
msgid "Organi_zation:"
msgstr "组织(_Z):"
# addressbook/gui/contact-editor/contact-editor.glade.h:24
# addressbook/gui/contact-editor/contact-editor.glade.h:24
# addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
msgid "P_rofession:"
msgstr "职业(_R):"
+# addressbook/gui/component/e-address-popup.c:474
+# addressbook/gui/contact-editor/contact-editor.glade.h:26
+# addressbook/gui/contact-editor/e-contact-editor.c:1686
+# addressbook/gui/component/e-address-popup.c:474
+# addressbook/gui/contact-editor/contact-editor.glade.h:26
+# addressbook/gui/contact-editor/e-contact-editor.c:1686
+# addressbook/gui/component/e-address-popup.c:474
+# addressbook/gui/contact-editor/contact-editor.glade.h:26
+# addressbook/gui/contact-editor/e-contact-editor.c:1686
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#, fuzzy
+msgid "Primary _email:"
+msgstr "常用电子邮件"
+
# addressbook/gui/contact-editor/contact-editor.glade.h:27
# addressbook/gui/contact-editor/contact-editor.glade.h:27
# addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
msgid "S_pouse:"
msgstr "配偶(_P):"
-# addressbook/gui/contact-editor/contact-editor.glade.h:28
-# addressbook/gui/contact-editor/contact-editor.glade.h:28
-# addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "This is the _mailing address"
-msgstr "这是邮件地址(_M)"
-
# addressbook/gui/contact-editor/contact-editor.glade.h:29
# addressbook/gui/contact-editor/contact-editor.glade.h:29
# addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
msgid "Wants to receive _HTML mail"
msgstr "愿意接收 HTML 邮件(_H)"
+# addressbook/gui/component/addressbook-config.glade.h:24
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:24
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:31
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+msgid "_Add"
+msgstr "添加(_A)"
+
+# 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:1645
+# addressbook/gui/contact-editor/e-contact-editor.c:1712
+# 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:1645
+# addressbook/gui/contact-editor/e-contact-editor.c:1712
+# 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:1645
+# addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#, fuzzy
+msgid "_Business:"
+msgstr "商务"
+
+# addressbook/gui/contact-editor/contact-editor.glade.h:8
+# calendar/gui/dialogs/event-page.glade.h:3
+# calendar/gui/dialogs/task-page.glade.h:1
+# addressbook/gui/contact-editor/contact-editor.glade.h:8
+# calendar/gui/dialogs/event-page.glade.h:3
+# calendar/gui/dialogs/task-page.glade.h:1
+# addressbook/gui/contact-editor/contact-editor.glade.h:8
+# calendar/gui/dialogs/event-page.glade.h:3
+# calendar/gui/dialogs/task-page.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#, fuzzy
+msgid "_Categories..."
+msgstr "类别(_T)..."
+
# addressbook/gui/contact-editor/contact-editor.glade.h:31
# calendar/gui/dialogs/alarm-page.glade.h:9
# calendar/gui/dialogs/meeting-page.c:707 filter/filter.glade.h:8
@@ -2475,29 +2528,64 @@ msgstr "愿意接收 HTML 邮件(_H)"
# mail/folder-browser.c:1478 mail/mail-config.glade.h:105
# ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:97
# ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: calendar/gui/dialogs/meeting-page.c:715 calendar/gui/e-calendar-table.c:967
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3590
-#: mail/folder-browser.c:1783 ui/evolution-addressbook.xml.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:968
+#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3616
+#: mail/folder-browser.c:1786 ui/evolution-addressbook.xml.h:32
#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
msgid "_Delete"
msgstr "删除(_D)"
+# 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:1651
+# addressbook/gui/contact-editor/e-contact-editor.c:1713
+# 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:1651
+# addressbook/gui/contact-editor/e-contact-editor.c:1713
+# 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:1651
+# addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#, fuzzy
+msgid "_Home:"
+msgstr "家庭"
+
# addressbook/gui/contact-editor/contact-editor.glade.h:32
# addressbook/gui/contact-editor/contact-editor.glade.h:32
# addressbook/gui/contact-editor/contact-editor.glade.h:32
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
msgid "_Job title:"
msgstr "职称(_J):"
# addressbook/gui/contact-editor/contact-editor.glade.h:33
# addressbook/gui/contact-editor/contact-editor.glade.h:33
# addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "_Manager's Name:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#, fuzzy
+msgid "_Manager's name:"
msgstr "经理姓名(_M):"
+# 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: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: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:1655
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "_Mobile:"
+msgstr "手机"
+
# addressbook/gui/contact-editor/contact-editor.glade.h:34
# addressbook/gui/contact-editor/contact-editor.glade.h:34
# addressbook/gui/contact-editor/contact-editor.glade.h:34
@@ -2519,10 +2607,18 @@ msgstr "办公室(_O):"
msgid "_Public Calendar URL:"
msgstr "公开日历 URL(_P):"
+# addressbook/gui/contact-editor/contact-editor.glade.h:28
+# addressbook/gui/contact-editor/contact-editor.glade.h:28
+# addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "_This is the mailing address"
+msgstr "这是邮件地址(_M)"
+
# addressbook/gui/contact-editor/contact-editor.glade.h:37
# addressbook/gui/contact-editor/contact-editor.glade.h:37
# addressbook/gui/contact-editor/contact-editor.glade.h:37
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
msgid "_Web page address:"
msgstr "网页地址(_W):"
@@ -4404,28 +4500,28 @@ msgstr "乍得"
# addressbook/gui/contact-editor/e-contact-editor.c:757
# addressbook/gui/contact-editor/e-contact-editor.c:757
# addressbook/gui/contact-editor/e-contact-editor.c:757
-#: addressbook/gui/contact-editor/e-contact-editor.c:828
+#: addressbook/gui/contact-editor/e-contact-editor.c:827
msgid "Category editor not available."
msgstr "类别编辑器不可用。"
# addressbook/gui/contact-editor/e-contact-editor.c:764
# addressbook/gui/contact-editor/e-contact-editor.c:764
# addressbook/gui/contact-editor/e-contact-editor.c:764
-#: addressbook/gui/contact-editor/e-contact-editor.c:836
+#: addressbook/gui/contact-editor/e-contact-editor.c:835
msgid "This contact belongs to these categories:"
msgstr "该联系人属于这些范畴:"
# addressbook/gui/contact-editor/e-contact-editor.c:978
# addressbook/gui/contact-editor/e-contact-editor.c:978
# addressbook/gui/contact-editor/e-contact-editor.c:978
-#: addressbook/gui/contact-editor/e-contact-editor.c:1010
+#: addressbook/gui/contact-editor/e-contact-editor.c:1009
msgid "Save Contact as VCard"
msgstr "将联系人保存为 VCard"
# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1056
+#: addressbook/gui/contact-editor/e-contact-editor.c:1055
#, fuzzy
msgid ""
"Are you sure you want\n"
@@ -4435,7 +4531,7 @@ msgstr "您确定要删除该联系人吗?"
# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+#: addressbook/gui/contact-editor/e-contact-editor.c:1058
msgid ""
"Are you sure you want\n"
"to delete this contact?"
@@ -4444,14 +4540,14 @@ msgstr "您确定要删除该联系人吗?"
# 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:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
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:2362
+#: addressbook/gui/contact-editor/e-contact-editor.c:2369
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr "无法为域找到构件:“%s”"
@@ -4466,16 +4562,28 @@ msgstr "快速添加联系人"
# addressbook/gui/contact-editor/e-contact-quick-add.c:300
# addressbook/gui/contact-editor/e-contact-quick-add.c:300
# addressbook/gui/contact-editor/e-contact-quick-add.c:300
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
-msgid "Edit Full"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#, fuzzy
+msgid "_Edit Full"
msgstr "完全编辑"
-# addressbook/gui/contact-editor/e-contact-quick-add.c:332
-# addressbook/gui/contact-editor/e-contact-quick-add.c:332
-# addressbook/gui/contact-editor/e-contact-quick-add.c:332
+# mail/mail-config.glade.h:101
+# mail/mail-config.glade.h:101
+# mail/mail-config.glade.h:110
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#, fuzzy
+msgid "_Full Name:"
+msgstr "全名(_F):"
+
+# addressbook/backend/ebook/e-card.c:3807
+# addressbook/backend/ebook/e-card.c:3807
+# addressbook/backend/ebook/e-card.c:3807
#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
-msgid "E-mail"
-msgstr "电子邮件"
+#, fuzzy
+msgid "E-_mail:"
+msgstr ""
+"\n"
+"电子邮件:"
# composer/e-msg-composer.c:978
# composer/e-msg-composer.c:982
@@ -4529,17 +4637,25 @@ msgstr "覆盖"
msgid "Address _2:"
msgstr "地址 2(_2):"
+# addressbook/gui/contact-editor/fulladdr.glade.h:238
+# addressbook/gui/contact-editor/fulladdr.glade.h:238
+# addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#, fuzzy
+msgid "Ci_ty:"
+msgstr "城市(_C):"
+
# addressbook/gui/contact-editor/fulladdr.glade.h:56
# addressbook/gui/contact-editor/fulladdr.glade.h:56
# addressbook/gui/contact-editor/fulladdr.glade.h:3
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
msgid "Countr_y:"
msgstr "国家(_Y):"
# addressbook/gui/contact-editor/fulladdr.glade.h:237
# addressbook/gui/contact-editor/fulladdr.glade.h:237
# addressbook/gui/contact-editor/fulladdr.glade.h:4
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
#, fuzzy
msgid "Full Address"
msgstr "地址(_A):"
@@ -4547,17 +4663,10 @@ msgstr "地址(_A):"
# addressbook/gui/contact-editor/fulladdr.glade.h:237
# addressbook/gui/contact-editor/fulladdr.glade.h:237
# addressbook/gui/contact-editor/fulladdr.glade.h:4
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
msgid "_Address:"
msgstr "地址(_A):"
-# addressbook/gui/contact-editor/fulladdr.glade.h:238
-# addressbook/gui/contact-editor/fulladdr.glade.h:238
-# addressbook/gui/contact-editor/fulladdr.glade.h:5
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "_City:"
-msgstr "城市(_C):"
-
# addressbook/gui/contact-editor/fulladdr.glade.h:239
# addressbook/gui/contact-editor/fulladdr.glade.h:239
# addressbook/gui/contact-editor/fulladdr.glade.h:6
@@ -4579,24 +4688,17 @@ msgstr "州/省(_S):"
msgid "_ZIP Code:"
msgstr "邮政编码(_Z):"
-# addressbook/gui/contact-editor/fullname.glade.h:1
-# addressbook/gui/contact-editor/fullname.glade.h:1
-# addressbook/gui/contact-editor/fullname.glade.h:1
-#: addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Check Full Name"
-msgstr "检查全名"
-
# addressbook/gui/contact-editor/fullname.glade.h:2
# addressbook/gui/contact-editor/fullname.glade.h:2
# addressbook/gui/contact-editor/fullname.glade.h:2
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:2
msgid "Dr."
msgstr "博士"
# addressbook/gui/contact-editor/fullname.glade.h:3
# addressbook/gui/contact-editor/fullname.glade.h:3
# addressbook/gui/contact-editor/fullname.glade.h:3
-#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:3
msgid "Esq."
msgstr "先生"
@@ -4698,49 +4800,40 @@ msgstr "后缀(_S):"
msgid "_Title:"
msgstr "头衔(_T):"
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-msgid "List _name:"
-msgstr "列举姓名(_N):"
-
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
msgid "Members"
msgstr "成员"
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "Type an email address or drag a contact into the list below:"
-msgstr "输入电子邮件地址或者把联系人拖放到下面的列表:"
-
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
msgid "_Hide addresses when sending mail to this list"
msgstr "在往该列表发送邮件时隐藏地址(_H)"
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-msgid "_Remove"
-msgstr "删除(_R)"
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_List name:"
+msgstr "列举姓名(_N):"
+
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "_Type an email address or drag a contact into the list below:"
+msgstr "输入电子邮件地址或者把联系人拖放到下面的列表:"
# 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/contact-list-editor/contact-list-editor.glade.h:10
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
msgid "contact-list-editor"
msgstr "联系人列表编辑器"
@@ -4783,42 +4876,35 @@ msgstr "将列表保存为 VCard"
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
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
-msgid "Add Anyway"
-msgstr "强制添加"
-
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
msgid "Duplicate Contact Detected"
msgstr "复制检测到的联系人"
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
msgid "New Contact:"
msgstr "新联系人:"
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
msgid "Original Contact:"
msgstr "原联系人:"
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
msgid ""
"The name or email address of this contact already exists\n"
"in this folder. Would you like to add it anyway?"
@@ -4826,31 +4912,24 @@ msgstr ""
"该联系人的姓名或地址已经在本文件夹中存在了。\n"
"您一定要添加吗?"
-# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Change Anyway"
-msgstr "强制修改"
-
# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
msgid "Changed Contact:"
msgstr "被改变的联系人:"
# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
msgid "Conflicting Contact:"
msgstr "冲突的联系人:"
# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
msgid ""
"The changed email or name of this contact already\n"
"exists in this folder. Would you like to add it anyway?"
@@ -4933,7 +5012,7 @@ msgstr "手机"
# addressbook/gui/widgets/e-addressbook-table-adapter.c:140
# addressbook/gui/widgets/e-addressbook-util.c:85
# addressbook/gui/widgets/e-minicard.c:475
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
#: addressbook/gui/widgets/e-addressbook-util.c:105
#: addressbook/gui/widgets/e-minicard.c:531
msgid "Error modifying card"
@@ -4963,10 +5042,10 @@ msgstr "成功"
# camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1895
# shell/e-storage.c:528 shell/evolution-shell-component.c:1057
#: addressbook/gui/widgets/e-addressbook-util.c:37
-#: camel/providers/imap/camel-imap-command.c:309
-#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/imap/camel-imap-command.c:306
+#: camel/providers/imap/camel-imap-command.c:403
#: camel/providers/pop3/camel-pop3-store.c:522
-#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2077
#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
msgid "Unknown error"
msgstr "未知的错误"
@@ -5028,9 +5107,9 @@ msgstr "不支持的协议"
#: addressbook/gui/widgets/e-addressbook-util.c:43
#: calendar/gui/calendar-model.c:758 calendar/gui/calendar-model.c:1183
#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:470 calendar/gui/print.c:2319
-#: camel/camel-service.c:737 camel/camel-service.c:779
-#: camel/camel-service.c:849 camel/camel-service.c:892
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
+#: camel/camel-service.c:737 camel/camel-service.c:780
+#: camel/camel-service.c:850 camel/camel-service.c:894
#: camel/providers/pop3/camel-pop3-store.c:439
#: camel/providers/pop3/camel-pop3-store.c:516
msgid "Cancelled"
@@ -5075,7 +5154,6 @@ msgstr "其它错误"
# addressbook/gui/widgets/e-addressbook-util.c:57
# calendar/gui/dialogs/save-comp.c:50
#: addressbook/gui/widgets/e-addressbook-util.c:75
-#: calendar/gui/dialogs/save-comp.c:50
msgid "Do you want to save changes?"
msgstr "您希望保存修改吗?"
@@ -5419,7 +5497,7 @@ msgstr "删除"
# widgets/menus/gal-view-menus.c:195
# widgets/menus/gal-view-menus.c:195
#: addressbook/gui/widgets/e-addressbook-view.c:904
-#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3555
+#: calendar/gui/e-day-view.c:3689 calendar/gui/e-week-view.c:3581
msgid "Current View"
msgstr "当前视图"
@@ -5711,8 +5789,8 @@ msgstr "周视图"
# addressbook/printing/e-contact-print-envelope.c:236
# addressbook/printing/e-contact-print-envelope.c:215
# addressbook/printing/e-contact-print-envelope.c:236
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
msgid "Print envelope"
msgstr "打印信封"
@@ -5891,7 +5969,7 @@ msgstr "列数:"
# addressbook/printing/e-contact-print.glade.h:23
# addressbook/printing/e-contact-print.glade.h:23
# addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:79
msgid "Options"
msgstr "选项"
@@ -6265,7 +6343,7 @@ msgstr "三十一号"
# calendar/gui/e-calendar-table.c:406 mail/message-list.c:679
#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:752
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
msgid "High"
msgstr "高"
@@ -6284,7 +6362,7 @@ msgstr "高"
#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
#: calendar/gui/calendar-model.c:1708
#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:751
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
msgid "Normal"
msgstr "中"
@@ -6299,7 +6377,7 @@ msgstr "中"
# calendar/gui/e-calendar-table.c:408 mail/message-list.c:677
#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:396 mail/message-list.c:750
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
msgid "Low"
msgstr "低"
@@ -6315,7 +6393,7 @@ msgstr "低"
#. An empty string is the same as 'None'.
#: calendar/cal-util/cal-util.c:570
#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/e-calendar-table.c:396
msgid "Undefined"
msgstr "未定义"
@@ -6509,7 +6587,7 @@ msgstr "编辑约会(_E)"
# calendar/gui/alarm-notify/alarm-queue.c:670
# calendar/gui/alarm-notify/alarm-queue.c:670
# calendar/gui/alarm-notify/alarm-queue.c:675
-#: calendar/gui/alarm-notify/alarm-queue.c:778
+#: calendar/gui/alarm-notify/alarm-queue.c:770
msgid "No description available."
msgstr "没有描述。"
@@ -6518,8 +6596,8 @@ msgstr "没有描述。"
# calendar/gui/alarm-notify/alarm-queue.c:753
# calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2283
# widgets/misc/e-messagebox.c:159
-#: calendar/gui/alarm-notify/alarm-queue.c:851
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:843
+#: calendar/gui/alarm-notify/alarm-queue.c:867
#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
msgid "Warning"
msgstr "警告"
@@ -6527,7 +6605,7 @@ msgstr "警告"
# calendar/gui/alarm-notify/alarm-queue.c:730
# calendar/gui/alarm-notify/alarm-queue.c:730
# calendar/gui/alarm-notify/alarm-queue.c:735
-#: calendar/gui/alarm-notify/alarm-queue.c:855
+#: calendar/gui/alarm-notify/alarm-queue.c:847
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -6542,7 +6620,7 @@ msgstr ""
# calendar/gui/alarm-notify/alarm-queue.c:781
# calendar/gui/alarm-notify/alarm-queue.c:781
# calendar/gui/alarm-notify/alarm-queue.c:758
-#: calendar/gui/alarm-notify/alarm-queue.c:881
+#: calendar/gui/alarm-notify/alarm-queue.c:873
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -6561,7 +6639,7 @@ msgstr ""
# mail/mail-callbacks.c:2142
# mail/mail-callbacks.c:2261
# calendar/gui/alarm-notify/alarm-queue.c:772
-#: calendar/gui/alarm-notify/alarm-queue.c:895
+#: calendar/gui/alarm-notify/alarm-queue.c:887
msgid "Do not ask me about this program again."
msgstr "不要再次询问该问题。"
@@ -6626,7 +6704,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:421 calendar/gui/e-day-view-top-item.c:264
-#: calendar/gui/e-day-view.c:1392 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view.c:1412 calendar/gui/e-week-view-main-item.c:325
msgid "%a %d %b"
msgstr "%b %d %a"
@@ -6669,7 +6747,7 @@ msgstr "%B %d"
# calendar/gui/calendar-commands.c:805
# calendar/gui/calendar-commands.c:820
# calendar/gui/calendar-commands.c:820
-#: calendar/gui/calendar-commands.c:844
+#: calendar/gui/calendar-commands.c:848
msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
@@ -6680,9 +6758,9 @@ msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
# 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/calendar-component.c:70 calendar/gui/gnome-cal.c:1344
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1352
#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
-#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
#: shell/e-shortcuts.c:1085
msgid "Calendar"
msgstr "日历"
@@ -6720,7 +6798,7 @@ msgstr "公共文件夹含有约会和事件"
# my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
# views/tasks/galview.xml.h:1
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:736
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
#: calendar/importers/icalendar-importer.c:645
#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
@@ -6855,7 +6933,7 @@ msgstr "创建一个新的全天约会创建新约会"
# calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
# calendar/gui/e-calendar-table.c:385
#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:963
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:372
msgid "Private"
msgstr "保密"
@@ -6866,14 +6944,14 @@ msgstr "保密"
# calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
# calendar/gui/e-calendar-table.c:386
#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:965
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:373
msgid "Confidential"
msgstr "机密"
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
-#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:372
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
msgid "Public"
msgstr "公开"
@@ -6912,7 +6990,7 @@ msgstr "西"
# calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
# calendar/gui/e-calendar-table.c:458
#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1133
-#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-calendar-table.c:445
msgid "Free"
msgstr "放假"
@@ -6925,8 +7003,8 @@ msgstr "放假"
# calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
# calendar/gui/e-meeting-time-sel.c:432
# shell/evolution-shell-component.c:1042
-#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:447
-#: calendar/gui/e-meeting-time-sel.c:407
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:406
#: shell/evolution-shell-component.c:1204
msgid "Busy"
msgstr "繁忙"
@@ -6942,7 +7020,7 @@ msgstr "繁忙"
# calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2246
#: calendar/gui/calendar-model.c:749 calendar/gui/calendar-model.c:1177
#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2310
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
msgid "Not Started"
msgstr "尚未开始"
@@ -6957,7 +7035,7 @@ msgstr "尚未开始"
# calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
#: calendar/gui/calendar-model.c:752 calendar/gui/calendar-model.c:1179
#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:468 calendar/gui/print.c:2313
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
msgid "In Progress"
msgstr "正在进行中"
@@ -6975,8 +7053,8 @@ msgstr "正在进行中"
# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
#: calendar/gui/calendar-model.c:755 calendar/gui/calendar-model.c:1181
#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:469 calendar/gui/e-meeting-model.c:296
-#: calendar/gui/e-meeting-model.c:319 calendar/gui/print.c:2316
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:294
+#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2316
msgid "Completed"
msgstr "已完成"
@@ -7017,12 +7095,12 @@ msgstr ""
#. An empty string is the same as 'None'.
#: calendar/gui/calendar-model.c:1175 calendar/gui/dialogs/meeting-page.c:330
#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2054
-#: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
-#: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:79
+#: mail/folder-browser.c:1748 mail/mail-account-gui.c:1254
+#: mail/mail-account-gui.c:1686 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:76
#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
-#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:441
+#: widgets/misc/e-dateedit.c:1457 widgets/misc/e-dateedit.c:1572
msgid "None"
msgstr "无"
@@ -7049,9 +7127,9 @@ msgstr "已分派"
# calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:301
# calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
# calendar/gui/e-meeting-model.c:810
-#: calendar/gui/calendar-model.c:1718 calendar/gui/e-meeting-model.c:268
-#: calendar/gui/e-meeting-model.c:278 calendar/gui/e-meeting-model.c:536
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/calendar-model.c:1718 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
+#: calendar/gui/e-meeting-model.c:784
msgid "Yes"
msgstr "是"
@@ -7061,8 +7139,8 @@ msgstr "是"
# calendar/gui/e-meeting-model.c:811
# calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
# calendar/gui/e-meeting-model.c:811
-#: calendar/gui/calendar-model.c:1718 calendar/gui/e-meeting-model.c:280
-#: calendar/gui/e-meeting-model.c:836
+#: calendar/gui/calendar-model.c:1718 calendar/gui/e-meeting-model.c:278
+#: calendar/gui/e-meeting-model.c:785
msgid "No"
msgstr "否"
@@ -7398,7 +7476,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:15 mail/mail-config.glade.h:178
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:173
msgid "minute(s)"
msgstr "分钟"
@@ -7713,7 +7791,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:152
+#: mail/mail-config.glade.h:147
msgid "_General"
msgstr "常规(_G)"
@@ -7945,36 +8023,36 @@ 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:328
+#: calendar/gui/dialogs/comp-editor.c:334
msgid "Could not update invalid object"
msgstr "无法更新无效对象"
-#: calendar/gui/dialogs/comp-editor.c:331
+#: calendar/gui/dialogs/comp-editor.c:337
msgid "Object not found, not updated"
msgstr "找不到对象,未更新"
-#: calendar/gui/dialogs/comp-editor.c:334
+#: calendar/gui/dialogs/comp-editor.c:340
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:337
+#: calendar/gui/dialogs/comp-editor.c:343
msgid "Could not update object"
msgstr "无法更新对象"
# calendar/gui/dialogs/comp-editor.c:678
# calendar/gui/dialogs/comp-editor.c:678
# calendar/gui/dialogs/comp-editor.c:692
-#: calendar/gui/dialogs/comp-editor.c:787
+#: calendar/gui/dialogs/comp-editor.c:793
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:792
+#: calendar/gui/dialogs/comp-editor.c:798
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
@@ -7982,7 +8060,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:795
+#: calendar/gui/dialogs/comp-editor.c:801
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
@@ -7990,7 +8068,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:798
+#: calendar/gui/dialogs/comp-editor.c:804
#, c-format
msgid "Journal entry - %s"
msgstr "日志条目 - %s"
@@ -7998,29 +8076,29 @@ 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:809
+#: calendar/gui/dialogs/comp-editor.c:815
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:1230
-#: calendar/gui/e-calendar-table.c:1038 calendar/gui/e-day-view.c:3924
-#: calendar/gui/e-week-view.c:3791 composer/e-msg-composer.c:1162
+#: calendar/gui/dialogs/comp-editor.c:1233
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3947
+#: calendar/gui/e-week-view.c:3817 composer/e-msg-composer.c:1162
msgid "Save as..."
msgstr "另存为..."
-#: calendar/gui/dialogs/comp-editor.c:1331
-#: calendar/gui/dialogs/comp-editor.c:1355
-#: calendar/gui/dialogs/comp-editor.c:1379
+#: calendar/gui/dialogs/comp-editor.c:1334
+#: calendar/gui/dialogs/comp-editor.c:1358
+#: calendar/gui/dialogs/comp-editor.c:1382
msgid "Changes made to this item may be discarded if an update arrives"
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:1406
+#: calendar/gui/dialogs/comp-editor.c:1409
msgid "Unable to obtain current version!"
msgstr "无法获取当前版本!"
@@ -8218,7 +8296,7 @@ msgstr "再次发生"
# calendar/gui/dialogs/event-editor.c:363
#: calendar/gui/dialogs/event-editor.c:220
#: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:436
msgid "Scheduling"
msgstr "正在调度"
@@ -8233,7 +8311,7 @@ msgstr "正在调度"
# calendar/gui/dialogs/event-editor.c:366
#: calendar/gui/dialogs/event-editor.c:227
#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
msgid "Meeting"
msgstr "会见"
@@ -8275,6 +8353,20 @@ msgstr "全天事务(_L)"
msgid "B_usy"
msgstr "忙(_U)"
+# addressbook/gui/contact-editor/contact-editor.glade.h:8
+# calendar/gui/dialogs/event-page.glade.h:3
+# calendar/gui/dialogs/task-page.glade.h:1
+# addressbook/gui/contact-editor/contact-editor.glade.h:8
+# calendar/gui/dialogs/event-page.glade.h:3
+# calendar/gui/dialogs/task-page.glade.h:1
+# addressbook/gui/contact-editor/contact-editor.glade.h:8
+# calendar/gui/dialogs/event-page.glade.h:3
+# calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
+msgid "Ca_tegories..."
+msgstr "类别(_T)..."
+
# calendar/gui/dialogs/event-page.glade.h:4
# calendar/gui/dialogs/task-page.glade.h:2
# calendar/gui/e-calendar-table.etspec.h:5
@@ -8412,7 +8504,7 @@ msgstr "那个人已经参加了会议!"
# calendar/gui/dialogs/meeting-page.c:701
# calendar/gui/dialogs/meeting-page.c:701
# calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:711
+#: calendar/gui/dialogs/meeting-page.c:713
msgid "_Delegate To..."
msgstr "授权于(_D)..."
@@ -8552,7 +8644,7 @@ msgstr "改变组织者(_C)"
# calendar/gui/dialogs/meeting-page.glade.h:4
# calendar/gui/e-meeting-time-sel.c:450
#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:425
+#: calendar/gui/e-meeting-time-sel.c:424
msgid "_Invite Others..."
msgstr "邀请其他人(_I)..."
@@ -8737,6 +8829,16 @@ msgstr "修改(_M)"
msgid "_No recurrence"
msgstr "没有循环(_N)"
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
+msgid "_Remove"
+msgstr "删除(_R)"
+
# calendar/gui/dialogs/recurrence-page.glade.h:13
# calendar/gui/dialogs/recurrence-page.glade.h:13
# calendar/gui/dialogs/recurrence-page.glade.h:13
@@ -8786,6 +8888,32 @@ msgstr "周"
msgid "year(s)"
msgstr "年"
+# mail/mail-account-gui.c:1045
+# mail/mail-account-gui.c:1045
+# mail/mail-account-gui.c:1042
+#: calendar/gui/dialogs/save-comp.c:54
+#, fuzzy
+msgid ""
+"This event has been changed, but has not been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"该签名已经被改变,但还没有存储。\n"
+"\n"
+"您希望保存改动吗?"
+
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1555
+msgid "_Discard Changes"
+msgstr ""
+
+# calendar/gui/e-itip-control.glade.h:4
+# calendar/gui/e-itip-control.glade.h:4
+# calendar/gui/e-itip-control.glade.h:4
+#: calendar/gui/dialogs/save-comp.c:63
+#, fuzzy
+msgid "Save Event"
+msgstr "日历事件"
+
# calendar/gui/dialogs/send-comp.c:55
# calendar/gui/dialogs/send-comp.c:55
# calendar/gui/dialogs/send-comp.c:56
@@ -8817,7 +8945,7 @@ msgstr "任务信息已经改变。发送更新版本?"
# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
-#: calendar/gui/dialogs/task-details-page.c:400
+#: calendar/gui/dialogs/task-details-page.c:401
#, fuzzy
msgid "Completed date is wrong"
msgstr "已完成 "
@@ -8855,7 +8983,6 @@ msgstr "进度"
# calendar/gui/dialogs/task-details-page.glade.h:12
# my-evolution/e-summary-preferences.c:966
#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:584
msgid "URL:"
msgstr "URL:"
@@ -8894,7 +9021,7 @@ msgstr "基本"
# calendar/gui/dialogs/task-editor.c:322
#: calendar/gui/dialogs/task-editor.c:204
#: calendar/gui/dialogs/task-editor.c:252
-#: calendar/gui/dialogs/task-editor.c:390
+#: calendar/gui/dialogs/task-editor.c:387
msgid "Assignment"
msgstr "分派"
@@ -8913,7 +9040,7 @@ msgstr ""
# composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1110
#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
msgid "Description:"
msgstr "描述:"
@@ -9087,88 +9214,77 @@ msgstr "%s 为未知触发类型"
# calendar/gui/e-calendar-table.c:427
# calendar/gui/e-calendar-table.c:427
# calendar/gui/e-calendar-table.c:428
-#: calendar/gui/e-calendar-table.c:416
-#, c-format
+#: calendar/gui/e-calendar-table.c:415
msgid "0%"
msgstr "0%"
# calendar/gui/e-calendar-table.c:428
# calendar/gui/e-calendar-table.c:428
# calendar/gui/e-calendar-table.c:429
-#: calendar/gui/e-calendar-table.c:417
-#, c-format
+#: calendar/gui/e-calendar-table.c:416
msgid "10%"
msgstr "10%"
# calendar/gui/e-calendar-table.c:429
# calendar/gui/e-calendar-table.c:429
# calendar/gui/e-calendar-table.c:430
-#: calendar/gui/e-calendar-table.c:418
-#, c-format
+#: calendar/gui/e-calendar-table.c:417
msgid "20%"
msgstr "20%"
# calendar/gui/e-calendar-table.c:430
# calendar/gui/e-calendar-table.c:430
# calendar/gui/e-calendar-table.c:431
-#: calendar/gui/e-calendar-table.c:419
-#, c-format
+#: calendar/gui/e-calendar-table.c:418
msgid "30%"
msgstr "30%"
# calendar/gui/e-calendar-table.c:431
# calendar/gui/e-calendar-table.c:431
# calendar/gui/e-calendar-table.c:432
-#: calendar/gui/e-calendar-table.c:420
-#, c-format
+#: calendar/gui/e-calendar-table.c:419
msgid "40%"
msgstr "40%"
# calendar/gui/e-calendar-table.c:432
# calendar/gui/e-calendar-table.c:432
# calendar/gui/e-calendar-table.c:433
-#: calendar/gui/e-calendar-table.c:421
-#, c-format
+#: calendar/gui/e-calendar-table.c:420
msgid "50%"
msgstr "50%"
# calendar/gui/e-calendar-table.c:433
# calendar/gui/e-calendar-table.c:433
# calendar/gui/e-calendar-table.c:434
-#: calendar/gui/e-calendar-table.c:422
-#, c-format
+#: calendar/gui/e-calendar-table.c:421
msgid "60%"
msgstr "60%"
# calendar/gui/e-calendar-table.c:434
# calendar/gui/e-calendar-table.c:434
# calendar/gui/e-calendar-table.c:435
-#: calendar/gui/e-calendar-table.c:423
-#, c-format
+#: calendar/gui/e-calendar-table.c:422
msgid "70%"
msgstr "70%"
# calendar/gui/e-calendar-table.c:435
# calendar/gui/e-calendar-table.c:435
# calendar/gui/e-calendar-table.c:436
-#: calendar/gui/e-calendar-table.c:424
-#, c-format
+#: calendar/gui/e-calendar-table.c:423
msgid "80%"
msgstr "80%"
# calendar/gui/e-calendar-table.c:436
# calendar/gui/e-calendar-table.c:436
# calendar/gui/e-calendar-table.c:437
-#: calendar/gui/e-calendar-table.c:425
-#, c-format
+#: calendar/gui/e-calendar-table.c:424
msgid "90%"
msgstr "90%"
# calendar/gui/e-calendar-table.c:437
# calendar/gui/e-calendar-table.c:437
# calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-calendar-table.c:426
-#, c-format
+#: calendar/gui/e-calendar-table.c:425
msgid "100%"
msgstr "100%"
@@ -9178,8 +9294,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:716 calendar/gui/e-day-view.c:2821
-#: calendar/gui/e-week-view.c:1914
+#: calendar/gui/e-calendar-table.c:717 calendar/gui/e-day-view.c:2841
+#: calendar/gui/e-week-view.c:1929
msgid "Deleting selected objects"
msgstr "删除选中的对象"
@@ -9192,8 +9308,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:948 calendar/gui/e-day-view.c:3688
-#: calendar/gui/e-week-view.c:3572 mail/folder-browser.c:1756
+#: calendar/gui/e-calendar-table.c:949 calendar/gui/e-day-view.c:3711
+#: calendar/gui/e-week-view.c:3598 mail/folder-browser.c:1759
#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
msgid "_Open"
msgstr "打开(_O)"
@@ -9201,7 +9317,7 @@ msgstr "打开(_O)"
# composer/e-msg-composer.c:943
# composer/e-msg-composer.c:947
# composer/e-msg-composer.c:912
-#: calendar/gui/e-calendar-table.c:949
+#: calendar/gui/e-calendar-table.c:950
msgid "_Save as..."
msgstr "另存为(_S)..."
@@ -9214,8 +9330,8 @@ msgstr "另存为(_S)..."
# 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:950 calendar/gui/e-day-view.c:3690
-#: calendar/gui/e-week-view.c:3547 calendar/gui/e-week-view.c:3574
+#: calendar/gui/e-calendar-table.c:951 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3573 calendar/gui/e-week-view.c:3600
#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
#: 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
@@ -9231,8 +9347,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:954 calendar/gui/e-day-view.c:3695
-#: calendar/gui/e-week-view.c:3579 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:955 calendar/gui/e-day-view.c:3718
+#: calendar/gui/e-week-view.c:3605 ui/evolution-addressbook.xml.h:1
#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "剪切(_U)"
@@ -9249,8 +9365,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:955 calendar/gui/e-day-view.c:3696
-#: calendar/gui/e-week-view.c:3580 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3719
+#: calendar/gui/e-week-view.c:3606 ui/evolution-addressbook.xml.h:30
#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
msgid "_Copy"
@@ -9271,9 +9387,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:956 calendar/gui/e-day-view.c:3661
-#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3551
-#: calendar/gui/e-week-view.c:3581 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3684
+#: calendar/gui/e-day-view.c:3720 calendar/gui/e-week-view.c:3577
+#: calendar/gui/e-week-view.c:3607 ui/evolution-addressbook.xml.h:37
#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
msgid "_Paste"
@@ -9282,35 +9398,35 @@ msgstr "粘贴(_P)"
# ui/evolution-task-editor.xml.h:1
# ui/evolution-task-editor.xml.h:1
# ui/evolution-task-editor.xml.h:1
-#: calendar/gui/e-calendar-table.c:960
+#: calendar/gui/e-calendar-table.c:961
msgid "_Assign Task"
msgstr "委派任务(_A)"
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:962
msgid "_Forward as iCalendar"
msgstr "作为 iCalendar 转发(_F)"
# calendar/gui/e-calendar-table.c:954
# calendar/gui/e-calendar-table.c:954
# calendar/gui/e-calendar-table.c:973
-#: calendar/gui/e-calendar-table.c:962
+#: calendar/gui/e-calendar-table.c:963
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
# calendar/gui/e-calendar-table.c:959
# calendar/gui/e-calendar-table.c:959
# calendar/gui/e-calendar-table.c:978
-#: calendar/gui/e-calendar-table.c:963
+#: calendar/gui/e-calendar-table.c:964
msgid "_Mark Selected Tasks as Complete"
msgstr "把任务标记为完成(_M)"
# calendar/gui/e-calendar-table.c:961
# calendar/gui/e-calendar-table.c:961
# calendar/gui/e-calendar-table.c:980
-#: calendar/gui/e-calendar-table.c:968
+#: calendar/gui/e-calendar-table.c:969
msgid "_Delete Selected Tasks"
msgstr "删除选定的任务(_D)"
@@ -9320,8 +9436,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:1243 calendar/gui/e-day-view.c:7645
-#: calendar/gui/e-week-view.c:4293
+#: calendar/gui/e-calendar-table.c:1236 calendar/gui/e-day-view.c:7661
+#: calendar/gui/e-week-view.c:4312
msgid "Updating objects"
msgstr "更新对象"
@@ -9331,7 +9447,7 @@ msgstr "更新对象"
# calendar/gui/e-calendar-table.etspec.h:6
# calendar/gui/e-calendar-table.c:1247
# calendar/gui/e-calendar-table.etspec.h:6
-#: calendar/gui/e-calendar-table.c:1326
+#: calendar/gui/e-calendar-table.c:1319
#: calendar/gui/e-calendar-table.etspec.h:6
msgid "Click to add a task"
msgstr "点击以添加任务"
@@ -9472,7 +9588,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:260 calendar/gui/e-day-view.c:1375
+#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1395
#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
msgid "%A %d %B"
msgstr "%B %d %A"
@@ -9485,7 +9601,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:268 calendar/gui/e-day-view.c:1408
+#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1428
#: calendar/gui/e-week-view-main-item.c:339
msgid "%d %b"
msgstr "%b %d"
@@ -9497,7 +9613,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:612 calendar/gui/e-week-view.c:344
+#: calendar/gui/e-day-view.c:610 calendar/gui/e-week-view.c:346
#: calendar/gui/print.c:813
msgid "am"
msgstr "上午"
@@ -9509,7 +9625,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:615 calendar/gui/e-week-view.c:347
+#: calendar/gui/e-day-view.c:613 calendar/gui/e-week-view.c:349
#: calendar/gui/print.c:815
msgid "pm"
msgstr "下午"
@@ -9517,14 +9633,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:3645
+#: calendar/gui/e-day-view.c:3668
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:3647 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3670 calendar/gui/e-week-view.c:3567
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
@@ -9537,21 +9653,21 @@ 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:3649 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3672 calendar/gui/e-week-view.c:3568
msgid "New Meeting"
msgstr "新会议"
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3543
+#: calendar/gui/e-day-view.c:3674 calendar/gui/e-week-view.c:3569
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:3656 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3679 ui/evolution-comp-editor.xml.h:11
msgid "Print..."
msgstr "打印..."
@@ -9561,7 +9677,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:3668 calendar/gui/e-week-view.c:3557
+#: calendar/gui/e-day-view.c:3691 calendar/gui/e-week-view.c:3583
#: ui/evolution-calendar.xml.h:13
msgid "Go to _Today"
msgstr "转到今天(_T)"
@@ -9569,14 +9685,14 @@ msgstr "转到今天(_T)"
# calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
# calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3422
# calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3426
-#: calendar/gui/e-day-view.c:3670 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3693 calendar/gui/e-week-view.c:3584
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:3675 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3588
#: ui/evolution-calendar.xml.h:34
msgid "_Publish Free/Busy Information"
msgstr "发布忙闲信息(_P)"
@@ -9584,7 +9700,7 @@ msgstr "发布忙闲信息(_P)"
# 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:3680 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3703 calendar/gui/e-week-view.c:3592
#: ui/evolution.xml.h:60
msgid "_Settings..."
msgstr "设置(_S)..."
@@ -9592,43 +9708,43 @@ msgstr "设置(_S)..."
# mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:105
# mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:105
# mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:107
-#: calendar/gui/e-day-view.c:3689 calendar/gui/e-week-view.c:3573
-#: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3712 calendar/gui/e-week-view.c:3599
+#: mail/folder-browser.c:1761 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:3701 calendar/gui/e-week-view.c:3585
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3611
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
# 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:3702 calendar/gui/e-week-view.c:3586
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3612
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_F)..."
# 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:3707 calendar/gui/e-week-view.c:3591
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3617
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:3708 calendar/gui/e-week-view.c:3592
+#: calendar/gui/e-day-view.c:3731 calendar/gui/e-week-view.c:3618
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:3709 calendar/gui/e-week-view.c:3593
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3619
msgid "Delete _All Occurrences"
msgstr "删除所有事件(_A)"
@@ -9819,8 +9935,8 @@ 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:1083 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:849
+#: calendar/gui/e-itip-control.c:1083 calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
#: calendar/gui/itip-utils.c:414
msgid "Accepted"
msgstr "接受"
@@ -9838,8 +9954,8 @@ 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:1091 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:313 calendar/gui/e-meeting-model.c:850
+#: calendar/gui/e-itip-control.c:1091 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
msgid "Declined"
msgstr "否决"
@@ -9864,14 +9980,14 @@ msgstr "否决"
# 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:1095 calendar/gui/e-itip-control.c:1303
-#: calendar/gui/e-meeting-model.c:224 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:807
-#: calendar/gui/e-meeting-model.c:823 camel/camel-gpg-context.c:1574
+#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
+#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
#: camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
-#: mail/mail-display.c:950 widgets/misc/e-charset-picker.c:60
-#: widgets/misc/e-charset-picker.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:348
+#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:546
msgid "Unknown"
msgstr "未知"
@@ -9912,7 +10028,7 @@ msgstr "更新"
#: calendar/gui/e-itip-control.c:1152 calendar/gui/e-itip-control.c:1183
#: calendar/gui/e-itip-control.c:1206 calendar/gui/e-itip-control.c:1219
#: calendar/gui/e-itip-control.c:1232 calendar/gui/e-itip-control.c:1245
-#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "确定"
@@ -9962,7 +10078,7 @@ msgstr "发送最新的信息"
# 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:1244 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:383 mail/mail-send-recv.c:440
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:443
#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
@@ -10446,21 +10562,21 @@ msgstr "日期-开始"
# calendar/gui/e-meeting-model.c:95
# calendar/gui/e-meeting-model.c:95
# calendar/gui/e-meeting-model.c:95
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:79
msgid "Chair Persons"
msgstr "主席人员"
# calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1550
# calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
# calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1697
+#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
msgid "Required Participants"
msgstr "必需的参与者"
# calendar/gui/e-meeting-model.c:97
# calendar/gui/e-meeting-model.c:97
# calendar/gui/e-meeting-model.c:97
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:81
msgid "Optional Participants"
msgstr "可选的参与者"
@@ -10470,7 +10586,7 @@ msgstr "可选的参与者"
# calendar/gui/e-meeting-model.c:780
# calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
# calendar/gui/e-meeting-model.c:780
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:82
msgid "Resources"
msgstr "资源"
@@ -10480,8 +10596,8 @@ msgstr "资源"
# calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
# calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
# calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:803
+#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
+#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
msgid "Individual"
msgstr "个人"
@@ -10491,8 +10607,8 @@ msgstr "个人"
# calendar/gui/e-meeting-model.c:779
# calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
# calendar/gui/e-meeting-model.c:779
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
+#: calendar/gui/e-meeting-model.c:753
msgid "Group"
msgstr "组"
@@ -10502,8 +10618,8 @@ msgstr "组"
# calendar/gui/e-meeting-model.c:780
# calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
# calendar/gui/e-meeting-model.c:780
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:805
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:754
msgid "Resource"
msgstr "资源"
@@ -10513,8 +10629,8 @@ msgstr "资源"
# calendar/gui/e-meeting-model.c:781
# calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
# calendar/gui/e-meeting-model.c:781
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:806
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:755
msgid "Room"
msgstr "房间"
@@ -10524,8 +10640,8 @@ msgstr "房间"
# calendar/gui/e-meeting-model.c:794
# calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
# calendar/gui/e-meeting-model.c:794
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
+#: calendar/gui/e-meeting-model.c:768
msgid "Chair"
msgstr "主席"
@@ -10535,8 +10651,8 @@ msgstr "主席"
# calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
# calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
# calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
msgid "Required Participant"
msgstr "必需的参与者"
@@ -10546,8 +10662,8 @@ msgstr "必需的参与者"
# calendar/gui/e-meeting-model.c:796
# calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
# calendar/gui/e-meeting-model.c:796
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:821
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:770
msgid "Optional Participant"
msgstr "可选的参与者"
@@ -10557,8 +10673,8 @@ msgstr "可选的参与者"
# calendar/gui/e-meeting-model.c:797
# calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
# calendar/gui/e-meeting-model.c:797
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:771
msgid "Non-Participant"
msgstr "不参加"
@@ -10568,8 +10684,8 @@ msgstr "不参加"
# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
-#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:309
-#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
msgid "Needs Action"
msgstr "需要动作"
@@ -10579,8 +10695,8 @@ msgstr "需要动作"
# calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
# calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
# calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:851 calendar/gui/e-meeting-time-sel.c:406
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
msgid "Tentative"
msgstr "暂时的"
@@ -10590,15 +10706,15 @@ msgstr "暂时的"
# calendar/gui/e-meeting-model.c:827
# calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
# calendar/gui/e-meeting-model.c:827
-#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
-#: calendar/gui/e-meeting-model.c:852
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:801
msgid "Delegated"
msgstr "被委任的"
# calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
# calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
# calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
-#: calendar/gui/e-meeting-model.c:298 calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
msgid "In Process"
msgstr "正在处理"
@@ -10611,7 +10727,7 @@ msgstr "正在处理"
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:458
-#: calendar/gui/e-meeting-time-sel.c:2115
+#: calendar/gui/e-meeting-time-sel.c:2097
msgid "%A, %B %d, %Y"
msgstr "%Y年%B月%d日 %A"
@@ -10627,7 +10743,7 @@ msgstr "%Y年%B月%d日 %A"
#. This is a strftime() format string %a = abbreviated weekday
#. name, %m = month number, %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:462
-#: calendar/gui/e-meeting-time-sel.c:2148 e-util/e-time-utils.c:189
+#: calendar/gui/e-meeting-time-sel.c:2130 e-util/e-time-utils.c:189
#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
msgid "%a %m/%d/%Y"
msgstr "%Y年%m月%d日 %a"
@@ -10641,21 +10757,21 @@ msgstr "%Y年%m月%d日 %a"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:224
-#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1583
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1581
msgid "%m/%d/%Y"
msgstr "%Y年%m月%d日"
# calendar/gui/e-meeting-time-sel.c:430
# calendar/gui/e-meeting-time-sel.c:433
# calendar/gui/e-meeting-time-sel.c:433
-#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
msgid "Out of Office"
msgstr "办公室以外"
# calendar/gui/e-meeting-time-sel.c:431
# calendar/gui/e-meeting-time-sel.c:434
# calendar/gui/e-meeting-time-sel.c:434
-#: calendar/gui/e-meeting-time-sel.c:409
+#: calendar/gui/e-meeting-time-sel.c:408
msgid "No Information"
msgstr "没有信息"
@@ -10669,92 +10785,92 @@ msgstr "选项(_O)"
# calendar/gui/e-meeting-time-sel.c:484
# calendar/gui/e-meeting-time-sel.c:487
# calendar/gui/e-meeting-time-sel.c:487
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:464
msgid "Show _Only Working Hours"
msgstr "只显示工作小时(_O)"
# calendar/gui/e-meeting-time-sel.c:497
# calendar/gui/e-meeting-time-sel.c:500
# calendar/gui/e-meeting-time-sel.c:500
-#: calendar/gui/e-meeting-time-sel.c:481
+#: calendar/gui/e-meeting-time-sel.c:474
msgid "Show _Zoomed Out"
msgstr "显示缩放的输出(_Z)"
# calendar/gui/e-meeting-time-sel.c:515
# calendar/gui/e-meeting-time-sel.c:518
# calendar/gui/e-meeting-time-sel.c:518
-#: calendar/gui/e-meeting-time-sel.c:499
+#: calendar/gui/e-meeting-time-sel.c:489
msgid "_Update Free/Busy"
msgstr "更新忙闲(_U)"
# calendar/gui/e-meeting-time-sel.c:533
# calendar/gui/e-meeting-time-sel.c:536
# calendar/gui/e-meeting-time-sel.c:536
-#: calendar/gui/e-meeting-time-sel.c:517
+#: calendar/gui/e-meeting-time-sel.c:504
msgid "_<<"
msgstr "_<<"
# calendar/gui/e-meeting-time-sel.c:550
# calendar/gui/e-meeting-time-sel.c:553
# calendar/gui/e-meeting-time-sel.c:553
-#: calendar/gui/e-meeting-time-sel.c:534
+#: calendar/gui/e-meeting-time-sel.c:522
msgid "_Autopick"
msgstr "自动获取(_A)"
# calendar/gui/e-meeting-time-sel.c:564
# calendar/gui/e-meeting-time-sel.c:567
# calendar/gui/e-meeting-time-sel.c:567
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:537
msgid ">_>"
msgstr ">_>"
# calendar/gui/e-meeting-time-sel.c:581
# calendar/gui/e-meeting-time-sel.c:584
# calendar/gui/e-meeting-time-sel.c:584
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:554
msgid "_All People and Resources"
msgstr "所有人和资源(_A)"
# calendar/gui/e-meeting-time-sel.c:594
# calendar/gui/e-meeting-time-sel.c:597
# calendar/gui/e-meeting-time-sel.c:597
-#: calendar/gui/e-meeting-time-sel.c:580
+#: calendar/gui/e-meeting-time-sel.c:563
msgid "All _People and One Resource"
msgstr "所有人和一个资源(_P)"
# calendar/gui/e-meeting-time-sel.c:607
# calendar/gui/e-meeting-time-sel.c:610
# calendar/gui/e-meeting-time-sel.c:610
-#: calendar/gui/e-meeting-time-sel.c:593
+#: calendar/gui/e-meeting-time-sel.c:572
msgid "_Required People"
msgstr "必需的人(_R)"
# calendar/gui/e-meeting-time-sel.c:620
# calendar/gui/e-meeting-time-sel.c:623
# calendar/gui/e-meeting-time-sel.c:623
-#: calendar/gui/e-meeting-time-sel.c:606
+#: calendar/gui/e-meeting-time-sel.c:581
msgid "Required People and _One Resource"
msgstr "必需的人和一个资源(_O)"
# calendar/gui/e-meeting-time-sel.c:643
# calendar/gui/e-meeting-time-sel.c:646
# calendar/gui/e-meeting-time-sel.c:646
-#: calendar/gui/e-meeting-time-sel.c:629
+#: calendar/gui/e-meeting-time-sel.c:600
msgid "Meeting _start time:"
msgstr "会议开始时间(_S):"
# calendar/gui/e-meeting-time-sel.c:662
# calendar/gui/e-meeting-time-sel.c:665
# calendar/gui/e-meeting-time-sel.c:665
-#: calendar/gui/e-meeting-time-sel.c:648
+#: calendar/gui/e-meeting-time-sel.c:620
msgid "Meeting _end time:"
msgstr "会议结束时间(_E):"
# calendar/gui/e-tasks.c:328
# calendar/gui/e-tasks.c:328
# calendar/gui/e-tasks.c:342
-#: calendar/gui/e-tasks.c:358 calendar/gui/gnome-cal.c:1983
-#: calendar/gui/gnome-cal.c:1994
+#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2005
+#: calendar/gui/gnome-cal.c:2016
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
@@ -10762,7 +10878,7 @@ msgstr "在 %s 打开任务"
# calendar/gui/e-tasks.c:355
# calendar/gui/e-tasks.c:355
# calendar/gui/e-tasks.c:367
-#: calendar/gui/e-tasks.c:387 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:199
#, c-format
msgid "Could not load the tasks in `%s'"
msgstr "无法从“%s”中装入任务"
@@ -10770,7 +10886,7 @@ msgstr "无法从“%s”中装入任务"
# calendar/gui/e-tasks.c:367
# calendar/gui/e-tasks.c:367
# calendar/gui/e-tasks.c:379
-#: calendar/gui/e-tasks.c:402
+#: calendar/gui/e-tasks.c:404
#, c-format
msgid "The method required to load `%s' is not supported"
msgstr "不支持装入“%s”必需的方法"
@@ -10778,7 +10894,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:416 calendar/gui/gnome-cal.c:1501
+#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1508
#, c-format
msgid "You don't have permission to open the folder in `%s'"
msgstr "您没有适当的权限打开“%s”中的文件夹"
@@ -10786,7 +10902,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:484 calendar/gui/gnome-cal.c:1705
+#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1727
#, c-format
msgid ""
"Error on %s:\n"
@@ -10798,7 +10914,7 @@ msgstr ""
# calendar/gui/e-calendar-table.etspec.h:8
# calendar/gui/e-calendar-table.etspec.h:8
# calendar/gui/e-calendar-table.etspec.h:8
-#: calendar/gui/e-tasks.c:555
+#: calendar/gui/e-tasks.c:557
msgid "Completing tasks..."
msgstr "正在完成的日期..."
@@ -10808,28 +10924,28 @@ msgstr "正在完成的日期..."
# calendar/gui/e-week-view.c:1824
# calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
# calendar/gui/e-week-view.c:1828
-#: calendar/gui/e-tasks.c:578
+#: calendar/gui/e-tasks.c:580
msgid "Deleting selected objects..."
msgstr "正在删除选中的对象..."
# mail/mail-ops.c:1556
# mail/mail-ops.c:1558
# calendar/gui/e-tasks.c:629
-#: calendar/gui/e-tasks.c:673
+#: calendar/gui/e-tasks.c:675
msgid "Expunging"
msgstr "正在删除"
# calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
# calendar/gui/e-week-view.c:3408 calendar/gui/e-week-view.c:3446
# calendar/gui/e-week-view.c:3412 calendar/gui/e-week-view.c:3450
-#: calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3566
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:1473
+#: calendar/gui/gnome-cal.c:1480
#, c-format
msgid "Could not open the folder in `%s'"
msgstr "无法打开“%s”中的文件夹"
@@ -10837,7 +10953,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:1487
+#: calendar/gui/gnome-cal.c:1494
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr "不支持打开“%s”必需的方法"
@@ -10845,12 +10961,12 @@ msgstr "不支持打开“%s”必需的方法"
# calendar/gui/alarm-notify/alarm-notify-dialog.c:371
# calendar/gui/alarm-notify/alarm-notify-dialog.c:371
# calendar/gui/alarm-notify/alarm-notify-dialog.c:371
-#: calendar/gui/gnome-cal.c:1533
+#: calendar/gui/gnome-cal.c:1555
#, c-format
msgid "Adding alarms for %s"
msgstr "添加关于 %s 的提醒"
-#: calendar/gui/gnome-cal.c:1725
+#: calendar/gui/gnome-cal.c:1747
#, c-format
msgid ""
"The calendar backend for\n"
@@ -10858,7 +10974,7 @@ msgid ""
" has crashed. You will have to restart Evolution in order to use it again"
msgstr ""
-#: calendar/gui/gnome-cal.c:1734
+#: calendar/gui/gnome-cal.c:1756
#, c-format
msgid ""
"The task backend for\n"
@@ -10869,7 +10985,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:1965
+#: calendar/gui/gnome-cal.c:1987
#, c-format
msgid "Opening calendar at %s"
msgstr "从 %s 打开日历"
@@ -10877,7 +10993,7 @@ msgstr "从 %s 打开日历"
# mail/mail-ops.c:1234
# mail/mail-ops.c:1236
# mail/mail-ops.c:1279
-#: calendar/gui/gnome-cal.c:2005
+#: calendar/gui/gnome-cal.c:2027
msgid "Opening default tasks folder"
msgstr "正在打开默认任务文件夹"
@@ -11239,8 +11355,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:2533 calendar/gui/print.c:2619
-#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:616
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2949
+#: my-evolution/e-summary.c:649
msgid "Print Preview"
msgstr "打印预览"
@@ -14336,7 +14452,7 @@ msgstr ""
# mail/mail-send-recv.c:541
#: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
#: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:573
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:576
msgid "Cancelled."
msgstr "已取消"
@@ -15006,7 +15122,7 @@ msgstr "正在解析: %s"
# camel/camel-service.c:638
# camel/camel-service.c:641
# camel/camel-service.c:641
-#: camel/camel-service.c:773 camel/camel-service.c:887
+#: camel/camel-service.c:774 camel/camel-service.c:889
#, c-format
msgid "Failure in name lookup: %s"
msgstr "域名寻找失败: %s"
@@ -15014,7 +15130,7 @@ msgstr "域名寻找失败: %s"
# camel/camel-service.c:663
# camel/camel-service.c:666
# camel/camel-service.c:666
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr "主机寻找失败: %s: 没有找到主机"
@@ -15022,7 +15138,7 @@ msgstr "主机寻找失败: %s: 没有找到主机"
# camel/camel-service.c:665
# camel/camel-service.c:668
# camel/camel-service.c:668
-#: camel/camel-service.c:803
+#: camel/camel-service.c:804
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr "主机寻找失败: %s: 未知的原因"
@@ -15030,21 +15146,21 @@ msgstr "主机寻找失败: %s: 未知的原因"
# camel/camel-service.c:611
# camel/camel-service.c:614
# camel/camel-service.c:614
-#: camel/camel-service.c:853
+#: camel/camel-service.c:854
msgid "Resolving address"
msgstr "正在解析地址"
# camel/camel-service.c:663
# camel/camel-service.c:666
# camel/camel-service.c:666
-#: camel/camel-service.c:915
+#: camel/camel-service.c:917
msgid "Host lookup failed: host not found"
msgstr "主机寻找失败:没有找到主机"
# camel/camel-service.c:665
# camel/camel-service.c:668
# camel/camel-service.c:668
-#: camel/camel-service.c:918
+#: camel/camel-service.c:920
msgid "Host lookup failed: unknown reason"
msgstr "主机寻找失败:未知的原因"
@@ -15488,9 +15604,9 @@ msgstr "无法重命名文件夹: %s: 没有该文件夹"
# camel/camel-remote-store.c:481
# camel/providers/imap/camel-imap-command.c:228
# camel/providers/imap/camel-imap-command.c:409
-#: camel/providers/imap/camel-imap-command.c:224
-#: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-command.c:221
+#: camel/providers/imap/camel-imap-command.c:260
+#: camel/providers/imap/camel-imap-command.c:450
#: camel/providers/imap/camel-imap-store.c:2644
msgid "Operation cancelled"
msgstr "操作已取消"
@@ -15501,7 +15617,7 @@ msgstr "操作已取消"
# camel/providers/imap/camel-imap-command.c:274
# camel/camel-remote-store.c:484
# camel/providers/imap/camel-imap-command.c:274
-#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-command.c:305
#: camel/providers/imap/camel-imap-store.c:2647
#, c-format
msgid "Server unexpectedly disconnected: %s"
@@ -15511,7 +15627,7 @@ msgstr "服务器意外地中止了连接: %s"
# camel/providers/imap/camel-imap-command.c:352
# camel/providers/imap/camel-imap-command.c:352
#. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:326
+#: camel/providers/imap/camel-imap-command.c:323
#, c-format
msgid ""
"Alert from IMAP server %s@%s:\n"
@@ -15523,7 +15639,7 @@ msgstr ""
# camel/providers/imap/camel-imap-command.c:352
# camel/providers/imap/camel-imap-command.c:352
# camel/providers/imap/camel-imap-command.c:352
-#: camel/providers/imap/camel-imap-command.c:395
+#: camel/providers/imap/camel-imap-command.c:392
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "来自 IMAP 服务器的意外应答: %s"
@@ -15531,7 +15647,7 @@ msgstr "来自 IMAP 服务器的意外应答: %s"
# camel/providers/imap/camel-imap-command.c:362
# camel/providers/imap/camel-imap-command.c:362
# camel/providers/imap/camel-imap-command.c:362
-#: camel/providers/imap/camel-imap-command.c:405
+#: camel/providers/imap/camel-imap-command.c:402
#, c-format
msgid "IMAP command failed: %s"
msgstr "IMAP 命令失败: %s"
@@ -15539,14 +15655,14 @@ msgstr "IMAP 命令失败: %s"
# camel/providers/imap/camel-imap-command.c:417
# camel/providers/imap/camel-imap-command.c:417
# camel/providers/imap/camel-imap-command.c:417
-#: camel/providers/imap/camel-imap-command.c:463
+#: camel/providers/imap/camel-imap-command.c:460
msgid "Server response ended too soon."
msgstr "服务器应答结束太快。"
# camel/providers/imap/camel-imap-command.c:608
# camel/providers/imap/camel-imap-command.c:608
# camel/providers/imap/camel-imap-command.c:610
-#: camel/providers/imap/camel-imap-command.c:655
+#: camel/providers/imap/camel-imap-command.c:652
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "IMAP 服务器应答不含有 %s 信息"
@@ -15554,7 +15670,7 @@ msgstr "IMAP 服务器应答不含有 %s 信息"
# camel/providers/imap/camel-imap-command.c:644
# camel/providers/imap/camel-imap-command.c:644
# camel/providers/imap/camel-imap-command.c:646
-#: camel/providers/imap/camel-imap-command.c:691
+#: camel/providers/imap/camel-imap-command.c:688
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr "来自 IMAP 服务器意外的 OK 应答: %s"
@@ -15593,7 +15709,7 @@ msgstr "正在扫描改变了的邮件"
# camel/camel-smime-context.c:810
# camel/camel-smime-context.c:810
# camel/camel-filter-search.c:126
-#: camel/providers/imap/camel-imap-folder.c:1873
+#: camel/providers/imap/camel-imap-folder.c:1875
#, c-format
msgid "Unable to retrieve message: %s"
msgstr "无法检索邮件:%s"
@@ -15622,7 +15738,7 @@ msgstr "无法检索邮件:%s"
# camel/providers/local/camel-mh-folder.c:207
# camel/providers/local/camel-mh-folder.c:215
# camel/providers/local/camel-spool-folder.c:579
-#: camel/providers/imap/camel-imap-folder.c:1910
+#: camel/providers/imap/camel-imap-folder.c:1912
#: camel/providers/local/camel-maildir-folder.c:212
#: camel/providers/local/camel-maildir-folder.c:225
#: camel/providers/local/camel-maildir-folder.c:234
@@ -15650,7 +15766,7 @@ msgstr ""
# camel/providers/local/camel-mbox-folder.c:331
# camel/providers/local/camel-mh-folder.c:198
# camel/providers/local/camel-spool-folder.c:579
-#: camel/providers/imap/camel-imap-folder.c:1910
+#: camel/providers/imap/camel-imap-folder.c:1912
#: camel/providers/local/camel-maildir-folder.c:212
#: camel/providers/local/camel-mbox-folder.c:351
#: camel/providers/local/camel-mh-folder.c:201
@@ -15663,8 +15779,8 @@ msgstr "没有该邮件"
# camel/providers/imap/camel-imap-folder.c:2001
# camel/providers/imap/camel-imap-folder.c:1632
# camel/providers/imap/camel-imap-folder.c:2108
-#: camel/providers/imap/camel-imap-folder.c:1933
-#: camel/providers/imap/camel-imap-folder.c:2529
+#: camel/providers/imap/camel-imap-folder.c:1935
+#: camel/providers/imap/camel-imap-folder.c:2531
msgid "This message is not currently available"
msgstr "该邮件目前不可用"
@@ -15674,15 +15790,15 @@ msgstr "该邮件目前不可用"
# camel/providers/imap/camel-imap-folder.c:1821
# camel/providers/imap/camel-imap-folder.c:1787
# camel/providers/imap/camel-imap-folder.c:1861
-#: camel/providers/imap/camel-imap-folder.c:2193
-#: camel/providers/imap/camel-imap-folder.c:2263
+#: camel/providers/imap/camel-imap-folder.c:2195
+#: camel/providers/imap/camel-imap-folder.c:2265
msgid "Fetching summary information for new messages"
msgstr "从新邮件中获取概要信息"
# camel/providers/imap/camel-imap-folder.c:2038
# camel/providers/imap/camel-imap-folder.c:2038
# camel/providers/imap/camel-imap-folder.c:2145
-#: camel/providers/imap/camel-imap-folder.c:2567
+#: camel/providers/imap/camel-imap-folder.c:2569
msgid "Could not find message body in FETCH response."
msgstr "无法在 FETCH 应答中找到邮件体。"
@@ -15748,7 +15864,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:1176
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
msgid "Folders"
msgstr "文件夹"
@@ -15805,7 +15921,7 @@ msgstr "IMAP 服务器上的邮件的读写。"
# camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:60
#: camel/providers/imap/camel-imap-provider.c:80
#: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:83
msgid "Password"
msgstr "密码"
@@ -17056,7 +17172,7 @@ msgstr "%s 天之后删除"
# camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
# camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
# camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:59
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:82
msgid "POP"
msgstr "POP"
@@ -17187,7 +17303,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:107
msgid "Sendmail"
msgstr "Sendmail"
@@ -17272,7 +17388,7 @@ msgstr "通过 sendmail 程序发送邮件"
# camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
# camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
# camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:74
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:99
msgid "SMTP"
msgstr "SMTP"
@@ -17580,7 +17696,7 @@ msgstr "SMTP 欢迎"
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1199
-#: camel/providers/smtp/camel-smtp-transport.c:926
+#: camel/providers/smtp/camel-smtp-transport.c:927
#, fuzzy, c-format
msgid "HELO request timed out: %s"
msgstr "RSET 请求超时: %s"
@@ -17588,7 +17704,7 @@ msgstr "RSET 请求超时: %s"
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1213
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:949
#, fuzzy
msgid "HELO response error"
msgstr "RSET 应答错误"
@@ -17596,14 +17712,14 @@ msgstr "RSET 应答错误"
# camel/providers/smtp/camel-smtp-transport.c:758
# camel/providers/smtp/camel-smtp-transport.c:758
# camel/providers/smtp/camel-smtp-transport.c:883
-#: camel/providers/smtp/camel-smtp-transport.c:1014
+#: camel/providers/smtp/camel-smtp-transport.c:1015
msgid "SMTP Authentication"
msgstr "SMTP 认证"
# camel/providers/smtp/camel-smtp-transport.c:764
# camel/providers/smtp/camel-smtp-transport.c:764
# camel/providers/smtp/camel-smtp-transport.c:889
-#: camel/providers/smtp/camel-smtp-transport.c:1020
+#: camel/providers/smtp/camel-smtp-transport.c:1021
msgid "Error creating SASL authentication object."
msgstr "创建 SASL 认证对象错误。"
@@ -17613,8 +17729,8 @@ msgstr "创建 SASL 认证对象错误。"
# camel/providers/smtp/camel-smtp-transport.c:791
# camel/providers/smtp/camel-smtp-transport.c:904
# camel/providers/smtp/camel-smtp-transport.c:916
-#: camel/providers/smtp/camel-smtp-transport.c:1037
-#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
#, c-format
msgid "AUTH request timed out: %s"
msgstr "AUTH 请求超时: %s"
@@ -17622,21 +17738,21 @@ msgstr "AUTH 请求超时: %s"
# camel/providers/smtp/camel-smtp-transport.c:800
# camel/providers/smtp/camel-smtp-transport.c:800
# camel/providers/smtp/camel-smtp-transport.c:925
-#: camel/providers/smtp/camel-smtp-transport.c:1058
+#: camel/providers/smtp/camel-smtp-transport.c:1059
msgid "AUTH request failed."
msgstr "AUTH 请求失败。"
# camel/providers/smtp/camel-smtp-transport.c:848
# camel/providers/smtp/camel-smtp-transport.c:848
# camel/providers/smtp/camel-smtp-transport.c:973
-#: camel/providers/smtp/camel-smtp-transport.c:1119
+#: camel/providers/smtp/camel-smtp-transport.c:1120
msgid "Bad authentication response from server.\n"
msgstr "来自服务器的错误认证应答。\n"
# camel/providers/smtp/camel-smtp-transport.c:874
# camel/providers/smtp/camel-smtp-transport.c:874
# camel/providers/smtp/camel-smtp-transport.c:999
-#: camel/providers/smtp/camel-smtp-transport.c:1144
+#: camel/providers/smtp/camel-smtp-transport.c:1145
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr "MAIL FROM 请求超时: %s: 邮件未发送"
@@ -17644,20 +17760,20 @@ msgstr "MAIL FROM 请求超时: %s: 邮件未发送"
# camel/providers/smtp/camel-smtp-transport.c:893
# camel/providers/smtp/camel-smtp-transport.c:893
# camel/providers/smtp/camel-smtp-transport.c:1013
-#: camel/providers/smtp/camel-smtp-transport.c:1164
+#: camel/providers/smtp/camel-smtp-transport.c:1165
msgid "MAIL FROM response error"
msgstr "MAIL FROM 应答错误"
# camel/providers/smtp/camel-smtp-transport.c:918
# camel/providers/smtp/camel-smtp-transport.c:918
# camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1188
+#: camel/providers/smtp/camel-smtp-transport.c:1189
#, c-format
msgid "RCPT TO request timed out: %s: mail not sent"
msgstr "RCPT TO 请求超时: %s: 邮件未发送"
# camel/providers/smtp/camel-smtp-transport.c:1054
-#: camel/providers/smtp/camel-smtp-transport.c:1210
+#: camel/providers/smtp/camel-smtp-transport.c:1211
#, c-format
msgid "RCPT TO <%s> failed"
msgstr "RCPT TO <%s> 失败"
@@ -17665,7 +17781,7 @@ msgstr "RCPT TO <%s> 失败"
# camel/providers/smtp/camel-smtp-transport.c:971
# camel/providers/smtp/camel-smtp-transport.c:971
# camel/providers/smtp/camel-smtp-transport.c:1090
-#: camel/providers/smtp/camel-smtp-transport.c:1249
+#: camel/providers/smtp/camel-smtp-transport.c:1250
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr "DATA 请求超时: %s: 邮件未发送"
@@ -17676,7 +17792,7 @@ msgstr "DATA 请求超时: %s: 邮件未发送"
#. we should have gotten instructions on how to use the DATA command:
#. * 354 Enter mail, end with "." on a line by itself
#.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1270
msgid "DATA response error"
msgstr "DATA 应答错误"
@@ -17686,8 +17802,8 @@ msgstr "DATA 应答错误"
# camel/providers/smtp/camel-smtp-transport.c:1048
# camel/providers/smtp/camel-smtp-transport.c:1144
# camel/providers/smtp/camel-smtp-transport.c:1162
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1333
+#: camel/providers/smtp/camel-smtp-transport.c:1311
+#: camel/providers/smtp/camel-smtp-transport.c:1334
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr "DATA 发送超时: 消息终止: %s: 邮件未发送"
@@ -17697,14 +17813,14 @@ msgstr "DATA 发送超时: 消息终止: %s: 邮件未发送"
# camel/camel-sasl-kerberos4.c:218
# camel/providers/imap/camel-imap-store.c:495
# camel/providers/smtp/camel-smtp-transport.c:1176
-#: camel/providers/smtp/camel-smtp-transport.c:1353
+#: camel/providers/smtp/camel-smtp-transport.c:1354
msgid "DATA termination response error"
msgstr "DATA 终止应答错误"
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1199
-#: camel/providers/smtp/camel-smtp-transport.c:1376
+#: camel/providers/smtp/camel-smtp-transport.c:1377
#, c-format
msgid "RSET request timed out: %s"
msgstr "RSET 请求超时: %s"
@@ -17712,7 +17828,7 @@ msgstr "RSET 请求超时: %s"
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1213
-#: camel/providers/smtp/camel-smtp-transport.c:1396
+#: camel/providers/smtp/camel-smtp-transport.c:1397
msgid "RSET response error"
msgstr "RSET 应答错误"
@@ -17722,7 +17838,7 @@ msgstr "RSET 应答错误"
# camel/providers/smtp/camel-smtp-transport.c:791
# camel/providers/smtp/camel-smtp-transport.c:904
# camel/providers/smtp/camel-smtp-transport.c:916
-#: camel/providers/smtp/camel-smtp-transport.c:1419
+#: camel/providers/smtp/camel-smtp-transport.c:1420
#, fuzzy, c-format
msgid "QUIT request timed out: %s"
msgstr "AUTH 请求超时: %s"
@@ -17730,7 +17846,7 @@ msgstr "AUTH 请求超时: %s"
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1250
-#: camel/providers/smtp/camel-smtp-transport.c:1439
+#: camel/providers/smtp/camel-smtp-transport.c:1440
msgid "QUIT response error"
msgstr "QUIT 应答错误"
@@ -17762,7 +17878,7 @@ msgstr "%.0fG"
# composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:136
# composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:135
#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:223
+#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
msgid "attachment"
msgstr "附件"
@@ -18091,10 +18207,6 @@ msgstr ""
"\n"
"您是否希望保存修改?"
-#: composer/e-msg-composer.c:1555
-msgid "_Discard Changes"
-msgstr ""
-
# composer/e-msg-composer.c:1412
# composer/e-msg-composer.c:1329
# composer/e-msg-composer.c:1295
@@ -18116,22 +18228,22 @@ msgstr "打开文件"
msgid "Signature:"
msgstr "签名:"
-#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1255
msgid "Autogenerated"
msgstr "已自动生成"
# composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
# composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
# composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2334
-#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2871
-#: composer/e-msg-composer.c:2872
+#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2900
+#: composer/e-msg-composer.c:2901
msgid "Compose a message"
msgstr "撰写邮件"
# composer/e-msg-composer.c:2440
# composer/e-msg-composer.c:2380
# composer/e-msg-composer.c:2351
-#: composer/e-msg-composer.c:2903
+#: composer/e-msg-composer.c:2932
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
@@ -18142,7 +18254,7 @@ msgstr ""
# composer/e-msg-composer.c:2463 composer/e-msg-composer.c:2518
# composer/e-msg-composer.c:2403 composer/e-msg-composer.c:2458
# composer/e-msg-composer.c:2374 composer/e-msg-composer.c:2429
-#: composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2958
#, fuzzy
msgid ""
"Could not create composer window:\n"
@@ -18156,7 +18268,7 @@ msgstr ""
# composer/e-msg-composer.c:2463 composer/e-msg-composer.c:2518
# composer/e-msg-composer.c:2403 composer/e-msg-composer.c:2458
# composer/e-msg-composer.c:2374 composer/e-msg-composer.c:2429
-#: composer/e-msg-composer.c:2989
+#: composer/e-msg-composer.c:3026
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
@@ -18164,7 +18276,7 @@ msgstr ""
"无法创见撰写窗口:\n"
"无法激活 HTML 编辑器组件。"
-#: composer/e-msg-composer.c:4003
+#: composer/e-msg-composer.c:4040
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -18413,7 +18525,7 @@ msgstr ""
# mail/mail-display.c:102
# calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
# mail/mail-display.c:101
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
msgid "Overwrite file?"
msgstr "覆盖文件?"
@@ -18558,7 +18670,7 @@ msgstr "%H:%M:%S"
#. strptime format for time of day, without seconds,
#. in 12-hour format.
#: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
-#: widgets/misc/e-dateedit.c:1405 widgets/misc/e-dateedit.c:1618
+#: widgets/misc/e-dateedit.c:1403 widgets/misc/e-dateedit.c:1616
msgid "%I:%M %p"
msgstr "%I:%M %p"
@@ -18570,7 +18682,7 @@ msgstr "%I:%M %p"
# widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1644
#. strptime format for time of day, without seconds 24-hour format.
#: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
-#: widgets/misc/e-dateedit.c:1402 widgets/misc/e-dateedit.c:1615
+#: widgets/misc/e-dateedit.c:1400 widgets/misc/e-dateedit.c:1613
msgid "%H:%M"
msgstr "%H:%M"
@@ -18752,7 +18864,7 @@ msgstr "指定文件名:"
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:834
#: filter/filter-folder.c:243 filter/vfolder-rule.c:438
-#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
+#: mail/mail-account-gui.c:1504 mail/mail-account-gui.c:1518
msgid "Select Folder"
msgstr "选择文件夹"
@@ -18766,21 +18878,21 @@ msgstr ""
"%s"
#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1404
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1404
msgid "Important"
msgstr "重要"
# my-evolution/Locations.h:508
#. red
#: filter/filter-label.c:122 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1405
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1405
#, fuzzy
msgid "Work"
msgstr "科克"
# my-evolution/Locations.h:1795
#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:84
#: shell/e-config-upgrade.c:1406
#, fuzzy
msgid "Personal"
@@ -18791,7 +18903,7 @@ msgstr "波纳尔"
# addressbook/gui/contact-editor/e-contact-editor-address.c:335
#. forest green
#: filter/filter-label.c:124 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1407
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1407
#, fuzzy
msgid "To Do"
msgstr "多哥"
@@ -18800,7 +18912,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:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:66
#: shell/e-config-upgrade.c:1408
#, fuzzy
msgid "Later"
@@ -18910,7 +19022,7 @@ msgstr "过去"
msgid "months"
msgstr "月"
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:179
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:174
msgid "seconds"
msgstr "秒"
@@ -19093,7 +19205,7 @@ msgstr "已标志"
# ui/evolution-mail-message.xml.h:98
# ui/evolution-mail-message.xml.h:98
# my-evolution/Locations.h:1192
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1796
#, fuzzy
msgid "Label"
msgstr "劳雷尔"
@@ -19171,7 +19283,7 @@ msgstr "小于"
msgid "Score"
msgstr "分数"
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1819
msgid "Sender"
msgstr "发件人"
@@ -19327,6 +19439,7 @@ msgstr "正在扫描 %s"
#: importers/pine-importer.c:637 mail/component-factory.c:116
#: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
+#: my-evolution/my-evolution.glade.h:4
msgid "Mail"
msgstr "邮件"
@@ -19500,25 +19613,17 @@ msgstr ""
msgid "Configure spell-checking, signatures, and the message composer here"
msgstr ""
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-#, fuzzy
-msgid "Configure the fonts used by Evolution here"
-msgstr "Evolution 撰写器车间。"
-
# ui/evolution-mail-global.xml.h:4
# ui/evolution-mail-global.xml.h:4
# ui/evolution-mail-global.xml.h:4
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
msgid "Configure your email accounts here"
msgstr "在这里配置您的电子邮件账号"
# data/evolution.desktop.in.h:1 shell/main.c:83
# shell/main.c:83
# shell/main.c:83
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
#, fuzzy
msgid "Evolution Mail"
msgstr "Evolution"
@@ -19526,7 +19631,7 @@ msgstr "Evolution"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
#, fuzzy
msgid "Evolution Mail accounts configuration control"
msgstr "Evolution 任务控制车间"
@@ -19534,7 +19639,7 @@ msgstr "Evolution 任务控制车间"
# mail/GNOME_Evolution_Mail.oaf.in.h:2
# mail/GNOME_Evolution_Mail.oaf.in.h:2
# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
#, fuzzy
msgid "Evolution Mail component"
msgstr "Evolution 邮件撰写器。"
@@ -19542,7 +19647,7 @@ msgstr "Evolution 邮件撰写器。"
# mail/GNOME_Evolution_Mail.oaf.in.h:2
# mail/GNOME_Evolution_Mail.oaf.in.h:2
# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
#, fuzzy
msgid "Evolution Mail composer"
msgstr "Evolution 邮件撰写器。"
@@ -19550,7 +19655,7 @@ msgstr "Evolution 邮件撰写器。"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
#, fuzzy
msgid "Evolution Mail composer configuration control"
msgstr "Evolution 任务控制车间"
@@ -19558,7 +19663,7 @@ msgstr "Evolution 任务控制车间"
# mail/GNOME_Evolution_Mail.oaf.in.h:8
# mail/GNOME_Evolution_Mail.oaf.in.h:8
# mail/GNOME_Evolution_Mail.oaf.in.h:8
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
#, fuzzy
msgid "Evolution Mail configuration interface"
msgstr "邮件配置界面"
@@ -19566,43 +19671,27 @@ msgstr "邮件配置界面"
# mail/GNOME_Evolution_Mail.oaf.in.h:4
# mail/GNOME_Evolution_Mail.oaf.in.h:4
# mail/GNOME_Evolution_Mail.oaf.in.h:4
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
#, fuzzy
msgid "Evolution Mail folder viewer"
msgstr "Evolution 邮件文件夹显示组件。"
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-#, fuzzy
-msgid "Evolution Mail font configuration control"
-msgstr "Evolution 任务控制车间"
-
# mail/GNOME_Evolution_Mail.oaf.in.h:3
# mail/GNOME_Evolution_Mail.oaf.in.h:3
# mail/GNOME_Evolution_Mail.oaf.in.h:3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
#, fuzzy
msgid "Evolution Mail preferences control"
msgstr "Evolution 邮件实施概要组件。"
-# calendar/gui/dialogs/recurrence-page.glade.h:11
-# calendar/gui/dialogs/recurrence-page.glade.h:11
-# calendar/gui/dialogs/recurrence-page.glade.h:11
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "Font Preferences"
-msgstr "没有循环(_N)"
-
# mail/mail-config.glade.h:8
# mail/mail-config.glade.h:8
# mail/mail-config.glade.h:8
-#: mail/GNOME_Evolution_Mail.server.in.in.h:16
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
msgid "Mail Accounts"
msgstr "邮件帐号"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
msgid "Mail Preferences"
msgstr "邮件首选项"
@@ -19674,39 +19763,39 @@ msgstr "您的某些邮件设置好像已崩溃,请按顺序检查所有内容
# mail/mail-callbacks.c:230
# mail/mail-callbacks.c:230
# mail/mail-callbacks.c:187
-#: mail/component-factory.c:997
+#: mail/component-factory.c:998
msgid "You have not set a mail transport method"
msgstr "您还没有设置邮件传输方法"
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1021
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr "您已取消邮件的发送,您仍希望退出吗?"
# mail/component-factory.c:951
# mail/component-factory.c:951
# mail/component-factory.c:955
-#: mail/component-factory.c:1060
+#: mail/component-factory.c:1061
msgid "New Mail Message"
msgstr "新建邮件"
# ui/evolution-mail-global.xml.h:20
# ui/evolution-mail-global.xml.h:20
# ui/evolution-mail-global.xml.h:20
-#: mail/component-factory.c:1060
+#: mail/component-factory.c:1061
msgid "_Mail Message"
msgstr "邮件(_M)"
# composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
# composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
# composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2334
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1062
msgid "Compose a new mail message"
msgstr "撰写一封新邮件"
# ui/evolution-mail-global.xml.h:10
# ui/evolution-mail-global.xml.h:10
# ui/evolution-mail-global.xml.h:10
-#: mail/component-factory.c:1069
+#: mail/component-factory.c:1070
#, fuzzy
msgid "New Message Post"
msgstr "新建邮件"
@@ -19714,21 +19803,21 @@ msgstr "新建邮件"
# ui/evolution-mail-message.xml.h:65
# ui/evolution-mail-message.xml.h:65
# ui/evolution-mail-message.xml.h:65
-#: mail/component-factory.c:1069
+#: mail/component-factory.c:1070
msgid "_Post Message"
msgstr "发送邮件(_P)"
# mail/component-factory.c:951
# mail/component-factory.c:951
# mail/component-factory.c:955
-#: mail/component-factory.c:1070
+#: mail/component-factory.c:1071
msgid "Post a new mail message"
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/component-factory.c:1353
+#: mail/component-factory.c:1354
#, fuzzy
msgid "Connecting..."
msgstr "正在连接服务器..."
@@ -19736,7 +19825,7 @@ msgstr "正在连接服务器..."
# mail/component-factory.c:1206
# mail/component-factory.c:1206
# mail/component-factory.c:1211
-#: mail/component-factory.c:1364
+#: mail/component-factory.c:1365
msgid "Cannot register storage with shell"
msgstr "无法用 shell 注册存储"
@@ -19758,7 +19847,7 @@ msgstr "属性"
# mail/folder-browser.c:297 mail/mail-display.c:298
# mail/folder-browser.c:297 mail/mail-display.c:297
# mail/folder-browser.c:298 mail/mail-display.c:298
-#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:939
+#: mail/folder-browser.c:330 mail/mail-display.c:394 mail/mail-display.c:942
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "无法创建临时目录: %s"
@@ -19766,7 +19855,7 @@ msgstr "无法创建临时目录: %s"
# mail/folder-browser.c:731
# mail/folder-browser.c:751
# mail/folder-browser.c:752
-#: mail/folder-browser.c:782
+#: mail/folder-browser.c:785
#, c-format
msgid "%d new"
msgstr "%d 新"
@@ -19777,21 +19866,21 @@ msgstr "%d 新"
# mail/folder-browser.c:765
# mail/folder-browser.c:755 mail/folder-browser.c:763
# mail/folder-browser.c:766
-#: mail/folder-browser.c:785 mail/folder-browser.c:793
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:788 mail/folder-browser.c:796
+#: mail/folder-browser.c:799
msgid ", "
msgstr ", "
# mail/folder-browser.c:735
# mail/folder-browser.c:756
# mail/folder-browser.c:757
-#: mail/folder-browser.c:787
+#: mail/folder-browser.c:790
#, c-format
msgid "%d hidden"
msgstr "隐藏 %d 个"
# mail/folder-browser.c:759
-#: mail/folder-browser.c:789
+#: mail/folder-browser.c:792
#, c-format
msgid "%d visible"
msgstr "%d 个可见"
@@ -19799,7 +19888,7 @@ msgstr "%d 个可见"
# mail/folder-browser.c:740
# mail/folder-browser.c:763
# mail/folder-browser.c:764
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:797
#, c-format
msgid "%d selected"
msgstr "选择 %d 个"
@@ -19807,7 +19896,7 @@ msgstr "选择 %d 个"
# mail/folder-browser.c:763
# mail/folder-browser.c:768
# mail/folder-browser.c:769
-#: mail/folder-browser.c:799
+#: mail/folder-browser.c:802
#, c-format
msgid "%d unsent"
msgstr "%d 个未发送"
@@ -19815,7 +19904,7 @@ msgstr "%d 个未发送"
# mail/folder-browser.c:765
# mail/folder-browser.c:770
# mail/folder-browser.c:771
-#: mail/folder-browser.c:801
+#: mail/folder-browser.c:804
#, c-format
msgid "%d sent"
msgstr "%d 个已发送"
@@ -19823,7 +19912,7 @@ msgstr "%d 个已发送"
# mail/folder-browser.c:767
# mail/folder-browser.c:772
# mail/folder-browser.c:773
-#: mail/folder-browser.c:803
+#: mail/folder-browser.c:806
#, c-format
msgid "%d total"
msgstr "共 %d 个"
@@ -19831,7 +19920,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:1182
+#: mail/folder-browser.c:1185
#, fuzzy
msgid "Create _Virtual Folder From Search..."
msgstr "从邮件创建虚拟文件夹(_V)"
@@ -19839,102 +19928,102 @@ msgstr "从邮件创建虚拟文件夹(_V)"
# mail/folder-browser.c:1430
# mail/folder-browser.c:1437
# mail/folder-browser.c:1438
-#: mail/folder-browser.c:1729
+#: mail/folder-browser.c:1732
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:1730
+#: mail/folder-browser.c:1733
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:1731
+#: mail/folder-browser.c:1734
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:1732
+#: mail/folder-browser.c:1735
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:1736
+#: mail/folder-browser.c:1739
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:1737
+#: mail/folder-browser.c:1740
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:1738
+#: mail/folder-browser.c:1741
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:1739 mail/folder-browser.c:2063
+#: mail/folder-browser.c:1742 mail/folder-browser.c:2066
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:1757
+#: mail/folder-browser.c:1760
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:1759
+#: mail/folder-browser.c:1762
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:1763 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1766 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:1764 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1767 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:1765 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1768 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:1766
+#: mail/folder-browser.c:1769
msgid "_Forward"
msgstr "转发(_F)"
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1773
msgid "Follo_w Up..."
msgstr ""
@@ -19950,7 +20039,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:1771
+#: mail/folder-browser.c:1774
#, fuzzy
msgid "Fla_g Completed"
msgstr "已完成"
@@ -19959,7 +20048,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:1772
+#: mail/folder-browser.c:1775
#, fuzzy
msgid "Cl_ear Flag"
msgstr "清除"
@@ -19968,14 +20057,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:1776 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1779 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:1777
+#: mail/folder-browser.c:1780
#, fuzzy
msgid "Mark as _Unread"
msgstr "标记为未读(_N)"
@@ -19983,14 +20072,14 @@ msgstr "标记为未读(_N)"
# mail/folder-browser.c:1461
# mail/folder-browser.c:1468
# mail/folder-browser.c:1469
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1781
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:1779
+#: mail/folder-browser.c:1782
#, fuzzy
msgid "_Mark as Unimportant"
msgstr "标记为不重要(_O)"
@@ -19998,7 +20087,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:1784
+#: mail/folder-browser.c:1787
#, fuzzy
msgid "U_ndelete"
msgstr "反删除(_U)"
@@ -20006,7 +20095,7 @@ msgstr "反删除(_U)"
# mail/folder-browser.c:1466
# mail/folder-browser.c:1475
# mail/folder-browser.c:1476
-#: mail/folder-browser.c:1788
+#: mail/folder-browser.c:1791
#, fuzzy
msgid "Mo_ve to Folder..."
msgstr "移动到文件夹(_M)..."
@@ -20014,14 +20103,14 @@ msgstr "移动到文件夹(_M)..."
# mail/folder-browser.c:1467
# mail/folder-browser.c:1476
# mail/folder-browser.c:1477
-#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1792 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:1797
+#: mail/folder-browser.c:1800
#, fuzzy
msgid "Add Sender to Address_book"
msgstr "将发件人添加到地址簿"
@@ -20029,7 +20118,7 @@ msgstr "将发件人添加到地址簿"
# mail/folder-browser.c:1476
# mail/folder-browser.c:1485
# mail/folder-browser.c:1486
-#: mail/folder-browser.c:1801
+#: mail/folder-browser.c:1804
#, fuzzy
msgid "Appl_y Filters"
msgstr "应用过滤规则"
@@ -20037,7 +20126,7 @@ msgstr "应用过滤规则"
# mail/folder-browser.c:1478
# mail/folder-browser.c:1487
# mail/folder-browser.c:1488
-#: mail/folder-browser.c:1805
+#: mail/folder-browser.c:1808
#, fuzzy
msgid "Crea_te Rule From Message"
msgstr "从消息创建规则(_L)"
@@ -20045,7 +20134,7 @@ msgstr "从消息创建规则(_L)"
# mail/folder-browser.c:1629
# mail/folder-browser.c:1657
# mail/folder-browser.c:1658
-#: mail/folder-browser.c:2064
+#: mail/folder-browser.c:2067
#, fuzzy
msgid "VFolder on M_ailing List"
msgstr "关于邮件列表的虚拟文件夹"
@@ -20053,7 +20142,7 @@ msgstr "关于邮件列表的虚拟文件夹"
# mail/folder-browser.c:1631
# mail/folder-browser.c:1659
# mail/folder-browser.c:1660
-#: mail/folder-browser.c:2066
+#: mail/folder-browser.c:2069
#, fuzzy, c-format
msgid "Filter on _Mailing List (%s)"
msgstr "过滤邮件列表 (%s)"
@@ -20061,7 +20150,7 @@ msgstr "过滤邮件列表 (%s)"
# mail/folder-browser.c:1632
# mail/folder-browser.c:1660
# mail/folder-browser.c:1661
-#: mail/folder-browser.c:2067
+#: mail/folder-browser.c:2070
#, fuzzy, c-format
msgid "VFolder on M_ailing List (%s)"
msgstr "关于邮件列表 (%s) 的虚拟文件夹"
@@ -20069,7 +20158,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:40
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
msgid "Default"
msgstr "默认"
@@ -20198,14 +20287,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:751 mail/mail-config.glade.h:154
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:149
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:755 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:123
#, fuzzy
msgid "User_name:"
msgstr "用户名(_U):"
@@ -20213,14 +20302,14 @@ msgstr "用户名(_U):"
# mail/mail-config.glade.h:112
# mail/mail-config.glade.h:112
# mail/mail-config.glade.h:121
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:156
msgid "_Path:"
msgstr "路径(_P):"
# mail/mail-account-gui.c:1654
# mail/mail-account-gui.c:1654
# mail/mail-account-gui.c:1665
-#: mail/mail-account-gui.c:1880
+#: mail/mail-account-gui.c:1881
msgid "You may not create two accounts with the same name."
msgstr "您不能以相同的名字创建两个帐号。"
@@ -20242,7 +20331,8 @@ msgstr "不要删除"
# mail/mail-accounts.c:194
# mail/mail-accounts.c:194
#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
-#: mail/mail-composer-prefs.c:676 mail/mail-composer-prefs.c:694
+#: mail/mail-composer-prefs.c:675 mail/mail-composer-prefs.c:693
+#: mail/mail-composer-prefs.c:717
msgid "Disable"
msgstr "禁用"
@@ -20250,7 +20340,8 @@ msgstr "禁用"
# mail/mail-accounts.c:196
# mail/mail-accounts.c:196
#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
-#: mail/mail-composer-prefs.c:676 mail/mail-composer-prefs.c:694
+#: mail/mail-composer-prefs.c:675 mail/mail-composer-prefs.c:693
+#: mail/mail-composer-prefs.c:717
msgid "Enable"
msgstr "启用"
@@ -20266,8 +20357,10 @@ msgstr "默认"
# mail/mail-config.glade.h:33
# mail/mail-config.glade.h:33
# mail/mail-config.glade.h:39
+#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
+#. has "activatable" set.
#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:706 mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
msgid "Enabled"
msgstr "已启用"
@@ -20343,14 +20436,14 @@ msgstr ""
# widgets/misc/e-messagebox.c:224
# widgets/misc/e-messagebox.c:224
#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:100 widgets/misc/e-messagebox.c:226
+#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
msgid "Don't show this message again."
msgstr "不再显示该信息。"
# mail/mail-callbacks.c:137
# mail/mail-callbacks.c:137
# mail/mail-callbacks.c:94
-#: mail/mail-callbacks.c:189
+#: mail/mail-callbacks.c:190
msgid ""
"You have not configured the mail client.\n"
"You need to do this before you can send,\n"
@@ -20365,7 +20458,7 @@ msgstr ""
# mail/mail-callbacks.c:186
# mail/mail-callbacks.c:186
# mail/mail-callbacks.c:143
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:212
#, fuzzy
msgid ""
"You need to configure an account\n"
@@ -20377,7 +20470,7 @@ msgstr ""
# mail/mail-callbacks.c:186
# mail/mail-callbacks.c:186
# mail/mail-callbacks.c:143
-#: mail/mail-callbacks.c:225
+#: mail/mail-callbacks.c:226
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
@@ -20388,7 +20481,7 @@ msgstr ""
# mail/mail-callbacks.c:200
# mail/mail-callbacks.c:200
# mail/mail-callbacks.c:157
-#: mail/mail-callbacks.c:232
+#: mail/mail-callbacks.c:233
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
@@ -20400,7 +20493,7 @@ msgstr ""
# mail/mail-callbacks.c:265
# mail/mail-callbacks.c:222
#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:254
+#: mail/mail-callbacks.c:255
#, fuzzy
msgid ""
"You are sending an HTML-formatted message. Please make sure that\n"
@@ -20410,14 +20503,14 @@ msgstr "您正在发送 HTML 格式的消息,当以下收件人不希望接收
# mail/mail-callbacks.c:280
# mail/mail-callbacks.c:280
# mail/mail-callbacks.c:237
-#: mail/mail-callbacks.c:266
+#: mail/mail-callbacks.c:267
msgid "Send anyway?"
msgstr "仍然发送?"
# mail/mail-callbacks.c:322
# mail/mail-callbacks.c:322
# mail/mail-callbacks.c:279
-#: mail/mail-callbacks.c:287
+#: mail/mail-callbacks.c:288
msgid ""
"This message has no subject.\n"
"Really send?"
@@ -20428,7 +20521,7 @@ msgstr ""
# mail/mail-callbacks.c:366
# mail/mail-callbacks.c:366
# mail/mail-callbacks.c:323
-#: mail/mail-callbacks.c:313
+#: mail/mail-callbacks.c:314
msgid ""
"Since the contact list you are sending to is configured to hide the list's "
"addresses, this message will contain only Bcc recipients."
@@ -20439,14 +20532,14 @@ msgstr ""
# mail/mail-callbacks.c:370
# mail/mail-callbacks.c:370
# mail/mail-callbacks.c:327
-#: mail/mail-callbacks.c:317
+#: mail/mail-callbacks.c:318
msgid "This message contains only Bcc recipients."
msgstr "该邮件只含有密件抄送收件人。"
# mail/mail-callbacks.c:374
# mail/mail-callbacks.c:374
# mail/mail-callbacks.c:331
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:323
msgid ""
"It is possible that the mail server may reveal the recipients by adding an "
"Apparently-To header.\n"
@@ -20458,14 +20551,14 @@ msgstr ""
# mail/mail-callbacks.c:504
# mail/mail-callbacks.c:504
# mail/mail-callbacks.c:460
-#: mail/mail-callbacks.c:470
+#: mail/mail-callbacks.c:471
msgid "You must specify recipients in order to send this message."
msgstr "您必须指定收件人以便发送该消息。"
# composer/e-msg-composer.c:1068
# mail/mail-callbacks.c:716
# mail/mail-callbacks.c:668
-#: mail/mail-callbacks.c:722
+#: mail/mail-callbacks.c:723
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
@@ -20476,35 +20569,35 @@ msgstr ""
# mail/mail-callbacks.c:838
# mail/mail-callbacks.c:928
# mail/mail-callbacks.c:878
-#: mail/mail-callbacks.c:1187
+#: mail/mail-callbacks.c:1188
msgid "an unknown sender"
msgstr "未知的发件人"
# mail/mail-callbacks.c:843
# mail/mail-callbacks.c:933
# mail/mail-callbacks.c:883
-#: mail/mail-callbacks.c:1191
+#: mail/mail-callbacks.c:1192
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:1698 mail/message-browser.c:123
+#: mail/mail-callbacks.c:1699 mail/message-browser.c:123
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:1700 mail/message-browser.c:125
+#: mail/mail-callbacks.c:1701 mail/message-browser.c:125
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:2344
+#: mail/mail-callbacks.c:2345
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr "您确信您需要编辑所有的 %d 个消息?"
@@ -20512,7 +20605,7 @@ msgstr "您确信您需要编辑所有的 %d 个消息?"
# mail/mail-callbacks.c:1784
# mail/mail-callbacks.c:1903
# mail/mail-callbacks.c:1939
-#: mail/mail-callbacks.c:2360
+#: mail/mail-callbacks.c:2361
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -20523,7 +20616,7 @@ msgstr ""
# mail/mail-callbacks.c:1823
# mail/mail-callbacks.c:1942
# mail/mail-callbacks.c:1978
-#: mail/mail-callbacks.c:2393
+#: mail/mail-callbacks.c:2394
msgid ""
"You may only resend messages\n"
"in the Sent folder."
@@ -20534,7 +20627,7 @@ msgstr ""
# mail/mail-callbacks.c:1837
# mail/mail-callbacks.c:1956
# mail/mail-callbacks.c:1992
-#: mail/mail-callbacks.c:2403
+#: mail/mail-callbacks.c:2404
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr "您确信您希望重新发送所有的 %d 个消息?"
@@ -20542,7 +20635,7 @@ msgstr "您确信您希望重新发送所有的 %d 个消息?"
# mail/mail-callbacks.c:1863
# mail/mail-callbacks.c:1982
# mail/mail-callbacks.c:2018
-#: mail/mail-callbacks.c:2424
+#: mail/mail-callbacks.c:2425
msgid "No Message Selected"
msgstr "没有选择消息"
@@ -20570,7 +20663,7 @@ msgstr "没有选择消息"
# camel/providers/local/camel-mh-folder.c:207
# camel/providers/local/camel-mh-folder.c:215
# camel/providers/local/camel-spool-folder.c:579
-#: mail/mail-callbacks.c:2465
+#: mail/mail-callbacks.c:2466
#, fuzzy, c-format
msgid ""
"Cannot save to `%s'\n"
@@ -20582,7 +20675,7 @@ 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
-#: mail/mail-callbacks.c:2470
+#: mail/mail-callbacks.c:2471
#, fuzzy, c-format
msgid ""
"`%s' already exists.\n"
@@ -20594,21 +20687,21 @@ msgstr ""
# mail/mail-callbacks.c:1962
# mail/mail-callbacks.c:2081
# mail/mail-callbacks.c:2117
-#: mail/mail-callbacks.c:2511
+#: mail/mail-callbacks.c:2512
msgid "Save Message As..."
msgstr "消息另存为..."
# mail/mail-callbacks.c:1964
# mail/mail-callbacks.c:2083
# mail/mail-callbacks.c:2119
-#: mail/mail-callbacks.c:2513
+#: mail/mail-callbacks.c:2514
msgid "Save Messages As..."
msgstr "消息另存为..."
# mail/mail-callbacks.c:2135
# mail/mail-callbacks.c:2254
# mail/mail-callbacks.c:2290
-#: mail/mail-callbacks.c:2687
+#: mail/mail-callbacks.c:2688
#, fuzzy
msgid ""
"This operation will permanently erase all messages marked as\n"
@@ -20624,7 +20717,7 @@ msgstr ""
# mail/mail-callbacks.c:2250
# mail/mail-callbacks.c:2369
# mail/mail-callbacks.c:2405
-#: mail/mail-callbacks.c:2782
+#: mail/mail-callbacks.c:2783
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -20636,14 +20729,14 @@ msgstr ""
# mail/mail-callbacks.c:2262
# mail/mail-callbacks.c:2381
# mail/mail-callbacks.c:2417
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:2791
msgid "Filters"
msgstr "过滤规则"
# camel/camel-filter-driver.c:789
# camel/camel-filter-driver.c:838
# mail/mail-callbacks.c:2490
-#: mail/mail-callbacks.c:2831
+#: mail/mail-callbacks.c:2832
#, c-format
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
@@ -20651,21 +20744,21 @@ msgstr "第 %d 页,共 %d 页"
# mail/mail-callbacks.c:2325
# mail/mail-callbacks.c:2465
# mail/mail-callbacks.c:2542
-#: mail/mail-callbacks.c:2887
+#: mail/mail-callbacks.c:2888
msgid "Print Message"
msgstr "打印消息"
# mail/mail-callbacks.c:2371
# mail/mail-callbacks.c:2531
# mail/mail-callbacks.c:2604
-#: mail/mail-callbacks.c:2954
+#: mail/mail-callbacks.c:2955
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:3147
+#: mail/mail-callbacks.c:3148
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr "您确信您希望在单独的窗口中打开所有的 %d 个消息?"
@@ -20673,12 +20766,12 @@ msgstr "您确信您希望在单独的窗口中打开所有的 %d 个消息?"
# 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:227 mail/mail-composer-prefs.c:350
-#: mail/mail-config.c:1347
+#: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
+#: mail/mail-config.c:1362
msgid "Unnamed"
msgstr "未命名"
-#: mail/mail-composer-prefs.c:335
+#: mail/mail-composer-prefs.c:334
#, fuzzy
msgid "You must specify a valid script name."
msgstr "请给出有效的脚本名"
@@ -20686,7 +20779,7 @@ 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:393 mail/mail-composer-prefs.c:455
+#: mail/mail-composer-prefs.c:392 mail/mail-composer-prefs.c:454
#, fuzzy
msgid "[script]"
msgstr " [脚本]"
@@ -20697,19 +20790,19 @@ msgstr " [脚本]"
# calendar/gui/e-meeting-time-sel.etspec.h:6
# calendar/gui/dialogs/meeting-page.etspec.h:6
# calendar/gui/e-meeting-time-sel.etspec.h:6
-#: mail/mail-composer-prefs.c:866
+#: mail/mail-composer-prefs.c:858
#, fuzzy
msgid "Language(s)"
msgstr "语言"
-#: mail/mail-composer-prefs.c:908
+#: mail/mail-composer-prefs.c:900
msgid "Add script signature"
msgstr "添加脚本签名"
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:125
-#: mail/mail-composer-prefs.c:928
+#: mail/mail-composer-prefs.c:920
#, fuzzy
msgid "Signature(s)"
msgstr "签名(_S)"
@@ -20717,7 +20810,7 @@ msgstr "签名(_S)"
# 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-druid.c:380 mail/mail-config.glade.h:63
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
msgid "Identity"
msgstr "标识"
@@ -20808,14 +20901,14 @@ msgstr ""
# mail/mail-config.c:2113
# mail/mail-config.c:2155
# mail/mail-config.c:2248
-#: mail/mail-config.c:1051
+#: mail/mail-config.c:1066
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:1129 mail/mail-config.c:1133
+#: mail/mail-config.c:1144 mail/mail-config.c:1148
msgid "Connecting to server..."
msgstr "正在连接服务器..."
@@ -20921,25 +21014,18 @@ msgstr "附件"
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:23
-msgid "Automatically _detect links"
-msgstr "自动检查连接"
-
-#: mail/mail-config.glade.h:24
msgid "Baltic (ISO-8859-13)"
msgstr ""
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
msgid "Baltic (ISO-8859-4)"
msgstr ""
# widgets/misc/e-charset-picker.c:159
# widgets/misc/e-charset-picker.c:159
# widgets/misc/e-charset-picker.c:162
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
msgid "C_haracter set:"
msgstr "字符集(_H)"
@@ -20949,46 +21035,46 @@ msgstr "字符集(_H)"
# ui/evolution-comp-editor.xml.h:1
# calendar/gui/alarm-notify/alarm-notify.glade.h:1
# ui/evolution-comp-editor.xml.h:1
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
msgid "C_olors"
msgstr "颜色(_O)"
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
msgid "Check spelling while I _type"
msgstr "在我输入时进行拼写检查(_T)"
# mail/mail-config.glade.h:13
# mail/mail-config.glade.h:13
# mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
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:30
+#: mail/mail-config.glade.h:29
msgid "Color for _misspelled words:"
msgstr "给错误拼写的单词上色(_M):"
# composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
# composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
# mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
msgid "Composing Messages"
msgstr "正在撰写邮件"
# mail/mail-config.glade.h:15
# mail/mail-config.glade.h:15
# mail/mail-config.glade.h:19
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
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:33
+#: mail/mail-config.glade.h:32
#, fuzzy
msgid ""
"Congratulations, your mail configuration is complete.\n"
@@ -21008,14 +21094,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:39
+#: mail/mail-config.glade.h:38
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:41
+#: mail/mail-config.glade.h:40
#, fuzzy
msgid "Default Behavior"
msgstr "默认"
@@ -21023,7 +21109,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:42
+#: mail/mail-config.glade.h:41
#, fuzzy
msgid "Default character _encoding:"
msgstr "默认字符编码: "
@@ -21031,7 +21117,7 @@ msgstr "默认字符编码: "
# mail/mail-ops.c:249
# mail/mail-ops.c:250
# mail/mail-ops.c:258
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
#, fuzzy
msgid "Deleting Mail"
msgstr "正在收取邮件"
@@ -21039,111 +21125,104 @@ msgstr "正在收取邮件"
# mail/mail-config.glade.h:27
# mail/mail-config.glade.h:27
# mail/mail-config.glade.h:32
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
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:46
+#: mail/mail-config.glade.h:45
msgid "Do not quote original message"
msgstr "无法引用原始消息"
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(_M)(同 Outlook 兼容)"
# 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:48 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:1
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:49
+#: mail/mail-config.glade.h:48
msgid "Drafts _folder:"
msgstr "草稿文件夹(_F):"
# mail/mail-config.glade.h:31
# mail/mail-config.glade.h:31
# mail/mail-config.glade.h:37
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
msgid "E_nable"
msgstr "启用(_N)"
-# my-evolution/metar.c:65
-# my-evolution/metar.c:65
-# my-evolution/metar.c:65
-#: mail/mail-config.glade.h:51
-msgid "Emacs"
-msgstr "Emacs"
-
# addressbook/gui/component/addressbook.c:805
# addressbook/gui/component/addressbook.c:805
# addressbook/gui/component/addressbook.c:838
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
msgid "Email Accounts"
msgstr "电子邮件"
# mail/mail-config.glade.h:99
# mail/mail-config.glade.h:99
# addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
msgid "Email _address:"
msgstr "电子邮件地址(_A):"
# mail/mail-config.glade.h:100
# mail/mail-config.glade.h:100
# mail/mail-config.glade.h:109
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
msgid "Empty _trash folders on exit"
msgstr "退出时清空已删除邮件(_T)"
# mail/mail-config-druid.c:599
# mail/mail-config-druid.c:599
# mail/mail-config-druid.c:599
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
msgid "Evolution Account Assistant"
msgstr "Evolution 帐号助手"
# mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
msgid "Execute Command..."
msgstr "执行命令..."
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
msgid "Fi_xed -width:"
msgstr "固定宽度(_X):"
# mail/folder-browser-ui.c:274
# mail/folder-browser-ui.c:274
# mail/folder-browser-ui.c:275
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
msgid "Font Properties"
msgstr "字体属性"
# mail/mail-ops.c:1191
# mail/mail-ops.c:1193
# mail/mail-ops.c:1236
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
msgid "Format messages in _HTML"
msgstr "用 HTML 格式化邮件(_H)"
# mail/mail-config.glade.h:34
# mail/mail-config.glade.h:34
# mail/mail-config.glade.h:41
-#: mail/mail-config.glade.h:60
+#: 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:61
+#: mail/mail-config.glade.h:59
#, fuzzy
msgid "Highlight _quotations with"
msgstr "突出显示引文,使用(_H)"
@@ -21151,21 +21230,21 @@ 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:62
+#: mail/mail-config.glade.h:60
msgid "IMAPv4 "
msgstr "IMAPv4"
# mail/mail-config.glade.h:39
# mail/mail-config.glade.h:39
# mail/mail-config.glade.h:46
-#: mail/mail-config.glade.h:65
+#: 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:66
+#: mail/mail-config.glade.h:64
msgid "Kerberos "
msgstr "Kerberos"
@@ -21178,7 +21257,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:67
+#: mail/mail-config.glade.h:65
#, fuzzy
msgid "Labels and Colors"
msgstr "保存并关闭"
@@ -21186,7 +21265,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:69
+#: mail/mail-config.glade.h:67
#, fuzzy
msgid "Loading Images"
msgstr "装入图像(_I)"
@@ -21194,21 +21273,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:70
+#: 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:72
+#: 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:73
+#: mail/mail-config.glade.h:71
#, fuzzy
msgid "Message Composer"
msgstr "邮件"
@@ -21216,7 +21295,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:74
+#: mail/mail-config.glade.h:72
#, fuzzy
msgid "Message Display"
msgstr "邮件显示(_M)"
@@ -21224,27 +21303,19 @@ msgstr "邮件显示(_M)"
# default_user/searches.xml.h:4
# default_user/searches.xml.h:4
# default_user/searches.xml.h:4
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:73
#, fuzzy
msgid "Message Fonts"
msgstr "邮件含有"
-# 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:76
-#, fuzzy
-msgid "Microsoft"
-msgstr "密克罗尼西亚"
-
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:53
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:75
msgid "New Mail Notification"
msgstr "新邮件提醒"
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:77
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
@@ -21253,35 +21324,35 @@ msgstr ""
# mail/mail-config.glade.h:48
# mail/mail-config.glade.h:48
# mail/mail-config.glade.h:56
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
msgid "Optional Information"
msgstr "可选的信息"
# addressbook/gui/contact-editor/contact-editor.glade.h:23
# addressbook/gui/contact-editor/contact-editor.glade.h:23
# addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:80
msgid "Or_ganization:"
msgstr "组织(_G):"
# mail/mail-config.glade.h:50
# mail/mail-config.glade.h:50
# mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG 键标识(_K):"
# mail/mail-config.glade.h:53
# mail/mail-config.glade.h:53
# mail/mail-config.glade.h:61
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:85
msgid "Pick a color"
msgstr "选取一个颜色"
# mail/mail-config.glade.h:57
# mail/mail-config.glade.h:57
# mail/mail-config.glade.h:66
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
#, fuzzy
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr "在发送只给出了暗送收件人时进行提示(_B)"
@@ -21289,14 +21360,14 @@ msgstr "在发送只给出了暗送收件人时进行提示(_B)"
# mail/mail-config.glade.h:54
# mail/mail-config.glade.h:54
# mail/mail-config.glade.h:63
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
msgid "Pretty Good Privacy (PGP/GPG)"
msgstr "Pretty Good Privacy (PGP/GPG)"
# ui/evolution-addressbook.xml.h:18
# ui/evolution-addressbook.xml.h:18
# ui/evolution-addressbook.xml.h:18
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
#, fuzzy
msgid "Printed Fonts"
msgstr "打印选中的联系人"
@@ -21304,14 +21375,14 @@ msgstr "打印选中的联系人"
# mail/mail-config.glade.h:58
# mail/mail-config.glade.h:58
# mail/mail-config.glade.h:67
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
msgid "Qmail maildir "
msgstr "Qmail 邮件目录"
# camel/camel-filter-driver.c:692
# camel/camel-filter-driver.c:741
# camel/camel-filter-driver.c:893
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
#, fuzzy
msgid "Quote original message"
msgstr "无法打开消息"
@@ -21319,21 +21390,21 @@ msgstr "无法打开消息"
# mail/mail-config.glade.h:59
# mail/mail-config.glade.h:59
# mail/mail-config.glade.h:68
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
msgid "Quoted"
msgstr "已引用"
# mail/mail-config.glade.h:60
# mail/mail-config.glade.h:60
# mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
msgid "Re_member this password"
msgstr "记住该密码(_M)"
# composer/e-msg-composer-hdrs.c:364
# composer/e-msg-composer-hdrs.c:364
# composer/e-msg-composer-hdrs.c:362
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
#, fuzzy
msgid "Re_ply-To:"
msgstr "回复到:"
@@ -21341,14 +21412,14 @@ msgstr "回复到:"
# mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
# mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:6
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
msgid "Receiving Email"
msgstr "正在接收电子邮件"
# mail/mail-config.glade.h:63
# mail/mail-config.glade.h:63
# mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:95
#, fuzzy
msgid "Receiving _Options"
msgstr "接收中选项"
@@ -21356,7 +21427,7 @@ msgstr "接收中选项"
# e-util/e-passwords.c:360 mail/mail-session.c:267
# e-util/e-passwords.c:360 mail/mail-session.c:267
# e-util/e-passwords.c:360 mail/mail-session.c:269
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
#, fuzzy
msgid "Remember this _password"
msgstr "记住该密码"
@@ -21364,14 +21435,14 @@ msgstr "记住该密码"
# mail/mail-config.glade.h:64
# mail/mail-config.glade.h:64
# mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
msgid "Required Information"
msgstr "必需的信息"
# mail/mail-config.glade.h:23
# mail/folder-browser.h:26
# mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
#, fuzzy
msgid "Restore Defaults"
msgstr "默认"
@@ -21379,7 +21450,7 @@ msgstr "默认"
# mail/mail-config.glade.h:67
# mail/mail-config.glade.h:67
# mail/mail-config.glade.h:76
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:100
#, fuzzy
msgid "S_ecurity"
msgstr "安全"
@@ -21387,108 +21458,101 @@ msgstr "安全"
# mail/mail-config.glade.h:66
# mail/mail-config.glade.h:66
# mail/mail-config.glade.h:75
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:101
msgid "Secure MIME (S/MIME)"
msgstr "安全 MIME (S/MIME)"
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:102
msgid "Select HTML fixed width font"
msgstr "选择 HTML 固定宽度字体"
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:103
msgid "Select HTML fixed width font for printing"
msgstr "选择用于打印的 HTML 固定宽度字体"
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:104
msgid "Select HTML variable width font"
msgstr "选择 HTML 变宽度字体"
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:105
msgid "Select HTML variable width font for printing"
msgstr "选择用于打印的 HTML 变宽度字体"
# 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
+#: mail/mail-config.glade.h:106
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:108
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:109
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:110
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:111
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:112
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
-msgid "Shortcuts _type:"
-msgstr "快捷方式类型(_T):"
-
# 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:117
+#: mail/mail-config.glade.h:113
msgid "Specify _filename:"
msgstr "指定文件名(_F):"
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:114
msgid "Spell _Checking"
msgstr "拼写检查(_C)"
# mail/mail-config.glade.h:84
# mail/mail-config.glade.h:84
# mail/mail-config.glade.h:93
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:115
msgid "Standard Unix mbox"
msgstr "标准 Unix mbox"
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:116
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:123
+#: mail/mail-config.glade.h:119
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:125
+#: mail/mail-config.glade.h:121
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -21497,14 +21561,14 @@ msgstr ""
# my-evolution/metar.c:63
# my-evolution/metar.c:63
# my-evolution/metar.c:63
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:124
msgid "V_ariable-width:"
msgstr "变宽度(_A):"
# mail/mail-config.glade.h:87
# mail/mail-config.glade.h:87
# mail/mail-config.glade.h:96
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:125
#, fuzzy
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -21515,52 +21579,45 @@ msgstr ""
"\n"
"点击 “下一步” 以便开始。"
-# my-evolution/metar.c:65
-# my-evolution/metar.c:65
-# my-evolution/metar.c:65
-#: mail/mail-config.glade.h:134
-msgid "XEmacs"
-msgstr "XEmacs"
-
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:125
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:130
msgid "_Add Signature"
msgstr "添加签名(_A)"
# mail/mail-config.glade.h:91
# mail/mail-config.glade.h:91
# mail/mail-config.glade.h:100
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:131
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:137
+#: mail/mail-config.glade.h:132
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:138
+#: mail/mail-config.glade.h:133
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:139
+#: mail/mail-config.glade.h:134
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:140
+#: mail/mail-config.glade.h:135
#, fuzzy
msgid "_Automatically check for new mail every"
msgstr "自动检查新邮件(_A)"
@@ -21568,101 +21625,101 @@ 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:141
+#: mail/mail-config.glade.h:136
msgid "_Automatically insert smiley images"
msgstr "自动插入笑脸图像(_A)"
# mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:137
msgid "_Beep when new mail arrives"
msgstr "新邮件到达时鸣笛(_B)"
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:104
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:138
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:144
+#: mail/mail-config.glade.h:139
msgid "_Confirm when expunging a folder"
msgstr "当删除文件夹时进行提示(_C)"
# 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:145
+#: mail/mail-config.glade.h:140
msgid "_Default signature:"
msgstr "默认签名(_D):"
# mail/mail-config.glade.h:23
# mail/folder-browser.h:26
# mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:141
msgid "_Defaults"
msgstr "默认(_D)"
# mail/mail-config.glade.h:34
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:142
msgid "_Do not notify me when new mail arrives"
msgstr "新邮件到达时不要提醒我(_D)"
# mail/mail-accounts.c:196
# mail/mail-accounts.c:196
# mail/mail-accounts.c:196
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:144
msgid "_Enable"
msgstr "启用(_E)"
# 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:150
+#: mail/mail-config.glade.h:145
msgid "_Forward style:"
msgstr "转发方式(_F):"
# mail/mail-config.glade.h:101
# mail/mail-config.glade.h:101
# mail/mail-config.glade.h:110
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:146
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:153
+#: mail/mail-config.glade.h:148
msgid "_HTML Mail"
msgstr "HTML 邮件(_H)"
# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
# mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:150
msgid "_Identity"
msgstr "标识(_I)"
# mail/mail-config.glade.h:105
# mail/mail-config.glade.h:105
# mail/mail-config.glade.h:114
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:151
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:157
+#: mail/mail-config.glade.h:152
msgid "_Make this my default account"
msgstr "使它成为我的默认帐号(_M)"
# mail/mail-config.glade.h:107
# mail/mail-config.glade.h:107
# mail/mail-config.glade.h:116
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:153
#, fuzzy
msgid "_Mark messages as read after"
msgstr "阅读时将邮件标记为已读,延时(_M)"
@@ -21670,26 +21727,26 @@ msgstr "阅读时将邮件标记为已读,延时(_M)"
# mail/mail-config.glade.h:108
# mail/mail-config.glade.h:108
# mail/mail-config.glade.h:117
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:154 my-evolution/e-summary-preferences.c:575
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:160
+#: mail/mail-config.glade.h:155
msgid "_Never load images off the net"
msgstr "从不离线装入图像(_N)"
# mail/mail-config.glade.h:62
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:157
msgid "_Play sound file when new mail arrives"
msgstr "新邮件到达时播放声音文件(_P)"
# mail/mail-config.glade.h:55
# mail/mail-config.glade.h:55
# mail/mail-config.glade.h:64
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:158
#, fuzzy
msgid "_Prompt when sending HTML messages to contacts that don't want them"
msgstr "在往不希望接收 HTML 消息的联系人发送 HTML 消息的时候进行提示"
@@ -21697,7 +21754,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:164
+#: mail/mail-config.glade.h:159
#, fuzzy
msgid "_Prompt when sending messages with an empty subject line"
msgstr "在发送空标题的消息时进行提示(_E)"
@@ -21705,32 +21762,32 @@ 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:165
+#: mail/mail-config.glade.h:160
msgid "_Receiving Mail"
msgstr "正在接收邮件(_R)"
# 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:166
+#: mail/mail-config.glade.h:161
msgid "_Reply style:"
msgstr "回复风格(_R):"
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:162
msgid "_Restore defaults"
msgstr "恢复默认值(_R)"
# 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:168
+#: mail/mail-config.glade.h:163
msgid "_Script:"
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:169
+#: mail/mail-config.glade.h:164
msgid "_Sending Mail"
msgstr "正在发送邮件(_S)"
@@ -21740,21 +21797,21 @@ msgstr "正在发送邮件(_S)"
# 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:170
+#: mail/mail-config.glade.h:165
msgid "_Show animated images"
msgstr "显示动画图像(_S)"
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:125
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:166
msgid "_Signatures"
msgstr "签名(_S)"
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1987
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:167
#, fuzzy
msgid "_Standard Font:"
msgstr "圣马力诺"
@@ -21762,7 +21819,7 @@ msgstr "圣马力诺"
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:168
#, fuzzy
msgid "_Terminal Font:"
msgstr "原联系人:"
@@ -21770,25 +21827,25 @@ msgstr "原联系人:"
# mail/mail-config.glade.h:86
# mail/mail-config.glade.h:86
# mail/mail-config.glade.h:95
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:169
msgid "_Use secure connection (SSL):"
msgstr "使用安全连接 (SSL)(_U):"
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:170
msgid "_Use the same fonts as other applications"
msgstr ""
# mail/mail-config.glade.h:2
# mail/mail-config.glade.h:2
# mail/mail-config.glade.h:2
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:171
msgid "color"
msgstr "颜色"
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:128
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
msgid "description"
msgstr "描述"
@@ -21833,7 +21890,7 @@ msgstr "无法创建 S/MIME 解码上下文。"
# mail/mail-display.c:106
# calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2070
# mail/mail-display.c:105
-#: mail/mail-display.c:193
+#: mail/mail-display.c:197
#, fuzzy, c-format
msgid ""
"File `%s' already exists.\n"
@@ -21845,14 +21902,14 @@ msgstr ""
# mail/mail-display.c:243
# mail/mail-display.c:242
# mail/mail-display.c:243
-#: mail/mail-display.c:333
+#: mail/mail-display.c:336
msgid "Save Attachment"
msgstr "保存附件"
# mail/folder-browser.c:297 mail/mail-display.c:298
# mail/folder-browser.c:297 mail/mail-display.c:297
# mail/folder-browser.c:298 mail/mail-display.c:298
-#: mail/mail-display.c:406
+#: mail/mail-display.c:409
#, c-format
msgid "Could not create temporary file '%s': %s"
msgstr "无法创建临时文件“%s”: %s"
@@ -21860,21 +21917,21 @@ msgstr "无法创建临时文件“%s”: %s"
# mail/mail-display.c:243
# mail/mail-display.c:242
# mail/mail-display.c:243
-#: mail/mail-display.c:454
+#: mail/mail-display.c:457
msgid "Save Attachment..."
msgstr "保存附件..."
# mail/mail-display.c:352
# mail/mail-display.c:351
# mail/mail-display.c:352
-#: mail/mail-display.c:455
+#: mail/mail-display.c:458
msgid "View Inline"
msgstr "嵌入视图"
# mail/mail-display.c:354
# mail/mail-display.c:353
# mail/mail-display.c:354
-#: mail/mail-display.c:456
+#: mail/mail-display.c:459
#, c-format
msgid "Open in %s..."
msgstr "在 %s 中打开..."
@@ -21882,7 +21939,7 @@ msgstr "在 %s 中打开..."
# mail/mail-display.c:415
# mail/mail-display.c:414
# mail/mail-display.c:415
-#: mail/mail-display.c:512
+#: mail/mail-display.c:515
#, c-format
msgid "View Inline (via %s)"
msgstr "嵌入视图 (通过 %s)"
@@ -21890,40 +21947,40 @@ msgstr "嵌入视图 (通过 %s)"
# mail/mail-display.c:419
# mail/mail-display.c:418
# mail/mail-display.c:419
-#: mail/mail-display.c:516
+#: mail/mail-display.c:519
msgid "Hide"
msgstr "隐藏"
# mail/mail-display.c:440
# mail/mail-display.c:439
# mail/mail-display.c:440
-#: mail/mail-display.c:536
+#: mail/mail-display.c:539
msgid "External Viewer"
msgstr "外部视图"
# ui/evolution-mail-message.xml.h:42
# ui/evolution-mail-message.xml.h:42
# ui/evolution-mail-message.xml.h:42
-#: mail/mail-display.c:1365
+#: mail/mail-display.c:1368
msgid "Downloading images"
msgstr "正在下载图像"
# mail/mail-display.c:1133
# mail/mail-display.c:1136
# mail/mail-display.c:1162
-#: mail/mail-display.c:1542
+#: mail/mail-display.c:1545
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:1879
+#: mail/mail-display.c:1887
#, fuzzy
msgid "Overdue:"
msgstr "被延误的任务(_V):"
-#: mail/mail-display.c:1883
+#: mail/mail-display.c:1891
#, fuzzy
msgid "by %B %d, %Y, %l:%M %P"
msgstr "%b %d %l:%M %p"
@@ -21931,28 +21988,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:2240
+#: mail/mail-display.c:2256
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:2241
+#: mail/mail-display.c:2257
msgid "Copy Link Location"
msgstr "复制连接位置"
# mail/mail-display.c:1607
# mail/mail-display.c:1633
# mail/mail-display.c:1662
-#: mail/mail-display.c:2243
+#: mail/mail-display.c:2259
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:2245
+#: mail/mail-display.c:2261
msgid "Save Image as..."
msgstr "图像保存为..."
@@ -22156,7 +22213,7 @@ msgstr "无法删除文件夹元信息 %s: %s"
# mail/mail-local.c:1281
# mail/mail-local.c:1281
# mail/mail-local.c:1281
-#: mail/mail-local.c:1329
+#: mail/mail-local.c:1319
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr "将文件夹格式从“%s”改为“%s”"
@@ -22164,7 +22221,7 @@ msgstr "将文件夹格式从“%s”改为“%s”"
# mail/mail-local.c:1318
# mail/mail-local.c:1318
# mail/mail-local.c:1318
-#: mail/mail-local.c:1354
+#: mail/mail-local.c:1344
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
@@ -22175,7 +22232,7 @@ msgstr ""
# mail/mail-local.c:1416
# mail/mail-local.c:1416
# mail/mail-local.c:1416
-#: mail/mail-local.c:1454
+#: mail/mail-local.c:1444
#, c-format
msgid "Reconfigure /%s"
msgstr "重新配置 /%s"
@@ -22183,7 +22240,7 @@ msgstr "重新配置 /%s"
# mail/mail-local.c:1407
# mail/mail-local.c:1407
# mail/mail-local.c:1407
-#: mail/mail-local.c:1518
+#: mail/mail-local.c:1508
msgid "You cannot change the format of a non-local folder."
msgstr "您不能改变远程文件夹的格式。"
@@ -22266,7 +22323,7 @@ msgstr "在第 %d 个邮件失败,共 %d 个"
# mail/mail-ops.c:695 mail/mail-send-recv.c:537
# mail/mail-ops.c:697 mail/mail-send-recv.c:545
# mail/mail-ops.c:740 mail/mail-send-recv.c:545
-#: mail/mail-ops.c:750 mail/mail-send-recv.c:577
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:580
msgid "Complete."
msgstr "完成。"
@@ -22350,14 +22407,33 @@ msgstr "正在刷新文件夹"
# mail/mail-ops.c:1556
# mail/mail-ops.c:1558
# mail/mail-ops.c:1601
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
msgid "Expunging folder"
msgstr "正在删除文件夹"
+# importers/elm-importer.c:169 importers/netscape-importer.c:689
+# importers/pine-importer.c:365
+# importers/elm-importer.c:169 importers/netscape-importer.c:689
+# importers/pine-importer.c:365
+# importers/elm-importer.c:169 importers/netscape-importer.c:689
+# importers/pine-importer.c:365
+#: mail/mail-ops.c:1642
+#, fuzzy, c-format
+msgid "Emptying trash in '%s'"
+msgstr "正在按 %2$s 导入 %1$s"
+
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:480
+#: shell/e-local-storage.c:1151
+msgid "Local Folders"
+msgstr "本地文件夹"
+
# mail/mail-ops.c:1605
# mail/mail-ops.c:1607
# mail/mail-ops.c:1650
-#: mail/mail-ops.c:1643
+#: mail/mail-ops.c:1718
#, c-format
msgid "Retrieving message %s"
msgstr "正在检索邮件 %s"
@@ -22365,7 +22441,7 @@ msgstr "正在检索邮件 %s"
# mail/mail-ops.c:1672
# mail/mail-ops.c:1674
# mail/mail-ops.c:1717
-#: mail/mail-ops.c:1715
+#: mail/mail-ops.c:1790
#, c-format
msgid "Retrieving %d message(s)"
msgstr "正在检索 %d 个邮件"
@@ -22373,7 +22449,7 @@ msgstr "正在检索 %d 个邮件"
# mail/mail-ops.c:1758
# mail/mail-ops.c:1760
# mail/mail-ops.c:1803
-#: mail/mail-ops.c:1801
+#: mail/mail-ops.c:1876
#, c-format
msgid "Saving %d messsage(s)"
msgstr "正在保存 %d 个邮件"
@@ -22381,7 +22457,7 @@ msgstr "正在保存 %d 个邮件"
# mail/mail-ops.c:1870
# mail/mail-ops.c:1872
# mail/mail-ops.c:1915
-#: mail/mail-ops.c:1849
+#: mail/mail-ops.c:1924
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -22393,7 +22469,7 @@ msgstr ""
# mail/mail-ops.c:1898
# mail/mail-ops.c:1900
# mail/mail-ops.c:1943
-#: mail/mail-ops.c:1877
+#: mail/mail-ops.c:1952
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -22405,14 +22481,14 @@ msgstr ""
# mail/mail-ops.c:1972
# mail/mail-ops.c:1974
# mail/mail-ops.c:2017
-#: mail/mail-ops.c:1951
+#: mail/mail-ops.c:2026
msgid "Saving attachment"
msgstr "正在保存附件"
# mail/mail-ops.c:1988
# mail/mail-ops.c:1990
# mail/mail-ops.c:2033
-#: mail/mail-ops.c:1968
+#: mail/mail-ops.c:2043
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -22424,7 +22500,7 @@ msgstr ""
# mail/mail-ops.c:2019
# mail/mail-ops.c:2021
# mail/mail-ops.c:2064
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:2073
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据: %s"
@@ -22432,7 +22508,7 @@ msgstr "无法写数据: %s"
# mail/mail-ops.c:2088
# mail/mail-ops.c:2090
# mail/mail-ops.c:2133
-#: mail/mail-ops.c:2146
+#: mail/mail-ops.c:2221
#, c-format
msgid "Disconnecting from %s"
msgstr "断开与 %s 的连接"
@@ -22440,7 +22516,7 @@ msgstr "断开与 %s 的连接"
# mail/mail-ops.c:2089
# mail/mail-ops.c:2091
# mail/mail-ops.c:2134
-#: mail/mail-ops.c:2146
+#: mail/mail-ops.c:2221
#, c-format
msgid "Reconnecting to %s"
msgstr "重新与 %s 连接"
@@ -22448,28 +22524,28 @@ msgstr "重新与 %s 连接"
# mail/mail-search.c:137
# mail/mail-search.c:137
# mail/mail-search.c:137
-#: mail/mail-search.c:150
+#: mail/mail-search.c:153
msgid "(Untitled Message)"
msgstr "(无标题的消息)"
# mail/mail-search.c:240
# mail/mail-search.c:240
# mail/mail-search.c:240
-#: mail/mail-search.c:232
+#: mail/mail-search.c:235
msgid "Untitled Message"
msgstr "无标题的消息"
# mail/mail-search.c:244
# mail/mail-search.c:244
# mail/mail-search.c:244
-#: mail/mail-search.c:234
+#: mail/mail-search.c:237
msgid "Empty Message"
msgstr "空邮件"
# mail/mail-search.c:291
# mail/mail-search.c:291
# mail/mail-search.c:291
-#: mail/mail-search.c:282
+#: mail/mail-search.c:285
msgid "Find in Message"
msgstr "在邮件中寻找"
@@ -22479,49 +22555,49 @@ msgstr "在邮件中寻找"
# mail/mail-search.c:263
# addressbook/gui/search/e-addressbook-search-dialog.c:151
# mail/mail-search.c:263
-#: mail/mail-search.c:285
+#: mail/mail-search.c:288
msgid "Search"
msgstr "搜索"
# mail/mail-search.c:321
# mail/mail-search.c:321
# mail/mail-search.c:321
-#: mail/mail-search.c:313
+#: mail/mail-search.c:316
msgid "Case Sensitive"
msgstr "大小写敏感"
# mail/mail-search.c:323
# mail/mail-search.c:323
# mail/mail-search.c:323
-#: mail/mail-search.c:315
+#: mail/mail-search.c:318
msgid "Search Forward"
msgstr "向前搜索"
# mail/mail-search.c:343
# mail/mail-search.c:343
# mail/mail-search.c:343
-#: mail/mail-search.c:335
+#: mail/mail-search.c:338
msgid "Find:"
msgstr "寻找:"
# mail/mail-search.c:346
# mail/mail-search.c:346
# mail/mail-search.c:346
-#: mail/mail-search.c:339
+#: mail/mail-search.c:342
msgid "Matches:"
msgstr "匹配:"
# mail/mail-send-recv.c:141
# mail/mail-send-recv.c:143
# mail/mail-send-recv.c:143
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:146
msgid "Cancelling..."
msgstr "正在取消..."
# mail/mail-send-recv.c:245
# mail/mail-send-recv.c:251
# mail/mail-send-recv.c:251
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:253
#, c-format
msgid "Server: %s, Type: %s"
msgstr "服务器: %s,类型: %s"
@@ -22529,7 +22605,7 @@ msgstr "服务器: %s,类型: %s"
# mail/mail-send-recv.c:247
# mail/mail-send-recv.c:253
# mail/mail-send-recv.c:253
-#: mail/mail-send-recv.c:252
+#: mail/mail-send-recv.c:255
#, c-format
msgid "Path: %s, Type: %s"
msgstr "路径: %s,类型: %s"
@@ -22537,7 +22613,7 @@ msgstr "路径: %s,类型: %s"
# mail/mail-send-recv.c:249
# mail/mail-send-recv.c:255
# mail/mail-send-recv.c:255
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:257
#, c-format
msgid "Type: %s"
msgstr "类型: %s"
@@ -22545,14 +22621,14 @@ msgstr "类型: %s"
# mail/mail-send-recv.c:286
# mail/mail-send-recv.c:292
# mail/mail-send-recv.c:292
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:305
msgid "Send & Receive Mail"
msgstr "发送和接收邮件"
# mail/mail-send-recv.c:288
# mail/mail-send-recv.c:294
# mail/mail-send-recv.c:294
-#: mail/mail-send-recv.c:303
+#: mail/mail-send-recv.c:306
#, fuzzy
msgid "Cancel _All"
msgstr "全部取消"
@@ -22560,14 +22636,14 @@ msgstr "全部取消"
# mail/mail-send-recv.c:348
# mail/mail-send-recv.c:354
# mail/mail-send-recv.c:354
-#: mail/mail-send-recv.c:385
+#: mail/mail-send-recv.c:388
msgid "Updating..."
msgstr "正在更新..."
# mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
# mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
# mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
-#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:445
msgid "Waiting..."
msgstr "正在等待..."
@@ -22596,14 +22672,14 @@ msgstr "输入密码"
# mail/mail-config.glade.h:113
# mail/mail-config.glade.h:113
# mail/mail-config.glade.h:122
-#: mail/mail-session.c:282
+#: mail/mail-session.c:283
msgid "_Remember this password"
msgstr "记住该密码(_R)"
# e-util/e-passwords.c:362 mail/mail-session.c:268
# e-util/e-passwords.c:362 mail/mail-session.c:268
# e-util/e-passwords.c:362 mail/mail-session.c:270
-#: mail/mail-session.c:283
+#: mail/mail-session.c:284
#, fuzzy
msgid "_Remember this password for the remainder of this session"
msgstr "在本会话中记住该密码"
@@ -22651,7 +22727,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:425 my-evolution/e-summary-preferences.c:577
+#: mail/mail-signature-editor.c:425
msgid "Name:"
msgstr "名称:"
@@ -22861,7 +22937,7 @@ msgstr "%Y %b %d"
# mail/message-list.c:2334
# mail/message-list.c:2358
# mail/message-list.c:2387
-#: mail/message-list.c:2617
+#: mail/message-list.c:2630
msgid "Generating message list"
msgstr "正在生成邮件列表"
@@ -38536,17 +38612,10 @@ 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:188
+#: my-evolution/e-summary-mail.c:189
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:443 shell/e-local-storage.c:1151
-msgid "Local Folders"
-msgstr "本地文件夹"
-
# my-evolution/e-summary-preferences.c:444
# my-evolution/e-summary-preferences.c:444
# my-evolution/e-summary-preferences.c:445
@@ -38561,33 +38630,38 @@ msgstr "Dictionary.com 的每日一词"
msgid "Quotes of the Day"
msgstr "每日引用"
-# my-evolution/e-summary-preferences.c:944
-# my-evolution/e-summary-preferences.c:944
-# my-evolution/e-summary-preferences.c:946
+# my-evolution/e-summary-rdf.c:528
+# my-evolution/e-summary-rdf.c:528
+# my-evolution/e-summary-rdf.c:443
#: my-evolution/e-summary-preferences.c:565
-msgid "Add a news feed"
-msgstr "添加新闻来源"
+#, fuzzy
+msgid "New 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:573
-msgid "Enter the URL of the news feed you wish to add"
-msgstr "输入您希望添加的新闻来源的 URL"
+# calendar/gui/dialogs/task-details-page.glade.h:12
+# my-evolution/e-summary-preferences.c:964
+# calendar/gui/dialogs/task-details-page.glade.h:12
+# my-evolution/e-summary-preferences.c:964
+# calendar/gui/dialogs/task-details-page.glade.h:12
+# my-evolution/e-summary-preferences.c:966
+#: my-evolution/e-summary-preferences.c:581
+#, fuzzy
+msgid "_URL:"
+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: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:305
+#: my-evolution/e-summary-rdf.c:315
msgid "Error downloading RDF"
msgstr "下载 RDF 错误"
# my-evolution/e-summary-rdf.c:528
# my-evolution/e-summary-rdf.c:528
# my-evolution/e-summary-rdf.c:443
-#: my-evolution/e-summary-rdf.c:443
+#: my-evolution/e-summary-rdf.c:453
msgid "News Feed"
msgstr "新闻来源"
@@ -38633,7 +38707,7 @@ msgstr ""
# my-evolution/e-summary-weather.c:559
# my-evolution/e-summary-weather.c:559
# my-evolution/e-summary-weather.c:504
-#: my-evolution/e-summary-weather.c:479
+#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
msgid "Weather"
msgstr "天气"
@@ -38654,7 +38728,7 @@ msgstr "KBOS"
# my-evolution/e-summary.c:193
# my-evolution/e-summary.c:193
# my-evolution/e-summary.c:190
-#: my-evolution/e-summary.c:198
+#: my-evolution/e-summary.c:204
msgid "%A, %B %e %Y"
msgstr "%Y %B %e %A"
@@ -38663,21 +38737,21 @@ msgstr "%Y %B %e %A"
# importers/elm-importer.c:98 importers/netscape-importer.c:109
# importers/pine-importer.c:103
# my-evolution/e-summary.c:475
-#: my-evolution/e-summary.c:523
+#: my-evolution/e-summary.c:531
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:589 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:620 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:623
+#: my-evolution/e-summary.c:655
msgid "Printing of Summary failed"
msgstr "打印概要失败"
@@ -40715,109 +40789,96 @@ msgstr "尘卷风"
msgid "Drifting dust whirls"
msgstr "阵尘卷风"
-# my-evolution/my-evolution.glade.h:2
-# my-evolution/my-evolution.glade.h:2
-# my-evolution/my-evolution.glade.h:2
-#: my-evolution/my-evolution.glade.h:1
-msgid "Add n_ews feed"
-msgstr "添加新闻来源(_E)"
-
# my-evolution/my-evolution.glade.h:6
# my-evolution/my-evolution.glade.h:6
# my-evolution/my-evolution.glade.h:6
-#: my-evolution/my-evolution.glade.h:2
+#: my-evolution/my-evolution.glade.h:1
msgid "C_elsius"
msgstr "摄氏度"
-# my-evolution/my-evolution.glade.h:5
-# my-evolution/my-evolution.glade.h:5
-# my-evolution/my-evolution.glade.h:5
-#: my-evolution/my-evolution.glade.h:4
-#, fuzzy
-msgid "Delete news feed"
-msgstr "所有新闻来源(_F):"
-
# my-evolution/my-evolution.glade.h:8
# my-evolution/my-evolution.glade.h:8
# my-evolution/my-evolution.glade.h:8
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:3
msgid "How many days should the calendar display at once?"
msgstr "日历一次应该显示多少日期?"
-# my-evolution/my-evolution.glade.h:9
-# my-evolution/my-evolution.glade.h:9
-# my-evolution/my-evolution.glade.h:9
-#: my-evolution/my-evolution.glade.h:6
-msgid "Ma_x number of items shown:"
-msgstr "显示项目的最大数(_X):"
-
# my-evolution/my-evolution.glade.h:10
# my-evolution/my-evolution.glade.h:10
# my-evolution/my-evolution.glade.h:10
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:5
msgid "News Feed Settings"
msgstr "新闻来源设置"
+# my-evolution/my-evolution.glade.h:28
+# my-evolution/my-evolution.glade.h:28
+# my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "News Feeds"
+msgstr "新闻来源(_N)"
+
# my-evolution/my-evolution.glade.h:11
# my-evolution/my-evolution.glade.h:11
# my-evolution/my-evolution.glade.h:11
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:7
msgid "One mont_h"
msgstr "一个月(_H)"
# my-evolution/my-evolution.glade.h:12
# my-evolution/my-evolution.glade.h:12
# my-evolution/my-evolution.glade.h:12
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:8
msgid "One w_eek"
msgstr "一周(_E)"
# my-evolution/my-evolution.glade.h:13
# my-evolution/my-evolution.glade.h:13
# my-evolution/my-evolution.glade.h:13
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:9
msgid "R_efresh time (seconds):"
msgstr "刷新时间 (秒)(_E):"
# my-evolution/my-evolution.glade.h:14
# my-evolution/my-evolution.glade.h:14
# my-evolution/my-evolution.glade.h:14
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:10
msgid "Refresh _time (seconds):"
msgstr "刷新时间 (秒)(_T):"
-# my-evolution/my-evolution.glade.h:15
-# my-evolution/my-evolution.glade.h:15
-# my-evolution/my-evolution.glade.h:15
-#: my-evolution/my-evolution.glade.h:12
-msgid "S_how full path for folders"
-msgstr "显示文件夹的完整路径(_H)"
+# my-evolution/my-evolution.glade.h:30
+# my-evolution/my-evolution.glade.h:30
+# my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Schedule"
+msgstr "调度(_S)"
# my-evolution/my-evolution.glade.h:16
# my-evolution/my-evolution.glade.h:16
# my-evolution/my-evolution.glade.h:16
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:12
msgid "Show _all tasks"
msgstr "显示所有任务(_A)"
# my-evolution/my-evolution.glade.h:17
# my-evolution/my-evolution.glade.h:17
# my-evolution/my-evolution.glade.h:17
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:13
msgid "Show _today's tasks"
msgstr "显示今天的任务(_T)"
# my-evolution/my-evolution.glade.h:18
# my-evolution/my-evolution.glade.h:18
# my-evolution/my-evolution.glade.h:18
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:14
msgid "Show temperatures in:"
msgstr "以之显示温度:"
# my-evolution/my-evolution.glade.h:19
# my-evolution/my-evolution.glade.h:19
# my-evolution/my-evolution.glade.h:19
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:15
msgid "Tasks "
msgstr "任务 "
@@ -40829,54 +40890,55 @@ msgstr "任务 "
msgid "Weather Settings"
msgstr "天气设置"
+#: my-evolution/my-evolution.glade.h:18
+#, fuzzy
+msgid "_Delete Feed"
+msgstr "已删除"
+
# my-evolution/my-evolution.glade.h:25
# my-evolution/my-evolution.glade.h:25
# my-evolution/my-evolution.glade.h:25
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
msgid "_Fahrenheit"
msgstr "华氏(_F)"
# my-evolution/my-evolution.glade.h:26
# my-evolution/my-evolution.glade.h:26
# my-evolution/my-evolution.glade.h:26
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
msgid "_Five days"
msgstr "五天(_F)"
-# my-evolution/my-evolution.glade.h:27
-# my-evolution/my-evolution.glade.h:27
-# my-evolution/my-evolution.glade.h:27
-#: my-evolution/my-evolution.glade.h:20
-msgid "_Mail"
-msgstr "邮件(_M)"
+# my-evolution/my-evolution.glade.h:9
+# my-evolution/my-evolution.glade.h:9
+# my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "_Max number of items shown:"
+msgstr "显示项目的最大数(_X):"
# my-evolution/my-evolution.glade.h:28
# my-evolution/my-evolution.glade.h:28
# my-evolution/my-evolution.glade.h:28
-#: my-evolution/my-evolution.glade.h:21
-msgid "_News Feeds"
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "_New Feed"
msgstr "新闻来源(_N)"
# my-evolution/my-evolution.glade.h:29
# my-evolution/my-evolution.glade.h:29
# my-evolution/my-evolution.glade.h:29
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
msgid "_One day"
msgstr "一天(_O)"
-# my-evolution/my-evolution.glade.h:30
-# my-evolution/my-evolution.glade.h:30
-# my-evolution/my-evolution.glade.h:30
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Schedule"
-msgstr "调度(_S)"
-
-# my-evolution/my-evolution.glade.h:31
-# my-evolution/my-evolution.glade.h:31
-# my-evolution/my-evolution.glade.h:31
+# my-evolution/my-evolution.glade.h:15
+# my-evolution/my-evolution.glade.h:15
+# my-evolution/my-evolution.glade.h:15
#: my-evolution/my-evolution.glade.h:24
-msgid "_Weather"
-msgstr "天气(_W)"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "显示文件夹的完整路径(_H)"
#: shell/GNOME_Evolution_Shell.server.in.in.h:1
msgid "Configure special folders and offline folder behavior here"
@@ -40960,8 +41022,8 @@ 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:180 shell/e-shell-view.c:486
-#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
+#: shell/e-shortcuts.c:1084
msgid "Inbox"
msgstr "收件箱"
@@ -41044,7 +41106,7 @@ msgstr ""
# shell/e-shell-about-box.c:43
# shell/e-shell-about-box.c:43
# shell/e-shell-about-box.c:43
-#: shell/e-shell-about-box.c:43
+#: shell/e-shell-about-box.c:45
msgid "Brought to you by"
msgstr "制作团队"
@@ -41226,7 +41288,7 @@ msgstr "重命名文件夹"
# shell/e-shell-folder-commands.c:554
# shell/e-shell-folder-creation-dialog.c:168
#: shell/e-shell-folder-commands.c:553
-#: shell/e-shell-folder-creation-dialog.c:170
+#: shell/e-shell-folder-creation-dialog.c:180
#, c-format
msgid "The specified folder name is not valid: %s"
msgstr "指定的文件夹名称不合法: %s"
@@ -41250,7 +41312,7 @@ msgstr ""
# 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-folder-creation-dialog.c:127
+#: shell/e-shell-folder-creation-dialog.c:137
#, c-format
msgid ""
"Cannot create the specified folder:\n"
@@ -41262,7 +41324,7 @@ msgstr ""
# ui/evolution.xml.h:7
# ui/evolution.xml.h:7
# ui/evolution.xml.h:7
-#: shell/e-shell-folder-creation-dialog.c:308
+#: shell/e-shell-folder-creation-dialog.c:318
#, fuzzy
msgid "Create New Folder"
msgstr "创建新文件夹(_N)..."
@@ -41542,14 +41604,14 @@ msgstr "请选择服务器。"
# mail/mail-ops.c:1234
# mail/mail-ops.c:1236
# mail/mail-ops.c:1279
-#: shell/e-shell-shared-folder-picker-dialog.c:374
+#: shell/e-shell-shared-folder-picker-dialog.c:387
msgid "Opening Folder"
msgstr "正在打开文件夹"
# mail/mail-ops.c:1234
# mail/mail-ops.c:1236
# mail/mail-ops.c:1279
-#: shell/e-shell-shared-folder-picker-dialog.c:380
+#: shell/e-shell-shared-folder-picker-dialog.c:393
#, fuzzy, c-format
msgid "Opening Folder \"%s\""
msgstr "正在打开文件夹“%s”"
@@ -41557,7 +41619,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:385
+#: shell/e-shell-shared-folder-picker-dialog.c:398
#, c-format
msgid "in \"%s\" ..."
msgstr "在“%s”中..."
@@ -41565,7 +41627,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:465
+#: shell/e-shell-shared-folder-picker-dialog.c:482
#, c-format
msgid "Could not open shared folder: %s."
msgstr "无法打开共享文件夹:%s。"
@@ -41573,7 +41635,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:518
+#: shell/e-shell-shared-folder-picker-dialog.c:535
msgid "Cannot find the specified shared folder."
msgstr "无法找到指定的共享文件夹。"
@@ -41583,7 +41645,7 @@ msgstr "无法找到指定的共享文件夹。"
# shell/e-shell-user-creatable-items-handler.c:540
# widgets/misc/e-charset-picker.c:104
#: shell/e-shell-user-creatable-items-handler.c:586
-#: shell/e-shell-user-creatable-items-handler.c:640
+#: shell/e-shell-user-creatable-items-handler.c:642
#: widgets/misc/e-charset-picker.c:106
msgid "New"
msgstr "新建"
@@ -41715,14 +41777,14 @@ msgstr "离线工作"
# shell/e-shell-view.c:214
# shell/e-shell-view.c:214
# shell/e-shell-view.c:215
-#: shell/e-shell-view.c:262
+#: shell/e-shell-view.c:264
msgid "(No folder displayed)"
msgstr "(未显示文件夹)"
# shell/e-shell-view.c:1585
# shell/e-shell-view.c:1585
# shell/e-shell-view.c:1598
-#: shell/e-shell-view.c:2045
+#: shell/e-shell-view.c:2040
#, c-format
msgid "%s (%d)"
msgstr "%s (%d)"
@@ -41730,14 +41792,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:2047
+#: shell/e-shell-view.c:2042
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:2091
+#: shell/e-shell-view.c:2083
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
@@ -41745,14 +41807,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:2098
+#: shell/e-shell-view.c:2090
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:2104
+#: shell/e-shell-view.c:2096
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr "Ximian Evolution 目前离线。 点击该按钮则在线工作。"
@@ -41783,7 +41845,7 @@ msgstr "无法设置本地存储 -- %s"
# shell/e-shell.c:1659
# shell/e-shell.c:1659
# shell/e-shell.c:1660
-#: shell/e-shell.c:1802
+#: shell/e-shell.c:1804
#, c-format
msgid ""
"The Evolution component that handles folders of type \"%s\"\n"
@@ -41797,28 +41859,28 @@ msgstr ""
# shell/e-shell.c:1886
# shell/e-shell.c:1886
# shell/e-shell.c:1887
-#: shell/e-shell.c:2067
+#: shell/e-shell.c:2069
msgid "Invalid arguments"
msgstr "无效参数"
# shell/e-shell.c:1888
# shell/e-shell.c:1888
# shell/e-shell.c:1889
-#: shell/e-shell.c:2069
+#: shell/e-shell.c:2071
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:2071
+#: shell/e-shell.c:2073
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:2073 shell/e-storage.c:568
+#: shell/e-shell.c:2075 shell/e-storage.c:568
msgid "Generic error"
msgstr "通用错误"
@@ -42600,7 +42662,7 @@ msgstr "Evolution 可以从下列文件中导入数据:"
# data/evolution.desktop.in.h:1 shell/main.c:83
# shell/main.c:83
# shell/main.c:83
-#: shell/main.c:112 shell/main.c:564
+#: shell/main.c:112 shell/main.c:574
msgid "Evolution"
msgstr "Evolution"
@@ -42612,7 +42674,7 @@ msgid "Evolution is now exiting ..."
msgstr "Evolution 正在退出 ..."
#. Preview/Alpha/Beta version warning message
-#: shell/main.c:266
+#: shell/main.c:274
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -42635,7 +42697,7 @@ msgstr ""
# ui/evolution.xml.h:31
# data/evolution.desktop.in.h:2
# data/evolution.desktop.in.h:2
-#: shell/main.c:290
+#: shell/main.c:298
#, fuzzy
msgid ""
"Thanks\n"
@@ -42645,7 +42707,7 @@ msgstr "Ximian Evolution"
# shell/importer/intelligent.c:198
# shell/importer/intelligent.c:198
# shell/importer/intelligent.c:198
-#: shell/main.c:298
+#: shell/main.c:306
#, fuzzy
msgid "Don't tell me again"
msgstr "不要再问我"
@@ -42653,14 +42715,14 @@ msgstr "不要再问我"
# shell/main.c:210
# shell/main.c:210
# shell/main.c:210
-#: shell/main.c:387
+#: shell/main.c:401
msgid "Cannot access the Ximian Evolution shell."
msgstr "无法访问 Ximian Evolution shell。"
# shell/main.c:219
# shell/main.c:219
# shell/main.c:219
-#: shell/main.c:396
+#: shell/main.c:410
#, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "无法初始化 Ximian Evolution shell: %s"
@@ -42668,14 +42730,14 @@ msgstr "无法初始化 Ximian Evolution shell: %s"
# shell/main.c:289
# shell/main.c:289
# shell/main.c:289
-#: shell/main.c:528
+#: shell/main.c:542
msgid "Disable splash screen"
msgstr "禁用启动屏幕"
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
-#: shell/main.c:530
+#: shell/main.c:544
#, fuzzy
msgid "Start in offline mode"
msgstr "开始导入"
@@ -42683,7 +42745,7 @@ msgstr "开始导入"
# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
# shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
-#: shell/main.c:532
+#: shell/main.c:546
#, fuzzy
msgid "Start in online mode"
msgstr "启动智能导入器"
@@ -42691,7 +42753,7 @@ msgstr "启动智能导入器"
# mail/GNOME_Evolution_Mail.oaf.in.h:6
# mail/GNOME_Evolution_Mail.oaf.in.h:6
# notes/GNOME_Evolution_Notes.oaf.in.h:3
-#: shell/main.c:535
+#: shell/main.c:549
#, fuzzy
msgid "Forcibly shut down all evolution components"
msgstr "Evolution 便签组件车间。"
@@ -42699,15 +42761,11 @@ msgstr "Evolution 便签组件车间。"
# shell/main.c:290
# shell/main.c:290
# shell/main.c:290
-#: shell/main.c:538
+#: shell/main.c:552
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
-#: shell/main.c:541
-msgid "Force upgrading of configuration files from Evolution 1.0.x"
-msgstr "强制更新来自 Evolution 1.0.x 的配置文件"
-
-#: shell/main.c:568
+#: shell/main.c:578
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -45527,17 +45585,10 @@ msgstr ""
# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
msgid "Select a Time Zone"
msgstr "选择一个时区"
-# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "Selection:"
-msgstr "选择:"
-
# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
@@ -45549,18 +45600,27 @@ msgstr "时区"
# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#, fuzzy
msgid ""
"Use the left mouse button to zoom in on an area of the map and select a time "
"zone.\n"
-" Use the right mouse button to zoom out."
+"Use the right mouse button to zoom out."
msgstr ""
"用鼠标左键放大地图的某个区域并选择一个时区。\n"
" 用鼠标右键缩小。"
+# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#, fuzzy
+msgid "_Selection:"
+msgstr "选择:"
+
# widgets/menus/gal-view-menus.c:195
# widgets/menus/gal-view-menus.c:195
# widgets/menus/gal-view-menus.c:195
-#: widgets/menus/gal-view-menus.c:287
+#: widgets/menus/gal-view-menus.c:290
msgid "_Current View"
msgstr "当前视图(_C)"
@@ -45568,7 +45628,7 @@ msgstr "当前视图(_C)"
# widgets/menus/gal-view-menus.c:195
# widgets/menus/gal-view-menus.c:195
#. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:349
#, fuzzy
msgid "Custom View"
msgstr "当前视图(_C)"
@@ -45576,7 +45636,7 @@ msgstr "当前视图(_C)"
# widgets/menus/gal-view-menus.c:195
# widgets/menus/gal-view-menus.c:195
# widgets/menus/gal-view-menus.c:195
-#: widgets/menus/gal-view-menus.c:355
+#: widgets/menus/gal-view-menus.c:358
#, fuzzy
msgid "Save Custom View..."
msgstr "当前视图(_C)"
@@ -45584,7 +45644,7 @@ msgstr "当前视图(_C)"
# widgets/menus/gal-view-menus.c:222
# widgets/menus/gal-view-menus.c:222
# widgets/menus/gal-view-menus.c:222
-#: widgets/menus/gal-view-menus.c:368
+#: widgets/menus/gal-view-menus.c:371
#, fuzzy
msgid "Define Views..."
msgstr "定义视图"
@@ -45609,14 +45669,14 @@ msgstr "%Y %B"
# widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
# widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
# widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:427
msgid "Now"
msgstr "现在"
# widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
# widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
# widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:435
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:433
msgid "Today"
msgstr "今天"
@@ -45746,27 +45806,27 @@ msgstr "可视"
msgid "Unknown character set: %s"
msgstr "未知的字符集:%s"
+# widgets/misc/e-charset-picker.c:395
+# widgets/misc/e-charset-picker.c:395
+# widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:230 widgets/misc/e-charset-picker.c:459
+msgid "Character Encoding"
+msgstr "字符编码"
+
# widgets/misc/e-charset-picker.c:201
# widgets/misc/e-charset-picker.c:201
# widgets/misc/e-charset-picker.c:204
-#: widgets/misc/e-charset-picker.c:228
+#: widgets/misc/e-charset-picker.c:239
msgid "Enter the character set to use"
msgstr "输入要使用的字符集"
# widgets/misc/e-charset-picker.c:276
# widgets/misc/e-charset-picker.c:276
# widgets/misc/e-charset-picker.c:279
-#: widgets/misc/e-charset-picker.c:303
+#: widgets/misc/e-charset-picker.c:335
msgid "Other..."
msgstr "其它..."
-# widgets/misc/e-charset-picker.c:395
-# widgets/misc/e-charset-picker.c:395
-# widgets/misc/e-charset-picker.c:398
-#: widgets/misc/e-charset-picker.c:423
-msgid "Character Encoding"
-msgstr "字符编码"
-
# widgets/misc/e-clipped-label.c:111
# widgets/misc/e-clipped-label.c:111
# widgets/misc/e-clipped-label.c:111
@@ -45923,6 +45983,134 @@ msgstr "Evolution 日历实施概要组件。"
msgid "Evolution Addressbook local file backend"
msgstr "Evolution 地址簿小卡片显示器"
+# addressbook/gui/component/addressbook-config.glade.h:8
+# addressbook/gui/component/addressbook-config.glade.h:8
+# addressbook/gui/component/addressbook-config.glade.h:11
+#~ msgid "De_lete"
+#~ msgstr "删除(_L)"
+
+# mail/mail-config.glade.h:99
+# mail/mail-config.glade.h:99
+# mail/mail-config.glade.h:108
+#~ msgid "Email Address:"
+#~ msgstr "电子邮件地址:"
+
+# addressbook/gui/contact-editor/e-contact-quick-add.c:332
+# addressbook/gui/contact-editor/e-contact-quick-add.c:332
+# addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#~ msgid "E-mail"
+#~ msgstr "电子邮件"
+
+# addressbook/gui/contact-editor/fullname.glade.h:1
+# addressbook/gui/contact-editor/fullname.glade.h:1
+# addressbook/gui/contact-editor/fullname.glade.h:1
+#~ msgid "Check Full Name"
+#~ 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
+#~ msgid "Add Anyway"
+#~ msgstr "强制添加"
+
+# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+# addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#~ msgid "Change Anyway"
+#~ msgstr "强制修改"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+#~ msgid "Configure the fonts used by Evolution here"
+#~ msgstr "Evolution 撰写器车间。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+#~ msgid "Evolution Mail font configuration control"
+#~ msgstr "Evolution 任务控制车间"
+
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+#~ msgid "Font Preferences"
+#~ msgstr "没有循环(_N)"
+
+# mail/mail-config.glade.h:94
+# mail/mail-config.glade.h:94
+# mail/mail-config.glade.h:103
+#~ msgid "Automatically _detect links"
+#~ msgstr "自动检查连接"
+
+# my-evolution/metar.c:65
+# my-evolution/metar.c:65
+# my-evolution/metar.c:65
+#~ msgid "Emacs"
+#~ msgstr "Emacs"
+
+# 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
+#, fuzzy
+#~ msgid "Microsoft"
+#~ msgstr "密克罗尼西亚"
+
+# shell/e-shortcuts.c:1043
+# shell/e-shortcuts.c:1043
+# shell/e-shortcuts.c:1043
+#~ msgid "Shortcuts _type:"
+#~ msgstr "快捷方式类型(_T):"
+
+# my-evolution/metar.c:65
+# my-evolution/metar.c:65
+# my-evolution/metar.c:65
+#~ msgid "XEmacs"
+#~ msgstr "XEmacs"
+
+# my-evolution/e-summary-preferences.c:944
+# my-evolution/e-summary-preferences.c:944
+# my-evolution/e-summary-preferences.c:946
+#~ 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
+#~ msgid "Enter the URL of the news feed you wish to add"
+#~ msgstr "输入您希望添加的新闻来源的 URL"
+
+# my-evolution/my-evolution.glade.h:2
+# my-evolution/my-evolution.glade.h:2
+# my-evolution/my-evolution.glade.h:2
+#~ msgid "Add n_ews feed"
+#~ msgstr "添加新闻来源(_E)"
+
+# my-evolution/my-evolution.glade.h:5
+# my-evolution/my-evolution.glade.h:5
+# my-evolution/my-evolution.glade.h:5
+#, fuzzy
+#~ msgid "Delete news feed"
+#~ msgstr "所有新闻来源(_F):"
+
+# my-evolution/my-evolution.glade.h:27
+# my-evolution/my-evolution.glade.h:27
+# my-evolution/my-evolution.glade.h:27
+#~ msgid "_Mail"
+#~ msgstr "邮件(_M)"
+
+# my-evolution/my-evolution.glade.h:31
+# my-evolution/my-evolution.glade.h:31
+# my-evolution/my-evolution.glade.h:31
+#~ msgid "_Weather"
+#~ msgstr "天气(_W)"
+
+#~ msgid "Force upgrading of configuration files from Evolution 1.0.x"
+#~ msgstr "强制更新来自 Evolution 1.0.x 的配置文件"
+
# addressbook/gui/contact-editor/fulladdr.glade.h:45
# addressbook/gui/contact-editor/fulladdr.glade.h:45
# addressbook/gui/contact-editor/fulladdr.glade.h:2
@@ -48646,16 +48834,6 @@ msgstr "Evolution 地址簿小卡片显示器"
#~ "\n"
#~ "电子邮件:\n"
-# addressbook/backend/ebook/e-card.c:3807
-# addressbook/backend/ebook/e-card.c:3807
-# addressbook/backend/ebook/e-card.c:3807
-#~ msgid ""
-#~ "\n"
-#~ "E-mail:"
-#~ msgstr ""
-#~ "\n"
-#~ "电子邮件:"
-
# addressbook/backend/ebook/e-card.c:3832
# addressbook/backend/ebook/e-card.c:3832
# addressbook/backend/ebook/e-card.c:3832