aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2004-04-30 23:01:36 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-04-30 23:01:36 +0800
commit1c8f61ea0bea3c97d3b6339a989882ab2180749a (patch)
treeb381ee25a790ae7ab0110d9ae2044ec915227212 /po/zh_CN.po
parent448012d42619872149723008d6490497ed24618a (diff)
downloadgsoc2013-evolution-1c8f61ea0bea3c97d3b6339a989882ab2180749a.tar
gsoc2013-evolution-1c8f61ea0bea3c97d3b6339a989882ab2180749a.tar.gz
gsoc2013-evolution-1c8f61ea0bea3c97d3b6339a989882ab2180749a.tar.bz2
gsoc2013-evolution-1c8f61ea0bea3c97d3b6339a989882ab2180749a.tar.lz
gsoc2013-evolution-1c8f61ea0bea3c97d3b6339a989882ab2180749a.tar.xz
gsoc2013-evolution-1c8f61ea0bea3c97d3b6339a989882ab2180749a.tar.zst
gsoc2013-evolution-1c8f61ea0bea3c97d3b6339a989882ab2180749a.zip
disted
svn path=/trunk/; revision=25711
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po4590
1 files changed, 2705 insertions, 1885 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 88422dd528..b8bf87c94e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2004-04-19 11:44-0400\n"
+"POT-Creation-Date: 2004-04-29 13:14-0400\n"
"PO-Revision-Date: 2004-01-25 07:08+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -68,8 +68,8 @@ msgstr "默认的同步地址:"
msgid "Could not load addressbook"
msgstr "无法装入地址簿"
-#: addressbook/conduit/address-conduit.c:1214
-#: addressbook/conduit/address-conduit.c:1217
+#: addressbook/conduit/address-conduit.c:1219
+#: addressbook/conduit/address-conduit.c:1222
msgid "Could not read pilot's Address application block"
msgstr "无法读入 Pilot 的地址应用程序块"
@@ -90,9 +90,8 @@ msgstr "在这里配置自动完成"
#.
#. name = e_book_get_name (book);
#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/gui/component/addressbook-component.c:522
#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:363
+#: calendar/gui/migration.c:373
msgid "Contacts"
msgstr "联系人"
@@ -132,141 +131,115 @@ msgstr "Evolution 文件夹配置控件"
msgid "Manager your S/Mime certificates here"
msgstr "在此管理您的 S/Mime 证书"
-#: addressbook/gui/component/addressbook-component.c:227
-#, fuzzy, c-format
-msgid "Address book '%s' will be removed. Are you sure you want to continue?"
-msgstr "即将删除地址簿“%s”。您确定想要继续吗?"
-
-#: addressbook/gui/component/addressbook-component.c:315
-#: addressbook/gui/component/ldap-config.glade.h:25
-#, fuzzy
-msgid "New Address Book"
-msgstr "新建地址簿"
-
-#: addressbook/gui/component/addressbook-component.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:368
-#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "删除"
-
-#: addressbook/gui/component/addressbook-component.c:317
-#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:370
-msgid "Properties..."
-msgstr "属性..."
-
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:93
msgid "New Contact"
msgstr "新建联系人"
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:94
msgid "_Contact"
msgstr "联系人(_C)"
-#: addressbook/gui/component/addressbook-component.c:564
+#: addressbook/gui/component/addressbook-component.c:95
msgid "Create a new contact"
msgstr "创建一个新联系人"
-#: addressbook/gui/component/addressbook-component.c:570
+#: addressbook/gui/component/addressbook-component.c:101
msgid "New Contact List"
msgstr "新建联系人列表"
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:102
msgid "Contact _List"
msgstr "联系人列表(_L)"
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:103
msgid "Create a new contact list"
msgstr "创建一个新的联系人列表"
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:109
#, fuzzy
msgid "New Contacts Group"
msgstr "新建联系人"
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:110
#, fuzzy
msgid "_Contacts Group"
msgstr "联系人(_C):"
-#: addressbook/gui/component/addressbook-component.c:580
+#: addressbook/gui/component/addressbook-component.c:111
#, fuzzy
msgid "Create a new contacts group"
msgstr "创建新快捷方式组"
-#: addressbook/gui/component/addressbook-config.c:407
+#: addressbook/gui/component/addressbook-config.c:466
msgid "Failed to connect to LDAP server"
msgstr "连接 LDAP 服务器失败"
-#: addressbook/gui/component/addressbook-config.c:431
+#: addressbook/gui/component/addressbook-config.c:490
msgid "Failed to authenticate with LDAP server"
msgstr "LDAP 服务器认证失败"
-#: addressbook/gui/component/addressbook-config.c:459
+#: addressbook/gui/component/addressbook-config.c:518
msgid "Could not perform query on Root DSE"
msgstr "无法在根 DSE 上执行查询"
-#: addressbook/gui/component/addressbook-config.c:785
+#: addressbook/gui/component/addressbook-config.c:822
msgid "The server responded with no supported search bases"
msgstr "服务器响应为没有支持的搜索起点"
-#: addressbook/gui/component/addressbook-config.c:1217
+#: addressbook/gui/component/addressbook-config.c:1216
msgid "This server does not support LDAPv3 schema information"
msgstr "此服务器不支持 LDAPv3 schema 信息"
-#: addressbook/gui/component/addressbook-config.c:1238
+#: addressbook/gui/component/addressbook-config.c:1237
msgid "Error retrieving schema information"
msgstr "检索 schema 信息错误"
-#: addressbook/gui/component/addressbook-config.c:1246
+#: addressbook/gui/component/addressbook-config.c:1245
msgid "Server did not respond with valid schema information"
msgstr "服务器没有响应有效的 schema 信息"
-#: addressbook/gui/component/addressbook-migrate.c:58
-#: calendar/gui/migration.c:128 mail/em-migrate.c:1072
+#: addressbook/gui/component/addressbook-migrate.c:68
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1070
msgid "Migrating..."
msgstr "正在升迁..."
-#: addressbook/gui/component/addressbook-migrate.c:98
-#: calendar/gui/migration.c:175 mail/em-migrate.c:1113
+#: addressbook/gui/component/addressbook-migrate.c:120
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
#, c-format
msgid "Migrating `%s':"
msgstr "升迁“%s”:"
#. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:408
-#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: addressbook/gui/component/addressbook-migrate.c:438
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:239
+#: mail/mail-component.c:242
msgid "On This Computer"
msgstr "在此计算机中"
#. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:416
-#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
-#: filter/filter-label.c:123 mail/em-migrate.c:926 mail/mail-config.c:67
+#: addressbook/gui/component/addressbook-migrate.c:446
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
+#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
#: mail/mail-config.glade.h:106
msgid "Personal"
msgstr "个人"
#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:424
+#: addressbook/gui/component/addressbook-migrate.c:454
msgid "On LDAP Servers"
msgstr "在 LDAP 服务器上"
-#: addressbook/gui/component/addressbook-migrate.c:552
+#: addressbook/gui/component/addressbook-migrate.c:582
msgid "LDAP Servers"
msgstr "LDAP 服务器"
-#: addressbook/gui/component/addressbook-migrate.c:672
+#: addressbook/gui/component/addressbook-migrate.c:702
msgid "Autocompletion Settings"
msgstr "自动完成设置"
-#: addressbook/gui/component/addressbook-migrate.c:853
+#: addressbook/gui/component/addressbook-migrate.c:1076
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -277,7 +250,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: addressbook/gui/component/addressbook-migrate.c:869
+#: addressbook/gui/component/addressbook-migrate.c:1090
#, fuzzy
msgid ""
"The format of mailing list contacts has changed.\n"
@@ -288,29 +261,43 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: addressbook/gui/component/addressbook.c:622
+#: addressbook/gui/component/addressbook-migrate.c:1099
+#, fuzzy
+msgid ""
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution 联系人文件夹的位置和层次与 Evolution 1.x 不同。\n"
+"\n"
+"请稍候,Evolution 正在升迁您的文件夹..."
+
+#: addressbook/gui/component/addressbook-migrate.c:1109
+#, fuzzy
+msgid ""
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
+msgstr ""
+"Evolution 联系人文件夹的位置和层次与 Evolution 1.x 不同。\n"
+"\n"
+"请稍候,Evolution 正在升迁您的文件夹..."
+
+#: addressbook/gui/component/addressbook.c:89
msgid "Accessing LDAP Server anonymously"
msgstr "匿名访问 LDAP 服务器"
-#: addressbook/gui/component/addressbook.c:693
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
msgid "Failed to authenticate.\n"
msgstr "认证失败。\n"
-#: addressbook/gui/component/addressbook.c:699
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%s为 %s 输入口令 (用户 %s)"
-#: addressbook/gui/component/addressbook.c:1025
-#, fuzzy
-msgid "UID of the contacts source that the view will display"
-msgstr "日历将显示的 URI"
-
-#: addressbook/gui/component/addressbook.c:1030
-#, fuzzy
-msgid "The URI that the address book will display"
-msgstr "日历将显示的 URI"
-
#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
msgid "EFolderList xml for the list of completion uris"
msgstr ""
@@ -335,7 +322,7 @@ msgstr " 显示支持的基础(_H) "
#: addressbook/gui/component/ldap-config.glade.h:2
#: addressbook/gui/component/select-names/select-names.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
#: addressbook/gui/contact-editor/fulladdr.glade.h:1
#: addressbook/gui/contact-editor/fullname.glade.h:1
#: addressbook/gui/contact-editor/im.glade.h:1
@@ -355,125 +342,187 @@ msgid "*"
msgstr "*"
#: addressbook/gui/component/ldap-config.glade.h:3
+msgid "1"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:4
msgid "1:00"
msgstr "1:00"
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:5
msgid "3268"
msgstr "3268"
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:6
msgid "389"
msgstr "389"
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "5"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
msgid "5:00"
msgstr "5:00"
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:9
msgid "636"
msgstr "636"
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:10
#, fuzzy
-msgid "Address Book Creation Assistant"
-msgstr "地址簿创建助手"
+msgid "<b>Authentication</b>"
+msgstr "身份验证"
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<b>Display</b>"
+msgstr "显示(_D)"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<b>Downloading</b>"
+msgstr "<b>发送电子邮件:</b>"
+
+#: addressbook/gui/component/ldap-config.glade.h:13
+#, fuzzy
+msgid "<b>Searching</b>"
+msgstr "搜索"
+
+#: addressbook/gui/component/ldap-config.glade.h:14
+#, fuzzy
+msgid "<b>Server Information</b>"
+msgstr "第二步:服务器信息"
+
+#: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
+msgid "<b>Type:</b>"
+msgstr "<b>到期:</b>"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Add Contacts Group"
+msgstr "联系人(_C):"
+
+#: addressbook/gui/component/ldap-config.glade.h:17
#, fuzzy
msgid "Address Book Properties"
msgstr "地址簿属性"
-#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
#: mail/mail-config.glade.h:40
msgid "Always"
msgstr "总是"
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:19
msgid "Anonymously"
msgstr "匿名"
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:20
+#: calendar/gui/dialogs/task-editor.c:193
+msgid "Basic"
+msgstr "基本"
+
+#: addressbook/gui/component/ldap-config.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
#, fuzzy
-msgid ""
-"Congratulations, you are\n"
-"\t finished setting up this address book.\n"
-"\n"
-"Please click the \"Apply\" button to save the settings you have entered here."
-msgstr ""
-"恭喜,您已经设置完了此 LDAP 服务器。您现在可以访问此目录了。\n"
-"\n"
-"请单击“完成”按钮保存您在此输入的设置。"
+msgid "C_olor:"
+msgstr "颜色(_O)"
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:22
msgid "Connecting"
msgstr "连接"
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:23
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
+#: smime/gui/smime-ui.glade.h:19
+msgid "Details"
+msgstr "细节"
+
+#: addressbook/gui/component/ldap-config.glade.h:24
msgid "Distinguished _name:"
msgstr "识别性名称(_N):"
-#: addressbook/gui/component/ldap-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:25
+#, fuzzy
+msgid "Distinguished name"
+msgstr "识别性名称(_N):"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Download limit:"
+msgstr "下载上限(_D):"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Email address"
+msgstr "电子邮件地址:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
msgid "Email address:"
msgstr "电子邮件地址:"
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:29
msgid "Evolution will use this DN to authenticate you with the server"
msgstr "Evolution 将使用此已识别的名字在服务器上对您进行认证"
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:30
msgid ""
"Evolution will use this email address to authenticate you with the server"
msgstr "Evolution 将使用此电子邮件地址在服务器上对您进行认证"
-#: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "Finished"
-msgstr "已完成"
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
+msgid "Find Possible Search Bases"
+msgstr "支持的搜索起点"
-#: addressbook/gui/component/ldap-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:32
+#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
#: smime/gui/smime-ui.glade.h:27
msgid "General"
msgstr "常规"
-#: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "Group:"
-msgstr "组:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
#: mail/mail-config.glade.h:99
msgid "Never"
msgstr "从不"
-#: addressbook/gui/component/ldap-config.glade.h:26
-msgid ""
-"Now, you must specify how you want to connect to the LDAP server. The SSL "
-"(Secure Sockets Layer)\n"
-"and TLS (Transport Layer Security) protocols are used by some servers to "
-"cryptographically protect\n"
-"your connection. Ask your system administrator if your LDAP server uses "
-"these protocols."
-msgstr ""
-"现在,您应该指定如何连接到 LDAP 服务器。大多数服务器都会采用SSL(安全套接\n"
-"字层)或TLS(传输层安全)协议来加密保护您的连接。请询问您的系统管理员关于您\n"
-"的 LDAP 服务器使用何种协议的信息。"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:34
msgid "One"
msgstr "一级"
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:35
+msgid "Only locations within starting point"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+msgid "Pick a color"
+msgstr "选取一种颜色"
+
+#: addressbook/gui/component/ldap-config.glade.h:37
msgid "S_earch scope: "
msgstr "搜索范围(_E):"
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:38
+#, fuzzy
+msgid "Search base only"
+msgstr "搜索起点:"
+
+#: addressbook/gui/component/ldap-config.glade.h:39
+msgid "Search base:"
+msgstr "搜索起点:"
+
+#: addressbook/gui/component/ldap-config.glade.h:40
+#, fuzzy
+msgid "Search scope:"
+msgstr "搜索范围(_E):"
+
+#: addressbook/gui/component/ldap-config.glade.h:41
msgid "Searching"
msgstr "搜索"
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:42
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if\n"
@@ -482,7 +531,7 @@ msgstr ""
"选中此选项意味着 Evolution 只在您的 LDAP 服务器支持\n"
"SSL 或 TLS 时才连接到您的 LDAP 服务器。"
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:44
msgid ""
"Selecting this option means that Evolution will only try to use SSL/TLS if "
"you are in a \n"
@@ -496,7 +545,7 @@ msgstr ""
"例如,如果您和您的 LDAP 服务器工作时位于防火墙后,Evolution 就没有必\n"
"要使用 SSL/TLS,因为您的连接已经相当安全了。"
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:48
msgid ""
"Selecting this option means that your server does not support either SSL or "
"TLS. This \n"
@@ -507,60 +556,19 @@ msgstr ""
"选择此选项意味着您的服务器既不支持 SSL 也不支持 TLS。可能导致的结果将是\n"
"您的连接不太安全,您也易于受到安全漏洞的攻击。"
-#: addressbook/gui/component/ldap-config.glade.h:41
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editing contacts. "
-msgstr ""
-"选择此选项可让您更改 Evolution 对 LDAP 搜索及创建和编辑联系人所用的默认设置。"
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-#, fuzzy
-msgid ""
-"Specifying a\n"
-"\t\t\t display name and group is the first step in setting\n"
-"\t\t\t up an address book."
-msgstr "指定显示名称是配置 LDAP 服务器所需的最后一个步骤。"
-
-#: addressbook/gui/component/ldap-config.glade.h:46
-#: calendar/gui/dialogs/calendar-setup.glade.h:20
-msgid "Step 1: Folder Characteristics"
+#: addressbook/gui/component/ldap-config.glade.h:51
+msgid "Starting point and locations within it"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid "Step 2: Server Information"
-msgstr "第二步:服务器信息"
-
-#: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 3: Connecting to Server"
-msgstr "第三步:连接服务器"
-
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 4: Searching the Directory"
-msgstr "第四步:搜索目录"
-
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:52
msgid "Sub"
msgstr "子级"
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
msgid "Supported Search Bases"
msgstr "支持的搜索起点"
-#: addressbook/gui/component/ldap-config.glade.h:52
-msgid ""
-"The options on this page control how many entries should be included in "
-"your\n"
-"searches, and how long a search should take. Ask your system administrator "
-"if you\n"
-"need to change these options."
-msgstr ""
-"本页中的选项控制了在您的搜索中应当包含多少项,以及搜索将花费的时间。\n"
-"如果您需要更改这些选项,请询问您的系统管理员。"
-
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:54
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
"searches will \n"
@@ -570,7 +578,7 @@ msgstr ""
"搜索基础是您搜索开始项的可识别名称(DN)。如果您将此处留空,搜索将从目\n"
"录树的根开始。"
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:56
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the \n"
@@ -583,28 +591,13 @@ msgstr ""
"指定的搜索基础下所属的全部项。搜索范围若为“一级”,则只会包含您指定的搜\n"
"索基础之下一级的项目。\n"
-#: addressbook/gui/component/ldap-config.glade.h:61
-#, fuzzy
-msgid ""
-"This assistant will help you\n"
-"\t create a new address book. \n"
-"\n"
-"Depending on the type of address book you create, additional\n"
-"parameters may be required. Please contact your system\n"
-"administrator if you need help finding this information."
-msgstr ""
-"此助手将帮助您使用 LDAP(轻量级目录访问协议)服务器访问在线目录服务。\n"
-"\n"
-"添加新的 LDAP 服务器需要关于服务器的一些专业化信息。如果您对这些信\n"
-"息不太了解的话,请询问您的系统管理员。"
-
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:60
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr "这是您的 LDAP 服务器的完整名字。例如,“ldap.mycompany.com”。"
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:61
#, fuzzy
msgid ""
"This is the maximum number of entries to download. Setting this number to "
@@ -614,7 +607,7 @@ msgstr ""
"这是可下载条目的最大数量。将此数值设定\n"
"得太大将导致地址簿变慢。"
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:63
msgid ""
"This is the method evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -623,7 +616,7 @@ msgstr ""
"这是 evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
"对 ldap 服务器的匿名访问权限。"
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:64
msgid ""
"This is the name for this server that will appear in your Evolution folder "
"list.\n"
@@ -632,17 +625,7 @@ msgstr ""
"这是此服务器在 Evolution 文件夹列表中显示的名称。\n"
"它只用于显示。"
-#: addressbook/gui/component/ldap-config.glade.h:73
-#: calendar/gui/dialogs/calendar-setup.glade.h:34
-#, fuzzy
-msgid ""
-"This is the name that will appear in your Evolution folder list. It is for "
-"display purposes only. "
-msgstr ""
-"这是此服务器在 Evolution 文件夹列表中显示的名称。\n"
-"它只用于显示。"
-
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:66
msgid ""
"This is the port on the LDAP server that Evolution will try to connect to. "
"A \n"
@@ -652,80 +635,111 @@ msgstr ""
"这是 LDAP 服务器上的端口,Evolution 将试图连接到您所给出的标准端口列表。\n"
"如果您不清楚要指定端口,请询问您的系统管理员。"
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:69
msgid "This option controls how long a search will be run."
msgstr "此选项控制搜索将运行多长时间。"
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Timeout:"
+msgstr "时间格式:"
+
+#: addressbook/gui/component/ldap-config.glade.h:71
msgid "U_se SSL/TLS:"
msgstr "使用 _SSL/TLS:"
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:72
msgid "Using distinguished name (DN)"
msgstr "使用已识别的姓名 (DN)"
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:73
msgid "Using email address"
msgstr "使用电子邮件地址"
-#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
+#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
#: mail/mail-config.glade.h:154
msgid "Whenever Possible"
msgstr "可能时"
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:75
#, fuzzy
-msgid ""
-"You have decided to configure an LDAP server. The first step in doing this "
-"is to provide its name and your\n"
-"log in information. Please ask your system administrator if you are unsure "
-"of this information."
-msgstr ""
-"配置 LDAP 服务器的第一个步骤是提供其名称,以及您的登录信息。\n"
-"如果您对这些信息不太了解,请询问您的系统管理员。"
+msgid "_Add Contacts Group"
+msgstr "联系人(_C):"
-#: addressbook/gui/component/ldap-config.glade.h:84
-#: calendar/gui/dialogs/calendar-setup.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:76
+#: calendar/gui/dialogs/calendar-setup.glade.h:12
msgid "_Display name:"
msgstr "显示名称(_D):"
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:77
msgid "_Download limit:"
msgstr "下载上限(_D):"
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:78
+#, fuzzy
+msgid "_Email address:"
+msgstr "电子邮件地址:"
+
+#: addressbook/gui/component/ldap-config.glade.h:79
msgid "_Log in method:"
msgstr "登录方式(_L):"
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:80
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+msgid "_Name:"
+msgstr "名称(_N):"
+
+#: addressbook/gui/component/ldap-config.glade.h:81
msgid "_Port number:"
msgstr "端口号(_P):"
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:82
+#, fuzzy
+msgid "_Port:"
+msgstr "优先级(_P):"
+
+#: addressbook/gui/component/ldap-config.glade.h:83
msgid "_Search base:"
msgstr "搜索起点(_S):"
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
msgid "_Server name:"
msgstr "服务器名(_S):"
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
+#, fuzzy
+msgid "_Server:"
+msgstr "服务器(_E):"
+
+#: addressbook/gui/component/ldap-config.glade.h:86
msgid "_Timeout (minutes):"
msgstr "超时(分钟)(_T):"
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:87
+#, fuzzy
+msgid "_Use secure connection:"
+msgstr "使用安全连接 (SSL)(_U):"
+
+#: addressbook/gui/component/ldap-config.glade.h:88
msgid "cards"
msgstr "卡片"
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:89
msgid "connecting-tab"
msgstr "连接-页"
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:90
msgid "general-tab"
msgstr "常规-页"
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:91
+#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:182
+msgid "minutes"
+msgstr "分钟"
+
+#: addressbook/gui/component/ldap-config.glade.h:92
msgid "searching-tab"
msgstr "搜索-页"
@@ -733,35 +747,35 @@ msgstr "搜索-页"
msgid "Evolution Addressbook name selection interface"
msgstr "Evolution 的地址簿名称选择界面"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:206
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
msgid "Remove All"
msgstr "全部删除"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:213
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
#: addressbook/gui/component/select-names/e-select-names.c:696
-#: calendar/gui/dialogs/cal-prefs-dialog.c:734
+#: calendar/gui/dialogs/cal-prefs-dialog.c:724
msgid "Remove"
msgstr "删除"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:220
+#: addressbook/gui/component/select-names/e-select-names-popup.c:222
msgid "View Contact List"
msgstr "查看联系人列表"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:220
+#: addressbook/gui/component/select-names/e-select-names-popup.c:222
msgid "View Contact Info"
msgstr "查看联系人信息"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:227
-#: addressbook/gui/component/select-names/e-select-names-popup.c:328
+#: addressbook/gui/component/select-names/e-select-names-popup.c:229
+#: addressbook/gui/component/select-names/e-select-names-popup.c:330
msgid "Send HTML Mail?"
msgstr "发送 HTML 邮件吗?"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:320
+#: addressbook/gui/component/select-names/e-select-names-popup.c:322
#: addressbook/gui/widgets/eab-popup-control.c:983
msgid "Add to Contacts"
msgstr "添加到联系人"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:346
+#: addressbook/gui/component/select-names/e-select-names-popup.c:348
msgid "Unnamed Contact"
msgstr "未命名的联系人"
@@ -802,213 +816,266 @@ msgstr "类别(_A):"
msgid "_Find"
msgstr "查找(_F)"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid " B_usiness:"
-msgstr "商务(_U):"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#, fuzzy
+msgid "<b>Email</b>"
+msgstr "<b>发送电子邮件:</b>"
#: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "A_ddress..."
-msgstr "地址(_D)..."
+#, fuzzy
+msgid "<b>Home</b>"
+msgstr "<b>到期:</b>"
#: addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "A_ssistant's name:"
-msgstr "助手姓名(_S):"
+#, fuzzy
+msgid "<b>Instant Messaging</b>"
+msgstr "即时通讯"
#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "Addressbook:"
-msgstr "地址簿:"
+#, fuzzy
+msgid "<b>Job</b>"
+msgstr "<b>到期:</b>"
#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "Anni_versary:"
-msgstr "周年(_V):"
+#, fuzzy
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>发送电子邮件:</b>"
#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "Birthda_y:"
-msgstr "生日(_Y):"
+#, fuzzy
+msgid "<b>Other</b>"
+msgstr "<b>到期:</b>"
#: addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "Blog address:"
-msgstr "Blog 地址:"
+#, fuzzy
+msgid "<b>Telephone</b>"
+msgstr "<b>到期:</b>"
#: addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "Business fa_x:"
-msgstr "商务传真(_X):"
+msgid "<b>Web Addresses</b>"
+msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "Collaboration"
-msgstr "合作"
+#, fuzzy
+msgid "<b>Work</b>"
+msgstr "<b>到期:</b>"
-#. Construct the app
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:1202
-#: addressbook/gui/contact-editor/e-contact-editor.c:2019
-msgid "Contact Editor"
-msgstr "联系人编辑器"
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/widgets/eab-contact-display.c:302
+#: addressbook/gui/widgets/eab-contact-display.c:321
+msgid "AIM"
+msgstr "AIM"
#: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "D_epartment:"
-msgstr "部门(_E):"
+#, fuzzy
+msgid "Address 2:"
+msgstr "地址 _2:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
-msgid "Details"
-msgstr "细节"
+#, fuzzy
+msgid "Address:"
+msgstr "地址(_A):"
#: addressbook/gui/contact-editor/contact-editor.glade.h:14
-msgid "Enter the person's instant messenger accounts here."
-msgstr "在此输入个人的即时通讯账户。"
+#, fuzzy
+msgid "Anniversary:"
+msgstr "周年(_V):"
#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "F_ree/Busy URL:"
-msgstr "忙闲 URL(_R):"
+#, fuzzy
+msgid "Assistant:"
+msgstr "助手"
#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "File a_s:"
-msgstr "存档为(_S):"
+#, fuzzy
+msgid "Birthday:"
+msgstr "生日(_Y):"
#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Full _Name..."
-msgstr "全名(_N)..."
+#, fuzzy
+msgid "Blog:"
+msgstr "Blog"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: calendar/gui/dialogs/event-page.glade.h:5
+msgid "Calendar:"
+msgstr "日历:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:19
#, fuzzy
-msgid ""
-"If this person has the ability to participate in a video conference, enter "
-"their address here."
-msgstr "如果此人把忙闲信息或其它日历信息发布到互联网上,就在这里输入发布地址。"
+msgid "City:"
+msgstr "城市(_T):"
#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid ""
-"If this person publishes free/busy or other calendar information on the "
-"Internet, enter the address\n"
-"of that information here."
-msgstr "如果此人把忙闲信息或其它日历信息发布到互联网上,就在这里输入发布地址。"
+#, fuzzy
+msgid "Company:"
+msgstr "命令:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: addressbook/gui/widgets/e-minicard.c:181
+msgid "Contact"
+msgstr "联系人"
#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "Instant Messaging"
-msgstr "即时通讯"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+msgid "Contact Editor"
+msgstr "联系人编辑器"
#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "New phone type"
-msgstr "新电话类型"
+#, fuzzy
+msgid "Country:"
+msgstr "国家(_Y):"
#: addressbook/gui/contact-editor/contact-editor.glade.h:24
-msgid "No_tes:"
-msgstr "注释(_T):"
+#, fuzzy
+msgid "Department:"
+msgstr "部门(_E):"
#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Organi_zation:"
-msgstr "组织(_Z):"
+#, fuzzy
+msgid "Free/Busy:"
+msgstr "忙闲 URL(_R):"
#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "P_rofession:"
-msgstr "职业(_R):"
+msgid "Full _Name..."
+msgstr "全名(_N)..."
#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "Primary _email:"
-msgstr "主电子邮件(_E):"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:194
+msgid "Home"
+msgstr "家庭"
#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "S_pouse:"
-msgstr "配偶(_P):"
+#, fuzzy
+msgid "Job title:"
+msgstr "职称(_J):"
#: addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "Wants to receive _HTML mail"
-msgstr "愿意接收 HTML 邮件(_H)"
+#: calendar/gui/e-itip-control.c:936
+msgid "Location:"
+msgstr "位置:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-msgid "_Add"
-msgstr "添加(_A)"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Business:"
-msgstr "商务(_B):"
+#, fuzzy
+msgid "Mailing Address"
+msgstr "电子邮件地址"
#: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "_Categories..."
-msgstr "类别(_C)..."
+#, fuzzy
+msgid "Manager:"
+msgstr "经理"
-#. FIXME: need to disable for undeletable folders
#: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651
-#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
-#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
-#: mail/em-folder-tree.c:2570 mail/em-folder-view.c:794
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "删除(_D)"
+#, fuzzy
+msgid "Ni_ckname:"
+msgstr "昵称(_N):"
#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:22
-msgid "_Edit"
-msgstr "编辑(_E)"
+#, fuzzy
+msgid "Notes:"
+msgstr "注释(_T):"
#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-msgid "_Home:"
-msgstr "家庭(_H):"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#, fuzzy
+msgid "Novell Groupwise"
+msgstr "Novell GroupWise"
#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Job title:"
-msgstr "职称(_J):"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_Manager's name:"
-msgstr "经理姓名(_M):"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
+msgid "Other"
+msgstr "其它"
#: addressbook/gui/contact-editor/contact-editor.glade.h:38
-msgid "_Mobile:"
-msgstr "移动电话(_M):"
+#, fuzzy
+msgid "Personal Information"
+msgstr "可选的信息"
#: addressbook/gui/contact-editor/contact-editor.glade.h:39
-msgid "_Nickname:"
-msgstr "昵称(_N):"
+#, fuzzy
+msgid "Profession:"
+msgstr "职业(_R):"
#: addressbook/gui/contact-editor/contact-editor.glade.h:40
-msgid "_Office:"
-msgstr "办公室(_O):"
+#, fuzzy
+msgid "State/Province:"
+msgstr "州/省(_S):"
#: addressbook/gui/contact-editor/contact-editor.glade.h:41
-msgid "_Public Calendar URL:"
-msgstr "公开日历 URL(_P):"
+#, fuzzy
+msgid "Wants to receive HTML mail"
+msgstr "愿意接收 HTML 邮件(_H)"
#: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "_This is the mailing address"
-msgstr "这是邮政地址(_T)"
+#, fuzzy
+msgid "Webcam:"
+msgstr "网页:"
+#. red
#: addressbook/gui/contact-editor/contact-editor.glade.h:43
-msgid "_Video Conferencing URL:"
-msgstr "视频会议 URL(_V):"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:193
+#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
+msgid "Work"
+msgstr "工作"
#: addressbook/gui/contact-editor/contact-editor.glade.h:44
-msgid "_Web page address:"
-msgstr "网页地址(_W):"
+#, fuzzy
+msgid "Zip/Postal Code:"
+msgstr "邮政编码(_Z):"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:45
+#, fuzzy
+msgid "_Categories"
+msgstr "类别"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:46
+#, fuzzy
+msgid "_File under:"
+msgstr "文件名:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#, fuzzy
+msgid "_Where:"
+msgstr "服务器(_E):"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:48
+msgid "item7"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:49
+msgid "item8"
+msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:332
msgid "Address"
msgstr "地址"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:173
+#: addressbook/gui/contact-editor/e-contact-editor.c:281
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
#: addressbook/gui/widgets/e-addressbook-model.c:309
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
#: addressbook/gui/widgets/e-minicard-label.c:164
#: addressbook/gui/widgets/e-minicard-view-widget.c:119
#: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:173
+#: addressbook/gui/widgets/e-minicard.c:174
msgid "Editable"
msgstr "可编辑"
@@ -1988,15 +2055,10 @@ msgstr "津巴布韦"
msgid "AOL Instant Messenger"
msgstr "AOL 即时通讯程序"
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#, fuzzy
-msgid "Novell Groupwise"
-msgstr "Novell GroupWise"
-
#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2835
-#: addressbook/gui/widgets/eab-contact-display.c:308
-#: addressbook/gui/widgets/eab-contact-display.c:327
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:305
+#: addressbook/gui/widgets/eab-contact-display.c:324
msgid "Jabber"
msgstr "Jabber"
@@ -2004,25 +2066,19 @@ msgstr "Jabber"
msgid "Yahoo Messenger"
msgstr "雅虎通"
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2838
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/widgets/eab-contact-display.c:304
+#: addressbook/gui/widgets/eab-contact-display.c:323
msgid "ICQ"
msgstr "ICQ"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:704
msgid "Service"
msgstr "服务"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:727
-#: calendar/gui/dialogs/cal-prefs-dialog.c:580
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
#: calendar/gui/e-cal-list-view.etspec.h:2
msgid "Location"
msgstr "位置"
@@ -2031,97 +2087,52 @@ msgstr "位置"
msgid "Username"
msgstr "用户名"
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2503
-#: addressbook/gui/contact-editor/e-contact-editor.c:2799
-msgid "Home"
-msgstr "家庭"
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
+msgid "Yahoo"
+msgstr "雅虎"
-#. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2803
-#: filter/filter-label.c:122 mail/em-migrate.c:925 mail/mail-config.c:66
-#: mail/mail-config.glade.h:155
-msgid "Work"
-msgstr "工作"
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/widgets/eab-contact-display.c:306
+#: addressbook/gui/widgets/eab-contact-display.c:325
+msgid "MSN"
+msgstr "MSN"
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2504
-#: addressbook/gui/contact-editor/e-contact-editor.c:2807
-msgid "Other"
-msgstr "其它"
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#, fuzzy
+msgid "GroupWise"
+msgstr "Novell GroupWise"
-#: addressbook/gui/contact-editor/e-contact-editor.c:217
+#: addressbook/gui/contact-editor/e-contact-editor.c:246
msgid "Source Book"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:224
+#: addressbook/gui/contact-editor/e-contact-editor.c:253
msgid "Target Book"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:231
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:159
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:180
-msgid "Contact"
-msgstr "联系人"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:238
+#: addressbook/gui/contact-editor/e-contact-editor.c:267
msgid "Is New Contact"
msgstr "为新联系人"
-#: addressbook/gui/contact-editor/e-contact-editor.c:245
+#: addressbook/gui/contact-editor/e-contact-editor.c:274
msgid "Writable Fields"
msgstr "可写域"
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:288
msgid "Changed"
msgstr "已更改"
-#: addressbook/gui/contact-editor/e-contact-editor.c:718
-msgid "Account Name"
-msgstr "账户名"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1485
+#: addressbook/gui/contact-editor/e-contact-editor.c:1656
msgid "Category editor not available."
msgstr "类别编辑器不可用。"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1493
+#: addressbook/gui/contact-editor/e-contact-editor.c:1664
msgid "This contact belongs to these categories:"
msgstr "此联系人属于这些类别:"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-msgid "Save Contact as VCard"
-msgstr "将联系人保存为 VCard"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2502
-msgid "Business"
-msgstr "商务"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2834
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
-msgid "AIM"
-msgstr "AIM"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2836
-#: addressbook/gui/widgets/eab-contact-display.c:310
-#: addressbook/gui/widgets/eab-contact-display.c:329
-msgid "Yahoo"
-msgstr "雅虎"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2837
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:328
-msgid "MSN"
-msgstr "MSN"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2839
-#, fuzzy
-msgid "GroupWise"
-msgstr "Novell GroupWise"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:3126
+#: addressbook/gui/contact-editor/e-contact-editor.c:2495
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr "无法为域找到构件:“%s”"
@@ -2299,7 +2310,7 @@ msgstr "输入电子邮件地址或者把联系人拖放到下面的列表(_T)
msgid "contact-list-editor"
msgstr "联系人列表编辑器"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:152
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
#: addressbook/gui/widgets/e-addressbook-model.c:295
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
#: addressbook/gui/widgets/e-addressbook-view.c:215
@@ -2308,17 +2319,17 @@ msgstr "联系人列表编辑器"
msgid "Book"
msgstr "名簿"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:166
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
msgid "Is New List"
msgstr "为新列表"
#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:214
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:756
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
msgid "Contact List Editor"
msgstr "联系人列表编辑器"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:434
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
msgid "Save List as VCard"
msgstr "将列表保存为 VCard"
@@ -2360,8 +2371,8 @@ msgstr ""
"您一定要添加吗?"
#. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
-#: widgets/misc/e-filter-bar.c:154
+#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: widgets/misc/e-filter-bar.c:156
msgid "Advanced Search"
msgstr "高级搜索"
@@ -2404,13 +2415,13 @@ msgid "Email begins with"
msgstr "邮件以此开头"
#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:57
msgid "Category is"
msgstr "类别为"
#. We attach subitems below
#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
msgid "Any field contains"
msgstr "任何域含有"
@@ -2503,7 +2514,7 @@ msgid "Cut"
msgstr "剪切"
#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:366
+#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
@@ -2514,8 +2525,18 @@ msgstr "复制"
msgid "Paste"
msgstr "粘贴"
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
+#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "删除"
+
#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1248
+#: calendar/gui/e-calendar-view.c:1262
msgid "Current View"
msgstr "当前视图"
@@ -2531,7 +2552,7 @@ msgstr ""
#. All, unmatched, separator
#: addressbook/gui/widgets/e-addressbook-view.c:1657
-#: calendar/gui/cal-search-bar.c:359
+#: calendar/gui/cal-search-bar.c:362
msgid "Any Category"
msgstr "任何类别"
@@ -2572,7 +2593,7 @@ msgid "Company Phone"
msgstr "公司电话"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:515 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
msgid "Email"
msgstr "电子邮件"
@@ -2624,7 +2645,7 @@ msgid "Manager"
msgstr "经理"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:331
msgid "Mobile Phone"
msgstr "移动电话"
@@ -2633,7 +2654,7 @@ msgid "Nickname"
msgstr "昵称"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:342
msgid "Note"
msgstr "注释"
@@ -2642,7 +2663,7 @@ msgid "Office"
msgstr "办公室"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:303
+#: addressbook/gui/widgets/eab-contact-display.c:300
msgid "Organization"
msgstr "组织"
@@ -2698,17 +2719,17 @@ msgid "Web Site"
msgstr "网站"
#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:136
+#: addressbook/gui/widgets/e-minicard.c:137
msgid "Width"
msgstr "宽度"
#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:143
+#: addressbook/gui/widgets/e-minicard.c:144
msgid "Height"
msgstr "高度"
#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:151
+#: addressbook/gui/widgets/e-minicard.c:152
msgid "Has Focus"
msgstr "有焦点"
@@ -2760,152 +2781,183 @@ msgstr ""
msgid "Adapter"
msgstr "适配器"
-#: addressbook/gui/widgets/e-minicard.c:159
+#: addressbook/gui/widgets/e-minicard.c:160
msgid "Selected"
msgstr "已选择"
-#: addressbook/gui/widgets/e-minicard.c:166
+#: addressbook/gui/widgets/e-minicard.c:167
msgid "Has Cursor"
msgstr "有光标"
-#: addressbook/gui/widgets/eab-contact-display.c:117
-#: addressbook/gui/widgets/eab-contact-display.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:114
+#: addressbook/gui/widgets/eab-contact-display.c:177
msgid "(map)"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:127
-#: addressbook/gui/widgets/eab-contact-display.c:193
+#: addressbook/gui/widgets/eab-contact-display.c:124
+#: addressbook/gui/widgets/eab-contact-display.c:190
msgid "map"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:496
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:493
msgid "List Members"
msgstr "列出成员"
-#: addressbook/gui/widgets/eab-contact-display.c:296
+#: addressbook/gui/widgets/eab-contact-display.c:293
#, fuzzy
msgid "E-mail"
msgstr "电子邮件"
-#: addressbook/gui/widgets/eab-contact-display.c:304
+#: addressbook/gui/widgets/eab-contact-display.c:301
#, fuzzy
msgid "Position"
msgstr "描述"
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: addressbook/gui/widgets/eab-contact-display.c:303
+#: addressbook/gui/widgets/eab-contact-display.c:322
#, fuzzy
msgid "Groupwise"
msgstr "组"
-#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:308
#, fuzzy
msgid "Video Conferencing"
msgstr "视频会议 URL(_V):"
-#: addressbook/gui/widgets/eab-contact-display.c:312
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:330
#, fuzzy
msgid "Phone"
msgstr "车载电话"
-#: addressbook/gui/widgets/eab-contact-display.c:313
+#: addressbook/gui/widgets/eab-contact-display.c:310
msgid "Fax"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:317
+#: addressbook/gui/widgets/eab-contact-display.c:314
#, fuzzy
msgid "work"
msgstr "工作"
-#: addressbook/gui/widgets/eab-contact-display.c:330
+#: addressbook/gui/widgets/eab-contact-display.c:327
msgid "WWW"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:331
-#: addressbook/gui/widgets/eab-contact-display.c:550
+#: addressbook/gui/widgets/eab-contact-display.c:328
+#: addressbook/gui/widgets/eab-contact-display.c:547
msgid "Blog"
msgstr "Blog"
-#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:335
#, fuzzy
msgid "personal"
msgstr "个人"
-#: addressbook/gui/widgets/eab-contact-display.c:511
+#: addressbook/gui/widgets/eab-contact-display.c:508
msgid "Job Title"
msgstr "职称"
-#: addressbook/gui/widgets/eab-contact-display.c:542
+#: addressbook/gui/widgets/eab-contact-display.c:539
msgid "Home page"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
msgid "Success"
msgstr "成功"
-#: addressbook/gui/widgets/eab-gui-util.c:48
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1089
-msgid "Unknown error"
-msgstr "未知的错误"
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
msgid "Repository offline"
msgstr "仓库离线"
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "地址簿不存在"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "新建联系人列表"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
msgid "Permission denied"
msgstr "没有权限"
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
msgid "Contact not found"
msgstr "找不到联系人"
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
msgid "Contact ID already exists"
msgstr "联系人 ID 已经存在"
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
msgid "Protocol not supported"
msgstr "不支持的协议"
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
-#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:212
-#: calendar/gui/print.c:2349 camel/camel-service.c:728
-#: camel/camel-service.c:766 camel/camel-service.c:850
-#: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:728 camel/camel-service.c:766
+#: camel/camel-service.c:850 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:451
#: camel/providers/pop3/camel-pop3-store.c:532
msgid "Cancelled"
msgstr "已经取消"
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "无法打开“%s”:%s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
msgid "Authentication Failed"
msgstr "认证失败"
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
msgid "Authentication Required"
msgstr "必须认证"
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
msgid "TLS not Available"
msgstr "TLS 不可用"
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
#, fuzzy
-msgid "Address Book does not exist"
-msgstr "地址簿不存在"
+msgid "No such source"
+msgstr "没有该邮件"
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
msgid "Other error"
msgstr "其它错误"
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#: addressbook/gui/widgets/eab-gui-util.c:102
#, fuzzy
msgid ""
"We were unable to open this addressbook. Please check that the path exists "
@@ -2914,7 +2966,7 @@ msgstr ""
"我们无法打开此地址簿。请检查路径是否存在\n"
"以及您是否有足够的权限访问它。"
-#: addressbook/gui/widgets/eab-gui-util.c:97
+#: addressbook/gui/widgets/eab-gui-util.c:109
#, fuzzy
msgid ""
"We were unable to open this addressbook. This either means you have entered "
@@ -2924,7 +2976,7 @@ msgstr ""
"您输入了错误的 URI,也可能是因为\n"
"LDAP 服务器已经关闭。"
-#: addressbook/gui/widgets/eab-gui-util.c:102
+#: addressbook/gui/widgets/eab-gui-util.c:114
#, fuzzy
msgid ""
"This version of Evolution does not have LDAP support compiled in to it. If "
@@ -2936,7 +2988,7 @@ msgstr ""
"以下链接获取 OpenLDAP,然后从程序的 CVS 源代码\n"
"重新编译程序。\n"
-#: addressbook/gui/widgets/eab-gui-util.c:111
+#: addressbook/gui/widgets/eab-gui-util.c:123
#, fuzzy
msgid ""
"We were unable to open this addressbook. This either means you have entered "
@@ -2946,11 +2998,11 @@ msgstr ""
"您输入了错误的 URI,也可能是因为\n"
"服务器已经关闭。"
-#: addressbook/gui/widgets/eab-gui-util.c:128
+#: addressbook/gui/widgets/eab-gui-util.c:140
msgid "Unable to open addressbook"
msgstr "无法打开地址簿"
-#: addressbook/gui/widgets/eab-gui-util.c:149
+#: addressbook/gui/widgets/eab-gui-util.c:161
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -2961,7 +3013,7 @@ msgstr ""
"Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
"搜索条件,或者在此地址簿的目录服务器参数中将结果限制调高。"
-#: addressbook/gui/widgets/eab-gui-util.c:155
+#: addressbook/gui/widgets/eab-gui-util.c:167
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"
@@ -2972,53 +3024,53 @@ msgstr ""
"请在搜索的时候指定更加严格的搜索条件,或者在此地址簿的目录服务器参数\n"
"中将时间限制调高。"
-#: addressbook/gui/widgets/eab-gui-util.c:161
+#: addressbook/gui/widgets/eab-gui-util.c:173
msgid "The backend for this addressbook was unable to parse this query."
msgstr "此地址簿的后端无法解析此查询。"
-#: addressbook/gui/widgets/eab-gui-util.c:164
+#: addressbook/gui/widgets/eab-gui-util.c:176
msgid "The backend for this addressbook refused to perform this query."
msgstr "此地址簿的后端拒绝执行此查询。"
-#: addressbook/gui/widgets/eab-gui-util.c:167
+#: addressbook/gui/widgets/eab-gui-util.c:179
msgid "This query did not complete successfully."
msgstr "此查询未成功完成。"
-#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:205
msgid "Do you want to save changes?"
msgstr "您希望保存修改吗?"
-#: addressbook/gui/widgets/eab-gui-util.c:195
+#: addressbook/gui/widgets/eab-gui-util.c:207
msgid "_Discard"
msgstr "丢弃(_D)"
-#: addressbook/gui/widgets/eab-gui-util.c:214
+#: addressbook/gui/widgets/eab-gui-util.c:228
msgid "Error adding list"
msgstr "添加列表出错"
-#: addressbook/gui/widgets/eab-gui-util.c:214
-#: addressbook/gui/widgets/eab-gui-util.c:632
+#: addressbook/gui/widgets/eab-gui-util.c:228
+#: addressbook/gui/widgets/eab-gui-util.c:650
msgid "Error adding contact"
msgstr "添加联系人出错"
-#: addressbook/gui/widgets/eab-gui-util.c:223
+#: addressbook/gui/widgets/eab-gui-util.c:239
msgid "Error modifying list"
msgstr "修改列表出错"
-#: addressbook/gui/widgets/eab-gui-util.c:223
+#: addressbook/gui/widgets/eab-gui-util.c:239
msgid "Error modifying contact"
msgstr "修改联系人出错"
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:251
msgid "Error removing list"
msgstr "删除列表出错"
-#: addressbook/gui/widgets/eab-gui-util.c:233
-#: addressbook/gui/widgets/eab-gui-util.c:590
+#: addressbook/gui/widgets/eab-gui-util.c:251
+#: addressbook/gui/widgets/eab-gui-util.c:608
msgid "Error removing contact"
msgstr "删除联系人出错"
-#: addressbook/gui/widgets/eab-gui-util.c:315
+#: addressbook/gui/widgets/eab-gui-util.c:333
#, fuzzy, c-format
msgid ""
"Opening %d contacts will open %d new windows as well.\n"
@@ -3027,7 +3079,7 @@ msgstr ""
"打开 %d 张卡片将同时打开 %d 个新窗口。\n"
"您真的想要显示所有卡片吗?"
-#: addressbook/gui/widgets/eab-gui-util.c:341
+#: addressbook/gui/widgets/eab-gui-util.c:359
#, c-format
msgid ""
"%s already exists\n"
@@ -3036,50 +3088,50 @@ msgstr ""
"%s 已经存在\n"
"您打算覆盖它吗?"
-#: addressbook/gui/widgets/eab-gui-util.c:345
+#: addressbook/gui/widgets/eab-gui-util.c:363
msgid "Overwrite"
msgstr "覆盖"
-#: addressbook/gui/widgets/eab-gui-util.c:381
+#: addressbook/gui/widgets/eab-gui-util.c:399
#, c-format
msgid "Error saving %s: %s"
msgstr "保存 %s 出错:%s"
#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:418
+#: addressbook/gui/widgets/eab-gui-util.c:436
msgid "card.vcf"
msgstr "card.vcf"
-#: addressbook/gui/widgets/eab-gui-util.c:551
+#: addressbook/gui/widgets/eab-gui-util.c:569
msgid "list"
msgstr "列表"
-#: addressbook/gui/widgets/eab-gui-util.c:686
+#: addressbook/gui/widgets/eab-gui-util.c:704
msgid "Move contact to"
msgstr "将联系人移动到"
-#: addressbook/gui/widgets/eab-gui-util.c:688
+#: addressbook/gui/widgets/eab-gui-util.c:706
msgid "Copy contact to"
msgstr "将联系人复制到"
-#: addressbook/gui/widgets/eab-gui-util.c:691
+#: addressbook/gui/widgets/eab-gui-util.c:709
msgid "Move contacts to"
msgstr "将联系人移动到"
-#: addressbook/gui/widgets/eab-gui-util.c:693
+#: addressbook/gui/widgets/eab-gui-util.c:711
msgid "Copy contacts to"
msgstr "将联系人复制到"
-#: addressbook/gui/widgets/eab-gui-util.c:696
+#: addressbook/gui/widgets/eab-gui-util.c:714
#, fuzzy
msgid "Select target addressbook."
msgstr "从地址簿中选择联系人"
-#: addressbook/gui/widgets/eab-gui-util.c:869
+#: addressbook/gui/widgets/eab-gui-util.c:887
msgid "Multiple VCards"
msgstr "多个 VCard"
-#: addressbook/gui/widgets/eab-gui-util.c:872
+#: addressbook/gui/widgets/eab-gui-util.c:890
#, c-format
msgid "VCard for %s"
msgstr "%s 的 VCard"
@@ -3475,18 +3527,18 @@ msgstr "输入密码"
msgid "Split Multi-Day Events:"
msgstr "分割多日事件:"
-#: calendar/conduits/calendar/calendar-conduit.c:1320
-#: calendar/conduits/todo/todo-conduit.c:857
+#: calendar/conduits/calendar/calendar-conduit.c:1313
+#: calendar/conduits/todo/todo-conduit.c:849
msgid "Could not start wombat server"
msgstr "无法启动 wombat 服务器"
-#: calendar/conduits/calendar/calendar-conduit.c:1321
-#: calendar/conduits/todo/todo-conduit.c:858
+#: calendar/conduits/calendar/calendar-conduit.c:1314
+#: calendar/conduits/todo/todo-conduit.c:850
msgid "Could not start wombat"
msgstr "无法启动 wombat"
-#: calendar/conduits/calendar/calendar-conduit.c:1436
-#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1422
+#: calendar/conduits/calendar/calendar-conduit.c:1425
msgid "Could not read pilot's Calendar application block"
msgstr "无法读入 Pilot 日历应用程序块"
@@ -3494,8 +3546,8 @@ msgstr "无法读入 Pilot 日历应用程序块"
msgid "Default Priority:"
msgstr "默认优先级:"
-#: calendar/conduits/todo/todo-conduit.c:945
-#: calendar/conduits/todo/todo-conduit.c:948
+#: calendar/conduits/todo/todo-conduit.c:929
+#: calendar/conduits/todo/todo-conduit.c:932
msgid "Could not read pilot's ToDo application block"
msgstr "无法读入 Pilot ToDo 应用程序块"
@@ -3504,7 +3556,7 @@ msgid "Calendar and Tasks"
msgstr "日历和任务"
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:847
+#: calendar/gui/calendar-component.c:944
msgid "Calendars"
msgstr "日历"
@@ -3545,10 +3597,10 @@ msgid "Evolution's Tasks component"
msgstr "Evolution 任务组件"
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1155 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:500 calendar/gui/tasks-control.c:516
+#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:709
+#: calendar/importers/icalendar-importer.c:705
msgid "Tasks"
msgstr "任务"
@@ -3564,11 +3616,11 @@ msgstr "开始:"
msgid "Ending:"
msgstr "结束:"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
msgid "Evolution Alarm"
msgstr "Evolution 提醒"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
#, c-format
msgid "Alarm on %s"
msgstr "在 %s 时提醒"
@@ -3592,24 +3644,24 @@ msgstr "午睡时间(分钟)"
msgid "_Edit appointment"
msgstr "编辑约会(_E)"
-#: calendar/gui/alarm-notify/alarm-queue.c:872
+#: calendar/gui/alarm-notify/alarm-queue.c:873
#: ui/evolution-message-composer.xml.h:10
msgid "Open"
msgstr "打开"
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:875
msgid "Dismiss"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:876
+#: calendar/gui/alarm-notify/alarm-queue.c:877
msgid "Dismiss All"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:941
+#: calendar/gui/alarm-notify/alarm-queue.c:944
msgid "No description available."
msgstr "没有描述。"
-#: calendar/gui/alarm-notify/alarm-queue.c:959
+#: calendar/gui/alarm-notify/alarm-queue.c:964
#, c-format
msgid ""
"Alarm on %s\n"
@@ -3618,12 +3670,12 @@ msgid ""
"Ending at %s"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:1055
-#: calendar/gui/alarm-notify/alarm-queue.c:1079
+#: calendar/gui/alarm-notify/alarm-queue.c:1060
+#: calendar/gui/alarm-notify/alarm-queue.c:1084
msgid "Warning"
msgstr "警告"
-#: calendar/gui/alarm-notify/alarm-queue.c:1059
+#: calendar/gui/alarm-notify/alarm-queue.c:1064
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -3635,7 +3687,7 @@ msgstr ""
"发送电子邮件。Evolution 将以\n"
"显示普通提示会话框代替。"
-#: calendar/gui/alarm-notify/alarm-queue.c:1085
+#: calendar/gui/alarm-notify/alarm-queue.c:1090
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3651,23 +3703,23 @@ msgstr ""
"\n"
"您确信您要运行该程序吗?"
-#: calendar/gui/alarm-notify/alarm-queue.c:1099
+#: calendar/gui/alarm-notify/alarm-queue.c:1104
msgid "Do not ask me about this program again."
msgstr "不要再次询问此问题。"
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:164
msgid "Could not initialize Bonobo"
msgstr "无法初始化 Bonobo"
-#: calendar/gui/alarm-notify/notify-main.c:166
+#: calendar/gui/alarm-notify/notify-main.c:167
msgid "Could not initialize gnome-vfs"
msgstr "无法创始化 gnome-vfs"
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:178
msgid "Could not create the alarm notify service factory"
msgstr "无法创建提醒服务车间"
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:114
+#: calendar/gui/alarm-notify/util.c:37
msgid "invalid time"
msgstr "无效时间"
@@ -3802,30 +3854,30 @@ msgstr ""
msgid "Whether to show week numbers in date navigator"
msgstr "在日期浏览器中显示周数(_N)"
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
msgid "Summary contains"
msgstr "概要含有"
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
msgid "Description contains"
msgstr "描述含有"
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
msgid "Comment contains"
msgstr "注释含有"
-#: calendar/gui/cal-search-bar.c:53
+#: calendar/gui/cal-search-bar.c:56
#, fuzzy
msgid "Location contains"
msgstr "描述含有"
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1005
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
msgid "Unmatched"
msgstr "无匹配"
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1606
-#: camel/providers/groupwise/camel-gw-listener.c:302
-#: camel/providers/groupwise/camel-gw-listener.c:326
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: camel/providers/groupwise/camel-gw-listener.c:304
+#: camel/providers/groupwise/camel-gw-listener.c:327
msgid "Calendar"
msgstr "日历"
@@ -3846,7 +3898,8 @@ msgid "Purge events older than"
msgstr "返回小于"
#: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-options.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
msgid "days"
msgstr "天数"
@@ -3856,8 +3909,8 @@ msgstr "%Y年%m月%d日%A"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1590 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
msgid "%a %d %b"
msgstr "%m月%d日%A"
@@ -3879,79 +3932,82 @@ msgstr "%Y年%m月%d日"
msgid "%d %B"
msgstr "%m月%d日"
-#: calendar/gui/calendar-component.c:373
+#: calendar/gui/calendar-component.c:367
#, c-format
msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
msgstr "即将删除日历“%s”。您确定想要继续吗?"
-#: calendar/gui/calendar-component.c:432
-#: calendar/gui/dialogs/calendar-setup.glade.h:13
+#: calendar/gui/calendar-component.c:423
msgid "New Calendar"
msgstr "新建日历"
-#: calendar/gui/calendar-component.c:932
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+msgid "Properties..."
+msgstr "属性..."
+
+#: calendar/gui/calendar-component.c:790
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:802
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:836
+msgid ""
+"Selected calendar is read-only, events cannot be created. Please select a "
+"read-write calendar."
+msgstr ""
+
+#: calendar/gui/calendar-component.c:1095
msgid "New appointment"
msgstr "新建约会"
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1096
msgid "_Appointment"
msgstr "约会(_A)"
-#: calendar/gui/calendar-component.c:934
+#: calendar/gui/calendar-component.c:1097
msgid "Create a new appointment"
msgstr "创建新约会"
-#: calendar/gui/calendar-component.c:940
+#: calendar/gui/calendar-component.c:1103
msgid "New meeting"
msgstr "新闻会议"
-#: calendar/gui/calendar-component.c:941
+#: calendar/gui/calendar-component.c:1104
msgid "M_eeting"
msgstr "会议(_E)"
-#: calendar/gui/calendar-component.c:942
+#: calendar/gui/calendar-component.c:1105
msgid "Create a new meeting request"
msgstr "创建一条新会议请求"
-#: calendar/gui/calendar-component.c:948
+#: calendar/gui/calendar-component.c:1111
msgid "New all day appointment"
msgstr "新建全天约会"
-#: calendar/gui/calendar-component.c:949
+#: calendar/gui/calendar-component.c:1112
msgid "All _Day Appointment"
msgstr "全天约会(_D)"
-#: calendar/gui/calendar-component.c:950
+#: calendar/gui/calendar-component.c:1113
msgid "Create a new all-day appointment"
msgstr "创建新全天约会"
-#: calendar/gui/calendar-component.c:956
+#: calendar/gui/calendar-component.c:1119
msgid "New calendar"
msgstr "新建日历"
-#: calendar/gui/calendar-component.c:957
+#: calendar/gui/calendar-component.c:1120
msgid "C_alendar"
msgstr "日历(_A)"
-#: calendar/gui/calendar-component.c:958
+#: calendar/gui/calendar-component.c:1121
msgid "Create a new calendar"
msgstr "创建新日历"
-#: calendar/gui/calendar-component.c:1026
-#, c-format
-msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1038
-msgid "There is no calendar available for creating events and meetings"
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1072
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
#: calendar/gui/calendar-offline-handler.c:192
#, c-format
msgid "backend_go_offline(): %s"
@@ -4068,15 +4124,11 @@ msgstr "dialog1"
msgid "extra times every"
msgstr "每个额外时间"
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
+#: calendar/gui/dialogs/alarm-options.glade.h:13
+#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
msgid "hours"
msgstr "小时"
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
-msgid "minutes"
-msgstr "分钟"
-
#: calendar/gui/dialogs/alarm-page.c:800
msgid "Action/Trigger"
msgstr ""
@@ -4119,8 +4171,7 @@ msgstr "发送电子邮件"
#: calendar/gui/dialogs/alarm-page.glade.h:9
#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:167
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "概要:"
@@ -4150,7 +4201,7 @@ msgid "hour(s)"
msgstr "小时"
#: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40
+#: calendar/gui/dialogs/calendar-setup.glade.h:21
msgid "minute(s)"
msgstr "分钟"
@@ -4160,34 +4211,34 @@ msgstr "约会开始"
#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
#. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:569 mail/em-account-prefs.c:492
-#: mail/em-composer-prefs.c:670 mail/em-composer-prefs.c:898
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:463
+#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
msgid "Enabled"
msgstr "已启用"
-#: calendar/gui/dialogs/cal-prefs-dialog.c:731
+#: calendar/gui/dialogs/cal-prefs-dialog.c:721
msgid "Are you sure you want to remove this URL?"
msgstr "您确定您想要删除此 URL 吗?"
-#: calendar/gui/dialogs/cal-prefs-dialog.c:739
+#: calendar/gui/dialogs/cal-prefs-dialog.c:729
msgid "Don't Remove"
msgstr "不删除"
-#: calendar/gui/dialogs/cal-prefs-dialog.c:789
-#: calendar/gui/dialogs/cal-prefs-dialog.c:823
-#: calendar/gui/dialogs/cal-prefs-dialog.c:857 mail/em-account-prefs.c:314
-#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
-#: mail/em-composer-prefs.c:589 mail/em-composer-prefs.c:647
-#: mail/em-composer-prefs.c:677
+#: calendar/gui/dialogs/cal-prefs-dialog.c:778
+#: calendar/gui/dialogs/cal-prefs-dialog.c:811
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:285
+#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
+#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
+#: mail/em-composer-prefs.c:670
msgid "Disable"
msgstr "禁用"
-#: calendar/gui/dialogs/cal-prefs-dialog.c:789
-#: calendar/gui/dialogs/cal-prefs-dialog.c:823
-#: calendar/gui/dialogs/cal-prefs-dialog.c:859 mail/em-account-prefs.c:314
-#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:400
-#: mail/em-composer-prefs.c:589 mail/em-composer-prefs.c:647
-#: mail/em-composer-prefs.c:677
+#: calendar/gui/dialogs/cal-prefs-dialog.c:778
+#: calendar/gui/dialogs/cal-prefs-dialog.c:811
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:285
+#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
+#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
+#: mail/em-composer-prefs.c:670
msgid "Enable"
msgstr "启用"
@@ -4242,7 +4293,7 @@ msgstr "启用(_N)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
#: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:563
msgid "Friday"
msgstr "星期五"
@@ -4256,7 +4307,7 @@ msgstr "分钟"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:559
msgid "Monday"
msgstr "星期一"
@@ -4266,7 +4317,7 @@ msgstr "周日(_U)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:564
msgid "Saturday"
msgstr "星期六"
@@ -4280,7 +4331,7 @@ msgstr "在日期浏览器中显示周数(_N)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:558
msgid "Sunday"
msgstr "星期日"
@@ -4298,7 +4349,7 @@ msgstr "任务列表"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:562
msgid "Thursday"
msgstr "星期四"
@@ -4316,7 +4367,7 @@ msgstr "时间格式:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:560
msgid "Tuesday"
msgstr "星期二"
@@ -4326,7 +4377,7 @@ msgstr "一周开始(_E):"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:561
msgid "Wednesday"
msgstr "星期三"
@@ -4367,6 +4418,16 @@ msgstr "一天开始(_D):"
msgid "_Display"
msgstr "显示(_D)"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22
+msgid "_Edit"
+msgstr "编辑(_E)"
+
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
msgid "_Free/Busy Publishing"
msgstr "忙/闲发布(_F)"
@@ -4415,27 +4476,27 @@ msgstr "周三(_W)"
msgid "before every appointment"
msgstr "在每次约会前"
-#: calendar/gui/dialogs/calendar-setup.c:156
+#: calendar/gui/dialogs/calendar-setup.c:166
#, fuzzy
msgid "You must specify a location to get the calendar from."
msgstr "您必须指定文件名。"
-#: calendar/gui/dialogs/calendar-setup.c:164
+#: calendar/gui/dialogs/calendar-setup.c:174
#, fuzzy, c-format
msgid "The source location '%s' is not well-formed."
msgstr "不支持装入“%s”必需的方法"
-#: calendar/gui/dialogs/calendar-setup.c:179
+#: calendar/gui/dialogs/calendar-setup.c:189
#, c-format
msgid "The source location '%s' is not a webcal source."
msgstr ""
-#: calendar/gui/dialogs/calendar-setup.c:216
+#: calendar/gui/dialogs/calendar-setup.c:234
#, c-format
msgid "Source with name '%s' already exists in the selected group"
msgstr ""
-#: calendar/gui/dialogs/calendar-setup.c:229
+#: calendar/gui/dialogs/calendar-setup.c:247
#, c-format
msgid ""
"The group '%s' is remote. You must specify a location to get the calendar "
@@ -4443,113 +4504,64 @@ msgid ""
msgstr ""
#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Calendar Creation Assistant"
-msgstr "日历创建助手"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Calendar Properties"
-msgstr "日历属性"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
#, fuzzy
-msgid ""
-"Congratulations, you are finished setting up this calendar.\n"
-"\n"
-"Please click the \"Apply\" button to save the settings you have entered here."
-msgstr ""
-"恭喜,您已经设置完了此 LDAP 服务器。您现在可以访问此目录了。\n"
-"\n"
-"请单击“完成”按钮保存您在此输入的设置。"
+msgid "Add Calendar"
+msgstr "添加新日历"
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
#, fuzzy
-msgid ""
-"Congratulations, you are finished setting up this task list.\n"
-"\n"
-"Please click the \"Apply\" button to save the settings you have entered here."
-msgstr ""
-"恭喜,您已经设置完了此 LDAP 服务器。您现在可以访问此目录了。\n"
-"\n"
-"请单击“完成”按钮保存您在此输入的设置。"
+msgid "Add Tasks Group"
+msgstr "任务列表组"
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:364
-msgid "New Task List"
-msgstr "新建任务列表"
+#: calendar/gui/dialogs/calendar-setup.glade.h:5
+msgid "Calendar Properties"
+msgstr "日历属性"
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:8
msgid "Remote"
msgstr "远程"
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid ""
-"Specifying a display name and group is the first step in setting up a "
-"calendar."
-msgstr "指定显示名称是配置 LDAP 服务器所需的最后一个步骤。"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:19
-#, fuzzy
-msgid ""
-"Specifying a display name and group is the first step in setting up a task "
-"list."
-msgstr "指定显示名称是配置 LDAP 服务器所需的最后一个步骤。"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
-msgid "Step 2: Remote Folder Parameters"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:22
-msgid "Task List Creation Assistant"
-msgstr "任务列表创建助手"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
msgid "Task List Properties"
msgstr "任务列表属性"
-#: calendar/gui/dialogs/calendar-setup.glade.h:24
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
#, fuzzy
-msgid ""
-"This assistant will help you create a new calendar. \n"
-"\n"
-"Depending on the type of calendar you create, additional\n"
-"parameters may be required. Please contact your system\n"
-"administrator if you need help finding this information."
-msgstr ""
-"此助手将帮助您使用 LDAP(轻量级目录访问协议)服务器访问在线目录服务。\n"
-"\n"
-"添加新的 LDAP 服务器需要关于服务器的一些专业化信息。如果您对这些信\n"
-"息不太了解的话,请询问您的系统管理员。"
+msgid "_Add Calendar"
+msgstr "添加新日历"
-#: calendar/gui/dialogs/calendar-setup.glade.h:29
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
#, fuzzy
-msgid ""
-"This assistant will help you create a new task list.\n"
-"\n"
-"Depending on the type of task list you create, additional\n"
-"parameters may be required. Please contact your system\n"
-"administrator if you need help finding this information."
-msgstr ""
-"此助手将帮助您使用 LDAP(轻量级目录访问协议)服务器访问在线目录服务。\n"
-"\n"
-"添加新的 LDAP 服务器需要关于服务器的一些专业化信息。如果您对这些信\n"
-"息不太了解的话,请询问您的系统管理员。"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:35
-msgid ""
-"You're creating a folder in a group that's stored in a remote location. This "
-"requires you\n"
-"to specify additional parameters."
-msgstr ""
+msgid "_Add Group"
+msgstr "添加组(_A)..."
-#: calendar/gui/dialogs/calendar-setup.glade.h:38
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
msgid "_Refresh Interval:"
msgstr "刷新间隔(_R):"
-#: calendar/gui/dialogs/calendar-setup.glade.h:39
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#, fuzzy
+msgid "_Refresh:"
+msgstr "刷新"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
msgid "_Source URL:"
msgstr "源 URI(_S):"
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#, fuzzy
+msgid "_Type:"
+msgstr "类型:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "周"
+
#: calendar/gui/dialogs/cancel-comp.c:57
msgid ""
"The event being deleted is a meeting, would you like to send a cancellation "
@@ -4649,51 +4661,51 @@ msgstr " (预定 "
msgid "Due "
msgstr "预定 "
-#: calendar/gui/dialogs/comp-editor.c:424
+#: calendar/gui/dialogs/comp-editor.c:431
msgid "Could not update object"
msgstr "无法更新对象"
-#: calendar/gui/dialogs/comp-editor.c:899
-#: calendar/gui/dialogs/comp-editor.c:936
+#: calendar/gui/dialogs/comp-editor.c:904
+#: calendar/gui/dialogs/comp-editor.c:941
msgid "Edit Appointment"
msgstr "编辑约会"
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:909
+#: calendar/gui/dialogs/comp-editor.c:946
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
-#: calendar/gui/dialogs/comp-editor.c:907
-#: calendar/gui/dialogs/comp-editor.c:944
+#: calendar/gui/dialogs/comp-editor.c:912
+#: calendar/gui/dialogs/comp-editor.c:949
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
-#: calendar/gui/dialogs/comp-editor.c:910
-#: calendar/gui/dialogs/comp-editor.c:947
+#: calendar/gui/dialogs/comp-editor.c:915
+#: calendar/gui/dialogs/comp-editor.c:952
#, c-format
msgid "Journal entry - %s"
msgstr "日志条目 - %s"
-#: calendar/gui/dialogs/comp-editor.c:921
-#: calendar/gui/dialogs/comp-editor.c:957
+#: calendar/gui/dialogs/comp-editor.c:926
+#: calendar/gui/dialogs/comp-editor.c:962
msgid "No summary"
msgstr "没有概要"
-#: calendar/gui/dialogs/comp-editor.c:1382
-#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
-#: composer/e-msg-composer.c:1193
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
+#: composer/e-msg-composer.c:1183
msgid "Save as..."
msgstr "另存为..."
-#: calendar/gui/dialogs/comp-editor.c:1485
-#: calendar/gui/dialogs/comp-editor.c:1509
-#: calendar/gui/dialogs/comp-editor.c:1535
+#: calendar/gui/dialogs/comp-editor.c:1480
+#: calendar/gui/dialogs/comp-editor.c:1515
+#: calendar/gui/dialogs/comp-editor.c:1541
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "如果更新到达的话,对此项目的更改将被丢弃"
-#: calendar/gui/dialogs/comp-editor.c:1574
+#: calendar/gui/dialogs/comp-editor.c:1577
msgid "Unable to use current version!"
msgstr "无法使用当前版本!"
@@ -4887,10 +4899,6 @@ msgstr "忙(_U)"
msgid "Ca_tegories..."
msgstr "类别(_T)..."
-#: calendar/gui/dialogs/event-page.glade.h:5
-msgid "Calendar:"
-msgstr "日历:"
-
#: calendar/gui/dialogs/event-page.glade.h:6
#: calendar/gui/dialogs/task-page.glade.h:3
msgid "Classification"
@@ -4943,32 +4951,43 @@ msgstr "开始时间(_S):"
#. an empty string is the same as 'None'
#: calendar/gui/dialogs/meeting-page.c:311
#: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2168
-#: mail/em-account-prefs.c:453 mail/em-folder-view.c:803
-#: mail/mail-account-gui.c:1390 mail/mail-account-gui.c:1884
+#: calendar/gui/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
+#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
+#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
#: mail/mail-config.glade.h:100
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
msgid "None"
msgstr "无"
-#: calendar/gui/dialogs/meeting-page.c:418
+#: calendar/gui/dialogs/meeting-page.c:420
msgid "The organizer selected no longer has an account."
msgstr "选中的组织者没有帐户了。"
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:426
msgid "An organizer is required."
msgstr "需要一名组织者。"
-#: calendar/gui/dialogs/meeting-page.c:439
+#: calendar/gui/dialogs/meeting-page.c:441
msgid "At least one attendee is required."
msgstr "需要至少一个参加者。"
-#: calendar/gui/dialogs/meeting-page.c:647
+#: calendar/gui/dialogs/meeting-page.c:650
msgid "_Delegate To..."
msgstr "授权于(_D)..."
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/dialogs/meeting-page.c:654
+#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1295 calendar/gui/e-calendar-view.c:1327
+#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "删除(_D)"
+
#: calendar/gui/dialogs/meeting-page.etspec.h:1
#: calendar/gui/e-meeting-list-view.c:240
#: calendar/gui/e-meeting-time-sel.etspec.h:1
@@ -5006,7 +5025,7 @@ msgid "Member"
msgstr "成员"
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
@@ -5183,7 +5202,7 @@ msgid "_No recurrence"
msgstr "不再现(_N)"
#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:452
+#: composer/e-msg-composer-attachment-bar.c:450
msgid "_Remove"
msgstr "删除(_R)"
@@ -5225,7 +5244,7 @@ msgstr ""
"\n"
"您希望保存改动吗?"
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1610
+#: calendar/gui/dialogs/save-comp.c:57
msgid "_Discard Changes"
msgstr "丢弃修改(_D)"
@@ -5281,42 +5300,38 @@ msgid "% _Complete"
msgstr "完成百分比(_C)"
#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
-#: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
msgid "Completed"
msgstr "已完成"
#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:230
-#: mail/message-list.c:945
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
msgid "High"
msgstr "高"
#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
-#: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:206 calendar/gui/print.c:2343
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
+#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: calendar/gui/print.c:2343
msgid "In Progress"
msgstr "正在进行中"
#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:234
-#: mail/message-list.c:943
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
msgid "Low"
msgstr "低"
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:232 mail/message-list.c:944
+#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
+#: mail/message-list.c:922
msgid "Normal"
msgstr "中"
#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
-#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:216
-#: calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
msgid "Not Started"
msgstr "尚未开始"
@@ -5325,7 +5340,7 @@ msgid "Progress"
msgstr "进度"
#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:394
+#: calendar/gui/e-calendar-table.c:377
msgid "Undefined"
msgstr "未定义"
@@ -5346,10 +5361,6 @@ msgstr "状态(_S):"
msgid "_Web Page:"
msgstr "网页(_W):"
-#: calendar/gui/dialogs/task-editor.c:193
-msgid "Basic"
-msgstr "基本"
-
#: calendar/gui/dialogs/task-editor.c:207
#: calendar/gui/dialogs/task-editor.c:270
#: calendar/gui/dialogs/task-editor.c:407
@@ -5360,12 +5371,7 @@ msgstr "指派"
msgid "Due date is wrong"
msgstr "到期日期错误"
-#: calendar/gui/dialogs/task-page.c:547 calendar/gui/e-cal-model-tasks.c:738
-#: calendar/gui/e-cal-model-tasks.c:766
-msgid "Due date is before start date!"
-msgstr "到期日期先于开始日期!"
-
-#: calendar/gui/dialogs/task-page.c:840
+#: calendar/gui/dialogs/task-page.c:824
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "无法打开“%s”中的任务。"
@@ -5374,8 +5380,8 @@ msgstr "无法打开“%s”中的任务。"
msgid "Con_fidential"
msgstr "机密(_F)"
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:246
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
+#: calendar/gui/e-itip-control.glade.h:6
#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
msgid "Description:"
msgstr "描述:"
@@ -5517,17 +5523,17 @@ msgid "%s for an unknown trigger type"
msgstr "%s 为未知触发类型"
#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
msgid "Public"
msgstr "公开"
#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:370
+#: calendar/gui/e-calendar-table.c:353
msgid "Private"
msgstr "保密"
#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:371
+#: calendar/gui/e-calendar-table.c:354
msgid "Confidential"
msgstr "机密"
@@ -5545,32 +5551,32 @@ msgstr "开始日期"
msgid "Summary"
msgstr "概要"
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
msgid "Free"
msgstr "空闲"
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
#: calendar/gui/e-meeting-time-sel.c:399
msgid "Busy"
msgstr "繁忙"
-#: calendar/gui/e-cal-model-tasks.c:275
+#: calendar/gui/e-cal-model-tasks.c:302
msgid "N"
msgstr "北"
-#: calendar/gui/e-cal-model-tasks.c:275
+#: calendar/gui/e-cal-model-tasks.c:302
msgid "S"
msgstr "南"
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
msgid "E"
msgstr "东"
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:304
msgid "W"
msgstr "西"
-#: calendar/gui/e-cal-model-tasks.c:545
+#: calendar/gui/e-cal-model-tasks.c:573
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -5580,28 +5586,28 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
+#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
msgid "Yes"
msgstr "是"
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
+#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
msgid "No"
msgstr "否"
#. This is the default filename used for temporary file creation
#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
#: calendar/gui/e-meeting-list-view.c:144
#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
#: camel/camel-tcp-stream-openssl.c:631
#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2134
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:61
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
+#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
msgid "Unknown"
msgstr "未知"
@@ -5613,128 +5619,128 @@ msgstr "重复"
msgid "Assigned"
msgstr "已委派"
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:396
msgid "0%"
msgstr "0%"
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:397
msgid "10%"
msgstr "10%"
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:398
msgid "20%"
msgstr "20%"
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:399
msgid "30%"
msgstr "30%"
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:400
msgid "40%"
msgstr "40%"
-#: calendar/gui/e-calendar-table.c:418
+#: calendar/gui/e-calendar-table.c:401
msgid "50%"
msgstr "50%"
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:402
msgid "60%"
msgstr "60%"
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:403
msgid "70%"
msgstr "70%"
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:404
msgid "80%"
msgstr "80%"
-#: calendar/gui/e-calendar-table.c:422
+#: calendar/gui/e-calendar-table.c:405
msgid "90%"
msgstr "90%"
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:406
msgid "100%"
msgstr "100%"
-#: calendar/gui/e-calendar-table.c:701 calendar/gui/e-calendar-view.c:626
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
msgid "Deleting selected objects"
msgstr "删除选中的对象"
-#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
msgid "Updating objects"
msgstr "更新对象"
-#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1081
-#: calendar/gui/e-calendar-view.c:1261 calendar/gui/e-calendar-view.c:1328
-#: mail/em-folder-view.c:769 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
+#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
msgid "_Open"
msgstr "打开(_O)"
-#: calendar/gui/e-calendar-table.c:1041
+#: calendar/gui/e-calendar-table.c:1023
msgid "Open _Web Page"
msgstr "打开网页(_W)"
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1087
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1334
-#: mail/em-folder-view.c:771 mail/em-popup.c:689 mail/em-popup.c:804
+#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1361
+#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
#: ui/evolution-mail-message.xml.h:128
msgid "_Save As..."
msgstr "另存为(_S)..."
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1085
-#: calendar/gui/e-calendar-view.c:1240 calendar/gui/e-calendar-view.c:1263
-#: calendar/gui/e-calendar-view.c:1332 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
+#: calendar/gui/e-calendar-view.c:1254 calendar/gui/e-calendar-view.c:1277
+#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
#: ui/evolution-tasks.xml.h:25
msgid "_Print..."
msgstr "打印(_P)..."
-#: calendar/gui/e-calendar-table.c:1047 calendar/gui/e-calendar-table.c:1076
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1310
+#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
#: ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "剪切(_U)"
-#: calendar/gui/e-calendar-table.c:1048 calendar/gui/e-calendar-table.c:1074
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1308
-#: mail/em-folder-tree.c:2563 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1323
+#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
msgid "_Copy"
msgstr "复制(_C)"
-#: calendar/gui/e-calendar-table.c:1049 calendar/gui/e-calendar-table.c:1083
-#: calendar/gui/e-calendar-view.c:1244 calendar/gui/e-calendar-view.c:1270
-#: calendar/gui/e-calendar-view.c:1330 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
+#: calendar/gui/e-calendar-view.c:1258 calendar/gui/e-calendar-view.c:1284
+#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:24
msgid "_Paste"
msgstr "粘贴(_P)"
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1035
msgid "_Assign Task"
msgstr "委派任务(_A)"
-#: calendar/gui/e-calendar-table.c:1054
+#: calendar/gui/e-calendar-table.c:1036
msgid "_Forward as iCalendar"
msgstr "作为 iCalendar 转发(_F)"
-#: calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-table.c:1037
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
-#: calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-table.c:1038
msgid "_Mark Selected Tasks as Complete"
msgstr "把任务标记为完成(_M)"
-#: calendar/gui/e-calendar-table.c:1061 calendar/gui/e-calendar-table.c:1079
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
msgid "_Delete Selected Tasks"
msgstr "删除选定的任务(_D)"
-#: calendar/gui/e-calendar-table.c:1371
+#: calendar/gui/e-calendar-table.c:1353
#: calendar/gui/e-calendar-table.etspec.h:3
msgid "Click to add a task"
msgstr "点击以添加任务"
@@ -5745,7 +5751,7 @@ msgid "% Complete"
msgstr "% 完成"
#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
msgid "Complete"
msgstr "完成"
@@ -5772,71 +5778,71 @@ msgstr "开始日期"
msgid "Task sort"
msgstr "任务排序"
-#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
+#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
-#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
-#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
msgid "New Meeting"
msgstr "新会议"
-#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
msgid "New Task"
msgstr "新建任务"
-#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
#, fuzzy
msgid "Select _Today"
msgstr "选定线索(_T)"
-#: calendar/gui/e-calendar-view.c:1251
+#: calendar/gui/e-calendar-view.c:1265
#, fuzzy
msgid "_Select Date..."
msgstr "选择(_S)..."
-#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
msgid "_Publish Free/Busy Information"
msgstr "发布忙闲信息(_P)"
-#: calendar/gui/e-calendar-view.c:1274
+#: calendar/gui/e-calendar-view.c:1288
#, fuzzy
msgid "Cop_y to Calendar..."
msgstr "复制到文件夹..."
-#: calendar/gui/e-calendar-view.c:1275
+#: calendar/gui/e-calendar-view.c:1289
#, fuzzy
msgid "Mo_ve to Calendar..."
msgstr "移动到文件夹(_V)..."
-#: calendar/gui/e-calendar-view.c:1276
+#: calendar/gui/e-calendar-view.c:1290
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
-#: calendar/gui/e-calendar-view.c:1277
+#: calendar/gui/e-calendar-view.c:1291
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_F)..."
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
msgid "Delete this _Occurrence"
msgstr "删除此次出现(_O)"
-#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
msgid "Delete _All Occurrences"
msgstr "删除所有出现(_A)"
-#: calendar/gui/e-calendar-view.c:1316
+#: calendar/gui/e-calendar-view.c:1331
msgid "Go to _Today"
msgstr "转到今天(_T)"
-#: calendar/gui/e-calendar-view.c:1318
+#: calendar/gui/e-calendar-view.c:1333
msgid "_Go to Date..."
msgstr "转到日期(_G)..."
-#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
msgid "_Settings..."
msgstr "设置(_S)..."
@@ -5870,433 +5876,428 @@ msgstr "%02i 分钟分割"
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1573
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1572
#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
msgid "%A %d %B"
msgstr "%B%d日%A"
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1606
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
#: calendar/gui/e-week-view-main-item.c:343
msgid "%d %b"
msgstr "%B%d日"
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:823 calendar/gui/e-week-view.c:596
+#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
#: calendar/gui/print.c:838
msgid "am"
msgstr "上午"
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:826 calendar/gui/e-week-view.c:599
+#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
#: calendar/gui/print.c:840
msgid "pm"
msgstr "下午"
-#: calendar/gui/e-itip-control.c:591
+#: calendar/gui/e-itip-control.c:592
msgid "Yes. (Complex Recurrence)"
msgstr "是(复杂重现)"
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:603
#, fuzzy, c-format
msgid "Every day"
msgid_plural "Every %d days"
msgstr[0] "每天"
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:608
#, fuzzy, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
msgstr[0] "每周"
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:610
#, fuzzy, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
msgstr[0] "每周的"
-#: calendar/gui/e-itip-control.c:617
+#: calendar/gui/e-itip-control.c:618
msgid " and "
msgstr " 和 "
-#: calendar/gui/e-itip-control.c:624
+#: calendar/gui/e-itip-control.c:625
#, c-format
msgid "The %s day of "
msgstr "第 %s 天属于"
-#: calendar/gui/e-itip-control.c:637
+#: calendar/gui/e-itip-control.c:638
#, c-format
msgid "The %s %s of "
msgstr "%s %s 属于"
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:645
#, fuzzy, c-format
msgid "every month"
msgid_plural "every %d months"
msgstr[0] "每月"
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:649
#, fuzzy, c-format
msgid "Every year"
msgid_plural "Every %d years"
msgstr[0] "每年"
-#: calendar/gui/e-itip-control.c:659
+#: calendar/gui/e-itip-control.c:660
#, fuzzy, c-format
msgid "a total of %d time"
msgid_plural " a total of %d times"
msgstr[0] " 总计 %d 次"
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:669
msgid ", ending on "
msgstr ",结束于 "
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:693
msgid "<b>Starts:</b> "
msgstr "<b>开始:</b>"
-#: calendar/gui/e-itip-control.c:702
+#: calendar/gui/e-itip-control.c:703
msgid "<b>Ends:</b> "
msgstr "<b>结束:</b>"
-#: calendar/gui/e-itip-control.c:722
+#: calendar/gui/e-itip-control.c:723
msgid "<b>Completed:</b> "
msgstr "<b>已完成:</b> "
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:733
msgid "<b>Due:</b> "
msgstr "<b>到期:</b>"
-#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
msgid "iCalendar Information"
msgstr "iCalendar 信息"
#. Title
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:788
msgid "iCalendar Error"
msgstr "iCalendar 错误"
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
-#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
msgid "An unknown person"
msgstr "未知的人"
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:910
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作。"
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:925
msgid "<i>None</i>"
msgstr "<i>无</i>"
-#: calendar/gui/e-itip-control.c:930
-msgid "Location:"
-msgstr "位置:"
-
-#. write status
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:202
+#: calendar/gui/e-itip-control.c:950
msgid "Status:"
msgstr "状态:"
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
#: calendar/gui/itip-utils.c:422
msgid "Accepted"
msgstr "接受"
-#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
msgid "Tentatively Accepted"
msgstr "暂时接受"
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
msgid "Declined"
msgstr "拒绝"
-#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
-#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
+#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
msgid "Choose an action:"
msgstr "选择一项活动:"
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1023
msgid "Update"
msgstr "更新"
-#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
-#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
+#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
#: shell/e-shell.c:1079 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "确定"
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1051
msgid "Accept"
msgstr "接受"
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1052
msgid "Tentatively accept"
msgstr "暂时接受"
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1053
msgid "Decline"
msgstr "拒绝"
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1077
msgid "Send Free/Busy Information"
msgstr "发送忙闲信息"
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1090
msgid "Update respondent status"
msgstr "更新应答者状态"
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1103
msgid "Send Latest Information"
msgstr "发送最新的信息"
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
#: ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1192
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> 发布了会议信息。"
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1193
msgid "Meeting Information"
msgstr "会议信息"
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1198
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr "<b>%s</b> 请求 %s 参加一个会议。"
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1200
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请求您参加一个会议。"
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1201
msgid "Meeting Proposal"
msgstr "会议建议"
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1205
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> 希望加入到已存的会议。"
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1206
msgid "Meeting Update"
msgstr "会议更新"
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1210
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> 想收到最新的会议信息。"
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1211
msgid "Meeting Update Request"
msgstr "会议更新请求"
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1218
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> 已回复一个会议请求。"
-#: calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1219
msgid "Meeting Reply"
msgstr "会议答复"
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1226
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1227
msgid "Meeting Cancellation"
msgstr "会议取消"
-#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
+#: calendar/gui/e-itip-control.c:1337
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> 发送了一个无法理解的信息。"
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1235
msgid "Bad Meeting Message"
msgstr "错误的会议信息"
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1260
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> 发布了任务信息。"
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1261
msgid "Task Information"
msgstr "任务信息"
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1266
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> 请求 %s 完成一个任务。"
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1268
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请求您完成一个任务。"
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1269
msgid "Task Proposal"
msgstr "任务建议"
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1273
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s<b> 希望加入到已存在的任务。"
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1274
msgid "Task Update"
msgstr "任务更新"
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1278
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> 希望获取最新的任务信息。"
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1279
msgid "Task Update Request"
msgstr "任务更新请求"
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1286
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> 已经回复了任务委派。"
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1287
msgid "Task Reply"
msgstr "任务回复"
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1294
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> 取消了任务。"
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1295
msgid "Task Cancellation"
msgstr "任务取消"
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1303
msgid "Bad Task Message"
msgstr "错误的任务邮件"
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1322
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> 发布了忙闲信息。"
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1323
msgid "Free/Busy Information"
msgstr "忙闲信息"
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1327
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请求您的忙闲信息。"
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1328
msgid "Free/Busy Request"
msgstr "忙/闲请求"
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1332
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> 应答了忙闲请求。"
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1333
msgid "Free/Busy Reply"
msgstr "忙闲应答"
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1338
msgid "Bad Free/Busy Message"
msgstr "错误的忙闲信息"
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1413
msgid "The message does not appear to be properly formed"
msgstr "邮件的格式可能不正确"
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1472
msgid "The message contains only unsupported requests."
msgstr "邮件只含有不支持的请求。"
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1503
msgid "The attachment does not contain a valid calendar message"
msgstr "附件中没有有效的日历信息"
-#: calendar/gui/e-itip-control.c:1527
+#: calendar/gui/e-itip-control.c:1535
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日历项目"
-#: calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1766
msgid "Calendar file could not be updated!\n"
msgstr "无法更新日历文件!\n"
-#: calendar/gui/e-itip-control.c:1760
+#: calendar/gui/e-itip-control.c:1768
msgid "Update complete\n"
msgstr "更新完成\n"
-#: calendar/gui/e-itip-control.c:1790 calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新参与者状态"
-#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
+#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
msgid "Object is invalid and cannot be updated\n"
msgstr "对象无效,无法更新\n"
-#: calendar/gui/e-itip-control.c:1816
+#: calendar/gui/e-itip-control.c:1824
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "此响应并非来自当前参与者。将响应者加为参与者吗?"
-#: calendar/gui/e-itip-control.c:1828
+#: calendar/gui/e-itip-control.c:1836
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新参与者状态!\n"
-#: calendar/gui/e-itip-control.c:1847
+#: calendar/gui/e-itip-control.c:1855
msgid "There was an error on the CORBA system\n"
msgstr "CORBA 系统出错\n"
-#: calendar/gui/e-itip-control.c:1850
+#: calendar/gui/e-itip-control.c:1858
msgid "Object could not be found\n"
msgstr "找不到对象\n"
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1861
msgid "You don't have the right permissions to update the calendar\n"
msgstr "您没有适当的权限打开日历\n"
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1864
msgid "Attendee status updated\n"
msgstr "更新参与者状态\n"
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1867
msgid "Attendee status could not be updated!\n"
msgstr "无法更新参与者状态!\n"
-#: calendar/gui/e-itip-control.c:1890
+#: calendar/gui/e-itip-control.c:1898
msgid "Removal Complete"
msgstr "删除完成"
-#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
msgid "Item sent!\n"
msgstr "项目已发送!\n"
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1965
+#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
@@ -6495,30 +6496,7 @@ msgstr "会议开始时间(_S):"
msgid "Meeting _end time:"
msgstr "会议结束时间(_E):"
-#: calendar/gui/e-tasks.c:180
-msgid "Start Date:"
-msgstr "开始日期:"
-
-#: calendar/gui/e-tasks.c:196
-msgid "Due Date:"
-msgstr "到期日期:"
-
-#. write priority
-#: calendar/gui/e-tasks.c:224
-msgid "Priority:"
-msgstr "优先级:"
-
-#. URL
-#: calendar/gui/e-tasks.c:280
-msgid "Web Page:"
-msgstr "网页:"
-
-#: calendar/gui/e-tasks.c:313 mail/em-folder-view.c:2213
-#, c-format
-msgid "Click to open %s"
-msgstr "点击以打开 %s"
-
-#: calendar/gui/e-tasks.c:789 calendar/gui/gnome-cal.c:1909
+#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
#, c-format
msgid ""
"Error on %s:\n"
@@ -6528,7 +6506,7 @@ msgstr ""
" %s"
#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:808
+#: calendar/gui/e-tasks.c:544
#, c-format
msgid ""
"The task backend for\n"
@@ -6536,12 +6514,12 @@ msgid ""
" has crashed."
msgstr ""
-#: calendar/gui/e-tasks.c:888
+#: calendar/gui/e-tasks.c:624
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
-#: calendar/gui/e-tasks.c:909
+#: calendar/gui/e-tasks.c:645
#, c-format
msgid ""
"Error opening %s:\n"
@@ -6550,48 +6528,48 @@ msgstr ""
"打开 %s 出错:\n"
" %s"
-#: calendar/gui/e-tasks.c:928
+#: calendar/gui/e-tasks.c:664
msgid "Loading tasks"
msgstr "装入任务"
-#: calendar/gui/e-tasks.c:1030
+#: calendar/gui/e-tasks.c:766
msgid "Completing tasks..."
msgstr "正在完成的日期..."
-#: calendar/gui/e-tasks.c:1053
+#: calendar/gui/e-tasks.c:789
msgid "Deleting selected objects..."
msgstr "正在删除选中的对象..."
-#: calendar/gui/e-tasks.c:1079
+#: calendar/gui/e-tasks.c:816
msgid "Expunging"
msgstr "销毁"
-#: calendar/gui/gnome-cal.c:1770
+#: calendar/gui/gnome-cal.c:1773
#, fuzzy, c-format
msgid "Loading appointments at %s"
msgstr "约会 - %s"
-#: calendar/gui/gnome-cal.c:1789
+#: calendar/gui/gnome-cal.c:1792
#, fuzzy, c-format
msgid "Loading tasks at %s"
msgstr "装入任务"
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1812
#, c-format
msgid "Opening %s"
msgstr "打开 %s"
-#: calendar/gui/gnome-cal.c:1938
+#: calendar/gui/gnome-cal.c:1941
#, c-format
msgid "The calendar backend for '%s' has crashed."
msgstr ""
-#: calendar/gui/gnome-cal.c:1950
+#: calendar/gui/gnome-cal.c:1953
#, c-format
msgid "The task backend for '%s' has crashed."
msgstr ""
-#: calendar/gui/gnome-cal.c:2763
+#: calendar/gui/gnome-cal.c:2757
#, fuzzy
msgid "Purging"
msgstr "都灵"
@@ -6708,7 +6686,7 @@ msgstr "iCalendar 信息"
msgid "You must be an attendee of the event."
msgstr "您必须是事件的参与者。"
-#: calendar/gui/migration.c:137
+#: calendar/gui/migration.c:146
#, fuzzy
msgid ""
"The location and hierarchy of the Evolution task folders has changed since "
@@ -6720,7 +6698,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: calendar/gui/migration.c:141
+#: calendar/gui/migration.c:150
#, fuzzy
msgid ""
"The location and hierarchy of the Evolution calendar folders has changed "
@@ -6732,12 +6710,12 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: calendar/gui/migration.c:366
+#: calendar/gui/migration.c:376
msgid "Birthdays & Anniversaries"
msgstr ""
#. Create the Webcal source group
-#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
+#: calendar/gui/migration.c:462 calendar/gui/migration.c:544
msgid "On The Web"
msgstr ""
@@ -6972,47 +6950,57 @@ msgstr "打印项"
msgid "Print Setup"
msgstr "打印设置"
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:299
#, c-format
msgid "Task List '%s' will be removed. Are you sure you want to continue?"
msgstr "即将删除任务列表“%s”。您确定想要继续吗?"
-#: calendar/gui/tasks-component.c:570
+#: calendar/gui/tasks-component.c:357
+msgid "New Task List"
+msgstr "新建任务列表"
+
+#: calendar/gui/tasks-component.c:464
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:476
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:514
+msgid ""
+"Selected task list is read-only, events cannot be created. Please select a "
+"read-write calendar."
+msgstr ""
+
+#: calendar/gui/tasks-component.c:722
msgid "New task"
msgstr "新建任务"
-#: calendar/gui/tasks-component.c:571
+#: calendar/gui/tasks-component.c:723
msgid "_Task"
msgstr "任务(_T)"
-#: calendar/gui/tasks-component.c:572
+#: calendar/gui/tasks-component.c:724
msgid "Create a new task"
msgstr "创建新任务"
-#: calendar/gui/tasks-component.c:578
+#: calendar/gui/tasks-component.c:730
#, fuzzy
msgid "New tasks group"
msgstr "新建任务"
-#: calendar/gui/tasks-component.c:579
+#: calendar/gui/tasks-component.c:731
#, fuzzy
msgid "_Tasks Group"
msgstr "任务列表组"
-#: calendar/gui/tasks-component.c:580
+#: calendar/gui/tasks-component.c:732
#, fuzzy
msgid "Create a new tasks group"
msgstr "创建新任务"
-#: calendar/gui/tasks-component.c:648
-#, c-format
-msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
-
-#: calendar/gui/tasks-component.c:660
-msgid "There is no calendar available for creating tasks"
-msgstr ""
-
#: calendar/gui/tasks-control.c:152
msgid "The URI of the tasks folder to display"
msgstr "要显示的任务文件夹的 URI"
@@ -7070,15 +7058,15 @@ msgstr "vCalendar 文件(.vcf)"
msgid "Appointments and Meetings"
msgstr "含有约会和事件的公共文件夹"
-#: calendar/importers/icalendar-importer.c:494
+#: calendar/importers/icalendar-importer.c:490
msgid "Reminder!!"
msgstr "提醒!!"
-#: calendar/importers/icalendar-importer.c:702
+#: calendar/importers/icalendar-importer.c:698
msgid "Calendar Events"
msgstr "日历事件"
-#: calendar/importers/icalendar-importer.c:727
+#: calendar/importers/icalendar-importer.c:723
msgid ""
"Evolution has found Gnome Calendar files.\n"
"Would you like to import them into Evolution?"
@@ -7086,7 +7074,7 @@ msgstr ""
"Evolution 已找到 Gnome 日历文件。\n"
"您是否原意把它们导入 Evolution?"
-#: calendar/importers/icalendar-importer.c:734
+#: calendar/importers/icalendar-importer.c:730
msgid "Gnome Calendar"
msgstr "Gnome 日历"
@@ -8682,16 +8670,16 @@ msgstr "正在重新与服务器同步"
msgid "Copy folder content locally for offline operation"
msgstr "将文件夹内容复制到本地以进行脱机操作"
-#: camel/camel-disco-folder.c:101
+#: camel/camel-disco-folder.c:103
msgid "Downloading new messages for offline mode"
msgstr "下载新邮件以进行脱机操作"
-#: camel/camel-disco-folder.c:441
+#: camel/camel-disco-folder.c:449
#, c-format
msgid "Preparing folder '%s' for offline"
msgstr "正在准备脱机文件夹“%s”"
-#: camel/camel-disco-store.c:377
+#: camel/camel-disco-store.c:404
msgid "You must be working online to complete this operation"
msgstr "您必须在线工作以便完成该操作"
@@ -8867,8 +8855,8 @@ msgstr ""
#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:697
-#: mail/mail-send-recv.c:598
+#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: mail/mail-send-recv.c:611
msgid "Cancelled."
msgstr "已取消。"
@@ -9378,6 +9366,79 @@ msgstr ""
msgid "Enter security pass-phrase for `%s'"
msgstr "为 %s 输入密码"
+#: camel/camel-smime-context.c:261
+#, fuzzy, c-format
+msgid "Cannot find certificate for '%s'"
+msgstr "无法创建文件夹:%s:%s"
+
+#: camel/camel-smime-context.c:267
+#, fuzzy
+msgid "Cannot create CMS message"
+msgstr "无法打开消息"
+
+#: camel/camel-smime-context.c:272
+msgid "Cannot create CMS signedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:278
+#, fuzzy
+msgid "Cannot attach CMS signedData"
+msgstr "无法附加文件 %s:%s"
+
+#: camel/camel-smime-context.c:285
+#, fuzzy
+msgid "Cannot attach CMS data"
+msgstr "无法附加文件 %s:%s"
+
+#: camel/camel-smime-context.c:291
+msgid "Cannot create CMS SignerInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:297
+msgid "Cannot find cert chain"
+msgstr ""
+
+#: camel/camel-smime-context.c:303
+msgid "Cannot add CMS SigningTime"
+msgstr ""
+
+#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
+#, fuzzy, c-format
+msgid "Encryption cert for '%s' does not exist"
+msgstr "文件夹“%s”不存在。"
+
+#: camel/camel-smime-context.c:344
+msgid "Cannot add SMIMEEncKeyPrefs attribute"
+msgstr ""
+
+#: camel/camel-smime-context.c:349
+msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
+msgstr ""
+
+#: camel/camel-smime-context.c:354
+#, fuzzy
+msgid "Cannot add add encryption certificate"
+msgstr "加密证书(_P):"
+
+#: camel/camel-smime-context.c:360
+msgid "Cannot add CMS SignerInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:430
+#, fuzzy
+msgid "Cannot create encoder context"
+msgstr "无法在 %s 创建文件夹锁:%s"
+
+#: camel/camel-smime-context.c:436
+#, fuzzy
+msgid "Failed to add data to CMS encoder"
+msgstr "追加到本地“已发”文件夹失败:%s"
+
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#, fuzzy
+msgid "Failed to encode data"
+msgstr "认证失败。\n"
+
#: camel/camel-smime-context.c:514
#, fuzzy
msgid "Unverified"
@@ -9412,7 +9473,7 @@ msgid "Signature algorithm unknown"
msgstr ""
#: camel/camel-smime-context.c:528
-msgid "Siganture algorithm unsupported"
+msgid "Signature algorithm unsupported"
msgstr ""
#: camel/camel-smime-context.c:530
@@ -9425,11 +9486,120 @@ msgstr "保存签名"
msgid "Processing error"
msgstr "解析错误"
+#: camel/camel-smime-context.c:569
+#, fuzzy
+msgid "No signedData in signature"
+msgstr "添加脚本签名"
+
+#: camel/camel-smime-context.c:576
+msgid "Digests missing from enveloped data"
+msgstr ""
+
+#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
+#, fuzzy
+msgid "Cannot calculate digests"
+msgstr "无法创建文件夹:%s:%s"
+
+#: camel/camel-smime-context.c:604
+#, fuzzy
+msgid "Cannot set message digests"
+msgstr "无法获取消息 %s:%s"
+
+#: camel/camel-smime-context.c:614
+#, fuzzy
+msgid "Certificate import failed"
+msgstr "证书签名失败"
+
+#: camel/camel-smime-context.c:624
+msgid "Certficate only message, cannot verify certificates"
+msgstr ""
+
+#: camel/camel-smime-context.c:627
+msgid "Certficate only message, certificates imported and verified"
+msgstr ""
+
+#: camel/camel-smime-context.c:631
+#, fuzzy
+msgid "Can't find signature digests"
+msgstr "编辑签名"
+
#: camel/camel-smime-context.c:647
#, fuzzy, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "服务器:%s,类型:%s"
+#: camel/camel-smime-context.c:748
+#, fuzzy
+msgid "Decoder failed"
+msgstr "IMAP 命令失败:%s"
+
+#: camel/camel-smime-context.c:800
+#, fuzzy, c-format
+msgid "Can't find certificate for `%s'"
+msgstr "无法创建文件夹:%s:%s"
+
+#: camel/camel-smime-context.c:807
+msgid "Can't find common bulk encryption algorithm"
+msgstr ""
+
+#. PORT_GetError(); ??
+#: camel/camel-smime-context.c:816
+msgid "Can't allocate slot for encryption bulk key"
+msgstr ""
+
+#: camel/camel-smime-context.c:827
+#, fuzzy
+msgid "Can't create CMS Message"
+msgstr "从邮件创建规则(_T)"
+
+#: camel/camel-smime-context.c:833
+msgid "Can't create CMS EnvelopedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:839
+msgid "Can't attach CMS EnvelopedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:845
+msgid "Can't attach CMS data object"
+msgstr ""
+
+#: camel/camel-smime-context.c:854
+msgid "Can't create CMS RecipientInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:859
+msgid "Can't add CMS RecipientInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:873
+#, fuzzy
+msgid "Can't create encoder context"
+msgstr "无法在 %s 创建文件夹锁:%s"
+
+#: camel/camel-smime-context.c:884
+#, fuzzy
+msgid "Failed to add data to encoder"
+msgstr "向服务器发送用户名失败"
+
+#: camel/camel-smime-context.c:970
+#, c-format
+msgid "Decoder failed, error %d"
+msgstr ""
+
+#: camel/camel-smime-context.c:977
+msgid "S/MIME Decrypt: No encrypted content found"
+msgstr ""
+
+#: camel/camel-smime-context.c:1004
+#, fuzzy
+msgid "import keys: unimplemented"
+msgstr "命令尚未实现"
+
+#: camel/camel-smime-context.c:1012
+msgid "export keys: unimplemented"
+msgstr ""
+
#: camel/camel-store.c:214
msgid "Cannot get folder: Invalid operation on this store"
msgstr "无法获取文件夹:对该存储的无效操作"
@@ -9760,8 +9930,8 @@ msgstr "密码"
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
-#: camel/providers/groupwise/camel-gw-listener.c:303
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: camel/providers/groupwise/camel-gw-listener.c:305
+#: camel/providers/groupwise/camel-gw-listener.c:328
#, fuzzy
msgid "Checklist"
msgstr "列表"
@@ -9779,6 +9949,13 @@ msgstr "操作已取消"
msgid "Server unexpectedly disconnected: %s"
msgstr "服务器意外地中止了连接:%s"
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/pop3/camel-pop3-store.c:538
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1089
+msgid "Unknown error"
+msgstr "未知的错误"
+
#. for imap ALERT codes, account user@host
#: camel/providers/imap/camel-imap-command.c:320
#, c-format
@@ -9813,31 +9990,31 @@ msgstr "IMAP 服务器应答不含有 %s 信息"
msgid "Unexpected OK response from IMAP server: %s"
msgstr "来自 IMAP 服务器意外的 OK 应答:%s"
-#: camel/providers/imap/camel-imap-folder.c:223
+#: camel/providers/imap/camel-imap-folder.c:226
#, c-format
msgid "Could not create directory %s: %s"
msgstr "无法创建目录 %s:%s"
-#: camel/providers/imap/camel-imap-folder.c:242
+#: camel/providers/imap/camel-imap-folder.c:245
#, c-format
msgid "Could not load summary for %s"
msgstr "无法为 %s 装入概要"
-#: camel/providers/imap/camel-imap-folder.c:323
+#: camel/providers/imap/camel-imap-folder.c:326
msgid "Folder was destroyed and recreated on server."
msgstr "文件夹已被删除并在服务器上重建了。"
#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:566
+#: camel/providers/imap/camel-imap-folder.c:569
msgid "Scanning for changed messages"
msgstr "正在扫描改变了的邮件"
-#: camel/providers/imap/camel-imap-folder.c:1960
+#: camel/providers/imap/camel-imap-folder.c:1963
#, c-format
msgid "Unable to retrieve message: %s"
msgstr "无法检索邮件:%s"
-#: camel/providers/imap/camel-imap-folder.c:2007
+#: camel/providers/imap/camel-imap-folder.c:2010
#: camel/providers/local/camel-maildir-folder.c:211
#: camel/providers/local/camel-maildir-folder.c:224
#: camel/providers/local/camel-maildir-folder.c:233
@@ -9853,25 +10030,25 @@ msgstr ""
"无法获取邮件:%s\n"
" %s"
-#: camel/providers/imap/camel-imap-folder.c:2007
+#: camel/providers/imap/camel-imap-folder.c:2010
#: camel/providers/local/camel-maildir-folder.c:211
#: camel/providers/local/camel-mbox-folder.c:417
#: camel/providers/local/camel-mh-folder.c:200
msgid "No such message"
msgstr "没有该邮件"
-#: camel/providers/imap/camel-imap-folder.c:2041
-#: camel/providers/imap/camel-imap-folder.c:2643
-#: camel/providers/nntp/camel-nntp-folder.c:205
+#: camel/providers/imap/camel-imap-folder.c:2044
+#: camel/providers/imap/camel-imap-folder.c:2646
+#: camel/providers/nntp/camel-nntp-folder.c:233
msgid "This message is not currently available"
msgstr "该邮件目前不可用"
-#: camel/providers/imap/camel-imap-folder.c:2307
-#: camel/providers/imap/camel-imap-folder.c:2377
+#: camel/providers/imap/camel-imap-folder.c:2310
+#: camel/providers/imap/camel-imap-folder.c:2380
msgid "Fetching summary information for new messages"
msgstr "从新邮件中获取概要信息"
-#: camel/providers/imap/camel-imap-folder.c:2681
+#: camel/providers/imap/camel-imap-folder.c:2684
msgid "Could not find message body in FETCH response."
msgstr "无法在 FETCH 应答中找到邮件体。"
@@ -10451,7 +10628,7 @@ msgstr "无法关闭来源文件夹 %s:%s"
msgid "Could not close temp folder: %s"
msgstr "无法关闭临时文件夹:%s"
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2523
+#: camel/providers/local/camel-mbox-summary.c:592
#, c-format
msgid "Could not rename folder: %s"
msgstr "无法重命名文件夹:%s"
@@ -10617,8 +10794,8 @@ msgstr "向服务器发送用户名失败"
msgid "Server rejected username/password"
msgstr "服务器拒绝了用户名/密码"
-#: camel/providers/nntp/camel-nntp-folder.c:140
-#: camel/providers/nntp/camel-nntp-folder.c:230
+#: camel/providers/nntp/camel-nntp-folder.c:168
+#: camel/providers/nntp/camel-nntp-folder.c:258
#: camel/providers/pop3/camel-pop3-folder.c:262
#: camel/providers/pop3/camel-pop3-folder.c:430
#: camel/providers/pop3/camel-pop3-folder.c:491
@@ -10626,9 +10803,9 @@ msgstr "服务器拒绝了用户名/密码"
msgid "User cancelled"
msgstr "用户已取消"
-#: camel/providers/nntp/camel-nntp-folder.c:142
-#: camel/providers/nntp/camel-nntp-folder.c:226
-#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:170
+#: camel/providers/nntp/camel-nntp-folder.c:254
+#: camel/providers/nntp/camel-nntp-folder.c:260
#: camel/providers/pop3/camel-pop3-folder.c:433
#: camel/providers/pop3/camel-pop3-folder.c:494
#: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10637,48 +10814,48 @@ msgstr "用户已取消"
msgid "Cannot get message %s: %s"
msgstr "无法获取消息 %s:%s"
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/nntp/camel-nntp-folder.c:195
+#: camel/providers/nntp/camel-nntp-folder.c:185
+#: camel/providers/nntp/camel-nntp-folder.c:223
#, c-format
msgid "Internal error: uid in invalid format: %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:170
+#: camel/providers/nntp/camel-nntp-folder.c:198
#, fuzzy, c-format
msgid "Could not get article %s from NNTP server"
msgstr "无法获取组:%s"
-#: camel/providers/nntp/camel-nntp-folder.c:353
+#: camel/providers/nntp/camel-nntp-folder.c:381
msgid "Posting not allowed by news server"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:364
+#: camel/providers/nntp/camel-nntp-folder.c:392
#, c-format
msgid "Failed to send newsgroups header: %s: message not posted"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:404
-#: camel/providers/nntp/camel-nntp-folder.c:417
+#: camel/providers/nntp/camel-nntp-folder.c:432
+#: camel/providers/nntp/camel-nntp-folder.c:445
#, c-format
msgid "Error posting to newsgroup: %s: message not posted"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:429
+#: camel/providers/nntp/camel-nntp-folder.c:457
msgid "Error reading response to posted message: message not posted"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:432
+#: camel/providers/nntp/camel-nntp-folder.c:460
#, fuzzy, c-format
msgid "Error posting message: %s: message not posted"
msgstr ""
"自动存储邮件错误:%s\n"
" %s"
-#: camel/providers/nntp/camel-nntp-folder.c:448
+#: camel/providers/nntp/camel-nntp-folder.c:476
msgid "You cannot post NNTP messages while working offline!"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:459
+#: camel/providers/nntp/camel-nntp-folder.c:487
#, fuzzy
msgid "You cannot copy messages from a NNTP folder!"
msgstr "无法关闭临时文件夹:%s"
@@ -10854,7 +11031,8 @@ msgstr "没有 uid 为 %s 的邮件"
msgid "Retrieving POP message %d"
msgstr "检索 POP 邮件 %d"
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
+#: composer/e-msg-composer.c:1236
msgid "Unknown reason"
msgstr "未知原因"
@@ -11287,34 +11465,34 @@ msgstr "IMAP 命令失败:%s"
msgid "QUIT command failed"
msgstr "IMAP 命令失败:%s"
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:106
#, c-format
msgid "%.0fK"
msgstr "%.0fK"
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:109
#, c-format
msgid "%.0fM"
msgstr "%.0fM"
-#: composer/e-msg-composer-attachment-bar.c:111
+#: composer/e-msg-composer-attachment-bar.c:112
#, c-format
msgid "%.0fG"
msgstr "%.0fG"
-#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1486
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
msgid "attachment"
msgstr "附件"
-#: composer/e-msg-composer-attachment-bar.c:453
+#: composer/e-msg-composer-attachment-bar.c:451
msgid "Remove selected items from the attachment list"
msgstr "从附件列表中删除选定的条目"
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:491
msgid "Add attachment..."
msgstr "添加附件..."
-#: composer/e-msg-composer-attachment-bar.c:494
+#: composer/e-msg-composer-attachment-bar.c:492
msgid "Attach a file to the message"
msgstr "把文件附件到邮件"
@@ -11342,14 +11520,10 @@ msgid "MIME type:"
msgstr "MIME 类型:"
#: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:66
+#: composer/e-msg-composer-select-file.c:74
msgid "Suggest automatic display of attachment"
msgstr "建议自动显示附件"
-#: composer/e-msg-composer-hdrs.c:308
-msgid "You need to configure an account before you can compose mail."
-msgstr "在您可以撰写邮件之前您需要配置一个帐户。"
-
#: composer/e-msg-composer-hdrs.c:512
msgid "Posting destination"
msgstr "投递目的"
@@ -11426,151 +11600,68 @@ msgstr "投递到:"
msgid "Click here to select folders to post to"
msgstr "<点击这里以便选择文件夹>"
-#: composer/e-msg-composer-select-file.c:119
+#: composer/e-msg-composer-select-file.c:127
msgid "Attach file(s)"
msgstr "添加附件"
-#: composer/e-msg-composer.c:694
+#: composer/e-msg-composer.c:695
#, fuzzy
msgid ""
"Cannot sign outgoing message: No signing certificate set for from account"
msgstr "当使用该账户时总是发送签名邮件(_A)"
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:701
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for from "
"account"
msgstr ""
-#: composer/e-msg-composer.c:831
-#, c-format
-msgid ""
-"Error while reading file %s:\n"
-"%s"
-msgstr ""
-"读入文件 %s 时发声错误:\n"
-"%s"
-
-#: composer/e-msg-composer.c:1208
-msgid "File exists, overwrite?"
-msgstr "文件存在,覆盖它?"
-
-#: composer/e-msg-composer.c:1219 composer/e-msg-composer.c:1235
-#, c-format
-msgid "Error saving file: %s"
-msgstr "保存文件错误:%s"
-
-#: composer/e-msg-composer.c:1259
-#, c-format
-msgid "Error loading file: %s"
-msgstr "读入文件错误:%s"
-
-#: composer/e-msg-composer.c:1297
-#, c-format
-msgid "Error accessing file: %s"
-msgstr "访问文件错误:%s"
+#: composer/e-msg-composer.c:1273
+#, fuzzy
+msgid "Could not open file"
+msgstr "无法打开文件"
-#: composer/e-msg-composer.c:1305
+#: composer/e-msg-composer.c:1281
msgid "Unable to retrieve message from editor"
msgstr "无法从编辑器检索邮件"
-#: composer/e-msg-composer.c:1312
-#, c-format
-msgid ""
-"Unable to seek on file: %s\n"
-"%s"
-msgstr ""
-"无法搜索文件:%s\n"
-"%s"
-
-#: composer/e-msg-composer.c:1319
-#, c-format
-msgid ""
-"Unable to truncate file: %s\n"
-"%s"
-msgstr ""
-"无法截断文件:%s\n"
-"%s"
-
-#: composer/e-msg-composer.c:1328
-#, c-format
-msgid ""
-"Unable to copy file descriptor: %s\n"
-"%s"
-msgstr ""
-"无法复制文件描述符:%s\n"
-"%s"
-
-#: composer/e-msg-composer.c:1337
-#, c-format
-msgid ""
-"Error autosaving message: %s\n"
-" %s"
-msgstr ""
-"自动存储邮件错误:%s\n"
-" %s"
-
-#: composer/e-msg-composer.c:1441
-#, fuzzy
-msgid ""
-"Ximian Evolution has found unsaved messages from a previous session.\n"
-"Would you like to try to recover them?"
-msgstr ""
-"Ximian Evolution 发现上次会话含有未保存的文件。\n"
-"您是否希望恢复它们?"
-
-#: composer/e-msg-composer.c:1605
-#, c-format
-msgid ""
-"The message \"%s\" has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"邮件“%s”尚未发送。\n"
-"\n"
-"您是否希望保存修改?"
-
-#: composer/e-msg-composer.c:1607
+#: composer/e-msg-composer.c:1551
#, fuzzy
msgid "Untitled Message"
msgstr "多封邮件"
-#: composer/e-msg-composer.c:1614
-msgid "Warning: Modified Message"
-msgstr "警告:已改动的邮件"
-
-#: composer/e-msg-composer.c:1647
+#: composer/e-msg-composer.c:1581
msgid "Open file"
msgstr "打开文件"
-#: composer/e-msg-composer.c:2054 mail/mail-account-gui.c:1311
+#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
msgid "Autogenerated"
msgstr "自动生成的"
-#: composer/e-msg-composer.c:2153
+#: composer/e-msg-composer.c:2087
msgid "Signature:"
msgstr "签名:"
-#: composer/e-msg-composer.c:2353
+#: composer/e-msg-composer.c:2288
#, c-format
msgid "<b>%d</b> File Attached"
msgid_plural "<b>%d</b> Files Attached"
msgstr[0] "附加了 <b>%d</b> 个文件"
-#: composer/e-msg-composer.c:2382
+#: composer/e-msg-composer.c:2317
msgid "Hide _Attachment Bar (drop attachments here)"
msgstr "隐藏附件栏(将附件拖至此处)(_A)"
-#: composer/e-msg-composer.c:2385 composer/e-msg-composer.c:3284
+#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
msgid "Show _Attachment Bar (drop attachments here)"
msgstr "显示附件栏(将附件拖至此处)(_A)"
-#: composer/e-msg-composer.c:2402 composer/e-msg-composer.c:3167
-#: composer/e-msg-composer.c:3168
+#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
+#: composer/e-msg-composer.c:3104
msgid "Compose a message"
msgstr "撰写邮件"
-#: composer/e-msg-composer.c:3197
+#: composer/e-msg-composer.c:3137
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
@@ -11578,7 +11669,7 @@ msgstr ""
"无法创建撰写窗口:\n"
"无法激活地址选择控制。"
-#: composer/e-msg-composer.c:3225
+#: composer/e-msg-composer.c:3165
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component.\n"
@@ -11590,7 +11681,7 @@ msgstr ""
"请确定您的 gtkhtml 和 libgtkhtml 所安装的版\n"
"本正确。\n"
-#: composer/e-msg-composer.c:3329
+#: composer/e-msg-composer.c:3269
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
@@ -11598,12 +11689,125 @@ msgstr ""
"无法创建撰写窗口:\n"
"无法激活 HTML 编辑器组件。"
-#: composer/e-msg-composer.c:4334
+#: composer/e-msg-composer.c:4274
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
msgstr "<b>(编写器含有不可编辑的非文本消息体。)<b>"
+#: composer/mail-composer-errors.xml.in.h:1
+msgid "${1}"
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:2
+msgid "All accounts have been removed."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:3
+#, fuzzy
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "您真的想要删除此无标题约会吗?"
+
+#: composer/mail-composer-errors.xml.in.h:4
+msgid "Because \"${0}\", you may need to select different mail options."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:5
+msgid "Because \"${1}\"."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:6
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:7
+#, fuzzy
+msgid "Could not create message."
+msgstr "无法创建管道:%s"
+
+#: composer/mail-composer-errors.xml.in.h:8
+#, fuzzy
+msgid "Could not read signature file \"{0}\"."
+msgstr "无法保存签名文件:%s"
+
+#: composer/mail-composer-errors.xml.in.h:9
+#, fuzzy
+msgid "Could not save to autosave file \"{0}\"."
+msgstr "无法保存签名文件:%s"
+
+#: composer/mail-composer-errors.xml.in.h:10
+msgid "Directories can not be attached to Messages."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:11
+#, fuzzy
+msgid "Discard Changes"
+msgstr "丢弃修改(_D)"
+
+#: composer/mail-composer-errors.xml.in.h:12
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "您希望保存修改吗?"
+
+#: composer/mail-composer-errors.xml.in.h:13
+#, fuzzy
+msgid "Don't Recover"
+msgstr "不删除"
+
+#: composer/mail-composer-errors.xml.in.h:14
+#, fuzzy
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "保存快捷方式错误。"
+
+#: composer/mail-composer-errors.xml.in.h:15
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:16
+#, fuzzy
+msgid "Recover"
+msgstr "删除"
+
+#: composer/mail-composer-errors.xml.in.h:17
+#, fuzzy
+msgid "Save Message"
+msgstr "保存邮件..."
+
+#: composer/mail-composer-errors.xml.in.h:18
+msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:19
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:20
+#, fuzzy
+msgid "Unfinished messages found"
+msgstr "下一封未读邮件"
+
+#: composer/mail-composer-errors.xml.in.h:21
+msgid "Warning: Modified Message"
+msgstr "警告:已改动的邮件"
+
+#: composer/mail-composer-errors.xml.in.h:22
+#, fuzzy
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "把文件附件到邮件"
+
+#: composer/mail-composer-errors.xml.in.h:23
+msgid "You need to configure an account before you can compose mail."
+msgstr "在您可以撰写邮件之前您需要配置一个帐户。"
+
#: data/evolution.desktop.in.in.h:1
msgid "The Ximian Evolution Groupware Suite"
msgstr "Ximian Evolution 群件套件"
@@ -11875,24 +12079,20 @@ msgid "1 year ago"
msgid_plural "%d years ago"
msgstr[0] "1 年前"
-#: filter/filter-datespec.c:187
-msgid "You must choose a date."
-msgstr "您忘记选择日期了。"
-
-#: filter/filter-datespec.c:287
+#: filter/filter-datespec.c:280
msgid "<click here to select a date>"
msgstr "<点击这里以选择日期>"
-#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
+#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
msgid "now"
msgstr "现在"
#. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:297
+#: filter/filter-datespec.c:290
msgid "%d-%b-%Y"
msgstr "%Y-%m-%d"
-#: filter/filter-datespec.c:413
+#: filter/filter-datespec.c:406
msgid "Select a time to compare against"
msgstr "选择用于比较的时间"
@@ -11901,16 +12101,84 @@ msgstr "选择用于比较的时间"
msgid "_Filter Rules"
msgstr "过滤规则"
-#: filter/filter-file.c:166
+#: filter/filter-errors.xml.in.h:1
+#, fuzzy
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"常规表达式错误 “%s”:\n"
+"%s"
+
+#: filter/filter-errors.xml.in.h:2
+msgid "Could not compile regular expression \"{1}\"."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:3
+#, fuzzy
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "文件“%s”不存在或者不是普通文件。"
+
+#: filter/filter-errors.xml.in.h:4
+#, fuzzy
+msgid "Missing date."
+msgstr "会议更新"
+
+#: filter/filter-errors.xml.in.h:5
+#, fuzzy
+msgid "Missing file name."
+msgstr "识别性名称(_N):"
+
+#: filter/filter-errors.xml.in.h:6
+#, fuzzy
+msgid "Missing folder."
+msgstr "正在删除文件夹“%s”"
+
+#: filter/filter-errors.xml.in.h:7
+#, fuzzy
+msgid "Missing name."
+msgstr "指派"
+
+#: filter/filter-errors.xml.in.h:8
+msgid "Name \"{0}\" already used."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:9
+#, fuzzy
+msgid "No sources selected."
+msgstr "没有选定服务器"
+
+#: filter/filter-errors.xml.in.h:10
+msgid "Please choose another name."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:11
+msgid "You must choose a date."
+msgstr "您忘记选择日期了。"
+
+#: filter/filter-errors.xml.in.h:12
+msgid "You must name this filter."
+msgstr "您必须为该过滤规则命名。"
+
+#: filter/filter-errors.xml.in.h:13
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "您必须为该虚拟文件夹命名。"
+
+#: filter/filter-errors.xml.in.h:14
msgid "You must specify a file name."
msgstr "您必须指定文件名。"
-#: filter/filter-file.c:185
-#, c-format
-msgid "File '%s' does not exist or is not a regular file."
-msgstr "文件“%s”不存在或者不是普通文件。"
+#: filter/filter-errors.xml.in.h:15
+msgid "You must specify a folder."
+msgstr "您必须指定文件夹。"
+
+#: filter/filter-errors.xml.in.h:16
+msgid ""
+"You must specify at least one folder as a source. Either by selecting the "
+"folders individually, and/or by selecting all local folders, all remote "
+"folders, or both."
+msgstr ""
-#: filter/filter-file.c:301
+#: filter/filter-file.c:288
msgid "Choose a file"
msgstr "选择文件"
@@ -11920,37 +12188,24 @@ msgstr "选择文件"
msgid "<b>Then</b>"
msgstr "<b>到期:</b>"
-#: filter/filter-folder.c:153
-msgid "You must specify a folder."
-msgstr "您必须指定文件夹。"
-
-#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
-#: mail/mail-account-gui.c:1177
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
+#: mail/mail-account-gui.c:1327
msgid "Select Folder"
msgstr "选择文件夹"
-#: filter/filter-input.c:193
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"常规表达式错误 “%s”:\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:924
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
#: mail/mail-config.c:65 mail/mail-config.glade.h:90
msgid "Important"
msgstr "重要"
#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:927 mail/mail-config.c:68
+#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
#: mail/mail-config.glade.h:145
msgid "To Do"
msgstr "待办"
#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:928 mail/mail-config.c:69
+#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
#: mail/mail-config.glade.h:94
msgid "Later"
msgstr "稍候"
@@ -11959,41 +12214,37 @@ msgstr "稍候"
msgid "Test"
msgstr "测试"
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "您必须为该过滤规则命名。"
-
-#: filter/filter-rule.c:752
+#: filter/filter-rule.c:746
#, fuzzy
msgid "Rule name:"
msgstr "规则名:"
-#: filter/filter-rule.c:756
+#: filter/filter-rule.c:750
msgid "Untitled"
msgstr "无标题"
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:773
#, fuzzy
msgid "<b>If</b>"
msgstr "<b>到期:</b>"
-#: filter/filter-rule.c:810
+#: filter/filter-rule.c:804
msgid "Execute actions"
msgstr "执行动作"
-#: filter/filter-rule.c:814
+#: filter/filter-rule.c:808
msgid "if all criteria are met"
msgstr "如果满足所有条件"
-#: filter/filter-rule.c:819
+#: filter/filter-rule.c:813
msgid "if any criteria are met"
msgstr "如果满足任一条件"
-#: filter/filter-rule.c:910
+#: filter/filter-rule.c:904
msgid "incoming"
msgstr "接收"
-#: filter/filter-rule.c:910
+#: filter/filter-rule.c:904
msgid "outgoing"
msgstr "发送"
@@ -12065,10 +12316,6 @@ msgstr "当前时间"
msgid "the time you specify"
msgstr "您指定的时间"
-#: filter/filter.glade.h:23
-msgid "weeks"
-msgstr "周"
-
#: filter/filter.glade.h:24
msgid "with all active remote folders"
msgstr "以全部活跃远程文件夹"
@@ -12215,7 +12462,7 @@ msgstr "未标志"
msgid "Junk Test"
msgstr "六月"
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:802
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
#: widgets/misc/e-expander.c:189
msgid "Label"
msgstr "标签"
@@ -12325,9 +12572,9 @@ msgstr "以之开始"
msgid "Stop Processing"
msgstr "停止处理"
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1539
-#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
+#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
#: smime/lib/e-cert.c:1079
msgid "Subject"
msgstr "主题"
@@ -12336,21 +12583,15 @@ msgstr "主题"
msgid "Unset Status"
msgstr "未设置状态"
-#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1008
-#, c-format
-msgid "Rule name '%s' is not unique, choose another."
-msgstr "规则名“%s”不唯一,请另外选择一个名称。"
-
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:285
msgid "Add Rule"
msgstr "添加规则"
-#: filter/rule-editor.c:375
+#: filter/rule-editor.c:361
msgid "Edit Rule"
msgstr "编辑规则"
-#: filter/rule-editor.c:699
+#: filter/rule-editor.c:685
msgid "Rule name"
msgstr "规则名"
@@ -12396,15 +12637,7 @@ msgstr "主题不含有"
msgid "Virtual _Folders"
msgstr "虚拟文件夹"
-#: filter/vfolder-rule.c:215
-msgid "You must name this vfolder."
-msgstr "您必须为该虚拟文件夹命名。"
-
-#: filter/vfolder-rule.c:230
-msgid "You need to to specify at least one folder as a source."
-msgstr "您至少需要把一个文件夹指定为源。"
-
-#: filter/vfolder-rule.c:587
+#: filter/vfolder-rule.c:572
msgid "VFolder source"
msgstr "虚拟文件夹来源"
@@ -12453,10 +12686,10 @@ msgstr "Evolution 邮件文件夹查看器"
msgid "Evolution Mail preferences control"
msgstr "Evolution 邮件首选项控件"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:828
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:495
-#: mail/mail-component.c:540
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
+#: mail/mail-component.c:582
msgid "Mail"
msgstr "邮件"
@@ -12468,99 +12701,38 @@ msgstr "邮件账户"
msgid "Mail Preferences"
msgstr "邮件首选项"
-#: mail/em-account-prefs.c:232
-msgid "Are you sure you want to delete this account?"
-msgstr "您确信您要删除该账户吗?"
-
-#: mail/em-account-prefs.c:240
-msgid "Don't delete"
-msgstr "不要删除"
-
#. translators: default account indicator
-#: mail/em-account-prefs.c:444
+#: mail/em-account-prefs.c:415
msgid "[Default]"
msgstr "[默认]"
-#: mail/em-account-prefs.c:498
+#: mail/em-account-prefs.c:469
msgid "Account name"
msgstr "账户名"
-#: mail/em-account-prefs.c:500
+#: mail/em-account-prefs.c:471
msgid "Protocol"
msgstr "协议"
-#: mail/em-composer-prefs.c:295 mail/em-composer-prefs.c:418
-#: mail/mail-config.c:1037
+#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
+#: mail/mail-config.c:1038
msgid "Unnamed"
msgstr "未命名"
-#: mail/em-composer-prefs.c:402
-msgid "You must specify a valid script name."
-msgstr "您必须指定有效的脚本名。"
-
-#: mail/em-composer-prefs.c:902
+#: mail/em-composer-prefs.c:895
msgid "Language(s)"
msgstr "语言"
-#: mail/em-composer-prefs.c:948
+#: mail/em-composer-prefs.c:941
#, fuzzy
msgid "Add signature script"
msgstr "添加签名(_A)"
-#: mail/em-composer-prefs.c:968
+#: mail/em-composer-prefs.c:961
msgid "Signature(s)"
msgstr "签名"
-#: mail/em-composer-utils.c:124
-#, fuzzy, c-format
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-"%sSend anyway?"
-msgstr "您即将发送 HTML 格式的邮件。请确定下列收件人愿意接收 HTML 邮件:\n"
-
-#: mail/em-composer-utils.c:138
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"该消息没有主题。\n"
-"确实要发送?"
-
-#: mail/em-composer-utils.c:153
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-"由于您正在发送的邮件的接收人列表被配置为隐藏列表的地址,该消息将只含有密件抄"
-"送收件人。"
-
-#: mail/em-composer-utils.c:157
-msgid "This message contains only Bcc recipients."
-msgstr "该邮件只含有密件抄送收件人。"
-
-#: mail/em-composer-utils.c:162
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-"邮件服务器可能会以添加 Apparent-To 头而使收件人可见。\n"
-"仍然发送?"
-
-#: mail/em-composer-utils.c:305
-msgid "You must specify recipients in order to send this message."
-msgstr "您必须指定收件人以便发送该消息。"
-
-#: mail/em-composer-utils.c:574
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"无法为该账户打开草稿文件夹。\n"
-"您是否希望使用默认草稿文件夹?"
-
-#: mail/em-folder-browser.c:138
+#: mail/em-folder-browser.c:139
msgid "Create _Virtual Folder From Search..."
msgstr "根据搜索创建虚拟文件夹(_V)..."
@@ -12594,8 +12766,8 @@ msgstr "<点击这里以便选择文件夹>"
msgid "Create New Folder"
msgstr "创建新文件夹"
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2277
-#: mail/mail-component.c:704
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
+#: mail/mail-component.c:731
msgid "Specify where to create the folder:"
msgstr "指定在哪里创建文件夹:"
@@ -12604,416 +12776,382 @@ msgid "Folder _name:"
msgstr "文件夹名称(_N):"
#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:856
+#: mail/mail-vfolder.c:852
msgid "VFolders"
msgstr "虚拟文件夹"
-#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
msgid "UNMATCHED"
msgstr ""
#. Inbox is always first
-#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
+#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
msgid "Inbox"
msgstr "收件箱"
-#: mail/em-folder-tree-model.c:493 mail/em-folder-tree-model.c:802
+#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
msgid "Loading..."
msgstr "正在装入..."
-#: mail/em-folder-tree.c:922
+#: mail/em-folder-tree.c:924
#, fuzzy, c-format
msgid "Moving folder %s"
msgstr "正在删除文件夹“%s”"
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:926
#, fuzzy, c-format
msgid "Copying folder %s"
msgstr "正在打开文件夹 %s"
-#: mail/em-folder-tree.c:931
+#: mail/em-folder-tree.c:933
#, fuzzy, c-format
msgid "Moving messages into folder %s"
msgstr "把邮件移动到 %s"
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:935
#, fuzzy, c-format
msgid "Copying messages into folder %s"
msgstr "把邮件复制到 %s"
-#: mail/em-folder-tree.c:949
+#: mail/em-folder-tree.c:951
#, fuzzy
msgid "Cannot drop message(s) into toplevel store"
msgstr "无法将消息移动或复制到虚拟文件夹中"
-#: mail/em-folder-tree.c:1997
-#, fuzzy, c-format
-msgid "Cannot move folder `%s': illegal operation"
-msgstr "无法重命名文件夹:%s:无效操作"
-
-#: mail/em-folder-tree.c:2026 mail/em-folder-tree.c:2203
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: mail/em-folder-tree.c:2042 mail/em-folder-tree.c:2055
-#: mail/em-folder-view.c:671 mail/em-folder-view.c:685
+#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
+#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
#: mail/importers/evolution-mbox-importer.c:119
msgid "Select folder"
msgstr "选择文件夹"
-#: mail/em-folder-tree.c:2082
+#: mail/em-folder-tree.c:2080
#, fuzzy, c-format
msgid "Creating folder `%s'"
msgstr "正在存储文件夹“%s”"
-#: mail/em-folder-tree.c:2277 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
msgid "Create folder"
msgstr "创建文件夹"
-#: mail/em-folder-tree.c:2396
-#, c-format
-msgid "Could not delete folder: %s"
-msgstr "无法删除文件夹:%s"
-
-#: mail/em-folder-tree.c:2423
-#, fuzzy, c-format
-msgid "Cannot delete local %s folder."
-msgstr "无法删除文件夹:%s:没有该文件夹"
-
-#: mail/em-folder-tree.c:2429
-#, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "您真的要删除文件夹“%s”及其全部子文件夹吗?"
-
-#: mail/em-folder-tree.c:2439
-#, c-format
-msgid "Delete \"%s\""
-msgstr "删除“%s”"
-
-#: mail/em-folder-tree.c:2475
-#, fuzzy, c-format
-msgid "Cannot rename local %s folder."
-msgstr "无法重命名文件夹:%s:没有该文件夹"
-
-#: mail/em-folder-tree.c:2484
+#: mail/em-folder-tree.c:2458
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "把文件夹“%s”重命名为:"
-#: mail/em-folder-tree.c:2486
+#: mail/em-folder-tree.c:2460
msgid "Rename Folder"
msgstr "重命名文件夹"
-#: mail/em-folder-tree.c:2510
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "已经存在名为“%s”的文件夹。请使用不同的名称。"
-
-#: mail/em-folder-tree.c:2558 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
msgid "_View"
msgstr "查看(_V)"
-#: mail/em-folder-tree.c:2559
+#: mail/em-folder-tree.c:2530
msgid "Open in _New Window"
msgstr "在新窗口中打开(_N)"
-#: mail/em-folder-tree.c:2564
+#: mail/em-folder-tree.c:2535
msgid "_Move"
msgstr "移动(_M)"
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2568
+#: mail/em-folder-tree.c:2539
msgid "_New Folder..."
msgstr "新建文件夹(_N)..."
-#: mail/em-folder-tree.c:2571
+#: mail/em-folder-tree.c:2542
msgid "_Rename"
msgstr "重命名(_R)"
-#: mail/em-folder-tree.c:2574 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
msgid "_Properties..."
msgstr "属性(_P)..."
#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:770 mail/em-popup.c:688
+#: mail/em-folder-view.c:771 mail/em-popup.c:689
msgid "_Edit as New Message..."
msgstr "作为新邮件进行编辑(_E)..."
-#: mail/em-folder-view.c:772
+#: mail/em-folder-view.c:773
msgid "_Print"
msgstr "打印(_P)"
-#: mail/em-folder-view.c:775 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
-#: mail/em-folder-view.c:776 mail/em-popup.c:808
+#: mail/em-folder-view.c:777 mail/em-popup.c:809
#: ui/evolution-mail-message.xml.h:88
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:778 mail/em-popup.c:810
#: ui/evolution-mail-message.xml.h:87
msgid "Reply to _All"
msgstr "回复所有人(_A)"
-#: mail/em-folder-view.c:778 mail/em-popup.c:811
+#: mail/em-folder-view.c:779 mail/em-popup.c:812
#: ui/evolution-mail-message.xml.h:113
msgid "_Forward"
msgstr "转发(_F)"
-#: mail/em-folder-view.c:781
+#: mail/em-folder-view.c:782
msgid "Follo_w Up..."
msgstr "跟随(_W)..."
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:783
msgid "Fla_g Completed"
msgstr "已完成标志(_G)"
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:784
msgid "Cl_ear Flag"
msgstr "清除标志(_E)"
-#: mail/em-folder-view.c:786 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:787 ui/evolution-mail-message.xml.h:50
msgid "Mar_k as Read"
msgstr "标记为已读(_K)"
-#: mail/em-folder-view.c:787
+#: mail/em-folder-view.c:788
msgid "Mark as _Unread"
msgstr "标记为未读(_U)"
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:789
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:790
msgid "_Mark as Unimportant"
msgstr "标记为不重要(_M)"
-#: mail/em-folder-view.c:790 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
#, fuzzy
msgid "Mark as _Junk"
msgstr "标记为未读(_U)"
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
#, fuzzy
msgid "Mark as _Not Junk"
msgstr "标记为重要(_I)"
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:796
msgid "U_ndelete"
msgstr "取消删除(_N)"
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:799
msgid "Mo_ve to Folder..."
msgstr "移动到文件夹(_V)..."
-#: mail/em-folder-view.c:799 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
msgid "_Copy to Folder..."
msgstr "复制到文件夹(_C)..."
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:808
msgid "Add Sender to Address_book"
msgstr "将发件人添加到地址簿(_B)"
-#: mail/em-folder-view.c:810
+#: mail/em-folder-view.c:811
msgid "Appl_y Filters"
msgstr "应用过滤规则(_Y)"
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:812
#, fuzzy
msgid "F_ilter Junk"
msgstr "过滤规则"
-#: mail/em-folder-view.c:814
+#: mail/em-folder-view.c:815
msgid "Crea_te Rule From Message"
msgstr "从邮件创建规则(_T)"
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:816
msgid "VFolder on _Subject"
msgstr "基于主题的虚拟文件夹(_S)"
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:817
msgid "VFolder on Se_nder"
msgstr "基于发件人的虚拟文件夹(_N)"
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:818
msgid "VFolder on _Recipients"
msgstr "基于收件人的虚拟文件夹(_R)"
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:819
msgid "VFolder on Mailing _List"
msgstr "基于邮件列表的虚拟文件夹(_L)"
-#: mail/em-folder-view.c:820
+#: mail/em-folder-view.c:821
msgid "VFolder on Thread"
msgstr "基于线索的虚拟文件夹"
-#: mail/em-folder-view.c:824
+#: mail/em-folder-view.c:825
msgid "Filter on Sub_ject"
msgstr "基于主题过滤(_J)"
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:826
msgid "Filter on Sen_der"
msgstr "基于发件人过滤(_D)"
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:827
msgid "Filter on Re_cipients"
msgstr "基于收件人过滤(_C)"
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:828
msgid "Filter on _Mailing List"
msgstr "基于邮件列表过滤(_M)"
-#: mail/em-folder-view.c:829
+#: mail/em-folder-view.c:830
msgid "Filter on Thread"
msgstr "基于线索过滤"
#. default charset used in mail view
-#: mail/em-folder-view.c:1612 mail/em-folder-view.c:1650
+#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
#: mail/mail-config.glade.h:66
msgid "Default"
msgstr "默认"
-#: mail/em-folder-view.c:1686
+#: mail/em-folder-view.c:1687
msgid "Print Message"
msgstr "打印消息"
-#: mail/em-folder-view.c:1949
+#: mail/em-folder-view.c:1950
msgid "_Copy Link Location"
msgstr "复制链接位置(_C)"
-#: mail/em-folder-view.c:2208
+#: mail/em-folder-view.c:2209
#, c-format
msgid "Click to mail %s"
msgstr "点击以给 %s 发送邮件"
+#: mail/em-folder-view.c:2214
+#, c-format
+msgid "Click to open %s"
+msgstr "点击以打开 %s"
+
#. message-search popup match count string
-#: mail/em-format-html-display.c:409
+#: mail/em-format-html-display.c:410
#, c-format
msgid "Matches: %d"
msgstr "匹配:%d"
-#: mail/em-format-html-display.c:645 mail/em-format-html.c:568
+#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
msgid "Unsigned"
msgstr "未签名"
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:646
#, fuzzy
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
msgstr "该邮件有数字签名,但不能证实是可信的。"
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
#, fuzzy
msgid "Valid signature"
msgstr "编辑签名"
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:647
#, fuzzy
msgid ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
msgstr "该邮件有数字签名,但不能证实是可信的。"
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
#, fuzzy
msgid "Invalid signature"
msgstr "编辑签名"
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:648
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
msgstr ""
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
msgid "Valid signature, cannot verify sender"
msgstr ""
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:649
#, fuzzy
msgid ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
msgstr "input_token 包含无效的签名,或者无法验证签名。"
-#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
#, fuzzy
msgid "Unencrypted"
msgstr "被中断"
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:655
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
+"The Internet."
msgstr ""
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
msgid "Encrypted, weak"
msgstr ""
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:656
msgid ""
"This message is encrypted, but with a weak encryption algorithm. It would "
"be difficult, but not impossible for an outsider to view the content of this "
"message in a practical amount of time."
msgstr ""
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
#, fuzzy
msgid "Encrypted"
msgstr "PGP 加密"
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:657
msgid ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
msgstr ""
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
+#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
msgid "Encrypted, strong"
msgstr ""
-#: mail/em-format-html-display.c:657
+#: mail/em-format-html-display.c:658
msgid ""
"This message is encrypted, with a strong encryption algorithm. It would be "
"very difficult for an outsider to view the content of this message in a "
"practical amount of time."
msgstr ""
-#: mail/em-format-html-display.c:754
+#: mail/em-format-html-display.c:755
#, fuzzy
msgid "_View Certificate"
msgstr "证书 ID(_C):"
-#: mail/em-format-html-display.c:769
+#: mail/em-format-html-display.c:770
#, fuzzy
msgid "This certificate is not viewable"
msgstr "证书未生效"
-#: mail/em-format-html-display.c:1001
+#: mail/em-format-html-display.c:1002
#, fuzzy
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "到 %m月%d日%A,%H:%M"
-#: mail/em-format-html-display.c:1009
+#: mail/em-format-html-display.c:1010
msgid "Overdue:"
msgstr "延误:"
-#: mail/em-format-html-display.c:1012
+#: mail/em-format-html-display.c:1013
msgid "by %B %d, %Y, %l:%M %p"
msgstr "到 %m月%d日%A,%H:%M"
-#: mail/em-format-html-display.c:1082
+#: mail/em-format-html-display.c:1083
msgid "_View Inline"
msgstr "嵌入视图(_V)"
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1084
msgid "_Hide"
msgstr "隐藏(_H)"
@@ -13022,140 +13160,129 @@ msgstr "隐藏(_H)"
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
-#: mail/em-format-html.c:461 mail/em-format-html.c:463
+#: mail/em-format-html.c:462 mail/em-format-html.c:464
#, c-format
msgid "Retrieving `%s'"
msgstr "正在收取“%s”"
-#: mail/em-format-html.c:840
+#: mail/em-format-html.c:843
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
-#: mail/em-format-html.c:870
+#: mail/em-format-html.c:873
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
-#: mail/em-format-html.c:881
+#: mail/em-format-html.c:884
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
-#: mail/em-format-html.c:883
+#: mail/em-format-html.c:886
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
-#: mail/em-format-html.c:904
+#: mail/em-format-html.c:907
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
-#: mail/em-format-html.c:915
+#: mail/em-format-html.c:918
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
-#: mail/em-format-html.c:1157
+#: mail/em-format-html.c:1160
#, fuzzy
msgid "Formatting message"
msgstr "正在移动邮件"
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:304
+#: mail/message-tag-followup.c:314
msgid "From"
msgstr "发件人"
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:744
+#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
#: mail/em-mailer-prefs.c:68
msgid "Reply-To"
msgstr "回复至"
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:745
+#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
msgid "To"
msgstr "收件人"
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
#: mail/em-mailer-prefs.c:70
msgid "Cc"
msgstr "抄送"
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:747
+#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
#: mail/em-mailer-prefs.c:71
msgid "Bcc"
msgstr "密件抄送"
#. pseudo-header
-#: mail/em-format-html.c:1543 mail/em-format-quote.c:308
+#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
#: mail/em-mailer-prefs.c:918
msgid "Mailer"
msgstr "邮件程序"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1570
+#: mail/em-format-html.c:1573
msgid "<I> (%a, %R %Z)</I>"
msgstr ""
#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1573
+#: mail/em-format-html.c:1576
msgid "<I> (%R %Z)</I>"
msgstr ""
-#: mail/em-format-html.c:1583 mail/em-format-quote.c:315 mail/em-format.c:749
+#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
msgid "Date"
msgstr "日期"
-#: mail/em-format-html.c:1604 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
msgid "Newsgroups"
msgstr ""
-#: mail/em-format.c:987
+#: mail/em-format.c:986
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
-#: mail/em-format.c:1066 mail/em-format.c:1188
+#: mail/em-format.c:1065 mail/em-format.c:1184
#, fuzzy
msgid "Could not parse S/MIME message: Unknown error"
msgstr "无法解析 MIME 邮件。显示源文本。"
-#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
-#: mail/em-format.c:1223
-#, c-format
-msgid "Internal error: expecting CamelMultipart, got \"%s\""
-msgstr ""
-
-#: mail/em-format.c:1178
+#: mail/em-format.c:1174
msgid "Unsupported encryption type for multipart/encrypted"
msgstr ""
-#: mail/em-format.c:1325
+#: mail/em-format.c:1320
msgid "Could not parse MIME message. Displaying as source."
msgstr "无法解析 MIME 邮件。显示源文本。"
-#: mail/em-format.c:1344
+#: mail/em-format.c:1339
#, fuzzy
msgid "Unsupported signature format"
msgstr "不支持的方案"
-#: mail/em-format.c:1352
+#: mail/em-format.c:1347
#, fuzzy
msgid "Error verifying signature"
msgstr "无法校验叶子签名"
-#: mail/em-format.c:1352
+#: mail/em-format.c:1347
#, fuzzy
msgid "Unknown error verifying signature"
msgstr "无法校验叶子签名"
-#: mail/em-format.c:1372
-#, c-format
-msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
-msgstr ""
-
#: mail/em-junk-filter.c:82
msgid "Spamassassin (built-in)"
msgstr ""
@@ -13179,7 +13306,7 @@ msgstr "每周"
msgid "Once per month"
msgstr "每月"
-#: mail/em-migrate.c:1080
+#: mail/em-migrate.c:1078
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
"since Evolution 1.x.\n"
@@ -13187,56 +13314,56 @@ msgid ""
"Please be patient while Evolution migrates your folders..."
msgstr ""
-#: mail/em-migrate.c:1935 mail/em-migrate.c:1950
+#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
#, fuzzy, c-format
msgid "Failed to migrate pop3 uid caches: %s"
msgstr "缓冲 %s 失败:%s"
-#: mail/em-migrate.c:2038 mail/em-migrate.c:2139
+#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
#, fuzzy, c-format
msgid "Failed to migrate folder expand state: %s"
msgstr "缓冲 %s 失败:%s"
-#: mail/em-migrate.c:2263 mail/em-migrate.c:2435
+#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
#, fuzzy, c-format
msgid "Failed to create directory `%s': %s"
msgstr "创建到“%s”的管道失败:%s"
-#: mail/em-migrate.c:2275
+#: mail/em-migrate.c:2350
#, fuzzy, c-format
msgid "Failed to open store for `%s': %s"
msgstr "解析主机“%s”:%s"
-#: mail/em-popup.c:698
+#: mail/em-popup.c:699
msgid "Save As..."
msgstr "另存为..."
-#: mail/em-popup.c:716
+#: mail/em-popup.c:717
#, c-format
msgid "untitled_image.%s"
msgstr "无标题图像.%s"
-#: mail/em-popup.c:805
+#: mail/em-popup.c:806
msgid "Set as _Background"
msgstr "设为背景(_B)"
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
msgid "_Reply to sender"
msgstr "回复发件人(_R)"
-#: mail/em-popup.c:855
+#: mail/em-popup.c:856
msgid "_Open Link in Browser"
msgstr "在浏览器中打开链接(_O)"
-#: mail/em-popup.c:856
+#: mail/em-popup.c:857
msgid "Se_nd message to..."
msgstr "把邮件发送到列表(_N)..."
-#: mail/em-popup.c:857
+#: mail/em-popup.c:858
msgid "_Add to Addressbook"
msgstr "添加到地址簿(_A)"
-#: mail/em-popup.c:963
+#: mail/em-popup.c:964
#, c-format
msgid "Open in %s..."
msgstr "在 %s 中打开..."
@@ -13263,110 +13390,47 @@ msgstr "请选择服务器。"
msgid "No server has been selected"
msgstr "没有选定服务器"
-#: mail/em-utils.c:100
+#: mail/em-utils.c:95
msgid "Don't show this message again."
msgstr "不再显示此信息。"
-#: mail/em-utils.c:282
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"装入过滤规则信息错误:\n"
-"%s"
-
-#: mail/em-utils.c:291
+#: mail/em-utils.c:285
msgid "Filters"
msgstr "过滤规则"
-#: mail/em-utils.c:536
+#: mail/em-utils.c:530
msgid "-------- Forwarded Message --------"
msgstr "-------- 转发的邮件 --------"
-#: mail/em-utils.c:1143
+#: mail/em-utils.c:1137
msgid "an unknown sender"
msgstr "未知的发件人"
#. translators: attribution string used when quoting messages,
#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1153
+#: mail/em-utils.c:1147
msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
msgstr "在%Y年%m月%d日的%H:%M,%%s写道:"
-#: mail/em-utils.c:1436 mail/em-utils.c:1520 mail/em-utils.c:1529
-#, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"无法保存到“%s”\n"
-" %s"
-
-#: mail/em-utils.c:1441
-#, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"%s 已经存在。\n"
-"您打算覆盖它吗?"
-
-#: mail/em-utils.c:1484
+#: mail/em-utils.c:1476
msgid "message"
msgstr "邮件"
-#: mail/em-utils.c:1536
-#, fuzzy, c-format
-msgid "Error: '%s' exists and is not a regular file"
-msgstr "错误:“%s”不存在或者不是普通文件"
-
-#: mail/em-utils.c:1590
+#: mail/em-utils.c:1579
msgid "Save Message..."
msgstr "保存邮件..."
-#: mail/em-utils.c:1639
+#: mail/em-utils.c:1628
#, fuzzy
msgid "Add address"
msgstr "地址"
#. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2074
+#: mail/em-utils.c:2063
#, fuzzy, c-format
msgid "Messages from %s"
msgstr "来自 %s 的邮件"
-#: mail/em-utils.c:2125
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "无法创建临时目录:%s"
-
-#: mail/em-utils.c:2456
-#, fuzzy, c-format
-msgid ""
-"This operation will permanently remove all deleted messages in the folder `%"
-"s'. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-"该操作将永久删除所有标记为完成的邮件。\n"
-"如果您继续,您将无法恢复这些邮件。\n"
-"\n"
-"确实删除这些邮件吗?"
-
-#: mail/em-utils.c:2481
-#, fuzzy
-msgid ""
-"This operation will permanently remove all deleted messages in all folders. "
-"If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-"该操作将永久删除所有标记为完成的邮件。\n"
-"如果您继续,您将无法恢复这些邮件。\n"
-"\n"
-"确实删除这些邮件吗?"
-
#: mail/evolution-mail.schemas.in.in.h:1
msgid "Automatic link recognition"
msgstr ""
@@ -13998,20 +14062,20 @@ msgstr ""
msgid "Evolution is importing your old Netscape data"
msgstr "Evolution 正在导入您原来的 Netscape 数据"
-#: mail/importers/netscape-importer.c:1678
+#: mail/importers/netscape-importer.c:1677
#, fuzzy
msgid "Importing Netscape data"
msgstr "Evolution 正在导入您原来的 Netscape 数据"
-#: mail/importers/netscape-importer.c:1878
+#: mail/importers/netscape-importer.c:1877
msgid "Settings"
msgstr "设置"
-#: mail/importers/netscape-importer.c:1883
+#: mail/importers/netscape-importer.c:1882
msgid "Mail Filters"
msgstr "邮件过滤规则"
-#: mail/importers/netscape-importer.c:1904
+#: mail/importers/netscape-importer.c:1903
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
@@ -14044,31 +14108,23 @@ msgstr ""
msgid "Pine"
msgstr "Pine"
-#: mail/mail-account-editor.c:110
-msgid "You have not filled in all of the required information."
-msgstr "您还没有填写所有必须的信息。"
-
#. give our dialog an OK button and title
#: mail/mail-account-editor.c:153
msgid "Evolution Account Editor"
msgstr "Evolution 账户编辑器"
-#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
msgid "_Host:"
msgstr "主机(_H):"
-#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
msgid "User_name:"
msgstr "用户名(_N):"
-#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
msgid "_Path:"
msgstr "路径(_P):"
-#: mail/mail-account-gui.c:2119
-msgid "You may not create two accounts with the same name."
-msgstr "您不能以相同的名字创建两个账户。"
-
#: mail/mail-autofilter.c:75
#, c-format
msgid "Mail to %s"
@@ -14098,97 +14154,83 @@ msgstr "到 %s 的回复"
msgid "Add Filter Rule"
msgstr "添加过滤规则"
-#: mail/mail-autofilter.c:430
-msgid "The following filter rule(s):\n"
-msgstr "下列过滤器规则:\n"
-
-#: mail/mail-autofilter.c:436
-#, c-format
-msgid ""
-"Used the removed folder:\n"
-" '%s'\n"
-"And have been updated."
-msgstr ""
-"使用了已删除的文件夹:\n"
-" “%s”\n"
-"已经被更新。"
-
-#: mail/mail-component.c:472
+#: mail/mail-component.c:492
#, fuzzy, c-format
msgid "%d deleted"
msgstr "已删除"
-#: mail/mail-component.c:474
+#: mail/mail-component.c:494
#, c-format
msgid "%d junk"
msgstr ""
-#: mail/mail-component.c:477
+#: mail/mail-component.c:517
#, fuzzy, c-format
msgid "%d drafts"
msgstr "%d 天"
-#: mail/mail-component.c:479
+#: mail/mail-component.c:519
#, fuzzy, c-format
msgid "%d sent"
msgstr "%d 秒"
-#: mail/mail-component.c:481
+#: mail/mail-component.c:521
#, fuzzy, c-format
msgid "%d unsent"
msgstr "%d 秒"
-#: mail/mail-component.c:485
+#: mail/mail-component.c:525
#, fuzzy, c-format
msgid "%d total"
msgstr "%d 个联系人"
-#: mail/mail-component.c:487
+#: mail/mail-component.c:527
#, c-format
msgid ", %d unread"
msgstr ""
-#: mail/mail-component.c:583
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr ""
+#: mail/mail-component.c:531
+#, fuzzy, c-format
+msgid ", %d selected"
+msgstr "已删除"
-#: mail/mail-component.c:651
+#: mail/mail-component.c:683
msgid "New Mail Message"
msgstr "新建邮件"
-#: mail/mail-component.c:652
+#: mail/mail-component.c:684
msgid "_Mail Message"
msgstr "邮件(_M)"
-#: mail/mail-component.c:653
+#: mail/mail-component.c:685
msgid "Compose a new mail message"
msgstr "撰写一封新邮件"
-#: mail/mail-component.c:659
+#: mail/mail-component.c:691
#, fuzzy
msgid "New Mail Folder"
msgstr "新建虚拟文件夹"
-#: mail/mail-component.c:660
+#: mail/mail-component.c:692
#, fuzzy
msgid "Mail _Folder"
msgstr "邮件过滤规则"
-#: mail/mail-component.c:661
+#: mail/mail-component.c:693
#, fuzzy
msgid "Create a new mail folder"
msgstr "创建新日历"
-#: mail/mail-component.c:824
+#: mail/mail-component.c:871
#, fuzzy
msgid "URI of the mail source that the view will display"
msgstr "日历将显示的 URI"
-#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
msgid "Identity"
msgstr "标识"
-#: mail/mail-config-druid.c:368
+#: mail/mail-config-druid.c:366
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
"below do not need to be filled in, unless you wish to include this "
@@ -14197,12 +14239,12 @@ msgstr ""
"请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入,除非您想要在您发"
"出的邮件中包含此信息。"
-#: mail/mail-config-druid.c:374 mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
#: mail/mail-config.glade.h:116
msgid "Receiving Mail"
msgstr "接收邮件"
-#: mail/mail-config-druid.c:376
+#: mail/mail-config-druid.c:374
msgid ""
"Please enter information about your incoming mail server below. If you are "
"not sure, ask your system administrator or Internet Service Provider."
@@ -14210,15 +14252,15 @@ msgstr ""
"请在下面输入您的收件服务器信息。如果您不太确定的话,请询问您的系统管理员或者"
"互联网服务提供商ISP。"
-#: mail/mail-config-druid.c:383
+#: mail/mail-config-druid.c:381
msgid "Please select among the following options"
msgstr "请从以下选项中选择"
-#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
msgid "Sending Mail"
msgstr "发送邮件"
-#: mail/mail-config-druid.c:388
+#: mail/mail-config-druid.c:386
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -14226,11 +14268,11 @@ msgstr ""
"请在下面输入您的发件服务器信息。如果您不太确定的话,请询问您的系统管理员或者"
"互联网服务提供商ISP。"
-#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
msgid "Account Management"
msgstr "账户管理"
-#: mail/mail-config-druid.c:395
+#: mail/mail-config-druid.c:393
msgid ""
"You are almost done with the mail configuration process. The identity, "
"incoming mail server and outgoing mail transport method which you provided "
@@ -14241,11 +14283,11 @@ msgstr ""
"您即将完成邮件配置的过程了。您提供的用于收件服务器和发送方式将被组合在一起,"
"成为 Evolution 的邮件帐户。请在下面输入此帐户的名称。此名称只会用作显示。"
-#: mail/mail-config.c:887
+#: mail/mail-config.c:888
msgid "Checking Service"
msgstr "检查服务"
-#: mail/mail-config.c:965 mail/mail-config.c:969
+#: mail/mail-config.c:966 mail/mail-config.c:970
msgid "Connecting to server..."
msgstr "正在连接服务器..."
@@ -14628,10 +14670,6 @@ msgstr "组织(_G):"
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG 键标识(_K):"
-#: mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "选取一种颜色"
-
#: mail/mail-config.glade.h:108
#, fuzzy
msgid "Play sound file when new mail arri_ves"
@@ -14851,10 +14889,6 @@ msgstr "使它成为我的默认账户(_M)"
msgid "_Mark messages as read after"
msgstr "把邮件标记为已读前等(_M)"
-#: mail/mail-config.glade.h:170
-msgid "_Name:"
-msgstr "名称(_N):"
-
#: mail/mail-config.glade.h:171
#, fuzzy
msgid "_Never load images from the Internet"
@@ -14897,30 +14931,437 @@ msgstr "颜色"
msgid "description"
msgstr "描述"
-#: mail/mail-folder-cache.c:786
-#, c-format
-msgid "Pinging %s"
-msgstr "正在查验 %s"
+#: mail/mail-errors.xml.in.h:1
+#, fuzzy
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "已经存在名为“%s”的文件夹。请使用不同的名称。"
-#: mail/mail-mt.c:261
-#, c-format
+#: mail/mail-errors.xml.in.h:2
msgid ""
-"Error while '%s':\n"
-"%s"
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
msgstr ""
-"当“%s”时错误:\n"
+
+#: mail/mail-errors.xml.in.h:3
+msgid "Are you sure you want to delete this account?"
+msgstr "您确信您要删除该账户吗?"
+
+#: mail/mail-errors.xml.in.h:4
+#, fuzzy
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "从该文件夹永久删除所有已删除的邮件"
+
+#: mail/mail-errors.xml.in.h:5
+#, fuzzy
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "永久删除所有文件夹中的所有已删除的邮件"
+
+#: mail/mail-errors.xml.in.h:6
+#, fuzzy
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "您确定您想要删除此 URL 吗?"
+
+#: mail/mail-errors.xml.in.h:7
+#, fuzzy
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "发送只有暗送收件人的邮件时提示(_O)"
+
+#: mail/mail-errors.xml.in.h:8
+#, fuzzy
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "您确定要删除此联系人吗?"
+
+#: mail/mail-errors.xml.in.h:9
+msgid "Because \"{0}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:10
+msgid "Because \"{1}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:11
+msgid "Because \"{2}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:12
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:13
+#, fuzzy
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "无法复制文件夹:%s"
+
+#: mail/mail-errors.xml.in.h:14
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "无法创建文件夹:%s:%s"
+
+#: mail/mail-errors.xml.in.h:15
+#, fuzzy
+msgid "Cannot create temporary save directory."
+msgstr "无法创建临时目录:%s"
+
+#: mail/mail-errors.xml.in.h:16
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "无法创建目录“%s”:%s"
+
+#: mail/mail-errors.xml.in.h:17
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr ""
+"无法删除文件夹:\n"
"%s"
-#: mail/mail-mt.c:264
-#, c-format
+#: mail/mail-errors.xml.in.h:18
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "无法删除文件夹:%s:没有该文件夹"
+
+#: mail/mail-errors.xml.in.h:19
+#, fuzzy
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "文件夹“%s”不存在。"
+
+#: mail/mail-errors.xml.in.h:20
+#, fuzzy
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "无法移动文件夹:%s"
+
+#: mail/mail-errors.xml.in.h:21
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "无法打开“%s”:%s"
+
+#: mail/mail-errors.xml.in.h:22
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "无法打开“%s”:%s"
+
+#: mail/mail-errors.xml.in.h:23
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
+msgstr "无法打开消息"
+
+#: mail/mail-errors.xml.in.h:24
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:25
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "无法重命名文件夹:%s:没有该文件夹"
+
+#: mail/mail-errors.xml.in.h:26
+msgid "Cannot save changes to account."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:27
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
+msgstr "无法创建目录“%s”:%s"
+
+#: mail/mail-errors.xml.in.h:28
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
+msgstr ""
+"无法保存到“%s”\n"
+" %s"
+
+#: mail/mail-errors.xml.in.h:29
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "添加签名(_A)"
+
+#: mail/mail-errors.xml.in.h:30
msgid ""
-"Error while performing operation:\n"
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:31
+#, fuzzy
+msgid "Could not save signature file."
+msgstr "无法保存签名文件:%s"
+
+#: mail/mail-errors.xml.in.h:32
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "删除“%s”"
+
+#: mail/mail-errors.xml.in.h:33
+#, fuzzy
+msgid "Delete account?"
+msgstr "删除选中的联系人"
+
+#: mail/mail-errors.xml.in.h:34
+#, fuzzy
+msgid "Discard changed?"
+msgstr "丢弃更改(_D)"
+
+#: mail/mail-errors.xml.in.h:35
+#, fuzzy
+msgid "Do you wish to save your changes?"
+msgstr "您希望保存修改吗?"
+
+#: mail/mail-errors.xml.in.h:36
+msgid "Don't delete"
+msgstr "不要删除"
+
+#: mail/mail-errors.xml.in.h:37
+#, fuzzy
+msgid "Enter password."
+msgstr "输入密码"
+
+#: mail/mail-errors.xml.in.h:38
+#, fuzzy
+msgid "Error loading filter definitions."
+msgstr ""
+"装入过滤规则信息错误:\n"
"%s"
+
+#: mail/mail-errors.xml.in.h:39
+#, fuzzy
+msgid "Error while performing operation."
msgstr ""
"执行操作时错误:\n"
"%s"
-#: mail/mail-mt.c:903
+#: mail/mail-errors.xml.in.h:40
+#, fuzzy
+msgid "Error while {0}."
+msgstr ""
+"当“%s”时错误:\n"
+"%s"
+
+#: mail/mail-errors.xml.in.h:41
+#, fuzzy
+msgid "File exists but cannot overwrite it."
+msgstr "文件存在,覆盖它?"
+
+#: mail/mail-errors.xml.in.h:42
+#, fuzzy
+msgid "File exists but is not a regular file."
+msgstr "文件“%s”不存在或者不是普通文件。"
+
+#: mail/mail-errors.xml.in.h:43
+msgid "If you continue, you will not be able to recover these messages."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:44
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:45
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:46
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:47
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "身份验证"
+
+#: mail/mail-errors.xml.in.h:48
+msgid "Mail filters automatically updated."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:49
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:50
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:51
+#, fuzzy
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email: {0} Send anyway?"
+msgstr "您即将发送 HTML 格式的邮件。请确定下列收件人愿意接收 HTML 邮件:\n"
+
+#: mail/mail-errors.xml.in.h:52
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "您真的要删除文件夹“%s”及其全部子文件夹吗?"
+
+#: mail/mail-errors.xml.in.h:53
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:54
+msgid ""
+"The contact list you are sending to is configured to hide list recipients. "
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:55
+#, fuzzy
+msgid ""
+"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
+"have been updated."
+msgstr ""
+"下列虚拟文件夹:\n"
+"%s使用了已删除的文件夹:\n"
+" “%s”\n"
+"已经被更新。"
+
+#: mail/mail-errors.xml.in.h:56
+#, fuzzy
+msgid ""
+"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
+"been updated."
+msgstr ""
+"下列虚拟文件夹:\n"
+"%s使用了已删除的文件夹:\n"
+" “%s”\n"
+"已经被更新。"
+
+#: mail/mail-errors.xml.in.h:57
+msgid ""
+"The message was sent via the \"sendmail\" external application. Sendmail "
+"reports the following error: status 67: mail not sent. The message is stored "
+"in the Outbox folder. Check the message for errors and resend."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:58
+msgid "The script file must exist and be executable."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:59
+msgid ""
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:60
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:61
+#, fuzzy
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP 服务器 %s 不支持请求的认证类型 %s。"
+
+#: mail/mail-errors.xml.in.h:62
+#, fuzzy
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+"该签名已经被改变,但还没有存储。\n"
+"\n"
+"您希望保存改动吗?"
+
+#: mail/mail-errors.xml.in.h:63
+#, fuzzy
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+"无法为该账户打开草稿文件夹。\n"
+"您是否希望使用默认草稿文件夹?"
+
+#: mail/mail-errors.xml.in.h:64
+#, fuzzy
+msgid "Use _Default"
+msgstr "默认"
+
+#: mail/mail-errors.xml.in.h:65
+#, fuzzy
+msgid "Use default drafts folder?"
+msgstr "正在打开默认任务文件夹"
+
+#: mail/mail-errors.xml.in.h:66
+msgid "You have not filled in all of the required information."
+msgstr "您还没有填写所有必须的信息。"
+
+#: mail/mail-errors.xml.in.h:67
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:68
+msgid "You may not create two accounts with the same name."
+msgstr "您不能以相同的名字创建两个账户。"
+
+#: mail/mail-errors.xml.in.h:69
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:70
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:71
+msgid "_Discard changes"
+msgstr "丢弃更改(_D)"
+
+#: mail/mail-errors.xml.in.h:72
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "清空回收站(_T)"
+
+#: mail/mail-errors.xml.in.h:73
+#, fuzzy
+msgid "_Expunge"
+msgstr "销毁(_X)"
+
+#: mail/mail-errors.xml.in.h:74
+#, fuzzy
+msgid "_Send"
+msgstr "发送"
+
+#: mail/mail-errors.xml.in.h:75
+msgid "vFolders automatically updated."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:76
+msgid "{0}"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:77
+msgid "{0}."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:78
+msgid "{1}"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:79
+msgid "{1}."
+msgstr ""
+
+#: mail/mail-folder-cache.c:786
+#, c-format
+msgid "Pinging %s"
+msgstr "正在查验 %s"
+
+#: mail/mail-mt.c:897
msgid "Working"
msgstr "工作"
@@ -14932,12 +15373,12 @@ msgstr "过滤文件夹"
msgid "Fetching Mail"
msgstr "收取邮件"
-#: mail/mail-ops.c:534
+#: mail/mail-ops.c:532
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "应用寄出过滤器失败:%s"
-#: mail/mail-ops.c:559
+#: mail/mail-ops.c:557
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -14946,113 +15387,113 @@ msgstr ""
"追加到 %s:%s 失败\n"
"转而追加到本地“已发”文件夹。"
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:566
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "追加到本地“已发”文件夹失败:%s"
-#: mail/mail-ops.c:664
+#: mail/mail-ops.c:662
#, c-format
msgid "Sending message %d of %d"
msgstr "发送第 %d 个邮件,共 %d 个"
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:693
#, fuzzy, c-format
msgid "Failed to send %d of %d messages"
msgstr "在第 %d 个消息失败,共 %d 个"
-#: mail/mail-ops.c:699
+#: mail/mail-ops.c:697
msgid "Complete."
msgstr "完成。"
-#: mail/mail-ops.c:796
+#: mail/mail-ops.c:794
msgid "Saving message to folder"
msgstr "把邮件保存到文件夹中"
-#: mail/mail-ops.c:881
+#: mail/mail-ops.c:879
#, c-format
msgid "Moving messages to %s"
msgstr "把邮件移动到 %s"
-#: mail/mail-ops.c:881
+#: mail/mail-ops.c:879
#, c-format
msgid "Copying messages to %s"
msgstr "把邮件复制到 %s"
-#: mail/mail-ops.c:994
+#: mail/mail-ops.c:992
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "正在“%s”中扫描文件夹"
-#: mail/mail-ops.c:1123
+#: mail/mail-ops.c:1105
msgid "Forwarded messages"
msgstr "转发的邮件"
-#: mail/mail-ops.c:1166
+#: mail/mail-ops.c:1148
#, c-format
msgid "Opening folder %s"
msgstr "正在打开文件夹 %s"
-#: mail/mail-ops.c:1238
+#: mail/mail-ops.c:1220
#, c-format
msgid "Opening store %s"
msgstr "正在打开存储 %s"
-#: mail/mail-ops.c:1316
+#: mail/mail-ops.c:1298
#, c-format
msgid "Removing folder %s"
msgstr "正在删除文件夹“%s”"
-#: mail/mail-ops.c:1410
+#: mail/mail-ops.c:1392
#, c-format
msgid "Storing folder '%s'"
msgstr "正在存储文件夹“%s”"
-#: mail/mail-ops.c:1475
+#: mail/mail-ops.c:1457
#, c-format
msgid "Expunging and storing account '%s'"
msgstr ""
-#: mail/mail-ops.c:1476
+#: mail/mail-ops.c:1458
#, fuzzy, c-format
msgid "Storing account '%s'"
msgstr "正在存储文件夹“%s”"
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1513
msgid "Refreshing folder"
msgstr "正在刷新文件夹"
-#: mail/mail-ops.c:1567 mail/mail-ops.c:1618
+#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
msgid "Expunging folder"
msgstr "正在销毁文件夹"
-#: mail/mail-ops.c:1615
+#: mail/mail-ops.c:1597
#, c-format
msgid "Emptying trash in '%s'"
msgstr "正在清空“%s”中的已删除邮件"
-#: mail/mail-ops.c:1616
+#: mail/mail-ops.c:1598
msgid "Local Folders"
msgstr "本地文件夹"
-#: mail/mail-ops.c:1699
+#: mail/mail-ops.c:1681
#, c-format
msgid "Retrieving message %s"
msgstr "正在收取邮件 %s"
-#: mail/mail-ops.c:1771
+#: mail/mail-ops.c:1753
#, fuzzy, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "正在收取 %d 封邮件"
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:1839
#, fuzzy, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messsages"
msgstr[0] "正在保存 %d 封邮件"
-#: mail/mail-ops.c:1907
+#: mail/mail-ops.c:1889
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -15061,7 +15502,7 @@ msgstr ""
"无法创建输出文件:%s\n"
" %s"
-#: mail/mail-ops.c:1935
+#: mail/mail-ops.c:1917
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -15070,11 +15511,11 @@ msgstr ""
"在将邮件保存到 %s 时发生错误:\n"
" %s"
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:1988
msgid "Saving attachment"
msgstr "正在保存附件"
-#: mail/mail-ops.c:2023
+#: mail/mail-ops.c:2005
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -15083,17 +15524,17 @@ msgstr ""
"无法创建输出文件:%s:\n"
" %s"
-#: mail/mail-ops.c:2053
+#: mail/mail-ops.c:2035
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据:%s"
-#: mail/mail-ops.c:2201
+#: mail/mail-ops.c:2183
#, c-format
msgid "Disconnecting from %s"
msgstr "正在断开与 %s 的连接"
-#: mail/mail-ops.c:2201
+#: mail/mail-ops.c:2183
#, c-format
msgid "Reconnecting to %s"
msgstr "正在重新连接到 %s"
@@ -15122,94 +15563,71 @@ msgstr ""
msgid "Security Information"
msgstr "安全信息"
-#: mail/mail-send-recv.c:156
+#: mail/mail-send-recv.c:157
msgid "Cancelling..."
msgstr "正在取消..."
-#: mail/mail-send-recv.c:263
+#: mail/mail-send-recv.c:264
#, c-format
msgid "Server: %s, Type: %s"
msgstr "服务器:%s,类型:%s"
-#: mail/mail-send-recv.c:265
+#: mail/mail-send-recv.c:266
#, c-format
msgid "Path: %s, Type: %s"
msgstr "路径:%s,类型:%s"
-#: mail/mail-send-recv.c:267
+#: mail/mail-send-recv.c:268
#, c-format
msgid "Type: %s"
msgstr "类型:%s"
-#: mail/mail-send-recv.c:317
+#: mail/mail-send-recv.c:320
msgid "Send & Receive Mail"
msgstr "发送和接收邮件"
-#: mail/mail-send-recv.c:320
+#: mail/mail-send-recv.c:323
msgid "Cancel _All"
msgstr "全部取消(_A)"
-#: mail/mail-send-recv.c:401
+#: mail/mail-send-recv.c:412
msgid "Updating..."
msgstr "正在更新..."
-#: mail/mail-send-recv.c:401 mail/mail-send-recv.c:453
+#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466
msgid "Waiting..."
msgstr "正在等待..."
-#: mail/mail-session.c:236
+#: mail/mail-session.c:237
msgid "User canceled operation."
msgstr "用户己取消操作。"
-#: mail/mail-session.c:269
+#: mail/mail-session.c:270
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
msgid "Enter Password"
msgstr "输入密码"
-#: mail/mail-session.c:298
+#: mail/mail-session.c:295
msgid "_Remember this password"
msgstr "记住该密码(_R)"
-#: mail/mail-session.c:299
+#: mail/mail-session.c:296
msgid "_Remember this password for the remainder of this session"
msgstr "在本会话中记住该密码(_R)"
-#: mail/mail-signature-editor.c:86
-#, c-format
-msgid "Could not save signature file: %s"
-msgstr "无法保存签名文件:%s"
-
-#: mail/mail-signature-editor.c:233
-msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"该签名已经被改变,但还没有存储。\n"
-"\n"
-"您希望保存改动吗?"
-
-#: mail/mail-signature-editor.c:236
-msgid "_Discard changes"
-msgstr "丢弃更改(_D)"
-
-#: mail/mail-signature-editor.c:240
-msgid "Save signature"
-msgstr "保存签名"
-
-#: mail/mail-signature-editor.c:388
+#: mail/mail-signature-editor.c:371
msgid "Edit signature"
msgstr "编辑签名"
-#: mail/mail-signature-editor.c:428
+#: mail/mail-signature-editor.c:411
msgid "Enter a name for this signature."
msgstr "输入该签名的名字。"
-#: mail/mail-signature-editor.c:431
+#: mail/mail-signature-editor.c:414
msgid "Name:"
msgstr "名称:"
@@ -15249,97 +15667,79 @@ msgstr "设置虚拟文件夹:%s"
msgid "Updating vfolders for uri: %s"
msgstr "为 uri: %s 更新虚拟文件夹"
-#: mail/mail-vfolder.c:525
-#, c-format
-msgid ""
-"The following vFolder(s):\n"
-"%sUsed the removed folder:\n"
-" '%s'\n"
-"And have been updated."
-msgstr ""
-"下列虚拟文件夹:\n"
-"%s使用了已删除的文件夹:\n"
-" “%s”\n"
-"已经被更新。"
-
-#: mail/mail-vfolder.c:926
+#: mail/mail-vfolder.c:922
msgid "vFolders"
msgstr "虚拟文件夹"
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:961
msgid "Edit VFolder"
msgstr "编辑虚拟文件夹"
-#: mail/mail-vfolder.c:985
-#, c-format
-msgid "Trying to edit a vfolder '%s' which doesn't exist."
-msgstr "试图编辑并不存在的虚拟文件夹“%s”。"
-
-#: mail/mail-vfolder.c:1057
+#: mail/mail-vfolder.c:1045
msgid "New VFolder"
msgstr "新建虚拟文件夹"
-#: mail/message-list.c:933
+#: mail/message-list.c:911
msgid "Unseen"
msgstr "不可见"
-#: mail/message-list.c:934
+#: mail/message-list.c:912
msgid "Seen"
msgstr "可见"
-#: mail/message-list.c:935
+#: mail/message-list.c:913
msgid "Answered"
msgstr "已答复"
-#: mail/message-list.c:936
+#: mail/message-list.c:914
msgid "Multiple Unseen Messages"
msgstr "多封不可见邮件"
-#: mail/message-list.c:937
+#: mail/message-list.c:915
msgid "Multiple Messages"
msgstr "多封邮件"
-#: mail/message-list.c:941
+#: mail/message-list.c:919
msgid "Lowest"
msgstr "最低"
-#: mail/message-list.c:942
+#: mail/message-list.c:920
msgid "Lower"
msgstr "较低"
-#: mail/message-list.c:946
+#: mail/message-list.c:924
msgid "Higher"
msgstr "较高"
-#: mail/message-list.c:947
+#: mail/message-list.c:925
msgid "Highest"
msgstr "最高"
-#: mail/message-list.c:1268
+#: mail/message-list.c:1244
msgid "?"
msgstr "?"
-#: mail/message-list.c:1275
+#: mail/message-list.c:1251
msgid "Today %l:%M %p"
msgstr "今天 %H:%M"
-#: mail/message-list.c:1284
+#: mail/message-list.c:1260
msgid "Yesterday %l:%M %p"
msgstr "昨天 %H:%M"
-#: mail/message-list.c:1296
+#: mail/message-list.c:1272
msgid "%a %l:%M %p"
msgstr "%A %H:%M"
-#: mail/message-list.c:1304
+#: mail/message-list.c:1280
msgid "%b %d %l:%M %p"
msgstr "%m月%d日 %H:%M"
-#: mail/message-list.c:1306
+#: mail/message-list.c:1282
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
-#: mail/message-list.c:3103
+#: mail/message-list.c:3109
msgid "Generating message list"
msgstr "正在生成邮件列表"
@@ -15407,7 +15807,7 @@ msgstr "全部回复"
msgid "Review"
msgstr "回顾"
-#: mail/message-tag-followup.c:281 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
msgid "Flag to Follow Up"
msgstr "跟随的标志"
@@ -15579,11 +15979,11 @@ msgstr "制作团队"
msgid "(Untitled)"
msgstr "(无标题)"
-#: shell/e-shell-importer.c:145
+#: shell/e-shell-importer.c:146
msgid "Choose the type of importer to run:"
msgstr "选择要运行的导入器类型:"
-#: shell/e-shell-importer.c:148
+#: shell/e-shell-importer.c:149
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list.\n"
@@ -15595,16 +15995,16 @@ msgstr ""
"\n"
"如果您不清楚,可以选择“自动”,Evolution 将试图为您确定类型。"
-#: shell/e-shell-importer.c:154
+#: shell/e-shell-importer.c:155
#, fuzzy
msgid "Choose the destination for this import"
msgstr "取消该项的会议"
-#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:738
+#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:748
msgid "Please select the information that you would like to import:"
msgstr "请选择您希望导入的信息:"
-#: shell/e-shell-importer.c:160
+#: shell/e-shell-importer.c:161
msgid ""
"Evolution checked for settings to import from the following\n"
"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -15615,7 +16015,7 @@ msgstr ""
"iCalendar。并未发现可导入的设置。如果您想要再试一次,请单击\n"
"“后退”按钮。\n"
-#: shell/e-shell-importer.c:228 shell/e-shell-importer.c:259
+#: shell/e-shell-importer.c:229 shell/e-shell-importer.c:260
#, c-format
msgid ""
"Importing %s\n"
@@ -15624,30 +16024,30 @@ msgstr ""
"正在导入 %s\n"
"正在导入项目 %d。"
-#: shell/e-shell-importer.c:332
+#: shell/e-shell-importer.c:333
msgid "Select importer"
msgstr "选择导入器"
-#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
#, c-format
msgid "File %s does not exist"
msgstr "文件 %s 不存在"
-#: shell/e-shell-importer.c:457
+#: shell/e-shell-importer.c:459
msgid "Importing"
msgstr "正在导入"
-#: shell/e-shell-importer.c:465
+#: shell/e-shell-importer.c:467
#, fuzzy, c-format
msgid "Importing %s.\n"
msgstr "正在导入"
-#: shell/e-shell-importer.c:475 shell/e-shell-importer.c:476
+#: shell/e-shell-importer.c:477 shell/e-shell-importer.c:478
#, c-format
msgid "Error loading %s"
msgstr "装入 %s 错误"
-#: shell/e-shell-importer.c:492
+#: shell/e-shell-importer.c:495
#, c-format
msgid ""
"Importing %s\n"
@@ -15656,31 +16056,31 @@ msgstr ""
"正在导入 %s\n"
"正在导入项目 1。"
-#: shell/e-shell-importer.c:546
+#: shell/e-shell-importer.c:549
msgid "Automatic"
msgstr "自动"
-#: shell/e-shell-importer.c:595
+#: shell/e-shell-importer.c:598
msgid "_Filename:"
msgstr "文件名(_F):"
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:603
msgid "Select a file"
msgstr "选择一个文件"
-#: shell/e-shell-importer.c:610
+#: shell/e-shell-importer.c:613
msgid "File _type:"
msgstr "文件类型(_T):"
-#: shell/e-shell-importer.c:649
+#: shell/e-shell-importer.c:652
msgid "Import data and settings from _older programs"
msgstr "从老版程序中导入数据和设置(_O)"
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:655
msgid "Import a _single file"
msgstr "导入单个文件(_S)"
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:566
+#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
msgid ""
"Please wait...\n"
"Scanning for existing setups"
@@ -15688,26 +16088,26 @@ msgstr ""
"请稍候...\n"
"正在扫描现有设置"
-#: shell/e-shell-importer.c:724
+#: shell/e-shell-importer.c:727
msgid "Starting Intelligent Importers"
msgstr "启动智能导入器"
-#: shell/e-shell-importer.c:850 shell/e-shell-startup-wizard.c:693
+#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
#, c-format
msgid "From %s:"
msgstr "从 %s:"
-#: shell/e-shell-importer.c:1037
+#: shell/e-shell-importer.c:1044
#, fuzzy, c-format
msgid "No importer available for file %s"
msgstr "协议“%s”没有可用的提供者"
-#: shell/e-shell-importer.c:1049
+#: shell/e-shell-importer.c:1056
#, fuzzy
msgid "Unable to execute importer"
msgstr "执行 gpg 失败。"
-#: shell/e-shell-importer.c:1159
+#: shell/e-shell-importer.c:1169
msgid "_Import"
msgstr "导入(_I)"
@@ -15715,15 +16115,15 @@ msgstr "导入(_I)"
msgid "Closing connections..."
msgstr "正在关闭连接..."
-#: shell/e-shell-settings-dialog.c:327
+#: shell/e-shell-settings-dialog.c:323
msgid "Evolution Settings"
msgstr "Evolution 设置"
-#: shell/e-shell-startup-wizard.c:570
+#: shell/e-shell-startup-wizard.c:575
msgid "Starting import"
msgstr "开始导入"
-#: shell/e-shell-startup-wizard.c:785
+#: shell/e-shell-startup-wizard.c:795
msgid ""
"If you quit the Evolution Setup Assistant now, all of the information that "
"you have entered will be forgotten. You will need to run this assistant "
@@ -15785,16 +16185,16 @@ msgstr "离线工作(_W)"
msgid "Work Offline"
msgstr "离线工作"
-#: shell/e-shell-window.c:327
+#: shell/e-shell-window.c:338
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr "Ximian Evolution 目前在线。点击该按钮则离线工作。"
-#: shell/e-shell-window.c:334
+#: shell/e-shell-window.c:345
msgid "Ximian Evolution is in the process of going offline."
msgstr "Ximian Evolution 正在离线过程中。"
-#: shell/e-shell-window.c:340
+#: shell/e-shell-window.c:351
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr "Ximian Evolution 目前离线。点击该按钮则在线工作。"
@@ -15827,11 +16227,11 @@ msgstr "通用错误"
msgid "Checkbox"
msgstr "复选框"
-#: shell/e-user-creatable-items-handler.c:683
+#: shell/e-user-creatable-items-handler.c:691
msgid "New"
msgstr "新建"
-#: shell/evolution-shell-component-utils.c:124
+#: shell/evolution-shell-component-utils.c:115
#, c-format
msgid ""
"%s\n"
@@ -15842,7 +16242,7 @@ msgstr ""
"\n"
"未知的错误。"
-#: shell/evolution-shell-component-utils.c:127
+#: shell/evolution-shell-component-utils.c:118
#, c-format
msgid ""
"%s\n"
@@ -15855,7 +16255,7 @@ msgstr ""
"来自成员系统的错误为:\n"
"%s"
-#: shell/evolution-shell-component-utils.c:134
+#: shell/evolution-shell-component-utils.c:125
#, c-format
msgid ""
"%s\n"
@@ -15996,7 +16396,7 @@ msgid "Evolution can import data from the following files:"
msgstr "Evolution 可以从下列文件中导入数据:"
#. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:230
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -16028,7 +16428,7 @@ msgstr ""
"\n"
"我们希望您尽情享受我们努力工作的成果,我们也热切盼望着您的意见!\n"
-#: shell/main.c:255
+#: shell/main.c:254
msgid ""
"Thanks\n"
"The Ximian Evolution Team\n"
@@ -16036,41 +16436,41 @@ msgstr ""
"感谢\n"
"Ximian Evolution 团队\n"
-#: shell/main.c:262
+#: shell/main.c:261
msgid "Don't tell me again"
msgstr "不要再问我"
-#: shell/main.c:392
+#: shell/main.c:391
#, fuzzy
msgid "Cannot register the Ximian Evolution shell."
msgstr "无法访问 Ximian Evolution shell。"
-#: shell/main.c:401
+#: shell/main.c:400
#, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "无法初始化 Ximian Evolution shell:%s"
-#: shell/main.c:498
+#: shell/main.c:497
msgid "Start Evolution activating the specified component"
msgstr ""
-#: shell/main.c:500
+#: shell/main.c:499
msgid "Start in offline mode"
msgstr "以离线模式启动"
-#: shell/main.c:502
+#: shell/main.c:501
msgid "Start in online mode"
msgstr "以在线模式启动"
-#: shell/main.c:505
+#: shell/main.c:504
msgid "Forcibly shut down all evolution components"
msgstr "强制关闭所有 Evolution 组件"
-#: shell/main.c:509
+#: shell/main.c:508
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr ""
-#: shell/main.c:512
+#: shell/main.c:511
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
@@ -16902,13 +17302,6 @@ msgstr "把此项保存到磁盘"
msgid "_File"
msgstr "文件(_F)"
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "保存(_S)"
-
#: ui/evolution-composer-entries.xml.h:1
msgid "Copy selected text to the clipboard"
msgstr "将选中文字复制到剪贴板"
@@ -16946,6 +17339,13 @@ msgstr "保存联系人并关闭对话框"
msgid "Send _Message to Contact..."
msgstr "给联系人发邮件(_M)..."
+#: ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "保存(_S)"
+
#: ui/evolution-contact-list-editor.xml.h:4
msgid "Delete this list"
msgstr "删除该列表"
@@ -18049,20 +18449,26 @@ msgstr "设置状态"
msgid "_Tasks"
msgstr "任务(_T)"
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
msgid "UTC"
msgstr "UTC"
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "Select a Time Zone"
-msgstr "选择一个时区"
+#, fuzzy
+msgid "<b>Time Zones</b>"
+msgstr "时区"
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr "时区"
+#, fuzzy
+msgid "<b>_Selection</b>"
+msgstr "选择(_S):"
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid "Select a Time Zone"
+msgstr "选择一个时区"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
msgid ""
"Use the left mouse button to zoom in on an area of the map and select a time "
"zone.\n"
@@ -18071,10 +18477,6 @@ msgstr ""
"用鼠标左键放大地图的某个区域并选择时区。\n"
"用鼠标右键缩小。"
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-msgid "_Selection:"
-msgstr "选择(_S):"
-
#: widgets/menus/gal-view-menus.c:292
msgid "_Current View"
msgstr "当前视图(_C)"
@@ -18116,87 +18518,87 @@ msgstr "时间必须采用格式:%s"
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "百分比值必需在 0 到 100 之间,含 0 和 100"
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
msgid "Baltic"
msgstr "波罗的语"
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
msgid "Central European"
msgstr "中欧"
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
msgid "Chinese"
msgstr "中文"
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
msgid "Cyrillic"
msgstr "西里尔语"
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
msgid "Greek"
msgstr "希腊语"
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
msgid "Hebrew"
msgstr "希伯来语"
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
msgid "Japanese"
msgstr "日文"
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
msgid "Korean"
msgstr "韩语"
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
msgid "Turkish"
msgstr "土耳其语"
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
msgid "Unicode"
msgstr "Unicode"
-#: widgets/misc/e-charset-picker.c:72
+#: widgets/misc/e-charset-picker.c:73
msgid "Western European"
msgstr "西欧"
-#: widgets/misc/e-charset-picker.c:73
+#: widgets/misc/e-charset-picker.c:74
#, fuzzy
msgid "Western European, New"
msgstr "西欧"
-#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:93
msgid "Traditional"
msgstr "繁体"
-#: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
-#: widgets/misc/e-charset-picker.c:95 widgets/misc/e-charset-picker.c:96
+#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
msgid "Simplified"
msgstr "简体"
-#: widgets/misc/e-charset-picker.c:99
+#: widgets/misc/e-charset-picker.c:100
msgid "Ukrainian"
msgstr "乌克兰语"
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:103
msgid "Visual"
msgstr "可视"
-#: widgets/misc/e-charset-picker.c:170
+#: widgets/misc/e-charset-picker.c:171
#, c-format
msgid "Unknown character set: %s"
msgstr "未知的字符集:%s"
-#: widgets/misc/e-charset-picker.c:215 widgets/misc/e-charset-picker.c:444
+#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
msgid "Character Encoding"
msgstr "字符编码"
-#: widgets/misc/e-charset-picker.c:224
+#: widgets/misc/e-charset-picker.c:231
msgid "Enter the character set to use"
msgstr "输入要使用的字符集"
-#: widgets/misc/e-charset-picker.c:320
+#: widgets/misc/e-charset-picker.c:338
msgid "Other..."
msgstr "其它..."
@@ -18263,17 +18665,17 @@ msgstr "Indian Springs"
msgid "Spacing around expander arrow"
msgstr ""
-#: widgets/misc/e-filter-bar.c:191
+#: widgets/misc/e-filter-bar.c:195
#, fuzzy
msgid "_Searches"
msgstr "搜索(_S)"
-#: widgets/misc/e-filter-bar.c:193
+#: widgets/misc/e-filter-bar.c:197
msgid "Search Editor"
msgstr "搜索编辑器"
#. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:214
+#: widgets/misc/e-filter-bar.c:220
msgid "Save Search"
msgstr "保存搜索"
@@ -18333,6 +18735,455 @@ msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
#, fuzzy
+#~ msgid ""
+#~ "Address book '%s' will be removed. Are you sure you want to continue?"
+#~ msgstr "即将删除地址簿“%s”。您确定想要继续吗?"
+
+#, fuzzy
+#~ msgid "New Address Book"
+#~ msgstr "新建地址簿"
+
+#, fuzzy
+#~ msgid "UID of the contacts source that the view will display"
+#~ msgstr "日历将显示的 URI"
+
+#, fuzzy
+#~ msgid "The URI that the address book will display"
+#~ msgstr "日历将显示的 URI"
+
+#, fuzzy
+#~ msgid "Address Book Creation Assistant"
+#~ msgstr "地址簿创建助手"
+
+#, fuzzy
+#~ msgid ""
+#~ "Congratulations, you are\n"
+#~ "\t finished setting up this address book.\n"
+#~ "\n"
+#~ "Please click the \"Apply\" button to save the settings you have entered "
+#~ "here."
+#~ msgstr ""
+#~ "恭喜,您已经设置完了此 LDAP 服务器。您现在可以访问此目录了。\n"
+#~ "\n"
+#~ "请单击“完成”按钮保存您在此输入的设置。"
+
+#~ msgid "Finished"
+#~ msgstr "已完成"
+
+#~ msgid "Group:"
+#~ msgstr "组:"
+
+#~ msgid ""
+#~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
+#~ "(Secure Sockets Layer)\n"
+#~ "and TLS (Transport Layer Security) protocols are used by some servers to "
+#~ "cryptographically protect\n"
+#~ "your connection. Ask your system administrator if your LDAP server uses "
+#~ "these protocols."
+#~ msgstr ""
+#~ "现在,您应该指定如何连接到 LDAP 服务器。大多数服务器都会采用SSL(安全套接\n"
+#~ "字层)或TLS(传输层安全)协议来加密保护您的连接。请询问您的系统管理员关于您\n"
+#~ "的 LDAP 服务器使用何种协议的信息。"
+
+#~ msgid ""
+#~ "Selecting this option will let you change Evolution's default settings "
+#~ "for LDAP\n"
+#~ "searches, and for creating and editing contacts. "
+#~ msgstr ""
+#~ "选择此选项可让您更改 Evolution 对 LDAP 搜索及创建和编辑联系人所用的默认设"
+#~ "置。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Specifying a\n"
+#~ "\t\t\t display name and group is the first step in setting\n"
+#~ "\t\t\t up an address book."
+#~ msgstr "指定显示名称是配置 LDAP 服务器所需的最后一个步骤。"
+
+#~ msgid "Step 3: Connecting to Server"
+#~ msgstr "第三步:连接服务器"
+
+#~ msgid "Step 4: Searching the Directory"
+#~ msgstr "第四步:搜索目录"
+
+#~ msgid ""
+#~ "The options on this page control how many entries should be included in "
+#~ "your\n"
+#~ "searches, and how long a search should take. Ask your system "
+#~ "administrator if you\n"
+#~ "need to change these options."
+#~ msgstr ""
+#~ "本页中的选项控制了在您的搜索中应当包含多少项,以及搜索将花费的时间。\n"
+#~ "如果您需要更改这些选项,请询问您的系统管理员。"
+
+#, fuzzy
+#~ msgid ""
+#~ "This assistant will help you\n"
+#~ "\t create a new address book. \n"
+#~ "\n"
+#~ "Depending on the type of address book you create, additional\n"
+#~ "parameters may be required. Please contact your system\n"
+#~ "administrator if you need help finding this information."
+#~ msgstr ""
+#~ "此助手将帮助您使用 LDAP(轻量级目录访问协议)服务器访问在线目录服务。\n"
+#~ "\n"
+#~ "添加新的 LDAP 服务器需要关于服务器的一些专业化信息。如果您对这些信\n"
+#~ "息不太了解的话,请询问您的系统管理员。"
+
+#, fuzzy
+#~ msgid ""
+#~ "This is the name that will appear in your Evolution folder list. It is "
+#~ "for display purposes only. "
+#~ msgstr ""
+#~ "这是此服务器在 Evolution 文件夹列表中显示的名称。\n"
+#~ "它只用于显示。"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have decided to configure an LDAP server. The first step in doing "
+#~ "this is to provide its name and your\n"
+#~ "log in information. Please ask your system administrator if you are "
+#~ "unsure of this information."
+#~ msgstr ""
+#~ "配置 LDAP 服务器的第一个步骤是提供其名称,以及您的登录信息。\n"
+#~ "如果您对这些信息不太了解,请询问您的系统管理员。"
+
+#~ msgid " B_usiness:"
+#~ msgstr "商务(_U):"
+
+#~ msgid "A_ddress..."
+#~ msgstr "地址(_D)..."
+
+#~ msgid "A_ssistant's name:"
+#~ msgstr "助手姓名(_S):"
+
+#~ msgid "Addressbook:"
+#~ msgstr "地址簿:"
+
+#~ msgid "Blog address:"
+#~ msgstr "Blog 地址:"
+
+#~ msgid "Business fa_x:"
+#~ msgstr "商务传真(_X):"
+
+#~ msgid "Collaboration"
+#~ msgstr "合作"
+
+#~ msgid "Enter the person's instant messenger accounts here."
+#~ msgstr "在此输入个人的即时通讯账户。"
+
+#~ msgid "File a_s:"
+#~ msgstr "存档为(_S):"
+
+#, fuzzy
+#~ msgid ""
+#~ "If this person has the ability to participate in a video conference, "
+#~ "enter their address here."
+#~ msgstr ""
+#~ "如果此人把忙闲信息或其它日历信息发布到互联网上,就在这里输入发布地址。"
+
+#~ msgid ""
+#~ "If this person publishes free/busy or other calendar information on the "
+#~ "Internet, enter the address\n"
+#~ "of that information here."
+#~ msgstr ""
+#~ "如果此人把忙闲信息或其它日历信息发布到互联网上,就在这里输入发布地址。"
+
+#~ msgid "New phone type"
+#~ msgstr "新电话类型"
+
+#~ msgid "Organi_zation:"
+#~ msgstr "组织(_Z):"
+
+#~ msgid "Primary _email:"
+#~ msgstr "主电子邮件(_E):"
+
+#~ msgid "S_pouse:"
+#~ msgstr "配偶(_P):"
+
+#~ msgid "_Add"
+#~ msgstr "添加(_A)"
+
+#~ msgid "_Business:"
+#~ msgstr "商务(_B):"
+
+#~ msgid "_Categories..."
+#~ msgstr "类别(_C)..."
+
+#~ msgid "_Home:"
+#~ msgstr "家庭(_H):"
+
+#~ msgid "_Manager's name:"
+#~ msgstr "经理姓名(_M):"
+
+#~ msgid "_Mobile:"
+#~ msgstr "移动电话(_M):"
+
+#~ msgid "_Office:"
+#~ msgstr "办公室(_O):"
+
+#~ msgid "_Public Calendar URL:"
+#~ msgstr "公开日历 URL(_P):"
+
+#~ msgid "_This is the mailing address"
+#~ msgstr "这是邮政地址(_T)"
+
+#~ msgid "_Video Conferencing URL:"
+#~ msgstr "视频会议 URL(_V):"
+
+#~ msgid "_Web page address:"
+#~ msgstr "网页地址(_W):"
+
+#~ msgid "Account Name"
+#~ msgstr "账户名"
+
+#~ msgid "Save Contact as VCard"
+#~ msgstr "将联系人保存为 VCard"
+
+#~ msgid "Business"
+#~ msgstr "商务"
+
+#~ msgid "Calendar Creation Assistant"
+#~ msgstr "日历创建助手"
+
+#, fuzzy
+#~ msgid ""
+#~ "Congratulations, you are finished setting up this calendar.\n"
+#~ "\n"
+#~ "Please click the \"Apply\" button to save the settings you have entered "
+#~ "here."
+#~ msgstr ""
+#~ "恭喜,您已经设置完了此 LDAP 服务器。您现在可以访问此目录了。\n"
+#~ "\n"
+#~ "请单击“完成”按钮保存您在此输入的设置。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Congratulations, you are finished setting up this task list.\n"
+#~ "\n"
+#~ "Please click the \"Apply\" button to save the settings you have entered "
+#~ "here."
+#~ msgstr ""
+#~ "恭喜,您已经设置完了此 LDAP 服务器。您现在可以访问此目录了。\n"
+#~ "\n"
+#~ "请单击“完成”按钮保存您在此输入的设置。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Specifying a display name and group is the first step in setting up a "
+#~ "calendar."
+#~ msgstr "指定显示名称是配置 LDAP 服务器所需的最后一个步骤。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Specifying a display name and group is the first step in setting up a "
+#~ "task list."
+#~ msgstr "指定显示名称是配置 LDAP 服务器所需的最后一个步骤。"
+
+#~ msgid "Task List Creation Assistant"
+#~ msgstr "任务列表创建助手"
+
+#, fuzzy
+#~ msgid ""
+#~ "This assistant will help you create a new calendar. \n"
+#~ "\n"
+#~ "Depending on the type of calendar you create, additional\n"
+#~ "parameters may be required. Please contact your system\n"
+#~ "administrator if you need help finding this information."
+#~ msgstr ""
+#~ "此助手将帮助您使用 LDAP(轻量级目录访问协议)服务器访问在线目录服务。\n"
+#~ "\n"
+#~ "添加新的 LDAP 服务器需要关于服务器的一些专业化信息。如果您对这些信\n"
+#~ "息不太了解的话,请询问您的系统管理员。"
+
+#, fuzzy
+#~ msgid ""
+#~ "This assistant will help you create a new task list.\n"
+#~ "\n"
+#~ "Depending on the type of task list you create, additional\n"
+#~ "parameters may be required. Please contact your system\n"
+#~ "administrator if you need help finding this information."
+#~ msgstr ""
+#~ "此助手将帮助您使用 LDAP(轻量级目录访问协议)服务器访问在线目录服务。\n"
+#~ "\n"
+#~ "添加新的 LDAP 服务器需要关于服务器的一些专业化信息。如果您对这些信\n"
+#~ "息不太了解的话,请询问您的系统管理员。"
+
+#~ msgid "Due date is before start date!"
+#~ msgstr "到期日期先于开始日期!"
+
+#~ msgid "Start Date:"
+#~ msgstr "开始日期:"
+
+#~ msgid "Due Date:"
+#~ msgstr "到期日期:"
+
+#~ msgid "Priority:"
+#~ msgstr "优先级:"
+
+#~ msgid ""
+#~ "Error while reading file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "读入文件 %s 时发声错误:\n"
+#~ "%s"
+
+#~ msgid "Error saving file: %s"
+#~ msgstr "保存文件错误:%s"
+
+#~ msgid "Error loading file: %s"
+#~ msgstr "读入文件错误:%s"
+
+#~ msgid "Error accessing file: %s"
+#~ msgstr "访问文件错误:%s"
+
+#~ msgid ""
+#~ "Unable to seek on file: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法搜索文件:%s\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Unable to truncate file: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法截断文件:%s\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Unable to copy file descriptor: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法复制文件描述符:%s\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error autosaving message: %s\n"
+#~ " %s"
+#~ msgstr ""
+#~ "自动存储邮件错误:%s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Ximian Evolution has found unsaved messages from a previous session.\n"
+#~ "Would you like to try to recover them?"
+#~ msgstr ""
+#~ "Ximian Evolution 发现上次会话含有未保存的文件。\n"
+#~ "您是否希望恢复它们?"
+
+#~ msgid ""
+#~ "The message \"%s\" has not been sent.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "邮件“%s”尚未发送。\n"
+#~ "\n"
+#~ "您是否希望保存修改?"
+
+#~ msgid "Rule name '%s' is not unique, choose another."
+#~ msgstr "规则名“%s”不唯一,请另外选择一个名称。"
+
+#~ msgid "You need to to specify at least one folder as a source."
+#~ msgstr "您至少需要把一个文件夹指定为源。"
+
+#~ msgid "You must specify a valid script name."
+#~ msgstr "您必须指定有效的脚本名。"
+
+#~ msgid ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+#~ msgstr ""
+#~ "该消息没有主题。\n"
+#~ "确实要发送?"
+
+#~ msgid ""
+#~ "Since the contact list you are sending to is configured to hide the "
+#~ "list's addresses, this message will contain only Bcc recipients."
+#~ msgstr ""
+#~ "由于您正在发送的邮件的接收人列表被配置为隐藏列表的地址,该消息将只含有密件"
+#~ "抄送收件人。"
+
+#~ msgid "This message contains only Bcc recipients."
+#~ msgstr "该邮件只含有密件抄送收件人。"
+
+#~ msgid ""
+#~ "It is possible that the mail server may reveal the recipients by adding "
+#~ "an Apparently-To header.\n"
+#~ "Send anyway?"
+#~ msgstr ""
+#~ "邮件服务器可能会以添加 Apparent-To 头而使收件人可见。\n"
+#~ "仍然发送?"
+
+#~ msgid "You must specify recipients in order to send this message."
+#~ msgstr "您必须指定收件人以便发送该消息。"
+
+#, fuzzy
+#~ msgid "Cannot move folder `%s': illegal operation"
+#~ msgstr "无法重命名文件夹:%s:无效操作"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "Could not delete folder: %s"
+#~ msgstr "无法删除文件夹:%s"
+
+#~ msgid ""
+#~ "`%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "%s 已经存在。\n"
+#~ "您打算覆盖它吗?"
+
+#, fuzzy
+#~ msgid "Error: '%s' exists and is not a regular file"
+#~ msgstr "错误:“%s”不存在或者不是普通文件"
+
+#, fuzzy
+#~ msgid ""
+#~ "This operation will permanently remove all deleted messages in the folder "
+#~ "`%s'. If you continue, you will not be able to recover these messages.\n"
+#~ "\n"
+#~ "Really erase these messages?"
+#~ msgstr ""
+#~ "该操作将永久删除所有标记为完成的邮件。\n"
+#~ "如果您继续,您将无法恢复这些邮件。\n"
+#~ "\n"
+#~ "确实删除这些邮件吗?"
+
+#, fuzzy
+#~ msgid ""
+#~ "This operation will permanently remove all deleted messages in all "
+#~ "folders. If you continue, you will not be able to recover these "
+#~ "messages.\n"
+#~ "\n"
+#~ "Really erase these messages?"
+#~ msgstr ""
+#~ "该操作将永久删除所有标记为完成的邮件。\n"
+#~ "如果您继续,您将无法恢复这些邮件。\n"
+#~ "\n"
+#~ "确实删除这些邮件吗?"
+
+#~ msgid "The following filter rule(s):\n"
+#~ msgstr "下列过滤器规则:\n"
+
+#~ msgid ""
+#~ "Used the removed folder:\n"
+#~ " '%s'\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "使用了已删除的文件夹:\n"
+#~ " “%s”\n"
+#~ "已经被更新。"
+
+#~ msgid "Save signature"
+#~ msgstr "保存签名"
+
+#~ msgid "Trying to edit a vfolder '%s' which doesn't exist."
+#~ msgstr "试图编辑并不存在的虚拟文件夹“%s”。"
+
+#, fuzzy
#~ msgid "New Addressbook Book"
#~ msgstr "新建地址簿"
@@ -18511,9 +19362,6 @@ msgstr "%s (%d%% 完成)"
#~ msgid "LDAP Server Name:"
#~ msgstr "LDAP 服务器名:"
-#~ msgid "Search base:"
-#~ msgstr "搜索起点:"
-
#~ msgid "STARTTLS request timed out: %s"
#~ msgstr "STARTTLS 请求超时:%s"
@@ -18604,9 +19452,6 @@ msgstr "%s (%d%% 完成)"
#~ msgid "[script]"
#~ msgstr "[脚本]"
-#~ msgid "Add script signature"
-#~ msgstr "添加脚本签名"
-
#~ msgid "Current store format:"
#~ msgstr "当前存储格式:"
@@ -18640,9 +19485,6 @@ msgstr "%s (%d%% 完成)"
#~ msgid "Account Information"
#~ msgstr "账户信息"
-#~ msgid "Authentication"
-#~ msgstr "身份验证"
-
#~ msgid "Composing Messages"
#~ msgstr "撰写邮件"
@@ -18670,9 +19512,6 @@ msgstr "%s (%d%% 完成)"
#~ msgid "Message Fonts"
#~ msgstr "邮件字体"
-#~ msgid "Optional Information"
-#~ msgstr "可选的信息"
-
#~ msgid "Printed Fonts"
#~ msgstr "打印用字体"
@@ -18801,12 +19640,6 @@ msgstr "%s (%d%% 完成)"
#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
#~ msgstr "不检查 IMAP 账户收到的邮件(_N)"
-#~ msgid "Cannot copy folder: %s"
-#~ msgstr "无法复制文件夹:%s"
-
-#~ msgid "Cannot move folder: %s"
-#~ msgstr "无法移动文件夹:%s"
-
#~ msgid "Cannot move a folder over itself."
#~ msgstr "无法把文件夹移动到它本身。"
@@ -18828,13 +19661,6 @@ msgstr "%s (%d%% 完成)"
#~ msgid "Move Folder"
#~ msgstr "移动文件夹"
-#~ msgid ""
-#~ "Cannot delete folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "无法删除文件夹:\n"
-#~ "%s"
-
#~ msgid "Really delete folder \"%s\"?"
#~ msgstr "您真的要删除文件夹“%s”吗?"
@@ -18882,9 +19708,6 @@ msgstr "%s (%d%% 完成)"
#~ msgid "Show the shortcuts as large icons"
#~ msgstr "用大图标显示快捷方式"
-#~ msgid "_Add Group..."
-#~ msgstr "添加组(_A)..."
-
#~ msgid "_Remove this Group..."
#~ msgstr "删除该组(_R)..."
@@ -18933,9 +19756,6 @@ msgstr "%s (%d%% 完成)"
#~ msgid "Remove this shortcut from the shortcut bar"
#~ msgstr "从快捷方式栏上删除此快捷方式"
-#~ msgid "Error saving shortcuts."
-#~ msgstr "保存快捷方式错误。"
-
#~ msgid "Shortcuts"
#~ msgstr "快捷方式"