aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2004-01-13 12:30:14 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-01-13 12:30:14 +0800
commit31d60040afd06ffe62e8d761cd61b4b3720454e0 (patch)
treef460b39c534dc04e045ab6583f6239624fa1f6ae /po/zh_CN.po
parent3518f77cb294a8cbde366cc923e9ab72d752bc64 (diff)
downloadgsoc2013-evolution-31d60040afd06ffe62e8d761cd61b4b3720454e0.tar.gz
gsoc2013-evolution-31d60040afd06ffe62e8d761cd61b4b3720454e0.tar.zst
gsoc2013-evolution-31d60040afd06ffe62e8d761cd61b4b3720454e0.zip
bump version and requirements
2004-01-12 JP Rosevear <jpr@ximian.com> * configure.in: bump version and requirements svn path=/trunk/; revision=24193
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po3439
1 files changed, 2013 insertions, 1426 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f4805d1df6..5c964edc18 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: 2003-12-29 12:04-0500\n"
+"POT-Creation-Date: 2004-01-12 22:53-0500\n"
"PO-Revision-Date: 2003-09-07 11:09+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -53,6 +53,7 @@ msgstr "在这里配置您的电子邮件账号"
#. name = e_book_get_name (book);
#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: calendar/gui/calendar-component.c:583
#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
msgid "Contacts"
msgstr "联系人"
@@ -94,19 +95,20 @@ msgstr "Evolution 文件夹配置控件"
msgid "Manager your S/Mime certificates here"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:211
+#: addressbook/gui/component/addressbook-component.c:202
+#, c-format
+msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:258
#: addressbook/gui/component/ldap-config.glade.h:28
#, fuzzy
msgid "New Addressbook"
msgstr "地址簿"
-#: addressbook/gui/component/addressbook-component.c:212
-msgid "Properties..."
-msgstr "属性..."
-
-#: addressbook/gui/component/addressbook-component.c:213
+#: addressbook/gui/component/addressbook-component.c:259
#: addressbook/gui/widgets/e-addressbook-view.c:1017
-#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:418
+#: calendar/gui/calendar-component.c:410 calendar/gui/tasks-component.c:399
#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
#: ui/evolution-contact-editor.xml.h:3
@@ -114,66 +116,37 @@ msgstr "属性..."
msgid "Delete"
msgstr "删除"
-#: addressbook/gui/component/addressbook-component.c:214
-#: calendar/gui/calendar-component.c:435 calendar/gui/tasks-component.c:416
-#, fuzzy
-msgid "Rename"
-msgstr "重命名(_R)"
+#: addressbook/gui/component/addressbook-component.c:260
+#: calendar/gui/calendar-component.c:411 calendar/gui/tasks-component.c:401
+msgid "Properties..."
+msgstr "属性..."
-#: addressbook/gui/component/addressbook-component.c:285
+#: addressbook/gui/component/addressbook-component.c:331
#, fuzzy
msgid "New Contact"
msgstr "新联系人:"
-#: addressbook/gui/component/addressbook-component.c:286
+#: addressbook/gui/component/addressbook-component.c:332
msgid "_Contact"
msgstr "联系人(_C)"
-#: addressbook/gui/component/addressbook-component.c:287
+#: addressbook/gui/component/addressbook-component.c:333
msgid "Create a new contact"
msgstr "创建一个新联系人"
-#: addressbook/gui/component/addressbook-component.c:292
+#: addressbook/gui/component/addressbook-component.c:338
msgid "New Contact List"
msgstr "新建联系人列表"
-#: addressbook/gui/component/addressbook-component.c:293
+#: addressbook/gui/component/addressbook-component.c:339
#, fuzzy
msgid "Contact _List"
msgstr "新建联系人列表"
-#: addressbook/gui/component/addressbook-component.c:294
+#: addressbook/gui/component/addressbook-component.c:340
msgid "Create a new contact list"
msgstr "创建一个新的联系人列表"
-#: addressbook/gui/component/addressbook-component.c:443
-#: calendar/gui/calendar-component.c:831 calendar/gui/tasks-component.c:772
-msgid "On This Computer"
-msgstr ""
-
-#. orange
-#: addressbook/gui/component/addressbook-component.c:453
-#: calendar/gui/calendar-component.c:839 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:780
-#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:88
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "个人"
-
-#. red
-#: addressbook/gui/component/addressbook-component.c:460
-#: calendar/gui/calendar-component.c:846 filter/filter-label.c:122
-#: mail/mail-config.c:64 mail/mail-config.glade.h:135
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "工作"
-
-#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-component.c:468
-#, fuzzy
-msgid "On LDAP Servers"
-msgstr "LDAP 服务器"
-
#. FIXME: parent
#: addressbook/gui/component/addressbook-config.c:244
#, fuzzy
@@ -208,6 +181,51 @@ msgstr "检索 schema 信息错误"
msgid "Server did not respond with valid schema information"
msgstr "服务器没有响应有效的 schema 信息"
+#: addressbook/gui/component/addressbook-migrate.c:45 mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "正在等待..."
+
+#: addressbook/gui/component/addressbook-migrate.c:53
+msgid ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-migrate.c:86 mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "正在查验 %s"
+
+#. create the local source group
+#: addressbook/gui/component/addressbook-migrate.c:313
+#: calendar/gui/calendar-component.c:540 calendar/gui/calendar-component.c:550
+#: calendar/gui/tasks-component.c:502 calendar/gui/tasks-component.c:508
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-migrate.c:323
+#: calendar/gui/calendar-component.c:557 calendar/gui/migration.c:124
+#: calendar/gui/migration.c:147 calendar/gui/tasks-component.c:515
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:88
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "个人"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-migrate.c:331
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP 服务器"
+
+#: addressbook/gui/component/addressbook-migrate.c:463
+#, fuzzy
+msgid "LDAP Servers"
+msgstr "LDAP 服务器"
+
#: addressbook/gui/component/addressbook.c:273
msgid ""
"More cards matched this query than either the server is \n"
@@ -243,29 +261,30 @@ msgid "This query did not complete successfully."
msgstr "此查询未成功完成。"
#: addressbook/gui/component/addressbook.c:592
+#, fuzzy
msgid ""
-"We were unable to open this addressbook. Please check that the\n"
-"path exists and that you have permission to access it."
+"We were unable to open this addressbook. Please check that the path exists "
+"and that you have permission to access it."
msgstr ""
"我们无法打开此地址簿。请检查路径是否存在\n"
"以及您是否有足够的权限访问它。"
#: addressbook/gui/component/addressbook.c:599
+#, fuzzy
msgid ""
-"We were unable to open this addressbook. This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is unreachable."
+"We were unable to open this addressbook. This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
msgstr ""
"我们无法打开此地址簿。这可能是由于\n"
"您输入了错误的 URI,也可能是因为\n"
"LDAP 服务器已经关闭。"
#: addressbook/gui/component/addressbook.c:604
+#, fuzzy
msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it. If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+"This version of Evolution does not have LDAP support compiled in to it. If "
+"you want to use LDAP in Evolution you must compile the program from the CVS "
+"sources after retrieving OpenLDAP from the link below."
msgstr ""
"本版本的 Evolution 并没有把 LDAP 支持编译进去。\n"
"如果您希望在 Evolution 中使用 LDAP,就必须先从\n"
@@ -273,10 +292,10 @@ msgstr ""
"重新编译程序。\n"
#: addressbook/gui/component/addressbook.c:613
+#, fuzzy
msgid ""
-"We were unable to open this addressbook. This either\n"
-"means you have entered an incorrect URI, or the server\n"
-"is unreachable."
+"We were unable to open this addressbook. This either means you have entered "
+"an incorrect URI, or the server is unreachable."
msgstr ""
"我们无法打开此地址簿。这可能是由于\n"
"您输入了错误的 URI,也可能是因为\n"
@@ -334,12 +353,13 @@ msgstr " 显示支持的基础(_H) "
#: addressbook/gui/contact-editor/fulladdr.glade.h:1
#: addressbook/gui/contact-editor/fullname.glade.h:1
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/calendar-setup.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1
#: calendar/gui/dialogs/meeting-page.glade.h:1
#: calendar/gui/dialogs/new-calendar.glade.h:1
#: calendar/gui/dialogs/new-task-list.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:1
#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
@@ -377,19 +397,24 @@ msgid "Addressbook Creation Assistant"
msgstr "LDAP 配置助手"
#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "Addressbook Properties"
+msgstr "地址簿资源"
+
+#: addressbook/gui/component/ldap-config.glade.h:13
msgid "Addressbook Sources"
msgstr "地址簿资源"
-#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:66
+#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:66
#: mail/mail-config.glade.h:16
msgid "Always"
msgstr "总是"
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:15
msgid "Anonymously"
msgstr "匿名"
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:16
#, fuzzy
msgid ""
"Congratulations, you are finished setting up this addressbook.\n"
@@ -401,18 +426,14 @@ msgstr ""
"\n"
"请单击“完成”按钮保存您在此输入的设置。"
-#: addressbook/gui/component/ldap-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:19
msgid "Connecting"
msgstr "连接"
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
msgid "Distinguished _name:"
msgstr "已识别的姓名(_D):"
-#: addressbook/gui/component/ldap-config.glade.h:20
-msgid "Edit LDAP Server"
-msgstr "编辑 LDAP 服务器"
-
#: addressbook/gui/component/ldap-config.glade.h:21
msgid "Email address:"
msgstr "电子邮件地址:"
@@ -427,16 +448,19 @@ msgid ""
msgstr "Evolution 将使用此电子邮件地址在服务器上对您进行认证"
#: addressbook/gui/component/ldap-config.glade.h:24
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
msgid "Finished"
msgstr "已完成"
#: addressbook/gui/component/ldap-config.glade.h:25
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
#: smime/gui/smime-ui.glade.h:27
msgid "General"
msgstr "常规"
#: addressbook/gui/component/ldap-config.glade.h:26
+#: calendar/gui/dialogs/calendar-setup.glade.h:12
#, fuzzy
msgid "Group:"
msgstr "组"
@@ -468,7 +492,7 @@ msgid "S_earch scope: "
msgstr "搜索范围(_E):"
#: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:605
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:660
#: calendar/gui/gnome-cal.c:586
msgid "Searching"
msgstr "搜索"
@@ -512,6 +536,7 @@ msgstr ""
"您的连接不太安全,您也易于受到安全漏洞的攻击。"
#: addressbook/gui/component/ldap-config.glade.h:45
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
msgid ""
"Selecting this option will let you change Evolution's default settings for "
"LDAP\n"
@@ -527,6 +552,7 @@ msgid ""
msgstr "指定显示名称是配置 LDAP 服务器所需的最后一个步骤。"
#: addressbook/gui/component/ldap-config.glade.h:48
+#: calendar/gui/dialogs/calendar-setup.glade.h:20
msgid "Step 1: Folder Characteristics"
msgstr ""
@@ -635,6 +661,7 @@ msgstr ""
"它只用于显示。"
#: addressbook/gui/component/ldap-config.glade.h:74
+#: 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 "
@@ -686,6 +713,7 @@ msgstr ""
"如果您对这些信息不太了解,请询问您的系统管理员。"
#: addressbook/gui/component/ldap-config.glade.h:85
+#: calendar/gui/dialogs/calendar-setup.glade.h:37
msgid "_Display name:"
msgstr "显示名称(_D):"
@@ -693,13 +721,15 @@ msgstr "显示名称(_D):"
msgid "_Download limit:"
msgstr "下载上限(_D):"
-#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
#: ui/evolution-calendar.xml.h:36 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:41
+#: 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:19
+#: ui/evolution-tasks.xml.h:20
msgid "_Edit"
msgstr "编辑(_E)"
@@ -743,35 +773,35 @@ msgstr "搜索-页"
msgid "Evolution Addressbook name selection interface"
msgstr "Evolution 的地址簿名称选择界面"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:205
+#: addressbook/gui/component/select-names/e-select-names-popup.c:207
msgid "Remove All"
msgstr "全部删除"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:694
+#: addressbook/gui/component/select-names/e-select-names-popup.c:214
+#: addressbook/gui/component/select-names/e-select-names.c:693
#: composer/e-msg-composer-attachment-bar.c:444
msgid "Remove"
msgstr "删除"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:219
+#: addressbook/gui/component/select-names/e-select-names-popup.c:221
msgid "View Contact List"
msgstr "查看联系人列表"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:219
+#: addressbook/gui/component/select-names/e-select-names-popup.c:221
msgid "View Contact Info"
msgstr "查看联系人信息"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:226
-#: addressbook/gui/component/select-names/e-select-names-popup.c:336
+#: addressbook/gui/component/select-names/e-select-names-popup.c:228
+#: addressbook/gui/component/select-names/e-select-names-popup.c:338
msgid "Send HTML Mail?"
msgstr "发送 HTML 邮件?"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:328
+#: addressbook/gui/component/select-names/e-select-names-popup.c:330
#: addressbook/gui/widgets/eab-popup-control.c:1002
msgid "Add to Contacts"
msgstr "添加到联系人"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:354
+#: addressbook/gui/component/select-names/e-select-names-popup.c:356
msgid "Unnamed Contact"
msgstr "未命名的联系人"
@@ -787,41 +817,40 @@ msgstr "姓名"
msgid "Source"
msgstr "来源"
-#: addressbook/gui/component/select-names/e-select-names.c:518
-msgid "Select Contacts from Addressbook"
+#: addressbook/gui/component/select-names/e-select-names.c:494
+#, fuzzy
+msgid "Select Contents from Address Book"
msgstr "从地址簿中选择联系人"
#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Find"
-msgstr "查找"
+#, fuzzy
+msgid "<b>Contacts</b>"
+msgstr "<b>状态:</b>"
#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "选择姓名"
+#, fuzzy
+msgid "<b>Show Contacts</b>"
+msgstr "显示联系人"
#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Selected Contacts:"
-msgstr "已选中的联系人:"
+#, fuzzy
+msgid "Address _Book:"
+msgstr "地址簿"
#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show Contacts"
-msgstr "显示联系人"
+#, fuzzy
+msgid "C_ategory:"
+msgstr "类别(_C):"
#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid ""
-"Type a name into the entry, or\n"
-"select one from the list below:"
-msgstr ""
-"在条目中输入一个姓名,或\n"
-"在下面的列表中选择一个:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Category:"
-msgstr "类别(_C):"
+#, fuzzy
+msgid "Select Contacts from Address Book"
+msgstr "从地址簿中选择联系人"
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-msgid "_Folder:"
-msgstr "文件夹(_F):"
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Find"
+msgstr "查找"
#: addressbook/gui/contact-editor/contact-editor.glade.h:1
msgid " B_usiness:"
@@ -863,7 +892,7 @@ msgstr "合作"
#. Construct the app
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:1520
+#: addressbook/gui/contact-editor/e-contact-editor.c:1989
msgid "Contact Editor"
msgstr "联系人编辑器"
@@ -878,108 +907,128 @@ msgid "Details"
msgstr "细节"
#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Enter the person's instant messenger accounts here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
msgid "F_ree/Busy URL:"
msgstr "忙闲 URL(_R):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
msgid "File a_s:"
msgstr "存档为(_S):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
msgid "Full _Name..."
msgstr "全名(_N)..."
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: 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 "如果此人把忙闲信息或其它日历信息发布到互联网上,就在这里输入发布地址。"
+
+#: 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 "如果此人把忙闲信息或其它日历信息发布到互联网上,就在这里输入发布地址。"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#, fuzzy
+msgid "Instant Messaging"
+msgstr "投递邮件(_P)"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
msgid "New phone type"
msgstr "新电话类型"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
msgid "No_tes:"
msgstr "注释(_T):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
msgid "Organi_zation:"
msgstr "组织(_Z):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
msgid "P_rofession:"
msgstr "职业(_R):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
msgid "Primary _email:"
msgstr "主电子邮件(_E):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
msgid "S_pouse:"
msgstr "配偶(_P):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
msgid "Wants to receive _HTML mail"
msgstr "愿意接收 HTML 邮件(_H)"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
msgid "_Add"
msgstr "添加(_A)"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
msgid "_Business:"
msgstr "商务(_B):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
msgid "_Categories..."
msgstr "类别(_C)..."
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1236
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-calendar-table.c:1043
-#: calendar/gui/e-calendar-table.c:1061 mail/em-folder-tree.c:1502
-#: mail/em-folder-view.c:706 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1264
+#: calendar/gui/e-cal-view.c:1295 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-table.c:1073 mail/em-folder-tree.c:1654
+#: mail/em-folder-view.c:731 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-tasks.xml.h:19
msgid "_Delete"
msgstr "删除(_D)"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "_Home:"
msgstr "家庭(_H):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
msgid "_Job title:"
msgstr "职称(_J):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
msgid "_Manager's name:"
msgstr "经理姓名(_M):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
msgid "_Mobile:"
msgstr "移动电话(_M):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
msgid "_Nickname:"
msgstr "昵称(_N):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
msgid "_Office:"
msgstr "办公室(_O):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:41
msgid "_Public Calendar URL:"
msgstr "公开日历 URL(_P):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:42
msgid "_This is the mailing address"
msgstr "这是邮政地址(_T)"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:43
+msgid "_Video Conferencing URL:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:44
msgid "_Web page address:"
msgstr "网页地址(_W):"
@@ -989,7 +1038,7 @@ 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.c:226
+#: addressbook/gui/contact-editor/e-contact-editor.c:242
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
#: addressbook/gui/widgets/e-addressbook-model.c:312
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -1197,10 +1246,14 @@ msgid "Comoros"
msgstr "科摩罗群岛"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
msgid "Congo"
msgstr "刚果"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#, fuzzy
+msgid "Congo, The Democratic Republic Of The"
+msgstr "韩国人民民主共和国"
+
#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
msgid "Cook Islands"
msgstr "库克群岛"
@@ -1246,117 +1299,117 @@ msgid "Dominican Republic"
msgstr "多米尼加共和国"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "East Timor"
-msgstr "东帝汶"
-
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
msgid "Ecuador"
msgstr "厄瓜多尔"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
msgid "Egypt"
msgstr "埃及"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
msgid "El Salvador"
msgstr "萨尔瓦多"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
msgid "Equatorial Guinea"
msgstr "赤道几内亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
msgid "Eritrea"
msgstr "厄立特里亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
msgid "Estonia"
msgstr "爱沙尼亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
msgid "Ethiopia"
msgstr "埃塞俄比亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
msgid "Falkland Islands"
msgstr "福克兰群岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
msgid "Faroe Islands"
msgstr "法罗群岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
msgid "Fiji"
msgstr "斐济"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
msgid "Finland"
msgstr "芬兰"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
msgid "France"
msgstr "法国"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
msgid "French Guiana"
msgstr "法属圭亚那"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
msgid "French Polynesia"
msgstr "法属波利尼西亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
msgid "French Southern Territories"
msgstr "法属南部地区"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
msgid "Gabon"
msgstr "加蓬"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
msgid "Gambia"
msgstr "冈比亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
msgid "Georgia"
msgstr "格鲁吉亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
msgid "Germany"
msgstr "德国"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
msgid "Ghana"
msgstr "加纳"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
msgid "Gibraltar"
msgstr "直布罗陀"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
msgid "Greece"
msgstr "希腊"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
msgid "Greenland"
msgstr "格陵兰"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
msgid "Grenada"
msgstr "格林纳达"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
msgid "Guadeloupe"
msgstr "瓜德罗普岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
msgid "Guam"
msgstr "关岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
msgid "Guatemala"
msgstr "危地马拉"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+msgid "Guernsey"
+msgstr "格恩西岛"
+
#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
msgid "Guinea"
msgstr "几内亚"
@@ -1406,599 +1459,668 @@ msgid "Indonesia"
msgstr "印度尼西亚"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#, fuzzy
+msgid "Iran"
+msgstr "宜兰"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#, fuzzy
+msgid "Iraq"
+msgstr "以色列"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
msgid "Ireland"
msgstr "爱尔兰"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+msgid "Isle of Man"
+msgstr "Isle of Man"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
msgid "Israel"
msgstr "以色列"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
msgid "Italy"
msgstr "意大利"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
msgid "Jamaica"
msgstr "牙买加"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
msgid "Japan"
msgstr "日本"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+msgid "Jersey"
+msgstr "杰尔西"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
msgid "Jordan"
msgstr "约旦"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
msgid "Kazakhstan"
msgstr "哈萨克斯坦"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
msgid "Kenya"
msgstr "肯尼亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
msgid "Kiribati"
msgstr "基里巴斯"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#, fuzzy
+msgid "Korea, Democratic People's Republic Of"
+msgstr "韩国人民民主共和国"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
msgid "Korea, Republic Of"
msgstr "韩国"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
msgid "Kuwait"
msgstr "科威特"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
msgid "Kyrgyzstan"
msgstr "吉尔吉斯斯坦"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
msgid "Laos"
msgstr "老挝"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
msgid "Latvia"
msgstr "拉脱维亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
msgid "Lebanon"
msgstr "黎巴嫩"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
msgid "Lesotho"
msgstr "莱索托"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
msgid "Liberia"
msgstr "利比里亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+msgid "Libya"
+msgstr "利比亚"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
msgid "Liechtenstein"
msgstr "列支敦士登"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
msgid "Lithuania"
msgstr "立陶宛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
msgid "Luxembourg"
msgstr "卢森堡"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Macau"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#, fuzzy
+msgid "Macao"
msgstr "中国澳门特别行政区"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
msgid "Macedonia"
msgstr "马其顿"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
msgid "Madagascar"
msgstr "马达加斯加"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
msgid "Malawi"
msgstr "马拉维"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
msgid "Malaysia"
msgstr "马来西亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
msgid "Maldives"
msgstr "马尔代夫"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
msgid "Mali"
msgstr "马里"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
msgid "Malta"
msgstr "马耳他"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
msgid "Marshall Islands"
msgstr "马绍尔群岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
msgid "Martinique"
msgstr "马提尼可岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
msgid "Mauritania"
msgstr "毛里塔尼亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
msgid "Mauritius"
msgstr "毛里求斯"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
msgid "Mayotte"
msgstr "马约特岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
msgid "Mexico"
msgstr "墨西哥"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
msgid "Micronesia"
msgstr "密克罗尼西亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
msgid "Moldova, Republic Of"
msgstr "摩尔多瓦共和国"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
msgid "Monaco"
msgstr "摩纳哥"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
msgid "Mongolia"
msgstr "蒙古"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
msgid "Montserrat"
msgstr "蒙特塞拉特群岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
msgid "Morocco"
msgstr "摩洛哥"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
msgid "Mozambique"
msgstr "莫桑比克"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
msgid "Myanmar"
msgstr "缅甸"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
msgid "Namibia"
msgstr "纳米比亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
msgid "Nauru"
msgstr "瑙鲁"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
msgid "Nepal"
msgstr "尼泊尔"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
msgid "Netherlands"
msgstr "荷兰"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
msgid "Netherlands Antilles"
msgstr "荷属安的列斯"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
msgid "New Caledonia"
msgstr "新喀里多尼亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
msgid "New Zealand"
msgstr "新西兰"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
msgid "Nicaragua"
msgstr "尼加拉瓜"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
msgid "Niger"
msgstr "尼日尔"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
msgid "Nigeria"
msgstr "尼日利亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
msgid "Niue"
msgstr "纽埃岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
msgid "Norfolk Island"
msgstr "诺福克岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
msgid "Northern Mariana Islands"
msgstr "北马里亚那群岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
msgid "Norway"
msgstr "挪威"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
msgid "Oman"
msgstr "阿曼"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
msgid "Pakistan"
msgstr "巴基斯坦"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
msgid "Palau"
msgstr "帕劳群岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
msgid "Palestinian Territory"
msgstr "巴勒斯坦地区"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
msgid "Panama"
msgstr "巴拿马"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
msgid "Papua New Guinea"
msgstr "巴布亚新几内亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
msgid "Paraguay"
msgstr "巴拉圭"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
msgid "Peru"
msgstr "秘鲁"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
msgid "Philippines"
msgstr "菲利宾"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
msgid "Pitcairn"
msgstr "皮特克恩岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
msgid "Poland"
msgstr "波兰"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
msgid "Portugal"
msgstr "葡萄牙"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
msgid "Puerto Rico"
msgstr "波多黎各"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
msgid "Qatar"
msgstr "卡塔尔"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
msgid "Reunion"
msgstr "留尼汪"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
msgid "Romania"
msgstr "罗马尼亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
msgid "Russian Federation"
msgstr "俄罗斯联邦"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
msgid "Rwanda"
msgstr "卢旺达"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
msgid "Saint Kitts And Nevis"
msgstr "圣基德和吉维斯"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
msgid "Saint Lucia"
msgstr "圣卢西亚岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
msgid "Saint Vincent And The Grena-dines"
msgstr "圣文森特和格林纳达"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
msgid "Samoa"
msgstr "萨摩亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
msgid "San Marino"
msgstr "圣马力诺"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
msgid "Sao Tome And Principe"
msgstr "圣多美和普林西比"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
msgid "Saudi Arabia"
msgstr "沙特阿拉伯"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
msgid "Senegal"
msgstr "塞内加尔"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+msgid "Serbia And Montenegro"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
msgid "Seychelles"
msgstr "塞舌尔"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
msgid "Sierra Leone"
msgstr "塞拉利昂"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
msgid "Singapore"
msgstr "新加坡"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
msgid "Slovakia"
msgstr "斯洛伐克"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
msgid "Slovenia"
msgstr "斯洛文尼亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
msgid "Solomon Islands"
msgstr "所罗门群岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
msgid "Somalia"
msgstr "索马里"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
msgid "South Africa"
msgstr "南非"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
msgid "South Georgia And The South Sandwich Islands"
msgstr "南乔治亚和南三文治群岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
msgid "Spain"
msgstr "西班牙"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
msgid "Sri Lanka"
msgstr "斯里兰卡"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
msgid "St. Helena"
msgstr "圣赫勒拿岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
msgid "St. Pierre And Miquelon"
msgstr "圣皮埃尔和麦克伦群岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
msgid "Sudan"
msgstr "苏丹"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
msgid "Suriname"
msgstr "苏里南"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
msgid "Svalbard And Jan Mayen Islands"
msgstr "斯瓦巴和尖棉群岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
msgid "Swaziland"
msgstr "斯威士兰"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
msgid "Sweden"
msgstr "瑞典"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
msgid "Switzerland"
msgstr "瑞士"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#, fuzzy
+msgid "Syria"
+msgstr "士麦纳"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
msgid "Taiwan"
msgstr "中国台湾"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
msgid "Tajikistan"
msgstr "塔吉克斯坦"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
msgid "Tanzania, United Republic Of"
msgstr "坦桑尼亚联邦共和国"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
msgid "Thailand"
msgstr "泰国"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#, fuzzy
+msgid "Timor-Leste"
+msgstr "的里雅斯特"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
msgid "Togo"
msgstr "多哥"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
msgid "Tokelau"
msgstr "托克劳群岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
msgid "Tonga"
msgstr "汤加"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
msgid "Trinidad And Tobago"
msgstr "特里尼达和多巴哥"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
msgid "Tunisia"
msgstr "突尼斯"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
msgid "Turkey"
msgstr "土耳其"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
msgid "Turkmenistan"
msgstr "土库曼斯坦"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
msgid "Turks And Caicos Islands"
msgstr "特克斯和凯科斯群岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
msgid "Tuvalu"
msgstr "图瓦卢"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
msgid "Uganda"
msgstr "乌干达"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
msgid "Ukraine"
msgstr "乌克兰"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
msgid "United Arab Emirates"
msgstr "阿拉伯联合酋长国"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
msgid "United Kingdom"
msgstr "英国"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
msgid "United States Minor Outlying Islands"
msgstr "美国小型外岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
msgid "Uruguay"
msgstr "乌拉圭"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
msgid "Uzbekistan"
msgstr "乌兹别克斯坦"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
msgid "Vanuatu"
msgstr "努瓦阿图"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
msgid "Venezuela"
msgstr "委内瑞拉"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:370
msgid "Viet Nam"
msgstr "越南"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:371
msgid "Virgin Islands, British"
msgstr "英属处女群岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:372
msgid "Virgin Islands, U.S."
msgstr "美属处女群岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:373
msgid "Wallis And Futuna Islands"
msgstr "瓦利斯和富图纳群岛"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:374
msgid "Western Sahara"
msgstr "西撒哈拉"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:375
msgid "Yemen"
msgstr "也门"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Yugoslavia"
-msgstr "南斯拉夫"
-
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:376
msgid "Zambia"
msgstr "赞比亚"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:377
msgid "Zimbabwe"
msgstr "津巴布韦"
-#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#: addressbook/gui/contact-editor/e-contact-editor.c:207
#, fuzzy
msgid "Source Book"
msgstr "来源"
-#: addressbook/gui/contact-editor/e-contact-editor.c:198
+#: addressbook/gui/contact-editor/e-contact-editor.c:214
msgid "Target Book"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:205
+#: addressbook/gui/contact-editor/e-contact-editor.c:221
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: addressbook/gui/widgets/e-minicard.c:189
msgid "Contact"
msgstr "联系人"
-#: addressbook/gui/contact-editor/e-contact-editor.c:212
+#: addressbook/gui/contact-editor/e-contact-editor.c:228
#, fuzzy
msgid "Is New Contact"
msgstr "新建联系人"
-#: addressbook/gui/contact-editor/e-contact-editor.c:219
+#: addressbook/gui/contact-editor/e-contact-editor.c:235
msgid "Writable Fields"
msgstr "可写域"
-#: addressbook/gui/contact-editor/e-contact-editor.c:233
+#: addressbook/gui/contact-editor/e-contact-editor.c:249
msgid "Changed"
msgstr "已更改"
-#: addressbook/gui/contact-editor/e-contact-editor.c:976
+#: addressbook/gui/contact-editor/e-contact-editor.c:708
+#, fuzzy
+msgid "Service"
+msgstr "服务就绪"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:722
+msgid "Account Name"
+msgstr "帐号名"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1426
msgid "Category editor not available."
msgstr "类别编辑器不可用。"
-#: addressbook/gui/contact-editor/e-contact-editor.c:984
+#: addressbook/gui/contact-editor/e-contact-editor.c:1434
msgid "This contact belongs to these categories:"
msgstr "此联系人属于这些类别:"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1206
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
msgid "Save Contact as VCard"
msgstr "将联系人保存为 VCard"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1697
msgid ""
"Are you sure you want\n"
"to delete these contacts?"
msgstr "您确定要删除这些联系人吗?"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1249
+#: addressbook/gui/contact-editor/e-contact-editor.c:1700
msgid ""
"Are you sure you want\n"
"to delete this contact?"
msgstr "您确定要删除此联系人吗?"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2028
+#: addressbook/gui/contact-editor/e-contact-editor.c:2497
msgid "Business"
msgstr "商务"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2498
msgid "Home"
msgstr "家庭"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2030
+#: addressbook/gui/contact-editor/e-contact-editor.c:2499
msgid "Other"
msgstr "其它"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2569
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
+msgid "AIM"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2808
+#, fuzzy
+msgid "Jabber"
+msgstr "未命名的列表"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2809
+#, fuzzy
+msgid "Yahoo"
+msgstr "Yoro"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2810
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2811
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3098
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr "无法为域找到构件:“%s”"
@@ -2346,9 +2468,9 @@ msgstr "剪切"
#. create the dialog
#: addressbook/gui/widgets/e-addressbook-view.c:1015
-#: calendar/gui/calendar-component.c:433
+#: calendar/gui/calendar-component.c:408
#: calendar/gui/dialogs/copy-source-dialog.c:136
-#: calendar/gui/tasks-component.c:414 ui/evolution-addressbook.xml.h:2
+#: calendar/gui/tasks-component.c:397 ui/evolution-addressbook.xml.h:2
#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr "复制"
@@ -2359,7 +2481,7 @@ msgid "Paste"
msgstr "粘贴"
#: addressbook/gui/widgets/e-addressbook-view.c:1021
-#: calendar/gui/e-cal-view.c:1205
+#: calendar/gui/e-cal-view.c:1233
msgid "Current View"
msgstr "当前视图"
@@ -2669,7 +2791,7 @@ msgstr "成功"
#: camel/providers/imap/camel-imap-command.c:306
#: camel/providers/imap/camel-imap-command.c:403
#: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1012
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1010
msgid "Unknown error"
msgstr "未知的错误"
@@ -2696,9 +2818,9 @@ msgid "Protocol not supported"
msgstr "不支持的协议"
#: addressbook/gui/widgets/eab-gui-util.c:50
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:601
-#: calendar/gui/e-calendar-table.c:465 calendar/gui/e-tasks.c:213
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:212
#: calendar/gui/print.c:2319 camel/camel-service.c:734
#: camel/camel-service.c:772 camel/camel-service.c:856
#: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
@@ -2919,13 +3041,13 @@ msgstr ""
msgid "Print envelope"
msgstr "打印信封"
-#: addressbook/printing/e-contact-print.c:1003
+#: addressbook/printing/e-contact-print.c:1004
#, fuzzy
msgid "Print contacts"
msgstr "打印选中的联系人"
-#: addressbook/printing/e-contact-print.c:1069
-#: addressbook/printing/e-contact-print.c:1096
+#: addressbook/printing/e-contact-print.c:1070
+#: addressbook/printing/e-contact-print.c:1097
#, fuzzy
msgid "Print contact"
msgstr "打印选中的联系人"
@@ -3201,6 +3323,12 @@ msgstr "没有提供文件名。"
msgid "Unnamed List"
msgstr "未命名的列表"
+#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
+#: smime/gui/component.c:39
+#, fuzzy
+msgid "Enter password"
+msgstr "输入密码"
+
#: calendar/conduits/calendar/calendar-conduit.c:206
msgid "Split Multi-Day Events:"
msgstr "分割多日事件:"
@@ -3277,8 +3405,8 @@ msgid "Evolution's Tasks component"
msgstr "Evolution 测试组件"
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1795
-#: calendar/gui/tasks-control.c:490
+#: calendar/gui/e-tasks.c:1042 calendar/gui/print.c:1795
+#: calendar/gui/tasks-control.c:505
#: calendar/importers/icalendar-importer.c:717
#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
msgid "Tasks"
@@ -3324,11 +3452,26 @@ msgstr "午睡时间(分钟)"
msgid "_Edit appointment"
msgstr "编辑约会(_E)"
-#: calendar/gui/alarm-notify/alarm-queue.c:871
+#: calendar/gui/alarm-notify/alarm-queue.c:900 calendar/gui/e-cal-view.c:1246
+#: calendar/gui/e-cal-view.c:1311 calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1076 mail/em-folder-view.c:706
+#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "打开(_O)"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:902
+msgid "_Dismiss"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:904
+msgid "Dismiss _All"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:969
msgid "No description available."
msgstr "没有描述。"
-#: calendar/gui/alarm-notify/alarm-queue.c:889
+#: calendar/gui/alarm-notify/alarm-queue.c:987
#, c-format
msgid ""
"Alarm on %s\n"
@@ -3337,12 +3480,12 @@ msgid ""
"Ending at %s"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:976
-#: calendar/gui/alarm-notify/alarm-queue.c:1000
+#: calendar/gui/alarm-notify/alarm-queue.c:1079
+#: calendar/gui/alarm-notify/alarm-queue.c:1103
msgid "Warning"
msgstr "警告"
-#: calendar/gui/alarm-notify/alarm-queue.c:980
+#: calendar/gui/alarm-notify/alarm-queue.c:1083
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -3354,7 +3497,7 @@ msgstr ""
"发送电子邮件。Evolution 将以\n"
"显示普通提示会话框代替。"
-#: calendar/gui/alarm-notify/alarm-queue.c:1006
+#: calendar/gui/alarm-notify/alarm-queue.c:1109
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3370,23 +3513,23 @@ msgstr ""
"\n"
"您确信您要运行该程序吗?"
-#: calendar/gui/alarm-notify/alarm-queue.c:1020
+#: calendar/gui/alarm-notify/alarm-queue.c:1123
msgid "Do not ask me about this program again."
msgstr "不要再次询问此问题。"
-#: calendar/gui/alarm-notify/notify-main.c:159
+#: calendar/gui/alarm-notify/notify-main.c:160
msgid "Could not initialize Bonobo"
msgstr "无法初始化 Bonobo"
-#: calendar/gui/alarm-notify/notify-main.c:162
+#: calendar/gui/alarm-notify/notify-main.c:163
msgid "Could not initialize gnome-vfs"
msgstr "无法创始化 gnome-vfs"
-#: calendar/gui/alarm-notify/notify-main.c:171
+#: calendar/gui/alarm-notify/notify-main.c:172
msgid "Could not create the alarm notify service factory"
msgstr "无法创建提醒服务车间"
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:110
msgid "invalid time"
msgstr "无效时间"
@@ -3430,95 +3573,99 @@ msgid "Intervals shown in Day and Work Week views"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
-msgid "Minute the workday ends on"
+msgid "List of urls for free/busy publishing"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
-msgid "Minute the workday starts on"
+msgid "Minute the workday ends on"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
-msgid "Number of units for default reminder"
+msgid "Minute the workday starts on"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
-msgid "Number of units for determining when to hide tasks"
+msgid "Number of units for default reminder"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Position of the horizontal pane"
+msgid "Number of units for determining when to hide tasks"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Position of the horizontal pane in the month view"
+msgid "Position of the horizontal pane"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
-msgid "Position of the vertical pane"
+msgid "Position of the horizontal pane in the month view"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
-msgid "Position of the vertical pane in the month view"
+msgid "Position of the vertical pane"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Position of the vertical pane in the task view"
+msgid "Position of the vertical pane in the month view"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
-msgid "Programs that can run as part of alarms"
+msgid "Position of the vertical pane in the task view"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
#, fuzzy
msgid "Show where events end in week and month views"
msgstr "在周视图和月视图中显示约会结束时间(_S)"
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
#, fuzzy
msgid "The view showing when the calendar starts"
msgstr "预览将要打印的日历"
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
msgid "Time last alarm ran"
msgstr ""
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
msgid "Units for determining when to hide tasks"
msgstr ""
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
msgid "Units of default reminder"
msgstr ""
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
msgid "Weekday the week starts on"
msgstr ""
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
#, fuzzy
msgid "Whether to ask for confirmation on appointment deletion"
msgstr "删除项时要求确认(_A)"
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
#, fuzzy
msgid "Whether to ask for confirmation when folder is expunged"
msgstr "删除项时要求确认(_A)"
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
#, fuzzy
msgid "Whether to hide completed tasks"
msgstr "删除已完成的任务"
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
msgid "Whether to set a default reminder for events"
msgstr ""
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
msgid "Whether to show times in 24h format instead of using am/pm"
msgstr ""
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
#, fuzzy
msgid "Whether to show week numbers in date navigator"
msgstr "在日期浏览器中显示周数(_N)"
@@ -3535,11 +3682,11 @@ msgstr "描述含有"
msgid "Comment contains"
msgstr "注释含有"
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1117
msgid "Unmatched"
msgstr "无匹配"
-#: calendar/gui/calendar-commands.c:371
+#: calendar/gui/calendar-commands.c:342
#, fuzzy
msgid ""
"This operation will permanently erase all events older than the selected "
@@ -3550,128 +3697,140 @@ msgstr ""
"\n"
"确实删除这些任务吗?"
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:348
#, fuzzy
msgid "Purge events older than"
msgstr "返回小于"
-#: calendar/gui/calendar-commands.c:383
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/calendar-commands.c:353
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
msgid "days"
msgstr "天数"
-#: calendar/gui/calendar-commands.c:452
+#: calendar/gui/calendar-commands.c:422
msgid "%A %d %B %Y"
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:455 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/calendar-commands.c:425 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
msgid "%a %d %b"
msgstr "%m月%d日%A"
-#: calendar/gui/calendar-commands.c:457 calendar/gui/calendar-commands.c:462
-#: calendar/gui/calendar-commands.c:464
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434
msgid "%a %d %b %Y"
msgstr "%Y年%m月%d日%A"
-#: calendar/gui/calendar-commands.c:481 calendar/gui/calendar-commands.c:487
-#: calendar/gui/calendar-commands.c:493 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:463 calendar/gui/calendar-commands.c:465
msgid "%d %B %Y"
msgstr "%Y年%m月%d日"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:455
#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1516
msgid "%d %B"
msgstr "%m月%d日"
-#: calendar/gui/calendar-component.c:369
+#: calendar/gui/calendar-component.c:361
#, c-format
msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
msgstr ""
-#: calendar/gui/calendar-component.c:410
-#, fuzzy
-msgid "Rename this calendar to"
-msgstr "打印此日历"
-
-#: calendar/gui/calendar-component.c:431
+#: calendar/gui/calendar-component.c:406
+#: calendar/gui/dialogs/calendar-setup.glade.h:13
#, fuzzy
msgid "New Calendar"
msgstr "新喀里多尼亚"
-#: calendar/gui/calendar-component.c:615
+#. create the remote source group
+#: calendar/gui/calendar-component.c:544 calendar/gui/calendar-component.c:573
+msgid "On The Web"
+msgstr ""
+
+#. red
+#: calendar/gui/calendar-component.c:564 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:135
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "工作"
+
+#: calendar/gui/calendar-component.c:584 calendar/gui/calendar-component.c:596
+msgid "Birthdays & Anniversaries"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:595
+#, fuzzy
+msgid "Birthdays"
+msgstr "生日(_Y):"
+
+#: calendar/gui/calendar-component.c:720
msgid "New appointment"
msgstr "新建约会"
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:721
msgid "_Appointment"
msgstr "约会(_A)"
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:722
msgid "Create a new appointment"
msgstr "创建新约会"
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:727
msgid "New meeting"
msgstr "新闻会议"
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:728
msgid "M_eeting"
msgstr "会议(_E)"
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:729
#, fuzzy
msgid "Create a new meeting request"
msgstr "创建一条新任务请求"
-#: calendar/gui/calendar-component.c:629
+#: calendar/gui/calendar-component.c:734
#, fuzzy
msgid "New all day appointment"
msgstr "新建全天约会"
-#: calendar/gui/calendar-component.c:630
+#: calendar/gui/calendar-component.c:735
msgid "All _Day Appointment"
msgstr "全天约会(_D)"
-#: calendar/gui/calendar-component.c:631
+#: calendar/gui/calendar-component.c:736
#, fuzzy
msgid "Create a new all-day appointment"
msgstr "创建新约会"
-#: calendar/gui/calendar-component.c:636
+#: calendar/gui/calendar-component.c:741
#, fuzzy
msgid "New calendar"
msgstr "新喀里多尼亚"
-#: calendar/gui/calendar-component.c:637
+#: calendar/gui/calendar-component.c:742
#, fuzzy
msgid "C_alendar"
msgstr "日历(_A):"
-#: calendar/gui/calendar-component.c:638
+#: calendar/gui/calendar-component.c:743
#, fuzzy
msgid "Create a new calendar"
msgstr "创建新文件夹"
-#: calendar/gui/calendar-component.c:705
+#: calendar/gui/calendar-component.c:810
#, c-format
msgid "Unable to open the calendar '%s' for creating events and meetings"
msgstr ""
-#: calendar/gui/calendar-component.c:718
+#: calendar/gui/calendar-component.c:822
msgid "There is no calendar available for creating events and meetings"
msgstr ""
-#. create the remote source group
-#: calendar/gui/calendar-component.c:855
-msgid "On The Web"
-msgstr ""
-
#: calendar/gui/calendar-offline-handler.c:192
#, c-format
msgid "backend_go_offline(): %s"
@@ -3715,7 +3874,7 @@ msgstr "打开日历的方法不支持"
msgid "Permission denied to open the calendar"
msgstr "没有权限打开日历"
-#: calendar/gui/comp-editor-factory.c:519
+#: calendar/gui/comp-editor-factory.c:518
#, c-format
msgid "open_client(): %s"
msgstr ""
@@ -3753,79 +3912,53 @@ msgstr "程序提醒选项"
msgid "Unknown Alarm Options"
msgstr "未知提醒选项"
-#: calendar/gui/dialogs/alarm-options.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
#, fuzzy
-msgid " "
-msgstr " "
+msgid "Alarm Repeat"
+msgstr "提醒重复"
#: calendar/gui/dialogs/alarm-options.glade.h:3
#, fuzzy
-msgid "<b>Alarm Action</b>"
-msgstr "日历信息"
+msgid "Message to Display:"
+msgstr "邮件显示"
#: calendar/gui/dialogs/alarm-options.glade.h:4
-#, fuzzy
-msgid "<b>Alarm Email</b>"
-msgstr "<b>发送电子邮件:</b>"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-#, fuzzy
-msgid "<b>Alarm Repeat</b>"
-msgstr "提醒重复"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-#, fuzzy
-msgid "<b>Alarm Sound</b>"
-msgstr "日历信息"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-#, fuzzy
-msgid "<b>Message to Display</b>"
-msgstr "要显示的邮件:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
msgid "Message to Send"
msgstr "要发送的邮件"
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: calendar/gui/dialogs/alarm-options.glade.h:5
msgid "Play sound:"
msgstr "播放声音:"
-#: calendar/gui/dialogs/alarm-options.glade.h:10
+#: calendar/gui/dialogs/alarm-options.glade.h:6
msgid "Repeat the alarm"
msgstr "重复提醒"
-#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: calendar/gui/dialogs/alarm-options.glade.h:7
msgid "Run program:"
msgstr "运行程序:"
-#: calendar/gui/dialogs/alarm-options.glade.h:12
+#: calendar/gui/dialogs/alarm-options.glade.h:8
msgid "Send To:"
msgstr "发送给:"
-#: calendar/gui/dialogs/alarm-options.glade.h:13
+#: calendar/gui/dialogs/alarm-options.glade.h:9
msgid "With these arguments:"
msgstr "使用这些参数:"
-#: calendar/gui/dialogs/alarm-options.glade.h:15 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
msgid "dialog1"
msgstr "dialog1"
-#: calendar/gui/dialogs/alarm-options.glade.h:16
+#: calendar/gui/dialogs/alarm-options.glade.h:12
msgid "extra times every"
msgstr "每个额外时间"
-#: calendar/gui/dialogs/alarm-options.glade.h:17 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
msgid "hours"
msgstr "小时"
-#: calendar/gui/dialogs/alarm-options.glade.h:18 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
msgid "minutes"
msgstr "分钟"
@@ -3833,220 +3966,223 @@ msgstr "分钟"
msgid "Action/Trigger"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:1
#: calendar/gui/dialogs/recurrence-page.glade.h:2
-#, fuzzy
-msgid "<b>Basics</b>"
-msgstr "<b>状态:</b>"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#, fuzzy
-msgid "<b>Reminders</b>"
-msgstr "提示器"
+msgid "Basics"
+msgstr "基本"
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
msgid "Date/Time:"
msgstr "日期/时间:"
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:463
msgid "Display a message"
msgstr "显示消息"
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:459
msgid "Play a sound"
msgstr "播放声音"
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#, fuzzy
+msgid "Reminders"
+msgstr "提醒"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:471
msgid "Run a program"
msgstr "运行程序"
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.glade.h:7
msgid "Send an Email"
msgstr "发送电子邮件"
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
#: calendar/gui/e-itip-control.c:933 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:168
+#: calendar/gui/e-tasks.c:167
msgid "Summary:"
msgstr "概要:"
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:9
msgid "_Options..."
msgstr "选项(_O)..."
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:10
msgid "after"
msgstr "之后"
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:11
msgid "before"
msgstr "之前"
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
msgid "day(s)"
msgstr "天"
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:13
msgid "end of appointment"
msgstr "约会结束"
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:14
msgid "hour(s)"
msgstr "小时"
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
msgid "minute(s)"
msgstr "分钟"
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:16
msgid "start of appointment"
msgstr "约会开始"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
msgid "05 minutes"
msgstr "05 分钟"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
msgid "10 minutes"
msgstr "10 分钟"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
msgid "15 minutes"
msgstr "15 分钟"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
msgid "30 minutes"
msgstr "30 分钟"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
msgid "60 minutes"
msgstr "60 分钟"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Alerts</b>"
-msgstr "<b>开始:</b>"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, fuzzy
-msgid "<b>Task List</b>"
-msgstr "日历信息"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Time</b>"
-msgstr "<b>到期:</b>"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Work Week</b>"
-msgstr "一周工作日"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
+msgid "Alerts"
+msgstr "警告"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
msgid "Calendar and Tasks Settings"
msgstr "日历和任务设置"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
msgid "Color for overdue tasks"
msgstr "被延误任务的颜色"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
msgid "Color for tasks due today"
msgstr "今天到期任务的颜色"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
msgid "Day _ends:"
msgstr "一天结束(_E):"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
msgid "Days"
msgstr "天数"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: mail/mail-config.glade.h:51
+msgid "E_nable"
+msgstr "启用(_N)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
#: calendar/gui/dialogs/recurrence-page.c:1048
#: calendar/gui/e-itip-control.c:557
msgid "Friday"
msgstr "星期五"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
msgid "Hours"
msgstr "小时"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
msgid "Minutes"
msgstr "分钟"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
#: calendar/gui/dialogs/recurrence-page.c:1044
#: calendar/gui/e-itip-control.c:553
msgid "Monday"
msgstr "星期一"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
msgid "S_un"
msgstr "周日(_U)"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
#: calendar/gui/dialogs/recurrence-page.c:1049
#: calendar/gui/e-itip-control.c:558
msgid "Saturday"
msgstr "星期六"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
msgid "Sh_ow a reminder"
msgstr "显示一条提醒(_O)"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
msgid "Show week _numbers in date navigator"
msgstr "在日期浏览器中显示周数(_N)"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
#: calendar/gui/dialogs/recurrence-page.c:1050
#: calendar/gui/e-itip-control.c:552
msgid "Sunday"
msgstr "星期日"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
msgid "T_asks due today:"
msgstr "今天到期的任务(_A):"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
msgid "T_hu"
msgstr "周四(_H)"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#, fuzzy
+msgid "Task List"
+msgstr "任务列表"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
#: calendar/gui/dialogs/recurrence-page.c:1047
#: calendar/gui/e-itip-control.c:556
msgid "Thursday"
msgstr "星期四"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Time"
+msgstr "时间"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
msgid "Time _zone:"
msgstr "时区(_Z):"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
msgid "Time format:"
msgstr "时间格式:"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
#: calendar/gui/dialogs/recurrence-page.c:1045
#: calendar/gui/e-itip-control.c:554
msgid "Tuesday"
msgstr "星期二"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
msgid "W_eek starts:"
msgstr "一周开始(_E):"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
#: calendar/gui/dialogs/recurrence-page.c:1046
#: calendar/gui/e-itip-control.c:555
msgid "Wednesday"
msgstr "星期三"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ui/evolution-calendar.xml.h:32
+msgid "Work Week"
+msgstr "一周工作日"
+
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
msgid "Work days:"
msgstr "工作日:"
@@ -4060,66 +4196,226 @@ msgid "_24 hour"
msgstr "_24 小时"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "_Add URL"
+msgstr "添加(_A)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
msgid "_Ask for confirmation when deleting items"
msgstr "删除项时要求确认(_A)"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
msgid "_Compress weekends in month view"
msgstr "不在月视图中显示周末(_C)"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
msgid "_Day begins:"
msgstr "一天开始(_D):"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
msgid "_Display"
msgstr "显示(_D)"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "_Free/Busy Publishing"
+msgstr "忙/闲请求"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
msgid "_Fri"
msgstr "周五(_F)"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
#: mail/mail-config.glade.h:153
msgid "_General"
msgstr "常规(_G)"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
msgid "_Hide completed tasks after"
msgstr "随后隐藏已完成的任务(_H)"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
msgid "_Mon"
msgstr "周一(_M)"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
msgid "_Overdue tasks:"
msgstr "延误的任务(_O):"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
msgid "_Sat"
msgstr "周六(_S)"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
msgid "_Show appointment end times in week and month views"
msgstr "在周视图和月视图中显示约会结束时间(_S)"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
msgid "_Time divisions:"
msgstr "时间分割(_T):"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
msgid "_Tue"
msgstr "周二(_T)"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
msgid "_Wed"
msgstr "周三(_W)"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
msgid "before every appointment"
msgstr "在每次约会前"
+#: calendar/gui/dialogs/calendar-setup.c:155
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "您必须指定文件名。"
+
+#: calendar/gui/dialogs/calendar-setup.c:163
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "不支持装入“%s”必需的方法"
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:213
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:226
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:254
+#, fuzzy
+msgid "Could not create directory for new calendar"
+msgstr "无法创建目录 %s:%s"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Calendar Creation Assistant"
+msgstr "LDAP 配置助手"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Calendar Properties"
+msgstr "iCalendar 错误"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid ""
+"Congratulations, you are finished setting up this calendar.\n"
+"\n"
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
+msgstr ""
+"恭喜,您已经设置完了此 LDAP 服务器。您现在可以访问此目录了。\n"
+"\n"
+"请单击“完成”按钮保存您在此输入的设置。"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid ""
+"Congratulations, you are finished setting up this task list.\n"
+"\n"
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
+msgstr ""
+"恭喜,您已经设置完了此 LDAP 服务器。您现在可以访问此目录了。\n"
+"\n"
+"请单击“完成”按钮保存您在此输入的设置。"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+#: calendar/gui/tasks-component.c:395
+#, fuzzy
+msgid "New Task List"
+msgstr "任务列表"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#, fuzzy
+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
+#, fuzzy
+msgid "Task List Creation Assistant"
+msgstr "LDAP 配置助手"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23
+#, fuzzy
+msgid "Task List Properties"
+msgstr "任务列表"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:24
+#, 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"
+"息不太了解的话,请询问您的系统管理员。"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:29
+#, 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 ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:38
+#, fuzzy
+msgid "_Refresh Interval:"
+msgstr "刷新列表"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:39
+#, fuzzy
+msgid "_Source URL:"
+msgstr "POP 源 URI"
+
#: calendar/gui/dialogs/cancel-comp.c:57
msgid ""
"The event being deleted is a meeting, would you like to send a cancellation "
@@ -4219,52 +4515,52 @@ msgstr " (预定 "
msgid "Due "
msgstr "预定 "
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:404
msgid "Could not update object"
msgstr "无法更新对象"
-#: calendar/gui/dialogs/comp-editor.c:818
-#: calendar/gui/dialogs/comp-editor.c:855
+#: calendar/gui/dialogs/comp-editor.c:870
+#: calendar/gui/dialogs/comp-editor.c:907
msgid "Edit Appointment"
msgstr "编辑约会"
-#: calendar/gui/dialogs/comp-editor.c:823
-#: calendar/gui/dialogs/comp-editor.c:860
+#: calendar/gui/dialogs/comp-editor.c:875
+#: calendar/gui/dialogs/comp-editor.c:912
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
-#: calendar/gui/dialogs/comp-editor.c:826
-#: calendar/gui/dialogs/comp-editor.c:863
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
-#: calendar/gui/dialogs/comp-editor.c:829
-#: calendar/gui/dialogs/comp-editor.c:866
+#: calendar/gui/dialogs/comp-editor.c:881
+#: calendar/gui/dialogs/comp-editor.c:918
#, c-format
msgid "Journal entry - %s"
msgstr "日志条目 - %s"
-#: calendar/gui/dialogs/comp-editor.c:840
-#: calendar/gui/dialogs/comp-editor.c:876
+#: calendar/gui/dialogs/comp-editor.c:892
+#: calendar/gui/dialogs/comp-editor.c:928
msgid "No summary"
msgstr "没有概要"
-#: calendar/gui/dialogs/comp-editor.c:1313 calendar/gui/e-cal-view.c:992
-#: calendar/gui/e-calendar-table.c:1175 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1353 calendar/gui/e-cal-view.c:1047
+#: calendar/gui/e-calendar-table.c:1187 composer/e-msg-composer.c:1128
msgid "Save as..."
msgstr "另存为..."
-#: calendar/gui/dialogs/comp-editor.c:1416
-#: calendar/gui/dialogs/comp-editor.c:1440
-#: calendar/gui/dialogs/comp-editor.c:1466
+#: calendar/gui/dialogs/comp-editor.c:1456
+#: calendar/gui/dialogs/comp-editor.c:1480
+#: calendar/gui/dialogs/comp-editor.c:1506
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "如果更新到达的话,对此项目的更改将被丢弃"
-#: calendar/gui/dialogs/comp-editor.c:1506
-#: calendar/gui/dialogs/comp-editor.c:1515
-msgid "Unable to obtain current version!"
+#: calendar/gui/dialogs/comp-editor.c:1562
+#, fuzzy
+msgid "Unable to use current version!"
msgstr "无法获取当前版本!"
#: calendar/gui/dialogs/copy-source-dialog.c:142
@@ -4423,89 +4719,83 @@ msgstr "结束时间有错"
msgid "Unable to open the calendar '%s'."
msgstr "没有权限打开日历"
+#: calendar/gui/dialogs/event-page.glade.h:2
+msgid "A_ll day event"
+msgstr "全天事务(_L)"
+
#: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:3
-#, fuzzy
-msgid "<b>Classification</b>"
-msgstr "分类"
+msgid "B_usy"
+msgstr "忙(_U)"
#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:4
-#, fuzzy
-msgid "<b>Date &amp; Time</b>"
-msgstr "日期及时间"
+#: calendar/gui/dialogs/task-page.glade.h:2
+msgid "Ca_tegories..."
+msgstr "类别(_T)..."
#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:5
#, fuzzy
-msgid "<b>Description</b>"
-msgstr "描述:"
+msgid "Calendar:"
+msgstr "日历(_A):"
#: calendar/gui/dialogs/event-page.glade.h:6
-#, fuzzy
-msgid "<b>L_ocation</b>"
-msgstr "地理位置(_O):"
+#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
+msgstr "分类"
#: calendar/gui/dialogs/event-page.glade.h:7
-#, fuzzy
-msgid "<b>Show Time As</b>"
-msgstr "将时间显示为"
+msgid "Co_nfidential"
+msgstr "机密(_N)"
#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:5
#, fuzzy
-msgid "<b>Su_mmary</b>"
-msgstr "<b>开始:</b>"
+msgid "Date & Time"
+msgstr "日期/时间:"
#: calendar/gui/dialogs/event-page.glade.h:9
-msgid "A_ll day event"
-msgstr "全天事务(_L)"
+msgid "F_ree"
+msgstr "闲(_R)"
#: calendar/gui/dialogs/event-page.glade.h:10
-msgid "B_usy"
-msgstr "忙(_U)"
+#, fuzzy
+msgid "L_ocation:"
+msgstr "位置:"
#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Ca_tegories..."
-msgstr "类别(_T)..."
+#: calendar/gui/dialogs/task-page.glade.h:8
+msgid "Pri_vate"
+msgstr "私有(_V)"
#: calendar/gui/dialogs/event-page.glade.h:12
-#, fuzzy
-msgid "Calendar:"
-msgstr "日历(_A):"
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "Pu_blic"
+msgstr "公开(_B)"
#: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Co_nfidential"
-msgstr "机密(_N)"
+#, fuzzy
+msgid "Show Time As"
+msgstr "将时间显示为"
#: calendar/gui/dialogs/event-page.glade.h:14
-msgid "F_ree"
-msgstr "闲(_R)"
-
-#: calendar/gui/dialogs/event-page.glade.h:15
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Pri_vate"
-msgstr "私有(_V)"
-
-#: calendar/gui/dialogs/event-page.glade.h:16
#: calendar/gui/dialogs/task-page.glade.h:11
-msgid "Pu_blic"
-msgstr "公开(_B)"
+msgid "Su_mmary:"
+msgstr "概要(_U):"
-#: calendar/gui/dialogs/event-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:15
msgid "_End time:"
msgstr "结束时间(_E):"
-#: calendar/gui/dialogs/event-page.glade.h:18
+#: calendar/gui/dialogs/event-page.glade.h:16
msgid "_Start time:"
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:593 composer/e-msg-composer.c:2050
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:715
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2066
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:740
#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
#: mail/mail-config.glade.h:80
#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
@@ -4599,45 +4889,6 @@ msgstr "改变组织者(_C)"
msgid "_Invite Others..."
msgstr "邀请其他人(_I)..."
-#: calendar/gui/dialogs/new-calendar.c:102
-#: calendar/gui/dialogs/new-task-list.c:46
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/new-calendar.c:116
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-
-#: calendar/gui/dialogs/new-calendar.c:125
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "不支持装入“%s”必需的方法"
-
-#: calendar/gui/dialogs/new-calendar.c:138
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/new-calendar.c:155
-#, fuzzy
-msgid "Could not create cache for new calendar"
-msgstr "无法创建目录 %s:%s"
-
-#: calendar/gui/dialogs/new-calendar.c:174
-#, fuzzy
-msgid "Could not create directory for new calendar"
-msgstr "无法创建目录 %s:%s"
-
-#: calendar/gui/dialogs/new-calendar.c:254
-#: calendar/gui/dialogs/new-task-list.c:131
-#, fuzzy
-msgid "A group must be selected"
-msgstr "必须设定组织者。"
-
#: calendar/gui/dialogs/new-calendar.glade.h:2
#, fuzzy
msgid "<b>Calendar options</b>"
@@ -4663,11 +4914,6 @@ msgstr "日历信息"
msgid "Calendar Name"
msgstr "日历"
-#: calendar/gui/dialogs/new-task-list.c:56
-#, fuzzy
-msgid "Could not create directory for new task list"
-msgstr "无法创建目录 %s:%s"
-
#: calendar/gui/dialogs/new-task-list.glade.h:2
#, fuzzy
msgid "<b>Task List Options</b>"
@@ -4701,20 +4947,20 @@ msgid ""
"You are modifying a recurring journal entry, what would you like to modify?"
msgstr "您即将修改再现日记项,请指定您想要修改的具体内容。"
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
msgid "This Instance Only"
msgstr "只是本次"
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
#, fuzzy
msgid "This and Prior Instances"
msgstr "本次和以后各次"
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
msgid "This and Future Instances"
msgstr "本次和以后各次"
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
msgid "All Instances"
msgstr "所有各次"
@@ -4771,70 +5017,70 @@ msgstr "循环"
msgid "Date/Time"
msgstr "日期/时间:"
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-#, fuzzy
-msgid "<b>Exceptions</b>"
-msgstr "例外"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "A_dd"
+msgstr "添加(_D)"
#: calendar/gui/dialogs/recurrence-page.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "预览"
+msgid "Every"
+msgstr "每"
#: calendar/gui/dialogs/recurrence-page.glade.h:5
#, fuzzy
-msgid "<b>Recurrence Rule</b>"
-msgstr "再现规则"
+msgid "Exceptions"
+msgstr "例外"
#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "A_dd"
-msgstr "添加(_D)"
+#, fuzzy
+msgid "Preview"
+msgstr "预览"
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "Every"
-msgstr "每"
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#, fuzzy
+msgid "Recurrence Rule"
+msgstr "再现规则"
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
msgid "_Custom recurrence"
msgstr "定制再现(_C)"
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
msgid "_Modify"
msgstr "修改(_M)"
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
msgid "_No recurrence"
msgstr "不再现(_N)"
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
msgid "_Remove"
msgstr "删除(_R)"
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
msgid "_Simple recurrence"
msgstr "简单再现(_S)"
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
msgid "for"
msgstr "只"
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
msgid "forever"
msgstr "永远"
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
msgid "month(s)"
msgstr "月"
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
msgid "until"
msgstr "直到"
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
msgid "week(s)"
msgstr "周"
-#: calendar/gui/dialogs/recurrence-page.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
msgid "year(s)"
msgstr "年"
@@ -4848,11 +5094,11 @@ msgstr ""
"\n"
"您希望保存改动吗?"
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1555
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1545
msgid "_Discard Changes"
msgstr "丢弃修改(_D)"
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
msgid "Save Event"
msgstr "保存事件"
@@ -4876,80 +5122,80 @@ msgstr "任务信息已经改变。发送更新版本?"
msgid "Completed date is wrong"
msgstr "完成日期有错"
-#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:2
#, fuzzy, no-c-format
msgid "% _Complete"
msgstr "% 完成"
#: calendar/gui/dialogs/task-details-page.glade.h:4
-#, fuzzy
-msgid "<b>Progress</b>"
-msgstr "进度"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "<b>Web Page</b>"
-msgstr "<b>发送电子邮件:</b>"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:599
-#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-model.c:289
#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:209
#: calendar/gui/print.c:2316
msgid "Completed"
msgstr "已完成"
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:389 calendar/gui/e-tasks.c:231
+#: 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:919
msgid "High"
msgstr "高"
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:597
-#: calendar/gui/e-cal-model-tasks.c:659 calendar/gui/e-calendar-table.c:463
-#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2313
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:465
+#: calendar/gui/e-tasks.c:206 calendar/gui/print.c:2313
msgid "In Progress"
msgstr "正在进行中"
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:235
+#: 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:917
msgid "Low"
msgstr "低"
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:390
-#: calendar/gui/e-tasks.c:233 mail/message-list.c:918
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-tasks.c:232 mail/message-list.c:918
msgid "Normal"
msgstr "中"
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:595
-#: calendar/gui/e-calendar-table.c:462 calendar/gui/e-tasks.c:217
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:216
#: calendar/gui/print.c:2310
msgid "Not Started"
msgstr "尚未开始"
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:392
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#, fuzzy
+msgid "Progress"
+msgstr "正在进行中"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:394
msgid "Undefined"
msgstr "未定义"
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:12
#, fuzzy
msgid "_Date Completed:"
msgstr "完成日期:"
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:13
msgid "_Priority:"
msgstr "优先级(_P):"
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:14
msgid "_Status:"
msgstr "状态(_S):"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Web Page:"
+msgstr "网页地址(_W):"
+
#: calendar/gui/dialogs/task-editor.c:193
msgid "Basic"
msgstr "基本"
@@ -4973,136 +5219,137 @@ msgstr "到期日期先于开始日期!"
msgid "Unable to open tasks in '%s'."
msgstr "无法打开地址簿"
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:4
msgid "Con_fidential"
msgstr "机密(_F)"
-#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:988
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:246
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
+msgid "Description:"
+msgstr "描述:"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
#, fuzzy
msgid "Folder:"
msgstr "文件夹(_F):"
-#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
msgid "Sta_rt Date:"
msgstr "开始日期(_R):"
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:12
msgid "_Due Date:"
msgstr "到期日期(_D):"
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/e-alarm-list.c:395
#, c-format
msgid "%d days"
msgstr "%d 天"
-#: calendar/gui/e-alarm-list.c:400
+#: calendar/gui/e-alarm-list.c:398
msgid "1 day"
msgstr "1 天"
-#: calendar/gui/e-alarm-list.c:405
+#: calendar/gui/e-alarm-list.c:403
#, c-format
msgid "%d weeks"
msgstr "%d 周"
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:406
msgid "1 week"
msgstr "1 周"
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:411
#, c-format
msgid "%d hours"
msgstr "%d 小时"
-#: calendar/gui/e-alarm-list.c:416
+#: calendar/gui/e-alarm-list.c:414
msgid "1 hour"
msgstr "1 小时"
-#: calendar/gui/e-alarm-list.c:421
+#: calendar/gui/e-alarm-list.c:419
#, c-format
msgid "%d minutes"
msgstr "%d 分钟"
-#: calendar/gui/e-alarm-list.c:424
+#: calendar/gui/e-alarm-list.c:422
msgid "1 minute"
msgstr "1 分钟"
-#: calendar/gui/e-alarm-list.c:429
+#: calendar/gui/e-alarm-list.c:427
#, c-format
msgid "%d seconds"
msgstr "%d 秒"
-#: calendar/gui/e-alarm-list.c:432
+#: calendar/gui/e-alarm-list.c:430
msgid "1 second"
msgstr "1 秒"
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/e-alarm-list.c:467
msgid "Send an email"
msgstr "发送电子邮件"
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:477
msgid "Unknown action to be performed"
msgstr "执行未知的动作"
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:489
#, c-format
msgid "%s %s before the start of the appointment"
msgstr "在约会开始之前 %s %s"
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:492
#, c-format
msgid "%s %s after the start of the appointment"
msgstr "在约会开始之后 %s %s"
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:497
#, c-format
msgid "%s at the start of the appointment"
msgstr "在约会开始时 %s"
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:506
#, c-format
msgid "%s %s before the end of the appointment"
msgstr "在约会结束之前 %s %s"
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:509
#, c-format
msgid "%s %s after the end of the appointment"
msgstr "在约会结束之后 %s %s"
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:514
#, c-format
msgid "%s at the end of the appointment"
msgstr "在约会结束时 %s"
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:538
#, c-format
msgid "%s at %s"
msgstr "在 %2$s 时 %1$s"
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:544
#, c-format
msgid "%s for an unknown trigger type"
msgstr "%s 为未知触发类型"
#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:367
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:369
msgid "Public"
msgstr "公开"
#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:368
+#: calendar/gui/e-calendar-table.c:370
msgid "Private"
msgstr "保密"
#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-calendar-table.c:371
msgid "Confidential"
msgstr "机密"
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#: calendar/gui/e-calendar-table.etspec.h:5
-msgid "Classification"
-msgstr "分类"
-
#: calendar/gui/e-cal-list-view.etspec.h:3
#: calendar/gui/e-calendar-table.etspec.h:9
#, fuzzy
@@ -5129,11 +5376,11 @@ msgstr "颜色"
msgid "component"
msgstr "约会"
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
msgid "Free"
msgstr "空闲"
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:444
#: calendar/gui/e-meeting-time-sel.c:399
msgid "Busy"
msgstr "繁忙"
@@ -5164,7 +5411,7 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/e-cal-model-tasks.c:934 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
#: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -5172,7 +5419,7 @@ msgstr ""
msgid "Yes"
msgstr "是"
-#: calendar/gui/e-cal-model-tasks.c:934 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
#: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
msgid "No"
@@ -5189,7 +5436,7 @@ msgstr "否"
#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1664
#: camel/camel-gpg-context.c:1715 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:2003
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2094
#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
msgid "Unknown"
msgstr "未知"
@@ -5202,179 +5449,172 @@ msgstr "重复"
msgid "Assigned"
msgstr "已委派"
-#: calendar/gui/e-cal-view.c:626 calendar/gui/e-calendar-table.c:686
+#: calendar/gui/e-cal-view.c:681 calendar/gui/e-calendar-table.c:698
msgid "Deleting selected objects"
msgstr "删除选中的对象"
-#: calendar/gui/e-cal-view.c:730 calendar/gui/e-calendar-table.c:847
+#: calendar/gui/e-cal-view.c:785 calendar/gui/e-calendar-table.c:859
msgid "Updating objects"
msgstr "更新对象"
-#: calendar/gui/e-cal-view.c:1190 calendar/gui/e-cal-view.c:1275
+#: calendar/gui/e-cal-view.c:1218 calendar/gui/e-cal-view.c:1303
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
-#: calendar/gui/e-cal-view.c:1191 calendar/gui/e-cal-view.c:1277
+#: calendar/gui/e-cal-view.c:1219 calendar/gui/e-cal-view.c:1305
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
-#: calendar/gui/e-cal-view.c:1192 calendar/gui/e-cal-view.c:1279
+#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1307
msgid "New Meeting"
msgstr "新会议"
-#: calendar/gui/e-cal-view.c:1193 calendar/gui/e-cal-view.c:1281
+#: calendar/gui/e-cal-view.c:1221 calendar/gui/e-cal-view.c:1309
msgid "New Task"
msgstr "新建任务"
-#: calendar/gui/e-cal-view.c:1197 calendar/gui/e-cal-view.c:1220
-#: calendar/gui/e-cal-view.c:1287 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-calendar-table.c:1068 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1248
+#: calendar/gui/e-cal-view.c:1315 calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:40
#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
msgid "_Print..."
msgstr "打印(_P)..."
-#: calendar/gui/e-cal-view.c:1201 calendar/gui/e-cal-view.c:1227
-#: calendar/gui/e-cal-view.c:1285 calendar/gui/e-calendar-table.c:1032
-#: calendar/gui/e-calendar-table.c:1066 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-cal-view.c:1229 calendar/gui/e-cal-view.c:1255
+#: calendar/gui/e-cal-view.c:1313 calendar/gui/e-calendar-table.c:1044
+#: calendar/gui/e-calendar-table.c:1078 ui/evolution-addressbook.xml.h:38
#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
msgid "_Paste"
msgstr "粘贴(_P)"
-#: calendar/gui/e-cal-view.c:1207 calendar/gui/e-cal-view.c:1271
+#: calendar/gui/e-cal-view.c:1235 calendar/gui/e-cal-view.c:1299
#: ui/evolution-calendar.xml.h:13
msgid "Go to _Today"
msgstr "转到今天(_T)"
-#: calendar/gui/e-cal-view.c:1208 calendar/gui/e-cal-view.c:1273
+#: calendar/gui/e-cal-view.c:1236 calendar/gui/e-cal-view.c:1301
msgid "_Go to Date..."
msgstr "转到日期(_G)..."
-#: calendar/gui/e-cal-view.c:1212 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1240 ui/evolution-calendar.xml.h:40
msgid "_Publish Free/Busy Information"
msgstr "发布忙闲信息(_P)"
-#: calendar/gui/e-cal-view.c:1218 calendar/gui/e-cal-view.c:1283
-#: calendar/gui/e-calendar-table.c:1023 calendar/gui/e-calendar-table.c:1064
-#: mail/em-folder-view.c:681 shell/e-shortcuts-view.c:422
-#: ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "打开(_O)"
-
-#: calendar/gui/e-cal-view.c:1219 calendar/gui/e-cal-view.c:1289
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1070
-#: mail/em-folder-view.c:683 mail/em-popup.c:597 mail/em-popup.c:712
+#: calendar/gui/e-cal-view.c:1247 calendar/gui/e-cal-view.c:1317
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1082
+#: mail/em-folder-view.c:708 mail/em-popup.c:597 mail/em-popup.c:712
#: ui/evolution-mail-message.xml.h:126
msgid "_Save As..."
msgstr "另存为(_S)..."
-#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1265
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1059
+#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1293
+#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1071
#: 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-cal-view.c:1226 calendar/gui/e-cal-view.c:1263
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1057
-#: mail/em-folder-tree.c:1497 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1069
+#: mail/em-folder-tree.c:1649 ui/evolution-addressbook.xml.h:31
#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
msgid "_Copy"
msgstr "复制(_C)"
-#: calendar/gui/e-cal-view.c:1231
+#: calendar/gui/e-cal-view.c:1259
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
-#: calendar/gui/e-cal-view.c:1232
+#: calendar/gui/e-cal-view.c:1260
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_F)..."
-#: calendar/gui/e-cal-view.c:1237 calendar/gui/e-cal-view.c:1268
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1296
msgid "Delete this _Occurrence"
msgstr "删除此次出现(_O)"
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1269
+#: calendar/gui/e-cal-view.c:1266 calendar/gui/e-cal-view.c:1297
msgid "Delete _All Occurrences"
msgstr "删除所有出现(_A)"
-#: calendar/gui/e-cal-view.c:1291 ui/evolution.xml.h:30
+#: calendar/gui/e-cal-view.c:1319 ui/evolution.xml.h:30
msgid "_Settings..."
msgstr "设置(_S)..."
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:413
msgid "0%"
msgstr "0%"
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:414
msgid "10%"
msgstr "10%"
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:415
msgid "20%"
msgstr "20%"
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:416
msgid "30%"
msgstr "30%"
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:417
msgid "40%"
msgstr "40%"
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:418
msgid "50%"
msgstr "50%"
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:419
msgid "60%"
msgstr "60%"
-#: calendar/gui/e-calendar-table.c:418
+#: calendar/gui/e-calendar-table.c:420
msgid "70%"
msgstr "70%"
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:421
msgid "80%"
msgstr "80%"
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:422
msgid "90%"
msgstr "90%"
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:423
msgid "100%"
msgstr "100%"
-#: calendar/gui/e-calendar-table.c:1024
+#: calendar/gui/e-calendar-table.c:1036
#, fuzzy
msgid "Open _Web Page"
msgstr "打开邮件(_O)"
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1048
msgid "_Assign Task"
msgstr "委派任务(_A)"
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1049
msgid "_Forward as iCalendar"
msgstr "作为 iCalendar 转发(_F)"
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1050
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
-#: calendar/gui/e-calendar-table.c:1039
+#: calendar/gui/e-calendar-table.c:1051
msgid "_Mark Selected Tasks as Complete"
msgstr "把任务标记为完成(_M)"
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-table.c:1056 calendar/gui/e-calendar-table.c:1074
msgid "_Delete Selected Tasks"
msgstr "删除选定的任务(_D)"
-#: calendar/gui/e-calendar-table.c:1355
+#: calendar/gui/e-calendar-table.c:1367
#: calendar/gui/e-calendar-table.etspec.h:6
msgid "Click to add a task"
msgstr "点击以添加任务"
@@ -5389,7 +5629,7 @@ msgid "Alarms"
msgstr "提醒"
#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:578
msgid "Complete"
msgstr "完成"
@@ -5447,26 +5687,26 @@ 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:1342
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1348
#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1532
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:1375
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1381
#: 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:596 calendar/gui/e-week-view.c:325
+#: calendar/gui/e-day-view.c:602 calendar/gui/e-week-view.c:334
#: calendar/gui/print.c:818
msgid "am"
msgstr "上午"
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
+#: calendar/gui/e-day-view.c:605 calendar/gui/e-week-view.c:337
#: calendar/gui/print.c:820
msgid "pm"
msgstr "下午"
@@ -5589,35 +5829,29 @@ msgid "Location:"
msgstr "位置:"
#. write status
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-tasks.c:203
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-tasks.c:202
msgid "Status:"
msgstr "状态:"
#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:180
#: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
#: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:422
msgid "Accepted"
msgstr "接受"
-#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:421
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
msgid "Tentatively Accepted"
msgstr "暂时接受"
#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:181
#: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
#: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
-#: calendar/gui/itip-utils.c:450
+#: 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:988 calendar/gui/e-itip-control.glade.h:6
-#: calendar/gui/e-tasks.c:247 composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-config.glade.h:45
-msgid "Description:"
-msgstr "描述:"
-
#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
@@ -5631,7 +5865,7 @@ msgstr "更新"
#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
-#: shell/e-shell.c:1002 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1000 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "确定"
@@ -5659,9 +5893,9 @@ msgstr "更新应答者状态"
msgid "Send Latest Information"
msgstr "发送最新的信息"
-#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:438
-#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
-#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
@@ -6112,85 +6346,84 @@ msgstr "会议开始时间(_S):"
msgid "Meeting _end time:"
msgstr "会议结束时间(_E):"
-#: calendar/gui/e-tasks.c:181
+#: calendar/gui/e-tasks.c:180
#, fuzzy
msgid "Start Date:"
msgstr "开始日期(_R):"
-#: calendar/gui/e-tasks.c:197
+#: calendar/gui/e-tasks.c:196
#, fuzzy
msgid "Due Date:"
msgstr "到期日期(_D):"
#. write priority
-#: calendar/gui/e-tasks.c:225
+#: calendar/gui/e-tasks.c:224
#, fuzzy
msgid "Priority:"
msgstr "优先级(_P):"
#. URL
-#: calendar/gui/e-tasks.c:281
+#: calendar/gui/e-tasks.c:280
#, fuzzy
msgid "Web Page:"
msgstr "页面"
-#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
+#: calendar/gui/e-tasks.c:730 calendar/gui/gnome-cal.c:1890
#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "无法从“%s”中装入任务"
-
-#: calendar/gui/e-tasks.c:725
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "不支持装入“%s”必需的方法"
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr ""
+"%s 错误:\n"
+" %s"
-#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
+#: calendar/gui/e-tasks.c:793
#, c-format
-msgid "You don't have permission to open the folder in `%s'"
-msgstr "您没有适当的权限打开“%s”中的文件夹"
+msgid "Opening tasks at %s"
+msgstr "在 %s 打开任务"
-#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1978
-#, c-format
+#: calendar/gui/e-tasks.c:808
+#, fuzzy, c-format
msgid ""
-"Error on %s:\n"
-" %s"
+"Error opening %s:\n"
+"%s"
msgstr ""
"%s 错误:\n"
" %s"
-#: calendar/gui/e-tasks.c:958
+#: calendar/gui/e-tasks.c:825
+#, fuzzy
+msgid "Loading tasks"
+msgstr "装入图像"
+
+#: calendar/gui/e-tasks.c:918
msgid "Completing tasks..."
msgstr "正在完成的日期..."
-#: calendar/gui/e-tasks.c:981
+#: calendar/gui/e-tasks.c:941
msgid "Deleting selected objects..."
msgstr "正在删除选中的对象..."
-#: calendar/gui/e-tasks.c:1006
+#: calendar/gui/e-tasks.c:966
msgid "Expunging"
msgstr "正在销毁"
-#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
+#: calendar/gui/gnome-cal.c:1607 mail/importers/netscape-importer.c:1843
#: shell/e-shortcuts.c:1086
msgid "Calendar"
msgstr "日历"
-#: calendar/gui/gnome-cal.c:1737
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "无法打开“%s”中的文件夹"
-
-#: calendar/gui/gnome-cal.c:1751
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "不支持打开“%s”必需的方法"
+#: calendar/gui/gnome-cal.c:1755
+#, fuzzy, c-format
+msgid "Opening %s"
+msgstr "在 %s 中打开..."
-#: calendar/gui/gnome-cal.c:1808
+#: calendar/gui/gnome-cal.c:1766
#, fuzzy, c-format
-msgid "Adding %s"
-msgstr "正在发送“%s”"
+msgid "Could not open '%s': %s"
+msgstr "无法重命名“%s”:%s"
-#: calendar/gui/gnome-cal.c:1999
+#: calendar/gui/gnome-cal.c:1911
#, c-format
msgid ""
"The task backend for\n"
@@ -6200,7 +6433,7 @@ msgstr ""
"%s\n"
"的任务后端已经崩溃。您需要重新启动 Evolution 才能再次使用该后端"
-#: calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:1919
#, c-format
msgid ""
"The calendar backend for\n"
@@ -6210,7 +6443,7 @@ msgstr ""
"%s\n"
"的日历后端已经崩溃。您需要重新启动 Evolution 才能再次使用该后端"
-#: calendar/gui/gnome-cal.c:2867
+#: calendar/gui/gnome-cal.c:2798
#, fuzzy
msgid "Purging"
msgstr "都灵"
@@ -6271,60 +6504,65 @@ msgstr "十月"
msgid "September"
msgstr "九月"
-#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
-#: calendar/gui/itip-utils.c:347
+#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
+#: calendar/gui/itip-utils.c:351
msgid "An organizer must be set."
msgstr "必须设定组织者。"
-#: calendar/gui/itip-utils.c:302
+#: calendar/gui/itip-utils.c:306
msgid "At least one attendee is necessary"
msgstr "至少需要一个参加者"
-#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
msgid "Event information"
msgstr "事件信息"
-#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
msgid "Task information"
msgstr "任务信息"
-#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
+#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
msgid "Journal information"
msgstr "日志信息"
-#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
+#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
msgid "Free/Busy information"
msgstr "忙闲信息"
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:402
msgid "Calendar information"
msgstr "日历信息"
-#: calendar/gui/itip-utils.c:434
+#: calendar/gui/itip-utils.c:438
msgid "Updated"
msgstr "更新"
-#: calendar/gui/itip-utils.c:442
+#: calendar/gui/itip-utils.c:446
msgid "Refresh"
msgstr "刷新"
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/itip-utils.c:450
msgid "Counter-proposal"
msgstr "投票表决"
-#: calendar/gui/itip-utils.c:517
+#: calendar/gui/itip-utils.c:521
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "忙闲信息 (%s 到 %s)"
-#: calendar/gui/itip-utils.c:527
+#: calendar/gui/itip-utils.c:531
msgid "iCalendar information"
msgstr "iCalendar 信息"
-#: calendar/gui/itip-utils.c:667
+#: calendar/gui/itip-utils.c:671
msgid "You must be an attendee of the event."
msgstr "您必须是事件的参与者。"
+#: calendar/gui/itip-utils.c:1155
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "为 %s 输入密码"
+
#: calendar/gui/print.c:476
msgid "1st"
msgstr "1日"
@@ -6544,7 +6782,7 @@ msgid "Contacts: "
msgstr "联系人:"
#: calendar/gui/print.c:2530 calendar/gui/print.c:2616
-#: calendar/gui/tasks-control.c:567 mail/em-format-html-print.c:147
+#: calendar/gui/tasks-control.c:582 mail/em-format-html-print.c:147
msgid "Print Preview"
msgstr "打印预览"
@@ -6561,57 +6799,52 @@ msgstr "打印设置"
msgid "Task List '%s' will be removed. Are you sure you want to continue?"
msgstr ""
-#: calendar/gui/tasks-component.c:391
-#, fuzzy
-msgid "Rename this task list to"
-msgstr "重命名此快捷方式"
-
-#: calendar/gui/tasks-component.c:412
-#, fuzzy
-msgid "New Task List"
-msgstr "任务列表"
-
-#: calendar/gui/tasks-component.c:587
+#: calendar/gui/tasks-component.c:622
msgid "New task"
msgstr "新建任务"
-#: calendar/gui/tasks-component.c:588
+#: calendar/gui/tasks-component.c:623
msgid "_Task"
msgstr "任务(_T)"
-#: calendar/gui/tasks-component.c:589
+#: calendar/gui/tasks-component.c:624
msgid "Create a new task"
msgstr "创建新任务"
-#: calendar/gui/tasks-component.c:594
+#: calendar/gui/tasks-component.c:629
#, fuzzy
msgid "New task list"
msgstr "任务列表"
-#: calendar/gui/tasks-component.c:595
+#: calendar/gui/tasks-component.c:630
#, fuzzy
msgid "_Task List"
msgstr "任务列表"
-#: calendar/gui/tasks-component.c:596
+#: calendar/gui/tasks-component.c:631
#, fuzzy
msgid "Create a new task list"
msgstr "创建新任务"
-#: calendar/gui/tasks-component.c:663
+#: calendar/gui/tasks-component.c:698
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr ""
-#: calendar/gui/tasks-component.c:676
+#: calendar/gui/tasks-component.c:710
msgid "There is no calendar available for creating tasks"
msgstr ""
-#: calendar/gui/tasks-control.c:148
+#: calendar/gui/tasks-control.c:151
msgid "The URI of the tasks folder to display"
msgstr "要显示的任务文件夹的 URI"
-#: calendar/gui/tasks-control.c:450
+#: calendar/gui/tasks-control.c:203
+#, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "无法从“%s”中装入任务"
+
+#: calendar/gui/tasks-control.c:466
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -6622,11 +6855,11 @@ msgstr ""
"\n"
"确实删除这些任务吗?"
-#: calendar/gui/tasks-control.c:454
+#: calendar/gui/tasks-control.c:469
msgid "Do not ask me again."
msgstr "不要再次询问。"
-#: calendar/gui/tasks-control.c:596
+#: calendar/gui/tasks-control.c:611
msgid "Print Tasks"
msgstr "打印任务"
@@ -8262,11 +8495,15 @@ msgstr ""
msgid "Resynchronizing with server"
msgstr "正在重新与服务器同步"
-#: camel/camel-disco-folder.c:90
+#: camel/camel-disco-folder.c:41
+msgid "Copy folder content locally for offline operation"
+msgstr ""
+
+#: camel/camel-disco-folder.c:101
msgid "Downloading new messages for offline mode"
msgstr ""
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:441
#, c-format
msgid "Preparing folder '%s' for offline"
msgstr "正在准备脱机文件夹“%s”"
@@ -8444,7 +8681,7 @@ msgstr ""
#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:572
+#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:574
msgid "Cancelled."
msgstr "已取消"
@@ -8801,7 +9038,7 @@ msgstr "引用的证书已过期。"
#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1217
+#: camel/providers/imap/camel-imap-store.c:1221
msgid "Bad authentication response from server."
msgstr "来自服务器的无效认证应答。"
@@ -9022,11 +9259,11 @@ msgid "Cannot create folder: Invalid operation on this store"
msgstr "无法创建文件夹:对该存储的无效操作"
#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1119
+#: mail/mail-ops.c:1102
msgid "Trash"
msgstr "回收站"
-#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: camel/camel-store.c:793 mail/mail-ops.c:1108
#: ui/evolution-mail-message.xml.h:46
#, fuzzy
msgid "Junk"
@@ -9279,15 +9516,58 @@ msgstr "无法重命名文件夹:%s:无效操作"
msgid "Cannot rename folder: %s: No such folder"
msgstr "无法重命名文件夹:%s:没有该文件夹"
+#: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Checking for new mail"
+msgstr "正在检查新邮件"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:55
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Check for new messages in all folders"
+msgstr "在所有文件夹中检查新邮件"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:71
+#, fuzzy
+msgid "Apply filters to new messages in Inbox on this server"
+msgstr "应用过滤规则到本服务器上收件箱中的新邮件"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Automatically synchronize remote mail locally"
+msgstr "自动检查邮件的间隔(_A)"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
+msgid "Novell GroupWise"
+msgstr ""
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:84
+msgid "For accesing Novell Groupwise servers"
+msgstr ""
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/imap/camel-imap-provider.c:89
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-provider.c:71
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "密码"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:101
+#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imapp/camel-imapp-provider.c:67
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
+
#: camel/providers/imap/camel-imap-command.c:221
#: camel/providers/imap/camel-imap-command.c:260
#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2817
+#: camel/providers/imap/camel-imap-store.c:2821
msgid "Operation cancelled"
msgstr "操作已取消"
#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2820
+#: camel/providers/imap/camel-imap-store.c:2824
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "服务器意外地中止了连接:%s"
@@ -9336,21 +9616,21 @@ msgstr "无法创建目录 %s:%s"
msgid "Could not load summary for %s"
msgstr "无法为 %s 装入概要"
-#: camel/providers/imap/camel-imap-folder.c:308
+#: camel/providers/imap/camel-imap-folder.c:314
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:550
+#: camel/providers/imap/camel-imap-folder.c:560
msgid "Scanning for changed messages"
msgstr "正在扫描改变了的邮件"
-#: camel/providers/imap/camel-imap-folder.c:1886
+#: camel/providers/imap/camel-imap-folder.c:1899
#, c-format
msgid "Unable to retrieve message: %s"
msgstr "无法检索邮件:%s"
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
#: camel/providers/local/camel-maildir-folder.c:211
#: camel/providers/local/camel-maildir-folder.c:224
#: camel/providers/local/camel-maildir-folder.c:233
@@ -9366,24 +9646,25 @@ msgstr ""
"无法获取邮件:%s\n"
" %s"
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
#: 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:1946
-#: camel/providers/imap/camel-imap-folder.c:2542
+#: camel/providers/imap/camel-imap-folder.c:1959
+#: camel/providers/imap/camel-imap-folder.c:2555
+#: camel/providers/nntp/camel-nntp-folder.c:205
msgid "This message is not currently available"
msgstr "该邮件目前不可用"
-#: camel/providers/imap/camel-imap-folder.c:2206
-#: camel/providers/imap/camel-imap-folder.c:2276
+#: camel/providers/imap/camel-imap-folder.c:2219
+#: camel/providers/imap/camel-imap-folder.c:2289
msgid "Fetching summary information for new messages"
msgstr "从新邮件中获取概要信息"
-#: camel/providers/imap/camel-imap-folder.c:2580
+#: camel/providers/imap/camel-imap-folder.c:2593
msgid "Could not find message body in FETCH response."
msgstr "无法在 FETCH 应答中找到邮件体。"
@@ -9420,15 +9701,8 @@ msgstr "连接 LDAP 服务器失败"
msgid "Command:"
msgstr "公司"
-#: camel/providers/imap/camel-imap-provider.c:50
-msgid "Checking for new mail"
-msgstr "正在检查新邮件"
-
-#: camel/providers/imap/camel-imap-provider.c:52
-msgid "Check for new messages in all folders"
-msgstr "在所有文件夹中检查新邮件"
-
#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/nntp/camel-nntp-provider.c:41
msgid "Folders"
msgstr "文件夹"
@@ -9448,11 +9722,6 @@ msgstr "命名空间"
msgid "Apply filters to new messages in INBOX on this server"
msgstr "应用过滤规则到本服务器上收件箱中的新邮件"
-#: camel/providers/imap/camel-imap-provider.c:66
-#, fuzzy
-msgid "Automatically synchronize remote mail locally"
-msgstr "自动检查邮件的间隔(_A)"
-
#: camel/providers/imap/camel-imap-provider.c:72
msgid "IMAP"
msgstr "IMAP"
@@ -9461,18 +9730,6 @@ msgstr "IMAP"
msgid "For reading and storing mail on IMAP servers."
msgstr "IMAP 服务器上的邮件的读写。"
-#: camel/providers/imap/camel-imap-provider.c:89
-#: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
-msgid "Password"
-msgstr "密码"
-
-#: camel/providers/imap/camel-imap-provider.c:91
-#: camel/providers/imapp/camel-imapp-provider.c:67
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
-
#: camel/providers/imap/camel-imap-store.c:459
#, c-format
msgid "IMAP server %s"
@@ -9486,7 +9743,7 @@ msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
#: camel/providers/imap/camel-imap-store.c:582
#: camel/providers/imap/camel-imap-store.c:602
#: camel/providers/imapp/camel-imapp-store.c:236
-#: camel/providers/nntp/camel-nntp-store.c:131
+#: camel/providers/nntp/camel-nntp-store.c:140
#: camel/providers/pop3/camel-pop3-store.c:177
#: camel/providers/smtp/camel-smtp-transport.c:269
#: camel/providers/smtp/camel-smtp-transport.c:285
@@ -9504,8 +9761,8 @@ msgstr "TLS 不可用"
#: camel/providers/imap/camel-imap-store.c:599
#: camel/providers/imap/camel-imap-store.c:831
#: camel/providers/imapp/camel-imapp-store.c:233
-#: camel/providers/nntp/camel-nntp-store.c:128
-#: camel/providers/nntp/camel-nntp-store.c:146
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
#: camel/providers/pop3/camel-pop3-store.c:194
msgid "Connection cancelled"
msgstr "连接已取消"
@@ -9531,28 +9788,28 @@ msgstr "SSL 协商失败"
msgid "Could not connect with command \"%s\": %s"
msgstr "无法连接到 %s (端口 %d):%s"
-#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/imap/camel-imap-store.c:1251
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
-#: camel/providers/imap/camel-imap-store.c:1257
+#: camel/providers/imap/camel-imap-store.c:1261
#: camel/providers/smtp/camel-smtp-transport.c:486
#, c-format
msgid "No support for authentication type %s"
msgstr "不支持验证类型 %s"
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1284
#: camel/providers/imapp/camel-imapp-store.c:349
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%s请为 %s@%s 输入 IMAP 密码"
-#: camel/providers/imap/camel-imap-store.c:1294
+#: camel/providers/imap/camel-imap-store.c:1298
msgid "You didn't enter a password."
msgstr "您没有输入密码。"
-#: camel/providers/imap/camel-imap-store.c:1323
+#: camel/providers/imap/camel-imap-store.c:1327
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -9563,24 +9820,24 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:1670
-#: camel/providers/imap/camel-imap-store.c:1812
+#: camel/providers/imap/camel-imap-store.c:1674
+#: camel/providers/imap/camel-imap-store.c:1816
#, c-format
msgid "No such folder %s"
msgstr "没有文件夹 %s"
-#: camel/providers/imap/camel-imap-store.c:2013
+#: camel/providers/imap/camel-imap-store.c:2017
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it containes the character \"%c\""
msgstr "文件夹名“%s”无效,原因是其中含有字符“%c”"
-#: camel/providers/imap/camel-imap-store.c:2025
+#: camel/providers/imap/camel-imap-store.c:2029
#, c-format
msgid "Unknown parent folder: %s"
msgstr "未知的父文件夹:%s"
-#: camel/providers/imap/camel-imap-store.c:2061
+#: camel/providers/imap/camel-imap-store.c:2065
msgid "The parent folder is not allowed to contain subfolders"
msgstr "父文件夹不允许含有子文件夹"
@@ -9997,7 +10254,7 @@ msgstr "无法关闭来源文件夹 %s:%s"
msgid "Could not close temp folder: %s"
msgstr "无法关闭临时文件夹:%s"
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1286
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1410
#, c-format
msgid "Could not rename folder: %s"
msgstr "无法重命名文件夹:%s"
@@ -10116,6 +10373,7 @@ msgstr ""
"文件夹可能已损坏,副本保存在“%s”"
#: camel/providers/nntp/camel-nntp-auth.c:44
+#: camel/providers/nntp/camel-nntp-store.c:998
#, fuzzy, c-format
msgid "Please enter the NNTP password for %s@%s"
msgstr "%s请为 %s@%s 输入 SMTP 密码"
@@ -10133,13 +10391,18 @@ msgstr "连接 LDAP 服务器失败"
msgid "Server rejected username/password"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:114
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
+#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:230
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "用户已取消"
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
+#: 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/pop3/camel-pop3-folder.c:433
#: camel/providers/pop3/camel-pop3-folder.c:494
#: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10148,13 +10411,51 @@ msgstr ""
msgid "Cannot get message %s: %s"
msgstr "无法获取消息 %s:%s"
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "用户已取消"
+#: camel/providers/nntp/camel-nntp-folder.c:157
+#: camel/providers/nntp/camel-nntp-folder.c:195
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:170
+#, fuzzy, c-format
+msgid "Could not get article %s from NNTP server"
+msgstr "无法获取组:%s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:353
+msgid "Posting not allowed by news server"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:364
+#, 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
+#, c-format
+msgid "Error posting to newsgroup: %s: message not posted"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:429
+msgid "Error reading response to posted message: message not posted"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:432
+#, fuzzy, c-format
+msgid "Error posting message: %s: message not posted"
+msgstr ""
+"自动存储邮件错误:%s\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:448
+msgid "You cannot post NNTP messages while working offline!"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:459
+#, fuzzy
+msgid "You cannot copy messages from a NNTP folder!"
+msgstr "无法关闭临时文件夹:%s"
#: camel/providers/nntp/camel-nntp-grouplist.c:45
#, fuzzy
@@ -10176,66 +10477,128 @@ msgstr ""
"无法创建输出文件:%s\n"
" %s"
-#: camel/providers/nntp/camel-nntp-provider.c:41
+#: camel/providers/nntp/camel-nntp-provider.c:43
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:45
+msgid "In the subscription dialog, show relative folder names"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:52
msgid "USENET news"
msgstr "USENET 新闻"
-#: camel/providers/nntp/camel-nntp-provider.c:43
+#: camel/providers/nntp/camel-nntp-provider.c:54
msgid "This is a provider for reading from and posting toUSENET newsgroups."
msgstr "这是一个从 USENET 新闻组和向 USENET 新闻组发布消息的提供者。"
-#: camel/providers/nntp/camel-nntp-store.c:149
+#: camel/providers/nntp/camel-nntp-provider.c:73
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr "该选项将以明文密码向进行 NNTP 服务器进行认证。"
+
+#: camel/providers/nntp/camel-nntp-store.c:158
#, c-format
msgid "Could not read greeting from %s: %s"
msgstr "无法阅读来自 %s 的欢迎信息:%s"
-#: camel/providers/nntp/camel-nntp-store.c:161
+#: camel/providers/nntp/camel-nntp-store.c:170
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "NNTP 服务器 %s 返回错误码 %d:%s"
-#: camel/providers/nntp/camel-nntp-store.c:260
+#: camel/providers/nntp/camel-nntp-store.c:326
#, c-format
msgid "USENET News via %s"
msgstr "USENET 新闻 %s"
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/nntp/camel-nntp-store.c:641
+#, fuzzy
+msgid "Stream error"
+msgstr "解析错误"
+
+#: camel/providers/nntp/camel-nntp-store.c:644
+#, fuzzy, c-format
msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr "该选项将以明文密码向进行 NNTP 服务器进行认证。"
+"Error retrieving newsgroups:\n"
+"\n"
+"%s"
+msgstr ""
+"在将邮件保存到 %s 时发生错误:\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:736
+msgid ""
+"You cannot subscribe to this newsgroup:\n"
+"\n"
+"No such newsgroup. The selected item is a probably a parent folder."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:768
+msgid ""
+"You cannot unsubscribe to this newsgroup:\n"
+"\n"
+"newsgroup does not exist!"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:793
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:801
+#, fuzzy
+msgid "You cannot rename a folder in a News store."
+msgstr "无法将文件夹 %s 改名为 %s:%s"
+
+#: camel/providers/nntp/camel-nntp-store.c:809
+#, fuzzy
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr "无法把文件夹移动到其子目录。"
+
+#: camel/providers/nntp/camel-nntp-summary.c:229
+#, fuzzy, c-format
+msgid "Connection error: %s"
+msgstr "未知的错误:%s"
-#: camel/providers/nntp/camel-nntp-summary.c:237
+#: camel/providers/nntp/camel-nntp-summary.c:240
#, c-format
msgid "No such folder: %s"
msgstr "没有文件夹:%s"
-#: camel/providers/nntp/camel-nntp-summary.c:241
+#: camel/providers/nntp/camel-nntp-summary.c:246
#, c-format
msgid "Could not get group: %s"
msgstr "无法获取组:%s"
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-summary.c:311
+#, fuzzy
+msgid "Could not get messages: unspecificed error"
+msgstr "无法发送邮件:%s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:356
#, c-format
msgid "NNTP Command failed: %s"
msgstr "NNTP 命令失败:%s"
-#: camel/providers/nntp/camel-nntp-summary.c:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: camel/providers/nntp/camel-nntp-summary.c:416
+#: camel/providers/nntp/camel-nntp-summary.c:517
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s:正在扫描新消息"
-#: camel/providers/nntp/camel-nntp-summary.c:523
+#: camel/providers/nntp/camel-nntp-summary.c:532
#, c-format
msgid "Unknown server response: %s"
msgstr "未知的服务器应答:%s"
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:579
msgid "Use cancel"
msgstr "使用取消"
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:581
#, c-format
msgid "Operation failed: %s"
msgstr "操作失败:%s"
@@ -10586,7 +10949,7 @@ msgstr "通过 %s 发送 SMTP 邮件"
msgid "Cannot send message: sender address not valid."
msgstr "无法发送邮件:发件人地址不合法。"
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:611
msgid "Sending message"
msgstr "正在发送邮件"
@@ -10707,7 +11070,7 @@ msgstr "%.0fM"
msgid "%.0fG"
msgstr "%.0fG"
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1382
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
msgid "attachment"
msgstr "附件"
@@ -10751,11 +11114,20 @@ msgstr "MIME 类型:"
msgid "Suggest automatic display of attachment"
msgstr "建议自动显示附件"
-#: composer/e-msg-composer-hdrs.c:287
+#: composer/e-msg-composer-hdrs.c:304
msgid "You need to configure an account before you can compose mail."
msgstr "在您可以撰写邮件之前您需要配置一个帐户。"
-#: composer/e-msg-composer-hdrs.c:480
+#: composer/e-msg-composer-hdrs.c:507
+msgid "Posting destination"
+msgstr "投递目的"
+
+#: composer/e-msg-composer-hdrs.c:508
+#, fuzzy
+msgid "Choose folders to post the message to."
+msgstr "把文件附件到邮件"
+
+#: composer/e-msg-composer-hdrs.c:542
msgid "Click here for the address book"
msgstr "点击此处以使用地址簿"
@@ -10766,45 +11138,45 @@ msgstr "点击此处以使用地址簿"
#. * because that causes from_changed to be called, which
#. * expects the reply_to fields to be initialized.
#.
-#: composer/e-msg-composer-hdrs.c:510
+#: composer/e-msg-composer-hdrs.c:572
msgid "Reply-To:"
msgstr "回复到:"
#.
#. * From
#.
-#: composer/e-msg-composer-hdrs.c:516
+#: composer/e-msg-composer-hdrs.c:578
msgid "From:"
msgstr "发件人:"
#.
#. * Subject
#.
-#: composer/e-msg-composer-hdrs.c:522
+#: composer/e-msg-composer-hdrs.c:584
msgid "Subject:"
msgstr "主题:"
-#: composer/e-msg-composer-hdrs.c:531
+#: composer/e-msg-composer-hdrs.c:593
msgid "To:"
msgstr "收信人:"
-#: composer/e-msg-composer-hdrs.c:532
+#: composer/e-msg-composer-hdrs.c:594
msgid "Enter the recipients of the message"
msgstr "输入邮件的收件人"
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:597
msgid "Cc:"
msgstr "抄送:"
-#: composer/e-msg-composer-hdrs.c:536
+#: composer/e-msg-composer-hdrs.c:598
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "输入将接收该邮件副本的收件人地址"
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:601
msgid "Bcc:"
msgstr "暗中抄送:"
-#: composer/e-msg-composer-hdrs.c:540
+#: composer/e-msg-composer-hdrs.c:602
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -10813,36 +11185,32 @@ msgstr "输入将接收该邮件副本,但不出现在收件人列表中的收
#.
#. * Post-To
#.
-#: composer/e-msg-composer-hdrs.c:547
+#: composer/e-msg-composer-hdrs.c:609
msgid "Post To:"
msgstr "投递到:"
-#: composer/e-msg-composer-hdrs.c:548
-msgid "Posting destination"
-msgstr "投递目的"
-
-#: composer/e-msg-composer-hdrs.c:548
+#: composer/e-msg-composer-hdrs.c:614
#, fuzzy
-msgid "Choose a folder to post the message to."
-msgstr "把文件附件到邮件"
+msgid "Click here to select folders to post to"
+msgstr "<点击这里以便选择文件夹>"
#: composer/e-msg-composer-select-file.c:119
msgid "Attach file(s)"
msgstr "添加附件"
-#: composer/e-msg-composer.c:651
+#: composer/e-msg-composer.c:654
#, fuzzy
msgid ""
"Cannot sign outgoing message: No signing certificate set for from account"
msgstr "当使用该帐号时总是发送签名邮件(_A)"
-#: composer/e-msg-composer.c:657
+#: composer/e-msg-composer.c:660
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for from "
"account"
msgstr ""
-#: composer/e-msg-composer.c:788
+#: composer/e-msg-composer.c:791
#, c-format
msgid ""
"Error while reading file %s:\n"
@@ -10851,30 +11219,30 @@ msgstr ""
"读入文件 %s 时发声错误:\n"
"%s"
-#: composer/e-msg-composer.c:1153
+#: composer/e-msg-composer.c:1143
msgid "File exists, overwrite?"
msgstr "文件存在,覆盖它?"
-#: composer/e-msg-composer.c:1164 composer/e-msg-composer.c:1180
+#: composer/e-msg-composer.c:1154 composer/e-msg-composer.c:1170
#, c-format
msgid "Error saving file: %s"
msgstr "保存文件错误:%s"
-#: composer/e-msg-composer.c:1204
+#: composer/e-msg-composer.c:1194
#, c-format
msgid "Error loading file: %s"
msgstr "读入文件错误:%s"
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1232
#, c-format
msgid "Error accessing file: %s"
msgstr "访问文件错误:%s"
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1240
msgid "Unable to retrieve message from editor"
msgstr "无法从编辑器检索邮件"
-#: composer/e-msg-composer.c:1257
+#: composer/e-msg-composer.c:1247
#, c-format
msgid ""
"Unable to seek on file: %s\n"
@@ -10883,7 +11251,7 @@ msgstr ""
"无法搜索文件:%s\n"
"%s"
-#: composer/e-msg-composer.c:1264
+#: composer/e-msg-composer.c:1254
#, c-format
msgid ""
"Unable to truncate file: %s\n"
@@ -10892,7 +11260,7 @@ msgstr ""
"无法截断文件:%s\n"
"%s"
-#: composer/e-msg-composer.c:1273
+#: composer/e-msg-composer.c:1263
#, c-format
msgid ""
"Unable to copy file descriptor: %s\n"
@@ -10901,7 +11269,7 @@ msgstr ""
"无法复制文件描述符:%s\n"
"%s"
-#: composer/e-msg-composer.c:1282
+#: composer/e-msg-composer.c:1272
#, c-format
msgid ""
"Error autosaving message: %s\n"
@@ -10910,15 +11278,16 @@ msgstr ""
"自动存储邮件错误:%s\n"
" %s"
-#: composer/e-msg-composer.c:1386
+#: composer/e-msg-composer.c:1376
+#, fuzzy
msgid ""
-"Ximian Evolution has found unsaved files from a previous session.\n"
+"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:1550
+#: composer/e-msg-composer.c:1540
#, c-format
msgid ""
"The message \"%s\" has not been sent.\n"
@@ -10929,28 +11298,43 @@ msgstr ""
"\n"
"您是否希望保存修改?"
-#: composer/e-msg-composer.c:1559
+#: composer/e-msg-composer.c:1549
msgid "Warning: Modified Message"
msgstr "警告:已改动的邮件"
-#: composer/e-msg-composer.c:1592
+#: composer/e-msg-composer.c:1582
msgid "Open file"
msgstr "打开文件"
-#: composer/e-msg-composer.c:2011
+#: composer/e-msg-composer.c:2027
msgid "Signature:"
msgstr "签名:"
-#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2067 mail/mail-account-gui.c:1260
msgid "Autogenerated"
msgstr "自动生成的"
-#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
-#: composer/e-msg-composer.c:2930
+#: composer/e-msg-composer.c:2245
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2274
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2277 composer/e-msg-composer.c:3136
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2294 composer/e-msg-composer.c:3020
+#: composer/e-msg-composer.c:3021
msgid "Compose a message"
msgstr "撰写邮件"
-#: composer/e-msg-composer.c:2961
+#: composer/e-msg-composer.c:3052
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
@@ -10958,7 +11342,7 @@ msgstr ""
"无法创建撰写窗口:\n"
"无法激活地址选择控制。"
-#: composer/e-msg-composer.c:2991
+#: composer/e-msg-composer.c:3081
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component.\n"
@@ -10970,7 +11354,7 @@ msgstr ""
"请确定您的 gtkhtml 和 libgtkhtml 所安装的版\n"
"本正确。\n"
-#: composer/e-msg-composer.c:3061
+#: composer/e-msg-composer.c:3182
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
@@ -10978,7 +11362,7 @@ msgstr ""
"无法创建撰写窗口:\n"
"无法激活 HTML 编辑器组件。"
-#: composer/e-msg-composer.c:4071
+#: composer/e-msg-composer.c:4190
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -11002,46 +11386,6 @@ msgstr "地址卡"
msgid "calendar information"
msgstr "日历信息"
-#: default_user/searches.xml.h:1
-msgid "Body contains"
-msgstr "邮件体含有"
-
-#: default_user/searches.xml.h:2
-msgid "Body does not contain"
-msgstr "邮件体不含有"
-
-#: default_user/searches.xml.h:3
-msgid "Body or subject contains"
-msgstr "邮件体或主题含有"
-
-#: default_user/searches.xml.h:4
-msgid "Message contains"
-msgstr "邮件含有"
-
-#: default_user/searches.xml.h:5
-msgid "Recipients contain"
-msgstr "收件人含有"
-
-#: default_user/searches.xml.h:6
-msgid "Sender contains"
-msgstr "发件人含有"
-
-#: default_user/searches.xml.h:7
-msgid "Subject contains"
-msgstr "主题含有"
-
-#: default_user/searches.xml.h:8
-msgid "Subject does not contain"
-msgstr "主题不含有"
-
-#: default_user/vfolders.xml.h:1
-msgid "Important mail (local)"
-msgstr "重要邮件(本地)"
-
-#: default_user/vfolders.xml.h:2
-msgid "Unread mail (local)"
-msgstr "未读邮件(本地)"
-
#: designs/OOA/ooa.glade.h:1
msgid ""
"<b>Currently, your status is \"Out of the Office\". </b>\n"
@@ -11396,7 +11740,7 @@ msgstr "待办"
msgid "Later"
msgstr "稍候"
-#: filter/filter-part.c:531
+#: filter/filter-part.c:531 shell/GNOME_Evolution_Test.server.in.in.h:3
msgid "Test"
msgstr "测试"
@@ -11587,7 +11931,8 @@ msgstr "表达式"
msgid "Follow Up"
msgstr "跟随"
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:714
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:739
+#: widgets/misc/e-expander.c:189
msgid "Label"
msgstr "标签"
@@ -11669,7 +12014,7 @@ msgstr "指定邮件头"
msgid "Stop Processing"
msgstr "停止处理"
-#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1449 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1472 mail/em-format.c:679
#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
msgid "Subject"
@@ -11793,6 +12138,38 @@ msgstr "规则名"
msgid "Score Rules"
msgstr "计分规则"
+#: filter/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "邮件体含有"
+
+#: filter/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "邮件体不含有"
+
+#: filter/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "邮件体或主题含有"
+
+#: filter/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "邮件含有"
+
+#: filter/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "收件人含有"
+
+#: filter/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "发件人含有"
+
+#: filter/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "主题含有"
+
+#: filter/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "主题不含有"
+
#: filter/vfolder-rule.c:209
msgid "You must name this vfolder."
msgstr "您必须为该虚拟文件夹命名。"
@@ -11850,7 +12227,7 @@ msgstr "Evolution 邮件文件夹查看器"
msgid "Evolution Mail preferences control"
msgstr "Evolution 邮件首选项控件"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:804
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:806
#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
#: mail/importers/pine-importer.c:572
msgid "Mail"
@@ -11966,11 +12343,11 @@ msgstr ""
"邮件服务器可能会以添加 Apparent-To 头而使收件人可见。\n"
"仍然发送?"
-#: mail/em-composer-utils.c:301
+#: mail/em-composer-utils.c:305
msgid "You must specify recipients in order to send this message."
msgstr "您必须指定收件人以便发送该消息。"
-#: mail/em-composer-utils.c:543
+#: mail/em-composer-utils.c:579
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
@@ -11982,7 +12359,7 @@ msgstr ""
msgid "Create _Virtual Folder From Search..."
msgstr "根据搜索创建虚拟文件夹(_V)..."
-#: mail/em-folder-selection-button.c:116
+#: mail/em-folder-selection-button.c:120
#: shell/evolution-folder-selector-button.c:100
msgid "<click here to select a folder>"
msgstr "<点击这里以便选择文件夹>"
@@ -11991,7 +12368,7 @@ msgstr "<点击这里以便选择文件夹>"
msgid "Create New Folder"
msgstr "创建新文件夹"
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1189
#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
msgid "Specify where to create the folder:"
msgstr "指定在哪里创建文件夹:"
@@ -12001,392 +12378,413 @@ msgstr "指定在哪里创建文件夹:"
msgid "Folder _name:"
msgstr "文件夹名称(_N):"
-#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1994
+#: mail/em-folder-tree-model.c:560 mail/em-utils.c:2085
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "无法创建临时目录:%s"
-#: mail/em-folder-tree-model.c:568
+#: mail/em-folder-tree-model.c:569
#, fuzzy, c-format
msgid "Could not create temporary mbox store: %s"
msgstr "无法创建临时目录:%s"
-#: mail/em-folder-tree-model.c:577
+#: mail/em-folder-tree-model.c:578
#, fuzzy, c-format
msgid "Could not create temporary mbox folder: %s"
msgstr "无法创建临时文件“%s”:%s"
-#: mail/em-folder-tree-model.c:592
+#: mail/em-folder-tree-model.c:593
#, fuzzy, c-format
msgid "Could not copy messages to temporary mbox folder: %s"
msgstr "无法关闭临时文件夹:%s"
-#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+#: mail/em-folder-tree-model.c:772 mail/em-folder-tree-model.c:1062
msgid "Loading..."
msgstr "装入..."
-#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#: mail/em-folder-tree.c:1067 mail/em-folder-tree.c:1154
#, c-format
msgid "%s"
msgstr ""
-#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
-#: mail/em-folder-view.c:591 mail/em-folder-view.c:605
+#: mail/em-folder-tree.c:1083 mail/em-folder-tree.c:1096
+#: mail/em-folder-view.c:616 mail/em-folder-view.c:630
#: shell/e-shell-importer.c:1060
msgid "Select folder"
msgstr "选择文件夹"
-#: mail/em-folder-tree.c:1091
+#: mail/em-folder-tree.c:1189
#, fuzzy
msgid "Create folder"
msgstr "创建新文件夹"
-#: mail/em-folder-tree.c:1182
+#: mail/em-folder-tree.c:1306
#, fuzzy, c-format
msgid "Could not delete folder: %s"
msgstr "无法删除文件夹“%s”:%s"
-#: mail/em-folder-tree.c:1203
+#: mail/em-folder-tree.c:1327
#, fuzzy, c-format
msgid "Really delete folder \"%s\" and all of its subfolders?"
msgstr "您真的要删除文件夹“%s”吗?"
-#: mail/em-folder-tree.c:1213 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:1337 shell/e-shell-folder-commands.c:416
#, c-format
msgid "Delete \"%s\""
msgstr "删除“%s”"
-#: mail/em-folder-tree.c:1247 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:1371 shell/e-shell-folder-commands.c:534
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "把文件夹“%s”重命名为:"
-#: mail/em-folder-tree.c:1249 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:1373 shell/e-shell-folder-commands.c:541
msgid "Rename Folder"
msgstr "重命名文件夹"
-#: mail/em-folder-tree.c:1273 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:1397 shell/e-shell-folder-commands.c:554
#, c-format
msgid "A folder named \"%s\" already exists. Please use a different name."
msgstr "已经存在名为“%s”的文件夹。请使用不同的名称。"
-#: mail/em-folder-tree.c:1371
+#: mail/em-folder-tree.c:1497
#, fuzzy
msgid "Folder properties"
msgstr "字体属性"
#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-tree.c:1377
+#: mail/em-folder-tree.c:1503
msgid "Properties"
msgstr "属性"
-#: mail/em-folder-tree.c:1385
+#. TODO: can this be done in a loop?
+#: mail/em-folder-tree.c:1512
#, fuzzy
msgid "Folder Name"
msgstr "文件夹名称(_F):"
-#: mail/em-folder-tree.c:1492 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:1523
+#, fuzzy
+msgid "Total messages"
+msgstr "求助消息"
+
+#: mail/em-folder-tree.c:1535
+#, fuzzy
+msgid "Unread messages"
+msgstr "下一封未读邮件(_U)"
+
+#: mail/em-folder-tree.c:1644 ui/evolution-addressbook.xml.h:45
#: ui/evolution-mail-global.xml.h:20 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:32
msgid "_View"
msgstr "查看(_V)"
-#: mail/em-folder-tree.c:1493
+#: mail/em-folder-tree.c:1645
#, fuzzy
msgid "Open in _New Window"
msgstr "在新窗口中打开"
-#: mail/em-folder-tree.c:1498
+#: mail/em-folder-tree.c:1650
#, fuzzy
msgid "_Move"
msgstr "移动"
-#: mail/em-folder-tree.c:1501
+#: mail/em-folder-tree.c:1653
msgid "_New Folder..."
msgstr "新建文件夹(_N)..."
-#: mail/em-folder-tree.c:1503 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:1655 shell/e-shortcuts-view.c:427
msgid "_Rename"
msgstr "重命名(_R)"
-#: mail/em-folder-tree.c:1506 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:1658 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:682 mail/em-popup.c:596
+#: mail/em-folder-view.c:707 mail/em-popup.c:596
msgid "_Edit as New Message..."
msgstr "作为新邮件进行编辑(_E)..."
-#: mail/em-folder-view.c:684
+#: mail/em-folder-view.c:709
msgid "_Print"
msgstr "打印(_P)"
-#: mail/em-folder-view.c:687 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:712 ui/evolution-mail-message.xml.h:124
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
-#: mail/em-folder-view.c:688 mail/em-popup.c:716
+#: mail/em-folder-view.c:713 mail/em-popup.c:716
#: ui/evolution-mail-message.xml.h:86
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
-#: mail/em-folder-view.c:689 mail/em-popup.c:717
+#: mail/em-folder-view.c:714 mail/em-popup.c:717
#: ui/evolution-mail-message.xml.h:85
msgid "Reply to _All"
msgstr "回复所有人(_A)"
-#: mail/em-folder-view.c:690 mail/em-popup.c:719
+#: mail/em-folder-view.c:715 mail/em-popup.c:719
#: ui/evolution-mail-message.xml.h:111
msgid "_Forward"
msgstr "转发(_F)"
-#: mail/em-folder-view.c:693
+#: mail/em-folder-view.c:718
msgid "Follo_w Up..."
msgstr "跟随(_W)..."
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:719
msgid "Fla_g Completed"
msgstr "已完成标志(_G)"
-#: mail/em-folder-view.c:695
+#: mail/em-folder-view.c:720
msgid "Cl_ear Flag"
msgstr "清除标志(_E)"
-#: mail/em-folder-view.c:698 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:723 ui/evolution-mail-message.xml.h:48
msgid "Mar_k as Read"
msgstr "标记为已读(_K)"
-#: mail/em-folder-view.c:699
+#: mail/em-folder-view.c:724
msgid "Mark as _Unread"
msgstr "标记为未读(_U)"
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:725
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:726
msgid "_Mark as Unimportant"
msgstr "标记为不重要(_M)"
-#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:727 ui/evolution-mail-message.xml.h:52
#, fuzzy
msgid "Mark as _Junk"
msgstr "标记为未读(_U)"
-#: mail/em-folder-view.c:703 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:728 ui/evolution-mail-message.xml.h:53
#, fuzzy
msgid "Mark as _Not Junk"
msgstr "标记为重要(_I)"
-#: mail/em-folder-view.c:707
+#: mail/em-folder-view.c:732
msgid "U_ndelete"
msgstr "取消删除(_N)"
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:735
msgid "Mo_ve to Folder..."
msgstr "移动到文件夹(_V)..."
-#: mail/em-folder-view.c:711 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:736 ui/evolution-addressbook.xml.h:32
msgid "_Copy to Folder..."
msgstr "复制到文件夹(_C)..."
-#: mail/em-folder-view.c:719
+#: mail/em-folder-view.c:744
msgid "Add Sender to Address_book"
msgstr "将发件人添加到地址簿(_B)"
-#: mail/em-folder-view.c:722
+#: mail/em-folder-view.c:747
msgid "Appl_y Filters"
msgstr "应用过滤规则(_Y)"
-#: mail/em-folder-view.c:725
+#: mail/em-folder-view.c:750
msgid "Crea_te Rule From Message"
msgstr "从邮件创建规则(_T)"
-#: mail/em-folder-view.c:726
+#: mail/em-folder-view.c:751
msgid "VFolder on _Subject"
msgstr "基于主题的虚拟文件夹(_S)"
-#: mail/em-folder-view.c:727
+#: mail/em-folder-view.c:752
msgid "VFolder on Se_nder"
msgstr "基于发件人的虚拟文件夹(_N)"
-#: mail/em-folder-view.c:728
+#: mail/em-folder-view.c:753
msgid "VFolder on _Recipients"
msgstr "基于收件人的虚拟文件夹(_R)"
-#: mail/em-folder-view.c:729
+#: mail/em-folder-view.c:754
msgid "VFolder on Mailing _List"
msgstr "基于邮件列表的虚拟文件夹(_L)"
-#: mail/em-folder-view.c:731
+#: mail/em-folder-view.c:756
#, fuzzy
msgid "VFolder on Thread"
msgstr "基于发件人的虚拟文件夹(_N)"
-#: mail/em-folder-view.c:735
+#: mail/em-folder-view.c:760
msgid "Filter on Sub_ject"
msgstr "基于主题过滤(_J)"
-#: mail/em-folder-view.c:736
+#: mail/em-folder-view.c:761
msgid "Filter on Sen_der"
msgstr "基于发件人过滤(_D)"
-#: mail/em-folder-view.c:737
+#: mail/em-folder-view.c:762
msgid "Filter on Re_cipients"
msgstr "基于收件人过滤(_C)"
-#: mail/em-folder-view.c:738
+#: mail/em-folder-view.c:763
msgid "Filter on _Mailing List"
msgstr "基于邮件列表过滤(_M)"
-#: mail/em-folder-view.c:740
+#: mail/em-folder-view.c:765
#, fuzzy
msgid "Filter on Thread"
msgstr "基于发件人过滤(_D)"
#. default charset used in mail view
-#: mail/em-folder-view.c:1512 mail/em-folder-view.c:1550
+#: mail/em-folder-view.c:1537 mail/em-folder-view.c:1575
#: mail/mail-config.glade.h:41
msgid "Default"
msgstr "默认"
-#: mail/em-folder-view.c:1584
+#: mail/em-folder-view.c:1611
msgid "Print Message"
msgstr "打印消息"
-#: mail/em-folder-view.c:1826
+#: mail/em-folder-view.c:1865
#, fuzzy
msgid "_Copy Link Location"
msgstr "复制链接位置"
+#: mail/em-folder-view.c:2113
+#, fuzzy, c-format
+msgid "Click to mail %s"
+msgstr "点击以添加任务"
+
+#: mail/em-folder-view.c:2115
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "点击以添加任务"
+
#. message-search popup match count string
-#: mail/em-format-html-display.c:373
+#: mail/em-format-html-display.c:395
#, fuzzy, c-format
msgid "Matches: %d"
msgstr "匹配:"
-#: mail/em-format-html-display.c:603 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:632 mail/em-format-html.c:564
#, fuzzy
msgid "Unsigned"
msgstr "已委派"
-#: mail/em-format-html-display.c:603
+#: mail/em-format-html-display.c:632
#, fuzzy
msgid ""
"This message is not signed. There is no guarantee the sender of the message "
"is authentic."
msgstr "该邮件有数字签名,但不能证实是可信的。"
-#: mail/em-format-html-display.c:604 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:633 mail/em-format-html.c:565
#, fuzzy
msgid "Valid signature"
msgstr "编辑签名"
-#: mail/em-format-html-display.c:604
+#: mail/em-format-html-display.c:633
msgid ""
"This message is signed and is valid, the sender of this message is very "
"likely who they claim to be."
msgstr ""
-#: mail/em-format-html-display.c:605 mail/em-format-html.c:566
+#: mail/em-format-html-display.c:634 mail/em-format-html.c:566
#, fuzzy
msgid "Invalid signature"
msgstr "编辑签名"
-#: mail/em-format-html-display.c:605
+#: mail/em-format-html-display.c:634
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
msgstr ""
-#: mail/em-format-html-display.c:606 mail/em-format-html.c:567
+#: mail/em-format-html-display.c:635 mail/em-format-html.c:567
msgid "Valid signature, cannot verify sender"
msgstr ""
-#: mail/em-format-html-display.c:606
+#: mail/em-format-html-display.c:635
#, 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:612 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:573
#, fuzzy
msgid "Unencrypted"
msgstr "被中断"
-#: mail/em-format-html-display.c:612
+#: mail/em-format-html-display.c:641
msgid ""
-"This message is not encrypted. It's content may be viewed in transit across "
-"The Internet."
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
msgstr ""
-#: mail/em-format-html-display.c:613 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:574
msgid "Encrypted, weak"
msgstr ""
-#: mail/em-format-html-display.c:613
+#: mail/em-format-html-display.c:642
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:614 mail/em-format-html.c:575
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:575
#, fuzzy
msgid "Encrypted"
msgstr "PGP 加密"
-#: mail/em-format-html-display.c:614
+#: mail/em-format-html-display.c:643
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:615 mail/em-format-html.c:576
+#: mail/em-format-html-display.c:644 mail/em-format-html.c:576
msgid "Encrypted, strong"
msgstr ""
-#: mail/em-format-html-display.c:615
+#: mail/em-format-html-display.c:644
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:699
+#: mail/em-format-html-display.c:728
#, fuzzy
msgid "_View Certificate"
msgstr "证书 ID(_C):"
-#: mail/em-format-html-display.c:704
+#: mail/em-format-html-display.c:733
#, fuzzy
msgid "This certificate is not viewable"
msgstr "证书未生效"
-#: mail/em-format-html-display.c:866 mail/em-format-html.c:645
+#: mail/em-format-html-display.c:895 mail/em-format-html.c:645
#, fuzzy
msgid "Could not parse S/MIME message: Unknown error"
msgstr "无法解析 MIME 邮件。显示源文本。"
-#: mail/em-format-html-display.c:902 mail/em-format-html.c:1051
-#: mail/em-format.c:1198
+#: mail/em-format-html-display.c:931 mail/em-format-html.c:1051
+#: mail/em-format.c:1201
#, fuzzy
msgid "Unsupported signature format"
msgstr "不支持的方案"
-#: mail/em-format-html-display.c:910 mail/em-format-html.c:1059
+#: mail/em-format-html-display.c:939 mail/em-format-html.c:1059
#, fuzzy
msgid "Unknown error verifying signature"
msgstr "无法校验叶子签名"
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1070
#, fuzzy
msgid "_View Inline"
msgstr "嵌入视图"
-#: mail/em-format-html-display.c:1008
+#: mail/em-format-html-display.c:1071
#, fuzzy
msgid "_Hide"
msgstr "隐藏"
@@ -12439,74 +12837,69 @@ msgstr "无法解析 MIME 邮件。显示源文本。"
msgid "Formatting message"
msgstr "正在移动邮件"
-#: mail/em-format-html.c:1434 mail/em-format.c:673 mail/em-mailer-prefs.c:67
+#: mail/em-format-html.c:1419 mail/em-format.c:674 mail/em-mailer-prefs.c:67
#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
msgid "From"
msgstr "发件人"
-#: mail/em-format-html.c:1436 mail/em-format.c:674 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1419 mail/em-format.c:675 mail/em-mailer-prefs.c:68
msgid "Reply-To"
msgstr "回复至"
-#: mail/em-format-html.c:1438 mail/em-format.c:675 mail/em-mailer-prefs.c:69
+#: mail/em-format-html.c:1419 mail/em-format.c:676 mail/em-mailer-prefs.c:69
#: mail/message-list.etspec.h:14
msgid "To"
msgstr "收件人"
-#: mail/em-format-html.c:1440 mail/em-format.c:676 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1419 mail/em-format.c:677 mail/em-mailer-prefs.c:70
msgid "Cc"
msgstr "抄送"
-#: mail/em-format-html.c:1442 mail/em-format.c:677 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1419 mail/em-format.c:678 mail/em-mailer-prefs.c:71
msgid "Bcc"
msgstr "密件抄送"
-#: mail/em-format-html.c:1458 mail/em-mailer-prefs.c:631
+#: mail/em-format-html.c:1479 mail/em-mailer-prefs.c:631
msgid "Mailer"
msgstr "邮件程序"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1485
+#: mail/em-format-html.c:1505
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:1488
+#: mail/em-format-html.c:1508
msgid "<I> (%R %Z)</I>"
msgstr ""
-#: mail/em-format-html.c:1499 mail/em-format.c:679 mail/em-mailer-prefs.c:73
+#: mail/em-format-html.c:1520 mail/em-format.c:680 mail/em-mailer-prefs.c:73
#: mail/message-list.etspec.h:2
msgid "Date"
msgstr "日期"
-#: mail/em-format.c:893
+#: mail/em-format.c:896
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
-#: mail/em-format.c:1186
+#: mail/em-format.c:1189
#, fuzzy
msgid "Session not initialised"
msgstr "无法初始化 Bonobo"
-#: mail/em-format.c:1212
+#: mail/em-format.c:1215
msgid "This message is digitally signed and has been found to be authentic."
msgstr "该邮件有数字签名,并被证实为可信。"
-#: mail/em-format.c:1214
+#: mail/em-format.c:1217
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr "该邮件有数字签名,但不能证实是可信的。"
-#: mail/em-junk-filter.c:72
+#: mail/em-junk-filter.c:73
msgid "Spamassassin (built-in)"
msgstr ""
-#: mail/em-migrate.c:120
-#, fuzzy
-msgid "Migrating..."
-msgstr "正在等待..."
-
#: mail/em-migrate.c:128
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
@@ -12515,22 +12908,22 @@ msgid ""
"Please be patient while Evolution migrates your folders..."
msgstr ""
-#: mail/em-migrate.c:161
+#: mail/em-migrate.c:833
#, fuzzy, c-format
-msgid "Migrating `%s':"
-msgstr "正在查验 %s"
+msgid "Failed to migrate `%s': %s"
+msgstr "缓冲 %s 失败:%s"
-#: mail/em-migrate.c:775
+#: mail/em-migrate.c:857 mail/em-migrate.c:872
#, fuzzy, c-format
-msgid "Failed to migrate `%s': %s"
+msgid "Failed to migrate pop3 uid caches: %s"
msgstr "缓冲 %s 失败:%s"
-#: mail/em-migrate.c:801 mail/em-migrate.c:818
+#: mail/em-migrate.c:931 mail/em-migrate.c:948
#, fuzzy, c-format
msgid "Failed to create directory `%s': %s"
msgstr "创建到“%s”的管道失败:%s"
-#: mail/em-migrate.c:830
+#: mail/em-migrate.c:960
#, fuzzy, c-format
msgid "Failed to open store for `%s': %s"
msgstr "解析主机“%s”:%s"
@@ -12574,26 +12967,26 @@ msgstr "将发件人添加到地址簿"
msgid "Open in %s..."
msgstr "在 %s 中打开..."
-#: mail/em-subscribe-editor.c:583
+#: mail/em-subscribe-editor.c:605
#, fuzzy
msgid "This store does not support subscriptions, or the are not enabled."
msgstr "此服务器不支持 LDAPv3 schema 信息"
-#: mail/em-subscribe-editor.c:612
+#: mail/em-subscribe-editor.c:634
#, fuzzy
msgid "Subscribed"
msgstr "订阅"
-#: mail/em-subscribe-editor.c:616
+#: mail/em-subscribe-editor.c:638 shell/e-storage-set-view.etspec.h:2
msgid "Folder"
msgstr "文件夹"
#. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:803
+#: mail/em-subscribe-editor.c:826
msgid "Please select a server."
msgstr "请选择服务器。"
-#: mail/em-subscribe-editor.c:824
+#: mail/em-subscribe-editor.c:847
msgid "No server has been selected"
msgstr "没有选定服务器"
@@ -12614,23 +13007,23 @@ msgstr ""
msgid "Filters"
msgstr "过滤规则"
-#: mail/em-utils.c:493
+#: mail/em-utils.c:531
#, fuzzy
msgid "-------- Forwarded Message --------"
msgstr "转发的邮件"
-#: mail/em-utils.c:1046
+#: mail/em-utils.c:1136
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:1056
+#: mail/em-utils.c:1146
#, fuzzy
msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
msgstr "在%Y年%m月%d日的%H:%M,%%s写道:"
-#: mail/em-utils.c:1332 mail/em-utils.c:1416 mail/em-utils.c:1425
+#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
#, c-format
msgid ""
"Cannot save to `%s'\n"
@@ -12639,7 +13032,7 @@ msgstr ""
"无法保存到“%s”\n"
" %s"
-#: mail/em-utils.c:1337
+#: mail/em-utils.c:1428
#, c-format
msgid ""
"`%s' already exists.\n"
@@ -12648,27 +13041,27 @@ msgstr ""
"%s 已经存在。\n"
"您打算覆盖它吗?"
-#: mail/em-utils.c:1380
+#: mail/em-utils.c:1471
#, fuzzy
msgid "message"
msgstr "邮件"
-#: mail/em-utils.c:1432
+#: mail/em-utils.c:1523
#, fuzzy, c-format
msgid "Error: '%s' exists and is not a regular file"
msgstr "文件“%s”不存在或者不是普通文件。"
-#: mail/em-utils.c:1486
+#: mail/em-utils.c:1577
#, fuzzy
msgid "Save Message..."
msgstr "邮件另存为..."
-#: mail/em-utils.c:1524
+#: mail/em-utils.c:1615
#, fuzzy
msgid "Add address"
msgstr "地址"
-#: mail/em-utils.c:2314
+#: mail/em-utils.c:2405
#, fuzzy, c-format
msgid ""
"This operation will permanently remove all deleted messages in the folder `%"
@@ -12681,7 +13074,7 @@ msgstr ""
"\n"
"确实删除这些邮件吗?"
-#: mail/em-utils.c:2340
+#: mail/em-utils.c:2431
#, fuzzy
msgid ""
"This operation will permanently remove all deleted messages in all folders. "
@@ -13027,59 +13420,67 @@ msgid "UID string of the default account."
msgstr "使它成为我的默认帐号(_M)"
#: mail/evolution-mail.schemas.in.in.h:73
-msgid "Use custom fonts"
+msgid "Use Spamasssassin daemon and client"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:74
-msgid "Use custom fonts for displaying mail"
+msgid "Use Spamasssassin daemon and client (spamc/spamd)"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:75
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
#, fuzzy
msgid "Variable width font"
msgstr "变宽(_A):"
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
msgid "View/Bcc menu item is checked"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
msgid "View/Bcc menu item is checked."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
msgid "View/Cc menu item is checked"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
msgid "View/Cc menu item is checked."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
msgid "View/From menu item is checked"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
msgid "View/From menu item is checked."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
msgid "View/PostTo menu item is checked"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
msgid "View/PostTo menu item is checked."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
msgid "View/ReplyTo menu item is checked"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
msgid "View/ReplyTo menu item is checked."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
msgid ""
"Whether or not to fall back on threading by subjects when the messages do "
"not contain In-Reply-To or References headers."
@@ -13214,7 +13615,7 @@ msgstr "正在扫描过滤器"
msgid "Scanning directory"
msgstr "正在扫描目录"
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
msgid "Starting import"
msgstr "开始导入"
@@ -13357,24 +13758,22 @@ msgstr ""
msgid "On this Computer"
msgstr ""
-#: mail/mail-component.c:379
+#: mail/mail-component.c:438
msgid "New Mail Message"
msgstr "新建邮件"
-#: mail/mail-component.c:380
+#: mail/mail-component.c:439
msgid "_Mail Message"
msgstr "邮件(_M)"
-#: mail/mail-component.c:381
+#: mail/mail-component.c:440
msgid "Compose a new mail message"
msgstr "撰写一封新邮件"
-#: mail/mail-component.c:496
-#, c-format
-msgid ""
-"The following error occured while migrating your mail data:\n"
-"%s"
-msgstr ""
+#: mail/mail-component.c:582
+#, fuzzy
+msgid "URI of the mail source that the view will display"
+msgstr "日历将显示的 URI"
#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
msgid "Identity"
@@ -13481,10 +13880,6 @@ msgstr "添加新签名..."
msgid "Al_ways encrypt to myself when sending encrypted mail"
msgstr "当发送加密邮件时总是对自身加密(_W)"
-#: mail/mail-config.glade.h:15
-msgid "Alerts"
-msgstr "警告"
-
#: mail/mail-config.glade.h:17
msgid "Always _blind carbon-copy (Bcc) to:"
msgstr "总是暗送到(_B):"
@@ -13606,10 +14001,6 @@ msgstr "完成"
msgid "Drafts _folder:"
msgstr "草稿文件夹(_F):"
-#: mail/mail-config.glade.h:51
-msgid "E_nable"
-msgstr "启用(_N)"
-
#: mail/mail-config.glade.h:52
msgid "Email Accounts"
msgstr "电子邮件"
@@ -13965,7 +14356,8 @@ msgid "_Junk"
msgstr "六月"
#: mail/mail-config.glade.h:158
-msgid "_Load images if sender is in addressbook"
+#, fuzzy
+msgid "_Load images if sender is in address book"
msgstr "如果发件人在地址簿中就装入图像(_L)"
#: mail/mail-config.glade.h:159
@@ -14084,16 +14476,16 @@ msgstr "工作"
msgid "Filtering Folder"
msgstr "过滤文件夹"
-#: mail/mail-ops.c:264
+#: mail/mail-ops.c:243
msgid "Fetching Mail"
msgstr "收取邮件"
-#: mail/mail-ops.c:558
+#: mail/mail-ops.c:537
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "应用寄出过滤器失败:%s"
-#: mail/mail-ops.c:579
+#: mail/mail-ops.c:558
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -14102,106 +14494,106 @@ msgstr ""
"追加到 %s:%s 失败\n"
"转而追加到本地“已发”文件夹。"
-#: mail/mail-ops.c:588
+#: mail/mail-ops.c:567
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "追加到本地“已发”文件夹失败:%s"
-#: mail/mail-ops.c:630
+#: mail/mail-ops.c:609
#, c-format
msgid "Sending \"%s\""
msgstr "正在发送“%s”"
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:727
#, c-format
msgid "Sending message %d of %d"
msgstr "发送第 %d 个邮件,共 %d 个"
-#: mail/mail-ops.c:767
+#: mail/mail-ops.c:746
#, c-format
msgid "Failed on message %d of %d"
msgstr "在第 %d 个邮件失败,共 %d 个"
-#: mail/mail-ops.c:769
+#: mail/mail-ops.c:748
msgid "Complete."
msgstr "完成。"
-#: mail/mail-ops.c:863
+#: mail/mail-ops.c:842
msgid "Saving message to folder"
msgstr "把邮件保存到文件夹中"
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:927
#, c-format
msgid "Moving messages to %s"
msgstr "把邮件移动到 %s"
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:927
#, c-format
msgid "Copying messages to %s"
msgstr "把邮件复制到 %s"
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1040
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "正在“%s”中扫描文件夹"
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1243
msgid "Forwarded messages"
msgstr "转发的邮件"
-#: mail/mail-ops.c:1303
+#: mail/mail-ops.c:1286
#, c-format
msgid "Opening folder %s"
msgstr "正在打开文件夹 %s"
-#: mail/mail-ops.c:1375
+#: mail/mail-ops.c:1358
#, c-format
msgid "Opening store %s"
msgstr "正在打开存储 %s"
-#: mail/mail-ops.c:1453
+#: mail/mail-ops.c:1436
#, c-format
msgid "Removing folder %s"
msgstr "正在删除文件夹“%s”"
-#: mail/mail-ops.c:1547
+#: mail/mail-ops.c:1530
#, c-format
msgid "Storing folder '%s'"
msgstr "正在存储文件夹“%s”"
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1581
msgid "Refreshing folder"
msgstr "正在刷新文件夹"
-#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
+#: mail/mail-ops.c:1617 mail/mail-ops.c:1668
msgid "Expunging folder"
msgstr "正在销毁文件夹"
-#: mail/mail-ops.c:1682
+#: mail/mail-ops.c:1665
#, c-format
msgid "Emptying trash in '%s'"
msgstr "正在清空“%s”中的已删除邮件"
-#: mail/mail-ops.c:1683
+#: mail/mail-ops.c:1666
msgid "Local Folders"
msgstr "本地文件夹"
-#: mail/mail-ops.c:1766
+#: mail/mail-ops.c:1749
#, c-format
msgid "Retrieving message %s"
msgstr "正在收取邮件 %s"
-#: mail/mail-ops.c:1838
+#: mail/mail-ops.c:1821
#, c-format
msgid "Retrieving %d message(s)"
msgstr "正在收取 %d 封邮件"
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1905
#, c-format
msgid "Saving %d messsage(s)"
msgstr "正在保存 %d 封邮件"
-#: mail/mail-ops.c:1970
+#: mail/mail-ops.c:1953
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -14210,7 +14602,7 @@ msgstr ""
"无法创建输出文件:%s\n"
" %s"
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:1981
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -14219,11 +14611,11 @@ msgstr ""
"在将邮件保存到 %s 时发生错误:\n"
" %s"
-#: mail/mail-ops.c:2069
+#: mail/mail-ops.c:2052
msgid "Saving attachment"
msgstr "正在保存附件"
-#: mail/mail-ops.c:2086
+#: mail/mail-ops.c:2069
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -14232,22 +14624,22 @@ msgstr ""
"无法创建输出文件:%s:\n"
" %s"
-#: mail/mail-ops.c:2116
+#: mail/mail-ops.c:2099
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据:%s"
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2247
#, c-format
msgid "Disconnecting from %s"
msgstr "正在断开与 %s 的连接"
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2247
#, c-format
msgid "Reconnecting to %s"
msgstr "正在重新连接到 %s"
-#: mail/mail-ops.c:2366
+#: mail/mail-ops.c:2349
msgid "Changing junk status"
msgstr ""
@@ -14306,36 +14698,36 @@ msgstr "类型:%s"
msgid "Send & Receive Mail"
msgstr "发送和接收邮件"
-#: mail/mail-send-recv.c:307
+#: mail/mail-send-recv.c:309
msgid "Cancel _All"
msgstr "全部取消(_A)"
-#: mail/mail-send-recv.c:388
+#: mail/mail-send-recv.c:390
msgid "Updating..."
msgstr "正在更新..."
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
msgid "Waiting..."
msgstr "正在等待..."
-#: mail/mail-session.c:234
+#: mail/mail-session.c:240
msgid "User canceled operation."
msgstr "用户己取消操作。"
-#: mail/mail-session.c:267
+#: mail/mail-session.c:273
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
-#: mail/mail-session.c:269
+#: mail/mail-session.c:275
msgid "Enter Password"
msgstr "输入密码"
-#: mail/mail-session.c:292
+#: mail/mail-session.c:298
msgid "_Remember this password"
msgstr "记住该密码(_R)"
-#: mail/mail-session.c:293
+#: mail/mail-session.c:299
msgid "_Remember this password for the remainder of this session"
msgstr "在本会话中记住该密码(_R)"
@@ -14492,7 +14884,7 @@ msgstr "%m月%d日 %H:%M"
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
-#: mail/message-list.c:3085
+#: mail/message-list.c:3091
msgid "Generating message list"
msgstr "正在生成邮件列表"
@@ -14724,48 +15116,6 @@ msgstr ""
msgid "mail"
msgstr "电子邮件"
-#: shell/e-setup.c:144
-msgid "Could not update files correctly"
-msgstr "无法正确更新文件"
-
-#: shell/e-setup.c:165
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"无法创建目录\n"
-"%s\n"
-"错误:%s"
-
-#: shell/e-setup.c:176
-#, c-format
-msgid ""
-"An error occurred in copying files into\n"
-"`%s'."
-msgstr "在把文件复制到“%s”时发生错误。"
-
-#: shell/e-setup.c:242
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"文件“%s”不是目录。\n"
-"请移动它以便安装 Evolution 用户文件。"
-
-#: shell/e-setup.c:251
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory. Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"目录“%s”存在,但不是 Evolution 目录。\n"
-"请移走它以便安装 Evolution 用户文件。"
-
#: shell/e-shell-about-box.c:45
msgid "Brought to you by"
msgstr "制作团队"
@@ -14901,7 +15251,7 @@ msgstr ""
"\n"
"如果您不清楚,可以选择“自动”,Evolution 将试图为您确定类型。"
-#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:737
msgid "Please select the information that you would like to import:"
msgstr "请选择您希望导入的信息:"
@@ -15008,7 +15358,7 @@ msgstr "从老版程序中导入数据和设置"
msgid "Import a _single file"
msgstr "导入单个文件"
-#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:566
msgid ""
"Please wait...\n"
"Scanning for existing setups"
@@ -15020,7 +15370,7 @@ msgstr ""
msgid "Starting Intelligent Importers"
msgstr "启动智能导入器"
-#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:692
#, c-format
msgid "From %s:"
msgstr "从 %s:"
@@ -15072,7 +15422,7 @@ msgstr "无法打开共享文件夹:%s。"
msgid "Cannot find the specified shared folder."
msgstr "无法找到指定的共享文件夹。"
-#: shell/e-shell-startup-wizard.c:778
+#: shell/e-shell-startup-wizard.c:784
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 "
@@ -15081,7 +15431,7 @@ msgid ""
"Do you want to quit using the Assistant now?"
msgstr ""
-#: shell/e-shell-startup-wizard.c:789
+#: shell/e-shell-startup-wizard.c:795
#, fuzzy
msgid "Quit Assistant"
msgstr "助手"
@@ -15171,19 +15521,19 @@ msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr "Ximian Evolution 目前离线。点击该按钮则在线工作。"
-#: shell/e-shell.c:1004
+#: shell/e-shell.c:1002
msgid "Invalid arguments"
msgstr "无效参数"
-#: shell/e-shell.c:1006
+#: shell/e-shell.c:1004
msgid "Cannot register on OAF"
msgstr "无法注册到 OAF"
-#: shell/e-shell.c:1008
+#: shell/e-shell.c:1006
msgid "Configuration Database not found"
msgstr "找不到配置数据库"
-#: shell/e-shell.c:1010
+#: shell/e-shell.c:1008
msgid "Generic error"
msgstr "通用错误"
@@ -15308,6 +15658,10 @@ msgstr "收件箱"
msgid "Shortcuts"
msgstr "快捷方式"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "复选框"
+
#: shell/e-task-widget.c:211
#, c-format
msgid "%s (...)"
@@ -15366,6 +15720,21 @@ msgstr ""
"来自激活系统的错误是:\n"
"%s"
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "新建任务"
+
+#: shell/evolution-test-component.c:141
+#, fuzzy
+msgid "_Test"
+msgstr "测试"
+
+#: shell/evolution-test-component.c:142
+#, fuzzy
+msgid "Create a new test item"
+msgstr "创建新任务"
+
#: shell/glade/e-active-connection-dialog.glade.h:1
msgid "Active Connections"
msgstr "当前连接"
@@ -15507,16 +15876,16 @@ msgstr "不要再问我"
msgid "Evolution can import data from the following files:"
msgstr "Evolution 可以从下列文件中导入数据:"
-#: shell/main.c:114 shell/main.c:559
+#: shell/main.c:113 shell/main.c:558
msgid "Evolution"
msgstr "Evolution"
-#: shell/main.c:120
+#: shell/main.c:119
msgid "Evolution is now exiting ..."
msgstr "Evolution 正在退出 ..."
#. Preview/Alpha/Beta version warning message
-#: shell/main.c:270
+#: shell/main.c:269
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -15548,7 +15917,7 @@ msgstr ""
"\n"
"我们希望您尽情享受我们努力工作的成果,我们也热切盼望着您的意见!\n"
-#: shell/main.c:294
+#: shell/main.c:293
msgid ""
"Thanks\n"
"The Ximian Evolution Team\n"
@@ -15556,11 +15925,11 @@ msgstr ""
"感谢\n"
"Ximian Evolution 团队\n"
-#: shell/main.c:302
+#: shell/main.c:301
msgid "Don't tell me again"
msgstr "不要再问我"
-#: shell/main.c:352
+#: shell/main.c:351
#, c-format
msgid ""
"Warning: Evolution could not upgrade all your data from version %s.\n"
@@ -15568,36 +15937,36 @@ msgid ""
"Evolution.\n"
msgstr ""
-#: shell/main.c:411
+#: shell/main.c:410
msgid "Cannot access the Ximian Evolution shell."
msgstr "无法访问 Ximian Evolution shell。"
-#: shell/main.c:420
+#: shell/main.c:419
#, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "无法初始化 Ximian Evolution shell:%s"
-#: shell/main.c:526
+#: shell/main.c:525
msgid "Start Evolution activating the specified component"
msgstr ""
-#: shell/main.c:528
+#: shell/main.c:527
msgid "Start in offline mode"
msgstr "以离线模式启动"
-#: shell/main.c:530
+#: shell/main.c:529
msgid "Start in online mode"
msgstr "以在线模式启动"
-#: shell/main.c:533
+#: shell/main.c:532
msgid "Forcibly shut down all evolution components"
msgstr "强制关闭所有 Evolution 组件"
-#: shell/main.c:536
+#: shell/main.c:535
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
-#: shell/main.c:563
+#: shell/main.c:562
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -15606,45 +15975,50 @@ msgstr ""
"%s:不能同时使用 --online 和 --offline。\n"
" 详情请使用 %s --help。\n"
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
-#: smime/gui/certificate-manager.c:395
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
+#: smime/gui/certificate-manager.c:458
#, fuzzy
msgid "Select a cert to import..."
msgstr "选择导入器"
-#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
-#: smime/gui/certificate-manager.c:473
+#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
+#: smime/gui/certificate-manager.c:541
#, fuzzy
msgid "Certificate Name"
msgstr "证书 ID(_C):"
-#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
+#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
#, fuzzy
msgid "Purposes"
msgstr "进度"
-#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
#: smime/lib/e-cert.c:512
msgid "Serial Number"
msgstr ""
-#: smime/gui/certificate-manager.c:174
+#: smime/gui/certificate-manager.c:257
#, fuzzy
msgid "Expires"
msgstr "表达式"
-#: smime/gui/certificate-manager.c:323
+#: smime/gui/certificate-manager.c:403
#, fuzzy
msgid "E-Mail Address"
msgstr "合并电子邮件地址"
-#: smime/gui/certificate-viewer.c:281
+#: smime/gui/certificate-viewer.c:326
#, fuzzy, c-format
msgid "Certificate Viewer: %s"
msgstr ""
"证书过期:%s\n"
"发行者:%s"
+#: smime/gui/component.c:36
+#, fuzzy, c-format
+msgid "Enter the password for `%s'"
+msgstr "为 %s 输入密码"
+
#. FIXME: add serial no, validity date, uses
#: smime/gui/e-cert-selector.c:116
#, c-format
@@ -15850,7 +16224,7 @@ msgstr ""
msgid "Your Certificates"
msgstr "证书 ID(_C):"
-#: smime/lib/e-cert-db.c:494
+#: smime/lib/e-cert-db.c:566
#, fuzzy
msgid "Certificate already exists"
msgstr "卡片 ID 已经存在"
@@ -16074,16 +16448,16 @@ msgstr "主题是 %s"
msgid "Certificate Signature Value"
msgstr "证书签名失败"
-#: smime/lib/e-pkcs12.c:246
+#: smime/lib/e-pkcs12.c:261
msgid "PKCS12 File Password"
msgstr ""
-#: smime/lib/e-pkcs12.c:246
+#: smime/lib/e-pkcs12.c:261
#, fuzzy
msgid "Enter password for PKCS12 file:"
msgstr "为 %s 输入密码"
-#: smime/lib/e-pkcs12.c:379
+#: smime/lib/e-pkcs12.c:359
#, fuzzy
msgid "Imported Certificate"
msgstr "证书 ID(_C):"
@@ -16218,7 +16592,7 @@ msgstr "查看当前联系人"
#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
+#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:23
msgid "_Actions"
msgstr "操作(_A)"
@@ -16354,10 +16728,6 @@ msgstr "查看当前联系人"
msgid "Week"
msgstr "周"
-#: ui/evolution-calendar.xml.h:32
-msgid "Work Week"
-msgstr "一周工作日"
-
#: ui/evolution-calendar.xml.h:37
#, fuzzy
msgid "_Open Appointment"
@@ -16421,7 +16791,7 @@ msgstr "把此项保存到磁盘"
#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
#: ui/evolution-contact-list-editor.xml.h:13
#: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:44
#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
#: ui/evolution.xml.h:25
msgid "_File"
@@ -16429,7 +16799,7 @@ 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:47
+#: ui/evolution-message-composer.xml.h:50
#: ui/evolution-signature-editor.xml.h:15
msgid "_Save"
msgstr "保存(_S)"
@@ -17115,7 +17485,7 @@ msgid "Close this window"
msgstr "关闭此窗口"
#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
#: ui/evolution.xml.h:24
msgid "_Close"
msgstr "关闭(_C)"
@@ -17252,46 +17622,66 @@ msgid "Toggles whether the From chooser is displayed"
msgstr "是否显示发件人选择器"
#: ui/evolution-message-composer.xml.h:35
-msgid "Toggles whether the Reply-To field is displayed"
+#, fuzzy
+msgid "Toggles whether the Post-To field is displayed"
msgstr "是否显示回复域"
#: ui/evolution-message-composer.xml.h:36
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "是否显示回复域"
+
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Toggles whether the To field is displayed"
+msgstr "是否显示转发域"
+
+#: ui/evolution-message-composer.xml.h:38
msgid "_Attachment..."
msgstr "附件(_A)..."
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:39
msgid "_Bcc Field"
msgstr "暗中转发域(_B)"
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:40
msgid "_Cc Field"
msgstr "转发域(_C)"
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:42
msgid "_Delete all"
msgstr "全部删除(_D)"
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:45
msgid "_From Field"
msgstr "发件人域(_F)"
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:46
#: ui/evolution-signature-editor.xml.h:14
msgid "_Insert"
msgstr "插入(_I)"
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:47
msgid "_Open..."
msgstr "打开(_O)..."
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:48
+#, fuzzy
+msgid "_Post-To Field"
+msgstr "回复域(_R)"
+
+#: ui/evolution-message-composer.xml.h:49
msgid "_Reply-To Field"
msgstr "回复域(_R)"
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:51
msgid "_Security"
msgstr "安全(_S)"
+#: ui/evolution-message-composer.xml.h:52
+#, fuzzy
+msgid "_To Field"
+msgstr "发件人域(_F)"
+
#: ui/evolution-signature-editor.xml.h:5
msgid "H_TML"
msgstr "H_TML"
@@ -17388,6 +17778,16 @@ msgstr "预览要打印的任务列表"
msgid "Print the list of tasks"
msgstr "打印任务列表"
+#: ui/evolution-tasks.xml.h:16
+#, fuzzy
+msgid "View the selected task"
+msgstr "删除选中的任务"
+
+#: ui/evolution-tasks.xml.h:21
+#, fuzzy
+msgid "_Open Task"
+msgstr "任务(_T)"
+
#: ui/evolution.xml.h:1
msgid "About Ximian Evolution..."
msgstr "关于 Ximian Evolution..."
@@ -17769,18 +18169,254 @@ msgstr "文字"
msgid "Find _Now"
msgstr "立即查找"
-#~ msgid "Basics"
-#~ msgstr "基本"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolution 测试组件"
+
+#: widgets/misc/e-expander.c:181
+#, fuzzy
+msgid "Expanded"
+msgstr "销毁(_E)"
+
+#: widgets/misc/e-expander.c:182
+#, fuzzy
+msgid "Whether or not the expander is expanded"
+msgstr "删除项时要求确认(_A)"
+
+#: widgets/misc/e-expander.c:190
+msgid "Text of the expander's label"
+msgstr ""
+
+#: widgets/misc/e-expander.c:197
+#, fuzzy
+msgid "Use underline"
+msgstr "未定义"
+
+#: widgets/misc/e-expander.c:198
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
+msgstr ""
+
+#: widgets/misc/e-expander.c:205
+#, fuzzy
+msgid "Spacing"
+msgstr "西班牙"
+
+#: widgets/misc/e-expander.c:206
+msgid "Space to put between the label and the child"
+msgstr ""
+
+#: widgets/misc/e-expander.c:215
+msgid "Label widget"
+msgstr ""
+
+#: widgets/misc/e-expander.c:216
+msgid "A widget to display in place of the usual expander label"
+msgstr ""
+
+#: widgets/misc/e-expander.c:222
+msgid "Expander Size"
+msgstr ""
+
+#: widgets/misc/e-expander.c:223
+msgid "Size of the expander arrow"
+msgstr ""
+
+#: widgets/misc/e-expander.c:231
+#, fuzzy
+msgid "Indicator Spacing"
+msgstr "Indian Springs"
+
+#: widgets/misc/e-expander.c:232
+msgid "Spacing around expander arrow"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Rename"
+#~ msgstr "重命名(_R)"
+
+#~ msgid "Edit LDAP Server"
+#~ msgstr "编辑 LDAP 服务器"
+
+#~ msgid "Select Names"
+#~ msgstr "选择姓名"
+
+#~ msgid "Selected Contacts:"
+#~ msgstr "已选中的联系人:"
+
+#~ msgid ""
+#~ "Type a name into the entry, or\n"
+#~ "select one from the list below:"
+#~ msgstr ""
+#~ "在条目中输入一个姓名,或\n"
+#~ "在下面的列表中选择一个:"
+
+#~ msgid "_Folder:"
+#~ msgstr "文件夹(_F):"
+
+#~ msgid "East Timor"
+#~ msgstr "东帝汶"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "南斯拉夫"
+
+#, fuzzy
+#~ msgid "Rename this calendar to"
+#~ msgstr "打印此日历"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr " "
-#~ msgid "Time"
-#~ msgstr "时间"
+#, fuzzy
+#~ msgid "<b>Alarm Action</b>"
+#~ msgstr "日历信息"
+
+#, fuzzy
+#~ msgid "<b>Alarm Email</b>"
+#~ msgstr "<b>发送电子邮件:</b>"
+
+#, fuzzy
+#~ msgid "<b>Alarm Sound</b>"
+#~ msgstr "日历信息"
+
+#, fuzzy
+#~ msgid "<b>Message to Display</b>"
+#~ msgstr "要显示的邮件:"
+
+#, fuzzy
+#~ msgid "<b>Basics</b>"
+#~ msgstr "<b>状态:</b>"
+
+#, fuzzy
+#~ msgid "<b>Reminders</b>"
+#~ msgstr "提示器"
+
+#, fuzzy
+#~ msgid "<b>Alerts</b>"
+#~ msgstr "<b>开始:</b>"
-#~ msgid "Su_mmary:"
-#~ msgstr "概要(_U):"
+#, fuzzy
+#~ msgid "<b>Task List</b>"
+#~ msgstr "日历信息"
+
+#, fuzzy
+#~ msgid "<b>Time</b>"
+#~ msgstr "<b>到期:</b>"
+
+#, fuzzy
+#~ msgid "<b>Work Week</b>"
+#~ msgstr "一周工作日"
+
+#, fuzzy
+#~ msgid "<b>Classification</b>"
+#~ msgstr "分类"
+
+#, fuzzy
+#~ msgid "<b>Date &amp; Time</b>"
+#~ msgstr "日期及时间"
+
+#, fuzzy
+#~ msgid "<b>Description</b>"
+#~ msgstr "描述:"
+
+#, fuzzy
+#~ msgid "<b>L_ocation</b>"
+#~ msgstr "地理位置(_O):"
#, fuzzy
-#~ msgid "_Web Page:"
-#~ msgstr "网页地址(_W):"
+#~ msgid "<b>Su_mmary</b>"
+#~ msgstr "<b>开始:</b>"
+
+#, fuzzy
+#~ msgid "Could not create cache for new calendar"
+#~ msgstr "无法创建目录 %s:%s"
+
+#, fuzzy
+#~ msgid "A group must be selected"
+#~ msgstr "必须设定组织者。"
+
+#, fuzzy
+#~ msgid "Could not create directory for new task list"
+#~ msgstr "无法创建目录 %s:%s"
+
+#, fuzzy
+#~ msgid "<b>Preview</b>"
+#~ msgstr "预览"
+
+#, fuzzy
+#~ msgid "<b>Progress</b>"
+#~ msgstr "进度"
+
+#, fuzzy
+#~ msgid "<b>Web Page</b>"
+#~ msgstr "<b>发送电子邮件:</b>"
+
+#~ msgid "The method required to load `%s' is not supported"
+#~ msgstr "不支持装入“%s”必需的方法"
+
+#~ msgid "You don't have permission to open the folder in `%s'"
+#~ msgstr "您没有适当的权限打开“%s”中的文件夹"
+
+#~ msgid "Could not open the folder in `%s'"
+#~ msgstr "无法打开“%s”中的文件夹"
+
+#~ msgid "The method required to open `%s' is not supported"
+#~ msgstr "不支持打开“%s”必需的方法"
+
+#, fuzzy
+#~ msgid "Adding %s"
+#~ msgstr "正在发送“%s”"
+
+#, fuzzy
+#~ msgid "Rename this task list to"
+#~ msgstr "重命名此快捷方式"
+
+#~ msgid "Important mail (local)"
+#~ msgstr "重要邮件(本地)"
+
+#~ msgid "Unread mail (local)"
+#~ msgstr "未读邮件(本地)"
+
+#~ msgid "Could not update files correctly"
+#~ msgstr "无法正确更新文件"
+
+#~ msgid ""
+#~ "Cannot create the directory\n"
+#~ "%s\n"
+#~ "Error: %s"
+#~ msgstr ""
+#~ "无法创建目录\n"
+#~ "%s\n"
+#~ "错误:%s"
+
+#~ msgid ""
+#~ "An error occurred in copying files into\n"
+#~ "`%s'."
+#~ msgstr "在把文件复制到“%s”时发生错误。"
+
+#~ msgid ""
+#~ "The file `%s' is not a directory.\n"
+#~ "Please move it in order to allow installation\n"
+#~ "of the Evolution user files."
+#~ msgstr ""
+#~ "文件“%s”不是目录。\n"
+#~ "请移动它以便安装 Evolution 用户文件。"
+
+#~ msgid ""
+#~ "The directory `%s' exists but is not the\n"
+#~ "Evolution directory. Please move it in order\n"
+#~ "to allow installation of the Evolution user files."
+#~ msgstr ""
+#~ "目录“%s”存在,但不是 Evolution 目录。\n"
+#~ "请移走它以便安装 Evolution 用户文件。"
#~ msgid "Select Calendar Folder"
#~ msgstr "选择日历文件夹"
@@ -17804,9 +18440,6 @@ msgstr "立即查找"
#~ msgid "_Forward Message"
#~ msgstr "转发邮件(_F)"
-#~ msgid "Account Name"
-#~ msgstr "帐号名"
-
#~ msgid "Server Name"
#~ msgstr "服务器名"
@@ -17855,9 +18488,6 @@ msgstr "立即查找"
#~ msgid "TTY"
#~ msgstr "TTY"
-#~ msgid "Opening tasks at %s"
-#~ msgstr "在 %s 打开任务"
-
#~ msgid "Send anyway?"
#~ msgstr "仍然发送?"
@@ -17971,9 +18601,6 @@ msgstr "立即查找"
#~ msgid "This operation cannot be performed in off-line mode"
#~ msgstr "本操作不能在离线模式下执行"
-#~ msgid "Checkbox"
-#~ msgstr "复选框"
-
#~ msgid "CORBA error"
#~ msgstr "CORBA 错误"
@@ -18016,9 +18643,6 @@ msgstr "立即查找"
#~ msgid "Test type"
#~ msgstr "测试类型"
-#~ msgid "Evolution Test Component"
-#~ msgstr "Evolution 测试组件"
-
#, fuzzy
#~ msgid "import"
#~ msgstr "导入"
@@ -18084,10 +18708,6 @@ msgstr "立即查找"
#~ msgstr "需要 HTML"
#, fuzzy
-#~ msgid "Jabber Id List"
-#~ msgstr "未命名的列表"
-
-#, fuzzy
#~ msgid "ICQ Id List"
#~ msgstr "为新列表"
@@ -18619,9 +19239,6 @@ msgstr "立即查找"
#~ msgid "New Message Post"
#~ msgstr "新建邮件投递"
-#~ msgid "_Post Message"
-#~ msgstr "投递邮件(_P)"
-
#~ msgid "Post a new mail message"
#~ msgstr "发送一封新邮件"
@@ -21365,9 +21982,6 @@ msgstr "立即查找"
#~ msgid "Guaymas"
#~ msgstr "瓜伊马斯"
-#~ msgid "Guernsey"
-#~ msgstr "格恩西岛"
-
#~ msgid "Guidonia"
#~ msgstr "圭多尼亚"
@@ -21692,9 +22306,6 @@ msgstr "立即查找"
#~ msgid "Iki Airport"
#~ msgstr "Iki Airport"
-#~ msgid "Ilan"
-#~ msgstr "宜兰"
-
#~ msgid "Iliamna"
#~ msgstr "伊里亚姆纳"
@@ -21719,9 +22330,6 @@ msgstr "立即查找"
#~ msgid "Indianapolis"
#~ msgstr "印地安纳波利斯"
-#~ msgid "Indian Springs"
-#~ msgstr "Indian Springs"
-
#~ msgid "Innsbruck"
#~ msgstr "因斯布鲁克"
@@ -21770,9 +22378,6 @@ msgstr "立即查找"
#~ msgid "Islamabad"
#~ msgstr "伊斯兰堡"
-#~ msgid "Isle of Man"
-#~ msgstr "Isle of Man"
-
#~ msgid "Islip"
#~ msgstr "Islip"
@@ -21842,9 +22447,6 @@ msgstr "立即查找"
#~ msgid "Jerez"
#~ msgstr "赫雷斯"
-#~ msgid "Jersey"
-#~ msgstr "杰尔西"
-
#~ msgid "Jinotega"
#~ msgstr "Jinotega"
@@ -22118,9 +22720,6 @@ msgstr "立即查找"
#~ msgid "Konya"
#~ msgstr "Konya"
-#~ msgid "Korea, Democratic People's Republic of"
-#~ msgstr "韩国人民民主共和国"
-
#~ msgid "Korea, Republic of"
#~ msgstr "大韩民国"
@@ -22367,9 +22966,6 @@ msgstr "立即查找"
#~ msgid "Liberal"
#~ msgstr "Liberal"
-#~ msgid "Libya"
-#~ msgstr "利比亚"
-
#~ msgid "Lichtenburg"
#~ msgstr "Lichtenburg"
@@ -24935,9 +25531,6 @@ msgstr "立即查找"
#~ msgid "Smithers"
#~ msgstr "Smithers"
-#~ msgid "Smyrna"
-#~ msgstr "士麦纳"
-
#~ msgid "Snowshoe Lake"
#~ msgstr "Snowshoe Lak"
@@ -25493,9 +26086,6 @@ msgstr "立即查找"
#~ msgid "Treviso/S.Angelo"
#~ msgstr "特里维索/S.Angelo"
-#~ msgid "Trieste"
-#~ msgstr "的里雅斯特"
-
#~ msgid "Trinidad"
#~ msgstr "特立尼达"
@@ -26120,9 +26710,6 @@ msgstr "立即查找"
#~ msgid "Yongsan/H-208 Hp"
#~ msgstr "Yongsan/H-208 Hp"
-#~ msgid "Yoro"
-#~ msgstr "Yoro"
-
#~ msgid "Yosu"
#~ msgstr "Yosu"