aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-10-08 06:50:02 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-10-08 06:50:02 +0800
commitdf86e5874705fdfa626160eb7e20f914a7334a6b (patch)
treedf21ba8a6e43f01aadf6ff3bb0f947a95f979629 /po/zh_CN.po
parentacdd11bcb947d6a2074c0bbde531c44bfd44d26e (diff)
downloadgsoc2013-evolution-df86e5874705fdfa626160eb7e20f914a7334a6b.tar
gsoc2013-evolution-df86e5874705fdfa626160eb7e20f914a7334a6b.tar.gz
gsoc2013-evolution-df86e5874705fdfa626160eb7e20f914a7334a6b.tar.bz2
gsoc2013-evolution-df86e5874705fdfa626160eb7e20f914a7334a6b.tar.lz
gsoc2013-evolution-df86e5874705fdfa626160eb7e20f914a7334a6b.tar.xz
gsoc2013-evolution-df86e5874705fdfa626160eb7e20f914a7334a6b.tar.zst
gsoc2013-evolution-df86e5874705fdfa626160eb7e20f914a7334a6b.zip
Sync for 1.1.2.
svn path=/trunk/; revision=18347
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po3414
1 files changed, 1892 insertions, 1522 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b849f52346..ca8de48077 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
"PO-Revision-Date: 2002-02-04 22:51+0800\n"
"Last-Translator: Wang Li <charlesw1234@163.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -680,17 +680,26 @@ msgstr "姓"
msgid "%x"
msgstr "%x"
+# addressbook/gui/component/select-names/e-select-names-popup.c:423
+# addressbook/gui/component/select-names/e-select-names-popup.c:423
+# addressbook/gui/component/select-names/e-select-names-popup.c:423
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
+#, fuzzy
+msgid "Unnamed List"
+msgstr "未命名的联系人列表"
+
# addressbook/backend/ebook/e-card.c:4235
# addressbook/backend/ebook/e-card.c:4235
# addressbook/backend/ebook/e-card.c:4235
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card.c:2681
msgid "Multiple VCards"
msgstr "多个 VCard"
# addressbook/backend/ebook/e-card.c:4243
# addressbook/backend/ebook/e-card.c:4243
# addressbook/backend/ebook/e-card.c:4243
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
#, c-format
msgid "VCard for %s"
msgstr "%s 的 VCard"
@@ -735,9 +744,9 @@ msgstr "%s 的 VCard"
#: addressbook/backend/ebook/test-client.c:34
#: addressbook/conduit/address-conduit.c:1860
#: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1727
+#: calendar/conduits/calendar/calendar-conduit.c:1807
#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:67
#: tools/evolution-addressbook-abuse.c:132
#: tools/evolution-addressbook-export.c:60
#: tools/evolution-addressbook-import.c:86
@@ -750,22 +759,22 @@ msgstr "无法初始化 Bonobo"
# addressbook/backend/pas/pas-backend-ldap.c:2269
# addressbook/backend/pas/pas-backend-file.c:259
# addressbook/backend/pas/pas-backend-ldap.c:2272
-#: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2968
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
msgid "Searching..."
msgstr "搜索..."
# addressbook/backend/pas/pas-backend-file.c:261
# addressbook/backend/pas/pas-backend-file.c:261
# addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
msgid "Loading..."
msgstr "装入..."
# addressbook/backend/pas/pas-backend-ldap.c:483
# addressbook/backend/pas/pas-backend-ldap.c:483
# addressbook/backend/pas/pas-backend-ldap.c:486
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
#, fuzzy
msgid "Reconnecting to LDAP server..."
msgstr "正在连接 LDAP 服务器..."
@@ -773,29 +782,29 @@ msgstr "正在连接 LDAP 服务器..."
# addressbook/backend/pas/pas-backend-ldap.c:912
# addressbook/backend/pas/pas-backend-ldap.c:912
# addressbook/backend/pas/pas-backend-ldap.c:915
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
msgid "Adding card to LDAP server..."
msgstr "正在将卡片添加到 LDAP 服务器..."
# addressbook/backend/pas/pas-backend-ldap.c:1013
# addressbook/backend/pas/pas-backend-ldap.c:1013
# addressbook/backend/pas/pas-backend-ldap.c:1016
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
msgid "Removing card from LDAP server..."
msgstr "正在从 LDAP 服务器删除卡片..."
# addressbook/backend/pas/pas-backend-ldap.c:1123
# addressbook/backend/pas/pas-backend-ldap.c:1123
# addressbook/backend/pas/pas-backend-ldap.c:1126
-#: addressbook/backend/pas/pas-backend-ldap.c:1562
-#: addressbook/backend/pas/pas-backend-ldap.c:1565
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
msgid "Modifying card from LDAP server..."
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:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
msgid "Receiving LDAP search results..."
msgstr "正在接收 LDAP 的搜索结果..."
@@ -805,7 +814,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:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
#, fuzzy
msgid "Error performing search"
msgstr "删除卡片错误"
@@ -842,7 +851,7 @@ msgstr "没有装入 EBook\n"
# calendar/conduits/calendar/calendar-conduit.c:1203
# calendar/conduits/todo/todo-conduit.c:824
#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
#: calendar/conduits/todo/todo-conduit.c:889
msgid "Could not start wombat server"
msgstr "无法启动 wombat 服务器"
@@ -857,7 +866,7 @@ msgstr "无法启动 wombat 服务器"
# calendar/conduits/calendar/calendar-conduit.c:1204
# calendar/conduits/todo/todo-conduit.c:825
#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
#: calendar/conduits/todo/todo-conduit.c:890
msgid "Could not start wombat"
msgstr "无法启动 wombat"
@@ -973,10 +982,10 @@ msgstr "示例地址簿控制车间"
# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
# shell/e-shortcuts.c:1061
#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:618
+#: addressbook/gui/component/addressbook-component.c:611
#: calendar/gui/dialogs/comp-editor-util.c:310
#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
#: shell/e-shortcuts.c:1067
msgid "Contacts"
msgstr "联系人"
@@ -1002,27 +1011,52 @@ msgstr "LDAP 服务器"
msgid "LDAP server containing contact information"
msgstr "含有联系人信息的 LDAP 服务器"
+# addressbook/gui/component/addressbook-component.c:71
+# calendar/gui/dialogs/comp-editor-util.c:310
+# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+# shell/e-shortcuts.c:1061
+# addressbook/gui/component/addressbook-component.c:71
+# calendar/gui/dialogs/comp-editor-util.c:310
+# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+# shell/e-shortcuts.c:1061
+# addressbook/gui/component/addressbook-component.c:71
+# calendar/gui/dialogs/comp-editor-util.c:310
+# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+# shell/e-shortcuts.c:1061
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "联系人"
+
+# addressbook/gui/component/addressbook-component.c:71
+# addressbook/gui/component/addressbook-component.c:71
+# addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "含有联系人信息的文件夹"
+
# addressbook/gui/component/addressbook-component.c:526
# ui/evolution-addressbook.xml.h:11
# addressbook/gui/component/addressbook-component.c:526
# ui/evolution-addressbook.xml.h:11
# addressbook/gui/component/addressbook-component.c:527
# ui/evolution-addressbook.xml.h:11
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
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:574
+#: addressbook/gui/component/addressbook-component.c:567
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:575
+#: addressbook/gui/component/addressbook-component.c:568
#, fuzzy
msgid "Create a new contact"
msgstr "创建新的联系人"
@@ -1030,14 +1064,14 @@ msgstr "创建新的联系人"
# addressbook/gui/component/addressbook-component.c:527
# addressbook/gui/component/addressbook-component.c:527
# addressbook/gui/component/addressbook-component.c:530
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
msgid "New Contact List"
msgstr "新建联系人列表"
# ui/evolution-addressbook.xml.h:32
# ui/evolution-addressbook.xml.h:32
# ui/evolution-addressbook.xml.h:33
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
#, fuzzy
msgid "Contact _List"
msgstr "联系人列表(_C)"
@@ -1045,7 +1079,7 @@ msgstr "联系人列表(_C)"
# ui/evolution-addressbook.xml.h:5
# ui/evolution-addressbook.xml.h:5
# ui/evolution-addressbook.xml.h:5
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
#, fuzzy
msgid "Create a new contact list"
msgstr "创建新的联系人列表"
@@ -1114,7 +1148,7 @@ msgstr "(在该版本的 evolution 中不支持SSL)"
# addressbook/gui/component/addressbook-factory.c:70
# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:142
+#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
msgid "Could not initialize gnome-vfs"
msgstr "无法创始化 gnome-vfs"
@@ -1128,14 +1162,14 @@ msgstr "其他联系人"
# addressbook/gui/component/addressbook.c:485
# addressbook/gui/component/addressbook.c:485
# addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
msgid "Unable to open addressbook"
msgstr "无法打开地址簿"
# addressbook/gui/component/addressbook.c:507
# addressbook/gui/component/addressbook.c:507
# addressbook/gui/component/addressbook.c:521
-#: addressbook/gui/component/addressbook.c:477
+#: addressbook/gui/component/addressbook.c:480
msgid ""
"We were unable to open this addressbook. Please check that the\n"
"path exists and that you have permission to access it."
@@ -1146,7 +1180,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:487
+#: addressbook/gui/component/addressbook.c:490
#, fuzzy
msgid ""
"We were unable to open this addressbook. This either\n"
@@ -1160,7 +1194,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:492
+#: addressbook/gui/component/addressbook.c:495
msgid ""
"This version of Evolution does not have LDAP support\n"
"compiled in to it. If you want to use LDAP in Evolution\n"
@@ -1175,7 +1209,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:501
+#: addressbook/gui/component/addressbook.c:504
#, fuzzy
msgid ""
"We were unable to open this addressbook. This either\n"
@@ -1186,22 +1220,38 @@ msgstr ""
"您输入了错误的 URI,或是是因为\n"
" LDAP 服务器已经关闭"
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+# camel/providers/imap/camel-imap-store.c:596
+# camel/providers/imap/camel-imap-store.c:596
+# camel/providers/imap/camel-imap-store.c:596
+#: addressbook/gui/component/addressbook.c:625
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr ""
+"无法认证到 IMAP 服务器。\n"
+"%s\n"
+"\n"
+
# addressbook/gui/component/addressbook.c:640
# addressbook/gui/component/addressbook.c:640
# addressbook/gui/component/addressbook.c:655
# addressbook/gui/component/addressbook.c:658
-#: addressbook/gui/component/addressbook.c:613
-#: addressbook/gui/component/addressbook.c:616
-#, c-format
-msgid "Enter password for %s (user %s)"
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
msgstr "为 %s (用户 %s)输入口令"
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
#, fuzzy
msgid "Name begins with"
msgstr "以之结束"
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
#, fuzzy
msgid "Email begins with"
msgstr "以之结束"
@@ -1212,7 +1262,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:743
+#: addressbook/gui/component/addressbook.c:784
#: calendar/gui/cal-search-bar.c:53
msgid "Category is"
msgstr "类别为"
@@ -1224,7 +1274,7 @@ msgstr "类别为"
# addressbook/gui/component/addressbook.c:836
# calendar/gui/cal-search-bar.c:55
#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:744
+#: addressbook/gui/component/addressbook.c:785
#: calendar/gui/cal-search-bar.c:49
msgid "Any field contains"
msgstr "任何域含有"
@@ -1234,11 +1284,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:745
+#: addressbook/gui/component/addressbook.c:786
msgid "Advanced..."
msgstr "高级..."
-#: addressbook/gui/component/addressbook.c:915
+#: addressbook/gui/component/addressbook.c:956
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -1246,7 +1296,7 @@ msgid ""
"the directory server preferences for this addressbook."
msgstr ""
-#: addressbook/gui/component/addressbook.c:921
+#: addressbook/gui/component/addressbook.c:962
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"
@@ -1254,15 +1304,15 @@ msgid ""
"preferences for this addressbook."
msgstr ""
-#: addressbook/gui/component/addressbook.c:927
+#: addressbook/gui/component/addressbook.c:968
msgid "The backend for this addressbook was unable to parse this query."
msgstr ""
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:971
msgid "The backend for this addressbook refused to perform this query."
msgstr ""
-#: addressbook/gui/component/addressbook.c:934
+#: addressbook/gui/component/addressbook.c:975
msgid "This query did not complete successfully."
msgstr ""
@@ -1273,7 +1323,7 @@ msgstr ""
# addressbook/gui/component/addressbook.c:1067
# calendar/gui/cal-search-bar.c:412
#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1009
+#: addressbook/gui/component/addressbook.c:1050
#: calendar/gui/cal-search-bar.c:382
msgid "Any Category"
msgstr "任何类别"
@@ -1281,7 +1331,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:1091
+#: addressbook/gui/component/addressbook.c:1132
msgid "The URI that the Folder Browser will display"
msgstr "文件夹浏览器将显示的 URI"
@@ -1401,46 +1451,30 @@ msgstr "开启查询(危险!)"
msgid " S_how Supported Bases "
msgstr "检查支持的类型(_C) "
-# addressbook/printing/e-contact-print.glade.h:23
-# addressbook/printing/e-contact-print.glade.h:23
-# addressbook/printing/e-contact-print.glade.h:23
#: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "选项"
-
-# my-evolution/my-evolution.glade.h:1
-# my-evolution/my-evolution.glade.h:1
-# my-evolution/my-evolution.glade.h:1
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "删除(_R)"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
msgid "1234"
msgstr ""
# calendar/gui/e-calendar-table.c:437
# calendar/gui/e-calendar-table.c:437
# addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
#, fuzzy
msgid "1:00"
msgstr "100"
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
msgid "2:30"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
msgid "3268"
msgstr ""
# calendar/gui/e-calendar-table.c:435
# calendar/gui/e-calendar-table.c:435
# calendar/gui/e-calendar-table.c:436
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
#, fuzzy
msgid "380"
msgstr "80%"
@@ -1448,22 +1482,41 @@ msgstr "80%"
# addressbook/gui/component/addressbook-config.glade.h:1
# addressbook/gui/component/addressbook-config.glade.h:1
# addressbook/gui/component/addressbook-config.glade.h:2
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
msgid "389"
msgstr "389"
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
msgid "5:00"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
msgid "636"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
msgid "666"
msgstr ""
+# 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/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "删除(_R)"
+
+# addressbook/printing/e-contact-print.glade.h:23
+# addressbook/printing/e-contact-print.glade.h:23
+# addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "选项"
+
#: addressbook/gui/component/ldap-config.glade.h:13
msgid "Add (or Edit) Attribute Mappings"
msgstr ""
@@ -1650,6 +1703,12 @@ msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:45
msgid ""
+"Please select an Evolution attribute and an\n"
+"LDAP attribute to associate with it."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:47
+msgid ""
"Please select and Evolution attribute and an\n"
"LDAP attribute to associate with it."
msgstr ""
@@ -1657,7 +1716,7 @@ msgstr ""
# mail/mail-config.glade.h:23
# mail/folder-browser.h:26
# mail/mail-config.glade.h:30
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:49
#, fuzzy
msgid "R_estore Defaults"
msgstr "默认"
@@ -1665,7 +1724,7 @@ msgstr "默认"
# mail/mail-config.glade.h:23
# mail/folder-browser.h:26
# mail/mail-config.glade.h:30
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
#, fuzzy
msgid "Re_store Defaults"
msgstr "默认"
@@ -1673,7 +1732,7 @@ msgstr "默认"
# addressbook/gui/component/addressbook-config.glade.h:13
# addressbook/gui/component/addressbook-config.glade.h:13
# addressbook/gui/component/addressbook-config.glade.h:18
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
#, fuzzy
msgid "S_earch scope: "
msgstr "搜索范围(_C):"
@@ -1685,33 +1744,33 @@ msgstr "搜索范围(_C):"
# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
# calendar/gui/e-week-view.c:1188
#. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:52
#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1215
+#: calendar/gui/e-week-view.c:1242
msgid "Searching"
msgstr "搜索"
# ui/evolution-addressbook.xml.h:21
# ui/evolution-addressbook.xml.h:21
# ui/evolution-addressbook.xml.h:21
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
#, fuzzy
msgid "Select"
msgstr "全选"
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
#, fuzzy
msgid "Selected:"
msgstr "已删除"
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:55
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if\n"
"your LDAP server supports SSL or TLS."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:57
msgid ""
"Selecting this option means that Evolution will only try to use SSL/TLS if "
"you are in a \n"
@@ -1722,7 +1781,7 @@ msgid ""
"secure."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:61
msgid ""
"Selecting this option means that your server does not support either SSL or "
"TLS. This \n"
@@ -1731,14 +1790,14 @@ msgid ""
"exploits. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:64
msgid ""
"Selecting this option will let you change Evolution's default settings for "
"LDAP\n"
"searches, and for creating and editting contacts. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:66
msgid ""
"Specifying a display name is the last required step in configuring an LDAP "
"server."
@@ -1747,7 +1806,7 @@ msgstr ""
# mail/mail-config.glade.h:81
# mail/mail-config.glade.h:81
# mail/mail-config.glade.h:90
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:67
#, fuzzy
msgid "Step 1: Server Information"
msgstr "来源信息"
@@ -1755,35 +1814,35 @@ msgstr "来源信息"
# mail/mail-config.c:2184 mail/mail-config.c:2188
# mail/mail-config.c:2233 mail/mail-config.c:2237
# mail/mail-config.c:2326 mail/mail-config.c:2330
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
#, fuzzy
msgid "Step 2: Connecting to Server"
msgstr "正在连接服务器..."
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
msgid "Step 3: Searching the Directory"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
msgid "Step 4: Display Name"
msgstr ""
# addressbook/gui/component/addressbook-config.glade.h:15
# addressbook/gui/component/addressbook-config.glade.h:15
# addressbook/gui/component/addressbook-config.glade.h:20
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
msgid "Sub"
msgstr ""
# shell/evolution-shell-component.c:1023
# shell/evolution-shell-component.c:1023
# shell/evolution-shell-component.c:1036
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
#, fuzzy
msgid "Supported Search Bases"
msgstr "不支持的方案"
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
msgid ""
"The first step in configuring an LDAP server is to provide its name, and "
"your log in\n"
@@ -1791,7 +1850,7 @@ msgid ""
"information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
msgid ""
"The options on this page control how many entries should be included in "
"your\n"
@@ -1800,7 +1859,7 @@ msgid ""
"need to change these options."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:78
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
"searches will \n"
@@ -1808,7 +1867,7 @@ msgid ""
"directory tree."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the \n"
@@ -1818,7 +1877,7 @@ msgid ""
"your base."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:83
msgid ""
"This assistant will help you to access online directory services\n"
"using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1828,14 +1887,14 @@ msgid ""
"need help finding this information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr ""
# addressbook/gui/component/addressbook-config.glade.h:25
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
#, fuzzy
msgid ""
"This is the maximum number of entries to download. Setting this number to "
@@ -1844,7 +1903,7 @@ msgid ""
msgstr "这是可下载卡片的最大数量。将该数值设定得太大将导致地址本变慢。"
# addressbook/gui/component/addressbook-config.glade.h:26
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
msgid ""
"This is the method evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1856,7 +1915,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:91
+#: addressbook/gui/component/ldap-config.glade.h:93
#, fuzzy
msgid ""
"This is the name for this server that will appear in your Evolution folder "
@@ -1864,7 +1923,7 @@ msgid ""
"It is for display purposes only. "
msgstr "这一名称将用于识别您的帐号。它只用于显示。"
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
msgid ""
"This is the port on the LDAP server that Evolution will try to connect to. "
"A \n"
@@ -1872,11 +1931,11 @@ msgid ""
"what port you should specify."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:98
msgid "This option controls how long a search will be run."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:99
msgid ""
"To add an attribute to the DN, select it from the list and click the \"Add "
"Attribute\" button.\n"
@@ -1885,12 +1944,12 @@ msgid ""
"that you add to the directory on the LDAP server. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:102
msgid "U_se SSL/TLS:"
msgstr ""
# addressbook/gui/component/addressbook-config.glade.h:12
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:103
#, fuzzy
msgid "Using distinguished name (DN)"
msgstr "识别姓名 (DN)"
@@ -1898,12 +1957,12 @@ msgstr "识别姓名 (DN)"
# addressbook/gui/component/addressbook-config.glade.h:9
# addressbook/gui/component/addressbook-config.glade.h:9
# addressbook/gui/component/addressbook-config.glade.h:13
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
#, fuzzy
msgid "Using email address"
msgstr "电子邮件地址"
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
msgid "Whenever Possible"
msgstr ""
@@ -1923,7 +1982,7 @@ msgstr ""
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
#: addressbook/gui/contact-editor/contact-editor.glade.h:30
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
@@ -1946,17 +2005,17 @@ msgstr "添加(_A)"
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:107
#, fuzzy
-msgid "_Add -&gt;"
+msgid "_Add ->"
msgstr "添加(_A)"
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
#, fuzzy
msgid "_Add Mapping"
msgstr "添加动作"
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
#, fuzzy
msgid "_Add to DN"
msgstr "添加动作"
@@ -1964,7 +2023,7 @@ msgstr "添加动作"
# calendar/gui/e-calendar-table.etspec.h:3
# calendar/gui/e-calendar-table.etspec.h:3
# calendar/gui/e-calendar-table.etspec.h:3
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
#, fuzzy
msgid "_Always"
msgstr "提醒"
@@ -1972,7 +2031,7 @@ msgstr "提醒"
# ui/evolution-message-composer.xml.h:46
# ui/evolution-message-composer.xml.h:46
# ui/evolution-message-composer.xml.h:46
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
#, fuzzy
msgid "_Delete Mapping"
msgstr "全部删除(_D)"
@@ -1980,23 +2039,23 @@ msgstr "全部删除(_D)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
#, fuzzy
msgid "_Display name:"
msgstr "显示(_D)"
# addressbook/gui/component/addressbook-config.glade.h:12
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
#, fuzzy
msgid "_Distinguished Name (DN):"
msgstr "识别姓名 (DN)"
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
msgid "_Don't use SSL/TLS"
msgstr ""
# addressbook/gui/component/addressbook-config.glade.h:33
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
#, fuzzy
msgid "_Download limit:"
msgstr "下载上限(_D)"
@@ -2019,7 +2078,7 @@ 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:114 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:116 filter/filter.glade.h:16
#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
#: ui/evolution-mail-messagedisplay.xml.h:6
@@ -2032,7 +2091,7 @@ msgstr "编辑(_E)"
# calendar/gui/alarm-notify/alarm-notify.glade.h:4
# calendar/gui/alarm-notify/alarm-notify.glade.h:4
# calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
#, fuzzy
msgid "_Edit Mapping"
msgstr "编辑约会(_E)"
@@ -2040,39 +2099,39 @@ msgstr "编辑约会(_E)"
# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
#, fuzzy
msgid "_Evolution attribute:"
msgstr "Evolution 提醒"
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
msgid "_If necessary "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
msgid "_LDAP attribute:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
msgid "_LDAP attributes:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
msgid "_Log in method:"
msgstr ""
# calendar/gui/e-meeting-time-sel.c:467
# calendar/gui/e-meeting-time-sel.c:470
# calendar/gui/e-meeting-time-sel.c:470
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
#, fuzzy
-msgid "_More Options &gt;&gt;"
+msgid "_More Options >>"
msgstr "选项(_O)"
# addressbook/gui/component/addressbook-config.glade.h:27
# addressbook/gui/component/addressbook-config.glade.h:27
# addressbook/gui/component/addressbook-config.glade.h:36
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
#, fuzzy
msgid "_Port number:"
msgstr "端口(_P):"
@@ -2080,7 +2139,7 @@ msgstr "端口(_P):"
# mail/mail-config.glade.h:23
# mail/folder-browser.h:26
# mail/mail-config.glade.h:30
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
#, fuzzy
msgid "_Restore Defaults"
msgstr "默认"
@@ -2088,7 +2147,7 @@ msgstr "默认"
# addressbook/gui/component/addressbook-config.glade.h:12
# addressbook/gui/component/addressbook-config.glade.h:12
# addressbook/gui/component/addressbook-config.glade.h:17
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
#, fuzzy
msgid "_Search base:"
msgstr "搜索起点(_B):"
@@ -2096,14 +2155,14 @@ msgstr "搜索起点(_B):"
# addressbook/gui/component/addressbook-config.glade.h:28
# addressbook/gui/component/addressbook-config.glade.h:28
# addressbook/gui/component/addressbook-config.glade.h:37
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
msgid "_Server name:"
msgstr "服务器名(_S):"
# calendar/gui/alarm-notify/alarm-notify.glade.h:3
# calendar/gui/alarm-notify/alarm-notify.glade.h:3
# calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
#, fuzzy
msgid "_Timeout (minutes):"
msgstr "午睡时间(分钟)"
@@ -2111,7 +2170,7 @@ msgstr "午睡时间(分钟)"
# mail/mail-config.c:326
# mail/mail-config.c:329
# mail/mail-config.c:354
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
#, fuzzy
msgid "account-druid"
msgstr "帐号 %d"
@@ -2119,7 +2178,7 @@ msgstr "帐号 %d"
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
#, fuzzy
msgid "account-editor"
msgstr "联系人列表编辑器"
@@ -2127,7 +2186,7 @@ msgstr "联系人列表编辑器"
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
#, fuzzy
msgid "cards"
msgstr "没有卡片"
@@ -2135,32 +2194,32 @@ msgstr "没有卡片"
# mail/mail-ops.c:2089
# mail/mail-ops.c:2091
# mail/mail-ops.c:2134
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
#, fuzzy
msgid "connecting-tab"
msgstr "重新与 %s 连接"
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
msgid "dn-customization-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
msgid "edit_server_window_simple"
msgstr ""
# addressbook/gui/contact-editor/contact-editor.glade.h:16
# addressbook/gui/contact-editor/contact-editor.glade.h:16
# addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
#, fuzzy
msgid "general-tab"
msgstr "常规"
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
msgid "mappings-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
msgid "objectclasses-tab"
msgstr ""
@@ -2170,7 +2229,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:136
+#: addressbook/gui/component/ldap-config.glade.h:138
#, fuzzy
msgid "searching-tab"
msgstr "搜索"
@@ -2200,8 +2259,8 @@ msgstr "地址簿名称选择界面车间"
# composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
#. Fixme: Ditto
#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:698
-#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: addressbook/gui/component/select-names/e-select-names.c:712
+#: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
#: shell/e-shortcuts-view.c:178
msgid "Remove"
@@ -2253,14 +2312,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:520
+#: addressbook/gui/component/select-names/e-select-names.c:514
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:560
+#: addressbook/gui/component/select-names/e-select-names.c:576
#, fuzzy
msgid "Find contact in"
msgstr "发件人含有"
@@ -2400,7 +2459,7 @@ msgstr "部门(_E):"
# addressbook/gui/contact-editor/contact-editor.glade.h:12
# calendar/gui/dialogs/task-editor.c:183
#: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:187
+#: calendar/gui/dialogs/task-editor.c:211
msgid "Details"
msgstr "细节"
@@ -2511,13 +2570,13 @@ msgstr "愿意接收 HTML 邮件(_H)"
# ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
#: addressbook/gui/contact-editor/contact-editor.glade.h:31
#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3763
-#: calendar/gui/e-week-view.c:3570 filter/filter.glade.h:15
-#: mail/folder-browser.c:1744 mail/mail-config.glade.h:151
+#: calendar/gui/dialogs/meeting-page.c:674
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
+#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
+#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
msgid "_Delete"
msgstr "删除(_D)"
@@ -2567,7 +2626,7 @@ msgstr "网页地址(_W):"
# addressbook/gui/contact-editor/fulladdr.glade.h:224
# addressbook/gui/contact-editor/e-contact-editor-address.c:128
# my-evolution/Locations.h:2343
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
#: my-evolution/Locations.h:2341
msgid "United States"
msgstr "美国"
@@ -2575,7 +2634,7 @@ msgstr "美国"
# addressbook/gui/contact-editor/fulladdr.glade.h:2
# addressbook/gui/contact-editor/fulladdr.glade.h:2
# addressbook/gui/contact-editor/e-contact-editor-address.c:129
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
msgid "Afghanistan"
msgstr "阿富汗"
@@ -2583,7 +2642,7 @@ msgstr "阿富汗"
# addressbook/gui/contact-editor/fulladdr.glade.h:3
# addressbook/gui/contact-editor/e-contact-editor-address.c:130
# my-evolution/Locations.h:42
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
#: my-evolution/Locations.h:42
msgid "Albania"
msgstr "阿尔巴尼亚"
@@ -2592,7 +2651,7 @@ msgstr "阿尔巴尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:4
# addressbook/gui/contact-editor/e-contact-editor-address.c:131
# my-evolution/Locations.h:54
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
#: my-evolution/Locations.h:54
msgid "Algeria"
msgstr "阿尔及利亚"
@@ -2600,42 +2659,42 @@ msgstr "阿尔及利亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# addressbook/gui/contact-editor/e-contact-editor-address.c:132
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
msgid "American Samoa"
msgstr "美洲萨摩亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:6
# addressbook/gui/contact-editor/fulladdr.glade.h:6
# addressbook/gui/contact-editor/e-contact-editor-address.c:133
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
msgid "Andorra"
msgstr "安道尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:7
# addressbook/gui/contact-editor/fulladdr.glade.h:7
# addressbook/gui/contact-editor/e-contact-editor-address.c:134
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
msgid "Angola"
msgstr "安哥拉"
# addressbook/gui/contact-editor/fulladdr.glade.h:8
# addressbook/gui/contact-editor/fulladdr.glade.h:8
# addressbook/gui/contact-editor/e-contact-editor-address.c:135
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
msgid "Anguilla"
msgstr "安圭拉"
# addressbook/gui/contact-editor/fulladdr.glade.h:9
# addressbook/gui/contact-editor/fulladdr.glade.h:9
# addressbook/gui/contact-editor/e-contact-editor-address.c:136
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
msgid "Antarctica"
msgstr "南极洲"
# addressbook/gui/contact-editor/fulladdr.glade.h:10
# addressbook/gui/contact-editor/fulladdr.glade.h:10
# addressbook/gui/contact-editor/e-contact-editor-address.c:137
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
msgid "Antigua And Barbuda"
msgstr "安提瓜和巴布达"
@@ -2643,7 +2702,7 @@ msgstr "安提瓜和巴布达"
# addressbook/gui/contact-editor/fulladdr.glade.h:11
# addressbook/gui/contact-editor/e-contact-editor-address.c:138
# my-evolution/Locations.h:120
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
#: my-evolution/Locations.h:120
msgid "Argentina"
msgstr "阿根廷"
@@ -2651,14 +2710,14 @@ msgstr "阿根廷"
# addressbook/gui/contact-editor/fulladdr.glade.h:12
# addressbook/gui/contact-editor/fulladdr.glade.h:12
# addressbook/gui/contact-editor/e-contact-editor-address.c:139
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
msgid "Armenia"
msgstr "亚美尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:13
# addressbook/gui/contact-editor/fulladdr.glade.h:13
# addressbook/gui/contact-editor/e-contact-editor-address.c:140
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
msgid "Aruba"
msgstr "阿鲁巴岛"
@@ -2666,7 +2725,7 @@ msgstr "阿鲁巴岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# addressbook/gui/contact-editor/e-contact-editor-address.c:141
# my-evolution/Locations.h:154
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
#: my-evolution/Locations.h:154
msgid "Australia"
msgstr "澳大利亚"
@@ -2675,7 +2734,7 @@ msgstr "澳大利亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:15
# addressbook/gui/contact-editor/e-contact-editor-address.c:142
# my-evolution/Locations.h:155
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
#: my-evolution/Locations.h:155
msgid "Austria"
msgstr "奥地利"
@@ -2683,7 +2742,7 @@ msgstr "奥地利"
# addressbook/gui/contact-editor/fulladdr.glade.h:16
# addressbook/gui/contact-editor/fulladdr.glade.h:16
# addressbook/gui/contact-editor/e-contact-editor-address.c:143
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
msgid "Azerbaijan"
msgstr "阿塞拜疆"
@@ -2691,7 +2750,7 @@ msgstr "阿塞拜疆"
# addressbook/gui/contact-editor/fulladdr.glade.h:17
# addressbook/gui/contact-editor/e-contact-editor-address.c:144
# my-evolution/Locations.h:161
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
#: my-evolution/Locations.h:161
msgid "Bahamas"
msgstr "巴哈马群岛"
@@ -2700,7 +2759,7 @@ msgstr "巴哈马群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:18
# addressbook/gui/contact-editor/e-contact-editor-address.c:145
# my-evolution/Locations.h:164
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
#: my-evolution/Locations.h:164
msgid "Bahrain"
msgstr "巴林岛"
@@ -2708,21 +2767,21 @@ msgstr "巴林岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:19
# addressbook/gui/contact-editor/fulladdr.glade.h:19
# addressbook/gui/contact-editor/e-contact-editor-address.c:146
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
msgid "Bangladesh"
msgstr "孟加拉国"
# addressbook/gui/contact-editor/fulladdr.glade.h:20
# addressbook/gui/contact-editor/fulladdr.glade.h:20
# addressbook/gui/contact-editor/e-contact-editor-address.c:147
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
msgid "Barbados"
msgstr "巴巴多斯岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:21
# addressbook/gui/contact-editor/fulladdr.glade.h:21
# addressbook/gui/contact-editor/e-contact-editor-address.c:148
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
msgid "Belarus"
msgstr "白俄罗斯"
@@ -2730,7 +2789,7 @@ msgstr "白俄罗斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:22
# addressbook/gui/contact-editor/e-contact-editor-address.c:149
# my-evolution/Locations.h:216
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
#: my-evolution/Locations.h:216
msgid "Belgium"
msgstr "比利时"
@@ -2739,7 +2798,7 @@ msgstr "比利时"
# addressbook/gui/contact-editor/fulladdr.glade.h:23
# addressbook/gui/contact-editor/e-contact-editor-address.c:150
# my-evolution/Locations.h:218
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
#: my-evolution/Locations.h:218
msgid "Belize"
msgstr "伯利兹"
@@ -2747,21 +2806,21 @@ msgstr "伯利兹"
# addressbook/gui/contact-editor/fulladdr.glade.h:24
# addressbook/gui/contact-editor/fulladdr.glade.h:24
# addressbook/gui/contact-editor/e-contact-editor-address.c:151
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
msgid "Benin"
msgstr "贝宁"
# addressbook/gui/contact-editor/fulladdr.glade.h:25
# addressbook/gui/contact-editor/fulladdr.glade.h:25
# addressbook/gui/contact-editor/e-contact-editor-address.c:152
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
msgid "Bermuda"
msgstr "百慕大群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:26
# addressbook/gui/contact-editor/fulladdr.glade.h:26
# addressbook/gui/contact-editor/e-contact-editor-address.c:153
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
msgid "Bhutan"
msgstr "不丹"
@@ -2769,7 +2828,7 @@ msgstr "不丹"
# addressbook/gui/contact-editor/fulladdr.glade.h:27
# addressbook/gui/contact-editor/e-contact-editor-address.c:154
# my-evolution/Locations.h:270
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
#: my-evolution/Locations.h:270
msgid "Bolivia"
msgstr "玻利维亚"
@@ -2777,21 +2836,21 @@ msgstr "玻利维亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:28
# addressbook/gui/contact-editor/fulladdr.glade.h:28
# addressbook/gui/contact-editor/e-contact-editor-address.c:155
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
msgid "Bosnia And Herzegowina"
msgstr "波斯尼亚和黑赛哥维纳"
# addressbook/gui/contact-editor/fulladdr.glade.h:29
# addressbook/gui/contact-editor/fulladdr.glade.h:29
# addressbook/gui/contact-editor/e-contact-editor-address.c:156
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
msgid "Botswana"
msgstr "博茨瓦纳"
# addressbook/gui/contact-editor/fulladdr.glade.h:30
# addressbook/gui/contact-editor/fulladdr.glade.h:30
# addressbook/gui/contact-editor/e-contact-editor-address.c:157
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
msgid "Bouvet Island"
msgstr "布维岛"
@@ -2799,7 +2858,7 @@ msgstr "布维岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:31
# addressbook/gui/contact-editor/e-contact-editor-address.c:158
# my-evolution/Locations.h:294
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
#: my-evolution/Locations.h:294
msgid "Brazil"
msgstr "巴西"
@@ -2807,14 +2866,14 @@ msgstr "巴西"
# addressbook/gui/contact-editor/fulladdr.glade.h:32
# addressbook/gui/contact-editor/fulladdr.glade.h:32
# addressbook/gui/contact-editor/e-contact-editor-address.c:159
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
msgid "British Indian Ocean Territory"
msgstr "英属印度洋地区"
# addressbook/gui/contact-editor/fulladdr.glade.h:34
# addressbook/gui/contact-editor/fulladdr.glade.h:34
# addressbook/gui/contact-editor/e-contact-editor-address.c:160
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
msgid "Brunei Darussalam"
msgstr "文莱 德鲁萨兰"
@@ -2822,7 +2881,7 @@ msgstr "文莱 德鲁萨兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:35
# addressbook/gui/contact-editor/e-contact-editor-address.c:161
# my-evolution/Locations.h:320
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
#: my-evolution/Locations.h:320
msgid "Bulgaria"
msgstr "保加利亚"
@@ -2830,28 +2889,28 @@ msgstr "保加利亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:36
# addressbook/gui/contact-editor/fulladdr.glade.h:36
# addressbook/gui/contact-editor/e-contact-editor-address.c:162
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
msgid "Burkina Faso"
msgstr "布基纳法索"
# addressbook/gui/contact-editor/fulladdr.glade.h:37
# addressbook/gui/contact-editor/fulladdr.glade.h:37
# addressbook/gui/contact-editor/e-contact-editor-address.c:163
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
msgid "Burundi"
msgstr "布隆迪"
# addressbook/gui/contact-editor/fulladdr.glade.h:38
# addressbook/gui/contact-editor/fulladdr.glade.h:38
# addressbook/gui/contact-editor/e-contact-editor-address.c:164
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
msgid "Cambodia"
msgstr "柬埔寨"
# addressbook/gui/contact-editor/fulladdr.glade.h:39
# addressbook/gui/contact-editor/fulladdr.glade.h:39
# addressbook/gui/contact-editor/e-contact-editor-address.c:165
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
msgid "Cameroon"
msgstr "喀麦隆"
@@ -2859,7 +2918,7 @@ msgstr "喀麦隆"
# addressbook/gui/contact-editor/fulladdr.glade.h:40
# addressbook/gui/contact-editor/e-contact-editor-address.c:166
# my-evolution/Locations.h:354
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
#: my-evolution/Locations.h:354
msgid "Canada"
msgstr "加拿大"
@@ -2867,7 +2926,7 @@ msgstr "加拿大"
# addressbook/gui/contact-editor/fulladdr.glade.h:41
# addressbook/gui/contact-editor/fulladdr.glade.h:41
# addressbook/gui/contact-editor/e-contact-editor-address.c:167
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
msgid "Cape Verde"
msgstr "佛得角"
@@ -2875,7 +2934,7 @@ msgstr "佛得角"
# addressbook/gui/contact-editor/fulladdr.glade.h:42
# addressbook/gui/contact-editor/e-contact-editor-address.c:168
# my-evolution/Locations.h:389
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
#: my-evolution/Locations.h:389
msgid "Cayman Islands"
msgstr "开曼群岛"
@@ -2883,14 +2942,14 @@ msgstr "开曼群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:43
# addressbook/gui/contact-editor/fulladdr.glade.h:43
# addressbook/gui/contact-editor/e-contact-editor-address.c:169
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
msgid "Central African Republic"
msgstr "中非共和国"
# addressbook/gui/contact-editor/fulladdr.glade.h:44
# addressbook/gui/contact-editor/fulladdr.glade.h:44
# addressbook/gui/contact-editor/e-contact-editor-address.c:170
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
msgid "Chad"
msgstr "乍得"
@@ -2898,7 +2957,7 @@ msgstr "乍得"
# addressbook/gui/contact-editor/fulladdr.glade.h:46
# addressbook/gui/contact-editor/e-contact-editor-address.c:171
# my-evolution/Locations.h:438
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
#: my-evolution/Locations.h:438
msgid "Chile"
msgstr "智利"
@@ -2906,7 +2965,7 @@ msgstr "智利"
# addressbook/gui/contact-editor/fulladdr.glade.h:47
# addressbook/gui/contact-editor/fulladdr.glade.h:47
# addressbook/gui/contact-editor/e-contact-editor-address.c:172
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
msgid "China"
msgstr "中国"
@@ -2914,7 +2973,7 @@ msgstr "中国"
# addressbook/gui/contact-editor/fulladdr.glade.h:48
# addressbook/gui/contact-editor/e-contact-editor-address.c:173
# my-evolution/Locations.h:451
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
#: my-evolution/Locations.h:451
msgid "Christmas Island"
msgstr "圣诞岛"
@@ -2922,7 +2981,7 @@ msgstr "圣诞岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:49
# addressbook/gui/contact-editor/fulladdr.glade.h:49
# addressbook/gui/contact-editor/e-contact-editor-address.c:174
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
msgid "Cocos (Keeling) Islands"
msgstr "科科斯群岛"
@@ -2930,7 +2989,7 @@ msgstr "科科斯群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:50
# addressbook/gui/contact-editor/e-contact-editor-address.c:175
# my-evolution/Locations.h:483
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
#: my-evolution/Locations.h:483
msgid "Colombia"
msgstr "哥伦比亚"
@@ -2938,7 +2997,7 @@ msgstr "哥伦比亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:51
# addressbook/gui/contact-editor/fulladdr.glade.h:51
# addressbook/gui/contact-editor/e-contact-editor-address.c:176
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
msgid "Comoros"
msgstr "科摩罗群岛"
@@ -2946,15 +3005,15 @@ msgstr "科摩罗群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:52
# addressbook/gui/contact-editor/e-contact-editor-address.c:177
# addressbook/gui/contact-editor/e-contact-editor-address.c:178
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
msgid "Congo"
msgstr "刚果"
# addressbook/gui/contact-editor/fulladdr.glade.h:53
# addressbook/gui/contact-editor/fulladdr.glade.h:53
# addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
msgid "Cook Islands"
msgstr "库克群岛"
@@ -2962,7 +3021,7 @@ msgstr "库克群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:54
# addressbook/gui/contact-editor/e-contact-editor-address.c:180
# my-evolution/Locations.h:517
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
#: my-evolution/Locations.h:517
msgid "Costa Rica"
msgstr "哥斯达黎加"
@@ -2970,7 +3029,7 @@ msgstr "哥斯达黎加"
# addressbook/gui/contact-editor/fulladdr.glade.h:55
# addressbook/gui/contact-editor/fulladdr.glade.h:55
# addressbook/gui/contact-editor/e-contact-editor-address.c:181
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
msgid "Cote d'Ivoire"
msgstr "科特迪瓦"
@@ -2978,7 +3037,7 @@ msgstr "科特迪瓦"
# addressbook/gui/contact-editor/fulladdr.glade.h:57
# addressbook/gui/contact-editor/e-contact-editor-address.c:182
# my-evolution/Locations.h:528
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
#: my-evolution/Locations.h:528
msgid "Croatia"
msgstr "克罗地亚"
@@ -2987,7 +3046,7 @@ msgstr "克罗地亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:58
# addressbook/gui/contact-editor/e-contact-editor-address.c:183
# my-evolution/Locations.h:532
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
#: my-evolution/Locations.h:532
msgid "Cuba"
msgstr "古巴"
@@ -2996,7 +3055,7 @@ msgstr "古巴"
# addressbook/gui/contact-editor/fulladdr.glade.h:59
# addressbook/gui/contact-editor/e-contact-editor-address.c:184
# my-evolution/Locations.h:545
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
#: my-evolution/Locations.h:545
msgid "Cyprus"
msgstr "塞浦路斯"
@@ -3005,7 +3064,7 @@ msgstr "塞浦路斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:60
# addressbook/gui/contact-editor/e-contact-editor-address.c:185
# my-evolution/Locations.h:546
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
#: my-evolution/Locations.h:546
msgid "Czech Republic"
msgstr "捷克共和国"
@@ -3014,7 +3073,7 @@ msgstr "捷克共和国"
# addressbook/gui/contact-editor/fulladdr.glade.h:61
# addressbook/gui/contact-editor/e-contact-editor-address.c:186
# my-evolution/Locations.h:580
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
#: my-evolution/Locations.h:580
msgid "Denmark"
msgstr "丹麦"
@@ -3022,14 +3081,14 @@ msgstr "丹麦"
# addressbook/gui/contact-editor/fulladdr.glade.h:62
# addressbook/gui/contact-editor/fulladdr.glade.h:62
# addressbook/gui/contact-editor/e-contact-editor-address.c:187
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
msgid "Djibouti"
msgstr "吉布提群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:63
# addressbook/gui/contact-editor/fulladdr.glade.h:63
# addressbook/gui/contact-editor/e-contact-editor-address.c:188
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
msgid "Dominica"
msgstr "多米尼加"
@@ -3037,7 +3096,7 @@ msgstr "多米尼加"
# addressbook/gui/contact-editor/fulladdr.glade.h:64
# addressbook/gui/contact-editor/e-contact-editor-address.c:189
# my-evolution/Locations.h:608
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
#: my-evolution/Locations.h:608
msgid "Dominican Republic"
msgstr "多米尼加共和国"
@@ -3045,7 +3104,7 @@ msgstr "多米尼加共和国"
# addressbook/gui/contact-editor/fulladdr.glade.h:65
# addressbook/gui/contact-editor/fulladdr.glade.h:65
# addressbook/gui/contact-editor/e-contact-editor-address.c:190
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
msgid "East Timor"
msgstr "东帝汶"
@@ -3053,7 +3112,7 @@ msgstr "东帝汶"
# addressbook/gui/contact-editor/fulladdr.glade.h:66
# addressbook/gui/contact-editor/e-contact-editor-address.c:191
# my-evolution/Locations.h:641
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
#: my-evolution/Locations.h:641
msgid "Ecuador"
msgstr "厄瓜多尔"
@@ -3062,7 +3121,7 @@ msgstr "厄瓜多尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:67
# addressbook/gui/contact-editor/e-contact-editor-address.c:192
# my-evolution/Locations.h:650
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
#: my-evolution/Locations.h:650
msgid "Egypt"
msgstr "埃及"
@@ -3071,7 +3130,7 @@ msgstr "埃及"
# addressbook/gui/contact-editor/fulladdr.glade.h:68
# addressbook/gui/contact-editor/e-contact-editor-address.c:193
# my-evolution/Locations.h:666
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
#: my-evolution/Locations.h:666
msgid "El Salvador"
msgstr "萨尔瓦多"
@@ -3079,14 +3138,14 @@ msgstr "萨尔瓦多"
# addressbook/gui/contact-editor/fulladdr.glade.h:69
# addressbook/gui/contact-editor/fulladdr.glade.h:69
# addressbook/gui/contact-editor/e-contact-editor-address.c:194
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
msgid "Equatorial Guinea"
msgstr "赤道几内亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:70
# addressbook/gui/contact-editor/fulladdr.glade.h:70
# addressbook/gui/contact-editor/e-contact-editor-address.c:195
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
msgid "Eritrea"
msgstr "厄立特里亚"
@@ -3094,7 +3153,7 @@ msgstr "厄立特里亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:71
# addressbook/gui/contact-editor/e-contact-editor-address.c:196
# my-evolution/Locations.h:684
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
#: my-evolution/Locations.h:684
msgid "Estonia"
msgstr "爱沙尼亚"
@@ -3102,28 +3161,28 @@ msgstr "爱沙尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:72
# addressbook/gui/contact-editor/fulladdr.glade.h:72
# addressbook/gui/contact-editor/e-contact-editor-address.c:197
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
msgid "Ethiopia"
msgstr "埃塞俄比亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:73
# addressbook/gui/contact-editor/fulladdr.glade.h:73
# addressbook/gui/contact-editor/e-contact-editor-address.c:198
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
msgid "Falkland Islands"
msgstr "福克兰群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:74
# addressbook/gui/contact-editor/fulladdr.glade.h:74
# addressbook/gui/contact-editor/e-contact-editor-address.c:199
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
msgid "Faroe Islands"
msgstr "法罗群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:75
# addressbook/gui/contact-editor/fulladdr.glade.h:75
# addressbook/gui/contact-editor/e-contact-editor-address.c:200
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
msgid "Fiji"
msgstr "斐济"
@@ -3131,7 +3190,7 @@ msgstr "斐济"
# addressbook/gui/contact-editor/fulladdr.glade.h:76
# addressbook/gui/contact-editor/e-contact-editor-address.c:201
# my-evolution/Locations.h:716
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
#: my-evolution/Locations.h:716
msgid "Finland"
msgstr "芬兰"
@@ -3140,7 +3199,7 @@ msgstr "芬兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:77
# addressbook/gui/contact-editor/e-contact-editor-address.c:202
# my-evolution/Locations.h:766
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
#: my-evolution/Locations.h:766
msgid "France"
msgstr "法国"
@@ -3148,35 +3207,35 @@ msgstr "法国"
# addressbook/gui/contact-editor/fulladdr.glade.h:78
# addressbook/gui/contact-editor/fulladdr.glade.h:78
# addressbook/gui/contact-editor/e-contact-editor-address.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
msgid "French Guiana"
msgstr "法属圭亚那"
# addressbook/gui/contact-editor/fulladdr.glade.h:79
# addressbook/gui/contact-editor/fulladdr.glade.h:79
# addressbook/gui/contact-editor/e-contact-editor-address.c:204
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
msgid "French Polynesia"
msgstr "法属波利尼西亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:80
# addressbook/gui/contact-editor/fulladdr.glade.h:80
# addressbook/gui/contact-editor/e-contact-editor-address.c:205
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
msgid "French Southern Territories"
msgstr "法属南部地区"
# addressbook/gui/contact-editor/fulladdr.glade.h:81
# addressbook/gui/contact-editor/fulladdr.glade.h:81
# addressbook/gui/contact-editor/e-contact-editor-address.c:206
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
msgid "Gabon"
msgstr "加蓬"
# addressbook/gui/contact-editor/fulladdr.glade.h:82
# addressbook/gui/contact-editor/fulladdr.glade.h:82
# addressbook/gui/contact-editor/e-contact-editor-address.c:207
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
msgid "Gambia"
msgstr "冈比亚"
@@ -3184,7 +3243,7 @@ msgstr "冈比亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:83
# addressbook/gui/contact-editor/e-contact-editor-address.c:208
# my-evolution/Locations.h:811
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
#: my-evolution/Locations.h:811
msgid "Georgia"
msgstr "格鲁吉亚"
@@ -3193,7 +3252,7 @@ msgstr "格鲁吉亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:84
# addressbook/gui/contact-editor/e-contact-editor-address.c:209
# my-evolution/Locations.h:812
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
#: my-evolution/Locations.h:812
msgid "Germany"
msgstr "德国"
@@ -3201,7 +3260,7 @@ msgstr "德国"
# addressbook/gui/contact-editor/fulladdr.glade.h:85
# addressbook/gui/contact-editor/fulladdr.glade.h:85
# addressbook/gui/contact-editor/e-contact-editor-address.c:210
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
msgid "Ghana"
msgstr "加纳"
@@ -3209,7 +3268,7 @@ msgstr "加纳"
# addressbook/gui/contact-editor/fulladdr.glade.h:86
# addressbook/gui/contact-editor/e-contact-editor-address.c:211
# my-evolution/Locations.h:815
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
#: my-evolution/Locations.h:815
msgid "Gibraltar"
msgstr "直布罗陀"
@@ -3218,7 +3277,7 @@ msgstr "直布罗陀"
# addressbook/gui/contact-editor/fulladdr.glade.h:87
# addressbook/gui/contact-editor/e-contact-editor-address.c:212
# my-evolution/Locations.h:846
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
#: my-evolution/Locations.h:846
msgid "Greece"
msgstr "希腊"
@@ -3226,28 +3285,28 @@ msgstr "希腊"
# addressbook/gui/contact-editor/fulladdr.glade.h:88
# addressbook/gui/contact-editor/fulladdr.glade.h:88
# addressbook/gui/contact-editor/e-contact-editor-address.c:213
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
msgid "Greenland"
msgstr "格陵兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:89
# addressbook/gui/contact-editor/fulladdr.glade.h:89
# addressbook/gui/contact-editor/e-contact-editor-address.c:214
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
msgid "Grenada"
msgstr "格林纳达"
# addressbook/gui/contact-editor/fulladdr.glade.h:90
# addressbook/gui/contact-editor/fulladdr.glade.h:90
# addressbook/gui/contact-editor/e-contact-editor-address.c:215
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
msgid "Guadeloupe"
msgstr "瓜德罗普岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:91
# addressbook/gui/contact-editor/fulladdr.glade.h:91
# addressbook/gui/contact-editor/e-contact-editor-address.c:216
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
msgid "Guam"
msgstr "关岛"
@@ -3255,7 +3314,7 @@ msgstr "关岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:92
# addressbook/gui/contact-editor/e-contact-editor-address.c:217
# my-evolution/Locations.h:867
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
#: my-evolution/Locations.h:867
msgid "Guatemala"
msgstr "危地马拉"
@@ -3263,21 +3322,21 @@ msgstr "危地马拉"
# addressbook/gui/contact-editor/fulladdr.glade.h:93
# addressbook/gui/contact-editor/fulladdr.glade.h:93
# addressbook/gui/contact-editor/e-contact-editor-address.c:218
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
msgid "Guinea"
msgstr "几内亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:94
# addressbook/gui/contact-editor/fulladdr.glade.h:94
# addressbook/gui/contact-editor/e-contact-editor-address.c:219
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
msgid "Guinea-bissau"
msgstr "几内亚比绍"
# addressbook/gui/contact-editor/fulladdr.glade.h:95
# addressbook/gui/contact-editor/fulladdr.glade.h:95
# addressbook/gui/contact-editor/e-contact-editor-address.c:220
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
msgid "Guyana"
msgstr "圭亚那"
@@ -3285,7 +3344,7 @@ msgstr "圭亚那"
# addressbook/gui/contact-editor/fulladdr.glade.h:96
# addressbook/gui/contact-editor/e-contact-editor-address.c:221
# my-evolution/Locations.h:888
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
#: my-evolution/Locations.h:888
msgid "Haiti"
msgstr "海地"
@@ -3293,14 +3352,14 @@ msgstr "海地"
# addressbook/gui/contact-editor/fulladdr.glade.h:97
# addressbook/gui/contact-editor/fulladdr.glade.h:97
# addressbook/gui/contact-editor/e-contact-editor-address.c:222
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
msgid "Heard And McDonald Islands"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:98
# addressbook/gui/contact-editor/fulladdr.glade.h:98
# addressbook/gui/contact-editor/e-contact-editor-address.c:223
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
msgid "Holy See"
msgstr "圣座"
@@ -3308,7 +3367,7 @@ msgstr "圣座"
# addressbook/gui/contact-editor/fulladdr.glade.h:99
# addressbook/gui/contact-editor/e-contact-editor-address.c:224
# my-evolution/Locations.h:945
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
#: my-evolution/Locations.h:945
msgid "Honduras"
msgstr "洪都拉斯"
@@ -3317,7 +3376,7 @@ msgstr "洪都拉斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:100
# addressbook/gui/contact-editor/e-contact-editor-address.c:225
# my-evolution/Locations.h:946
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
#: my-evolution/Locations.h:946
msgid "Hong Kong"
msgstr "香港"
@@ -3326,7 +3385,7 @@ msgstr "香港"
# addressbook/gui/contact-editor/fulladdr.glade.h:101
# addressbook/gui/contact-editor/e-contact-editor-address.c:226
# my-evolution/Locations.h:966
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
#: my-evolution/Locations.h:966
msgid "Hungary"
msgstr "匈牙利"
@@ -3335,7 +3394,7 @@ msgstr "匈牙利"
# addressbook/gui/contact-editor/fulladdr.glade.h:102
# addressbook/gui/contact-editor/e-contact-editor-address.c:227
# my-evolution/Locations.h:978
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
#: my-evolution/Locations.h:978
msgid "Iceland"
msgstr "冰岛"
@@ -3344,7 +3403,7 @@ msgstr "冰岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:103
# addressbook/gui/contact-editor/e-contact-editor-address.c:228
# my-evolution/Locations.h:991
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
#: my-evolution/Locations.h:991
msgid "India"
msgstr "印度"
@@ -3352,7 +3411,7 @@ msgstr "印度"
# addressbook/gui/contact-editor/fulladdr.glade.h:104
# addressbook/gui/contact-editor/fulladdr.glade.h:104
# addressbook/gui/contact-editor/e-contact-editor-address.c:229
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
msgid "Indonesia"
msgstr "印度尼西亚"
@@ -3360,7 +3419,7 @@ msgstr "印度尼西亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# addressbook/gui/contact-editor/e-contact-editor-address.c:230
# my-evolution/Locations.h:1007
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
#: my-evolution/Locations.h:1007
msgid "Ireland"
msgstr "爱尔兰"
@@ -3368,7 +3427,7 @@ msgstr "爱尔兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:106
# addressbook/gui/contact-editor/fulladdr.glade.h:106
# addressbook/gui/contact-editor/e-contact-editor-address.c:231
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
msgid "Israel"
msgstr "以色列"
@@ -3376,7 +3435,7 @@ msgstr "以色列"
# addressbook/gui/contact-editor/fulladdr.glade.h:107
# addressbook/gui/contact-editor/e-contact-editor-address.c:232
# my-evolution/Locations.h:1016
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
#: my-evolution/Locations.h:1016
msgid "Italy"
msgstr "意大利"
@@ -3385,7 +3444,7 @@ msgstr "意大利"
# addressbook/gui/contact-editor/fulladdr.glade.h:108
# addressbook/gui/contact-editor/e-contact-editor-address.c:233
# my-evolution/Locations.h:1031
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
#: my-evolution/Locations.h:1031
msgid "Jamaica"
msgstr "牙买加"
@@ -3394,7 +3453,7 @@ msgstr "牙买加"
# addressbook/gui/contact-editor/fulladdr.glade.h:109
# addressbook/gui/contact-editor/e-contact-editor-address.c:234
# my-evolution/Locations.h:1035
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
#: my-evolution/Locations.h:1035
msgid "Japan"
msgstr "日本"
@@ -3403,7 +3462,7 @@ msgstr "日本"
# addressbook/gui/contact-editor/fulladdr.glade.h:110
# addressbook/gui/contact-editor/e-contact-editor-address.c:235
# my-evolution/Locations.h:1046
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
#: my-evolution/Locations.h:1046
msgid "Jordan"
msgstr "约旦"
@@ -3411,28 +3470,28 @@ msgstr "约旦"
# addressbook/gui/contact-editor/fulladdr.glade.h:111
# addressbook/gui/contact-editor/fulladdr.glade.h:111
# addressbook/gui/contact-editor/e-contact-editor-address.c:236
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
msgid "Kazakhstan"
msgstr "哈萨克斯坦"
# addressbook/gui/contact-editor/fulladdr.glade.h:112
# addressbook/gui/contact-editor/fulladdr.glade.h:112
# addressbook/gui/contact-editor/e-contact-editor-address.c:237
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
msgid "Kenya"
msgstr "肯尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:113
# addressbook/gui/contact-editor/fulladdr.glade.h:113
# addressbook/gui/contact-editor/e-contact-editor-address.c:238
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
msgid "Kiribati"
msgstr "基里巴斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:60
# addressbook/gui/contact-editor/fulladdr.glade.h:60
# addressbook/gui/contact-editor/e-contact-editor-address.c:239
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
msgid "Korea, Republic Of"
msgstr "大韩民国"
@@ -3440,7 +3499,7 @@ msgstr "大韩民国"
# addressbook/gui/contact-editor/fulladdr.glade.h:114
# addressbook/gui/contact-editor/e-contact-editor-address.c:240
# my-evolution/Locations.h:1146
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
#: my-evolution/Locations.h:1146
msgid "Kuwait"
msgstr "科威特"
@@ -3448,14 +3507,14 @@ msgstr "科威特"
# addressbook/gui/contact-editor/fulladdr.glade.h:115
# addressbook/gui/contact-editor/fulladdr.glade.h:115
# addressbook/gui/contact-editor/e-contact-editor-address.c:241
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
msgid "Kyrgyzstan"
msgstr "吉尔吉斯斯坦"
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# addressbook/gui/contact-editor/e-contact-editor-address.c:242
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
msgid "Laos"
msgstr "老挝"
@@ -3463,7 +3522,7 @@ msgstr "老挝"
# addressbook/gui/contact-editor/fulladdr.glade.h:117
# addressbook/gui/contact-editor/e-contact-editor-address.c:243
# my-evolution/Locations.h:1190
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
msgid "Latvia"
msgstr "拉脱维亚"
@@ -3471,7 +3530,7 @@ msgstr "拉脱维亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:118
# addressbook/gui/contact-editor/e-contact-editor-address.c:244
# my-evolution/Locations.h:1198
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
#: my-evolution/Locations.h:1197
msgid "Lebanon"
msgstr "黎巴嫩"
@@ -3479,7 +3538,7 @@ msgstr "黎巴嫩"
# addressbook/gui/contact-editor/fulladdr.glade.h:119
# addressbook/gui/contact-editor/fulladdr.glade.h:119
# addressbook/gui/contact-editor/e-contact-editor-address.c:245
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
msgid "Lesotho"
msgstr "莱索托"
@@ -3487,7 +3546,7 @@ msgstr "莱索托"
# addressbook/gui/contact-editor/fulladdr.glade.h:120
# addressbook/gui/contact-editor/e-contact-editor-address.c:246
# my-evolution/Locations.h:1218
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
#: my-evolution/Locations.h:1217
msgid "Liberia"
msgstr "利比里亚"
@@ -3495,7 +3554,7 @@ msgstr "利比里亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:121
# addressbook/gui/contact-editor/fulladdr.glade.h:121
# addressbook/gui/contact-editor/e-contact-editor-address.c:247
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
msgid "Liechtenstein"
msgstr "列支敦士登"
@@ -3503,7 +3562,7 @@ msgstr "列支敦士登"
# addressbook/gui/contact-editor/fulladdr.glade.h:122
# addressbook/gui/contact-editor/e-contact-editor-address.c:248
# my-evolution/Locations.h:1234
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
#: my-evolution/Locations.h:1233
msgid "Lithuania"
msgstr "立陶宛"
@@ -3512,7 +3571,7 @@ msgstr "立陶宛"
# addressbook/gui/contact-editor/fulladdr.glade.h:123
# addressbook/gui/contact-editor/e-contact-editor-address.c:249
# my-evolution/Locations.h:1268
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
#: my-evolution/Locations.h:1267
msgid "Luxembourg"
msgstr "卢森堡"
@@ -3520,49 +3579,49 @@ msgstr "卢森堡"
# addressbook/gui/contact-editor/fulladdr.glade.h:124
# addressbook/gui/contact-editor/fulladdr.glade.h:124
# addressbook/gui/contact-editor/e-contact-editor-address.c:250
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
msgid "Macau"
msgstr "澳门"
# addressbook/gui/contact-editor/fulladdr.glade.h:125
# addressbook/gui/contact-editor/fulladdr.glade.h:125
# addressbook/gui/contact-editor/e-contact-editor-address.c:251
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
msgid "Macedonia"
msgstr "马其顿"
# addressbook/gui/contact-editor/fulladdr.glade.h:126
# addressbook/gui/contact-editor/fulladdr.glade.h:126
# addressbook/gui/contact-editor/e-contact-editor-address.c:252
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
msgid "Madagascar"
msgstr "马达加斯加"
# addressbook/gui/contact-editor/fulladdr.glade.h:127
# addressbook/gui/contact-editor/fulladdr.glade.h:127
# addressbook/gui/contact-editor/e-contact-editor-address.c:253
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
msgid "Malawi"
msgstr "马拉维"
# addressbook/gui/contact-editor/fulladdr.glade.h:128
# addressbook/gui/contact-editor/fulladdr.glade.h:128
# addressbook/gui/contact-editor/e-contact-editor-address.c:254
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
msgid "Malaysia"
msgstr "马来西亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:129
# addressbook/gui/contact-editor/fulladdr.glade.h:129
# addressbook/gui/contact-editor/e-contact-editor-address.c:255
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
msgid "Maldives"
msgstr "马尔代夫"
# addressbook/gui/contact-editor/fulladdr.glade.h:130
# addressbook/gui/contact-editor/fulladdr.glade.h:130
# addressbook/gui/contact-editor/e-contact-editor-address.c:256
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
msgid "Mali"
msgstr "马里"
@@ -3570,7 +3629,7 @@ msgstr "马里"
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# addressbook/gui/contact-editor/e-contact-editor-address.c:257
# my-evolution/Locations.h:1297
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
#: my-evolution/Locations.h:1296
msgid "Malta"
msgstr "马耳他"
@@ -3578,35 +3637,35 @@ msgstr "马耳他"
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# addressbook/gui/contact-editor/e-contact-editor-address.c:258
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
msgid "Marshall Islands"
msgstr "马绍尔群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:133
# addressbook/gui/contact-editor/fulladdr.glade.h:133
# addressbook/gui/contact-editor/e-contact-editor-address.c:259
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
msgid "Martinique"
msgstr "马提尼可岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# addressbook/gui/contact-editor/e-contact-editor-address.c:260
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
msgid "Mauritania"
msgstr "毛里塔尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:135
# addressbook/gui/contact-editor/fulladdr.glade.h:135
# addressbook/gui/contact-editor/e-contact-editor-address.c:261
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
msgid "Mauritius"
msgstr "毛里求斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:136
# addressbook/gui/contact-editor/fulladdr.glade.h:136
# addressbook/gui/contact-editor/e-contact-editor-address.c:262
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
msgid "Mayotte"
msgstr "马约特岛"
@@ -3614,7 +3673,7 @@ msgstr "马约特岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:137
# addressbook/gui/contact-editor/e-contact-editor-address.c:263
# my-evolution/Locations.h:1387
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
#: my-evolution/Locations.h:1386
msgid "Mexico"
msgstr "墨西哥"
@@ -3622,35 +3681,35 @@ 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
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
msgid "Micronesia"
msgstr "密克罗尼西亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:60
# addressbook/gui/contact-editor/fulladdr.glade.h:60
# addressbook/gui/contact-editor/e-contact-editor-address.c:265
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
msgid "Moldova, Republic Of"
msgstr "摩尔多瓦共和国"
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# addressbook/gui/contact-editor/e-contact-editor-address.c:266
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
msgid "Monaco"
msgstr "摩纳哥"
# addressbook/gui/contact-editor/fulladdr.glade.h:140
# addressbook/gui/contact-editor/fulladdr.glade.h:140
# addressbook/gui/contact-editor/e-contact-editor-address.c:267
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
msgid "Mongolia"
msgstr "蒙古"
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# addressbook/gui/contact-editor/e-contact-editor-address.c:268
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
msgid "Montserrat"
msgstr "蒙特塞拉特群岛"
@@ -3658,7 +3717,7 @@ msgstr "蒙特塞拉特群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:142
# addressbook/gui/contact-editor/e-contact-editor-address.c:269
# my-evolution/Locations.h:1470
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
#: my-evolution/Locations.h:1469
msgid "Morocco"
msgstr "摩洛哥"
@@ -3666,35 +3725,35 @@ msgstr "摩洛哥"
# addressbook/gui/contact-editor/fulladdr.glade.h:143
# addressbook/gui/contact-editor/fulladdr.glade.h:143
# addressbook/gui/contact-editor/e-contact-editor-address.c:270
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
msgid "Mozambique"
msgstr "莫桑比克"
# addressbook/gui/contact-editor/fulladdr.glade.h:144
# addressbook/gui/contact-editor/fulladdr.glade.h:144
# addressbook/gui/contact-editor/e-contact-editor-address.c:271
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
msgid "Myanmar"
msgstr "缅甸"
# addressbook/gui/contact-editor/fulladdr.glade.h:145
# addressbook/gui/contact-editor/fulladdr.glade.h:145
# addressbook/gui/contact-editor/e-contact-editor-address.c:272
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
msgid "Namibia"
msgstr "纳米比亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:146
# addressbook/gui/contact-editor/fulladdr.glade.h:146
# addressbook/gui/contact-editor/e-contact-editor-address.c:273
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
msgid "Nauru"
msgstr "瑙鲁"
# addressbook/gui/contact-editor/fulladdr.glade.h:147
# addressbook/gui/contact-editor/fulladdr.glade.h:147
# addressbook/gui/contact-editor/e-contact-editor-address.c:274
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
msgid "Nepal"
msgstr "尼泊尔"
@@ -3702,7 +3761,7 @@ msgstr "尼泊尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:148
# addressbook/gui/contact-editor/e-contact-editor-address.c:275
# my-evolution/Locations.h:1531
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
#: my-evolution/Locations.h:1530
msgid "Netherlands"
msgstr "荷兰"
@@ -3710,14 +3769,14 @@ msgstr "荷兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:149
# addressbook/gui/contact-editor/fulladdr.glade.h:149
# addressbook/gui/contact-editor/e-contact-editor-address.c:276
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
msgid "Netherlands Antilles"
msgstr "荷属安的列斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:150
# addressbook/gui/contact-editor/fulladdr.glade.h:150
# addressbook/gui/contact-editor/e-contact-editor-address.c:277
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
msgid "New Caledonia"
msgstr "新喀里多尼亚"
@@ -3725,7 +3784,7 @@ msgstr "新喀里多尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:151
# addressbook/gui/contact-editor/e-contact-editor-address.c:278
# my-evolution/Locations.h:1560
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
#: my-evolution/Locations.h:1559
msgid "New Zealand"
msgstr "新西兰"
@@ -3734,7 +3793,7 @@ msgstr "新西兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:152
# addressbook/gui/contact-editor/e-contact-editor-address.c:279
# my-evolution/Locations.h:1562
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
#: my-evolution/Locations.h:1561
msgid "Nicaragua"
msgstr "尼加拉瓜"
@@ -3742,21 +3801,21 @@ msgstr "尼加拉瓜"
# addressbook/gui/contact-editor/fulladdr.glade.h:153
# addressbook/gui/contact-editor/fulladdr.glade.h:153
# addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
msgid "Niger"
msgstr "尼日尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:154
# addressbook/gui/contact-editor/fulladdr.glade.h:154
# addressbook/gui/contact-editor/e-contact-editor-address.c:281
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
msgid "Nigeria"
msgstr "尼日利亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:155
# addressbook/gui/contact-editor/fulladdr.glade.h:155
# addressbook/gui/contact-editor/e-contact-editor-address.c:282
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
msgid "Niue"
msgstr "纽埃岛"
@@ -3764,7 +3823,7 @@ msgstr "纽埃岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:156
# addressbook/gui/contact-editor/e-contact-editor-address.c:283
# my-evolution/Locations.h:1574
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
#: my-evolution/Locations.h:1573
msgid "Norfolk Island"
msgstr "诺福克岛"
@@ -3772,7 +3831,7 @@ msgstr "诺福克岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:157
# addressbook/gui/contact-editor/fulladdr.glade.h:157
# addressbook/gui/contact-editor/e-contact-editor-address.c:284
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
msgid "Northern Mariana Islands"
msgstr "北马里亚那群岛"
@@ -3780,7 +3839,7 @@ msgstr "北马里亚那群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# addressbook/gui/contact-editor/e-contact-editor-address.c:285
# my-evolution/Locations.h:1587
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
#: my-evolution/Locations.h:1586
msgid "Norway"
msgstr "挪威"
@@ -3789,7 +3848,7 @@ msgstr "挪威"
# addressbook/gui/contact-editor/fulladdr.glade.h:159
# addressbook/gui/contact-editor/e-contact-editor-address.c:286
# my-evolution/Locations.h:1632
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
#: my-evolution/Locations.h:1631
msgid "Oman"
msgstr "阿曼"
@@ -3798,7 +3857,7 @@ msgstr "阿曼"
# addressbook/gui/contact-editor/fulladdr.glade.h:160
# addressbook/gui/contact-editor/e-contact-editor-address.c:287
# my-evolution/Locations.h:1673
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
#: my-evolution/Locations.h:1672
msgid "Pakistan"
msgstr "巴基斯坦"
@@ -3806,14 +3865,14 @@ msgstr "巴基斯坦"
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
msgid "Palau"
msgstr "帕劳群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:162
# addressbook/gui/contact-editor/fulladdr.glade.h:162
# addressbook/gui/contact-editor/e-contact-editor-address.c:289
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
msgid "Palestinian Territory"
msgstr "巴勒斯坦地区"
@@ -3821,7 +3880,7 @@ msgstr "巴勒斯坦地区"
# addressbook/gui/contact-editor/fulladdr.glade.h:163
# addressbook/gui/contact-editor/e-contact-editor-address.c:290
# my-evolution/Locations.h:1683
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
#: my-evolution/Locations.h:1682
msgid "Panama"
msgstr "巴拿马"
@@ -3829,7 +3888,7 @@ msgstr "巴拿马"
# addressbook/gui/contact-editor/fulladdr.glade.h:164
# addressbook/gui/contact-editor/fulladdr.glade.h:164
# addressbook/gui/contact-editor/e-contact-editor-address.c:291
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
msgid "Papua New Guinea"
msgstr "巴布亚新几内亚"
@@ -3837,7 +3896,7 @@ msgstr "巴布亚新几内亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:165
# addressbook/gui/contact-editor/e-contact-editor-address.c:292
# my-evolution/Locations.h:1688
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
#: my-evolution/Locations.h:1687
msgid "Paraguay"
msgstr "巴拉圭"
@@ -3846,7 +3905,7 @@ msgstr "巴拉圭"
# addressbook/gui/contact-editor/fulladdr.glade.h:166
# addressbook/gui/contact-editor/e-contact-editor-address.c:293
# my-evolution/Locations.h:1723
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
#: my-evolution/Locations.h:1722
msgid "Peru"
msgstr "秘鲁"
@@ -3854,14 +3913,14 @@ msgstr "秘鲁"
# addressbook/gui/contact-editor/fulladdr.glade.h:167
# addressbook/gui/contact-editor/fulladdr.glade.h:167
# addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
msgid "Philippines"
msgstr "菲利宾"
# addressbook/gui/contact-editor/fulladdr.glade.h:168
# addressbook/gui/contact-editor/fulladdr.glade.h:168
# addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
msgid "Pitcairn"
msgstr "皮特克恩岛"
@@ -3869,7 +3928,7 @@ msgstr "皮特克恩岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/e-contact-editor-address.c:296
# my-evolution/Locations.h:1764
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
#: my-evolution/Locations.h:1763
msgid "Poland"
msgstr "波兰"
@@ -3878,7 +3937,7 @@ msgstr "波兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:170
# addressbook/gui/contact-editor/e-contact-editor-address.c:297
# my-evolution/Locations.h:1791
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
#: my-evolution/Locations.h:1790
msgid "Portugal"
msgstr "葡萄牙"
@@ -3887,7 +3946,7 @@ msgstr "葡萄牙"
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# addressbook/gui/contact-editor/e-contact-editor-address.c:298
# my-evolution/Locations.h:1824
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
#: my-evolution/Locations.h:1823
msgid "Puerto Rico"
msgstr "波多黎各"
@@ -3896,7 +3955,7 @@ msgstr "波多黎各"
# addressbook/gui/contact-editor/fulladdr.glade.h:172
# addressbook/gui/contact-editor/e-contact-editor-address.c:299
# my-evolution/Locations.h:1836
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
#: my-evolution/Locations.h:1835
msgid "Qatar"
msgstr "卡塔尔"
@@ -3904,7 +3963,7 @@ msgstr "卡塔尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:175
# addressbook/gui/contact-editor/fulladdr.glade.h:175
# addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
msgid "Reunion"
msgstr "留尼汪"
@@ -3912,7 +3971,7 @@ msgstr "留尼汪"
# addressbook/gui/contact-editor/fulladdr.glade.h:176
# addressbook/gui/contact-editor/e-contact-editor-address.c:301
# my-evolution/Locations.h:1912
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
#: my-evolution/Locations.h:1910
msgid "Romania"
msgstr "罗马尼亚"
@@ -3920,56 +3979,56 @@ msgstr "罗马尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:177
# addressbook/gui/contact-editor/fulladdr.glade.h:177
# addressbook/gui/contact-editor/e-contact-editor-address.c:302
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
msgid "Russian Federation"
msgstr "俄罗斯联邦"
# addressbook/gui/contact-editor/fulladdr.glade.h:178
# addressbook/gui/contact-editor/fulladdr.glade.h:178
# addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
msgid "Rwanda"
msgstr "卢旺达"
# addressbook/gui/contact-editor/fulladdr.glade.h:179
# addressbook/gui/contact-editor/fulladdr.glade.h:179
# addressbook/gui/contact-editor/e-contact-editor-address.c:304
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
msgid "Saint Kitts And Nevis"
msgstr "圣基德和吉维斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# addressbook/gui/contact-editor/e-contact-editor-address.c:305
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
msgid "Saint Lucia"
msgstr "圣卢西亚岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:181
# addressbook/gui/contact-editor/fulladdr.glade.h:181
# addressbook/gui/contact-editor/e-contact-editor-address.c:306
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
msgid "Saint Vincent And The Grena-dines"
msgstr "圣文森特和格林纳达"
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# addressbook/gui/contact-editor/e-contact-editor-address.c:307
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
msgid "Samoa"
msgstr "萨摩亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/e-contact-editor-address.c:308
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
msgid "San Marino"
msgstr "圣马力诺"
# addressbook/gui/contact-editor/fulladdr.glade.h:184
# addressbook/gui/contact-editor/fulladdr.glade.h:184
# addressbook/gui/contact-editor/e-contact-editor-address.c:309
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
msgid "Sao Tome And Principe"
msgstr "圣多美和普林西比"
@@ -3977,7 +4036,7 @@ msgstr "圣多美和普林西比"
# addressbook/gui/contact-editor/fulladdr.glade.h:185
# addressbook/gui/contact-editor/e-contact-editor-address.c:310
# my-evolution/Locations.h:2035
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
#: my-evolution/Locations.h:2033
msgid "Saudi Arabia"
msgstr "沙特阿拉伯"
@@ -3985,21 +4044,21 @@ msgstr "沙特阿拉伯"
# addressbook/gui/contact-editor/fulladdr.glade.h:186
# addressbook/gui/contact-editor/fulladdr.glade.h:186
# addressbook/gui/contact-editor/e-contact-editor-address.c:311
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
msgid "Senegal"
msgstr "塞内加尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:187
# addressbook/gui/contact-editor/fulladdr.glade.h:187
# addressbook/gui/contact-editor/e-contact-editor-address.c:312
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
msgid "Seychelles"
msgstr "塞舌尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:188
# addressbook/gui/contact-editor/fulladdr.glade.h:188
# addressbook/gui/contact-editor/e-contact-editor-address.c:313
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
msgid "Sierra Leone"
msgstr "塞拉利昂"
@@ -4007,7 +4066,7 @@ msgstr "塞拉利昂"
# addressbook/gui/contact-editor/fulladdr.glade.h:189
# addressbook/gui/contact-editor/e-contact-editor-address.c:314
# my-evolution/Locations.h:2090
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
#: my-evolution/Locations.h:2088
msgid "Singapore"
msgstr "新加坡"
@@ -4016,7 +4075,7 @@ msgstr "新加坡"
# addressbook/gui/contact-editor/fulladdr.glade.h:190
# addressbook/gui/contact-editor/e-contact-editor-address.c:315
# my-evolution/Locations.h:2103
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
#: my-evolution/Locations.h:2101
msgid "Slovakia"
msgstr "斯洛伐克"
@@ -4025,7 +4084,7 @@ msgstr "斯洛伐克"
# addressbook/gui/contact-editor/fulladdr.glade.h:191
# addressbook/gui/contact-editor/e-contact-editor-address.c:316
# my-evolution/Locations.h:2104
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
#: my-evolution/Locations.h:2102
msgid "Slovenia"
msgstr "斯洛文尼亚"
@@ -4033,14 +4092,14 @@ msgstr "斯洛文尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:192
# addressbook/gui/contact-editor/fulladdr.glade.h:192
# addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
msgid "Solomon Islands"
msgstr "所罗门群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# addressbook/gui/contact-editor/e-contact-editor-address.c:318
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
msgid "Somalia"
msgstr "索马里"
@@ -4048,7 +4107,7 @@ msgstr "索马里"
# addressbook/gui/contact-editor/fulladdr.glade.h:194
# addressbook/gui/contact-editor/e-contact-editor-address.c:319
# my-evolution/Locations.h:2119
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
#: my-evolution/Locations.h:2117
msgid "South Africa"
msgstr "南非"
@@ -4056,7 +4115,7 @@ msgstr "南非"
# addressbook/gui/contact-editor/fulladdr.glade.h:195
# addressbook/gui/contact-editor/fulladdr.glade.h:195
# addressbook/gui/contact-editor/e-contact-editor-address.c:320
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
msgid "South Georgia And The South Sandwich Islands"
msgstr "南乔治亚和南三文治群岛"
@@ -4064,7 +4123,7 @@ msgstr "南乔治亚和南三文治群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:196
# addressbook/gui/contact-editor/e-contact-editor-address.c:321
# my-evolution/Locations.h:2127
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
#: my-evolution/Locations.h:2125
msgid "Spain"
msgstr "西班牙"
@@ -4072,28 +4131,28 @@ msgstr "西班牙"
# addressbook/gui/contact-editor/fulladdr.glade.h:197
# addressbook/gui/contact-editor/fulladdr.glade.h:197
# addressbook/gui/contact-editor/e-contact-editor-address.c:322
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
msgid "Sri Lanka"
msgstr "斯里兰卡"
# addressbook/gui/contact-editor/fulladdr.glade.h:198
# addressbook/gui/contact-editor/fulladdr.glade.h:198
# addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
msgid "St. Helena"
msgstr "圣赫勒拿岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:199
# addressbook/gui/contact-editor/fulladdr.glade.h:199
# addressbook/gui/contact-editor/e-contact-editor-address.c:324
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
msgid "St. Pierre And Miquelon"
msgstr "圣皮埃尔和麦克伦群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:200
# addressbook/gui/contact-editor/fulladdr.glade.h:200
# addressbook/gui/contact-editor/e-contact-editor-address.c:325
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
msgid "Sudan"
msgstr "苏丹"
@@ -4101,7 +4160,7 @@ msgstr "苏丹"
# addressbook/gui/contact-editor/fulladdr.glade.h:201
# addressbook/gui/contact-editor/e-contact-editor-address.c:326
# my-evolution/Locations.h:2176
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
#: my-evolution/Locations.h:2174
msgid "Suriname"
msgstr "苏里南"
@@ -4109,14 +4168,14 @@ msgstr "苏里南"
# addressbook/gui/contact-editor/fulladdr.glade.h:202
# addressbook/gui/contact-editor/fulladdr.glade.h:202
# addressbook/gui/contact-editor/e-contact-editor-address.c:327
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
msgid "Svalbard And Jan Mayen Islands"
msgstr "斯瓦巴和尖棉群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:203
# addressbook/gui/contact-editor/fulladdr.glade.h:203
# addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
msgid "Swaziland"
msgstr "斯威士兰"
@@ -4124,7 +4183,7 @@ msgstr "斯威士兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:204
# addressbook/gui/contact-editor/e-contact-editor-address.c:329
# my-evolution/Locations.h:2181
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
#: my-evolution/Locations.h:2179
msgid "Sweden"
msgstr "瑞典"
@@ -4133,7 +4192,7 @@ msgstr "瑞典"
# addressbook/gui/contact-editor/fulladdr.glade.h:205
# addressbook/gui/contact-editor/e-contact-editor-address.c:330
# my-evolution/Locations.h:2183
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
#: my-evolution/Locations.h:2181
msgid "Switzerland"
msgstr "瑞士"
@@ -4142,7 +4201,7 @@ msgstr "瑞士"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/e-contact-editor-address.c:331
# my-evolution/Locations.h:2205
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
#: my-evolution/Locations.h:2203
msgid "Taiwan"
msgstr "台湾"
@@ -4150,56 +4209,56 @@ msgstr "台湾"
# addressbook/gui/contact-editor/fulladdr.glade.h:207
# addressbook/gui/contact-editor/fulladdr.glade.h:207
# addressbook/gui/contact-editor/e-contact-editor-address.c:332
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
msgid "Tajikistan"
msgstr "塔吉克斯坦"
# addressbook/gui/contact-editor/fulladdr.glade.h:223
# addressbook/gui/contact-editor/fulladdr.glade.h:223
# addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
msgid "Tanzania, United Republic Of"
msgstr "坦桑尼亚联邦共和国"
# addressbook/gui/contact-editor/fulladdr.glade.h:208
# addressbook/gui/contact-editor/fulladdr.glade.h:208
# addressbook/gui/contact-editor/e-contact-editor-address.c:334
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
msgid "Thailand"
msgstr "泰国"
# addressbook/gui/contact-editor/fulladdr.glade.h:209
# addressbook/gui/contact-editor/fulladdr.glade.h:209
# addressbook/gui/contact-editor/e-contact-editor-address.c:335
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
msgid "Togo"
msgstr "多哥"
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# addressbook/gui/contact-editor/e-contact-editor-address.c:336
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
msgid "Tokelau"
msgstr "托克劳群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:211
# addressbook/gui/contact-editor/fulladdr.glade.h:211
# addressbook/gui/contact-editor/e-contact-editor-address.c:337
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
msgid "Tonga"
msgstr "汤加"
# addressbook/gui/contact-editor/fulladdr.glade.h:212
# addressbook/gui/contact-editor/fulladdr.glade.h:212
# addressbook/gui/contact-editor/e-contact-editor-address.c:338
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
msgid "Trinidad And Tobago"
msgstr "特里尼达和多巴哥"
# addressbook/gui/contact-editor/fulladdr.glade.h:213
# addressbook/gui/contact-editor/fulladdr.glade.h:213
# addressbook/gui/contact-editor/e-contact-editor-address.c:339
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
msgid "Tunisia"
msgstr "突尼斯"
@@ -4207,7 +4266,7 @@ msgstr "突尼斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:214
# addressbook/gui/contact-editor/e-contact-editor-address.c:340
# my-evolution/Locations.h:2321
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
#: my-evolution/Locations.h:2319
msgid "Turkey"
msgstr "土耳其"
@@ -4215,28 +4274,28 @@ msgstr "土耳其"
# addressbook/gui/contact-editor/fulladdr.glade.h:215
# addressbook/gui/contact-editor/fulladdr.glade.h:215
# addressbook/gui/contact-editor/e-contact-editor-address.c:341
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
msgid "Turkmenistan"
msgstr "土库曼斯坦"
# addressbook/gui/contact-editor/fulladdr.glade.h:216
# addressbook/gui/contact-editor/fulladdr.glade.h:216
# addressbook/gui/contact-editor/e-contact-editor-address.c:342
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
msgid "Turks And Caicos Islands"
msgstr "特克斯和凯科斯群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:217
# addressbook/gui/contact-editor/fulladdr.glade.h:217
# addressbook/gui/contact-editor/e-contact-editor-address.c:343
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
msgid "Tuvalu"
msgstr "图瓦卢"
# addressbook/gui/contact-editor/fulladdr.glade.h:219
# addressbook/gui/contact-editor/fulladdr.glade.h:219
# addressbook/gui/contact-editor/e-contact-editor-address.c:344
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
msgid "Uganda"
msgstr "乌干达"
@@ -4244,7 +4303,7 @@ msgstr "乌干达"
# addressbook/gui/contact-editor/fulladdr.glade.h:220
# addressbook/gui/contact-editor/e-contact-editor-address.c:345
# my-evolution/Locations.h:2334
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
#: my-evolution/Locations.h:2332
msgid "Ukraine"
msgstr "乌克兰"
@@ -4252,7 +4311,7 @@ msgstr "乌克兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:221
# addressbook/gui/contact-editor/fulladdr.glade.h:221
# addressbook/gui/contact-editor/e-contact-editor-address.c:346
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
msgid "United Arab Emirates"
msgstr "阿拉伯联合酋长国"
@@ -4260,7 +4319,7 @@ msgstr "阿拉伯联合酋长国"
# addressbook/gui/contact-editor/fulladdr.glade.h:222
# addressbook/gui/contact-editor/e-contact-editor-address.c:347
# my-evolution/Locations.h:2342
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
#: my-evolution/Locations.h:2340
msgid "United Kingdom"
msgstr "英国"
@@ -4268,7 +4327,7 @@ msgstr "英国"
# addressbook/gui/contact-editor/fulladdr.glade.h:225
# addressbook/gui/contact-editor/fulladdr.glade.h:225
# addressbook/gui/contact-editor/e-contact-editor-address.c:348
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
msgid "United States Minor Outlying Islands"
msgstr "美国小型外岛"
@@ -4276,7 +4335,7 @@ msgstr "美国小型外岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:226
# addressbook/gui/contact-editor/e-contact-editor-address.c:349
# my-evolution/Locations.h:2348
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
#: my-evolution/Locations.h:2346
msgid "Uruguay"
msgstr "乌拉圭"
@@ -4284,14 +4343,14 @@ msgstr "乌拉圭"
# addressbook/gui/contact-editor/fulladdr.glade.h:227
# addressbook/gui/contact-editor/fulladdr.glade.h:227
# addressbook/gui/contact-editor/e-contact-editor-address.c:350
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
msgid "Uzbekistan"
msgstr "乌兹别克斯坦"
# addressbook/gui/contact-editor/fulladdr.glade.h:228
# addressbook/gui/contact-editor/fulladdr.glade.h:228
# addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
msgid "Vanuatu"
msgstr "努瓦阿图"
@@ -4299,7 +4358,7 @@ msgstr "努瓦阿图"
# addressbook/gui/contact-editor/fulladdr.glade.h:229
# addressbook/gui/contact-editor/e-contact-editor-address.c:352
# my-evolution/Locations.h:2380
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
#: my-evolution/Locations.h:2378
msgid "Venezuela"
msgstr "委内瑞拉"
@@ -4308,7 +4367,7 @@ msgstr "委内瑞拉"
# addressbook/gui/contact-editor/fulladdr.glade.h:230
# addressbook/gui/contact-editor/e-contact-editor-address.c:353
# my-evolution/Locations.h:2392
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
#: my-evolution/Locations.h:2390
msgid "Viet Nam"
msgstr "越南"
@@ -4316,28 +4375,28 @@ msgstr "越南"
# addressbook/gui/contact-editor/fulladdr.glade.h:218
# addressbook/gui/contact-editor/fulladdr.glade.h:218
# addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
msgid "Virgin Islands, British"
msgstr "英属处女群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:218
# addressbook/gui/contact-editor/fulladdr.glade.h:218
# addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
msgid "Virgin Islands, U.S."
msgstr "美属处女群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:231
# addressbook/gui/contact-editor/fulladdr.glade.h:231
# addressbook/gui/contact-editor/e-contact-editor-address.c:356
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
msgid "Wallis And Futuna Islands"
msgstr "瓦利斯和富图纳群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:232
# addressbook/gui/contact-editor/fulladdr.glade.h:232
# addressbook/gui/contact-editor/e-contact-editor-address.c:357
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
msgid "Western Sahara"
msgstr "西撒哈拉"
@@ -4345,7 +4404,7 @@ msgstr "西撒哈拉"
# addressbook/gui/contact-editor/fulladdr.glade.h:233
# addressbook/gui/contact-editor/e-contact-editor-address.c:358
# my-evolution/Locations.h:2512
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
#: my-evolution/Locations.h:2510
msgid "Yemen"
msgstr "也门"
@@ -4354,7 +4413,7 @@ msgstr "也门"
# addressbook/gui/contact-editor/fulladdr.glade.h:234
# addressbook/gui/contact-editor/e-contact-editor-address.c:359
# my-evolution/Locations.h:2524
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
#: my-evolution/Locations.h:2522
msgid "Yugoslavia"
msgstr "南斯拉夫"
@@ -4362,14 +4421,14 @@ msgstr "南斯拉夫"
# addressbook/gui/contact-editor/fulladdr.glade.h:235
# addressbook/gui/contact-editor/fulladdr.glade.h:235
# addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
msgid "Zambia"
msgstr "赞比亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:236
# addressbook/gui/contact-editor/fulladdr.glade.h:236
# addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
msgid "Zimbabwe"
msgstr "津巴布韦"
@@ -4428,14 +4487,14 @@ msgstr "无法为域找到构件:“%s”"
# addressbook/gui/contact-editor/e-contact-quick-add.c:298
# addressbook/gui/contact-editor/e-contact-quick-add.c:298
# addressbook/gui/contact-editor/e-contact-quick-add.c:298
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
msgid "Contact Quick-Add"
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:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
msgid "Edit Full"
msgstr "完全编辑"
@@ -4445,7 +4504,7 @@ msgstr "完全编辑"
# addressbook/gui/widgets/e-addressbook-view.c:850
# addressbook/gui/contact-editor/e-contact-quick-add.c:326
# addressbook/gui/widgets/e-addressbook-view.c:961
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
#: addressbook/gui/widgets/e-addressbook-view.c:357
msgid "Full Name"
msgstr "全名"
@@ -4453,7 +4512,7 @@ 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
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
msgid "E-mail"
msgstr "电子邮件"
@@ -4484,6 +4543,25 @@ msgstr ""
"%s 已经存在\n"
"您打算覆盖它吗?"
+#: addressbook/gui/contact-editor/file-exists.glade.h:1
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: addressbook/gui/contact-editor/file-exists.glade.h:2
+msgid "Don't bother translating this string. It's not used."
+msgstr ""
+
+# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1908
+# mail/mail-display.c:102
+# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:2027
+# mail/mail-display.c:102
+# calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
+# mail/mail-display.c:101
+#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#, fuzzy
+msgid "Overwrite"
+msgstr "覆盖文件?"
+
# addressbook/gui/contact-editor/fulladdr.glade.h:1
# addressbook/gui/contact-editor/fulladdr.glade.h:1
# addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -4716,7 +4794,7 @@ msgstr "联系人列表编辑器"
# addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
# addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
# addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
msgid "Save List as VCard"
msgstr "将列表保存为 VCard"
@@ -4802,7 +4880,7 @@ msgstr ""
# addressbook/gui/search/e-addressbook-search-dialog.c:145
# widgets/misc/e-filter-bar.c:238
#: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
msgid "Advanced Search"
msgstr "高级搜索"
@@ -4820,21 +4898,21 @@ msgstr "搜索"
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
msgid "No cards"
msgstr "没有卡片"
# addressbook/gui/widgets/e-addressbook-model.c:130
# addressbook/gui/widgets/e-addressbook-model.c:130
# addressbook/gui/widgets/e-addressbook-model.c:130
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
msgid "1 card"
msgstr "1 张卡片"
# addressbook/gui/widgets/e-addressbook-model.c:133
# addressbook/gui/widgets/e-addressbook-model.c:133
# addressbook/gui/widgets/e-addressbook-model.c:133
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
#, c-format
msgid "%d cards"
msgstr "%d 张卡片"
@@ -4842,7 +4920,7 @@ msgstr "%d 张卡片"
# shell/e-shell-importer.c:455
# shell/e-shell-importer.c:455
# shell/e-shell-importer.c:466
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
#, fuzzy
msgid "Error getting book view"
msgstr "启动 %s 错误"
@@ -4856,7 +4934,7 @@ msgstr "启动 %s 错误"
# 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:140
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
#: addressbook/gui/widgets/e-addressbook-util.c:91
#: addressbook/gui/widgets/e-minicard.c:475
msgid "Error modifying card"
@@ -4886,10 +4964,10 @@ msgstr "成功"
# camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1895
# shell/e-storage.c:528 shell/evolution-shell-component.c:1057
#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-command.c:396
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2137
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1180
+#: camel/providers/imap/camel-imap-command.c:309
+#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
+#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
msgid "Unknown error"
msgstr "未知的错误"
@@ -4906,7 +4984,7 @@ msgstr "仓库离线"
# shell/evolution-shell-component.c:1035
# addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
# shell/evolution-shell-component.c:1048
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
#: shell/evolution-shell-component.c:1171
msgid "Permission denied"
msgstr "没有权限"
@@ -4951,8 +5029,8 @@ msgstr "不支持的协议"
#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
#: calendar/gui/dialogs/task-details-page.glade.h:3
#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
-#: camel/camel-service.c:738 camel/camel-service.c:778
-#: camel/camel-service.c:846 camel/camel-service.c:889
+#: camel/camel-service.c:739 camel/camel-service.c:779
+#: camel/camel-service.c:847 camel/camel-service.c:890
msgid "Cancelled"
msgstr "已经取消"
@@ -5039,7 +5117,7 @@ msgstr "删除列表错误"
# addressbook/gui/widgets/e-addressbook-view.c:1389
#: addressbook/gui/widgets/e-addressbook-util.c:101
#: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
msgid "Error removing card"
msgstr "删除卡片错误"
@@ -5059,11 +5137,10 @@ msgstr "显示卡片"
# addressbook/gui/widgets/e-addressbook-util.c:207
#: addressbook/gui/widgets/e-addressbook-util.c:213
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You have requested that %d cards be cards. This will cause %d new windows to "
-"be\n"
-"displayed on your screen. Do you really want to display all of these cards?"
+"Opening %d cards will open %d new windows as well.\n"
+"Do you really want to display all of these cards?"
msgstr ""
"您已经请求 %d 个卡片。这将在您的显示屏上打开\n"
" %d 个新窗口。您真的希望显示所有这些卡片?"
@@ -5233,7 +5310,7 @@ msgstr "地址簿"
# ui/evolution-addressbook.xml.h:19
#: addressbook/gui/widgets/e-addressbook-view.c:722
#: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1872
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr "保存为 VCard"
@@ -5420,7 +5497,7 @@ msgstr "粘贴"
# mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
# ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
# ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
#: ui/evolution-contact-editor.xml.h:2
@@ -5431,8 +5508,8 @@ msgstr "删除"
# widgets/menus/gal-view-menus.c:195
# widgets/menus/gal-view-menus.c:195
# widgets/menus/gal-view-menus.c:195
-#: addressbook/gui/widgets/e-addressbook-view.c:930
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3534
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
#, fuzzy
msgid "Current View"
msgstr "当前视图(_C)"
@@ -5444,7 +5521,7 @@ msgstr "当前视图(_C)"
#. Translators: put here a list of labels you want to see on buttons in
#. addressbook. You may use any character to separate labels but it must
#. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:963
+#: addressbook/gui/widgets/e-addressbook-view.c:965
msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
@@ -5455,11 +5532,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
#. in addressbook. You may use any character to separate labels but it
#. must also be placed at the begining ot the string.
#. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:968
+#: addressbook/gui/widgets/e-addressbook-view.c:970
msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-#: addressbook/gui/widgets/e-addressbook-view.c:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
#, c-format
msgid ""
"The addressbook backend for\n"
@@ -5682,7 +5759,7 @@ msgstr "包含:"
# addressbook/printing/e-contact-print.glade.h:18
# addressbook/printing/e-contact-print.glade.h:18
#: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
msgid "Landscape"
msgstr "横向"
@@ -5725,7 +5802,7 @@ msgstr "选项"
# addressbook/printing/e-contact-print.glade.h:24
# addressbook/printing/e-contact-print.glade.h:24
#: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
msgid "Orientation"
msgstr "方向"
@@ -5764,7 +5841,7 @@ msgstr "纸张来源:"
# addressbook/printing/e-contact-print.glade.h:29
#. Portrait
#: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
msgid "Portrait"
msgstr "纵向"
@@ -5877,7 +5954,7 @@ msgstr "无标题约会"
# calendar/gui/e-calendar-table.c:406 mail/message-list.c:679
#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:749
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
msgid "High"
msgstr "高"
@@ -5896,7 +5973,7 @@ msgstr "高"
#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
#: calendar/gui/calendar-model.c:1715
#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
msgid "Normal"
msgstr "中"
@@ -5911,7 +5988,7 @@ msgstr "中"
# calendar/gui/e-calendar-table.c:408 mail/message-list.c:677
#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
msgid "Low"
msgstr "低"
@@ -5931,13 +6008,17 @@ msgstr "低"
msgid "Undefined"
msgstr "未定义"
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
# calendar/conduits/calendar/calendar-conduit.c:937
# calendar/conduits/todo/todo-conduit.c:649
# calendar/conduits/calendar/calendar-conduit.c:1034
# calendar/conduits/todo/todo-conduit.c:649
# calendar/conduits/calendar/calendar-conduit.c:1150
# calendar/conduits/todo/todo-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/calendar/calendar-conduit.c:1225
#: calendar/conduits/todo/todo-conduit.c:835
msgid "Error while communicating with calendar server"
msgstr "在与日历服务器通讯时发生错误"
@@ -5948,8 +6029,8 @@ msgstr "在与日历服务器通讯时发生错误"
# calendar/conduits/calendar/calendar-conduit.c:1175
# calendar/conduits/calendar/calendar-conduit.c:1297
# calendar/conduits/calendar/calendar-conduit.c:1300
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/calendar/calendar-conduit.c:1300
+#: calendar/conduits/calendar/calendar-conduit.c:1372
+#: calendar/conduits/calendar/calendar-conduit.c:1375
msgid "Could not read pilot's Calendar application block"
msgstr "无法读入 Pilot 日历应用程序块"
@@ -6140,14 +6221,14 @@ 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:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
msgid "No description available."
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:736
+#: calendar/gui/alarm-notify/alarm-queue.c:741
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -6164,8 +6245,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:754
-#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2870
+#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
#: widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr "警告"
@@ -6173,7 +6254,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:759
+#: calendar/gui/alarm-notify/alarm-queue.c:764
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -6192,21 +6273,21 @@ 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:773
+#: calendar/gui/alarm-notify/alarm-queue.c:778
msgid "Do not ask me about this program again."
msgstr "不要再次询问该问题。"
# calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
# calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
# calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
msgid "Could not initialize GNOME"
msgstr "无法初始化 GNOME"
# calendar/gui/alarm-notify/notify-main.c:186
# calendar/gui/alarm-notify/notify-main.c:186
# calendar/gui/alarm-notify/notify-main.c:186
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:184
msgid "Could not create the alarm notify service factory"
msgstr "无法创建提醒服务车间"
@@ -6297,7 +6378,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:797
+#: calendar/gui/calendar-commands.c:799
msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
@@ -6470,9 +6551,9 @@ msgstr ""
# widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
#. An empty string is the same as 'None'.
#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1961
-#: mail/folder-browser.c:1706 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1649 mail/mail-accounts.c:453
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
+#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
@@ -6504,8 +6585,8 @@ msgstr "已分派"
# calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
# calendar/gui/e-meeting-model.c:810
#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:566
-#: calendar/gui/e-meeting-model.c:859
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
+#: calendar/gui/e-meeting-model.c:862
msgid "Yes"
msgstr "是"
@@ -6516,7 +6597,7 @@ msgstr "是"
# calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
# calendar/gui/e-meeting-model.c:811
#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:860
+#: calendar/gui/e-meeting-model.c:863
msgid "No"
msgstr "否"
@@ -6554,8 +6635,8 @@ msgstr "月视图"
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1365
-#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
msgid "Calendar"
msgstr "日历"
@@ -6563,10 +6644,26 @@ msgstr "日历"
# calendar/gui/component-factory.c:64
# calendar/gui/component-factory.c:64
# calendar/gui/component-factory.c:64
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:72
msgid "Folder containing appointments and events"
msgstr "文件夹含有约会和事件"
+# addressbook/gui/contact-editor/contact-editor.glade.h:36
+# addressbook/gui/contact-editor/contact-editor.glade.h:36
+# addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: calendar/gui/component-factory.c:76
+#, fuzzy
+msgid "Public Calendar"
+msgstr "公开日历 URL(_P):"
+
+# calendar/gui/component-factory.c:64
+# calendar/gui/component-factory.c:64
+# calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:77
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "文件夹含有约会和事件"
+
# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
# my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
@@ -6579,10 +6676,10 @@ msgstr "文件夹含有约会和事件"
# my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
# views/tasks/galview.xml.h:1
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
-#: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:311
+#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
+#: calendar/importers/icalendar-importer.c:704
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:311
#: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
#: shell/e-shortcuts.c:1063
msgid "Tasks"
@@ -6591,14 +6688,30 @@ msgstr "任务"
# calendar/gui/component-factory.c:69
# calendar/gui/component-factory.c:69
# calendar/gui/component-factory.c:69
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
msgid "Folder containing to-do items"
msgstr "文件夹含有 to-do 项"
+# addressbook/printing/e-contact-print.c:1111
+# addressbook/printing/e-contact-print.c:1111
+# addressbook/printing/e-contact-print.c:1115
+#: calendar/gui/component-factory.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "打印卡片"
+
+# calendar/gui/component-factory.c:69
+# calendar/gui/component-factory.c:69
+# calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "文件夹含有 to-do 项"
+
# ui/evolution-calendar.xml.h:21
# ui/evolution-calendar.xml.h:21
# ui/evolution-calendar.xml.h:21
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
#, fuzzy
msgid "New appointment"
msgstr "新建约会"
@@ -6606,7 +6719,7 @@ msgstr "新建约会"
# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
#, fuzzy
msgid "_Appointment"
msgstr "约会"
@@ -6614,14 +6727,14 @@ msgstr "约会"
# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
msgid "Create a new appointment"
msgstr "创建新约会"
# my-evolution/my-evolution.glade.h:10
# my-evolution/my-evolution.glade.h:10
# my-evolution/my-evolution.glade.h:10
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
#, fuzzy
msgid "New meeting"
msgstr "新闻来源设置"
@@ -6635,7 +6748,7 @@ msgstr "新闻来源设置"
# calendar/gui/dialogs/event-editor.c:207
# calendar/gui/dialogs/event-editor.c:263
# calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
#, fuzzy
msgid "_Meeting"
msgstr "会见"
@@ -6646,7 +6759,7 @@ msgstr "会见"
# ui/evolution-tasks.xml.h:5
# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
# ui/evolution-tasks.xml.h:6
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
#, fuzzy
msgid "Create a new meeting request"
msgstr "创建新任务"
@@ -6654,7 +6767,7 @@ msgstr "创建新任务"
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
#, fuzzy
msgid "New task"
msgstr "新建任务"
@@ -6662,7 +6775,7 @@ msgstr "新建任务"
# ui/evolution-tasks.xml.h:18
# ui/evolution-tasks.xml.h:18
# ui/evolution-tasks.xml.h:22
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
msgid "_Task"
msgstr "任务(_T)"
@@ -6672,14 +6785,14 @@ msgstr "任务(_T)"
# ui/evolution-tasks.xml.h:5
# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
# ui/evolution-tasks.xml.h:6
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
msgid "Create a new task"
msgstr "创建新任务"
# ui/evolution-calendar.xml.h:21
# ui/evolution-calendar.xml.h:21
# ui/evolution-calendar.xml.h:21
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
#, fuzzy
msgid "New All Day Appointment"
msgstr "新建约会"
@@ -6687,7 +6800,7 @@ msgstr "新建约会"
# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
#, fuzzy
msgid "All _Day Appointment"
msgstr "新建约会(_A)"
@@ -6695,7 +6808,7 @@ msgstr "新建约会(_A)"
# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
#, fuzzy
msgid "Create a new all-day appointment"
msgstr "创建新约会"
@@ -6765,45 +6878,46 @@ msgstr "未知提醒选项"
msgid "Alarm Repeat"
msgstr "提醒重复"
+# calendar/gui/dialogs/alarm-options.glade.h:6
+# calendar/gui/dialogs/alarm-options.glade.h:6
+# calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+#, fuzzy
+msgid ""
+"Evolution does not yet support email notification for reminders. You will "
+"not be able to edit the options for this reminder."
+msgstr ""
+"这是电子邮件提示器,但 Evolution 尚不支持这类提示器。您无法为该提示器编辑选"
+"项。"
+
# calendar/gui/dialogs/alarm-options.glade.h:2
# calendar/gui/dialogs/alarm-options.glade.h:2
# calendar/gui/dialogs/alarm-options.glade.h:2
-#: calendar/gui/dialogs/alarm-options.glade.h:2
+#: calendar/gui/dialogs/alarm-options.glade.h:3
msgid "Message to Display"
msgstr "要显示的消息"
# calendar/gui/dialogs/alarm-options.glade.h:3
# calendar/gui/dialogs/alarm-options.glade.h:3
# calendar/gui/dialogs/alarm-options.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
msgid "Play sound:"
msgstr "播放声音:"
# calendar/gui/dialogs/alarm-options.glade.h:4
# calendar/gui/dialogs/alarm-options.glade.h:4
# calendar/gui/dialogs/alarm-options.glade.h:4
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
msgid "Repeat the alarm"
msgstr "重复提醒"
# calendar/gui/dialogs/alarm-options.glade.h:5
# calendar/gui/dialogs/alarm-options.glade.h:5
# calendar/gui/dialogs/alarm-options.glade.h:5
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
msgid "Run program:"
msgstr "运行程序:"
-# calendar/gui/dialogs/alarm-options.glade.h:6
-# calendar/gui/dialogs/alarm-options.glade.h:6
-# calendar/gui/dialogs/alarm-options.glade.h:6
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid ""
-"This is an email reminder, but Evolution does not yet support this kind of "
-"reminders. You will not be able to edit the options for this reminder."
-msgstr ""
-"这是电子邮件提示器,但 Evolution 尚不支持这类提示器。您无法为该提示器编辑选"
-"项。"
-
# calendar/gui/dialogs/alarm-options.glade.h:7
# calendar/gui/dialogs/alarm-options.glade.h:7
# calendar/gui/dialogs/alarm-options.glade.h:7
@@ -6846,7 +6960,7 @@ msgstr "分钟"
# calendar/gui/dialogs/alarm-page.c:309
# calendar/gui/dialogs/alarm-page.c:309
# calendar/gui/dialogs/alarm-page.c:309
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
#, c-format
msgid "%d days"
msgstr "%d 天"
@@ -6854,14 +6968,14 @@ msgstr "%d 天"
# calendar/gui/dialogs/alarm-page.c:312
# calendar/gui/dialogs/alarm-page.c:312
# calendar/gui/dialogs/alarm-page.c:312
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
msgid "1 day"
msgstr "1 天"
# calendar/gui/dialogs/alarm-page.c:317
# calendar/gui/dialogs/alarm-page.c:317
# calendar/gui/dialogs/alarm-page.c:317
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
#, c-format
msgid "%d weeks"
msgstr "%d 周"
@@ -6869,14 +6983,14 @@ msgstr "%d 周"
# calendar/gui/dialogs/alarm-page.c:320
# calendar/gui/dialogs/alarm-page.c:320
# calendar/gui/dialogs/alarm-page.c:320
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
msgid "1 week"
msgstr "1 周"
# calendar/gui/dialogs/alarm-page.c:325
# calendar/gui/dialogs/alarm-page.c:325
# calendar/gui/dialogs/alarm-page.c:325
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
#, c-format
msgid "%d hours"
msgstr "%d 小时"
@@ -6884,14 +6998,14 @@ msgstr "%d 小时"
# calendar/gui/dialogs/alarm-page.c:328
# calendar/gui/dialogs/alarm-page.c:328
# calendar/gui/dialogs/alarm-page.c:328
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
msgid "1 hour"
msgstr "1 小时"
# calendar/gui/dialogs/alarm-page.c:333
# calendar/gui/dialogs/alarm-page.c:333
# calendar/gui/dialogs/alarm-page.c:333
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
#, c-format
msgid "%d minutes"
msgstr "%d 分钟"
@@ -6899,14 +7013,14 @@ msgstr "%d 分钟"
# calendar/gui/dialogs/alarm-page.c:336
# calendar/gui/dialogs/alarm-page.c:336
# calendar/gui/dialogs/alarm-page.c:336
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
msgid "1 minute"
msgstr "1 分钟"
# calendar/gui/dialogs/alarm-page.c:341
# calendar/gui/dialogs/alarm-page.c:341
# calendar/gui/dialogs/alarm-page.c:341
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
#, c-format
msgid "%d seconds"
msgstr "%d 秒"
@@ -6914,7 +7028,7 @@ msgstr "%d 秒"
# calendar/gui/dialogs/alarm-page.c:344
# calendar/gui/dialogs/alarm-page.c:344
# calendar/gui/dialogs/alarm-page.c:344
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
msgid "1 second"
msgstr "1 秒"
@@ -6924,7 +7038,7 @@ msgstr "1 秒"
# calendar/gui/dialogs/alarm-page.glade.h:4
# calendar/gui/dialogs/alarm-page.c:373
# calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/alarm-page.c:373
+#: calendar/gui/dialogs/alarm-page.c:383
#: calendar/gui/dialogs/alarm-page.glade.h:4
msgid "Play a sound"
msgstr "播放声音"
@@ -6935,7 +7049,7 @@ msgstr "播放声音"
# calendar/gui/dialogs/alarm-page.glade.h:3
# calendar/gui/dialogs/alarm-page.c:377
# calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:387
#: calendar/gui/dialogs/alarm-page.glade.h:3
msgid "Display a message"
msgstr "显示消息"
@@ -6943,7 +7057,7 @@ msgstr "显示消息"
# calendar/gui/dialogs/alarm-page.c:381
# calendar/gui/dialogs/alarm-page.c:381
# calendar/gui/dialogs/alarm-page.c:381
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
msgid "Send an email"
msgstr "发送电子邮件"
@@ -6953,7 +7067,7 @@ msgstr "发送电子邮件"
# calendar/gui/dialogs/alarm-page.glade.h:6
# calendar/gui/dialogs/alarm-page.c:385
# calendar/gui/dialogs/alarm-page.glade.h:6
-#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/alarm-page.c:395
#: calendar/gui/dialogs/alarm-page.glade.h:6
msgid "Run a program"
msgstr "运行程序"
@@ -6961,14 +7075,14 @@ msgstr "运行程序"
# calendar/gui/dialogs/alarm-page.c:391
# calendar/gui/dialogs/alarm-page.c:391
# calendar/gui/dialogs/alarm-page.c:391
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
msgid "Unknown action to be performed"
msgstr "执行未知的动作"
# calendar/gui/dialogs/alarm-page.c:403
# calendar/gui/dialogs/alarm-page.c:403
# calendar/gui/dialogs/alarm-page.c:403
-#: calendar/gui/dialogs/alarm-page.c:403
+#: calendar/gui/dialogs/alarm-page.c:413
#, c-format
msgid "%s %s before the start of the appointment"
msgstr "在约会开始之前 %s %s"
@@ -6976,7 +7090,7 @@ msgstr "在约会开始之前 %s %s"
# calendar/gui/dialogs/alarm-page.c:406
# calendar/gui/dialogs/alarm-page.c:406
# calendar/gui/dialogs/alarm-page.c:406
-#: calendar/gui/dialogs/alarm-page.c:406
+#: calendar/gui/dialogs/alarm-page.c:416
#, c-format
msgid "%s %s after the start of the appointment"
msgstr "在约会开始之后 %s %s"
@@ -6984,7 +7098,7 @@ msgstr "在约会开始之后 %s %s"
# calendar/gui/dialogs/alarm-page.c:411
# calendar/gui/dialogs/alarm-page.c:411
# calendar/gui/dialogs/alarm-page.c:411
-#: calendar/gui/dialogs/alarm-page.c:411
+#: calendar/gui/dialogs/alarm-page.c:421
#, c-format
msgid "%s at the start of the appointment"
msgstr "在约会开始时 %s"
@@ -6992,7 +7106,7 @@ msgstr "在约会开始时 %s"
# calendar/gui/dialogs/alarm-page.c:420
# calendar/gui/dialogs/alarm-page.c:420
# calendar/gui/dialogs/alarm-page.c:420
-#: calendar/gui/dialogs/alarm-page.c:420
+#: calendar/gui/dialogs/alarm-page.c:430
#, c-format
msgid "%s %s before the end of the appointment"
msgstr "在约会结束之前 %s %s"
@@ -7000,7 +7114,7 @@ msgstr "在约会结束之前 %s %s"
# calendar/gui/dialogs/alarm-page.c:423
# calendar/gui/dialogs/alarm-page.c:423
# calendar/gui/dialogs/alarm-page.c:423
-#: calendar/gui/dialogs/alarm-page.c:423
+#: calendar/gui/dialogs/alarm-page.c:433
#, c-format
msgid "%s %s after the end of the appointment"
msgstr "在约会结束之后 %s %s"
@@ -7008,7 +7122,7 @@ msgstr "在约会结束之后 %s %s"
# calendar/gui/dialogs/alarm-page.c:428
# calendar/gui/dialogs/alarm-page.c:428
# calendar/gui/dialogs/alarm-page.c:428
-#: calendar/gui/dialogs/alarm-page.c:428
+#: calendar/gui/dialogs/alarm-page.c:438
#, c-format
msgid "%s at the end of the appointment"
msgstr "在约会结束时 %s"
@@ -7016,7 +7130,7 @@ msgstr "在约会结束时 %s"
# calendar/gui/dialogs/alarm-page.c:453
# calendar/gui/dialogs/alarm-page.c:453
# calendar/gui/dialogs/alarm-page.c:452
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
#, c-format
msgid "%s at %s"
msgstr "在 %2$s 时 %1$s"
@@ -7024,7 +7138,7 @@ msgstr "在 %2$s 时 %1$s"
# calendar/gui/dialogs/alarm-page.c:459
# calendar/gui/dialogs/alarm-page.c:459
# calendar/gui/dialogs/alarm-page.c:458
-#: calendar/gui/dialogs/alarm-page.c:458
+#: calendar/gui/dialogs/alarm-page.c:468
#, c-format
msgid "%s for an unknown trigger type"
msgstr "%s 为未知触发类型"
@@ -7069,7 +7183,7 @@ msgstr "提示器"
# calendar/gui/e-itip-control.c:748 calendar/gui/e-itip-control.glade.h:11
#: calendar/gui/dialogs/alarm-page.glade.h:7
#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:774 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "概要:"
@@ -7215,7 +7329,7 @@ msgstr "天数"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
# calendar/gui/dialogs/recurrence-page.c:963
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1127
msgid "Friday"
msgstr "星期五"
@@ -7240,7 +7354,7 @@ msgstr "分钟"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
# calendar/gui/dialogs/recurrence-page.c:959
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/recurrence-page.c:1123
msgid "Monday"
msgstr "星期一"
@@ -7259,7 +7373,7 @@ msgstr "星期日(_N)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
# calendar/gui/dialogs/recurrence-page.c:964
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1128
msgid "Saturday"
msgstr "星期六"
@@ -7281,7 +7395,7 @@ msgstr "在日期浏览器中显示周数(_N)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
# calendar/gui/dialogs/recurrence-page.c:965
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
msgid "Sunday"
msgstr "星期日"
@@ -7315,7 +7429,7 @@ msgstr "任务列表(_T)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
# calendar/gui/dialogs/recurrence-page.c:962
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
msgid "Thursday"
msgstr "星期四"
@@ -7347,7 +7461,7 @@ msgstr "时间格式:"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
# calendar/gui/dialogs/recurrence-page.c:960
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/recurrence-page.c:1124
msgid "Tuesday"
msgstr "星期二"
@@ -7362,7 +7476,7 @@ msgstr ""
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
# calendar/gui/dialogs/recurrence-page.c:961
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1125
msgid "Wednesday"
msgstr "星期三"
@@ -7721,8 +7835,8 @@ msgstr "没有概要"
# composer/e-msg-composer.c:947
# composer/e-msg-composer.c:912
#: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3976
-#: calendar/gui/e-week-view.c:3802 composer/e-msg-composer.c:1146
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
+#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
msgid "Save as..."
msgstr "另存为..."
@@ -7833,21 +7947,21 @@ msgstr "输入代表"
# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
msgid "Appointment"
msgstr "约会"
# calendar/gui/dialogs/event-editor.c:190
# calendar/gui/dialogs/event-editor.c:190
# calendar/gui/dialogs/event-editor.c:190
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
msgid "Reminder"
msgstr "提醒"
# calendar/gui/dialogs/event-editor.c:195
# calendar/gui/dialogs/event-editor.c:195
# calendar/gui/dialogs/event-editor.c:195
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
msgid "Recurrence"
msgstr "再次发生"
@@ -7860,9 +7974,9 @@ msgstr "再次发生"
# calendar/gui/dialogs/event-editor.c:202
# calendar/gui/dialogs/event-editor.c:260
# calendar/gui/dialogs/event-editor.c:363
-#: calendar/gui/dialogs/event-editor.c:211
-#: calendar/gui/dialogs/event-editor.c:277
-#: calendar/gui/dialogs/event-editor.c:407
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
msgid "Scheduling"
msgstr "正在调度"
@@ -7875,9 +7989,9 @@ msgstr "正在调度"
# calendar/gui/dialogs/event-editor.c:207
# calendar/gui/dialogs/event-editor.c:263
# calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/dialogs/event-editor.c:216
-#: calendar/gui/dialogs/event-editor.c:280
-#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:237
+#: calendar/gui/dialogs/event-editor.c:302
+#: calendar/gui/dialogs/event-editor.c:436 ui/evolution-event-editor.xml.h:6
msgid "Meeting"
msgstr "会见"
@@ -8018,28 +8132,28 @@ msgstr "开始时间(_S):"
# calendar/gui/dialogs/meeting-page.c:425
# calendar/gui/dialogs/meeting-page.c:425
# calendar/gui/dialogs/meeting-page.c:425
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
msgid "An organizer is required."
msgstr "需要一名组织者。"
# calendar/gui/dialogs/meeting-page.c:446
# calendar/gui/dialogs/meeting-page.c:446
# calendar/gui/dialogs/meeting-page.c:446
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
msgid "At least one attendee is required."
msgstr "需要至少一个参加者。"
# calendar/gui/dialogs/meeting-page.c:626
# calendar/gui/dialogs/meeting-page.c:626
# calendar/gui/dialogs/meeting-page.c:626
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
msgid "That person is already attending the meeting!"
msgstr "那个人已经参加了会议!"
# calendar/gui/dialogs/meeting-page.c:701
# calendar/gui/dialogs/meeting-page.c:701
# calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
msgid "_Delegate To..."
msgstr "授权于(_D)..."
@@ -8130,7 +8244,7 @@ msgstr "成员"
# calendar/gui/e-itip-control.c:809
# calendar/gui/e-meeting-time-sel.etspec.h:8
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:905
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
@@ -8160,7 +8274,7 @@ msgstr "角色"
# mail/message-list.etspec.h:9
#: calendar/gui/dialogs/meeting-page.etspec.h:10
#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
#: mail/message-list.etspec.h:12
msgid "Status"
msgstr "状态"
@@ -8281,19 +8395,19 @@ msgstr "该约会含有 Evolution 无法编辑的循环。"
# calendar/gui/dialogs/recurrence-page.c:932
# calendar/gui/dialogs/recurrence-page.c:932
# calendar/gui/dialogs/recurrence-page.c:932
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
msgid "on"
msgstr "在"
# my-evolution/metar.c:262
# my-evolution/metar.c:262
# my-evolution/metar.c:262
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
#, fuzzy
msgid "first"
msgstr "霭"
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
msgid "second"
msgstr "秒"
@@ -8308,7 +8422,7 @@ msgstr "秒"
# addressbook/gui/contact-editor/e-contact-editor.c:1714
# mail/mail-config.glade.h:49
# my-evolution/Locations.h:1614
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
#, fuzzy
msgid "third"
msgstr "其它"
@@ -8316,7 +8430,7 @@ msgstr "其它"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/metar.c:64
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
#, fuzzy
msgid "fourth"
msgstr "北"
@@ -8324,7 +8438,7 @@ msgstr "北"
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# addressbook/gui/contact-editor/e-contact-save-as.c:170
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
#, fuzzy
msgid "last"
msgstr "列表"
@@ -8338,7 +8452,7 @@ msgstr "列表"
# addressbook/backend/ebook/e-card-simple.c:80
# addressbook/gui/contact-editor/e-contact-editor.c:1657
# addressbook/gui/widgets/e-addressbook-view.c:980
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
#, fuzzy
msgid "Other Date"
msgstr "其它传真"
@@ -8346,21 +8460,21 @@ msgstr "其它传真"
# calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
# calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
# calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
msgid "day"
msgstr "天"
# calendar/gui/dialogs/recurrence-page.c:1088
# calendar/gui/dialogs/recurrence-page.c:1088
# calendar/gui/dialogs/recurrence-page.c:1088
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
msgid "on the"
msgstr "在"
# calendar/gui/dialogs/recurrence-page.c:1269
# calendar/gui/dialogs/recurrence-page.c:1269
# calendar/gui/dialogs/recurrence-page.c:1269
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
msgid "occurrences"
msgstr "循环"
@@ -8524,7 +8638,7 @@ msgstr "完成日期:"
# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
#: calendar/gui/dialogs/task-details-page.glade.h:9
#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:572 calendar/gui/e-meeting-model.c:872
+#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
msgid "Needs Action"
msgstr "需要动作"
@@ -8542,7 +8656,7 @@ msgstr "进度"
# calendar/gui/dialogs/task-details-page.glade.h:12
# my-evolution/e-summary-preferences.c:966
#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:889
msgid "URL:"
msgstr "URL:"
@@ -8566,7 +8680,7 @@ msgstr "状态(_S):"
# calendar/gui/dialogs/task-editor.c:178
# addressbook/gui/component/addressbook-config.glade.h:9
# calendar/gui/dialogs/task-editor.c:178
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
msgid "Basic"
msgstr "基本"
@@ -8579,9 +8693,9 @@ msgstr "基本"
# calendar/gui/dialogs/task-editor.c:190
# calendar/gui/dialogs/task-editor.c:227
# calendar/gui/dialogs/task-editor.c:322
-#: calendar/gui/dialogs/task-editor.c:194
-#: calendar/gui/dialogs/task-editor.c:238
-#: calendar/gui/dialogs/task-editor.c:359
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
msgid "Assignment"
msgstr "分派"
@@ -8594,7 +8708,7 @@ msgstr "分派"
# calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:757
# calendar/gui/e-itip-control.glade.h:6
# composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:828
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
#: calendar/gui/e-itip-control.glade.h:6
#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
msgid "Description:"
@@ -8709,7 +8823,7 @@ msgstr "100%"
# calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
# calendar/gui/e-week-view.c:1828
#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1892
+#: calendar/gui/e-week-view.c:1919
msgid "Deleting selected objects"
msgstr "删除选中的对象"
@@ -8722,8 +8836,8 @@ msgstr "删除选中的对象"
# calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
# calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1455
# shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3552 mail/folder-browser.c:1717
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3752
+#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
msgid "_Open"
msgstr "打开(_O)"
@@ -8745,8 +8859,8 @@ msgstr "另存为..."
# ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:41
# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:105
# ui/my-evolution.xml.h:7
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3747
-#: calendar/gui/e-week-view.c:3526 calendar/gui/e-week-view.c:3554
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3754
+#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
@@ -8762,8 +8876,8 @@ msgstr "打印(_P)..."
# calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
# calendar/gui/e-week-view.c:3441 ui/evolution-addressbook.xml.h:1
# ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3752
-#: calendar/gui/e-week-view.c:3559 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
+#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "剪切(_U)"
@@ -8780,8 +8894,8 @@ msgstr "剪切(_U)"
# calendar/gui/e-week-view.c:3443 ui/evolution-addressbook.xml.h:34
# ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
# ui/evolution-tasks.xml.h:17
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3753
-#: calendar/gui/e-week-view.c:3560 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3760
+#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
#: ui/evolution-tasks.xml.h:15
msgid "_Copy"
@@ -8802,9 +8916,9 @@ msgstr "复制(_C)"
# calendar/gui/e-week-view.c:3445 ui/evolution-addressbook.xml.h:38
# ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
# ui/evolution-tasks.xml.h:21
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3716
-#: calendar/gui/e-day-view.c:3754 calendar/gui/e-week-view.c:3530
-#: calendar/gui/e-week-view.c:3561 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3723
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3526
+#: calendar/gui/e-week-view.c:3557 ui/evolution-addressbook.xml.h:37
#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
#: ui/evolution-tasks.xml.h:19
msgid "_Paste"
@@ -8854,8 +8968,8 @@ msgstr "删除选定的任务(_D)"
# calendar/gui/e-week-view.c:3924
# calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
# calendar/gui/e-week-view.c:3928
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7631
-#: calendar/gui/e-week-view.c:4303
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
+#: calendar/gui/e-week-view.c:4266
msgid "Updating objects"
msgstr "更新对象"
@@ -8865,7 +8979,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:1357
+#: calendar/gui/e-calendar-table.c:1360
#: calendar/gui/e-calendar-table.etspec.h:6
msgid "Click to add a task"
msgstr "点击以添加任务"
@@ -8883,8 +8997,8 @@ msgstr "提醒"
# camel/camel-filter-driver.c:886
# calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
# camel/camel-filter-driver.c:1026
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
-#: camel/camel-filter-driver.c:1100
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
+#: camel/camel-filter-driver.c:1109
msgid "Complete"
msgstr "完成"
@@ -8940,7 +9054,7 @@ msgstr "开始日期"
# my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
# shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
#: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
#: shell/e-shortcuts.c:1051
msgid "Summary"
msgstr "概要"
@@ -9058,14 +9172,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:3700
+#: calendar/gui/e-day-view.c:3707
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:3702 calendar/gui/e-week-view.c:3520
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
@@ -9078,7 +9192,7 @@ msgstr "新建全天事件(_E)"
# calendar/gui/dialogs/event-editor.c:207
# calendar/gui/dialogs/event-editor.c:263
# calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3521
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
#, fuzzy
msgid "New Meeting"
msgstr "会见"
@@ -9086,14 +9200,14 @@ msgstr "会见"
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
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:3711 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
msgid "Print..."
msgstr "打印..."
@@ -9103,7 +9217,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:3723 calendar/gui/e-week-view.c:3536
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
#: ui/evolution-calendar.xml.h:10
msgid "Go to _Today"
msgstr "转到今天(_T)"
@@ -9111,14 +9225,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:3725 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
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:3730 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
#: ui/evolution-calendar.xml.h:31
msgid "_Publish Free/Busy Information"
msgstr "发布忙闲信息(_P)"
@@ -9126,7 +9240,7 @@ msgstr "发布忙闲信息(_P)"
# mail/mail-local.c:1416
# mail/mail-local.c:1416
# executive-summary/component/e-summary-url.c:80
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3545
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
#, fuzzy
msgid "_Configure..."
msgstr "配置 %s"
@@ -9134,7 +9248,7 @@ msgstr "配置 %s"
# mail/mail-local.c:1416
# mail/mail-local.c:1416
# executive-summary/component/e-summary-url.c:80
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3546
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
#, fuzzy
msgid "_Configure Pilot..."
msgstr "配置 %s"
@@ -9142,15 +9256,15 @@ msgstr "配置 %s"
# mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:105
# mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:105
# mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:107
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3553
-#: mail/folder-browser.c:1719 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3549
+#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
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:3758 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
#, fuzzy
msgid "_Schedule Meeting..."
msgstr "调度会议(_M)"
@@ -9158,7 +9272,7 @@ msgstr "调度会议(_M)"
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
#, fuzzy
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_C)"
@@ -9166,49 +9280,49 @@ msgstr "作为 iCalendar 转发(_C)"
# calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
# calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3455
# calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
-#: calendar/gui/e-day-view.c:3764 calendar/gui/e-week-view.c:3571
+#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
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:3765 calendar/gui/e-week-view.c:3572
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
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:3766 calendar/gui/e-week-view.c:3573
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
msgid "Delete _All Occurrences"
msgstr "删除所有事件(_A)"
# shell/e-shell-view-menu.c:577
# shell/e-shell-view-menu.c:577
# shell/e-shell-view-menu.c:577
-#: calendar/gui/e-day-view.c:4128 calendar/gui/e-week-view.c:3930
-#: shell/e-shell-view-menu.c:639
+#: calendar/gui/e-day-view.c:4138 calendar/gui/e-week-view.c:3893
+#: shell/e-shell-view-menu.c:94
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr "GNOME Pilot 工具好像并未安装到系统中。"
# shell/e-shell-view-menu.c:585
# shell/e-shell-view-menu.c:585
# shell/e-shell-view-menu.c:585
-#: calendar/gui/e-day-view.c:4134 calendar/gui/e-week-view.c:3936
-#: shell/e-shell-view-menu.c:647
+#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
+#: shell/e-shell-view-menu.c:102
#, c-format
msgid "Error executing %s."
msgstr "执行 %s 错误。"
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/e-itip-control.c:590
msgid "<b>Starts:</b> "
msgstr ""
# calendar/gui/e-itip-control.c:565
# calendar/gui/e-itip-control.c:565
# calendar/gui/e-itip-control.c:568
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:600
#, fuzzy
msgid "<b>Ends:</b> "
msgstr "结束于:<b>"
@@ -9216,19 +9330,19 @@ msgstr "结束于:<b>"
# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
#, fuzzy
msgid "<b>Completed:</b> "
msgstr "已完成 "
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
msgid "<b>Due:</b> "
msgstr ""
# calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
# calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
# calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
-#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
msgid "iCalendar Information"
msgstr "iCalendar 信息"
@@ -9236,14 +9350,14 @@ msgstr "iCalendar 信息"
# calendar/gui/e-itip-control.c:641
# calendar/gui/e-itip-control.c:644
#. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
msgid "iCalendar Error"
msgstr "iCalendar 错误"
# calendar/gui/e-itip-control.c:706 calendar/gui/e-itip-control.c:722
# calendar/gui/e-itip-control.c:706 calendar/gui/e-itip-control.c:722
# calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
-#: calendar/gui/e-itip-control.c:734 calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
msgid "An unknown person"
msgstr "未知的人"
@@ -9251,7 +9365,7 @@ msgstr "未知的人"
# calendar/gui/e-itip-control.c:729
# calendar/gui/e-itip-control.c:732
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:764
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
@@ -9260,14 +9374,14 @@ msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作
# calendar/gui/e-itip-control.c:745
# calendar/gui/e-itip-control.c:745
# calendar/gui/e-itip-control.c:748
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
msgid "<i>None</i>"
msgstr "<i>无</i>"
# calendar/gui/dialogs/event-page.glade.h:8
# calendar/gui/dialogs/event-page.glade.h:8
# calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
#, fuzzy
msgid "Location:"
msgstr "地理位置(_O):"
@@ -9275,7 +9389,7 @@ msgstr "地理位置(_O):"
# calendar/gui/dialogs/task-details-page.glade.h:15
# calendar/gui/dialogs/task-details-page.glade.h:15
# calendar/gui/dialogs/task-details-page.glade.h:15
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
msgid "Status:"
msgstr "状态:"
@@ -9285,16 +9399,16 @@ msgstr "状态:"
# calendar/gui/e-meeting-model.c:824
# calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
# calendar/gui/e-meeting-model.c:824
-#: calendar/gui/e-itip-control.c:801 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:873
-#: calendar/gui/itip-utils.c:463
+#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
+#: calendar/gui/itip-utils.c:500
msgid "Accepted"
msgstr "接受"
# calendar/gui/e-itip-control.c:804
# calendar/gui/e-itip-control.c:804
# calendar/gui/e-itip-control.c:807
-#: calendar/gui/e-itip-control.c:805 calendar/gui/itip-utils.c:466
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
msgid "Tentatively Accepted"
msgstr "暂时接受"
@@ -9304,9 +9418,9 @@ msgstr "暂时接受"
# calendar/gui/e-meeting-model.c:825
# calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
# calendar/gui/e-meeting-model.c:825
-#: calendar/gui/e-itip-control.c:809 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:874
-#: calendar/gui/itip-utils.c:469 calendar/gui/itip-utils.c:495
+#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
+#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
msgid "Declined"
msgstr "否决"
@@ -9329,13 +9443,13 @@ msgstr "否决"
# camel/providers/smtp/camel-smtp-transport.c:171
# camel/providers/smtp/camel-smtp-transport.c:226
# widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:442
-#: calendar/gui/e-itip-control.c:813 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
-#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:831
-#: calendar/gui/e-meeting-model.c:847 camel/camel-tcp-stream-openssl.c:629
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
#: camel/providers/smtp/camel-smtp-transport.c:172
#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
#: widgets/misc/e-charset-picker.c:444
msgid "Unknown"
msgstr "未知"
@@ -9349,16 +9463,16 @@ msgstr "未知"
# calendar/gui/e-itip-control.c:789 calendar/gui/e-itip-control.c:805
# calendar/gui/e-itip-control.c:821 calendar/gui/e-itip-control.c:834
# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:860
-#: calendar/gui/e-itip-control.c:866 calendar/gui/e-itip-control.c:894
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:946 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:901
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:940
+#: calendar/gui/e-itip-control.c:953 calendar/gui/e-itip-control.c:966
msgid "Choose an action:"
msgstr "选择一项活动:"
# calendar/gui/e-itip-control.c:787
# calendar/gui/e-itip-control.c:787
# calendar/gui/e-itip-control.c:790
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
msgid "Update"
msgstr "更新"
@@ -9374,59 +9488,59 @@ msgstr "更新"
# calendar/gui/e-itip-control.c:823 calendar/gui/e-itip-control.c:836
# calendar/gui/e-itip-control.c:849 calendar/gui/e-itip-control.c:862
# shell/e-shell.c:1885 widgets/misc/e-cell-date-edit.c:258
-#: calendar/gui/e-itip-control.c:868 calendar/gui/e-itip-control.c:899
-#: calendar/gui/e-itip-control.c:922 calendar/gui/e-itip-control.c:935
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:961
-#: shell/e-shell.c:2127 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:875 calendar/gui/e-itip-control.c:906
+#: calendar/gui/e-itip-control.c:929 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-itip-control.c:968
+#: shell/e-shell.c:2175 widgets/misc/e-cell-date-edit.c:258
msgid "OK"
msgstr "确定"
# calendar/gui/e-itip-control.c:803
# calendar/gui/e-itip-control.c:803
# calendar/gui/e-itip-control.c:806
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
msgid "Accept"
msgstr "接受"
# calendar/gui/e-itip-control.c:804
# calendar/gui/e-itip-control.c:804
# calendar/gui/e-itip-control.c:807
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
msgid "Tentatively accept"
msgstr "暂时接受"
# calendar/gui/e-itip-control.c:805
# calendar/gui/e-itip-control.c:805
# calendar/gui/e-itip-control.c:808
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
msgid "Decline"
msgstr "否决"
# calendar/gui/e-itip-control.c:819
# calendar/gui/e-itip-control.c:819
# calendar/gui/e-itip-control.c:822
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
msgid "Send Free/Busy Information"
msgstr "发送忙闲信息"
# calendar/gui/e-itip-control.c:832
# calendar/gui/e-itip-control.c:832
# calendar/gui/e-itip-control.c:835
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
msgid "Update respondent status"
msgstr "更新应答者状态"
# calendar/gui/e-itip-control.c:846
# calendar/gui/e-itip-control.c:846
# calendar/gui/e-itip-control.c:848
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
msgid "Send Latest Information"
msgstr "发送最新的信息"
# calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
# calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
# calendar/gui/e-itip-control.c:861 ui/evolution-mail-global.xml.h:1
-#: calendar/gui/e-itip-control.c:960 calendar/gui/itip-utils.c:483
+#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
@@ -9434,7 +9548,7 @@ msgstr "取消"
# calendar/gui/e-itip-control.c:875
# calendar/gui/e-itip-control.c:875
# calendar/gui/e-itip-control.c:909
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1045
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> 发布了会议信息。"
@@ -9442,14 +9556,14 @@ msgstr "<b>%s</b> 发布了会议信息。"
# calendar/gui/e-itip-control.c:876
# calendar/gui/e-itip-control.c:876
# calendar/gui/e-itip-control.c:910
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
msgid "Meeting Information"
msgstr "会议信息"
# calendar/gui/e-itip-control.c:880
# calendar/gui/e-itip-control.c:880
# calendar/gui/e-itip-control.c:914
-#: calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1050
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请求您参加一个会议。"
@@ -9457,14 +9571,14 @@ msgstr "<b>%s</b> 请求您参加一个会议。"
# calendar/gui/e-itip-control.c:881
# calendar/gui/e-itip-control.c:881
# calendar/gui/e-itip-control.c:915
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
msgid "Meeting Proposal"
msgstr "会议建议"
# calendar/gui/e-itip-control.c:885
# calendar/gui/e-itip-control.c:885
# calendar/gui/e-itip-control.c:919
-#: calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1055
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> 希望加入到已存的会议。"
@@ -9472,14 +9586,14 @@ msgstr "<b>%s</b> 希望加入到已存的会议。"
# calendar/gui/e-itip-control.c:886
# calendar/gui/e-itip-control.c:886
# calendar/gui/e-itip-control.c:920
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
msgid "Meeting Update"
msgstr "会议更新"
# calendar/gui/e-itip-control.c:890
# calendar/gui/e-itip-control.c:890
# calendar/gui/e-itip-control.c:924
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1060
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> 想收到最新的会议信息。"
@@ -9487,14 +9601,14 @@ msgstr "<b>%s</b> 想收到最新的会议信息。"
# calendar/gui/e-itip-control.c:891
# calendar/gui/e-itip-control.c:891
# calendar/gui/e-itip-control.c:925
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
msgid "Meeting Update Request"
msgstr "会议更新请求"
# calendar/gui/e-itip-control.c:895
# calendar/gui/e-itip-control.c:895
# calendar/gui/e-itip-control.c:948
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1068
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> 已回复一个会议请求。"
@@ -9502,14 +9616,14 @@ msgstr "<b>%s</b> 已回复一个会议请求。"
# calendar/gui/e-itip-control.c:896
# calendar/gui/e-itip-control.c:896
# calendar/gui/e-itip-control.c:949
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
msgid "Meeting Reply"
msgstr "会议答复"
# calendar/gui/e-itip-control.c:900
# calendar/gui/e-itip-control.c:900
# calendar/gui/e-itip-control.c:953
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1076
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
@@ -9517,7 +9631,7 @@ msgstr "<b>%s</b> 取消了一个会议。"
# calendar/gui/e-itip-control.c:901
# calendar/gui/e-itip-control.c:901
# calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
msgid "Meeting Cancellation"
msgstr "会议取消"
@@ -9527,8 +9641,8 @@ msgstr "会议取消"
# calendar/gui/e-itip-control.c:990
# calendar/gui/e-itip-control.c:958 calendar/gui/e-itip-control.c:1029
# calendar/gui/e-itip-control.c:1064
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1180
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> 发送了一个无法理解的信息。"
@@ -9536,14 +9650,14 @@ msgstr "<b>%s</b> 发送了一个无法理解的信息。"
# calendar/gui/e-itip-control.c:906
# calendar/gui/e-itip-control.c:906
# calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
msgid "Bad Meeting Message"
msgstr "错误的会议信息"
# calendar/gui/e-itip-control.c:925
# calendar/gui/e-itip-control.c:925
# calendar/gui/e-itip-control.c:979
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1106
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> 发布了任务信息。"
@@ -9551,14 +9665,14 @@ msgstr "<b>%s</b> 发布了任务信息。"
# calendar/gui/e-itip-control.c:926
# calendar/gui/e-itip-control.c:926
# calendar/gui/e-itip-control.c:980
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
msgid "Task Information"
msgstr "任务信息"
# calendar/gui/e-itip-control.c:930
# calendar/gui/e-itip-control.c:930
# calendar/gui/e-itip-control.c:984
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请求您完成一个任务。"
@@ -9566,14 +9680,14 @@ msgstr "<b>%s</b> 请求您完成一个任务。"
# calendar/gui/e-itip-control.c:931
# calendar/gui/e-itip-control.c:931
# calendar/gui/e-itip-control.c:985
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
msgid "Task Proposal"
msgstr "任务建议"
# calendar/gui/e-itip-control.c:935
# calendar/gui/e-itip-control.c:935
# calendar/gui/e-itip-control.c:989
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1116
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s<b> 希望加入到已存在的任务。"
@@ -9581,14 +9695,14 @@ msgstr "<b>%s<b> 希望加入到已存在的任务。"
# calendar/gui/e-itip-control.c:936
# calendar/gui/e-itip-control.c:936
# calendar/gui/e-itip-control.c:990
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
msgid "Task Update"
msgstr "任务更新"
# calendar/gui/e-itip-control.c:940
# calendar/gui/e-itip-control.c:940
# calendar/gui/e-itip-control.c:994
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1121
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> 希望获取最新的任务信息。"
@@ -9596,14 +9710,14 @@ msgstr "<b>%s</b> 希望获取最新的任务信息。"
# calendar/gui/e-itip-control.c:941
# calendar/gui/e-itip-control.c:941
# calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
msgid "Task Update Request"
msgstr "任务更新请求"
# calendar/gui/e-itip-control.c:945
# calendar/gui/e-itip-control.c:945
# calendar/gui/e-itip-control.c:1019
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1129
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> 已经回复了任务委派。"
@@ -9611,14 +9725,14 @@ msgstr "<b>%s</b> 已经回复了任务委派。"
# calendar/gui/e-itip-control.c:946
# calendar/gui/e-itip-control.c:946
# calendar/gui/e-itip-control.c:1020
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
msgid "Task Reply"
msgstr "任务回复"
# calendar/gui/e-itip-control.c:950
# calendar/gui/e-itip-control.c:950
# calendar/gui/e-itip-control.c:1024
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1137
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> 取消了任务。"
@@ -9626,21 +9740,21 @@ msgstr "<b>%s</b> 取消了任务。"
# calendar/gui/e-itip-control.c:951
# calendar/gui/e-itip-control.c:951
# calendar/gui/e-itip-control.c:1025
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
msgid "Task Cancellation"
msgstr "任务取消"
# calendar/gui/e-itip-control.c:956
# calendar/gui/e-itip-control.c:956
# calendar/gui/e-itip-control.c:1030
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
msgid "Bad Task Message"
msgstr "错误的任务邮件"
# calendar/gui/e-itip-control.c:975
# calendar/gui/e-itip-control.c:975
# calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1158
+#: calendar/gui/e-itip-control.c:1165
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> 发布了忙闲信息。"
@@ -9648,14 +9762,14 @@ msgstr "<b>%s</b> 发布了忙闲信息。"
# calendar/gui/e-itip-control.c:976
# calendar/gui/e-itip-control.c:976
# calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
msgid "Free/Busy Information"
msgstr "忙闲信息"
# calendar/gui/e-itip-control.c:980
# calendar/gui/e-itip-control.c:980
# calendar/gui/e-itip-control.c:1054
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1170
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请求您的忙闲信息。"
@@ -9663,14 +9777,14 @@ msgstr "<b>%s</b> 请求您的忙闲信息。"
# calendar/gui/e-itip-control.c:981
# calendar/gui/e-itip-control.c:981
# calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
msgid "Free/Busy Request"
msgstr "忙闲请求"
# calendar/gui/e-itip-control.c:985
# calendar/gui/e-itip-control.c:985
# calendar/gui/e-itip-control.c:1059
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1175
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> 应答了忙闲请求。"
@@ -9678,136 +9792,148 @@ msgstr "<b>%s</b> 应答了忙闲请求。"
# calendar/gui/e-itip-control.c:986
# calendar/gui/e-itip-control.c:986
# calendar/gui/e-itip-control.c:1060
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
msgid "Free/Busy Reply"
msgstr "忙闲应答"
# calendar/gui/e-itip-control.c:991
# calendar/gui/e-itip-control.c:991
# calendar/gui/e-itip-control.c:1065
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
msgid "Bad Free/Busy Message"
msgstr "错误的忙闲信息"
# calendar/gui/e-itip-control.c:1064
# calendar/gui/e-itip-control.c:1064
# calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1236
msgid "The message does not appear to be properly formed"
msgstr "邮件的格式可能不正确"
# calendar/gui/e-itip-control.c:1083
# calendar/gui/e-itip-control.c:1083
# calendar/gui/e-itip-control.c:1157
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
msgid "The message contains only unsupported requests."
msgstr "邮件只含有不支持的请求。"
# calendar/gui/e-itip-control.c:1111 calendar/gui/e-itip-control.c:1117
# calendar/gui/e-itip-control.c:1111 calendar/gui/e-itip-control.c:1117
# calendar/gui/e-itip-control.c:1185 calendar/gui/e-itip-control.c:1191
-#: calendar/gui/e-itip-control.c:1276 calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
msgid "The attachment does not contain a valid calendar message"
msgstr "附件中没有有效的日程信息"
# calendar/gui/e-itip-control.c:1142
# calendar/gui/e-itip-control.c:1142
# calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日程项目"
-#: calendar/gui/e-itip-control.c:1458 calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
msgid "Object is invalid and cannot be updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1461 calendar/gui/e-itip-control.c:1553
+#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
msgid "There was an error on the CORBA system\n"
msgstr ""
# calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
# calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
# calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
-#: calendar/gui/e-itip-control.c:1464 calendar/gui/e-itip-control.c:1556
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
#, fuzzy
msgid "Object could not be found\n"
msgstr "无法发送项目!\n"
-#: calendar/gui/e-itip-control.c:1467 calendar/gui/e-itip-control.c:1559
-msgid "You don't have permissions to update the calendar\n"
-msgstr ""
+# calendar/gui/gnome-cal.c:1499
+# calendar/gui/gnome-cal.c:1499
+# calendar/gui/gnome-cal.c:1493
+#: calendar/gui/e-itip-control.c:1517
+#, fuzzy
+msgid "You do not have the right permissions to update the calendar\n"
+msgstr "无法打开“%s”中的文件夹"
# calendar/gui/e-itip-control.c:1243
# calendar/gui/e-itip-control.c:1243
# calendar/gui/e-itip-control.c:1317
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
msgid "Update complete\n"
msgstr "更新完成\n"
# calendar/gui/e-itip-control.c:1241
# calendar/gui/e-itip-control.c:1241
# calendar/gui/e-itip-control.c:1315
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
msgid "Calendar file could not be updated!\n"
msgstr "无法更新日历文件!\n"
# calendar/gui/e-itip-control.c:1300
# calendar/gui/e-itip-control.c:1300
# calendar/gui/e-itip-control.c:1374
-#: calendar/gui/e-itip-control.c:1502 calendar/gui/e-itip-control.c:1568
+#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新参与者状态"
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1573
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr ""
# calendar/gui/e-itip-control.c:1288
# calendar/gui/e-itip-control.c:1288
# calendar/gui/e-itip-control.c:1362
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1585
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新参与者状态!\n"
+# calendar/gui/gnome-cal.c:1499
+# calendar/gui/gnome-cal.c:1499
+# calendar/gui/gnome-cal.c:1493
+#: calendar/gui/e-itip-control.c:1609
+#, fuzzy
+msgid "You don't have the right permissions to update the calendar\n"
+msgstr "无法打开“%s”中的文件夹"
+
# calendar/gui/e-itip-control.c:1298
# calendar/gui/e-itip-control.c:1298
# calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1562
+#: calendar/gui/e-itip-control.c:1612
msgid "Attendee status updated\n"
msgstr "更新参与者状态\n"
# calendar/gui/e-itip-control.c:1296
# calendar/gui/e-itip-control.c:1296
# calendar/gui/e-itip-control.c:1370
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
msgid "Attendee status could not be updated!\n"
msgstr "无法更新参与者状态!\n"
# calendar/gui/e-itip-control.c:1328
# calendar/gui/e-itip-control.c:1328
# calendar/gui/e-itip-control.c:1402
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
msgid "Removal Complete"
msgstr "删除完成"
# calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1411
# calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1411
# calendar/gui/e-itip-control.c:1421 calendar/gui/e-itip-control.c:1471
-#: calendar/gui/e-itip-control.c:1630 calendar/gui/e-itip-control.c:1680
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
msgid "Item sent!\n"
msgstr "项目已发送!\n"
# calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
# calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
# calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1684
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:834
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
#, fuzzy
msgid "Select Calendar Folder"
msgstr "选择文件夹"
@@ -9815,7 +9941,7 @@ msgstr "选择文件夹"
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:834
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
#, fuzzy
msgid "Select Tasks Folder"
msgstr "选择文件夹"
@@ -9894,7 +10020,7 @@ msgstr "主席人员"
# calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1550
# calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
# calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
msgid "Required Participants"
msgstr "必需的参与者"
@@ -9923,7 +10049,7 @@ msgstr "资源"
# calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
# calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:562 calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
msgid "Individual"
msgstr "个人"
@@ -9934,7 +10060,7 @@ msgstr "个人"
# calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
# calendar/gui/e-meeting-model.c:779
#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:831
msgid "Group"
msgstr "组"
@@ -9945,7 +10071,7 @@ msgstr "组"
# calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
# calendar/gui/e-meeting-model.c:780
#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:829
+#: calendar/gui/e-meeting-model.c:832
msgid "Resource"
msgstr "资源"
@@ -9956,7 +10082,7 @@ msgstr "资源"
# calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
# calendar/gui/e-meeting-model.c:781
#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:833
msgid "Room"
msgstr "房间"
@@ -9967,7 +10093,7 @@ msgstr "房间"
# calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
# calendar/gui/e-meeting-model.c:794
#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:846
msgid "Chair"
msgstr "主席"
@@ -9978,7 +10104,7 @@ msgstr "主席"
# calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
# calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:844
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
msgid "Required Participant"
msgstr "必需的参与者"
@@ -9989,7 +10115,7 @@ msgstr "必需的参与者"
# calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
# calendar/gui/e-meeting-model.c:796
#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:845
+#: calendar/gui/e-meeting-model.c:848
msgid "Optional Participant"
msgstr "可选的参与者"
@@ -10000,7 +10126,7 @@ msgstr "可选的参与者"
# calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
# calendar/gui/e-meeting-model.c:797
#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:849
msgid "Non-Participant"
msgstr "不参加"
@@ -10011,7 +10137,7 @@ msgstr "不参加"
# calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
# calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:875 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
msgid "Tentative"
msgstr "暂时的"
@@ -10022,7 +10148,7 @@ msgstr "暂时的"
# calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
# calendar/gui/e-meeting-model.c:827
#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:876
+#: calendar/gui/e-meeting-model.c:879
msgid "Delegated"
msgstr "被委任的"
@@ -10184,8 +10310,8 @@ msgstr "会议结束时间(_E):"
# calendar/gui/e-tasks.c:328
# calendar/gui/e-tasks.c:328
# calendar/gui/e-tasks.c:342
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1976
-#: calendar/gui/gnome-cal.c:1987
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2018
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
@@ -10193,7 +10319,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:378 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
#, c-format
msgid "Could not load the tasks in `%s'"
msgstr "无法从“%s”中装入任务"
@@ -10201,7 +10327,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:390
+#: calendar/gui/e-tasks.c:393
#, c-format
msgid "The method required to load `%s' is not supported"
msgstr "不支持装入“%s”必需的方法"
@@ -10209,15 +10335,25 @@ msgstr "不支持装入“%s”必需的方法"
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1493
-#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
#, fuzzy, c-format
msgid "You don't have permission to open the folder in `%s'"
msgstr "无法打开“%s”中的文件夹"
+# shell/e-shell-importer.c:455
+# shell/e-shell-importer.c:455
+# shell/e-shell-importer.c:466
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "启动 %s 错误"
+
# calendar/gui/e-calendar-table.etspec.h:8
# calendar/gui/e-calendar-table.etspec.h:8
# calendar/gui/e-calendar-table.etspec.h:8
-#: calendar/gui/e-tasks.c:522
+#: calendar/gui/e-tasks.c:540
#, fuzzy
msgid "Completing tasks..."
msgstr "完成日期"
@@ -10228,7 +10364,7 @@ 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:545
+#: calendar/gui/e-tasks.c:563
#, fuzzy
msgid "Deleting selected objects..."
msgstr "删除选中的对象"
@@ -10236,14 +10372,14 @@ msgstr "删除选中的对象"
# mail/mail-ops.c:1556
# mail/mail-ops.c:1558
# calendar/gui/e-tasks.c:629
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
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:3519
+#: calendar/gui/e-week-view.c:3515
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
@@ -10263,7 +10399,16 @@ msgstr "无法打开“%s”中的文件夹"
msgid "The method required to open `%s' is not supported"
msgstr "不支持打开“%s”必需的方法"
-#: calendar/gui/gnome-cal.c:1734
+# 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
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "在 %s 时提醒"
+
+#: calendar/gui/gnome-cal.c:1761
#, c-format
msgid ""
"The calendar backend for\n"
@@ -10271,7 +10416,7 @@ msgid ""
" has crashed. You will have to restart Evolution in order to use it again"
msgstr ""
-#: calendar/gui/gnome-cal.c:1739
+#: calendar/gui/gnome-cal.c:1766
#, c-format
msgid ""
"The task backend for\n"
@@ -10282,7 +10427,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:1959
+#: calendar/gui/gnome-cal.c:1990
#, c-format
msgid "Opening calendar at %s"
msgstr "从 %s 打开日历"
@@ -10290,7 +10435,7 @@ msgstr "从 %s 打开日历"
# mail/mail-ops.c:1234
# mail/mail-ops.c:1236
# mail/mail-ops.c:1279
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
#, fuzzy
msgid "Opening default tasks folder"
msgstr "正在打开文件夹 %s"
@@ -10393,59 +10538,59 @@ msgstr "十月"
msgid "September"
msgstr "九月"
-# calendar/gui/itip-utils.c:243
-# calendar/gui/itip-utils.c:243
-# calendar/gui/itip-utils.c:243
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
-msgstr "至少需要一个参加者"
-
# calendar/gui/itip-utils.c:274
# calendar/gui/itip-utils.c:274
# calendar/gui/itip-utils.c:274
-#: calendar/gui/itip-utils.c:392
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
msgid "An organizer must be set."
msgstr "必须设定组织者。"
+# calendar/gui/itip-utils.c:243
+# calendar/gui/itip-utils.c:243
+# calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
+msgstr "至少需要一个参加者"
+
# calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
# calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
# calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
msgid "Event information"
msgstr "事件信息"
# calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
# calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
# calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
msgid "Task information"
msgstr "任务信息"
# calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
# calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
# calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
msgid "Journal information"
msgstr "日志信息"
# calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
# calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
# calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
msgid "Free/Busy information"
msgstr "忙闲信息"
# calendar/gui/itip-utils.c:321
# calendar/gui/itip-utils.c:321
# calendar/gui/itip-utils.c:321
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
msgid "Calendar information"
msgstr "日历信息"
# calendar/gui/e-itip-control.c:787
# calendar/gui/e-itip-control.c:787
# calendar/gui/e-itip-control.c:790
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
#, fuzzy
msgid "Updated"
msgstr "更新"
@@ -10453,19 +10598,34 @@ msgstr "更新"
# ui/evolution-subscribe.xml.h:3
# ui/evolution-subscribe.xml.h:3
# ui/evolution-subscribe.xml.h:3
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
#, fuzzy
msgid "Refresh"
msgstr "刷新列表"
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
msgid "Counter-proposal"
msgstr ""
+# calendar/gui/itip-utils.c:370
+# calendar/gui/itip-utils.c:370
+# calendar/gui/itip-utils.c:370
+#: calendar/gui/itip-utils.c:596
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "忙闲信息 (%s 到 %s)"
+
+# calendar/gui/itip-utils.c:382
+# calendar/gui/itip-utils.c:382
+# calendar/gui/itip-utils.c:382
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr "iCalendar 信息"
+
# calendar/gui/itip-utils.c:573
# calendar/gui/itip-utils.c:573
# calendar/gui/itip-utils.c:581
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:766
msgid "You must be an attendee of the event."
msgstr "您必须是事件的参与者。"
@@ -10909,7 +11069,7 @@ msgstr "打印日历"
# mail/mail-callbacks.c:2597 my-evolution/e-summary.c:605
# ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3162
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
#: my-evolution/e-summary.c:619
msgid "Print Preview"
msgstr "打印预览"
@@ -10946,7 +11106,7 @@ msgstr "要显示的任务文件夹的 URI"
# mail/mail-callbacks.c:2135
# mail/mail-callbacks.c:2254
# calendar/gui/tasks-control.c:434
-#: calendar/gui/tasks-control.c:453
+#: calendar/gui/tasks-control.c:462
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -10960,15 +11120,15 @@ msgstr ""
# mail/mail-callbacks.c:2142
# mail/mail-callbacks.c:2261
# calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2297
-#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2642
-#: mail/mail-callbacks.c:2884
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
msgid "Do not ask me again."
msgstr "不要再次询问。"
# addressbook/printing/e-contact-print.c:1111
# addressbook/printing/e-contact-print.c:1111
# addressbook/printing/e-contact-print.c:1115
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
#, fuzzy
msgid "Print Tasks"
msgstr "打印卡片"
@@ -11081,7 +11241,7 @@ msgstr "无法连接到存储: %s"
# calendar/gui/dialogs/event-editor.c:190
# calendar/gui/dialogs/event-editor.c:190
# calendar/gui/dialogs/event-editor.c:190
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
#, fuzzy
msgid "Reminder!!"
msgstr "提醒"
@@ -11089,7 +11249,7 @@ msgstr "提醒"
# calendar/gui/e-itip-control.glade.h:4
# calendar/gui/e-itip-control.glade.h:4
# calendar/gui/e-itip-control.glade.h:4
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
#, fuzzy
msgid "Calendar Events"
msgstr "日历消息"
@@ -11097,7 +11257,7 @@ msgstr "日历消息"
# importers/pine-importer.c:663
# importers/pine-importer.c:663
# importers/pine-importer.c:663
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
#, fuzzy
msgid ""
"Evolution has found Gnome Calendar files.\n"
@@ -11112,7 +11272,7 @@ msgstr ""
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
#, fuzzy
msgid "Gnome Calendar"
msgstr "日历"
@@ -11120,133 +11280,133 @@ msgstr "日历"
# calendar/pcs/query.c:246
# calendar/pcs/query.c:246
# calendar/pcs/query.c:246
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
msgid "time-now expects 0 arguments"
msgstr "time-now 需要 0 个参数"
# calendar/pcs/query.c:270
# calendar/pcs/query.c:270
# calendar/pcs/query.c:270
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
msgid "make-time expects 1 argument"
msgstr "make-time 需要 1 个参数"
# calendar/pcs/query.c:275
# calendar/pcs/query.c:275
# calendar/pcs/query.c:275
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
msgid "make-time expects argument 1 to be a string"
msgstr "make-time 的第一个参数应该是字符串"
# calendar/pcs/query.c:283
# calendar/pcs/query.c:283
# calendar/pcs/query.c:283
-#: calendar/pcs/query.c:292
+#: calendar/pcs/query.c:326
msgid "make-time argument 1 must be an ISO 8601 date/time string"
msgstr "make-time 的第一个参数必须是 ISO 8601 日期/时间字符串"
# calendar/pcs/query.c:312
# calendar/pcs/query.c:312
# calendar/pcs/query.c:312
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
msgid "time-add-day expects 2 arguments"
msgstr "time-add-day 需要 2 个参数"
# calendar/pcs/query.c:317
# calendar/pcs/query.c:317
# calendar/pcs/query.c:317
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:360
msgid "time-add-day expects argument 1 to be a time_t"
msgstr "time-add-day 的第一个参数应该是 time_t"
# calendar/pcs/query.c:324
# calendar/pcs/query.c:324
# calendar/pcs/query.c:324
-#: calendar/pcs/query.c:333
+#: calendar/pcs/query.c:367
msgid "time-add-day expects argument 2 to be an integer"
msgstr "time-add-day 的第二个参数应该是整数"
# calendar/pcs/query.c:351
# calendar/pcs/query.c:351
# calendar/pcs/query.c:351
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
msgid "time-day-begin expects 1 argument"
msgstr "time-day-begin 需要 1 个参数"
# calendar/pcs/query.c:356
# calendar/pcs/query.c:356
# calendar/pcs/query.c:356
-#: calendar/pcs/query.c:365
+#: calendar/pcs/query.c:399
msgid "time-day-begin expects argument 1 to be a time_t"
msgstr "time-day-begin 的第一个参数应该是 time_t"
# calendar/pcs/query.c:383
# calendar/pcs/query.c:383
# calendar/pcs/query.c:383
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
msgid "time-day-end expects 1 argument"
msgstr "time-day-end 需要一个参数"
# calendar/pcs/query.c:388
# calendar/pcs/query.c:388
# calendar/pcs/query.c:388
-#: calendar/pcs/query.c:397
+#: calendar/pcs/query.c:431
msgid "time-day-end expects argument 1 to be a time_t"
msgstr "time-day-end 的第一个参数应该是 time_t"
# calendar/pcs/query.c:424
# calendar/pcs/query.c:424
# calendar/pcs/query.c:424
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
msgid "get-vtype expects 0 arguments"
msgstr "get-vtype 需要 0 个参数"
# calendar/pcs/query.c:520
# calendar/pcs/query.c:520
# calendar/pcs/query.c:520
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
msgid "occur-in-time-range? expects 2 arguments"
msgstr "occur-in-time-range? 需要两个参数"
# calendar/pcs/query.c:525
# calendar/pcs/query.c:525
# calendar/pcs/query.c:525
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:568
msgid "occur-in-time-range? expects argument 1 to be a time_t"
msgstr "occur-in-time-range? 的第一个参数应该是 time_t"
# calendar/pcs/query.c:532
# calendar/pcs/query.c:532
# calendar/pcs/query.c:532
-#: calendar/pcs/query.c:541
+#: calendar/pcs/query.c:575
msgid "occur-in-time-range? expects argument 2 to be a time_t"
msgstr "occur-in-time-rang? 的第二个参数应该是 time_t"
# calendar/pcs/query.c:662
# calendar/pcs/query.c:662
# calendar/pcs/query.c:662
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
msgid "contains? expects 2 arguments"
msgstr "contains? 需要 2 个参数"
# calendar/pcs/query.c:667
# calendar/pcs/query.c:667
# calendar/pcs/query.c:667
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
msgid "contains? expects argument 1 to be a string"
msgstr "contains? 的第一个参数应该是字符串"
# calendar/pcs/query.c:674
# calendar/pcs/query.c:674
# calendar/pcs/query.c:674
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
msgid "contains? expects argument 2 to be a string"
msgstr "contains? 的第二个参数应该是字符串"
# calendar/pcs/query.c:691
# calendar/pcs/query.c:691
# calendar/pcs/query.c:691
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
msgid ""
"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
"\""
@@ -11255,14 +11415,14 @@ msgstr "contains? 的第一个参数必须是“任意”、“概要”、“
# calendar/pcs/query.c:733
# calendar/pcs/query.c:733
# calendar/pcs/query.c:733
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
msgid "has-categories? expects at least 1 argument"
msgstr "has-categories? 至少需要 1 个参数"
# calendar/pcs/query.c:745
# calendar/pcs/query.c:745
# calendar/pcs/query.c:745
-#: calendar/pcs/query.c:754
+#: calendar/pcs/query.c:788
msgid ""
"has-categories? expects all arguments to be strings or one and only one "
"argument to be a boolean false (#f)"
@@ -11271,31 +11431,39 @@ msgstr "has-categories? 的所有参数都应该为字符串或者它唯一的
# calendar/pcs/query.c:833
# calendar/pcs/query.c:833
# calendar/pcs/query.c:833
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
msgid "is-completed? expects 0 arguments"
msgstr "is-completed? 需要 0 个参数"
# calendar/pcs/query.c:878
# calendar/pcs/query.c:878
# calendar/pcs/query.c:878
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
msgid "completed-before? expects 1 argument"
msgstr "completed-before? 需要 1 个参数"
# calendar/pcs/query.c:883
# calendar/pcs/query.c:883
# calendar/pcs/query.c:883
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
msgid "completed-before? expects argument 1 to be a time_t"
msgstr "completed-before? 的第一个参数应该是 time_t"
# calendar/pcs/query.c:1160
# calendar/pcs/query.c:1160
# calendar/pcs/query.c:1160
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
msgid "Evaluation of the search expression did not yield a boolean value"
msgstr "计算搜索表达式没有得到布尔值"
+# addressbook/gui/widgets/e-addressbook-util.c:41
+# addressbook/gui/widgets/e-addressbook-util.c:41
+# addressbook/gui/widgets/e-addressbook-util.c:41
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "其它错误"
+
# calendar/zones.h:7
# calendar/zones.h:7
#.
@@ -13795,14 +13963,14 @@ msgstr "您必需在线工作以便完成该操作"
# camel/camel-filter-driver.c:553 camel/camel-filter-driver.c:562
# camel/camel-filter-driver.c:602 camel/camel-filter-driver.c:611
# camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:698
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
msgid "Syncing folders"
msgstr "同步文件夹"
# camel/camel-filter-driver.c:921
# camel/camel-filter-driver.c:970
# camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
-#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "解析过滤规则错误: %s: %s"
@@ -13810,7 +13978,7 @@ msgstr "解析过滤规则错误: %s: %s"
# camel/camel-filter-driver.c:927
# camel/camel-filter-driver.c:976
# camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "执行过滤规则错误: %s: %s"
@@ -13818,21 +13986,21 @@ msgstr "执行过滤规则错误: %s: %s"
# camel/camel-filter-driver.c:664
# camel/camel-filter-driver.c:713
# camel/camel-filter-driver.c:865
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
msgid "Unable to open spool folder"
msgstr "无法打开脱机文件夹"
# camel/camel-filter-driver.c:673
# camel/camel-filter-driver.c:722
# camel/camel-filter-driver.c:874
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
msgid "Unable to process spool folder"
msgstr "无法处理脱机文件夹"
# camel/camel-filter-driver.c:688
# camel/camel-filter-driver.c:737
# camel/camel-filter-driver.c:889
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "获取邮件 %d (%d%%)"
@@ -13840,14 +14008,14 @@ msgstr "获取邮件 %d (%d%%)"
# camel/camel-filter-driver.c:692
# camel/camel-filter-driver.c:741
# camel/camel-filter-driver.c:893
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
msgid "Cannot open message"
msgstr "无法打开消息"
# camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
# camel/camel-filter-driver.c:742 camel/camel-filter-driver.c:754
# camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
-#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
+#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
#, c-format
msgid "Failed on message %d"
msgstr "在消息 %d 失败"
@@ -13855,14 +14023,14 @@ msgstr "在消息 %d 失败"
# camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
# camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:881
# camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
-#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
msgid "Syncing folder"
msgstr "正在同步文件夹"
# camel/camel-filter-driver.c:789
# camel/camel-filter-driver.c:838
# camel/camel-filter-driver.c:988
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
#, c-format
msgid "Getting message %d of %d"
msgstr "正在获取第 %d 个消息,共 %d 个"
@@ -13870,7 +14038,7 @@ msgstr "正在获取第 %d 个消息,共 %d 个"
# camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
# camel/camel-filter-driver.c:843 camel/camel-filter-driver.c:861
# camel/camel-filter-driver.c:1003
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
#, c-format
msgid "Failed at message %d of %d"
msgstr "在第 %d 个消息失败,共 %d 个"
@@ -13878,14 +14046,14 @@ msgstr "在第 %d 个消息失败,共 %d 个"
# camel/camel-smime-context.c:810
# camel/camel-smime-context.c:810
# camel/camel-filter-search.c:126
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
msgid "Failed to retrieve message"
msgstr "检索消息失败。"
# shell/e-shell.c:1886
# shell/e-shell.c:1886
# shell/e-shell.c:1887
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
#, fuzzy
msgid "Invalid arguments to (system-flag)"
msgstr "无效参数"
@@ -13893,7 +14061,7 @@ msgstr "无效参数"
# shell/e-shell.c:1886
# shell/e-shell.c:1886
# shell/e-shell.c:1887
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
#, fuzzy
msgid "Invalid arguments to (user-tag)"
msgstr "无效参数"
@@ -13910,7 +14078,7 @@ msgstr "无效参数"
# camel/providers/imap/camel-imap-message-cache.c:313
# camel/providers/imap/camel-imap-message-cache.c:344
# camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
#, fuzzy, c-format
msgid "Failed to create pipe to '%s': %s"
msgstr "缓冲邮件 %s 失败: %s"
@@ -13927,7 +14095,7 @@ msgstr "缓冲邮件 %s 失败: %s"
# camel/providers/imap/camel-imap-message-cache.c:313
# camel/providers/imap/camel-imap-message-cache.c:344
# camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-filter-search.c:547
+#: camel/camel-filter-search.c:550
#, fuzzy, c-format
msgid "Failed to create create child process '%s': %s"
msgstr "缓冲邮件 %s 失败: %s"
@@ -13935,7 +14103,7 @@ msgstr "缓冲邮件 %s 失败: %s"
# camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
# camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
# camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
-#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
+#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "执行过滤规则搜索错误: %s: %s"
@@ -14006,14 +14174,14 @@ msgstr "不支持的操作:按 uid 搜索:搜索 %s"
# camel/camel-folder.c:1262
# camel/camel-folder.c:1262
# camel/camel-folder.c:1262
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
msgid "Moving messages"
msgstr "正在移动邮件"
# mail/mail-ops.c:868
# mail/mail-ops.c:870
# mail/mail-ops.c:913
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
#, fuzzy
msgid "Copying messages"
msgstr "把邮件复制到 %s"
@@ -14511,7 +14679,7 @@ msgstr ""
# camel/camel-sasl-kerberos4.c:218
# camel/providers/imap/camel-imap-store.c:495
#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:1064
msgid "Bad authentication response from server."
msgstr "来自服务器的无效认证应答。"
@@ -14600,7 +14768,7 @@ msgstr "常规表达式编译失败: %s: %s"
# camel/camel-service.c:157
# camel/camel-service.c:157
# camel/camel-service.c:157
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL “%s” 需要用户名组件"
@@ -14608,7 +14776,7 @@ msgstr "URL “%s” 需要用户名组件"
# camel/camel-service.c:165
# camel/camel-service.c:165
# camel/camel-service.c:165
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL “%s” 需要主机组件"
@@ -14616,7 +14784,7 @@ msgstr "URL “%s” 需要主机组件"
# camel/camel-service.c:173
# camel/camel-service.c:173
# camel/camel-service.c:173
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL “%s” 需要路径组件"
@@ -14624,7 +14792,7 @@ msgstr "URL “%s” 需要路径组件"
# camel/camel-service.c:611
# camel/camel-service.c:614
# camel/camel-service.c:614
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
#, c-format
msgid "Resolving: %s"
msgstr "正在解析: %s"
@@ -14632,7 +14800,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:884
+#: camel/camel-service.c:774 camel/camel-service.c:885
#, c-format
msgid "Failure in name lookup: %s"
msgstr "域名寻找失败: %s"
@@ -14640,7 +14808,7 @@ msgstr "域名寻找失败: %s"
# camel/camel-service.c:663
# camel/camel-service.c:666
# camel/camel-service.c:666
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr "主机寻找失败: %s: 没有找到主机"
@@ -14648,7 +14816,7 @@ msgstr "主机寻找失败: %s: 没有找到主机"
# camel/camel-service.c:665
# camel/camel-service.c:668
# camel/camel-service.c:668
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr "主机寻找失败: %s: 未知的原因"
@@ -14656,7 +14824,7 @@ msgstr "主机寻找失败: %s: 未知的原因"
# camel/camel-service.c:611
# camel/camel-service.c:614
# camel/camel-service.c:614
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
#, fuzzy
msgid "Resolving address"
msgstr "正在解析: %s"
@@ -14664,7 +14832,7 @@ msgstr "正在解析: %s"
# camel/camel-service.c:663
# camel/camel-service.c:666
# camel/camel-service.c:666
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
#, fuzzy
msgid "Host lookup failed: host not found"
msgstr "主机寻找失败: %s: 没有找到主机"
@@ -14672,7 +14840,7 @@ msgstr "主机寻找失败: %s: 没有找到主机"
# camel/camel-service.c:665
# camel/camel-service.c:668
# camel/camel-service.c:668
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
#, fuzzy
msgid "Host lookup failed: unknown reason"
msgstr "主机寻找失败: %s: 未知的原因"
@@ -14950,7 +15118,7 @@ msgid "Error in application verification"
msgstr ""
# camel/camel-tcp-stream-ssl.c:438
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
#, c-format
msgid ""
"Issuer: %s\n"
@@ -14964,12 +15132,12 @@ msgstr ""
"签名: %s"
# camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
msgid "GOOD"
msgstr "好"
# camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
msgid "BAD"
msgstr "坏"
@@ -14997,7 +15165,7 @@ msgstr ""
# camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
# camel/camel-tcp-stream-ssl.c:447
#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -15088,10 +15256,10 @@ msgstr "无法重命名文件夹: %s: 没有该文件夹"
# camel/camel-remote-store.c:481
# camel/providers/imap/camel-imap-command.c:228
# camel/providers/imap/camel-imap-command.c:409
-#: camel/providers/imap/camel-imap-command.c:223
-#: camel/providers/imap/camel-imap-command.c:262
-#: camel/providers/imap/camel-imap-command.c:441
-#: camel/providers/imap/camel-imap-store.c:2578
+#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:263
+#: camel/providers/imap/camel-imap-command.c:451
+#: camel/providers/imap/camel-imap-store.c:2641
msgid "Operation cancelled"
msgstr "操作已取消"
@@ -15101,8 +15269,8 @@ msgstr "操作已取消"
# camel/providers/imap/camel-imap-command.c:274
# camel/camel-remote-store.c:484
# camel/providers/imap/camel-imap-command.c:274
-#: camel/providers/imap/camel-imap-command.c:307
-#: camel/providers/imap/camel-imap-store.c:2581
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2644
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "服务器意外地中止了连接: %s"
@@ -15110,7 +15278,18 @@ msgstr "服务器意外地中止了连接: %s"
# camel/providers/imap/camel-imap-command.c:352
# camel/providers/imap/camel-imap-command.c:352
# camel/providers/imap/camel-imap-command.c:352
-#: camel/providers/imap/camel-imap-command.c:385
+#. for imap ALERT codes, account user@host
+#: camel/providers/imap/camel-imap-command.c:326
+#, fuzzy, c-format
+msgid ""
+"Alert from IMAP server %s@%s:\n"
+"%s"
+msgstr "来自 IMAP 服务器的意外应答: %s"
+
+# camel/providers/imap/camel-imap-command.c:352
+# camel/providers/imap/camel-imap-command.c:352
+# camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:395
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "来自 IMAP 服务器的意外应答: %s"
@@ -15118,7 +15297,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:395
+#: camel/providers/imap/camel-imap-command.c:405
#, c-format
msgid "IMAP command failed: %s"
msgstr "IMAP 命令失败: %s"
@@ -15126,14 +15305,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:450
+#: 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:642
+#: camel/providers/imap/camel-imap-command.c:652
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "IMAP 服务器应答不含有 %s 信息"
@@ -15141,7 +15320,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:678
+#: camel/providers/imap/camel-imap-command.c:688
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr "来自 IMAP 服务器意外的 OK 应答: %s"
@@ -15149,7 +15328,7 @@ msgstr "来自 IMAP 服务器意外的 OK 应答: %s"
# camel/providers/imap/camel-imap-folder.c:194
# camel/providers/imap/camel-imap-folder.c:194
# camel/providers/imap/camel-imap-folder.c:197
-#: camel/providers/imap/camel-imap-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:221
#, c-format
msgid "Could not create directory %s: %s"
msgstr "无法创建目录 %s: %s"
@@ -15157,7 +15336,7 @@ msgstr "无法创建目录 %s: %s"
# camel/providers/imap/camel-imap-folder.c:213
# camel/providers/imap/camel-imap-folder.c:213
# camel/providers/imap/camel-imap-folder.c:216
-#: camel/providers/imap/camel-imap-folder.c:239
+#: camel/providers/imap/camel-imap-folder.c:240
#, c-format
msgid "Could not load summary for %s"
msgstr "无法为 %s 装入概要"
@@ -15165,7 +15344,7 @@ msgstr "无法为 %s 装入概要"
# camel/providers/imap/camel-imap-folder.c:277
# camel/providers/imap/camel-imap-folder.c:277
# camel/providers/imap/camel-imap-folder.c:282
-#: camel/providers/imap/camel-imap-folder.c:305
+#: camel/providers/imap/camel-imap-folder.c:306
msgid "Folder was destroyed and recreated on server."
msgstr "文件夹已被删除并在服务器上重建了。"
@@ -15173,14 +15352,14 @@ msgstr "文件夹已被删除并在服务器上重建了。"
# camel/providers/imap/camel-imap-folder.c:461
# camel/providers/imap/camel-imap-folder.c:466
#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:547
+#: camel/providers/imap/camel-imap-folder.c:548
msgid "Scanning for changed messages"
msgstr "正在扫描改变了的邮件"
# camel/camel-smime-context.c:810
# camel/camel-smime-context.c:810
# camel/camel-filter-search.c:126
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
#, fuzzy, c-format
msgid "Unable to retrieve message: %s"
msgstr "检索消息失败。"
@@ -15209,7 +15388,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
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
#: camel/providers/local/camel-maildir-folder.c:212
#: camel/providers/local/camel-maildir-folder.c:224
#: camel/providers/local/camel-maildir-folder.c:233
@@ -15237,7 +15416,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:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
#: camel/providers/local/camel-maildir-folder.c:212
#: camel/providers/local/camel-mbox-folder.c:347
#: camel/providers/local/camel-mh-folder.c:201
@@ -15250,8 +15429,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:1927
-#: camel/providers/imap/camel-imap-folder.c:2424
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
msgid "This message is not currently available"
msgstr "该邮件目前不可用"
@@ -15261,22 +15440,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:2084
-#: camel/providers/imap/camel-imap-folder.c:2161
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
msgid "Fetching summary information for new messages"
msgstr "从新邮件中获取概要信息"
-# camel/providers/imap/camel-imap-folder.c:1746
-# camel/providers/imap/camel-imap-folder.c:1746
-# camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr "正在扫描新邮件"
-
# camel/providers/imap/camel-imap-folder.c:2038
# camel/providers/imap/camel-imap-folder.c:2038
# camel/providers/imap/camel-imap-folder.c:2145
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2565
msgid "Could not find message body in FETCH response."
msgstr "无法在 FETCH 应答中找到邮件体。"
@@ -15308,6 +15480,23 @@ msgstr "无法打开缓冲器目录: %s"
msgid "Failed to cache message %s: %s"
msgstr "缓冲邮件 %s 失败: %s"
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "缓冲邮件 %s 失败: %s"
+
# camel/providers/imap/camel-imap-provider.c:43
# camel/providers/imap/camel-imap-provider.c:43
# camel/providers/imap/camel-imap-provider.c:43
@@ -15396,7 +15585,7 @@ msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
# camel/providers/smtp/camel-smtp-transport.c:554
# camel/providers/smtp/camel-smtp-transport.c:554
# camel/providers/smtp/camel-smtp-transport.c:565
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
#, fuzzy, c-format
msgid "IMAP server %s"
msgstr "SMTP 服务器 %s"
@@ -15404,7 +15593,7 @@ msgstr "SMTP 服务器 %s"
# camel/camel-remote-store.c:207
# camel/camel-remote-store.c:207
# camel/camel-remote-store.c:207
-#: camel/providers/imap/camel-imap-store.c:458
+#: camel/providers/imap/camel-imap-store.c:459
#, fuzzy, c-format
msgid "IMAP service for %s on %s"
msgstr "%s 为 %s 服务,在 %s"
@@ -15412,7 +15601,7 @@ msgstr "%s 为 %s 服务,在 %s"
# camel/camel-remote-store.c:264
# camel/camel-remote-store.c:264
# camel/camel-remote-store.c:264
-#: camel/providers/imap/camel-imap-store.c:583
+#: camel/providers/imap/camel-imap-store.c:584
#: camel/providers/nntp/camel-nntp-store.c:130
#: camel/providers/nntp/camel-nntp-store.c:148
#: camel/providers/pop3/camel-pop3-store.c:180
@@ -15425,9 +15614,9 @@ msgstr "连接已取消"
# camel/providers/smtp/camel-smtp-transport.c:273
# camel/camel-remote-store.c:267
# camel/providers/smtp/camel-smtp-transport.c:276
-#: camel/providers/imap/camel-imap-store.c:586
+#: camel/providers/imap/camel-imap-store.c:587
#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/smtp/camel-smtp-transport.c:272
#, c-format
msgid "Could not connect to %s (port %d): %s"
msgstr "无法连接到 %s (端口 %d): %s"
@@ -15435,8 +15624,8 @@ msgstr "无法连接到 %s (端口 %d): %s"
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
-#: camel/providers/imap/camel-imap-store.c:645
-#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:677
#, fuzzy, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr ""
@@ -15446,7 +15635,7 @@ msgstr ""
# shell/e-storage.c:518
# shell/e-storage.c:518
# shell/e-storage.c:518
-#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:647
#: camel/providers/pop3/camel-pop3-store.c:213
#, fuzzy
msgid "SSL/TLS extension not supported."
@@ -15455,24 +15644,16 @@ msgstr "不支持的操作"
# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:678
#: camel/providers/pop3/camel-pop3-store.c:254
#, fuzzy
msgid "SSL negotiations failed"
msgstr "认证失败。"
-# shell/e-storage.c:510
-# shell/e-storage.c:510
-# shell/e-storage.c:510
-#: camel/providers/imap/camel-imap-store.c:940
-#, fuzzy, c-format
-msgid "The folder %s no longer exists"
-msgstr "文件夹不为空"
-
# camel/providers/imap/camel-imap-store.c:518
# camel/providers/imap/camel-imap-store.c:518
# camel/providers/imap/camel-imap-store.c:518
-#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/imap/camel-imap-store.c:1087
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
@@ -15483,8 +15664,8 @@ msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
# camel/providers/smtp/camel-smtp-transport.c:389
# camel/providers/imap/camel-imap-store.c:528
# camel/providers/smtp/camel-smtp-transport.c:393
-#: camel/providers/imap/camel-imap-store.c:1084
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/smtp/camel-smtp-transport.c:482
#, c-format
msgid "No support for authentication type %s"
msgstr "不支持验证类型 %s"
@@ -15492,7 +15673,7 @@ msgstr "不支持验证类型 %s"
# camel/providers/imap/camel-imap-store.c:552
# camel/providers/imap/camel-imap-store.c:552
# camel/providers/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1121
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%s请为 %s@%s 输入 IMAP 密码"
@@ -15503,15 +15684,15 @@ msgstr "%s请为 %s@%s 输入 IMAP 密码"
# camel/providers/smtp/camel-smtp-transport.c:430
# camel/providers/imap/camel-imap-store.c:567
# camel/providers/smtp/camel-smtp-transport.c:434
-#: camel/providers/imap/camel-imap-store.c:1123
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
msgid "You didn't enter a password."
msgstr "您没有输入密码。"
# camel/providers/imap/camel-imap-store.c:596
# camel/providers/imap/camel-imap-store.c:596
# camel/providers/imap/camel-imap-store.c:596
-#: camel/providers/imap/camel-imap-store.c:1152
+#: camel/providers/imap/camel-imap-store.c:1165
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -15525,8 +15706,8 @@ msgstr ""
# camel/providers/imap/camel-imap-store.c:899
# camel/providers/imap/camel-imap-store.c:899
# camel/providers/imap/camel-imap-store.c:900
-#: camel/providers/imap/camel-imap-store.c:1450
-#: camel/providers/imap/camel-imap-store.c:1592
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
#, c-format
msgid "No such folder %s"
msgstr "没有文件夹 %s"
@@ -15534,7 +15715,7 @@ msgstr "没有文件夹 %s"
# shell/e-shell-utils.c:121
# shell/e-shell-utils.c:121
# shell/e-shell-utils.c:121
-#: camel/providers/imap/camel-imap-store.c:1793
+#: camel/providers/imap/camel-imap-store.c:1814
#, fuzzy, c-format
msgid ""
"The folder name \"%s\" is invalid because it containes the character \"%c\""
@@ -15549,7 +15730,7 @@ msgstr "文件夹名不能含有回车符。"
# camel/providers/local/camel-mbox-summary.c:873
# camel/providers/local/camel-spool-summary.c:544
# camel/providers/local/camel-spool-summary.c:1110
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1826
#, fuzzy, c-format
msgid "Unknown parent folder: %s"
msgstr "未知的错误: %s"
@@ -15557,7 +15738,7 @@ msgstr "未知的错误: %s"
# camel/providers/imap/camel-imap-store.c:1274
# camel/providers/imap/camel-imap-store.c:1274
# camel/providers/imap/camel-imap-store.c:1275
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:1862
msgid "The parent folder is not allowed to contain subfolders"
msgstr "父文件夹不允许含有子文件夹"
@@ -15681,8 +15862,8 @@ msgstr "在标准邮件箱文件中读取和存储本地邮件。"
# camel/providers/local/camel-local-store.c:227
# camel/providers/local/camel-spool-store.c:109
#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:229
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:112
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "存储根目录 %s 不是绝对路径"
@@ -15706,7 +15887,7 @@ msgstr "存储根目录 %s 不是普通目录"
# camel/providers/local/camel-local-store.c:235
#: camel/providers/local/camel-local-store.c:155
#: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "无法获取文件夹: %s: %s"
@@ -15729,7 +15910,7 @@ msgstr "本地邮件文件 %s"
# camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
# camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
# camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
-#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
+#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "无法将文件夹 %s 改名为 %s: %s"
@@ -15737,7 +15918,7 @@ msgstr "无法将文件夹 %s 改名为 %s: %s"
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
-#: camel/providers/local/camel-local-store.c:359
+#: camel/providers/local/camel-local-store.c:363
#, fuzzy, c-format
msgid "Could not rename '%s': %s"
msgstr "无法重命名文件夹: %s"
@@ -15745,7 +15926,7 @@ msgstr "无法重命名文件夹: %s"
# camel/providers/local/camel-local-store.c:374
# camel/providers/local/camel-local-store.c:374
# camel/providers/local/camel-local-store.c:374
-#: camel/providers/local/camel-local-store.c:380
+#: camel/providers/local/camel-local-store.c:384
#, c-format
msgid "Could not delete folder summary file `%s': %s"
msgstr "无法删除文件夹概要文件 “%s”: %s"
@@ -15753,7 +15934,7 @@ msgstr "无法删除文件夹概要文件 “%s”: %s"
# camel/providers/local/camel-local-store.c:384
# camel/providers/local/camel-local-store.c:384
# camel/providers/local/camel-local-store.c:384
-#: camel/providers/local/camel-local-store.c:390
+#: camel/providers/local/camel-local-store.c:394
#, c-format
msgid "Could not delete folder index file `%s': %s"
msgstr "无法删除文件夹索引文件 “%s”: %s"
@@ -15761,7 +15942,7 @@ msgstr "无法删除文件夹索引文件 “%s”: %s"
# camel/providers/local/camel-local-summary.c:367
# camel/providers/local/camel-local-summary.c:367
# camel/providers/local/camel-local-summary.c:367
-#: camel/providers/local/camel-local-summary.c:406
+#: camel/providers/local/camel-local-summary.c:398
#, c-format
msgid "Could not save summary: %s: %s"
msgstr "无法保存概要: %s: %s"
@@ -15772,7 +15953,7 @@ msgstr "无法保存概要: %s: %s"
# camel/providers/local/camel-spool-summary.c:1157
# camel/providers/local/camel-local-summary.c:423
# camel/providers/local/camel-spool-summary.c:1157
-#: camel/providers/local/camel-local-summary.c:462
+#: camel/providers/local/camel-local-summary.c:454
msgid "Unable to add message to summary: unknown reason"
msgstr "无法将邮件添加到概要中: 未知的原因"
@@ -15810,6 +15991,7 @@ msgstr "无效的邮件内容"
# camel/providers/local/camel-mh-store.c:89
#: camel/providers/local/camel-maildir-store.c:106
#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-spool-store.c:160
#, c-format
msgid ""
"Could not open folder `%s':\n"
@@ -15830,6 +16012,7 @@ msgstr ""
#: camel/providers/local/camel-maildir-store.c:110
#: camel/providers/local/camel-mbox-store.c:101
#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-spool-store.c:164
#, c-format
msgid "Folder `%s' does not exist."
msgstr "文件夹“%s”不存在。"
@@ -15842,6 +16025,7 @@ msgstr "文件夹“%s”不存在。"
# camel/providers/local/camel-mh-store.c:102
#: camel/providers/local/camel-maildir-store.c:117
#: camel/providers/local/camel-mh-store.c:216
+#: camel/providers/local/camel-spool-store.c:168
#, c-format
msgid ""
"Could not create folder `%s':\n"
@@ -15885,7 +16069,8 @@ msgstr "不是邮件目录"
# camel/providers/local/camel-maildir-store.c:331
# camel/providers/local/camel-maildir-store.c:331
#: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:252
+#: camel/providers/local/camel-spool-store.c:282
+#: camel/providers/local/camel-spool-store.c:312
#, c-format
msgid "Could not scan folder `%s': %s"
msgstr "无法扫描文件夹“%s”: %s"
@@ -15951,7 +16136,7 @@ msgstr "正在存储文件夹"
# camel/providers/local/camel-mbox-folder.c:151
# camel/providers/local/camel-spool-folder.c:274
#: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:147
+#: camel/providers/local/camel-spool-folder.c:148
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr "无法在 %s 创建文件夹锁: %s"
@@ -16294,7 +16479,7 @@ msgstr "无法打开 MH 目录: %s: %s"
# camel/providers/local/camel-spool-store.c:209
# camel/providers/local/camel-spool-store.c:209
# camel/providers/local/camel-spool-store.c:209
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:118
#, fuzzy, c-format
msgid "Spool `%s' cannot be opened: %s"
msgstr "脱机文件夹无法改名"
@@ -16302,7 +16487,7 @@ msgstr "脱机文件夹无法改名"
# camel/providers/local/camel-local-store.c:145
# camel/providers/local/camel-local-store.c:145
# camel/providers/local/camel-local-store.c:145
-#: camel/providers/local/camel-spool-store.c:128
+#: camel/providers/local/camel-spool-store.c:130
#, fuzzy, c-format
msgid "Spool `%s' is not a regular file or directory"
msgstr "存储根目录 %s 不是普通目录"
@@ -16310,19 +16495,30 @@ msgstr "存储根目录 %s 不是普通目录"
# camel/providers/local/camel-spool-store.c:141
# camel/providers/local/camel-spool-store.c:141
# camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spool-store.c:145
+#: camel/providers/local/camel-spool-store.c:150
#, c-format
msgid "Folder `%s/%s' does not exist."
msgstr "文件夹“%s/%s”不存在。"
-#: camel/providers/local/camel-spool-store.c:162
+# camel/providers/local/camel-mbox-store.c:118
+# camel/providers/local/camel-mbox-store.c:145
+# camel/providers/local/camel-mbox-store.c:118
+# camel/providers/local/camel-mbox-store.c:145
+# camel/providers/local/camel-mbox-store.c:118
+# camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy, c-format
+msgid "`%s' is not a mailbox file."
+msgstr "“%s”并不是普通文件。"
+
+#: camel/providers/local/camel-spool-store.c:193
msgid "Store does not support an INBOX"
msgstr ""
# camel/providers/local/camel-spool-store.c:163
# camel/providers/local/camel-spool-store.c:163
# camel/providers/local/camel-spool-store.c:163
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
#, c-format
msgid "Spool mail file %s"
msgstr "脱机邮件文件 %s"
@@ -16330,7 +16526,7 @@ msgstr "脱机邮件文件 %s"
# camel/providers/local/camel-spool-store.c:209
# camel/providers/local/camel-spool-store.c:209
# camel/providers/local/camel-spool-store.c:209
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
#, fuzzy, c-format
msgid "Spool folder tree %s"
msgstr "脱机文件夹无法改名"
@@ -16338,14 +16534,14 @@ msgstr "脱机文件夹无法改名"
# camel/providers/local/camel-spool-store.c:209
# camel/providers/local/camel-spool-store.c:209
# camel/providers/local/camel-spool-store.c:209
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
msgid "Spool folders cannot be renamed"
msgstr "脱机文件夹无法改名"
# camel/providers/local/camel-spool-store.c:217
# camel/providers/local/camel-spool-store.c:217
# camel/providers/local/camel-spool-store.c:217
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
msgid "Spool folders cannot be deleted"
msgstr "脱机文件夹无法删除"
@@ -16507,7 +16703,7 @@ msgstr "操作失败:%s"
# camel/providers/pop3/camel-pop3-folder.c:175
# camel/providers/pop3/camel-pop3-folder.c:175
# camel/providers/pop3/camel-pop3-folder.c:175
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
msgid "Retrieving POP summary"
msgstr "检索 POP 概要"
@@ -16520,10 +16716,10 @@ msgstr "检索 POP 概要"
# camel/providers/imap/camel-imap-command.c:228
# camel/providers/imap/camel-imap-command.c:409
# camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/pop3/camel-pop3-folder.c:261
-#: camel/providers/pop3/camel-pop3-folder.c:426
-#: camel/providers/pop3/camel-pop3-folder.c:485
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:486
+#: camel/providers/pop3/camel-pop3-folder.c:503
msgid "User cancelled"
msgstr "用户已取消"
@@ -16545,7 +16741,7 @@ msgstr "用户已取消"
# camel/providers/local/camel-spool-folder.c:579
# camel/providers/nntp/camel-nntp-folder.c:153
# camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:264
#, c-format
msgid "Cannot get POP summary: %s"
msgstr "无法获取消息 POP 摘要:%s"
@@ -16553,14 +16749,14 @@ msgstr "无法获取消息 POP 摘要:%s"
# camel/providers/pop3/camel-pop3-folder.c:252
# camel/providers/pop3/camel-pop3-folder.c:252
# camel/providers/pop3/camel-pop3-folder.c:252
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
msgid "Expunging deleted messages"
msgstr "彻底去除已删除的邮件"
# camel/providers/pop3/camel-pop3-folder.c:367
# camel/providers/pop3/camel-pop3-folder.c:367
# camel/providers/pop3/camel-pop3-folder.c:367
-#: camel/providers/pop3/camel-pop3-folder.c:400
+#: camel/providers/pop3/camel-pop3-folder.c:401
#, c-format
msgid "No message with uid %s"
msgstr "没有 uid 为 %s 的邮件"
@@ -16570,7 +16766,7 @@ msgstr "没有 uid 为 %s 的邮件"
# camel/providers/pop3/camel-pop3-folder.c:371
#. Sigh, most of the crap in this function is so that the cancel button
#. returns the proper exception code. Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
#, c-format
msgid "Retrieving POP message %d"
msgstr "检索 POP 邮件 %d"
@@ -16593,10 +16789,10 @@ msgstr "检索 POP 邮件 %d"
# camel/providers/local/camel-spool-folder.c:579
# camel/providers/nntp/camel-nntp-folder.c:153
# camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:428
-#: camel/providers/pop3/camel-pop3-folder.c:487
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:504
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:488
+#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:505
#, c-format
msgid "Cannot get message %s: %s"
msgstr "无法获取消息 %s:%s"
@@ -16604,7 +16800,7 @@ msgstr "无法获取消息 %s:%s"
# my-evolution/metar.c:247
# my-evolution/metar.c:247
# my-evolution/metar.c:247
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
msgid "Unknown reason"
msgstr "未知原因"
@@ -17042,7 +17238,7 @@ msgstr "必须认证"
# 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:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
#, fuzzy
msgid "Welcome response error"
msgstr "QUIT 应答错误"
@@ -17050,8 +17246,8 @@ msgstr "QUIT 应答错误"
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:378
#, fuzzy, c-format
msgid "Failed to connect to SMTP server %s in secure mode: %s"
msgstr ""
@@ -17061,7 +17257,7 @@ msgstr ""
# calendar/gui/e-itip-control.c:1064
# calendar/gui/e-itip-control.c:1064
# calendar/gui/e-itip-control.c:1138
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
#, fuzzy
msgid "server does not appear to support SSL"
msgstr "邮件的格式可能不正确"
@@ -17069,7 +17265,7 @@ msgstr "邮件的格式可能不正确"
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1199
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:354
#, fuzzy, c-format
msgid "STARTTLS request timed out: %s"
msgstr "RSET 请求超时: %s"
@@ -17077,7 +17273,7 @@ msgstr "RSET 请求超时: %s"
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1104
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
#, fuzzy
msgid "STARTTLS response error"
msgstr "DATA 应答错误"
@@ -17085,7 +17281,7 @@ msgstr "DATA 应答错误"
# camel/providers/smtp/camel-smtp-transport.c:379
# camel/providers/smtp/camel-smtp-transport.c:379
# camel/providers/smtp/camel-smtp-transport.c:383
-#: camel/providers/smtp/camel-smtp-transport.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:472
#, fuzzy, c-format
msgid "SMTP server %s does not support requested authentication type %s."
msgstr "SMTP 服务器 %s 并不支持请求的认证类型 %s"
@@ -17093,7 +17289,7 @@ msgstr "SMTP 服务器 %s 并不支持请求的认证类型 %s"
# camel/providers/smtp/camel-smtp-transport.c:417
# camel/providers/smtp/camel-smtp-transport.c:417
# camel/providers/smtp/camel-smtp-transport.c:421
-#: camel/providers/smtp/camel-smtp-transport.c:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
#, c-format
msgid "%sPlease enter the SMTP password for %s@%s"
msgstr "%s请为 %s@%s 输入 SMTP 密码"
@@ -17101,7 +17297,7 @@ msgstr "%s请为 %s@%s 输入 SMTP 密码"
# camel/providers/smtp/camel-smtp-transport.c:438
# camel/providers/smtp/camel-smtp-transport.c:438
# camel/providers/smtp/camel-smtp-transport.c:442
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:531
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -17115,7 +17311,7 @@ msgstr ""
# camel/providers/smtp/camel-smtp-transport.c:554
# camel/providers/smtp/camel-smtp-transport.c:554
# camel/providers/smtp/camel-smtp-transport.c:565
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: camel/providers/smtp/camel-smtp-transport.c:664
#, c-format
msgid "SMTP server %s"
msgstr "SMTP 服务器 %s"
@@ -17123,7 +17319,7 @@ msgstr "SMTP 服务器 %s"
# camel/providers/smtp/camel-smtp-transport.c:556
# camel/providers/smtp/camel-smtp-transport.c:556
# camel/providers/smtp/camel-smtp-transport.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:663
+#: camel/providers/smtp/camel-smtp-transport.c:666
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "通过 %s 发送 SMTP 邮件"
@@ -17131,42 +17327,42 @@ msgstr "通过 %s 发送 SMTP 邮件"
# camel/providers/smtp/camel-smtp-transport.c:588
# camel/providers/smtp/camel-smtp-transport.c:588
# camel/providers/smtp/camel-smtp-transport.c:598
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:684
msgid "Cannot send message: sender address not valid."
msgstr "无法发送邮件: 发件人地址不合法。"
# camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:558
# camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:560
# camel/providers/smtp/camel-smtp-transport.c:603 mail/mail-ops.c:603
-#: camel/providers/smtp/camel-smtp-transport.c:686 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
msgid "Sending message"
msgstr "正在发送邮件"
# camel/providers/smtp/camel-smtp-transport.c:604
# camel/providers/smtp/camel-smtp-transport.c:604
# camel/providers/smtp/camel-smtp-transport.c:614
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
msgid "Cannot send message: no recipients defined."
msgstr "无法发送邮件: 没有定义收件人。"
# camel/providers/smtp/camel-smtp-transport.c:604
# camel/providers/smtp/camel-smtp-transport.c:604
# camel/providers/smtp/camel-smtp-transport.c:624
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:713
msgid "Cannot send message: one or more invalid recipients"
msgstr "无法发送消息:一个或多个非法收件人"
# camel/providers/smtp/camel-smtp-transport.c:684
# camel/providers/smtp/camel-smtp-transport.c:684
# camel/providers/smtp/camel-smtp-transport.c:798
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
msgid "SMTP Greeting"
msgstr "SMTP 欢迎"
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1199
-#: camel/providers/smtp/camel-smtp-transport.c:912
+#: camel/providers/smtp/camel-smtp-transport.c:927
#, fuzzy, c-format
msgid "HELO request timed out: %s"
msgstr "RSET 请求超时: %s"
@@ -17174,7 +17370,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:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
#, fuzzy
msgid "HELO response error"
msgstr "RSET 应答错误"
@@ -17182,14 +17378,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:1000
+#: 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:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
msgid "Error creating SASL authentication object."
msgstr "创建 SASL 认证对象错误。"
@@ -17199,8 +17395,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:1023
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: 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"
@@ -17208,21 +17404,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:1044
+#: 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:1105
+#: 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:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1145
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr "MAIL FROM 请求超时: %s: 邮件未发送"
@@ -17230,20 +17426,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:1150
+#: 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:1174
+#: 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:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1211
#, c-format
msgid "RCPT TO <%s> failed"
msgstr "RCPT TO <%s> 失败"
@@ -17251,7 +17447,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:1238
+#: camel/providers/smtp/camel-smtp-transport.c:1253
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr "DATA 请求超时: %s: 邮件未发送"
@@ -17262,7 +17458,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:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
msgid "DATA response error"
msgstr "DATA 应答错误"
@@ -17272,8 +17468,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:1298
-#: camel/providers/smtp/camel-smtp-transport.c:1321
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr "DATA 发送超时: 消息终止: %s: 邮件未发送"
@@ -17283,14 +17479,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:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
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:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1379
#, c-format
msgid "RSET request timed out: %s"
msgstr "RSET 请求超时: %s"
@@ -17298,7 +17494,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:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
msgid "RSET response error"
msgstr "RSET 应答错误"
@@ -17308,7 +17504,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:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1422
#, fuzzy, c-format
msgid "QUIT request timed out: %s"
msgstr "AUTH 请求超时: %s"
@@ -17316,75 +17512,60 @@ 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:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
msgid "QUIT response error"
msgstr "QUIT 应答错误"
-# composer/e-msg-composer-attachment-bar.c:101
-# composer/e-msg-composer-attachment-bar.c:101
-# composer/e-msg-composer-attachment-bar.c:101
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr "1 字节"
-
-# composer/e-msg-composer-attachment-bar.c:103
-# composer/e-msg-composer-attachment-bar.c:103
-# composer/e-msg-composer-attachment-bar.c:103
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr "%u 字节"
-
# composer/e-msg-composer-attachment-bar.c:110
# composer/e-msg-composer-attachment-bar.c:110
# composer/e-msg-composer-attachment-bar.c:110
-#: composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.1fK"
+#: composer/e-msg-composer-attachment-bar.c:107
+#, fuzzy, c-format
+msgid "%.0fK"
msgstr "%.1fK"
# composer/e-msg-composer-attachment-bar.c:114
# composer/e-msg-composer-attachment-bar.c:114
# composer/e-msg-composer-attachment-bar.c:114
-#: composer/e-msg-composer-attachment-bar.c:115
-#, c-format
-msgid "%.1fM"
+#: composer/e-msg-composer-attachment-bar.c:110
+#, fuzzy, c-format
+msgid "%.0fM"
msgstr "%.1fM"
# composer/e-msg-composer-attachment-bar.c:118
# composer/e-msg-composer-attachment-bar.c:118
# composer/e-msg-composer-attachment-bar.c:118
-#: composer/e-msg-composer-attachment-bar.c:119
-#, c-format
-msgid "%.1fG"
+#: composer/e-msg-composer-attachment-bar.c:113
+#, fuzzy, c-format
+msgid "%.0fG"
msgstr "%.1fG"
# composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
# 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:378 mail/mail-display.c:220
+#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
msgid "attachment"
msgstr "附件"
# composer/e-msg-composer-attachment-bar.c:500
# composer/e-msg-composer-attachment-bar.c:506
# composer/e-msg-composer-attachment-bar.c:506
-#: composer/e-msg-composer-attachment-bar.c:523
+#: composer/e-msg-composer-attachment-bar.c:516
msgid "Remove selected items from the attachment list"
msgstr "从附件列表中删除选定的条目"
# composer/e-msg-composer-attachment-bar.c:531
# composer/e-msg-composer-attachment-bar.c:537
# composer/e-msg-composer-attachment-bar.c:537
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
msgid "Add attachment..."
msgstr "添加附件..."
# composer/e-msg-composer-attachment-bar.c:532
# composer/e-msg-composer-attachment-bar.c:538
# composer/e-msg-composer-attachment-bar.c:538
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
msgid "Attach a file to the message"
msgstr "把文件附件到邮件"
@@ -17443,7 +17624,7 @@ msgstr "建议自动显示附件"
# composer/e-msg-composer-hdrs.c:327
# composer/e-msg-composer-hdrs.c:327
# composer/e-msg-composer-hdrs.c:326
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
msgid "Click here for the address book"
msgstr "点击此处以使用地址簿"
@@ -17457,7 +17638,7 @@ msgstr "点击此处以使用地址簿"
#. * because that causes from_changed to be called, which
#. * expects the reply_to fields to be initialized.
#.
-#: composer/e-msg-composer-hdrs.c:382
+#: composer/e-msg-composer-hdrs.c:399
msgid "Reply-To:"
msgstr "回复到:"
@@ -17467,7 +17648,7 @@ msgstr "回复到:"
#.
#. * From
#.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
msgid "From:"
msgstr "发件人:"
@@ -17477,49 +17658,49 @@ msgstr "发件人:"
#.
#. * Subject
#.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
msgid "Subject:"
msgstr "主题:"
# composer/e-msg-composer-hdrs.c:389
# composer/e-msg-composer-hdrs.c:389
# composer/e-msg-composer-hdrs.c:387
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
msgid "To:"
msgstr "收信人:"
# composer/e-msg-composer-hdrs.c:390
# composer/e-msg-composer-hdrs.c:390
# composer/e-msg-composer-hdrs.c:388
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
msgid "Enter the recipients of the message"
msgstr "输入邮件的收件人"
# composer/e-msg-composer-hdrs.c:393
# composer/e-msg-composer-hdrs.c:393
# composer/e-msg-composer-hdrs.c:391
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
msgid "Cc:"
msgstr "抄送:"
# composer/e-msg-composer-hdrs.c:394
# composer/e-msg-composer-hdrs.c:394
# composer/e-msg-composer-hdrs.c:392
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:435
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "输入将接收该邮件副本的收件人地址"
# composer/e-msg-composer-hdrs.c:397
# composer/e-msg-composer-hdrs.c:397
# composer/e-msg-composer-hdrs.c:395
-#: composer/e-msg-composer-hdrs.c:421
+#: composer/e-msg-composer-hdrs.c:438
msgid "Bcc:"
msgstr "暗中抄送:"
# composer/e-msg-composer-hdrs.c:398
# composer/e-msg-composer-hdrs.c:398
# composer/e-msg-composer-hdrs.c:396
-#: composer/e-msg-composer-hdrs.c:422
+#: composer/e-msg-composer-hdrs.c:439
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -17531,7 +17712,7 @@ msgstr "输入将接收该邮件副本,但不出现在收件人列表中的收
#.
#. * Post-To
#.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
#, fuzzy
msgid "Post To:"
msgstr "波尔图"
@@ -17539,7 +17720,7 @@ msgstr "波尔图"
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:119
# my-evolution/e-summary-calendar.c:395
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
#, fuzzy
msgid "Posting destination"
msgstr "无描述"
@@ -17566,7 +17747,7 @@ msgstr "无法创建 PGP 签名上下文。"
# composer/e-msg-composer.c:743
# composer/e-msg-composer.c:747
# composer/e-msg-composer.c:695
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
#, c-format
msgid ""
"Error while reading file %s:\n"
@@ -17578,21 +17759,21 @@ msgstr ""
# composer/e-msg-composer.c:952
# composer/e-msg-composer.c:956
# composer/e-msg-composer.c:921
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
msgid "Warning!"
msgstr "警告!"
# composer/e-msg-composer.c:956
# composer/e-msg-composer.c:960
# composer/e-msg-composer.c:925
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
msgid "File exists, overwrite?"
msgstr "文件存在,覆盖它?"
# composer/e-msg-composer.c:978
# composer/e-msg-composer.c:982
# composer/e-msg-composer.c:947
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
#, c-format
msgid "Error saving file: %s"
msgstr "保存文件错误: %s"
@@ -17600,7 +17781,7 @@ msgstr "保存文件错误: %s"
# composer/e-msg-composer.c:997
# composer/e-msg-composer.c:1001
# composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
#, c-format
msgid "Error loading file: %s"
msgstr "读入文件错误: %s"
@@ -17608,7 +17789,7 @@ msgstr "读入文件错误: %s"
# composer/e-msg-composer.c:1118
# composer/e-msg-composer.c:1032
# composer/e-msg-composer.c:997
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
#, c-format
msgid "Error accessing file: %s"
msgstr "访问文件错误: %s"
@@ -17616,14 +17797,14 @@ msgstr "访问文件错误: %s"
# composer/e-msg-composer.c:1126
# composer/e-msg-composer.c:1040
# composer/e-msg-composer.c:1005
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
msgid "Unable to retrieve message from editor"
msgstr "无法从编辑器检索邮件"
# composer/e-msg-composer.c:1133
# composer/e-msg-composer.c:1047
# composer/e-msg-composer.c:1012
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
#, c-format
msgid ""
"Unable to seek on file: %s\n"
@@ -17635,7 +17816,7 @@ msgstr ""
# composer/e-msg-composer.c:1140
# composer/e-msg-composer.c:1054
# composer/e-msg-composer.c:1019
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
#, c-format
msgid ""
"Unable to truncate file: %s\n"
@@ -17647,7 +17828,7 @@ msgstr ""
# composer/e-msg-composer.c:1149
# composer/e-msg-composer.c:1063
# composer/e-msg-composer.c:1028
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
#, c-format
msgid ""
"Error autosaving message: %s\n"
@@ -17659,7 +17840,7 @@ msgstr ""
# composer/e-msg-composer.c:1251
# composer/e-msg-composer.c:1165
# composer/e-msg-composer.c:1130
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1371
msgid ""
"Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"
@@ -17667,43 +17848,57 @@ msgstr ""
"Ximian Evolution 发现上次会话含有未保存的文件。\n"
"您是否希望恢复它们?"
+# composer/e-msg-composer.c:1405
+# composer/e-msg-composer.c:1322
+# composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1525
+#, fuzzy, c-format
+msgid ""
+"The message \"%s\" has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"该邮件尚未发送。\n"
+"\n"
+"您是否希望保存修改?"
+
# composer/e-msg-composer.c:1412
# composer/e-msg-composer.c:1329
# composer/e-msg-composer.c:1295
-#: composer/e-msg-composer.c:1530
+#: composer/e-msg-composer.c:1536
msgid "Warning: Modified Message"
msgstr "警告: 已改动的邮件"
# composer/e-msg-composer.c:1435
# composer/e-msg-composer.c:1352
# composer/e-msg-composer.c:1318
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
msgid "Open file"
msgstr "打开文件"
# mail/mail-config.glade.h:79
# mail/mail-config.glade.h:79
# mail/mail-config.glade.h:88
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
#, fuzzy
msgid "Signature:"
msgstr "签名文件:"
-#: composer/e-msg-composer.c:1962 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
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:2149 composer/e-msg-composer.c:2773
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
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:2790
+#: composer/e-msg-composer.c:2796
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
@@ -17714,7 +17909,21 @@ 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:2816 composer/e-msg-composer.c:2871
+#: composer/e-msg-composer.c:2822
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+"无法创见撰写窗口:\n"
+"无法激活 HTML 编辑器组件。"
+
+# 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:2879
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
@@ -17722,7 +17931,7 @@ msgstr ""
"无法创见撰写窗口:\n"
"无法激活 HTML 编辑器组件。"
-#: composer/e-msg-composer.c:3838
+#: composer/e-msg-composer.c:3858
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -17731,7 +17940,7 @@ msgstr ""
# composer/evolution-composer.c:367
# composer/evolution-composer.c:367
# composer/evolution-composer.c:367
-#: composer/evolution-composer.c:376
+#: composer/evolution-composer.c:393
msgid ""
"Could not create composer window, because you have not yet\n"
"configured any identities in the mail component."
@@ -17742,8 +17951,9 @@ msgstr ""
# composer/evolution-composer.c:382
# composer/evolution-composer.c:382
# composer/evolution-composer.c:382
-#: composer/evolution-composer.c:391
-msgid "Cannot initialize Evolution's composer."
+#: composer/evolution-composer.c:408
+#, fuzzy
+msgid "Cannot initialize the Evolution composer."
msgstr "无法初始化 Evolution 的撰写器。"
# data/evolution.desktop.in.h:2
@@ -17836,8 +18046,8 @@ msgstr "主题不含有"
# mail/mail-display.c:106
# calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2070
# mail/mail-display.c:105
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2509
-#: mail/mail-display.c:190
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: mail/mail-display.c:192
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -18048,7 +18258,8 @@ msgid "years"
msgstr "年"
#: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
+#, fuzzy
+msgid "You must choose a date."
msgstr "您忘记选择日期了。"
#: filter/filter-datespec.c:269
@@ -18118,19 +18329,19 @@ msgstr "则"
msgid "Add action"
msgstr "添加动作"
+# addressbook/printing/e-contact-print.glade.h:38
+# addressbook/printing/e-contact-print.glade.h:38
+# mail/mail-config.glade.h:92
#: filter/filter-folder.c:149
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"您忘记选择文件夹了。\n"
-"请退回并指定一个合法的文件夹以便存入邮件。"
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "指定文件名:"
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:834
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
+#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
msgid "Select Folder"
msgstr "选择文件夹"
@@ -18143,7 +18354,7 @@ msgstr ""
"常规表达式错误 “%s”:\n"
"%s"
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:76
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
#: mail/mail-config.glade.h:63
msgid "Important"
msgstr "重要"
@@ -18342,143 +18553,66 @@ msgid "Beep"
msgstr "伯利兹"
#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "含有"
-
-#: filter/libfilter-i18n.h:8
msgid "Copy to Folder"
msgstr "复制到文件夹"
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
msgid "Date received"
msgstr "接收日期"
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
msgid "Date sent"
msgstr "发送日期"
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
msgid "Deleted"
msgstr "已删除"
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "不含有"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "不以之结尾"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "不存在"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "不存在"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "听起来不像"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "不以之开始"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
msgid "Do Not Exist"
msgstr "不存在"
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
msgid "Draft"
msgstr "草稿"
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "以之结束"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
msgid "Exist"
msgstr "存在"
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "存在"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
msgid "Expression"
msgstr "表达式"
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
msgid "Follow Up"
msgstr ""
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "是"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "以后"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "以前"
-
-# mail/message-list.etspec.h:2
-# mail/message-list.etspec.h:2
-# mail/message-list.etspec.h:2
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "is Flagged"
-msgstr "已标志"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "大于"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "小于"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "不是"
-
-# mail/message-list.etspec.h:2
-# mail/message-list.etspec.h:2
-# mail/message-list.etspec.h:2
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "已标志"
-
# ui/evolution-mail-message.xml.h:98
# ui/evolution-mail-message.xml.h:98
# my-evolution/Locations.h:1192
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
#, fuzzy
msgid "Label"
msgstr "劳雷尔"
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
msgid "Mailing list"
msgstr "邮件列表"
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
msgid "Message Body"
msgstr "邮件体"
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
msgid "Message Header"
msgstr "邮件头"
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
msgid "Move to Folder"
msgstr "移动到文件夹"
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
#, fuzzy
msgid "Pipe Message to Shell Command"
msgstr "执行 Shell 命令"
@@ -18486,105 +18620,186 @@ msgstr "执行 Shell 命令"
# calendar/gui/dialogs/alarm-options.glade.h:3
# calendar/gui/dialogs/alarm-options.glade.h:3
# calendar/gui/dialogs/alarm-options.glade.h:3
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
#, fuzzy
msgid "Play Sound"
msgstr "播放声音:"
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
msgid "Read"
msgstr "已读"
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
msgid "Recipients"
msgstr "收件人"
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
msgid "Regex Match"
msgstr "常规表达式匹配"
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
msgid "Replied to"
msgstr "已回复"
-# addressbook/backend/ebook/e-card-simple.c:65
-# addressbook/backend/ebook/e-card-simple.c:70
-# addressbook/backend/ebook/e-card-simple.c:65
-# addressbook/backend/ebook/e-card-simple.c:70
-# my-evolution/Locations.h:327
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "伯恩斯"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "大于"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "小于"
+#: filter/libfilter-i18n.h:29
+msgid "Run Once"
+msgstr ""
# mail/message-list.etspec.h:5
# mail/message-list.etspec.h:6
# mail/message-list.etspec.h:6
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
#: mail/message-list.etspec.h:10
msgid "Score"
msgstr "分数"
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
msgid "Sender"
msgstr "发件人"
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:32
msgid "Set Status"
msgstr "设置状态"
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:33
#, fuzzy
msgid "Shell Command"
msgstr "执行 Shell 命令"
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:34
msgid "Size (kB)"
msgstr "大小 (kB)"
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "听起来象"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:35
msgid "Source Account"
msgstr "来源帐号"
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:36
msgid "Specific header"
msgstr "指定邮件头"
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "以之开始"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:38
msgid "Stop Processing"
msgstr "停止处理"
# mail/message-list.etspec.h:9
# mail/message-list.etspec.h:10
# mail/message-list.etspec.h:10
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
-#: mail/message-list.etspec.h:13
+#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
msgid "Subject"
msgstr "主题"
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:40
#, fuzzy
msgid "Unset Status"
msgstr "设置状态"
+#: filter/libfilter-i18n.h:41
+msgid "contains"
+msgstr "含有"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
+msgstr "不含有"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not end with"
+msgstr "不以之结尾"
+
+#: filter/libfilter-i18n.h:44
+msgid "does not exist"
+msgstr "不存在"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not return"
+msgstr "不存在"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not sound like"
+msgstr "听起来不像"
+
+#: filter/libfilter-i18n.h:47
+msgid "does not start with"
+msgstr "不以之开始"
+
+#: filter/libfilter-i18n.h:48
+msgid "ends with"
+msgstr "以之结束"
+
+#: filter/libfilter-i18n.h:49
+msgid "exists"
+msgstr "存在"
+
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is Flagged"
+msgstr "已标志"
+
+#: filter/libfilter-i18n.h:51
+msgid "is after"
+msgstr "以后"
+
+#: filter/libfilter-i18n.h:52
+msgid "is before"
+msgstr "以前"
+
+#: filter/libfilter-i18n.h:53
+msgid "is greater than"
+msgstr "大于"
+
+#: filter/libfilter-i18n.h:54
+msgid "is less than"
+msgstr "小于"
+
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+#: filter/libfilter-i18n.h:55
+#, fuzzy
+msgid "is not Flagged"
+msgstr "已标志"
+
+#: filter/libfilter-i18n.h:56
+msgid "is not"
+msgstr "不是"
+
+#: filter/libfilter-i18n.h:57
+msgid "is"
+msgstr "是"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns greater than"
+msgstr "大于"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns less than"
+msgstr "小于"
+
+# addressbook/backend/ebook/e-card-simple.c:65
+# addressbook/backend/ebook/e-card-simple.c:70
+# addressbook/backend/ebook/e-card-simple.c:65
+# addressbook/backend/ebook/e-card-simple.c:70
+# my-evolution/Locations.h:327
+#: filter/libfilter-i18n.h:60
+#, fuzzy
+msgid "returns"
+msgstr "伯恩斯"
+
+#: filter/libfilter-i18n.h:61
+msgid "sounds like"
+msgstr "听起来象"
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
+msgstr "以之开始"
+
#: filter/rule-editor.c:180
msgid "Rules"
msgstr "规则"
@@ -18627,7 +18842,7 @@ msgstr "Evolution 正在导入您原来的电子邮件"
# importers/pine-importer.c:101
# importers/elm-importer.c:96 importers/netscape-importer.c:107
# importers/pine-importer.c:101
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
#: importers/pine-importer.c:101
msgid "Importing..."
msgstr "正在导入..."
@@ -18638,7 +18853,7 @@ msgstr "正在导入..."
# importers/pine-importer.c:103
# importers/elm-importer.c:98 importers/netscape-importer.c:109
# importers/pine-importer.c:103
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
#: importers/pine-importer.c:103
msgid "Please wait"
msgstr "请等待"
@@ -18649,7 +18864,7 @@ msgstr "请等待"
# importers/pine-importer.c:365
# importers/elm-importer.c:169 importers/netscape-importer.c:689
# importers/pine-importer.c:365
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
#: importers/pine-importer.c:365
#, c-format
msgid "Importing %s as %s"
@@ -18661,7 +18876,7 @@ msgstr "正在按 %2$s 导入 %1$s"
# importers/pine-importer.c:471
# importers/elm-importer.c:375 importers/netscape-importer.c:782
# importers/pine-importer.c:471
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
#: importers/pine-importer.c:471
#, c-format
msgid "Scanning %s"
@@ -18673,9 +18888,9 @@ msgstr "正在扫描 %s"
# importers/pine-importer.c:637 mail/component-factory.c:100
# importers/elm-importer.c:525 importers/netscape-importer.c:958
# importers/pine-importer.c:637 mail/component-factory.c:100
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2128
#: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:339
+#: mail/folder-browser-ui.c:353
msgid "Mail"
msgstr "邮件"
@@ -18751,7 +18966,7 @@ msgstr ""
# importers/netscape-importer.c:106
# importers/netscape-importer.c:106
# importers/netscape-importer.c:106
-#: importers/netscape-importer.c:1226
+#: importers/netscape-importer.c:1227
msgid "Evolution is importing your old Netscape data"
msgstr "Evolution 正在导入您原来的 Netscape 数据"
@@ -18759,7 +18974,7 @@ msgstr "Evolution 正在导入您原来的 Netscape 数据"
# mail/mail-ops.c:1060 shell/e-local-storage.c:178
# mail/mail-ops.c:1103 shell/e-local-storage.c:178
#. Fill in the new fields
-#: importers/netscape-importer.c:1871 mail/mail-ops.c:1101
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
#: shell/e-local-storage.c:183
msgid "Trash"
msgstr "已删除"
@@ -18767,7 +18982,7 @@ msgstr "已删除"
# camel/providers/local/camel-local-store.c:196
# camel/providers/local/camel-local-store.c:196
# camel/providers/local/camel-local-store.c:196
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
#, fuzzy
msgid "Scanning mail filters"
msgstr "本地邮件文件 %s"
@@ -18775,25 +18990,25 @@ msgstr "本地邮件文件 %s"
# importers/netscape-importer.c:888 importers/pine-importer.c:570
# importers/netscape-importer.c:888 importers/pine-importer.c:570
# importers/netscape-importer.c:888 importers/pine-importer.c:570
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
msgid "Scanning directory"
msgstr "正在扫描目录"
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
msgid "Starting import"
msgstr "开始导入"
# importers/netscape-importer.c:963
# importers/netscape-importer.c:963
# importers/netscape-importer.c:963
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
msgid "Settings"
msgstr "设置"
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
#, fuzzy
msgid "Mail Filters"
msgstr "编辑过滤规则"
@@ -18801,7 +19016,7 @@ msgstr "编辑过滤规则"
# importers/netscape-importer.c:984
# importers/netscape-importer.c:984
# importers/netscape-importer.c:984
-#: importers/netscape-importer.c:2160
+#: importers/netscape-importer.c:2161
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
@@ -18978,45 +19193,61 @@ msgstr "邮件配置界面"
msgid "Folder containing mail"
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
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public Mail"
+msgstr "公开"
+
+# mail/component-factory.c:100
+# mail/component-factory.c:100
+# mail/component-factory.c:100
+#: mail/component-factory.c:103
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "文件夹含有邮件"
+
# mail/component-factory.c:102
# mail/component-factory.c:102
# mail/component-factory.c:102
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
msgid "Virtual Trash"
msgstr "虚拟已删除邮件箱"
# mail/component-factory.c:102
# mail/component-factory.c:102
# mail/component-factory.c:102
-#: mail/component-factory.c:103
+#: mail/component-factory.c:104
msgid "Virtual Trash folder"
msgstr "虚拟已删除邮件文件夹"
# mail/component-factory.c:147
# mail/component-factory.c:147
# mail/component-factory.c:147
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
msgid "This folder cannot contain messages."
msgstr "该文件夹不能含有邮件。"
# mail/component-factory.c:432
# mail/component-factory.c:432
# mail/component-factory.c:432
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
msgid "Properties..."
msgstr "属性..."
# mail/component-factory.c:432
# mail/component-factory.c:432
# mail/component-factory.c:432
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
msgid "Change this folder's properties"
msgstr "改变该文件夹的属性"
# mail/component-factory.c:783
# mail/component-factory.c:783
# mail/component-factory.c:786
-#: mail/component-factory.c:785
+#: mail/component-factory.c:805
msgid ""
"Some of your mail settings seem corrupt, please check that everything is in "
"order."
@@ -19025,18 +19256,18 @@ msgstr "您的某些邮件设置好像已崩溃,请按顺序检查所有内容
# mail/mail-callbacks.c:230
# mail/mail-callbacks.c:230
# mail/mail-callbacks.c:187
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
msgid "You have not set a mail transport method"
msgstr "您还没有设置邮件传输方法"
-#: mail/component-factory.c:972
+#: mail/component-factory.c:992
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr ""
# composer/e-msg-composer.c:1412
# composer/e-msg-composer.c:1329
# composer/e-msg-composer.c:1295
-#: mail/component-factory.c:978
+#: mail/component-factory.c:998
#, fuzzy
msgid "Warning: Unsent Messages"
msgstr "警告: 已改动的邮件"
@@ -19044,21 +19275,21 @@ msgstr "警告: 已改动的邮件"
# mail/component-factory.c:951
# mail/component-factory.c:951
# mail/component-factory.c:955
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
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:1020
+#: mail/component-factory.c:1040
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:1021
+#: mail/component-factory.c:1041
#, fuzzy
msgid "Compose a new mail message"
msgstr "撰写邮件"
@@ -19066,7 +19297,7 @@ msgstr "撰写邮件"
# ui/evolution-mail-global.xml.h:10
# ui/evolution-mail-global.xml.h:10
# ui/evolution-mail-global.xml.h:10
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
#, fuzzy
msgid "New Message Post"
msgstr "新建邮件"
@@ -19074,7 +19305,7 @@ msgstr "新建邮件"
# ui/evolution-mail-message.xml.h:65
# ui/evolution-mail-message.xml.h:65
# ui/evolution-mail-message.xml.h:65
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
#, fuzzy
msgid "_Post Message"
msgstr "上一个邮件"
@@ -19082,7 +19313,7 @@ msgstr "上一个邮件"
# mail/component-factory.c:951
# mail/component-factory.c:951
# mail/component-factory.c:955
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
#, fuzzy
msgid "Post a new mail message"
msgstr "新建邮件"
@@ -19090,28 +19321,29 @@ msgstr "新建邮件"
# mail/component-factory.c:975
# mail/component-factory.c:975
# mail/component-factory.c:980
-#: mail/component-factory.c:1058
-msgid "Cannot initialize Evolution's mail component."
+#: mail/component-factory.c:1078
+#, fuzzy
+msgid "Cannot initialize the Evolution mail component."
msgstr "无法初始化 Evolution 的邮件组件。"
# mail/component-factory.c:984
# mail/component-factory.c:984
# mail/component-factory.c:989
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
msgid "Cannot initialize Evolution's mail config component."
msgstr "无法初始化 Evolution 的邮件配置组件。"
# mail/component-factory.c:990
# mail/component-factory.c:990
# mail/component-factory.c:995
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
msgid "Cannot initialize Evolution's folder info component."
msgstr "无法初始化 Evolution 的文件夹信息组件。"
# mail/mail-config.c:2184 mail/mail-config.c:2188
# mail/mail-config.c:2233 mail/mail-config.c:2237
# mail/mail-config.c:2326 mail/mail-config.c:2330
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
#, fuzzy
msgid "Connecting..."
msgstr "正在连接服务器..."
@@ -19119,14 +19351,14 @@ msgstr "正在连接服务器..."
# mail/component-factory.c:1206
# mail/component-factory.c:1206
# mail/component-factory.c:1211
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
msgid "Cannot register storage with shell"
msgstr "无法用 shell 注册存储"
# mail/folder-browser-ui.c:272
# mail/folder-browser-ui.c:272
# mail/folder-browser-ui.c:273
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
#, c-format
msgid "Properties for \"%s\""
msgstr "“%s”的属性"
@@ -19134,14 +19366,14 @@ msgstr "“%s”的属性"
# mail/folder-browser-ui.c:274
# mail/folder-browser-ui.c:274
# mail/folder-browser-ui.c:275
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
msgid "Properties"
msgstr "属性"
# mail/folder-browser.c:297 mail/mail-display.c:298
# mail/folder-browser.c:297 mail/mail-display.c:297
# mail/folder-browser.c:298 mail/mail-display.c:298
-#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:880
+#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "无法创建临时目录: %s"
@@ -19214,7 +19446,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:1107
+#: mail/folder-browser.c:1113
#, fuzzy
msgid "Create _Virtual Folder From Search..."
msgstr "从邮件创建虚拟文件夹(_V)"
@@ -19222,102 +19454,102 @@ msgstr "从邮件创建虚拟文件夹(_V)"
# mail/folder-browser.c:1430
# mail/folder-browser.c:1437
# mail/folder-browser.c:1438
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
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:1691
+#: mail/folder-browser.c:1694
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:1692
+#: mail/folder-browser.c:1695
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:1693
+#: mail/folder-browser.c:1696
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:1697
+#: mail/folder-browser.c:1700
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:1698
+#: mail/folder-browser.c:1701
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:1699
+#: mail/folder-browser.c:1702
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:1700 mail/folder-browser.c:2023
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
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:1718
+#: mail/folder-browser.c:1721
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:1720
+#: mail/folder-browser.c:1723
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:1724 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1727 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:1725 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1728 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:1726 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1729 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:1727
+#: mail/folder-browser.c:1730
msgid "_Forward"
msgstr "转发(_F)"
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
msgid "Follo_w Up..."
msgstr ""
@@ -19333,7 +19565,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:1732
+#: mail/folder-browser.c:1735
#, fuzzy
msgid "Fla_g Completed"
msgstr "已完成"
@@ -19342,7 +19574,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:1733
+#: mail/folder-browser.c:1736
#, fuzzy
msgid "Cl_ear Flag"
msgstr "清除"
@@ -19351,14 +19583,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:1737 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1740 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:1738
+#: mail/folder-browser.c:1741
#, fuzzy
msgid "Mark as _Unread"
msgstr "标记为未读(_N)"
@@ -19366,14 +19598,14 @@ msgstr "标记为未读(_N)"
# mail/folder-browser.c:1461
# mail/folder-browser.c:1468
# mail/folder-browser.c:1469
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
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:1740
+#: mail/folder-browser.c:1743
#, fuzzy
msgid "_Mark as Unimportant"
msgstr "标记为不重要(_O)"
@@ -19381,7 +19613,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:1745
+#: mail/folder-browser.c:1748
#, fuzzy
msgid "U_ndelete"
msgstr "反删除(_U)"
@@ -19389,7 +19621,7 @@ msgstr "反删除(_U)"
# mail/folder-browser.c:1466
# mail/folder-browser.c:1475
# mail/folder-browser.c:1476
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
#, fuzzy
msgid "Mo_ve to Folder..."
msgstr "移动到文件夹(_M)..."
@@ -19397,14 +19629,14 @@ msgstr "移动到文件夹(_M)..."
# mail/folder-browser.c:1467
# mail/folder-browser.c:1476
# mail/folder-browser.c:1477
-#: mail/folder-browser.c:1750 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1753 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:1758
+#: mail/folder-browser.c:1761
#, fuzzy
msgid "Add Sender to Address_book"
msgstr "将发件人添加到地址簿"
@@ -19412,7 +19644,7 @@ msgstr "将发件人添加到地址簿"
# mail/folder-browser.c:1476
# mail/folder-browser.c:1485
# mail/folder-browser.c:1486
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
#, fuzzy
msgid "Appl_y Filters"
msgstr "应用过滤规则"
@@ -19420,7 +19652,7 @@ msgstr "应用过滤规则"
# mail/folder-browser.c:1478
# mail/folder-browser.c:1487
# mail/folder-browser.c:1488
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
#, fuzzy
msgid "Crea_te Rule From Message"
msgstr "从消息创建规则(_L)"
@@ -19428,7 +19660,7 @@ msgstr "从消息创建规则(_L)"
# mail/folder-browser.c:1629
# mail/folder-browser.c:1657
# mail/folder-browser.c:1658
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
#, fuzzy
msgid "VFolder on M_ailing List"
msgstr "关于邮件列表的虚拟文件夹"
@@ -19436,7 +19668,7 @@ msgstr "关于邮件列表的虚拟文件夹"
# mail/folder-browser.c:1631
# mail/folder-browser.c:1659
# mail/folder-browser.c:1660
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
#, fuzzy, c-format
msgid "Filter on _Mailing List (%s)"
msgstr "过滤邮件列表 (%s)"
@@ -19444,7 +19676,7 @@ msgstr "过滤邮件列表 (%s)"
# mail/folder-browser.c:1632
# mail/folder-browser.c:1660
# mail/folder-browser.c:1661
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
#, fuzzy, c-format
msgid "VFolder on M_ailing List (%s)"
msgstr "关于邮件列表 (%s) 的虚拟文件夹"
@@ -19565,14 +19797,14 @@ msgstr "Evolution 帐号编辑器"
# mail/mail-config.glade.h:104
# mail/mail-config.glade.h:104
# mail/mail-config.glade.h:113
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
msgid "_Host:"
msgstr "主机(_H):"
# mail/mail-config.glade.h:117
# mail/mail-config.glade.h:117
# mail/mail-config.glade.h:126
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
#, fuzzy
msgid "User_name:"
msgstr "用户名(_U):"
@@ -19580,14 +19812,14 @@ msgstr "用户名(_U):"
# mail/mail-config.glade.h:112
# mail/mail-config.glade.h:112
# mail/mail-config.glade.h:121
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
msgid "_Path:"
msgstr "路径(_P):"
# mail/mail-account-gui.c:1654
# mail/mail-account-gui.c:1654
# mail/mail-account-gui.c:1665
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
msgid "You may not create two accounts with the same name."
msgstr "您不能以相同的名字创建两个帐号。"
@@ -19616,8 +19848,8 @@ msgstr "确实删除帐号?"
# mail/mail-accounts.c:194
# mail/mail-accounts.c:194
#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
+#: mail/mail-composer-prefs.c:704
msgid "Disable"
msgstr "禁用"
@@ -19625,8 +19857,8 @@ msgstr "禁用"
# mail/mail-accounts.c:196
# mail/mail-accounts.c:196
#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
+#: mail/mail-composer-prefs.c:704
msgid "Enable"
msgstr "启用"
@@ -19748,9 +19980,10 @@ msgstr ""
# mail/mail-callbacks.c:222
#. FIXME: this wording sucks
#: mail/mail-callbacks.c:255
+#, fuzzy
msgid ""
-"You are sending an HTML-formatted message, but the following recipients do "
-"not want HTML-formatted mail:\n"
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
msgstr "您正在发送 HTML 格式的消息,当以下收件人不希望接收 HTML 格式的邮件:\n"
# mail/mail-callbacks.c:280
@@ -19811,7 +20044,7 @@ msgstr "您必须指定收件人以便发送该消息。"
# composer/e-msg-composer.c:1068
# mail/mail-callbacks.c:716
# mail/mail-callbacks.c:668
-#: mail/mail-callbacks.c:776
+#: mail/mail-callbacks.c:777
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
@@ -19822,35 +20055,35 @@ msgstr ""
# mail/mail-callbacks.c:838
# mail/mail-callbacks.c:928
# mail/mail-callbacks.c:878
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
msgid "an unknown sender"
msgstr "未知的发件人"
# mail/mail-callbacks.c:843
# mail/mail-callbacks.c:933
# mail/mail-callbacks.c:883
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
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:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
msgid "Move message(s) to"
msgstr "将消息移动到"
# mail/mail-callbacks.c:1283 mail/message-browser.c:132
# mail/mail-callbacks.c:1378 mail/message-browser.c:132
# mail/mail-callbacks.c:1413 mail/message-browser.c:132
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
msgid "Copy message(s) to"
msgstr "将消息复制到"
# mail/mail-callbacks.c:1759
# mail/mail-callbacks.c:1878
# mail/mail-callbacks.c:1914
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr "您确信您需要编辑所有的 %d 个消息?"
@@ -19858,7 +20091,7 @@ msgstr "您确信您需要编辑所有的 %d 个消息?"
# mail/mail-callbacks.c:1784
# mail/mail-callbacks.c:1903
# mail/mail-callbacks.c:1939
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -19869,7 +20102,7 @@ msgstr ""
# mail/mail-callbacks.c:1823
# mail/mail-callbacks.c:1942
# mail/mail-callbacks.c:1978
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
msgid ""
"You may only resend messages\n"
"in the Sent folder."
@@ -19880,7 +20113,7 @@ msgstr ""
# mail/mail-callbacks.c:1837
# mail/mail-callbacks.c:1956
# mail/mail-callbacks.c:1992
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr "您确信您希望重新发送所有的 %d 个消息?"
@@ -19888,7 +20121,7 @@ msgstr "您确信您希望重新发送所有的 %d 个消息?"
# mail/mail-callbacks.c:1863
# mail/mail-callbacks.c:1982
# mail/mail-callbacks.c:2018
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
msgid "No Message Selected"
msgstr "没有选择消息"
@@ -19898,33 +20131,33 @@ msgstr "没有选择消息"
# mail/mail-display.c:102
# calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
# mail/mail-display.c:101
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
msgid "Overwrite file?"
msgstr "覆盖文件?"
# mail/mail-callbacks.c:1962
# mail/mail-callbacks.c:2081
# mail/mail-callbacks.c:2117
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
msgid "Save Message As..."
msgstr "消息另存为..."
# mail/mail-callbacks.c:1964
# mail/mail-callbacks.c:2083
# mail/mail-callbacks.c:2119
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
msgid "Save Messages As..."
msgstr "消息另存为..."
# ui/evolution-mail-message.xml.h:21
# ui/evolution-mail-message.xml.h:21
# ui/evolution-mail-message.xml.h:21
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
#, fuzzy
msgid "Go to next folder with unread messages?"
msgstr "显示下一个未读文件"
-#: mail/mail-callbacks.c:2634
+#: mail/mail-callbacks.c:2661
msgid ""
"There are no more new messages in this folder.\n"
"Would you like to go to the next folder?"
@@ -19933,7 +20166,7 @@ msgstr ""
# mail/mail-callbacks.c:2135
# mail/mail-callbacks.c:2254
# mail/mail-callbacks.c:2290
-#: mail/mail-callbacks.c:2877
+#: mail/mail-callbacks.c:2904
msgid ""
"This operation will permanently erase all messages marked as deleted. If you "
"continue, you will not be able to recover these messages.\n"
@@ -19948,7 +20181,7 @@ msgstr ""
# mail/mail-callbacks.c:2250
# mail/mail-callbacks.c:2369
# mail/mail-callbacks.c:2405
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -19960,14 +20193,14 @@ msgstr ""
# mail/mail-callbacks.c:2262
# mail/mail-callbacks.c:2381
# mail/mail-callbacks.c:2417
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
msgid "Filters"
msgstr "过滤规则"
# camel/camel-filter-driver.c:789
# camel/camel-filter-driver.c:838
# mail/mail-callbacks.c:2490
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
#, c-format
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
@@ -19975,32 +20208,32 @@ msgstr "第 %d 页,共 %d 页"
# mail/mail-callbacks.c:2325
# mail/mail-callbacks.c:2465
# mail/mail-callbacks.c:2542
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
msgid "Print Message"
msgstr "打印消息"
# mail/mail-callbacks.c:2492
# mail/mail-callbacks.c:2569
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
msgid "US-Letter"
msgstr "美国信纸"
# mail/mail-callbacks.c:2371
# mail/mail-callbacks.c:2531
# mail/mail-callbacks.c:2604
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
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:3338
+#: mail/mail-callbacks.c:3386
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr "您确信您希望在单独的窗口中打开所有的 %d 个消息?"
-#: mail/mail-composer-prefs.c:220
+#: mail/mail-composer-prefs.c:223
msgid ""
"Please specify signature filename\n"
"in Andvanced section of signature settings."
@@ -20009,20 +20242,20 @@ msgstr ""
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:119
# my-evolution/e-summary-calendar.c:395
-#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
-#: mail/mail-composer-prefs.c:408
+#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
+#: mail/mail-composer-prefs.c:413
#, fuzzy
msgid " [script]"
msgstr "无描述"
-#: mail/mail-composer-prefs.c:301
+#: mail/mail-composer-prefs.c:306
msgid "Please specify a valid script name"
msgstr ""
# addressbook/gui/component/select-names/e-select-names-popup.c:506
# addressbook/gui/component/select-names/e-select-names-popup.c:506
# addressbook/gui/component/select-names/e-select-names-popup.c:506
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
#, fuzzy
msgid "Unnamed"
msgstr "未命名的联系人"
@@ -20030,12 +20263,12 @@ msgstr "未命名的联系人"
# ui/evolution-message-composer.xml.h:27
# ui/evolution-message-composer.xml.h:27
# ui/evolution-message-composer.xml.h:27
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
#, fuzzy
msgid "en"
msgstr "发送"
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
#, fuzzy
msgid "Add script signature"
msgstr "添加条件"
@@ -20043,7 +20276,7 @@ msgstr "添加条件"
# mail/mail-account-gui.c:1039
# mail/mail-account-gui.c:1039
# mail/mail-account-gui.c:1036
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
#, fuzzy
msgid "Add Signature"
msgstr "保存签名"
@@ -20120,7 +20353,7 @@ msgstr "Evolution 帐号助手"
# mail/mail-config.c:326
# mail/mail-config.c:329
# mail/mail-config.c:354
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
#, c-format
msgid "Account %d"
msgstr "帐号 %d"
@@ -20128,14 +20361,14 @@ msgstr "帐号 %d"
# mail/mail-config.c:2113
# mail/mail-config.c:2155
# mail/mail-config.c:2248
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
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:2731 mail/mail-config.c:2735
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
msgid "Connecting to server..."
msgstr "正在连接服务器..."
@@ -21243,14 +21476,14 @@ msgstr "无法创建 S/MIME 解码上下文。"
# mail/mail-display.c:243
# mail/mail-display.c:242
# mail/mail-display.c:243
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
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:384
+#: mail/mail-display.c:386
#, fuzzy, c-format
msgid "Could not create temporary file '%s': %s"
msgstr "无法创建临时目录: %s"
@@ -21258,7 +21491,7 @@ msgstr "无法创建临时目录: %s"
# mail/mail-display.c:243
# mail/mail-display.c:242
# mail/mail-display.c:243
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
#, fuzzy
msgid "Save Attachment..."
msgstr "保存附件"
@@ -21266,14 +21499,14 @@ msgstr "保存附件"
# mail/mail-display.c:352
# mail/mail-display.c:351
# mail/mail-display.c:352
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
msgid "View Inline"
msgstr "嵌入视图"
# mail/mail-display.c:354
# mail/mail-display.c:353
# mail/mail-display.c:354
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
#, c-format
msgid "Open in %s..."
msgstr "在 %s 中打开..."
@@ -21281,7 +21514,7 @@ msgstr "在 %s 中打开..."
# mail/mail-display.c:415
# mail/mail-display.c:414
# mail/mail-display.c:415
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
#, c-format
msgid "View Inline (via %s)"
msgstr "嵌入视图 (通过 %s)"
@@ -21289,21 +21522,21 @@ msgstr "嵌入视图 (通过 %s)"
# mail/mail-display.c:419
# mail/mail-display.c:418
# mail/mail-display.c:419
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
msgid "Hide"
msgstr "隐藏"
# mail/mail-display.c:440
# mail/mail-display.c:439
# mail/mail-display.c:440
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
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:1279
+#: mail/mail-display.c:1319
#, fuzzy
msgid "Downloading images"
msgstr "装入图像(_I)"
@@ -21311,52 +21544,48 @@ msgstr "装入图像(_I)"
# mail/mail-display.c:1133
# mail/mail-display.c:1136
# mail/mail-display.c:1162
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
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:1756
+#: mail/mail-display.c:1781
#, fuzzy
msgid "Overdue:"
msgstr "被延误的任务(_V):"
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
#, fuzzy
msgid "by %B %d, %Y, %l:%M %P"
msgstr "%b %d %l:%M %p"
-#: mail/mail-display.c:1762
-msgid "at your earliest convenience"
-msgstr ""
-
# mail/mail-display.c:1602
# mail/mail-display.c:1628
# mail/mail-display.c:1657
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
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:2085
+#: mail/mail-display.c:2113
msgid "Copy Link Location"
msgstr "复制连接位置"
# mail/mail-display.c:1607
# mail/mail-display.c:1633
# mail/mail-display.c:1662
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
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:2089
+#: mail/mail-display.c:2117
msgid "Save Image as..."
msgstr "图像保存为..."
@@ -21374,7 +21603,7 @@ msgstr "正在扫描 %s"
# mail/mail-format.c:635
# mail/mail-format.c:640
# mail/mail-format.c:646
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
@@ -21382,56 +21611,57 @@ msgstr "%s 附件"
# mail/mail-format.c:680
# mail/mail-format.c:686
# mail/mail-format.c:692
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
msgid "Could not parse MIME message. Displaying as source."
msgstr "无法解析 MIME 邮件。显示源文本。"
# mail/mail-format.c:763
# mail/mail-format.c:769
# mail/mail-format.c:775
-#: mail/mail-format.c:776 mail/message-list.etspec.h:2
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
msgid "Date"
msgstr "日期"
# mail/mail-format.c:846
# mail/mail-format.c:861
# mail/mail-format.c:867
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
msgid "Bad Address"
msgstr "无效地址"
# mail/mail-format.c:886 mail/message-list.etspec.h:3
# mail/mail-format.c:904 mail/message-list.etspec.h:3
# mail/mail-format.c:910 mail/message-list.etspec.h:3
-#: mail/mail-format.c:906 mail/message-list.etspec.h:7
+#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
msgid "From"
msgstr "发件人"
# mail/mail-format.c:889
# mail/mail-format.c:908
# mail/mail-format.c:914
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
msgid "Reply-To"
msgstr "回复至"
# mail/mail-format.c:893 mail/message-list.etspec.h:10
# mail/mail-format.c:913 mail/message-list.etspec.h:11
# mail/mail-format.c:919 mail/message-list.etspec.h:11
-#: mail/mail-format.c:915 mail/message-list.etspec.h:14
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
msgid "To"
msgstr "收件人"
# mail/mail-format.c:897
# mail/mail-format.c:918
# mail/mail-format.c:924
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
msgid "Cc"
msgstr "抄送"
# mail/mail-format.c:901
# mail/mail-format.c:923
# mail/mail-format.c:929
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
msgid "Bcc"
msgstr "密件抄送"
@@ -21441,7 +21671,7 @@ msgstr "密件抄送"
# importers/pine-importer.c:637 mail/component-factory.c:100
# importers/elm-importer.c:525 importers/netscape-importer.c:958
# importers/pine-importer.c:637 mail/component-factory.c:100
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
#, fuzzy
msgid "Mailer"
msgstr "邮件"
@@ -21449,7 +21679,7 @@ msgstr "邮件"
# mail/mail-format.c:1813
# mail/mail-format.c:1749
# mail/mail-format.c:1768
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
msgid ""
"This message is digitally signed. Click the lock icon for more information."
msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
@@ -21457,7 +21687,7 @@ msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
# mail/mail-crypto.c:84
# mail/mail-crypto.c:84
# mail/mail-crypto.c:84
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
#, fuzzy
msgid "Could not create a PGP verfication context"
msgstr "无法创建 PGP 验证上下文。"
@@ -21465,21 +21695,21 @@ msgstr "无法创建 PGP 验证上下文。"
# mail/mail-format.c:1844
# mail/mail-format.c:1780
# mail/mail-format.c:1799
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
msgid "This message is digitally signed and has been found to be authentic."
msgstr "该邮件有数字签名,并被证实为可信。"
# mail/mail-format.c:1852
# mail/mail-format.c:1788
# mail/mail-format.c:1807
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1878
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr "该邮件有数字签名,但不能证实是可信的。"
# mail/mail-format.c:2068
# mail/mail-format.c:2003
# mail/mail-format.c:2022
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
@@ -21487,7 +21717,7 @@ msgstr "指向 FTP 站点 (%s)"
# mail/mail-format.c:2082
# mail/mail-format.c:2017
# mail/mail-format.c:2036
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
@@ -21495,7 +21725,7 @@ msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
# mail/mail-format.c:2087
# mail/mail-format.c:2022
# mail/mail-format.c:2041
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
@@ -21503,7 +21733,7 @@ msgstr "指向本地文件 (%s)"
# mail/mail-format.c:2116
# mail/mail-format.c:2051
# mail/mail-format.c:2070
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
@@ -21511,7 +21741,7 @@ msgstr "指向远程数据 (%s)"
# mail/mail-format.c:2124
# mail/mail-format.c:2059
# mail/mail-format.c:2078
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
@@ -21519,14 +21749,14 @@ msgstr "指向未知的外部数据 (“%s”类型)"
# mail/mail-format.c:2129
# mail/mail-format.c:2064
# mail/mail-format.c:2083
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
# shell/e-local-storage.c:636
# shell/e-local-storage.c:636
# shell/e-local-storage.c:636
-#: mail/mail-local.c:540 mail/mail-local.c:542
+#: mail/mail-local.c:539 mail/mail-local.c:541
#, fuzzy, c-format
msgid "Local folders/%s"
msgstr "本地文件夹"
@@ -21534,14 +21764,14 @@ msgstr "本地文件夹"
# mail/mail-local.c:626
# mail/mail-local.c:626
# mail/mail-local.c:626
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
msgid "Reconfiguring folder"
msgstr "正在重新配置文件夹"
# mail/mail-local.c:707
# mail/mail-local.c:707
# mail/mail-local.c:707
-#: mail/mail-local.c:753
+#: mail/mail-local.c:752
#, fuzzy, c-format
msgid ""
"Cannot save folder metainfo; you may find you can't\n"
@@ -21553,7 +21783,7 @@ msgstr ""
# mail/mail-local.c:763
# mail/mail-local.c:763
# mail/mail-local.c:763
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
#, c-format
msgid "Cannot save folder metainfo to %s: %s"
msgstr "无法把文件夹元信息保存到 %s: %s"
@@ -21561,7 +21791,7 @@ msgstr "无法把文件夹元信息保存到 %s: %s"
# mail/mail-local.c:815
# mail/mail-local.c:815
# mail/mail-local.c:815
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
#, c-format
msgid "Cannot delete folder metadata %s: %s"
msgstr "无法删除文件夹元信息 %s: %s"
@@ -21569,23 +21799,15 @@ msgstr "无法删除文件夹元信息 %s: %s"
# mail/mail-local.c:1281
# mail/mail-local.c:1281
# mail/mail-local.c:1281
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr "将文件夹格式从“%s”改为“%s”"
-# mail/mail-local.c:1296
-# mail/mail-local.c:1296
-# mail/mail-local.c:1296
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "由于 %s 不是本地文件夹,因此不能重新配置"
-
# mail/mail-local.c:1318
# mail/mail-local.c:1318
# mail/mail-local.c:1318
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1351
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
@@ -21593,21 +21815,21 @@ msgstr ""
"如果您无法打开该邮件箱,\n"
"那么您可能必需手工修复它。"
-# mail/mail-local.c:1407
-# mail/mail-local.c:1407
-# mail/mail-local.c:1407
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr "您不能改变远程文件夹的格式。"
-
# mail/mail-local.c:1416
# mail/mail-local.c:1416
# mail/mail-local.c:1416
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
#, c-format
msgid "Reconfigure /%s"
msgstr "重新配置 /%s"
+# mail/mail-local.c:1407
+# mail/mail-local.c:1407
+# mail/mail-local.c:1407
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr "您不能改变远程文件夹的格式。"
+
# mail/mail-mt.c:254
# mail/mail-mt.c:254
# mail/mail-mt.c:254
@@ -21998,14 +22220,14 @@ msgstr "用户己取消操作。"
# mail/mail-config.glade.h:113
# mail/mail-config.glade.h:113
# mail/mail-config.glade.h:122
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
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:275
+#: mail/mail-session.c:273
#, fuzzy
msgid "_Remember this password for the remainder of this session"
msgstr "在本会话中记住该密码"
@@ -22013,7 +22235,7 @@ msgstr "在本会话中记住该密码"
# mail/mail-session.c:319
# mail/mail-session.c:319
# mail/mail-session.c:321
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
@@ -22021,7 +22243,7 @@ msgstr "为 %s 输入密码"
# mail/mail-session.c:322
# mail/mail-session.c:322
# mail/mail-session.c:324
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
msgid "Enter Password"
msgstr "输入密码"
@@ -22036,14 +22258,14 @@ msgstr "无法保存签名文件。"
# mail/mail-account-gui.c:1039
# mail/mail-account-gui.c:1039
# mail/mail-account-gui.c:1036
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
msgid "Save signature"
msgstr "保存签名"
# mail/mail-account-gui.c:1045
# mail/mail-account-gui.c:1045
# mail/mail-account-gui.c:1042
-#: mail/mail-signature-editor.c:180
+#: mail/mail-signature-editor.c:181
msgid ""
"This signature has been changed, but hasn't been saved.\n"
"\n"
@@ -22053,14 +22275,14 @@ msgstr ""
"\n"
"您希望保存改动吗?"
-#: mail/mail-signature-editor.c:371
-msgid "Type the name by which you would like to refer to this signature."
+#: mail/mail-signature-editor.c:372
+msgid "Enter a name for this signature."
msgstr ""
# my-evolution/e-summary-preferences.c:956
# my-evolution/e-summary-preferences.c:956
# my-evolution/e-summary-preferences.c:958
-#: mail/mail-signature-editor.c:374 my-evolution/e-summary-preferences.c:875
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
msgid "Name:"
msgstr "名称:"
@@ -22117,7 +22339,7 @@ msgstr ""
# mail/mail-vfolder.c:728
# mail/mail-vfolder.c:728
# mail/mail-vfolder.c:728
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
msgid "VFolders"
msgstr "虚拟文件夹"
@@ -22168,109 +22390,109 @@ msgstr "%s - 邮件"
# mail/message-list.c:639
# mail/message-list.c:645
# mail/message-list.c:662
-#: mail/message-list.c:737
+#: mail/message-list.c:736
msgid "Unseen"
msgstr "不可见"
# mail/message-list.c:640
# mail/message-list.c:646
# mail/message-list.c:663
-#: mail/message-list.c:738
+#: mail/message-list.c:737
msgid "Seen"
msgstr "可见"
# mail/message-list.c:641
# mail/message-list.c:647
# mail/message-list.c:664
-#: mail/message-list.c:739
+#: mail/message-list.c:738
msgid "Answered"
msgstr "已应答"
# mail/message-list.c:642
# mail/message-list.c:648
# mail/message-list.c:665
-#: mail/message-list.c:740
+#: mail/message-list.c:739
msgid "Multiple Unseen Messages"
msgstr "多个不可见邮件"
# mail/message-list.c:643
# mail/message-list.c:649
# mail/message-list.c:666
-#: mail/message-list.c:741
+#: mail/message-list.c:740
msgid "Multiple Messages"
msgstr "多个邮件"
# mail/message-list.c:647
# mail/message-list.c:658
# mail/message-list.c:675
-#: mail/message-list.c:745
+#: mail/message-list.c:744
msgid "Lowest"
msgstr "最低"
# mail/message-list.c:648
# mail/message-list.c:659
# mail/message-list.c:676
-#: mail/message-list.c:746
+#: mail/message-list.c:745
msgid "Lower"
msgstr "较低"
# mail/message-list.c:652
# mail/message-list.c:663
# mail/message-list.c:680
-#: mail/message-list.c:750
+#: mail/message-list.c:749
msgid "Higher"
msgstr "较高"
# mail/message-list.c:653
# mail/message-list.c:664
# mail/message-list.c:681
-#: mail/message-list.c:751
+#: mail/message-list.c:750
msgid "Highest"
msgstr "最高"
# mail/message-list.c:903
# mail/message-list.c:920
# mail/message-list.c:937
-#: mail/message-list.c:1067
+#: mail/message-list.c:1066
msgid "?"
msgstr "?"
# mail/message-list.c:910
# mail/message-list.c:927
# mail/message-list.c:944
-#: mail/message-list.c:1074
+#: mail/message-list.c:1073
msgid "Today %l:%M %p"
msgstr "今天 %l:%M %p"
# mail/message-list.c:919
# mail/message-list.c:936
# mail/message-list.c:953
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
msgid "Yesterday %l:%M %p"
msgstr "昨天 %l:%M %p"
# mail/message-list.c:931
# mail/message-list.c:948
# mail/message-list.c:965
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
msgid "%a %l:%M %p"
msgstr "%a %l:%m %p"
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
msgid "%b %d %l:%M %p"
msgstr "%b %d %l:%M %p"
# mail/message-list.c:941
# mail/message-list.c:958
# mail/message-list.c:975
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
msgid "%b %d %Y"
msgstr "%Y %b %d"
# mail/message-list.c:2334
# mail/message-list.c:2358
# mail/message-list.c:2387
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
msgid "Generating message list"
msgstr "正在生成邮件列表"
@@ -22395,14 +22617,62 @@ msgstr "全部回复"
msgid "Review"
msgstr "预览"
-#: mail/message-tag-followup.c:246
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
msgid "Flag to Follow Up"
msgstr ""
+# calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+# calendar/gui/dialogs/task-details-page.glade.h:4
+# calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:329
+# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
+# calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+# calendar/gui/dialogs/task-details-page.glade.h:4
+# calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:329
+# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
+# calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+# calendar/gui/dialogs/task-details-page.glade.h:4
+# calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
+# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "已完成"
+
+#: mail/message-tags.glade.h:5
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# widgets/misc/e-filter-bar.h:95
+# widgets/misc/e-filter-bar.h:95
+#: mail/message-tags.glade.h:7
+#, fuzzy
+msgid "_Clear Flag"
+msgstr "清除"
+
+# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "预定 "
+
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "已标志"
+
# mail/subscribe-dialog.c:219
# mail/subscribe-dialog.c:219
# mail/subscribe-dialog.c:219
-#: mail/subscribe-dialog.c:228
+#: mail/subscribe-dialog.c:229
#, c-format
msgid "Scanning folders under %s on \"%s\""
msgstr "在“%2$s”上的 %1$s 中扫描文件夹"
@@ -22410,7 +22680,7 @@ msgstr "在“%2$s”上的 %1$s 中扫描文件夹"
# mail/subscribe-dialog.c:221
# mail/subscribe-dialog.c:221
# mail/subscribe-dialog.c:221
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
#, c-format
msgid "Scanning root-level folders on \"%s\""
msgstr "正在扫描“%s”上的根级文件夹"
@@ -22418,7 +22688,7 @@ msgstr "正在扫描“%s”上的根级文件夹"
# mail/subscribe-dialog.c:318
# mail/subscribe-dialog.c:318
# mail/subscribe-dialog.c:318
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
#, c-format
msgid "Subscribing to folder \"%s\""
msgstr "订阅到文件夹 “%s”"
@@ -22426,7 +22696,7 @@ msgstr "订阅到文件夹 “%s”"
# mail/subscribe-dialog.c:320
# mail/subscribe-dialog.c:320
# mail/subscribe-dialog.c:320
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
#, c-format
msgid "Unsubscribing to folder \"%s\""
msgstr "取消到文件夹“%s”的订阅"
@@ -22437,7 +22707,7 @@ msgstr "取消到文件夹“%s”的订阅"
# shell/e-storage-set-view.etspec.h:1
# mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
# shell/e-storage-set-view.etspec.h:1
-#: mail/subscribe-dialog.c:1304 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
#: shell/e-storage-set-view.etspec.h:2
msgid "Folder"
msgstr "文件夹"
@@ -22445,7 +22715,7 @@ msgstr "文件夹"
# ui/evolution-message-composer.xml.h:23
# ui/evolution-message-composer.xml.h:23
# ui/evolution-message-composer.xml.h:23
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
#, fuzzy
msgid "Scanning folders..."
msgstr "保存到文件夹..."
@@ -22453,14 +22723,14 @@ msgstr "保存到文件夹..."
# mail/subscribe-dialog.c:1520
# mail/subscribe-dialog.c:1520
# mail/subscribe-dialog.c:1520
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
msgid "No server has been selected"
msgstr "没有选定服务器"
# mail/subscribe-dialog.c:1581
# mail/subscribe-dialog.c:1581
# mail/subscribe-dialog.c:1581
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
msgid "Please select a server."
msgstr "请选择服务器。"
@@ -37990,15 +38260,15 @@ 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:152
+#: my-evolution/e-summary-mail.c:154
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:406 my-evolution/e-summary-mail.c:734
-#: shell/e-local-storage.c:1126
+#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: shell/e-local-storage.c:1102
msgid "Local Folders"
msgstr "本地文件夹"
@@ -38014,35 +38284,35 @@ msgstr "本地文件夹"
#. (evolution/my-evolution/Locations)
#. Codes are seperated with : eg. "KBOS:EGAA"
#: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:591
msgid "KBOS"
msgstr "KBOS"
# my-evolution/e-summary-preferences.c:444
# my-evolution/e-summary-preferences.c:444
# my-evolution/e-summary-preferences.c:445
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
msgid "Dictionary.com Word of the Day"
msgstr "Dictionary.com 的每日一词"
# my-evolution/e-summary-preferences.c:465
# my-evolution/e-summary-preferences.c:465
# my-evolution/e-summary-preferences.c:466
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
msgid "Quotes of the Day"
msgstr "每日引用"
# my-evolution/e-summary-preferences.c:944
# my-evolution/e-summary-preferences.c:944
# my-evolution/e-summary-preferences.c:946
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
msgid "Add a news feed"
msgstr "添加新闻来源"
# my-evolution/e-summary-preferences.c:952
# my-evolution/e-summary-preferences.c:952
# my-evolution/e-summary-preferences.c:954
-#: my-evolution/e-summary-preferences.c:871
+#: my-evolution/e-summary-preferences.c:877
msgid "Enter the URL of the news feed you wish to add"
msgstr "输入您希望添加的新闻来源的 URL"
@@ -38106,14 +38376,14 @@ msgstr "(没有描述)"
msgid "My Weather"
msgstr "天气"
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
msgid "There was an error downloading data for"
msgstr ""
# my-evolution/e-summary-weather.c:559
# my-evolution/e-summary-weather.c:559
# my-evolution/e-summary-weather.c:504
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
msgid "Weather"
msgstr "天气"
@@ -40400,6 +40670,14 @@ msgstr ""
"无法转移文件夹:\n"
"%s"
+# mail/mail-display.c:354
+# mail/mail-display.c:353
+# mail/mail-display.c:354
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "在 %s 中打开..."
+
# mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
# shell/e-storage-set-view.etspec.h:1
# mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
@@ -40766,15 +41044,31 @@ msgstr "重命名文件夹"
# shell/e-shell-folder-commands.c:554
# shell/e-shell-folder-creation-dialog.c:168
#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:168
+#: shell/e-shell-folder-creation-dialog.c:165
#, c-format
msgid "The specified folder name is not valid: %s"
msgstr "指定的文件夹名称不合法: %s"
+#: shell/e-shell-folder-commands.c:586
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+# shell/e-shell-folder-commands.c:488
+# shell/e-shell-folder-commands.c:488
+# shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:589
+#, fuzzy, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr ""
+"无法重命名文件夹:\n"
+"%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-folder-creation-dialog.c:125
+#: shell/e-shell-folder-creation-dialog.c:122
#, c-format
msgid ""
"Cannot create the specified folder:\n"
@@ -40786,7 +41080,7 @@ msgstr ""
# ui/evolution.xml.h:7
# ui/evolution.xml.h:7
# ui/evolution.xml.h:7
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
#, fuzzy
msgid "Create New Folder"
msgstr "创建新文件夹(_N)..."
@@ -40794,7 +41088,7 @@ msgstr "创建新文件夹(_N)..."
# shell/e-shell-folder-selection-dialog.c:376
# shell/e-shell-folder-selection-dialog.c:376
# shell/e-shell-folder-selection-dialog.c:376
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
msgid "New..."
msgstr "正在新建..."
@@ -40834,26 +41128,10 @@ msgstr ""
msgid "Please select the information that you would like to import:"
msgstr "请选择您希望导入的信息:"
-# shell/e-shell-importer.c:243
-# shell/e-shell-importer.c:243
-# shell/e-shell-importer.c:243
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:243
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"正在导入 %s\n"
-"导入没有就绪。\n"
-"请 5 秒中以后再试。"
-
# shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
# shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
# shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
#, c-format
msgid ""
"Importing %s\n"
@@ -40865,7 +41143,7 @@ msgstr ""
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:834
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
#, fuzzy
msgid "Select importer"
msgstr "选择文件夹"
@@ -40873,7 +41151,7 @@ msgstr "选择文件夹"
# shell/e-shell-importer.c:397
# shell/e-shell-importer.c:397
# shell/e-shell-importer.c:409
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
#, c-format
msgid "File %s does not exist"
msgstr "文件 %s 不存在"
@@ -40882,15 +41160,15 @@ msgstr "文件 %s 不存在"
# shell/e-shell-about-box.c:40
# shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
# shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
-#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
-#: shell/e-shell-importer.c:565
+#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:555
msgid "Evolution Error"
msgstr "Evolution 错误"
# shell/e-shell-importer.c:424
# shell/e-shell-importer.c:424
# shell/e-shell-importer.c:435
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:504
#, c-format
msgid ""
"There is no importer that is able to handle\n"
@@ -40902,14 +41180,14 @@ msgstr ""
# shell/e-shell-importer.c:434
# shell/e-shell-importer.c:434
# shell/e-shell-importer.c:445
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
msgid "Importing"
msgstr "正在导入"
# shell/e-shell-importer.c:442
# shell/e-shell-importer.c:442
# shell/e-shell-importer.c:453
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
#, c-format
msgid ""
"Importing %s.\n"
@@ -40921,7 +41199,7 @@ msgstr ""
# shell/e-shell-importer.c:455
# shell/e-shell-importer.c:455
# shell/e-shell-importer.c:466
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
#, c-format
msgid "Error starting %s"
msgstr "启动 %s 错误"
@@ -40929,7 +41207,7 @@ msgstr "启动 %s 错误"
# shell/e-shell-importer.c:474
# shell/e-shell-importer.c:474
# shell/e-shell-importer.c:485
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
#, c-format
msgid "Error loading %s"
msgstr "装入 %s 错误"
@@ -40937,7 +41215,7 @@ msgstr "装入 %s 错误"
# shell/e-shell-importer.c:491
# shell/e-shell-importer.c:491
# shell/e-shell-importer.c:502
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
#, c-format
msgid ""
"Importing %s\n"
@@ -40949,49 +41227,49 @@ msgstr ""
# shell/e-shell-importer.c:561
# shell/e-shell-importer.c:561
# shell/e-shell-importer.c:572
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
msgid "Automatic"
msgstr "自动"
# shell/e-shell-importer.c:612
# shell/e-shell-importer.c:612
# shell/e-shell-importer.c:623
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
msgid "Filename:"
msgstr "文件名:"
# shell/e-shell-importer.c:617
# shell/e-shell-importer.c:617
# shell/e-shell-importer.c:628
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
msgid "Select a file"
msgstr "选择一个文件"
# shell/e-shell-importer.c:627
# shell/e-shell-importer.c:627
# shell/e-shell-importer.c:638
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
msgid "File type:"
msgstr "文件类型:"
# shell/e-shell-importer.c:652
# shell/e-shell-importer.c:652
# shell/e-shell-importer.c:663
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
msgid "Import data and settings from older programs"
msgstr "从老版程序中导入数据和设置"
# shell/e-shell-importer.c:656
# shell/e-shell-importer.c:656
# shell/e-shell-importer.c:667
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
msgid "Import a single file"
msgstr "导入单个文件"
# shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:628
# shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:628
# shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
-#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
msgid ""
"Please wait...\n"
"Scanning for existing setups"
@@ -41002,14 +41280,14 @@ msgstr ""
# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
# shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
-#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
msgid "Starting Intelligent Importers"
msgstr "启动智能导入器"
# shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:754
# shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:754
# shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
-#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
#, c-format
msgid "From %s:"
msgstr "从 %s:"
@@ -41017,21 +41295,21 @@ msgstr "从 %s:"
# shell/e-shell-importer.c:1014
# shell/e-shell-importer.c:1014
# shell/e-shell-importer.c:1027
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
msgid "Select folder"
msgstr "选择文件夹"
# shell/e-shell-importer.c:1015
# shell/e-shell-importer.c:1015
# shell/e-shell-importer.c:1028
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
msgid "Select a destination folder for importing this data"
msgstr "为导入的数据选择目标文件夹"
# shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
# shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
# shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
msgid "Import"
msgstr "导入"
@@ -41071,7 +41349,7 @@ msgstr ""
# shell/e-shell-about-box.c:40
# shell/e-shell-about-box.c:40
# shell/e-shell-about-box.c:40
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
#, fuzzy
msgid "Evolution Settings"
msgstr "Evolution "
@@ -41079,7 +41357,7 @@ msgstr "Evolution "
# mail/mail-ops.c:1234
# mail/mail-ops.c:1236
# mail/mail-ops.c:1279
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
#, fuzzy
msgid "Opening Folder"
msgstr "正在打开文件夹 %s"
@@ -41087,7 +41365,7 @@ msgstr "正在打开文件夹 %s"
# mail/mail-ops.c:1234
# mail/mail-ops.c:1236
# mail/mail-ops.c:1279
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
#, fuzzy, c-format
msgid "Opening Folder \"%s\""
msgstr "正在打开文件夹 %s"
@@ -41095,7 +41373,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:361
+#: shell/e-shell-shared-folder-picker-dialog.c:338
#, fuzzy, c-format
msgid "in \"%s\" ..."
msgstr "在 %s 中打开..."
@@ -41103,7 +41381,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:467
+#: shell/e-shell-shared-folder-picker-dialog.c:435
#, fuzzy, c-format
msgid "Could not open shared folder: %s."
msgstr "无法重命名文件夹: %s"
@@ -41111,7 +41389,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:539
+#: shell/e-shell-shared-folder-picker-dialog.c:488
#, fuzzy
msgid "Cannot find the specified shared folder."
msgstr ""
@@ -41179,42 +41457,42 @@ msgstr "“.”和“..”是保留文件夹名。"
# shell/e-shell-view-menu.c:165
# shell/e-shell-view-menu.c:165
# shell/e-shell-view-menu.c:165
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:196
msgid "Bug buddy was not found in your $PATH."
msgstr "在您的 $PATH 中找不到 Bug buddy。"
# shell/e-shell-view-menu.c:173
# shell/e-shell-view-menu.c:173
# shell/e-shell-view-menu.c:173
-#: shell/e-shell-view-menu.c:186
+#: shell/e-shell-view-menu.c:204
msgid "Bug buddy could not be run."
msgstr "无法运行 Bug buddy。"
# shell/e-shell-view-menu.c:215
# shell/e-shell-view-menu.c:215
# shell/e-shell-view-menu.c:215
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
msgid "About Ximian Evolution"
msgstr "关于 Ximian Evolution"
# shell/e-shell-view-menu.c:424
# shell/e-shell-view-menu.c:424
# shell/e-shell-view-menu.c:424
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
msgid "Go to folder..."
msgstr "转到文件夹..."
# shell/e-shell-view-menu.c:425
# shell/e-shell-view-menu.c:425
# shell/e-shell-view-menu.c:425
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
msgid "Select the folder that you want to open"
msgstr "选择您希望打开的文件夹"
# shell/e-shell-view-menu.c:545
# shell/e-shell-view-menu.c:545
# shell/e-shell-view-menu.c:545
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
#, fuzzy
msgid "Create New Shortcut"
msgstr "创建新快捷方式"
@@ -41222,28 +41500,28 @@ msgstr "创建新快捷方式"
# shell/e-shell-view-menu.c:546
# shell/e-shell-view-menu.c:546
# shell/e-shell-view-menu.c:546
-#: shell/e-shell-view-menu.c:596
+#: shell/e-shell-view-menu.c:626
msgid "Select the folder you want the shortcut to point to:"
msgstr "选择您希望快捷方式指向的文件夹:"
# shell/e-shell-view-menu.c:688
# shell/e-shell-view-menu.c:688
# shell/e-shell-view-menu.c:688
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
msgid "_Work Online"
msgstr "在线工作(_W)"
# shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
# shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
# shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
-#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
msgid "_Work Offline"
msgstr "离线工作(_W)"
# shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
# shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
# shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
msgid "Work Offline"
msgstr "离线工作"
@@ -41257,7 +41535,7 @@ msgstr "(未显示文件夹)"
# shell/e-shell-view.c:1585
# shell/e-shell-view.c:1585
# shell/e-shell-view.c:1598
-#: shell/e-shell-view.c:1838
+#: shell/e-shell-view.c:1847
#, c-format
msgid "%s (%d)"
msgstr "%s (%d)"
@@ -41265,14 +41543,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:1840
+#: shell/e-shell-view.c:1849
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:1887
+#: shell/e-shell-view.c:1896
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
@@ -41280,14 +41558,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:1894
+#: shell/e-shell-view.c:1903
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:1900
+#: shell/e-shell-view.c:1909
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr "Ximian Evolution 目前离线。 点击该按钮则在线工作。"
@@ -41310,7 +41588,7 @@ msgstr ""
# shell/e-shell.c:651
# shell/e-shell.c:651
# shell/e-shell.c:651
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr "无法设置本地存储 -- %s"
@@ -41318,7 +41596,7 @@ msgstr "无法设置本地存储 -- %s"
# shell/e-shell.c:1659
# shell/e-shell.c:1659
# shell/e-shell.c:1660
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
#, c-format
msgid ""
"The Evolution component that handles folders of type \"%s\"\n"
@@ -41332,28 +41610,28 @@ msgstr ""
# shell/e-shell.c:1886
# shell/e-shell.c:1886
# shell/e-shell.c:1887
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
msgid "Invalid arguments"
msgstr "无效参数"
# shell/e-shell.c:1888
# shell/e-shell.c:1888
# shell/e-shell.c:1889
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
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:2133
+#: shell/e-shell.c:2181
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:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
msgid "Generic error"
msgstr "通用错误"
@@ -41594,94 +41872,98 @@ msgstr "主席"
# shell/e-storage.c:498
# shell/e-storage.c:498
# shell/e-storage.c:498
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
msgid "No error"
msgstr "无错误"
# shell/e-storage.c:502
# shell/e-storage.c:502
# shell/e-storage.c:502
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
msgid "A folder with the same name already exists"
msgstr "已经有一个同名文件夹存在"
# shell/e-storage.c:504
# shell/e-storage.c:504
# shell/e-storage.c:504
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
msgid "The specified folder type is not valid"
msgstr "指定的文件夹类型无效"
# shell/e-storage.c:506
# shell/e-storage.c:506
# shell/e-storage.c:506
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
msgid "I/O error"
msgstr "输入输出错误"
# shell/e-storage.c:508
# shell/e-storage.c:508
# shell/e-storage.c:508
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
msgid "Not enough space to create the folder"
msgstr "没有足够的空间创建文件夹"
# shell/e-storage.c:510
# shell/e-storage.c:510
# shell/e-storage.c:510
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
msgid "The folder is not empty"
msgstr "文件夹不为空"
# shell/e-storage.c:512
# shell/e-storage.c:512
# shell/e-storage.c:512
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
msgid "The specified folder was not found"
msgstr "找不到指定的文件夹"
# shell/e-storage.c:514
# shell/e-storage.c:514
# shell/e-storage.c:514
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
msgid "Function not implemented in this storage"
msgstr "在该存储中没有实现该功能"
# shell/e-storage.c:518
# shell/e-storage.c:518
# shell/e-storage.c:518
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
msgid "Operation not supported"
msgstr "不支持的操作"
# shell/e-storage.c:520
# shell/e-storage.c:520
# shell/e-storage.c:520
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
msgid "The specified type is not supported in this storage"
msgstr "在该存储中不支持指定的类型"
# shell/e-storage.c:522
# shell/e-storage.c:522
# shell/e-storage.c:522
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
msgid "The specified folder cannot be modified or removed"
msgstr "无法修改或删除指定的文件夹"
# shell/e-storage.c:524
# shell/e-storage.c:524
# shell/e-storage.c:524
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
msgid "Cannot make a folder a child of one of its descendants"
msgstr "无法使文件夹成为它的子目录的子目录"
# shell/e-storage.c:526
# shell/e-storage.c:526
# shell/e-storage.c:526
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
msgid "Cannot create a folder with that name"
msgstr "无法以那个名字创建文件夹"
+#: shell/e-storage.c:586
+msgid "This operation cannot be performed in off-line mode"
+msgstr ""
+
# shell/e-task-widget.c:191
# shell/e-task-widget.c:191
# shell/e-task-widget.c:191
@@ -42034,9 +42316,10 @@ msgstr ""
# shell/glade/evolution-startup-wizard.glade.h:15
# shell/glade/evolution-startup-wizard.glade.h:15
#: shell/glade/evolution-startup-wizard.glade.h:15
+#, fuzzy
msgid ""
"You have successfully entered all of the information\n"
-"needed to setup Evolution. \n"
+"needed to set up Evolution. \n"
"\n"
"Click the \"Finish\" button to save your settings. "
msgstr ""
@@ -42059,45 +42342,38 @@ msgstr "点击“导入”以便开始将文件导入到 Evolution。"
msgid "Evolution Import Assistant"
msgstr "Evolution 导入助手"
-# shell/importer/import.glade.h:3
-# shell/importer/import.glade.h:3
-# shell/importer/import.glade.h:3
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Evolution 导入器助手"
-
# shell/importer/import.glade.h:4
# shell/importer/import.glade.h:4
# shell/importer/import.glade.h:4
-#: shell/importer/import.glade.h:4
+#: shell/importer/import.glade.h:3
msgid "Import File (step 3 of 3)"
msgstr "导入文件 (3 之 3 步)"
# shell/importer/import.glade.h:5
# shell/importer/import.glade.h:5
# shell/importer/import.glade.h:5
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
msgid "Importer Type (step 1 of 3)"
msgstr "导入类型 (3 之 1 步)"
# shell/importer/import.glade.h:6
# shell/importer/import.glade.h:6
# shell/importer/import.glade.h:6
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
msgid "Select Importers (step 2 of 3)"
msgstr "选择导入器 (3 之 2 步)"
# shell/importer/import.glade.h:7
# shell/importer/import.glade.h:7
# shell/importer/import.glade.h:7
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
msgid "Select a File (step 2 of 3)"
msgstr "选择文件 (3 之 2 步)"
# shell/importer/import.glade.h:8
# shell/importer/import.glade.h:8
# shell/importer/import.glade.h:8
-#: shell/importer/import.glade.h:8
+#: shell/importer/import.glade.h:7
msgid ""
"Welcome to the Evolution Import Assistant.\n"
"With this assistant you will be guided through the process of\n"
@@ -42451,10 +42727,10 @@ msgstr "查看当前联系人"
#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
#: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
msgid "_Actions"
msgstr "动作(_A)"
@@ -42666,7 +42942,7 @@ msgstr "打印该项"
# ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
# ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
msgid "Save"
msgstr "保存"
@@ -42732,7 +43008,7 @@ msgstr "把该项保存到磁盘"
#: ui/evolution-mail-messagedisplay.xml.h:7
#: ui/evolution-message-composer.xml.h:42
#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:49
msgid "_File"
msgstr "文件(_F)"
@@ -42886,7 +43162,8 @@ msgstr "为此项调度会议"
# ui/evolution-executive-summary.xml.h:1
# ui/evolution-executive-summary.xml.h:1
#: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
msgstr "定制我的 Evolution"
# ui/evolution-mail-global.xml.h:2
@@ -42968,48 +43245,49 @@ msgstr "新建邮件"
msgid "Post a message to a Public folder"
msgstr "把邮件保存到文件夹中"
+# ui/evolution-mail-global.xml.h:24
+# ui/evolution-mail-global.xml.h:24
+# ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "订阅到文件夹(_S)..."
+
# ui/evolution-mail-global.xml.h:15
# ui/evolution-mail-global.xml.h:15
# ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:14
msgid "Show message preview window"
msgstr "显示邮件预览窗口"
# ui/evolution-mail-global.xml.h:16
# ui/evolution-mail-global.xml.h:16
# ui/evolution-mail-global.xml.h:16
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "订阅 或 取消订阅远程服务器上的文件夹"
# ui/evolution-mail-global.xml.h:17
# ui/evolution-mail-global.xml.h:17
# ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
msgid "Virtual Folder _Editor..."
msgstr "虚拟文件夹编辑器(_E)..."
# ui/evolution-mail-global.xml.h:19
# ui/evolution-mail-global.xml.h:19
# ui/evolution-mail-global.xml.h:19
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
msgid "_Filters..."
msgstr "邮件过滤(_F)..."
# ui/evolution-mail-global.xml.h:22
# ui/evolution-mail-global.xml.h:22
# ui/evolution-mail-global.xml.h:22
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
msgid "_Preview Pane"
msgstr "预览窗口(_P)"
-# ui/evolution-mail-global.xml.h:24
-# ui/evolution-mail-global.xml.h:24
-# ui/evolution-mail-global.xml.h:24
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
-msgstr "订阅到文件夹(_S)..."
-
# ui/evolution-mail-list.xml.h:1
# ui/evolution-mail-list.xml.h:1
# ui/evolution-mail-list.xml.h:1
@@ -43175,7 +43453,7 @@ msgstr "删除(_E)"
# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
msgid "_Folder"
msgstr "文件夹(_F)"
@@ -43711,7 +43989,8 @@ msgstr "在显示邮件的邮件体中搜索文本"
# ui/evolution-mail-message.xml.h:79
# ui/evolution-mail-message.xml.h:81
#: ui/evolution-mail-message.xml.h:81
-msgid "Setup the page settings for your current printer"
+#, fuzzy
+msgid "Set up the page settings for your current printer"
msgstr "设定您当前打印机的页面设置"
# ui/evolution-mail-message.xml.h:80
@@ -43909,7 +44188,7 @@ msgstr "重命名(_R)..."
# ui/my-evolution.xml.h:9
# ui/evolution-mail-message.xml.h:108 ui/evolution.xml.h:49
# ui/my-evolution.xml.h:9
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
msgid "_Tools"
msgstr "工具(_T)"
@@ -43942,7 +44221,7 @@ msgstr "关闭该窗口"
#: ui/evolution-mail-messagedisplay.xml.h:5
#: ui/evolution-message-composer.xml.h:39
#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:46
msgid "_Close"
msgstr "关闭(_C)"
@@ -43953,7 +44232,7 @@ msgstr "关闭(_C)"
# ui/evolution-mail-messagedisplay.xml.h:8
# ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
msgid "_View"
msgstr "查看(_V)"
@@ -44262,7 +44541,7 @@ msgstr "保存项并关闭对话框"
# ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
# ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
# ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
msgid "_Help"
msgstr "帮助(_H)"
@@ -44546,7 +44825,7 @@ msgid "Open Other _User's Folder..."
msgstr "创建新文件夹(_N)..."
#: ui/evolution.xml.h:22
-msgid "Open a folder that is made available by some other user on the server"
+msgid "Open a folder belonging to some other user on the server"
msgstr ""
# ui/evolution.xml.h:18
@@ -44571,17 +44850,33 @@ msgstr "在另一个窗口中打开该文件夹"
msgid "Pi_lot Settings..."
msgstr "Pilot 设置(_P)..."
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+#: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "Pilot 设置(_P)..."
+
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+#: ui/evolution.xml.h:28
+#, fuzzy
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr "创建新文件夹(_N)..."
+
# ui/evolution-mail-global.xml.h:13
# ui/evolution-mail-global.xml.h:13
# ui/evolution-mail-global.xml.h:13
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
msgid "Send / Receive"
msgstr "发送和接收"
# ui/evolution-mail-global.xml.h:14
# ui/evolution-mail-global.xml.h:14
# ui/evolution-mail-global.xml.h:14
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
#, fuzzy
msgid "Send queued items and retrieve new items"
msgstr "发送编队的邮件并检索新邮件"
@@ -44589,7 +44884,15 @@ msgstr "发送编队的邮件并检索新邮件"
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:48
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Set up Pilot conduit configuration"
+msgstr "邮件配置"
+
+# mail/mail-config.glade.h:41
+# mail/mail-config.glade.h:41
+# mail/mail-config.glade.h:48
+#: ui/evolution.xml.h:32
#, fuzzy
msgid "Set up Pilot configuration"
msgstr "邮件配置"
@@ -44597,98 +44900,98 @@ msgstr "邮件配置"
# ui/evolution.xml.h:21
# ui/evolution.xml.h:21
# ui/evolution.xml.h:21
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
msgid "Show information about Ximian Evolution"
msgstr "显示关于 Ximian Evolution 的信息"
# ui/evolution.xml.h:22
# ui/evolution.xml.h:22
# ui/evolution.xml.h:22
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
msgid "Submit Bug Report"
msgstr "提交错误报告"
# ui/evolution.xml.h:23
# ui/evolution.xml.h:23
# ui/evolution.xml.h:23
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
msgid "Submit _Bug Report"
msgstr "提交错误报告(_B)"
# ui/evolution.xml.h:24
# ui/evolution.xml.h:24
# ui/evolution.xml.h:24
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
msgid "Submit a bug report using Bug Buddy"
msgstr "用 Bug Buddy 提交错误报告"
# ui/evolution.xml.h:25
# ui/evolution.xml.h:25
# ui/evolution.xml.h:25
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
msgid "Toggle"
msgstr "反转"
# ui/evolution.xml.h:26
# ui/evolution.xml.h:26
# ui/evolution.xml.h:26
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
msgid "Toggle whether to show the folder bar"
msgstr "是否显示文件夹栏"
# ui/evolution.xml.h:27
# ui/evolution.xml.h:27
# ui/evolution.xml.h:27
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
msgid "Toggle whether to show the shortcut bar"
msgstr "是否显示快捷方式栏"
# ui/evolution.xml.h:28
# ui/evolution.xml.h:28
# ui/evolution.xml.h:28
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
msgid "Toggle whether we are working offline."
msgstr "我们是否离线工作。"
# ui/evolution.xml.h:29
# ui/evolution.xml.h:29
# ui/evolution.xml.h:29
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
msgid "View the selected folder"
msgstr "查看选中的文件夹"
# ui/evolution.xml.h:31
# ui/evolution.xml.h:31
# ui/evolution.xml.h:31
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
msgid "Ximian Evolution _FAQ"
msgstr "Ximian Evolution 常见问题(_F)"
# ui/evolution.xml.h:32
# ui/evolution.xml.h:32
# ui/evolution.xml.h:32
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
msgid "_About Ximian Evolution..."
msgstr "关于 Ximian Evolution(_A)..."
# ui/evolution.xml.h:34
# ui/evolution.xml.h:34
# ui/evolution.xml.h:34
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
msgid "_Copy..."
msgstr "复制(_C)..."
# ui/evolution.xml.h:38
# ui/evolution.xml.h:38
# ui/evolution.xml.h:38
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
msgid "_Folder Bar"
msgstr "文件夹工具栏(_F)"
# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
#, fuzzy
msgid "_Folder..."
msgstr "文件夹(_F)"
@@ -44696,71 +44999,79 @@ msgstr "文件夹(_F)"
# ui/evolution.xml.h:39
# ui/evolution.xml.h:39
# ui/evolution.xml.h:39
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
msgid "_Go to Folder..."
msgstr "转到文件夹(_G)..."
# ui/evolution.xml.h:41
# ui/evolution.xml.h:41
# ui/evolution.xml.h:41
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
msgid "_Import..."
msgstr "正在导入(_I)..."
# ui/evolution.xml.h:42
# ui/evolution.xml.h:42
# ui/evolution.xml.h:42
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
msgid "_Move..."
msgstr "移动(_M)..."
# ui/evolution.xml.h:43
# ui/evolution.xml.h:43
# ui/evolution.xml.h:43
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
msgid "_New"
msgstr "新建(_N)"
# ui/evolution.xml.h:44
# ui/evolution.xml.h:44
# ui/evolution.xml.h:44
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
msgid "_New Folder"
msgstr "新建文件夹(_N)"
-# calendar/gui/dialogs/recurrence-page.glade.h:11
-# calendar/gui/dialogs/recurrence-page.glade.h:11
-# calendar/gui/dialogs/recurrence-page.glade.h:11
-#: ui/evolution.xml.h:56
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+#: ui/evolution.xml.h:59
#, fuzzy
-msgid "_Preferences..."
-msgstr "没有循环(_N)"
+msgid "_Remove Other User's Folder"
+msgstr "创建新文件夹(_N)..."
# ui/evolution.xml.h:46
# ui/evolution.xml.h:46
# ui/evolution.xml.h:46
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
msgid "_Rename..."
msgstr "重命名(_R)..."
# ui/evolution-mail-global.xml.h:23
# ui/evolution-mail-global.xml.h:23
# ui/evolution-mail-global.xml.h:23
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
msgid "_Send / Receive"
msgstr "发送和接收(_S)"
+# ui/evolution-mail-global.xml.h:21
+# ui/evolution-mail-global.xml.h:21
+# ui/evolution-mail-global.xml.h:21
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "邮件设置(_M)..."
+
# ui/evolution.xml.h:48
# ui/evolution.xml.h:48
# ui/evolution.xml.h:48
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:63
msgid "_Shortcut Bar"
msgstr "快捷方式栏(_S)"
# ui/evolution.xml.h:47
# ui/evolution.xml.h:47
# ui/evolution.xml.h:47
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
#, fuzzy
msgid "_Shortcut..."
msgstr "快捷方式(_S)"
@@ -45154,14 +45465,14 @@ msgstr "..."
# widgets/misc/e-filter-bar.c:152
# widgets/misc/e-filter-bar.c:153
# widgets/misc/e-filter-bar.c:153
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
msgid "Search Editor"
msgstr "搜索编辑器"
# widgets/misc/e-filter-bar.c:168
# widgets/misc/e-filter-bar.c:169
# widgets/misc/e-filter-bar.c:169
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
msgid "Save Search"
msgstr "保存搜索"
@@ -45305,6 +45616,95 @@ msgstr "init_corba(): 无法初始化 GNOME"
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "init_bonobo(): 无法初始化 Bonobo"
+# my-evolution/my-evolution.glade.h:1
+# my-evolution/my-evolution.glade.h:1
+# my-evolution/my-evolution.glade.h:1
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "删除(_R)"
+
+# 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
+#, fuzzy
+#~ msgid "_Add -&gt;"
+#~ msgstr "添加(_A)"
+
+# camel/providers/imap/camel-imap-folder.c:1746
+# camel/providers/imap/camel-imap-folder.c:1746
+# camel/providers/imap/camel-imap-folder.c:1793
+#~ msgid "Scanning for new messages"
+#~ msgstr "正在扫描新邮件"
+
+# shell/e-storage.c:510
+# shell/e-storage.c:510
+# shell/e-storage.c:510
+#, fuzzy
+#~ msgid "The folder %s no longer exists"
+#~ msgstr "文件夹不为空"
+
+# composer/e-msg-composer-attachment-bar.c:101
+# composer/e-msg-composer-attachment-bar.c:101
+# composer/e-msg-composer-attachment-bar.c:101
+#~ msgid "1 byte"
+#~ msgstr "1 字节"
+
+# composer/e-msg-composer-attachment-bar.c:103
+# composer/e-msg-composer-attachment-bar.c:103
+# composer/e-msg-composer-attachment-bar.c:103
+#~ msgid "%u bytes"
+#~ msgstr "%u 字节"
+
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "您忘记选择文件夹了。\n"
+#~ "请退回并指定一个合法的文件夹以便存入邮件。"
+
+# mail/mail-local.c:1296
+# mail/mail-local.c:1296
+# mail/mail-local.c:1296
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr "由于 %s 不是本地文件夹,因此不能重新配置"
+
+# shell/e-shell-importer.c:243
+# shell/e-shell-importer.c:243
+# shell/e-shell-importer.c:243
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "正在导入 %s\n"
+#~ "导入没有就绪。\n"
+#~ "请 5 秒中以后再试。"
+
+# shell/importer/import.glade.h:3
+# shell/importer/import.glade.h:3
+# shell/importer/import.glade.h:3
+#~ msgid "Evolution Importer Assistant"
+#~ 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 "_Preferences..."
+#~ msgstr "没有循环(_N)"
+
# addressbook/backend/pas/pas-backend-file.c:270
# addressbook/backend/pas/pas-backend-file.c:270
# addressbook/backend/pas/pas-backend-file.c:270
@@ -45400,18 +45800,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "Non-Participants"
#~ msgstr "不参加"
-# composer/e-msg-composer.c:1405
-# composer/e-msg-composer.c:1322
-# composer/e-msg-composer.c:1288
-#~ msgid ""
-#~ "This message has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "该邮件尚未发送。\n"
-#~ "\n"
-#~ "您是否希望保存修改?"
-
# mail/mail-accounts.c:149
# mail/mail-accounts.c:149
# mail/mail-accounts.c:149
@@ -45911,18 +46299,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "Unable to find any of your identities in the attendees list!\n"
#~ msgstr "无法在参与者列表中找到您的任何身份!\n"
-# calendar/gui/itip-utils.c:370
-# calendar/gui/itip-utils.c:370
-# calendar/gui/itip-utils.c:370
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "忙闲信息 (%s 到 %s)"
-
-# calendar/gui/itip-utils.c:382
-# calendar/gui/itip-utils.c:382
-# calendar/gui/itip-utils.c:382
-#~ msgid "iCalendar information"
-#~ msgstr "iCalendar 信息"
-
# camel/camel-cipher-context.c:211
# camel/camel-cipher-context.c:209
# camel/camel-cipher-context.c:209
@@ -46683,12 +47059,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "_Task..."
#~ msgstr "任务(_T)..."
-# ui/evolution-mail-global.xml.h:21
-# ui/evolution-mail-global.xml.h:21
-# ui/evolution-mail-global.xml.h:21
-#~ msgid "_Mail Settings..."
-#~ msgstr "邮件设置(_M)..."
-
# ui/evolution-mail-message.xml.h:33
# ui/evolution-mail-message.xml.h:33
# ui/evolution-mail-message.xml.h:33