aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorJP Rosevear <jpr@novell.com>2004-07-05 23:08:43 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-07-05 23:08:43 +0800
commit8893f5137dd77a76ce1fbaa8e8793a40a750f3fb (patch)
tree6ba22cb0aebe343b8c1b9d0980449957e391f989 /po/zh_CN.po
parent44ede0596eeb155117703e54c7a3a5b2c891bced (diff)
downloadgsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar.gz
gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar.zst
gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.zip
bump version, requirements
2004-07-02 JP Rosevear <jpr@novell.com> * configure.in: bump version, requirements 2004-07-02 JP Rosevaer <jpr@novell.com> * Makefile.am (SUBDIRS): Revert previous error change svn path=/trunk/; revision=26583
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po5579
1 files changed, 3143 insertions, 2436 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f17bf4d50d..379d8aada4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,14 +8,14 @@
msgid ""
msgstr ""
"Project-Id-Version: Evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-18 19:14+0200\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
"PO-Revision-Date: 2004-06-19 11:31+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: a11y/addressbook/ea-addressbook-view.c:94
@@ -24,14 +24,6 @@ msgstr ""
msgid "evolution addressbook"
msgstr "evolution 地址簿"
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "联系人头衔:"
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution 袖珍卡"
-
#: a11y/addressbook/ea-minicard-view.c:101
msgid "current addressbook folder "
msgstr "当前地址簿文件夹 "
@@ -52,34 +44,257 @@ msgstr " 张卡片"
msgid " card"
msgstr " 张卡片"
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "联系人头衔:"
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution 袖珍卡"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "无法发送项目!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+"无法认证到 IMAP 服务器。\n"
+"%s\n"
+"\n"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+#, fuzzy
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"选中此处以确保您的密码拼写正确。请记住,很多密码都是区分大小写的;您的 Caps "
+"Lock 灯可能为开。"
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "此存储不支持订阅,或订阅未启用。"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "无法从服务器获取组列表。"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "IMAP 服务器应答不含有 %s 信息"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "无法装入地址簿"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr "{0}"
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+#, fuzzy
+msgid "Category editor not available."
+msgstr "没有描述。"
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "保存在地址簿中"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "装入默认地址簿错误。"
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "无法处理脱机文件夹"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "您希望保存更改吗?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "丢弃(_D)"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "以及另外 %d 个联系人。"
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+#, fuzzy
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"您即将把联系人从一个地址簿移动到另外一个地址簿,但是无法从源地址簿删除该联系"
+"人。您想要换作复制联系人吗?"
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "无法分析邮件内容"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "添加联系人出错"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution 地址簿地址查看器"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
msgid "Default Sync Address:"
msgstr "默认的同步地址:"
-#: addressbook/conduit/address-conduit.c:1155
#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
msgid "Could not load addressbook"
msgstr "无法装入地址簿"
-#: addressbook/conduit/address-conduit.c:1224
-#: addressbook/conduit/address-conduit.c:1227
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
msgid "Could not read pilot's Address application block"
msgstr "无法读入 Pilot 的地址应用程序块"
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "匿名访问 LDAP 服务器"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr "*Control*F2"
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "认证失败。\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "自动完成"
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s为 %s 输入口令 (用户 %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "联系人(_O)"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "证书"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "在此配置自动完成"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "联系人"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution 地址簿"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution 地址簿地址弹出框"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution 地址簿地址查看器"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution 地址簿卡片查看器"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution 地址簿组件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime 证书管理控件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution 文件夹配置控件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "在此管理您的 S/MIME 证书"
#: addressbook/gui/component/addressbook-component.c:93
msgid "New Contact"
@@ -110,7 +325,8 @@ msgid "New Contacts Group"
msgstr "新建联系人组"
#: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
msgstr "联系人组(_C)"
#: addressbook/gui/component/addressbook-component.c:111
@@ -133,18 +349,14 @@ msgid "Migrating `%s':"
msgstr "升迁“%s”:"
#. create the local source group
-#. On This Computer is always first and VFolders is always last
#: addressbook/gui/component/addressbook-migrate.c:489
#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
#: mail/mail-component.c:245 mail/mail-vfolder.c:218
msgid "On This Computer"
msgstr "在此计算机中"
#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
#: addressbook/gui/component/addressbook-migrate.c:497
#: addressbook/gui/contact-editor/contact-editor.glade.h:34
#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
@@ -207,17 +419,17 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的 Pilot 同步数据..."
-#: addressbook/gui/component/addressbook-view.c:673
+#: addressbook/gui/component/addressbook-view.c:633
#, c-format
msgid "Address book '%s' will be removed. Are you sure you want to continue?"
msgstr "即将删除日历“%s”。您确定想要继续吗?"
-#: addressbook/gui/component/addressbook-view.c:752
+#: addressbook/gui/component/addressbook-view.c:714
msgid "New Address Book"
msgstr "新地址簿"
-#: addressbook/gui/component/addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
@@ -227,17 +439,25 @@ msgstr "新地址簿"
msgid "Delete"
msgstr "删除"
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:716
#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
msgid "Properties..."
msgstr "属性..."
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:993
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "联系人"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "匿名访问 LDAP 服务器"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "认证失败。\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s为 %s 输入口令 (用户 %s)"
#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
msgid "EFolderList xml for the list of completion uris"
@@ -257,58 +477,6 @@ msgstr ""
msgid "URI for the folder last used in the select names dialog"
msgstr ""
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr "*Control*F2"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "自动完成"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "联系人(_O)"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "证书"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "在此配置自动完成"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution 地址簿"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution 地址簿地址弹出框"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution 地址簿地址查看器"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution 地址簿卡片查看器"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution 地址簿组件"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime 证书管理控件"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution 文件夹配置控件"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "在此管理您的 S/MIME 证书"
-
#: addressbook/gui/component/ldap-config.glade.h:1
#: addressbook/gui/component/select-names/select-names.glade.h:1
#: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -316,7 +484,7 @@ msgstr "在此管理您的 S/MIME 证书"
#: addressbook/gui/contact-editor/fullname.glade.h:1
#: addressbook/gui/contact-editor/im.glade.h:1
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.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
@@ -325,7 +493,7 @@ msgstr "在此管理您的 S/MIME 证书"
#: calendar/gui/dialogs/task-page.glade.h:1
#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-dialogs.glade.h:6
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
msgid "*"
msgstr "*"
@@ -351,6 +519,7 @@ msgid "636"
msgstr "636"
#: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
msgid "<b>Authentication</b>"
msgstr "<b>身份验证</b>"
@@ -392,13 +561,11 @@ msgid "Anonymously"
msgstr "匿名"
#: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:199
msgid "Basic"
msgstr "基本"
#: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:208 mail/mail-dialogs.glade.h:13
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
msgid "Details"
msgstr "细节"
@@ -617,33 +784,26 @@ msgid "cards"
msgstr "卡片"
#: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
#: mail/mail-config.glade.h:183
msgid "minutes"
msgstr "分钟"
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "从地址簿中选择联系人"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution 的地址簿名称选择界面"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "全部删除"
-#: addressbook/gui/component/select-names/e-select-names.c:702
#: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
#: calendar/gui/dialogs/cal-prefs-dialog.c:724
msgid "Remove"
msgstr "删除"
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "姓名"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "全部删除"
-
#: addressbook/gui/component/select-names/e-select-names-popup.c:222
msgid "View Contact List"
msgstr "查看联系人列表"
@@ -666,15 +826,22 @@ msgstr "添加到联系人"
msgid "Unnamed Contact"
msgstr "未命名的联系人"
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "姓名"
+
#: addressbook/gui/component/select-names/e-select-names-table-model.c:351
#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
msgid "Source"
msgstr "来源"
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution 的地址簿名称选择界面"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "从地址簿中选择联系人"
#: addressbook/gui/component/select-names/select-names.glade.h:2
msgid "<b>Contacts</b>"
@@ -696,6 +863,11 @@ msgstr "类别(_A):"
msgid "_Find"
msgstr "查找(_F)"
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "搜索(_S)"
+
#: addressbook/gui/contact-editor/contact-editor.glade.h:2
msgid "<b>Email</b>"
msgstr "<b>电子邮件</b>"
@@ -733,7 +905,7 @@ msgid "<b>Work</b>"
msgstr "<b>工作</b>"
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
#: addressbook/gui/widgets/eab-contact-display.c:331
msgid "AIM"
msgstr "AIM"
@@ -755,7 +927,6 @@ msgid "Birthday:"
msgstr "生日:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
msgid "Calendar:"
msgstr "日历:"
@@ -768,7 +939,7 @@ msgid "Company:"
msgstr "公司:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
#: 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:181
@@ -776,7 +947,7 @@ msgid "Contact"
msgstr "联系人"
#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
msgid "Contact Editor"
msgstr "联系人编辑器"
@@ -868,8 +1039,8 @@ msgstr "Web 日志:"
#. red
#: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
#: mail/mail-config.glade.h:157
msgid "Work"
@@ -892,18 +1063,6 @@ msgstr "存档于(_F):"
msgid "_Where:"
msgstr "何处(_W):"
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr "您确定要删除这些联系人吗?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "您确定要删除此联系人吗?"
-
#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
#: addressbook/gui/widgets/eab-contact-display.c:350
#: addressbook/gui/widgets/eab-contact-display.c:365
@@ -911,16 +1070,16 @@ msgid "Address"
msgstr "地址"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
#: addressbook/gui/widgets/e-addressbook-model.c:309
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
#: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
msgid "Editable"
msgstr "可编辑"
@@ -1892,77 +2051,99 @@ msgstr "赞比亚"
msgid "Zimbabwe"
msgstr "津巴布韦"
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL 即时通讯程序"
+
#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
#: addressbook/gui/widgets/eab-contact-display.c:334
msgid "Jabber"
msgstr "Jabber"
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:336
-msgid "Yahoo"
-msgstr "雅虎"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "雅虎通"
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
#: addressbook/gui/widgets/eab-contact-display.c:333
msgid "ICQ"
msgstr "ICQ"
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:332
-msgid "GroupWise"
-msgstr "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "服务"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "位置"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "用户名"
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
msgid "Home"
msgstr "家庭"
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
msgid "Other"
msgstr "其它"
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "雅虎"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
msgid "Source Book"
msgstr "来源地址簿"
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
msgid "Target Book"
msgstr "目标地址簿"
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
msgid "Is New Contact"
msgstr "为新联系人"
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
msgid "Writable Fields"
msgstr "可写域"
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
msgid "Changed"
msgstr "已更改"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2356
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
msgid "This contact belongs to these categories:"
msgstr "此联系人属于这些类别:"
#. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
msgid "Please select an image for this contact"
msgstr "请选择此联系人的图像"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2437
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
msgid "No image"
msgstr "无图像"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2640
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -1970,22 +2151,17 @@ msgstr ""
"联系人数据无效:\n"
"\n"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2668
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
msgid "Invalid contact."
msgstr "无效的联系人。"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
msgid ""
"The contact cannot be saved to the selected address book. Do you want to "
"discard changes?"
msgstr "联系人无法保存到选中的地址簿。您想要丢弃更改吗?"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2731
-#: addressbook/gui/contact-editor/e-contact-editor.c:2755
-msgid "_Discard"
-msgstr "丢弃(_D)"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2750
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
msgid ""
"You are moving the contact from one address book to another, but it cannot "
"be removed from the source. Do you want to save a copy instead?"
@@ -1993,28 +2169,6 @@ msgstr ""
"您即将把联系人从一个地址簿移动到另外一个地址簿,但是无法从源地址簿删除该联系"
"人。您想要换作复制联系人吗?"
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL 即时通讯程序"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "雅虎通"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "服务"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Location"
-msgstr "位置"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "用户名"
-
#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
msgid "Contact Quick-Add"
msgstr "快速添加联系人"
@@ -2032,6 +2186,18 @@ msgstr "全名(_F):"
msgid "E-_mail:"
msgstr "电子邮件(_M):"
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr "您确定要删除这些联系人吗?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "您确定要删除此联系人吗?"
+
#: addressbook/gui/contact-editor/fulladdr.glade.h:2
msgid "Address _2:"
msgstr "地址 _2:"
@@ -2187,16 +2353,16 @@ msgid "_Type an email address or drag a contact into the list below:"
msgstr "输入电子邮件地址或者把联系人拖放到下面的列表(_T):"
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
+#: smime/gui/smime-ui.glade.h:48
msgid "dialog1"
msgstr "dialog1"
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
#: addressbook/gui/widgets/e-addressbook-model.c:295
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
msgid "Book"
msgstr "地址簿"
@@ -2257,6 +2423,397 @@ msgstr ""
msgid "Advanced Search"
msgstr "高级搜索"
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+msgid "No contacts"
+msgstr "无联系人"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d 个联系人"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:235
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
+msgid "Query"
+msgstr "查询"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "获取名簿视图出错"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+msgid "Model"
+msgstr "模型"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "修改卡片错误"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+msgid "Name begins with"
+msgstr "姓名以此开头"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Email begins with"
+msgstr "邮件以此开头"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: calendar/gui/cal-search-bar.c:54
+msgid "Category is"
+msgstr "类别为"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "任何域含有"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Advanced..."
+msgstr "高级..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:242
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "类型"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:539
+msgid "Address Book"
+msgstr "地址簿"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard..."
+msgstr "另存为 VCard..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+msgid "New Contact..."
+msgstr "新建联系人..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
+msgid "New Contact List..."
+msgstr "新建联系人列表..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
+msgid "Go to Folder..."
+msgstr "转到文件夹..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
+msgid "Import..."
+msgstr "导入..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
+msgid "Search for Contacts..."
+msgstr "搜索联系人..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
+msgid "Address Book Sources..."
+msgstr "地址簿来源..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
+msgid "Pilot Settings..."
+msgstr "Pilot 设置..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "转发联系人"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
+msgid "Send Message to Contact"
+msgstr "给联系人发邮件"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "打印"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
+msgid "Print Envelope"
+msgstr "打印信封"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
+msgid "Copy to Address Book..."
+msgstr "复制到地址簿..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
+msgid "Move to Address Book..."
+msgstr "移动到地址簿..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "剪切"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "复制"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "粘贴"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
+msgid "Current View"
+msgstr "当前视图"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
+msgid "Any Category"
+msgstr "任何类别"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "助手"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "助手电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "商务传真"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "商务电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "商务电话 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "回拨电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "车载电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Categories"
+msgstr "类别"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr "公司电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "电子邮件"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "电子邮件 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "电子邮件 3"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "姓"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "File As"
+msgstr "存档为"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Given Name"
+msgstr "名"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "家庭传真"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "家庭电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "家庭电话 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "ISDN Phone"
+msgstr "ISDN 电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Journal"
+msgstr "日记"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "经理"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "移动电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "昵称"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "注释"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "办公室"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "组织"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "其它传真"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "其它电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "寻呼机"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "主要电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "收音机"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:234
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "角色"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Spouse"
+msgstr "配偶"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "电传"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "头衔"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+msgid "Unit"
+msgstr "单位"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Web Site"
+msgstr "网站"
+
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
+msgid "Width"
+msgstr "宽度"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
+msgid "Height"
+msgstr "高度"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
+msgid "Has Focus"
+msgstr "有焦点"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "域"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "域名"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "文字模型"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "最大域名长度"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "列宽"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"本视图中没有可显示的项。\n"
+"\n"
+"请在此双击以创建新联系人。"
+
+#: addressbook/gui/widgets/e-minicard-view.c:167
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"本视图中没有可显示的项。"
+
+#: addressbook/gui/widgets/e-minicard-view.c:477
+msgid "Adapter"
+msgstr "适配器"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "已选择"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "有光标"
+
#: addressbook/gui/widgets/eab-contact-display.c:131
#: addressbook/gui/widgets/eab-contact-display.c:194
msgid "(map)"
@@ -2277,11 +2834,6 @@ msgstr "列出成员"
msgid "E-mail"
msgstr "电子邮件"
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "组织"
-
#: addressbook/gui/widgets/eab-contact-display.c:346
msgid "Position"
msgstr "位置"
@@ -2312,30 +2864,14 @@ msgstr "WWW"
msgid "Blog"
msgstr "Blog"
-#: addressbook/gui/widgets/eab-contact-display.c:364
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "移动电话"
-
#: addressbook/gui/widgets/eab-contact-display.c:368
msgid "personal"
msgstr "个人"
-#: addressbook/gui/widgets/eab-contact-display.c:375
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "注释"
-
#: addressbook/gui/widgets/eab-contact-display.c:541
msgid "Job Title"
msgstr "职称"
-#: addressbook/gui/widgets/eab-contact-display.c:545
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "电子邮件"
-
#: addressbook/gui/widgets/eab-contact-display.c:572
msgid "Home page"
msgstr "主页"
@@ -2392,12 +2928,12 @@ msgstr "不支持的协议"
#: addressbook/gui/widgets/eab-gui-util.c:61
#: calendar/gui/dialogs/task-details-page.glade.h:3
#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
#: camel/camel-service.c:724 camel/camel-service.c:762
#: camel/camel-service.c:846 camel/camel-service.c:886
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
msgid "Cancelled"
msgstr "已经取消"
@@ -2596,16 +3132,6 @@ msgstr "(无)"
msgid "Primary Email"
msgstr "主电子邮件"
-#: addressbook/gui/widgets/eab-popup-control.c:441
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "电子邮件 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:451
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "电子邮件 3"
-
#: addressbook/gui/widgets/eab-popup-control.c:567
msgid "Select an Action"
msgstr "选择一项活动"
@@ -2651,367 +3177,6 @@ msgstr "显示紧凑 VCard"
msgid "Save in addressbook"
msgstr "保存在地址簿中"
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-msgid "No contacts"
-msgstr "无联系人"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "%d 个联系人"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-msgid "Query"
-msgstr "查询"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "获取名簿视图出错"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "模型"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "修改卡片错误"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "姓名以此开头"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-msgid "Email begins with"
-msgstr "邮件以此开头"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: calendar/gui/cal-search-bar.c:54
-msgid "Category is"
-msgstr "类别为"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "任何域含有"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-msgid "Advanced..."
-msgstr "高级..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:238
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:227
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "类型"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:535
-msgid "Address Book"
-msgstr "地址簿"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:879
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-#: addressbook/gui/widgets/e-addressbook-view.c:2107
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard..."
-msgstr "另存为 VCard..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-msgid "New Contact..."
-msgstr "新建联系人..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
-msgid "New Contact List..."
-msgstr "新建联系人列表..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-msgid "Go to Folder..."
-msgstr "转到文件夹..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
-msgid "Import..."
-msgstr "导入..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1093
-msgid "Search for Contacts..."
-msgstr "搜索联系人..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1094
-msgid "Address Book Sources..."
-msgstr "地址簿来源..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
-msgid "Pilot Settings..."
-msgstr "Pilot 设置..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "转发联系人"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1101
-msgid "Send Message to Contact"
-msgstr "给联系人发邮件"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1102 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "打印"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1104
-msgid "Print Envelope"
-msgstr "打印信封"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
-msgid "Copy to Address Book..."
-msgstr "复制到地址簿..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
-msgid "Move to Address Book..."
-msgstr "移动到地址簿..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1112
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "剪切"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "复制"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "粘贴"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1119
-#: calendar/gui/e-calendar-view.c:1327
-msgid "Current View"
-msgstr "当前视图"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1692
-#: calendar/gui/cal-search-bar.c:358
-msgid "Any Category"
-msgstr "任何类别"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "助手"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "助手电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "商务传真"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "商务电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "商务电话 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "回拨电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "车载电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-calendar-table.etspec.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "Categories"
-msgstr "类别"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "公司电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Family Name"
-msgstr "姓"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "File As"
-msgstr "存档为"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Given Name"
-msgstr "名"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "家庭传真"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "家庭电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "家庭电话 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "ISDN Phone"
-msgstr "ISDN 电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Journal"
-msgstr "日记"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Manager"
-msgstr "经理"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "昵称"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "办公室"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "其它传真"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "其它电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "寻呼机"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "主要电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Radio"
-msgstr "收音机"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:234
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "角色"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Spouse"
-msgstr "配偶"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
-msgid "TTYTDD"
-msgstr "TTYTDD"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "电传"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "头衔"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Unit"
-msgstr "单位"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Web Site"
-msgstr "网站"
-
-#: addressbook/gui/widgets/e-minicard.c:137
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "宽度"
-
-#: addressbook/gui/widgets/e-minicard.c:144
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "高度"
-
-#: addressbook/gui/widgets/e-minicard.c:152
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "有焦点"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "已选择"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "有光标"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "域"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "域名"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "文字模型"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "最大域名长度"
-
-#: addressbook/gui/widgets/e-minicard-view.c:142
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"本视图中没有可显示的项。\n"
-"\n"
-"请在此双击以创建新联系人。"
-
-#: addressbook/gui/widgets/e-minicard-view.c:145
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"本视图中没有可显示的项。"
-
-#: addressbook/gui/widgets/e-minicard-view.c:453
-msgid "Adapter"
-msgstr "适配器"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "列宽"
-
#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
msgid "Card View"
msgstr "卡片视图"
@@ -3020,17 +3185,17 @@ msgstr "卡片视图"
msgid "GTK Tree View"
msgstr "GTK 树视图"
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
msgid "Reflow Test"
msgstr "回溯测试"
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
#: addressbook/printing/test-contact-print-style-editor.c:54
#: addressbook/printing/test-print.c:53
msgid "Copyright (C) 2000, Ximian, Inc."
msgstr "版权 (C) 2000, Ximian, Inc."
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
msgid "This should test the reflow canvas item"
msgstr "这应该测试回溯原始项目"
@@ -3054,6 +3219,11 @@ msgstr "Evolution vCard 导入器"
msgid "VCard (.vcf, .gcrd)"
msgstr "VCard (.vfg, .gcrd)"
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "打印信封"
+
#: addressbook/printing/e-contact-print.c:1000
msgid "Print contacts"
msgstr "打印联系人"
@@ -3063,11 +3233,6 @@ msgstr "打印联系人"
msgid "Print contact"
msgstr "打印联系人"
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "打印信封"
-
#: addressbook/printing/e-contact-print.glade.h:1
msgid "10 pt. Tahoma"
msgstr "10 pt. Tahoma"
@@ -3252,6 +3417,20 @@ msgstr "联系人打印测试"
msgid "This should test the contact print code"
msgstr "这应该测试联系人打印代码"
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "无法打开文件"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "无法获得地址簿列表"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "打开地址簿失败"
+
#: addressbook/tools/evolution-addressbook-export.c:56
msgid "Specify the output file instead of standard output"
msgstr "指定用来取代标准输出的输出文件"
@@ -3306,20 +3485,6 @@ msgstr ""
msgid "Impossible internal error."
msgstr "不可能的内部错误。"
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "无法打开文件"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "无法获得地址簿列表"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "打开地址簿失败"
-
#: addressbook/tools/evolution-addressbook-import.c:46
msgid "Error loading default addressbook."
msgstr "装入默认地址簿错误。"
@@ -3336,6 +3501,262 @@ msgstr "没有提供文件名。"
msgid "Unnamed List"
msgstr "未命名的列表"
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "不删除"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "发送给:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "您确信您要删除该账户吗?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "您确定要删除此联系人吗?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "您确信您要删除该账户吗?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "您确信您要删除该账户吗?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "您确信您要删除该账户吗?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "您确定要删除这些联系人吗?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "您确信您要删除该账户吗?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "您确定要删除这些联系人吗?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "您确定要删除这些联系人吗?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "您确定要删除这些联系人吗?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "约会"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "您希望保存更改吗?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s 您已经做出了修改。放弃这些修改并更新编辑器吗?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr "丢弃更改"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "保存邮件"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "发送"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution vCalendar 导入器"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
#: smime/gui/component.c:48
msgid "Enter password"
@@ -3346,29 +3767,93 @@ msgid "Split Multi-Day Events:"
msgstr "分割多日事件:"
#: calendar/conduits/calendar/calendar-conduit.c:1330
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
-msgstr "无法启动 wombat 服务器"
-
#: calendar/conduits/calendar/calendar-conduit.c:1331
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "无法启动 wombat"
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
+msgstr "无法启动 wombat 服务器"
#: calendar/conduits/calendar/calendar-conduit.c:1439
#: calendar/conduits/calendar/calendar-conduit.c:1442
msgid "Could not read pilot's Calendar application block"
msgstr "无法读入 Pilot 日历应用程序块"
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
msgid "Default Priority:"
msgstr "默认优先级:"
-#: calendar/conduits/todo/todo-conduit.c:929
#: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
msgid "Could not read pilot's ToDo application block"
msgstr "无法读入 Pilot ToDo 应用程序块"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr "*Control*F3"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr "*Control*F4"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "日历和任务"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "日历"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "在此配置您的时区、日历和任务列表 "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution 日历和任务"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution 日历配置控件"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution 日历调度邮件查看器"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution 日历/任务新闻编辑器"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution 日历组件"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution 任务组件"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "任务"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+msgid "_Calendars"
+msgstr "日历(_C)"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "任务(_T)"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution 日历提醒通知服务"
+
#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
msgid "Starting:"
msgstr "开始:"
@@ -3461,10 +3946,6 @@ msgstr ""
msgid "Do not ask me about this program again."
msgstr "不要再次询问此问题。"
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution 日历提醒通知服务"
-
#: calendar/gui/alarm-notify/notify-main.c:139
msgid "Could not initialize Bonobo"
msgstr "无法初始化 Bonobo"
@@ -3605,8 +4086,28 @@ msgstr "是以 24 小时格式还是以 12 小时格式显示时间"
msgid "Whether to show week numbers in date navigator"
msgstr "是否在日期浏览器中显示周数"
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "概要含有"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "描述含有"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "注释含有"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "位置含有"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "无匹配"
+
#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
#: calendar/gui/gnome-cal.c:1827
#: camel/providers/groupwise/camel-gw-listener.c:311
#: camel/providers/groupwise/camel-gw-listener.c:334
@@ -3626,7 +4127,7 @@ msgid "Purge events older than"
msgstr ""
#: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
msgid "days"
msgstr "天数"
@@ -3637,12 +4138,8 @@ msgstr "%Y年%m月%d日%A"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
#: calendar/gui/e-week-view-main-item.c:329
msgid "%a %d %b"
msgstr "%m月%d日%A"
@@ -3690,56 +4187,52 @@ msgstr "无法打开日历“%s”来创建事件和会议"
msgid "There is no calendar available for creating events and meetings"
msgstr "没有可创建事件和会议的日历"
-#: calendar/gui/calendar-component.c:1060
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "日历"
-
-#: calendar/gui/calendar-component.c:1223
+#: calendar/gui/calendar-component.c:1224
msgid "New appointment"
msgstr "新建约会"
-#: calendar/gui/calendar-component.c:1224
+#: calendar/gui/calendar-component.c:1225
msgid "_Appointment"
msgstr "约会(_A)"
-#: calendar/gui/calendar-component.c:1225
+#: calendar/gui/calendar-component.c:1226
msgid "Create a new appointment"
msgstr "创建新约会"
-#: calendar/gui/calendar-component.c:1231
+#: calendar/gui/calendar-component.c:1232
msgid "New meeting"
msgstr "新闻会议"
-#: calendar/gui/calendar-component.c:1232
+#: calendar/gui/calendar-component.c:1233
msgid "M_eeting"
msgstr "会议(_E)"
-#: calendar/gui/calendar-component.c:1233
+#: calendar/gui/calendar-component.c:1234
msgid "Create a new meeting request"
msgstr "创建一条新会议请求"
-#: calendar/gui/calendar-component.c:1239
+#: calendar/gui/calendar-component.c:1240
msgid "New all day appointment"
msgstr "新建全天约会"
-#: calendar/gui/calendar-component.c:1240
+#: calendar/gui/calendar-component.c:1241
msgid "All _Day Appointment"
msgstr "全天约会(_D)"
-#: calendar/gui/calendar-component.c:1241
+#: calendar/gui/calendar-component.c:1242
msgid "Create a new all-day appointment"
msgstr "创建新全天约会"
-#: calendar/gui/calendar-component.c:1247
+#: calendar/gui/calendar-component.c:1248
msgid "New calendar"
msgstr "新建日历"
-#: calendar/gui/calendar-component.c:1248
-msgid "C_alendar"
-msgstr "日历(_A)"
-
#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "日历"
+
+#: calendar/gui/calendar-component.c:1250
msgid "Create a new calendar"
msgstr "创建新日历"
@@ -3769,26 +4262,6 @@ msgstr "周视图"
msgid "Month View"
msgstr "月视图"
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "概要含有"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "描述含有"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "注释含有"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "位置含有"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "无匹配"
-
#: calendar/gui/comp-editor-factory.c:409
msgid "Error while opening the calendar"
msgstr "打开日历时出错"
@@ -3806,211 +4279,133 @@ msgstr "没有权限打开日历"
msgid "open_client(): %s"
msgstr "open_client():%s"
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "音频提醒选项"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "邮件提醒选项"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "邮件提醒选项"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "程序提醒选项"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "未知提醒选项"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "提醒重复"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "要显示的邮件:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "要发送的邮件"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "播放声音:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "重复提醒"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "运行程序:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "发送给:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "使用这些参数:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>提醒</b>"
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "每个额外时间"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>日历列表选项</b>"
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
-msgid "hours"
-msgstr "小时"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>常规</b>"
-#: calendar/gui/dialogs/alarm-page.c:815
-msgid "Action/Trigger"
-msgstr "动作/触发器"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "添加日历"
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "添加(_D)"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "撰写邮件"
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "基本"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "日期/时间:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "邮件(_M)"
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
msgid "Play a sound"
msgstr "播放声音"
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
msgid "Pop up an alert"
msgstr "弹出警告"
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "提醒"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
msgid "Run a program"
msgstr "运行程序"
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "发送给:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
msgid "Send an email"
msgstr "发送电子邮件"
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "概要:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "地址(_A):"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "运行程序"
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "选项(_O)..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "重复提醒"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "发送(_S)"
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
msgid "after"
msgstr "之后"
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
msgid "before"
msgstr "之前"
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
msgid "day(s)"
msgstr "天"
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
msgid "end of appointment"
msgstr "约会结束"
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "每个额外时间"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
msgid "hour(s)"
msgstr "小时"
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "小时"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
msgid "minute(s)"
msgstr "分钟"
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
msgid "start of appointment"
msgstr "约会开始"
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "您必须获取日历的位置。"
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "源位置“%s”不是规格的。"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "源位置“%s”不是 Webcal 源。"
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "选中组中已经存在名为“%s”的源"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr "“%s”是远程组。您必须指定可获取日历的位置"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "添加日历"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "添加任务组"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "颜色(_O):"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "选取一种颜色"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "添加日历(_A)"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "添加组(_A)"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "刷新(_R):"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "类型(_T):"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "动作/触发器"
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "添加(_D)"
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
-msgid "weeks"
-msgstr "周"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "在 %s 时提醒"
#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
#. has "activatable" set.
@@ -4119,7 +4514,7 @@ msgid "Free/Busy Publishing"
msgstr "忙/闲发布"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:1038
#: calendar/gui/e-itip-control.c:556
msgid "Friday"
msgstr "星期五"
@@ -4133,7 +4528,7 @@ msgid "Minutes"
msgstr "分钟"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:1034
#: calendar/gui/e-itip-control.c:552
msgid "Monday"
msgstr "星期一"
@@ -4143,7 +4538,7 @@ msgid "S_un"
msgstr "周日(_U)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1077
+#: calendar/gui/dialogs/recurrence-page.c:1039
#: calendar/gui/e-itip-control.c:557
msgid "Saturday"
msgstr "星期六"
@@ -4157,7 +4552,7 @@ msgid "Show week _numbers in date navigator"
msgstr "在日期浏览器中显示周数(_N)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1078
+#: calendar/gui/dialogs/recurrence-page.c:1040
#: calendar/gui/e-itip-control.c:551
msgid "Sunday"
msgstr "星期日"
@@ -4171,7 +4566,7 @@ msgid "T_hu"
msgstr "周四(_H)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:1037
#: calendar/gui/e-itip-control.c:555
msgid "Thursday"
msgstr "星期四"
@@ -4185,7 +4580,7 @@ msgid "Time format:"
msgstr "时间格式:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1073
+#: calendar/gui/dialogs/recurrence-page.c:1035
#: calendar/gui/e-itip-control.c:553
msgid "Tuesday"
msgstr "星期二"
@@ -4195,7 +4590,7 @@ msgid "W_eek starts:"
msgstr "一周开始(_E):"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:1036
#: calendar/gui/e-itip-control.c:554
msgid "Wednesday"
msgstr "星期三"
@@ -4228,7 +4623,8 @@ msgstr "不在月视图中显示周末(_C)"
msgid "_Day begins:"
msgstr "一天开始(_D):"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4278,6 +4674,72 @@ msgstr "周三(_W)"
msgid "before every appointment"
msgstr "在每次约会前"
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "您必须获取日历的位置。"
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "源位置“%s”不是规格的。"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "源位置“%s”不是 Webcal 源。"
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "选中组中已经存在名为“%s”的源"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr "“%s”是远程组。您必须指定可获取日历的位置"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "添加日历"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "添加任务组"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "颜色(_O):"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "选取一种颜色"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "添加日历(_A)"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "添加组(_A)"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "刷新(_R):"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "类型(_T):"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "周"
+
#: calendar/gui/dialogs/changed-comp.c:60
msgid "This event has been deleted."
msgstr "该事件已经被删除。"
@@ -4322,79 +4784,73 @@ msgstr "%s 您已经做出了修改。放弃这些修改并更新编辑器吗
msgid "%s You have made no changes, update the editor?"
msgstr "%s 您还没有进行修改,更新编辑器吗?"
-#: calendar/gui/dialogs/comp-editor.c:429
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "校验错误:%s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " 到 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (完成 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "已完成 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (预定 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "预定 "
+
+#: calendar/gui/dialogs/comp-editor.c:264
msgid "Could not update object"
msgstr "无法更新对象"
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:937
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
msgid "Edit Appointment"
msgstr "编辑约会"
-#: calendar/gui/dialogs/comp-editor.c:905
-#: calendar/gui/dialogs/comp-editor.c:942
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
#, c-format
msgid "Journal entry - %s"
msgstr "日志条目 - %s"
-#: calendar/gui/dialogs/comp-editor.c:922
-#: calendar/gui/dialogs/comp-editor.c:958
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
msgid "No summary"
msgstr "没有概要"
-#: calendar/gui/dialogs/comp-editor.c:1398
-#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "另存为..."
-
-#: calendar/gui/dialogs/comp-editor.c:1501
-#: calendar/gui/dialogs/comp-editor.c:1536
-#: calendar/gui/dialogs/comp-editor.c:1562
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "如果更新到达的话,对此项目的更改将被丢弃"
-#: calendar/gui/dialogs/comp-editor.c:1586
+#: calendar/gui/dialogs/comp-editor.c:1387
msgid "Unable to use current version!"
msgstr "无法使用当前版本!"
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-msgid "Validation error: %s"
-msgstr "校验错误:%s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " 到 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (完成 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "已完成 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (预定 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "预定 "
-
#: calendar/gui/dialogs/copy-source-dialog.c:57
msgid "Could not open source"
msgstr "无法打开源"
@@ -4456,8 +4912,9 @@ msgid "The item could not be deleted due to an error"
msgstr "由于错误,无法删除项目"
#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "地址簿..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "联系人"
#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
msgid "Delegate To:"
@@ -4467,132 +4924,190 @@ msgstr "授权给:"
msgid "Enter Delegate"
msgstr "输入代表"
-#: calendar/gui/dialogs/event-editor.c:207 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
msgid "Appointment"
msgstr "约会"
-#: calendar/gui/dialogs/event-editor.c:216
-msgid "Reminder"
-msgstr "提醒"
-
-#: calendar/gui/dialogs/event-editor.c:223
+#: calendar/gui/dialogs/event-editor.c:162
msgid "Recurrence"
msgstr "再现"
-#: calendar/gui/dialogs/event-editor.c:230
-#: calendar/gui/dialogs/event-editor.c:303
-#: calendar/gui/dialogs/event-editor.c:447
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
msgid "Scheduling"
msgstr "调度"
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:306
-#: calendar/gui/dialogs/event-editor.c:450 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "方向"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
msgid "Meeting"
msgstr "会议"
-#: calendar/gui/dialogs/event-page.c:490
+#: calendar/gui/dialogs/event-page.c:692
msgid "Event with no start date"
msgstr "没有开始日期的事件"
-#: calendar/gui/dialogs/event-page.c:493
+#: calendar/gui/dialogs/event-page.c:695
msgid "Event with no end date"
msgstr "没有结束日期的事件"
-#: calendar/gui/dialogs/event-page.c:649 calendar/gui/dialogs/task-page.c:516
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
msgid "Start date is wrong"
msgstr "开始日期有错"
-#: calendar/gui/dialogs/event-page.c:659
+#: calendar/gui/dialogs/event-page.c:865
msgid "End date is wrong"
msgstr "结束日期有错"
-#: calendar/gui/dialogs/event-page.c:682
+#: calendar/gui/dialogs/event-page.c:888
msgid "Start time is wrong"
msgstr "开始时间有错"
-#: calendar/gui/dialogs/event-page.c:689
+#: calendar/gui/dialogs/event-page.c:895
msgid "End time is wrong"
msgstr "结束时间有错"
-#: calendar/gui/dialogs/event-page.c:1296
+#: calendar/gui/dialogs/event-page.c:1605
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "无法打开日历“%s”。"
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "在每次约会前"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "约会结束"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "在每次约会前"
+
#: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "全天事务(_L)"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "在每次约会前"
#: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "忙(_U)"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "在每次约会前"
#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "类别(_T)..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "在每次约会前"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>任务列表</b>"
#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "分类"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>时间</b>"
#: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "机密(_N)"
+msgid "A_ll day event"
+msgstr "全天事务(_L)"
#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "日期和时间"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "保存当前视图..."
#: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "闲(_R)"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "类别(_T)..."
#: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "位置(_O):"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "日历:"
#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "私有(_V)"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "分类"
#: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "公开(_B)"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "机密"
#: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "将时间显示为"
+msgid "L_ocation:"
+msgstr "位置(_O):"
#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "保密"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "公开"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "将时间显示为"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
#: calendar/gui/dialogs/task-page.glade.h:11
msgid "Su_mmary:"
msgstr "概要(_U):"
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "清除(_C)"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "描述:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
msgid "_End time:"
msgstr "结束时间(_E):"
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
msgid "_Start time:"
msgstr "开始时间(_S):"
#. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:928
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
#: mail/mail-config.glade.h:103
#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
@@ -4601,32 +5116,26 @@ msgstr "开始时间(_S):"
msgid "None"
msgstr "无"
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:443
msgid "The organizer selected no longer has an account."
msgstr "选中的组织者没有帐户了。"
-#: calendar/gui/dialogs/meeting-page.c:444
+#: calendar/gui/dialogs/meeting-page.c:449
msgid "An organizer is required."
msgstr "需要一名组织者。"
-#: calendar/gui/dialogs/meeting-page.c:459
+#: calendar/gui/dialogs/meeting-page.c:464
msgid "At least one attendee is required."
msgstr "需要至少一个参加者。"
-#: calendar/gui/dialogs/meeting-page.c:677
+#: calendar/gui/dialogs/meeting-page.c:753
msgid "_Delegate To..."
msgstr "授权于(_D)..."
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:681
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
-#: mail/em-folder-tree.c:2584 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "删除(_D)"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "删除(_R)"
#: calendar/gui/dialogs/meeting-page.etspec.h:1
#: calendar/gui/e-meeting-list-view.c:218
@@ -4671,6 +5180,7 @@ msgid "RSVP"
msgstr "RSVP"
#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/dialogs/task-editor.c:158
#: calendar/gui/e-calendar-table.etspec.h:10
#: calendar/gui/e-meeting-list-view.c:248
#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
@@ -4679,21 +5189,30 @@ msgid "Status"
msgstr "状态"
#: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "添加出席者(_T)"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>提醒</b>"
#: calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Add attendees from addressbook."
-msgstr "从地址簿添加出席者。"
+#, fuzzy
+msgid "<b>Organizer</b>"
+msgstr "<b>其它</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "改变组织者(_C)"
#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "组织者:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "联系人"
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "改变组织者(_C)"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "组织者:"
#: calendar/gui/dialogs/new-calendar.glade.h:2
msgid "<b>Calendar options</b>"
@@ -4760,146 +5279,137 @@ msgstr "本次和以后各次"
msgid "All Instances"
msgstr "所有各次"
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "此约会含有 Evolution 无法编辑的循环。"
-#: calendar/gui/dialogs/recurrence-page.c:844
+#: calendar/gui/dialogs/recurrence-page.c:806
msgid "Recurrence date is invalid"
msgstr "再现日期无效"
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:917
msgid "on"
msgstr "在"
-#: calendar/gui/dialogs/recurrence-page.c:1016
+#: calendar/gui/dialogs/recurrence-page.c:978
msgid "first"
msgstr "第一"
-#: calendar/gui/dialogs/recurrence-page.c:1017
+#: calendar/gui/dialogs/recurrence-page.c:979
msgid "second"
msgstr "第二"
-#: calendar/gui/dialogs/recurrence-page.c:1018
+#: calendar/gui/dialogs/recurrence-page.c:980
msgid "third"
msgstr "第三"
-#: calendar/gui/dialogs/recurrence-page.c:1019
+#: calendar/gui/dialogs/recurrence-page.c:981
msgid "fourth"
msgstr "第四"
-#: calendar/gui/dialogs/recurrence-page.c:1020
+#: calendar/gui/dialogs/recurrence-page.c:982
msgid "last"
msgstr "最后"
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1005
msgid "Other Date"
msgstr "其它日期"
-#: calendar/gui/dialogs/recurrence-page.c:1071
+#: calendar/gui/dialogs/recurrence-page.c:1033
msgid "day"
msgstr "天"
-#: calendar/gui/dialogs/recurrence-page.c:1208
+#: calendar/gui/dialogs/recurrence-page.c:1170
msgid "on the"
msgstr "在"
-#: calendar/gui/dialogs/recurrence-page.c:1394
+#: calendar/gui/dialogs/recurrence-page.c:1356
msgid "occurrences"
msgstr "循环"
-#: calendar/gui/dialogs/recurrence-page.c:2378
+#: calendar/gui/dialogs/recurrence-page.c:2309
msgid "Date/Time"
msgstr "日期/时间"
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "每"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
msgstr "例外"
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "预览"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "再现规则"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "定制再现(_C)"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "修改(_M)"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>预览</b>"
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "不再现(_N)"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "再现"
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "删除(_R)"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "每"
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "简单再现(_S)"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "编辑约会(_E)"
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
msgid "for"
msgstr "只"
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
msgid "forever"
msgstr "永远"
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
msgid "month(s)"
msgstr "月"
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
msgid "until"
msgstr "直到"
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
msgid "week(s)"
msgstr "周"
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
msgid "year(s)"
msgstr "年"
-#: calendar/gui/dialogs/select-source-dialog.c:77
+#: calendar/gui/dialogs/select-source-dialog.c:84
msgid "Select destination"
msgstr "选择目的"
-#: calendar/gui/dialogs/select-source-dialog.c:98
+#: calendar/gui/dialogs/select-source-dialog.c:106
msgid "_Destination"
msgstr "目的(_D)"
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
msgid "Task List"
msgstr "任务列表"
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
msgid "Completed date is wrong"
msgstr "完成日期有错"
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">邮件字体</span>"
+
#: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "完成百分比(_C)"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">警告</span>"
#. Pass TRUE as is_utc, so it gets converted to the current
#. timezone.
#: calendar/gui/dialogs/task-details-page.glade.h:4
#: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
#: calendar/gui/print.c:2346
msgid "Completed"
@@ -4913,8 +5423,8 @@ msgstr "高"
#: calendar/gui/dialogs/task-details-page.glade.h:6
#: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
#: calendar/gui/print.c:2343
msgid "In Progress"
msgstr "进行中"
@@ -4926,22 +5436,22 @@ msgid "Low"
msgstr "低"
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
msgid "Normal"
msgstr "中"
#: calendar/gui/dialogs/task-details-page.glade.h:9
#: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
msgid "Not Started"
msgstr "尚未开始"
#: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "进度"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "完成率:%i"
#: calendar/gui/dialogs/task-details-page.glade.h:11
#: calendar/gui/e-calendar-table.c:377
@@ -4964,36 +5474,42 @@ msgstr "状态(_S):"
msgid "_Web Page:"
msgstr "网页(_W):"
-#: calendar/gui/dialogs/task-editor.c:215
-#: calendar/gui/dialogs/task-editor.c:278
-#: calendar/gui/dialogs/task-editor.c:415
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "任务"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
msgid "Assignment"
msgstr "指派"
-#: calendar/gui/dialogs/task-page.c:489
+#: calendar/gui/dialogs/task-page.c:496
msgid "Due date is wrong"
msgstr "到期日期错误"
-#: calendar/gui/dialogs/task-page.c:826
+#: calendar/gui/dialogs/task-page.c:831
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "无法打开“%s”中的任务。"
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "机密(_F)"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">选项</span>"
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">删除邮件</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
#: calendar/gui/e-cal-component-preview.c:268
#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
msgid "Description:"
msgstr "描述:"
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "文件夹:"
-
#: calendar/gui/dialogs/task-page.glade.h:10
msgid "Sta_rt date:"
msgstr "开始日期(_R):"
@@ -5002,52 +5518,58 @@ msgstr "开始日期(_R):"
msgid "_Due date:"
msgstr "到期日期(_D):"
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "组"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "选中要发布的日历"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>日历选项</b>"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "每日"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "公布频率"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "忙闲编辑器"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "忙/闲公布位置"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "忙/闲公布位置"
+msgid "Free/Busy Editor"
+msgstr "忙闲编辑器"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "登录名:"
+#, fuzzy
+msgid "_Daily"
+msgstr "每日"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "密码:"
+#, fuzzy
+msgid "_Manual"
+msgstr "邮件(_M)"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "公布频率"
+#, fuzzy
+msgid "_Password:"
+msgstr "密码:"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
msgstr "记住密码"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "用户名(_N):"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "用户发布"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
msgstr "每周"
#: calendar/gui/e-alarm-list.c:395
@@ -5124,7 +5646,7 @@ msgstr "在 %2$s 时 %1$s"
msgid "%s for an unknown trigger type"
msgstr "%s 为未知触发类型"
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2378
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
#, c-format
msgid "Click to open %s"
msgstr "单击以打开 %s"
@@ -5133,6 +5655,11 @@ msgstr "单击以打开 %s"
msgid "Untitled"
msgstr "无标题"
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "概要:"
+
#: calendar/gui/e-cal-component-preview.c:194
#: calendar/gui/e-cal-component-preview.c:205
msgid "Start Date:"
@@ -5156,20 +5683,93 @@ msgstr "优先级:"
msgid "Web Page:"
msgstr "网页:"
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "公开"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "结束日期"
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "保密"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "开始日期"
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "机密"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "概要"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "空闲"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "繁忙"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "北"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "南"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "东"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "西"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"地理位置必须以此格式输入:\n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "是"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "否"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
+#: camel/camel-gpg-context.c:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "未知"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "重复"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "已指派"
#: calendar/gui/e-calendar-table.c:396
msgid "0%"
@@ -5215,15 +5815,6 @@ msgstr "90%"
msgid "100%"
msgstr "100%"
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "空闲"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:401
-msgid "Busy"
-msgstr "繁忙"
-
#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
msgid "Deleting selected objects"
msgstr "删除选中的对象"
@@ -5234,7 +5825,7 @@ msgstr "更新对象"
#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
msgid "_Open"
msgstr "打开(_O)"
@@ -5244,7 +5835,7 @@ msgstr "打开网页(_W)"
#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
#: ui/evolution-mail-message.xml.h:128
msgid "_Save As..."
msgstr "另存为(_S)..."
@@ -5267,7 +5858,7 @@ msgstr "剪切(_U)"
#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
-#: mail/em-folder-tree.c:960 mail/message-list.c:1650
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
#: ui/evolution-tasks.xml.h:20
@@ -5298,10 +5889,25 @@ msgstr "标记为完成(_M)"
msgid "_Mark Selected Tasks as Complete"
msgstr "把任务标记为完成(_M)"
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "删除(_D)"
+
#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
msgid "_Delete Selected Tasks"
msgstr "删除选定的任务(_D)"
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "另存为..."
+
#: calendar/gui/e-calendar-table.c:1350
#: calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
@@ -5333,11 +5939,6 @@ msgstr "优先级"
msgid "Start date"
msgstr "开始日期"
-#: calendar/gui/e-calendar-table.etspec.h:11
-#: calendar/gui/e-cal-list-view.etspec.h:5 mail/mail-dialogs.glade.h:22
-msgid "Summary"
-msgstr "概要"
-
#: calendar/gui/e-calendar-table.etspec.h:12
msgid "Task sort"
msgstr "任务排序"
@@ -5414,95 +6015,13 @@ msgstr "转到日期(_G)..."
msgid "_Settings..."
msgstr "设置(_S)..."
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "结束日期"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-msgid "Start Date"
-msgstr "开始日期"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1705 camel/camel-gpg-context.c:1756
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1379
-#: camel/providers/imap4/camel-imap4-engine.c:1406
-#: camel/providers/imap4/camel-imap4-engine.c:1436
-#: camel/providers/imap4/camel-imap4-engine.c:1476
-#: camel/providers/imap4/camel-imap4-store.c:1179
-#: camel/providers/imap4/camel-imap4-utils.c:293
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1117
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "未知"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "重复"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "已指派"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "是"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "否"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "北"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "南"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "东"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "西"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"地理位置必须以此格式输入:\n"
-"\n"
-"45.436845,125.862501"
-
#. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
#: e-util/e-time-utils.c:393
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%Y年%m月%d日%A%H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
#: e-util/e-time-utils.c:402
msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5519,43 +6038,36 @@ msgstr ""
"\n"
"%s"
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "上午"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "下午"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i 分钟分割"
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
msgid "%A %d %B"
msgstr "%B%d日%A"
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
#: calendar/gui/e-week-view-main-item.c:343
msgid "%d %b"
msgstr "%B%d日"
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i 分钟分割"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "上午"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "下午"
#: calendar/gui/e-itip-control.c:585
msgid "Yes. (Complex Recurrence)"
@@ -5681,7 +6193,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:1141 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "确定"
@@ -5898,51 +6410,35 @@ msgstr "附件中没有可查看的日历项目"
msgid "Update complete\n"
msgstr "更新完成\n"
-#: calendar/gui/e-itip-control.c:1805 calendar/gui/e-itip-control.c:1877
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "由于条目不再存在而无法更新参与者状态"
-
-#: calendar/gui/e-itip-control.c:1821 calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1803
msgid "Object is invalid and cannot be updated\n"
msgstr "对象无效,无法更新\n"
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1813
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "此响应并非来自当前参与者。将响应者加为参与者吗?"
-#: calendar/gui/e-itip-control.c:1843
+#: calendar/gui/e-itip-control.c:1825
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新参与者状态!\n"
-#: calendar/gui/e-itip-control.c:1862
-msgid "There was an error on the CORBA system\n"
-msgstr "CORBA 系统出错\n"
-
-#: calendar/gui/e-itip-control.c:1865
-msgid "Object could not be found\n"
-msgstr "找不到对象\n"
-
-#: calendar/gui/e-itip-control.c:1868
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "您没有适当的权限打开日历\n"
-
-#: calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1842
msgid "Attendee status updated\n"
msgstr "更新参与者状态\n"
-#: calendar/gui/e-itip-control.c:1874
-msgid "Attendee status could not be updated!\n"
-msgstr "无法更新参与者状态!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "由于条目不再存在而无法更新参与者状态"
-#: calendar/gui/e-itip-control.c:1905
+#: calendar/gui/e-itip-control.c:1872
msgid "Removal Complete"
msgstr "删除完成"
-#: calendar/gui/e-itip-control.c:1928 calendar/gui/e-itip-control.c:1976
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
msgid "Item sent!\n"
msgstr "项目已发送!\n"
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1980
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
@@ -5971,6 +6467,10 @@ msgstr "装入日历"
msgid "Loading calendar..."
msgstr "正在装入日历..."
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "组织者:"
+
#: calendar/gui/e-itip-control.glade.h:10
msgid "Server Message:"
msgstr "服务器消息:"
@@ -6041,7 +6541,7 @@ msgid "Needs Action"
msgstr "需要动作"
#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:400
+#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
msgid "Tentative"
msgstr "暂时的"
@@ -6054,100 +6554,81 @@ msgstr "被委任的"
msgid "In Process"
msgstr "处理中"
-#: calendar/gui/e-meeting-time-sel.c:402 designs/OOA/ooa.glade.h:11
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%Y年%m月%d日%A"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%Y年%m月%d日%A"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%Y-%m-%d"
+
+#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
msgid "Out of Office"
msgstr "办公室以外"
-#: calendar/gui/e-meeting-time-sel.c:403
+#: calendar/gui/e-meeting-time-sel.c:401
msgid "No Information"
msgstr "没有信息"
-#: calendar/gui/e-meeting-time-sel.c:419
-msgid "Add attendees from addressbook"
-msgstr "从地址簿添加出席者"
-
-#: calendar/gui/e-meeting-time-sel.c:442
-msgid "_Options"
-msgstr "选项(_O)"
+#: calendar/gui/e-meeting-time-sel.c:432
+#, fuzzy
+msgid "O_ptions"
+msgstr "选项"
-#: calendar/gui/e-meeting-time-sel.c:459
+#: calendar/gui/e-meeting-time-sel.c:449
msgid "Show _only working hours"
msgstr "只显示工作小时(_O)"
-#: calendar/gui/e-meeting-time-sel.c:469
+#: calendar/gui/e-meeting-time-sel.c:459
msgid "Show _zoomed out"
msgstr "显示缩放的输出(_Z)"
-#: calendar/gui/e-meeting-time-sel.c:484
+#: calendar/gui/e-meeting-time-sel.c:474
msgid "_Update free/busy"
msgstr "更新忙闲(_U)"
-#: calendar/gui/e-meeting-time-sel.c:499
+#: calendar/gui/e-meeting-time-sel.c:489
msgid "_<<"
msgstr "_<<"
-#: calendar/gui/e-meeting-time-sel.c:517
+#: calendar/gui/e-meeting-time-sel.c:507
msgid "_Autopick"
msgstr "自动获取(_A)"
-#: calendar/gui/e-meeting-time-sel.c:532
+#: calendar/gui/e-meeting-time-sel.c:522
msgid ">_>"
msgstr ">_>"
-#: calendar/gui/e-meeting-time-sel.c:549
+#: calendar/gui/e-meeting-time-sel.c:539
msgid "_All people and resources"
msgstr "全部人和资源(_A)"
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:548
msgid "All _people and one resource"
msgstr "全部人和一个资源(_P)"
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:557
msgid "_Required people"
msgstr "必需的人(_R)"
-#: calendar/gui/e-meeting-time-sel.c:576
+#: calendar/gui/e-meeting-time-sel.c:566
msgid "Required people and _one resource"
msgstr "必需的人和一个资源(_O)"
-#: calendar/gui/e-meeting-time-sel.c:595
-msgid "Meeting _start time:"
-msgstr "会议开始时间(_S):"
-
-#: calendar/gui/e-meeting-time-sel.c:615
-msgid "Meeting _end time:"
-msgstr "会议结束时间(_E):"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2077
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%Y年%m月%d日%A"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel.c:2110
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%Y年%m月%d日%A"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%Y-%m-%d"
-
#: calendar/gui/e-pub-utils.c:300
#, c-format
msgid "Enter the password for %s"
@@ -6166,9 +6647,7 @@ msgstr ""
msgid "Loading tasks"
msgstr "装入任务"
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:846
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
@@ -6185,15 +6664,6 @@ msgstr "正在删除选中的对象..."
msgid "Expunging"
msgstr "销毁"
-#: calendar/gui/e-tasks.c:1088
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:873 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "任务"
-
#: calendar/gui/gnome-cal.c:704
msgid "Updating query"
msgstr "更新查询"
@@ -6217,55 +6687,6 @@ msgstr "打开 %s"
msgid "Purging"
msgstr "销毁"
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "*Control*F3"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "*Control*F4"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "日历和任务"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "在此配置您的时区、日历和任务列表 "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution 日历和任务"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution 日历配置控件"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution 日历调度邮件查看器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution 日历/任务新闻编辑器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution 日历组件"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution 任务组件"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-msgid "_Calendars"
-msgstr "日历(_C)"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "任务(_T)"
-
#: calendar/gui/goto-dialog.glade.h:1
msgid "April"
msgstr "四月"
@@ -6609,10 +7030,6 @@ msgstr "选中的月(%Y年%m月)"
msgid "Selected year (%Y)"
msgstr "选中的年(%Y年)"
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "任务"
-
#: calendar/gui/print.c:2356
#, c-format
msgid "Status: %s"
@@ -6689,27 +7106,28 @@ msgstr "无法打开任务列表“%s”来创建事件和会议"
msgid "There is no calendar available for creating tasks"
msgstr "没有可创建任务的日历"
-#: calendar/gui/tasks-component.c:1029
+#: calendar/gui/tasks-component.c:1030
msgid "New task"
msgstr "新建任务"
-#: calendar/gui/tasks-component.c:1030
+#: calendar/gui/tasks-component.c:1031
msgid "_Task"
msgstr "任务(_T)"
-#: calendar/gui/tasks-component.c:1031
+#: calendar/gui/tasks-component.c:1032
msgid "Create a new task"
msgstr "创建新任务"
-#: calendar/gui/tasks-component.c:1037
+#: calendar/gui/tasks-component.c:1038
msgid "New tasks group"
msgstr "新建任务组"
-#: calendar/gui/tasks-component.c:1038
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
msgstr "任务组(_T)"
-#: calendar/gui/tasks-component.c:1039
+#: calendar/gui/tasks-component.c:1040
msgid "Create a new tasks group"
msgstr "创建新任务组"
@@ -8469,41 +8887,6 @@ msgstr "(user-tag)参数无效"
msgid "Error executing filter search: %s: %s"
msgstr "执行过滤规则搜索错误:%s:%s"
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "不支持的操作:附加邮件:附加 %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "不支持的操作:按表达式搜索:搜索 %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "不支持的操作:按 uid 搜索:搜索 %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "移动邮件"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "复制邮件"
-
-#: camel/camel-folder.c:1665
-msgid "Learning junk"
-msgstr "学习垃圾邮件"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr "学习非垃圾邮件"
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "过滤新邮件"
-
#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
#, c-format
msgid ""
@@ -8547,6 +8930,41 @@ msgstr "(match-threads) 需要文件夹集"
msgid "Performing query on unknown header: %s"
msgstr "对未知的头进行查询:%s"
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "不支持的操作:附加邮件:附加 %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "不支持的操作:按表达式搜索:搜索 %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "不支持的操作:按 uid 搜索:搜索 %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "移动邮件"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "复制邮件"
+
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr "学习垃圾邮件"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr "学习非垃圾邮件"
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "过滤新邮件"
+
#: camel/camel-gpg-context.c:722
#, c-format
msgid ""
@@ -8662,26 +9080,6 @@ msgstr "加密内容"
msgid "Unable to parse message content"
msgstr "无法分析邮件内容"
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "无法为 %s 创建锁定文件:%s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "对 %s 获取锁文件的尝试超时。请稍后再试。"
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "用 fcntl(2) 获取锁失败:%s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "用 flock(2) 获取锁失败:%s"
-
#: camel/camel-lock-client.c:100
#, c-format
msgid "Cannot build locking helper pipe: %s"
@@ -8702,6 +9100,26 @@ msgstr "无法锁定“%s”:lock-helper 协议错误"
msgid "Could not lock '%s'"
msgstr "无法锁定“%s”"
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "无法为 %s 创建锁定文件:%s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "对 %s 获取锁文件的尝试超时。请稍后再试。"
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "用 fcntl(2) 获取锁失败:%s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "用 flock(2) 获取锁失败:%s"
+
#: camel/camel-movemail.c:107
#, c-format
msgid "Could not check mail file %s: %s"
@@ -9142,7 +9560,7 @@ msgstr "无法添加加密证书"
msgid "Cannot add CMS SignerInfo"
msgstr "无法添加 CMS 签名者信息"
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
msgid "Cannot create encoder context"
msgstr "无法创建编码器上下文"
@@ -9223,7 +9641,8 @@ msgid "Certificate only message, certificates imported and verified"
msgstr "只有证书的邮件,证书已导入并校验"
#: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
+#, fuzzy
+msgid "Cannot find signature digests"
msgstr "找不到签名摘要"
#: camel/camel-smime-context.c:651
@@ -9236,47 +9655,51 @@ msgid "Decoder failed"
msgstr "解码器失败"
#: camel/camel-smime-context.c:804
-#, c-format
-msgid "Can't find certificate for `%s'"
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
msgstr "找不到“%s”的证书"
#: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+#, fuzzy
+msgid "Cannot find common bulk encryption algorithm"
msgstr "找不到公共批量加密算法"
#. PORT_GetError(); ??
#: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+#, fuzzy
+msgid "Cannot allocate slot for encryption bulk key"
msgstr "无法为加密批量密钥分配密钥槽"
#: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
+#, fuzzy
+msgid "Cannot create CMS Message"
msgstr "无法创建 CMS 邮件"
#: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
msgstr "无法创建 CMS 信封数据"
#: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
msgstr "无法附加 CMS 信封数据"
#: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+#, fuzzy
+msgid "Cannot attach CMS data object"
msgstr "无法附加 CMS 数据对象"
#: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
msgstr "无法创建 CMS 收件人信息"
#: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot add CMS RecipientInfo"
msgstr "无法添加 CMS 收件人信息"
-#: camel/camel-smime-context.c:877
-msgid "Can't create encoder context"
-msgstr "无法创建编码器上下文"
-
#: camel/camel-smime-context.c:888
msgid "Failed to add data to encoder"
msgstr "将数据添加到编码器失败"
@@ -9321,7 +9744,8 @@ msgstr "无法创建文件夹:%s:文件夹已存在"
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "无法删除文件夹:%s:无效操作"
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "无法重命名文件夹:%s:无效操作"
@@ -9567,7 +9991,7 @@ msgstr "无法将邮件移动或复制到虚拟文件夹中"
msgid "Cannot delete folder: %s: No such folder"
msgstr "无法删除文件夹:%s:没有该文件夹"
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "无法重命名文件夹:%s:没有该文件夹"
@@ -9586,8 +10010,8 @@ msgid "Checking for new mail"
msgstr "检查新邮件"
#: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
msgid "Check for new messages in all folders"
msgstr "在所有文件夹中检查新邮件"
@@ -9617,8 +10041,8 @@ msgid "For accessing Novell Groupwise servers"
msgstr "访问 Novell GroupWise 服务器"
#: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
#: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
#: 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:108
@@ -9636,315 +10060,6 @@ msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
msgid "Checklist"
msgstr "待办清单"
-#: camel/providers/imap4/camel-imap4-command.c:531
-#: camel/providers/imap4/camel-imap4-command.c:538
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "向 IMAP 服务器 %s 发送命令失败:%s"
-
-#: camel/providers/imap4/camel-imap4-command.c:637
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "来自 IMAP4 服务器 %s 的意外响应:%s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:232
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "来自 IMAP 服务器 %s 的意外应答。"
-
-#: camel/providers/imap4/camel-imap4-engine.c:416
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "无法选择文件夹“%s”:无效的邮箱名"
-
-#: camel/providers/imap4/camel-imap4-engine.c:422
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "无法选择文件夹“%s”:无效的命令"
-
-#: camel/providers/imap4/camel-imap4-engine.c:997
-#: camel/providers/imap4/camel-imap4-engine.c:1378
-#: camel/providers/imap4/camel-imap4-engine.c:1405
-#: camel/providers/imap4/camel-imap4-engine.c:1435
-#: camel/providers/imap4/camel-imap4-engine.c:1475
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "IMAP4 服务器 %s 意外断开连接:%s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:998
-msgid "Got BYE response"
-msgstr "得到 BYE 响应"
-
-#: camel/providers/imap4/camel-imap4-folder.c:507
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "无法将标志与文件夹“%s”同步:未知"
-
-#: camel/providers/imap4/camel-imap4-folder.c:513
-#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "无法将标志与文件夹“%s”同步:无效的命令"
-
-#: camel/providers/imap4/camel-imap4-folder.c:650
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "无法销毁文件夹“%s”:未知"
-
-#: camel/providers/imap4/camel-imap4-folder.c:655
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "无法销毁文件夹“%s”:无效的命令"
-
-#: camel/providers/imap4/camel-imap4-folder.c:845
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "无法从文件夹“%2$s”获取邮件 %1$s:没有这样的邮件"
-
-#: camel/providers/imap4/camel-imap4-folder.c:850
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "无法从文件夹“%2$s”获取邮件 %1$s:命令无效"
-
-#: camel/providers/imap4/camel-imap4-folder.c:975
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "无法将邮件附加到文件夹“%s”:未知错误"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1004
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "无法将邮件附加到文件夹“%s”:无效的命令"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1083
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "无法将邮件从文件夹“%s”移动到文件夹“%s”:未知"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1087
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr "无法将邮件从文件夹“%s”复制到文件夹“%s”:未知"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1095
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "无法将邮件从文件夹“%s”移动到文件夹“%s”:无效的命令"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1099
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "无法将邮件从文件夹“%s”复制到文件夹“%s”:无效的命令"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "文件夹"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "只显示订阅了的文件夹"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "覆盖服务器提供的文件夹命名空间"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "命名空间"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "IMAPv4rev1 服务器上的邮件的读写。试验性!"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "该选项将使用纯文本密码连接到 IMAPv4rev1 服务器。"
-
-#: camel/providers/imap4/camel-imap4-store.c:174
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP 服务器 %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:176
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
-
-#: camel/providers/imap4/camel-imap4-store.c:217
-#: camel/providers/imap4/camel-imap4-store.c:234
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "无法连接到 %s (端口 %d):%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:219
-#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL 不可用"
-
-#: camel/providers/imap4/camel-imap4-store.c:231
-#: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:841
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "连接已取消"
-
-#: camel/providers/imap4/camel-imap4-store.c:270
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "以安全模式连接到 IMAP 服务器 %s 失败:服务器不支持 STARTTLS"
-
-#: camel/providers/imap4/camel-imap4-store.c:295
-#: camel/providers/imap/camel-imap-store.c:675
-#: camel/providers/imap/camel-imap-store.c:706
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:296
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "未知的错误"
-
-#: camel/providers/imap4/camel-imap4-store.c:382
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "无法使用 %2$s 身份验证算法对 IMAP 服务器 %1$s 进行身份验证"
-
-#: camel/providers/imap4/camel-imap4-store.c:427
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%s请输入 %s@%s 的 IMAP 密码"
-
-#: camel/providers/imap4/camel-imap4-store.c:501
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "无法使用 %2$s 认证到 IMAP 服务器 %1$s"
-
-#: camel/providers/imap4/camel-imap4-store.c:732
-#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "无法获取 IMAP 服务器 %2$s 上的文件夹 %1$s:未知"
-
-#: camel/providers/imap4/camel-imap4-store.c:794
-#: camel/providers/imap/camel-imap-store.c:1881
-#: camel/providers/imap/camel-imap-store.c:2259
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "文件夹名“%s”无效,原因是其中含有字符“%c”"
-
-#: camel/providers/imap4/camel-imap4-store.c:838
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "无法创建文件夹“%s”:无效的邮箱名"
-
-#: camel/providers/imap4/camel-imap4-store.c:843
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "无法创建文件夹“%s”:无效的命令"
-
-#: camel/providers/imap4/camel-imap4-store.c:871
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "无法删除文件夹“%s”:特殊文件夹"
-
-#: camel/providers/imap4/camel-imap4-store.c:904
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "无法删除文件夹“%s”:无效的邮箱名"
-
-#: camel/providers/imap4/camel-imap4-store.c:909
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "无法删除文件夹“%s”:无效的命令"
-
-#: camel/providers/imap4/camel-imap4-store.c:929
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "无法将文件夹“%s”重命名为“%s”:特殊文件夹"
-
-#: camel/providers/imap4/camel-imap4-store.c:961
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr "无法将文件夹“%s”重命名为“%s”:无效的邮箱名"
-
-#: camel/providers/imap4/camel-imap4-store.c:966
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "无法将文件夹“%s”重命名为“%s”:无效的命令"
-
-#: camel/providers/imap4/camel-imap4-store.c:1177
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1179
-msgid "Bad command"
-msgstr "无效命令"
-
-#: camel/providers/imap4/camel-imap4-store.c:1241
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "无法订阅文件夹“%s”:无效的邮箱名"
-
-#: camel/providers/imap4/camel-imap4-store.c:1246
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "无法订阅文件夹“%s”:无效的命令"
-
-#: camel/providers/imap4/camel-imap4-store.c:1291
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "无法退订文件夹“%s”:无效的邮箱名"
-
-#: camel/providers/imap4/camel-imap4-store.c:1296
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "无法退订文件夹“%s”:无效的命令"
-
-#: camel/providers/imap4/camel-imap4-utils.c:86
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "来自 IMAP4 服务器 %s 的意外响应:"
-
-#: camel/providers/imap4/camel-imap4-utils.c:109
-msgid "No data"
-msgstr "无数据"
-
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP4 服务器 %s 意外断开连接:%s"
-
#: camel/providers/imap/camel-imap-command.c:218
#: camel/providers/imap/camel-imap-command.c:257
#: camel/providers/imap/camel-imap-command.c:447
@@ -9958,6 +10073,15 @@ msgstr "操作已取消"
msgid "Server unexpectedly disconnected: %s"
msgstr "服务器意外地中止了连接:%s"
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "未知的错误"
+
#. for imap ALERT codes, account user@host
#: camel/providers/imap/camel-imap-command.c:320
#, c-format
@@ -10026,7 +10150,7 @@ msgstr ""
" %s"
#: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
#: camel/providers/local/camel-mbox-folder.c:418
#: camel/providers/local/camel-mh-folder.c:202
msgid "No such message"
@@ -10097,6 +10221,27 @@ msgstr "使用自定义命令连接到服务器"
msgid "Command:"
msgstr "命令:"
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "文件夹"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "只显示订阅了的文件夹"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "覆盖服务器提供的文件夹命名空间"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "命名空间"
+
#: camel/providers/imap/camel-imap-provider.c:64
msgid "Apply filters to new messages in INBOX on this server"
msgstr "应用过滤规则到本服务器上收件箱中的新邮件"
@@ -10117,13 +10262,62 @@ msgstr "IMAP"
msgid "For reading and storing mail on IMAP servers."
msgstr "IMAP 服务器上的邮件的读写。"
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP 服务器 %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:285
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "无法连接到 %s (端口 %d):%s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL 不可用"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "连接已取消"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
+
#: camel/providers/imap/camel-imap-store.c:676
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/pop3/camel-pop3-store.c:233
msgid "SSL/TLS extension not supported."
msgstr "不支持 SSL/TLS 扩展。"
#: camel/providers/imap/camel-imap-store.c:707
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/pop3/camel-pop3-store.c:274
msgid "SSL negotiations failed"
msgstr "SSL 协商失败"
@@ -10170,13 +10364,21 @@ msgstr ""
msgid "No such folder %s"
msgstr "没有文件夹 %s"
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "文件夹名“%s”无效,原因是其中含有字符“%c”"
+
#: camel/providers/imap/camel-imap-store.c:1939
#: camel/providers/imap/camel-imap-store.c:2320
msgid "The parent folder is not allowed to contain subfolders"
msgstr "父文件夹不允许含有子文件夹"
#: camel/providers/imap/camel-imap-store.c:1994
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-maildir-store.c:139
#: camel/providers/local/camel-mbox-store.c:212
#: camel/providers/local/camel-mh-store.c:236
#, c-format
@@ -10188,6 +10390,229 @@ msgstr "无法创建文件夹:%s:文件夹已存在。"
msgid "Unknown parent folder: %s"
msgstr "未知的父文件夹:%s"
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "向 IMAP 服务器 %s 发送命令失败:%s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "来自 IMAP4 服务器 %s 的意外响应:%s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "来自 IMAP 服务器 %s 的意外应答。"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "无法选择文件夹“%s”:无效的邮箱名"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "无法选择文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "IMAP4 服务器 %s 意外断开连接:%s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "得到 BYE 响应"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "无法将标志与文件夹“%s”同步:未知"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "无法将标志与文件夹“%s”同步:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "无法销毁文件夹“%s”:未知"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "无法销毁文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "无法从文件夹“%2$s”获取邮件 %1$s:没有这样的邮件"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "无法从文件夹“%2$s”获取邮件 %1$s:命令无效"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "无法将邮件附加到文件夹“%s”:未知错误"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "无法将邮件附加到文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "无法将邮件从文件夹“%s”移动到文件夹“%s”:未知"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "无法将邮件从文件夹“%s”复制到文件夹“%s”:未知"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr "无法将邮件从文件夹“%s”移动到文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "无法将邮件从文件夹“%s”复制到文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "IMAPv4rev1 服务器上的邮件的读写。试验性!"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "该选项将使用纯文本密码连接到 IMAPv4rev1 服务器。"
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "以安全模式连接到 IMAP 服务器 %s 失败:服务器不支持 STARTTLS"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr "无法使用 %2$s 身份验证算法对 IMAP 服务器 %1$s 进行身份验证"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%s请输入 %s@%s 的 IMAP 密码"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "无法使用 %2$s 认证到 IMAP 服务器 %1$s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "无法获取 IMAP 服务器 %2$s 上的文件夹 %1$s:未知"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "无法创建文件夹“%s”:无效的邮箱名"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "无法创建文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "无法删除文件夹“%s”:特殊文件夹"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "无法删除文件夹“%s”:无效的邮箱名"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "无法删除文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "无法将文件夹“%s”重命名为“%s”:特殊文件夹"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "无法将文件夹“%s”重命名为“%s”:无效的邮箱名"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "无法将文件夹“%s”重命名为“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "无效命令"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "无法订阅文件夹“%s”:无效的邮箱名"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "无法订阅文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "无法退订文件夹“%s”:无效的邮箱名"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "无法退订文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "来自 IMAP4 服务器 %s 的意外响应:"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "无数据"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "IMAP4 服务器 %s 意外断开连接:%s"
+
#: camel/providers/imapp/camel-imapp-provider.c:39
#: camel/providers/pop3/camel-pop3-provider.c:38
msgid "Message storage"
@@ -10352,18 +10777,26 @@ msgstr "无法保存概要:%s:%s"
msgid "Unable to add message to summary: unknown reason"
msgstr "无法将邮件添加到概要中:未知的原因"
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "收件箱"
+
+#: camel/providers/local/camel-maildir-folder.c:214
msgid "Maildir append message cancelled"
msgstr "邮件目录附加已放弃"
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
#, c-format
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "无法将邮件附加到邮件目录文件夹:%s:%s"
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
#: camel/providers/local/camel-mbox-folder.c:417
#: camel/providers/local/camel-mbox-folder.c:436
#: camel/providers/local/camel-mbox-folder.c:467
@@ -10379,48 +10812,48 @@ msgstr ""
"无法从文件夹 %2$s 获取邮件:%1$s\n"
" %3$s"
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
msgid "Invalid message contents"
msgstr "无效的邮件内容"
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
#: camel/providers/local/camel-mbox-store.c:154
#: camel/providers/local/camel-mh-store.c:204
#, c-format
msgid "Cannot get folder `%s': %s"
msgstr "无法获取文件夹“%s”:%s"
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
#: camel/providers/local/camel-mbox-store.c:162
#: camel/providers/local/camel-mh-store.c:211
#, c-format
msgid "Cannot get folder `%s': folder does not exist."
msgstr "无法获得文件夹“%s”:文件夹不存在。"
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
#: camel/providers/local/camel-mbox-store.c:184
#: camel/providers/local/camel-mbox-store.c:196
#, c-format
msgid "Cannot create folder `%s': %s"
msgstr "无法创建文件夹“%s”:%s"
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
#, c-format
msgid "Cannot get folder `%s': not a maildir directory."
msgstr "无法获取文件夹“%s”:不是 maildir 目录。"
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
#: camel/providers/local/camel-mh-store.c:260
#, c-format
msgid "Could not delete folder `%s': %s"
msgstr "无法删除文件夹“%s”:%s"
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
msgid "not a maildir directory"
msgstr "不是 maildir 目录"
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
#: camel/providers/local/camel-spool-store.c:284
#: camel/providers/local/camel-spool-store.c:314
#, c-format
@@ -10860,14 +11293,20 @@ msgid ""
"You cannot subscribe to this newsgroup:\n"
"\n"
"No such newsgroup. The selected item is a probably a parent folder."
-msgstr "您无法订阅此新闻组:\n\n没有这样的新闻组。选中项目可能是父文件夹。"
+msgstr ""
+"您无法订阅此新闻组:\n"
+"\n"
+"没有这样的新闻组。选中项目可能是父文件夹。"
#: camel/providers/nntp/camel-nntp-store.c:904
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
"\n"
"newsgroup does not exist!"
-msgstr "您无法订阅此新闻组:\n\n新闻组不存在!"
+msgstr ""
+"您无法订阅此新闻组:\n"
+"\n"
+"新闻组不存在!"
#: camel/providers/nntp/camel-nntp-store.c:929
msgid "You cannot create a folder in a News store: subscribe instead."
@@ -10997,48 +11436,53 @@ msgstr ""
msgid "Could not connect to POP server %s (port %d): %s"
msgstr "无法连接到 POP 服务器 %s (端口 %d):%s"
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "认证到 POP 服务器 %s 失败:%s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
#, c-format
msgid "Failed to connect to POP server %s in secure mode: %s"
msgstr "以安全模式连接到 POP 服务器 %s 失败:%s"
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
#, c-format
msgid "Could not connect to POP server %s"
msgstr "无法连接到 POP 服务器 %s"
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
"mechanism."
msgstr "无法连接到 POP 服务器 %s:不支持请求认证机制。"
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
#, c-format
msgid "SASL `%s' Login failed for POP server %s: %s"
msgstr "使用SASL“%s”登录 POP 服务器 %s 失败:%s"
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "无法登录到 POP 服务器 %s:SASL 协议错误"
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
#, c-format
msgid "Failed to authenticate on POP server %s: %s"
msgstr "认证到 POP 服务器 %s 失败:%s"
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
#, c-format
msgid "%sPlease enter the POP password for %s on host %s"
msgstr "%s请输入 %s@%s 的 POP 密码"
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -11047,7 +11491,16 @@ msgstr ""
"无法连接到 POP 服务器 %s。\n"
"发送密码错误:%s"
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"无法连接到 POP 服务器 %s。\n"
+"发送密码错误:%s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
#, c-format
msgid "No such folder `%s'."
msgstr "没有文件夹“%s”。"
@@ -11433,78 +11886,6 @@ msgstr "MIME 类型:"
msgid "Suggest automatic display of attachment"
msgstr "建议自动显示附件"
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "无法对寄出的邮件签名:未对此账户设置签名证书"
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "无法对寄出的邮件加密:未对此账户设置加密证书"
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr "无法打开文件"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "无法从编辑器获取邮件"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "无标题邮件"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "打开文件"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "自动生成的"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "签名:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "附加了 <b>%d</b> 个文件"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "隐藏附件栏(将附件拖至此处)(_A)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "显示附件栏(将附件拖至此处)(_A)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
-#: composer/e-msg-composer.c:3179
-msgid "Compose a message"
-msgstr "撰写邮件"
-
-#: composer/e-msg-composer.c:2649
-#, c-format
-msgid "Attached message - %s"
-msgstr "附加的邮件 - %s"
-
-#. translators, this count will always be >1
-#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "%d 封附加的邮件"
-
-#: composer/e-msg-composer.c:4332
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr "<b>(编写器含有不可编辑的非文本邮件体。)<b>"
-
#: composer/e-msg-composer-hdrs.c:512
msgid "Posting destination"
msgstr "投递目的"
@@ -11583,17 +11964,83 @@ msgstr "单击此处以选择要投递到的文件夹"
msgid "Attach file(s)"
msgstr "添加附件"
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "无法对寄出的邮件签名:未对此账户设置签名证书"
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "无法对寄出的邮件加密:未对此账户设置加密证书"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "无法打开文件"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "无法从编辑器获取邮件"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "无标题邮件"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "打开文件"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "自动生成的"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "签名:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "附加了 <b>%d</b> 个文件"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "隐藏附件栏(将附件拖至此处)(_A)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "显示附件栏(将附件拖至此处)(_A)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "撰写邮件"
+
+#: composer/e-msg-composer.c:2649
+#, c-format
+msgid "Attached message - %s"
+msgstr "附加的邮件 - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "%d 封附加的邮件"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr "<b>(编写器含有不可编辑的非文本邮件体。)<b>"
+
#. mail-composer:no-attach primary
#: composer/mail-composer-errors.xml.h:2
msgid "You cannot attach the file `{0}' to this message."
msgstr "您无法将文件“{0}”作为此邮件的附件。"
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
#. mail-composer:attach-notfile primary
#: composer/mail-composer-errors.xml.h:6
msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11617,11 +12064,6 @@ msgid "Could not retrieve messages to attach from {0}."
msgstr "无法从 {0} 获取要附加的邮件。"
#. mail-composer:attach-nomessages secondary
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
#: composer/mail-composer-errors.xml.h:14
#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
@@ -11683,12 +12125,8 @@ msgid ""
"you choose to save the message in your Drafts folder. This will allow you to "
"continue the message at a later date."
msgstr ""
-"关闭此编写窗口将会永久丢弃邮件,除非您选择在草稿文件夹中保存此邮件。"
-"这允许您在稍后继续编写邮件。"
-
-#: composer/mail-composer-errors.xml.h:33
-msgid "Discard Changes"
-msgstr "丢弃更改"
+"关闭此编写窗口将会永久丢弃邮件,除非您选择在草稿文件夹中保存此邮件。这允许您"
+"在稍后继续编写邮件。"
#: composer/mail-composer-errors.xml.h:34
msgid "Save Message"
@@ -11720,7 +12158,6 @@ msgid "You need to configure an account before you can compose mail."
msgstr "在您可以撰写邮件之前您需要配置一个帐户。"
#. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
#: composer/mail-composer-errors.xml.h:48
#: composer/mail-composer-errors.xml.h:52
msgid "Could not create composer window."
@@ -11888,16 +12325,12 @@ msgstr "同步类别:"
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%Y-%m-%d %A %p %I:%M"
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
msgid "%a %m/%d/%Y %H:%M"
msgstr "%Y-%m-%d %A %H:%M"
@@ -11949,31 +12382,23 @@ msgid "%m/%d/%Y %H"
msgstr "%Y-%m-%d %H点"
#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
msgid "%I:%M:%S %p"
msgstr "%p %I:%M:%S"
#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
#. strptime format for time of day, without seconds,
#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
msgid "%I:%M %p"
msgstr "%p %I:%M"
#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
msgid "%H:%M"
@@ -12059,7 +12484,6 @@ msgid "Missing file name."
msgstr "缺少文件名。"
#. filter:no-file secondary
-#. filter:bad-file secondary
#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
msgid "You must specify a file name."
msgstr "您必须指定文件名。"
@@ -12080,7 +12504,6 @@ msgid "Could not compile regular expression \"{1}\"."
msgstr "无法编译正则表达式“{1}”。"
#. filter:no-name primary
-#. mail:no-name-vfolder primary
#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
msgid "Missing name."
msgstr "缺少名称。"
@@ -12104,64 +12527,6 @@ msgstr "请另选一个名称。"
msgid "Choose a file"
msgstr "选择文件"
-#: filter/filter.glade.h:1
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>过滤规则(_F)</b>"
-
-#: filter/filter.glade.h:2
-msgid "Compare against"
-msgstr "比较"
-
-#: filter/filter.glade.h:3
-msgid "Incoming"
-msgstr "接收"
-
-#: filter/filter.glade.h:4
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr "邮件的日期将会与指定日期的午夜12:00进行比较。"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr "邮件的日期将会在过滤执行时与指定时间进行比较。"
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr "邮件的日期将会在过滤执行时与当前时间进行比较。"
-
-#: filter/filter.glade.h:11
-msgid "a time relative to the current time"
-msgstr "相对于当前时间的时间"
-
-#: filter/filter.glade.h:12
-msgid "ago"
-msgstr "过去"
-
-#: filter/filter.glade.h:16
-msgid "months"
-msgstr "月"
-
-#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "秒"
-
-#: filter/filter.glade.h:18
-msgid "the current time"
-msgstr "当前时间"
-
-#: filter/filter.glade.h:19
-msgid "the time you specify"
-msgstr "您指定的时间"
-
-#: filter/filter.glade.h:21
-msgid "years"
-msgstr "年"
-
#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
#: mail/mail-config.c:76 mail/mail-config.glade.h:93
msgid "Important"
@@ -12227,6 +12592,64 @@ msgstr "接收"
msgid "outgoing"
msgstr "发送"
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>过滤规则(_F)</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "比较"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "接收"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr "邮件的日期将会与指定日期的午夜12:00进行比较。"
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr "邮件的日期将会在过滤执行时与指定时间进行比较。"
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr "邮件的日期将会在过滤执行时与当前时间进行比较。"
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "相对于当前时间的时间"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "过去"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "月"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "秒"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "当前时间"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "您指定的时间"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "年"
+
#: filter/rule-editor.c:285
msgid "Add Rule"
msgstr "添加规则"
@@ -12239,6 +12662,70 @@ msgstr "编辑规则"
msgid "Rule name"
msgstr "规则名"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr "*Control*F1"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "编写器首选项"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "在此配置邮件首选项,包括安全和邮件显示"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "在此配置拼写检查、签名和邮件编写器"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "在这里配置您的电子邮件账户"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution 邮件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution 邮件账户配置控制"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution 邮件组件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution 邮件撰写器"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution 邮件撰写控件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution 邮件首选项控件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "邮件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "邮件账户"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "邮件首选项"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "邮件(_M)"
+
#. translators: default account indicator
#: mail/em-account-prefs.c:418
msgid "[Default]"
@@ -12290,7 +12777,7 @@ msgstr ""
msgid "_Filter Rules"
msgstr "过滤规则(_F)"
-#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:493
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
#: mail/mail-account-gui.c:1347
msgid "Select Folder"
msgstr "选择文件夹"
@@ -12424,7 +12911,7 @@ msgstr "未标志"
msgid "Junk Test"
msgstr "垃圾测试"
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:927
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
#: widgets/misc/e-expander.c:189
msgid "Label"
msgstr "标签"
@@ -12529,8 +13016,8 @@ msgstr "开始于"
msgid "Stop Processing"
msgstr "停止处理"
-#: mail/em-filter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
#: smime/lib/e-cert.c:1131
msgid "Subject"
@@ -12572,7 +13059,7 @@ msgstr "<单击此处以便选择文件夹>"
msgid "Create New Folder"
msgstr "创建新文件夹"
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2310
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
#: mail/mail-component.c:709
msgid "Specify where to create the folder:"
msgstr "指定在哪里创建文件夹:"
@@ -12585,378 +13072,399 @@ msgstr "创建"
msgid "Folder _name:"
msgstr "文件夹名称(_N):"
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "虚拟文件夹"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "不匹配"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "正在装入..."
+
+#: mail/em-folder-tree.c:846
#, c-format
msgid "Moving folder %s"
msgstr "移动文件夹“%s”"
-#: mail/em-folder-tree.c:843
+#: mail/em-folder-tree.c:848
#, c-format
msgid "Copying folder %s"
msgstr "复制文件夹 %s"
-#: mail/em-folder-tree.c:850 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
#, c-format
msgid "Moving messages into folder %s"
msgstr "把邮件移动到文件夹 %s"
-#: mail/em-folder-tree.c:852 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
#, c-format
msgid "Copying messages into folder %s"
msgstr "把邮件复制到文件夹 %s"
-#: mail/em-folder-tree.c:868
+#: mail/em-folder-tree.c:873
msgid "Cannot drop message(s) into toplevel store"
msgstr "无法将邮件放到顶级文件夹存储"
-#: mail/em-folder-tree.c:958 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
msgid "_Copy to Folder"
msgstr "复制到文件夹(_C)"
-#: mail/em-folder-tree.c:959 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
msgid "_Move to Folder"
msgstr "移动到文件夹(_M)"
-#: mail/em-folder-tree.c:961 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
msgid "_Move"
msgstr "移动(_M)"
-#: mail/em-folder-tree.c:963 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
msgid "Cancel _Drag"
msgstr "取消拖曳(_D)"
-#: mail/em-folder-tree.c:2083 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
#: mail/importers/evolution-mbox-importer.c:119
#: mail/importers/evolution-outlook-importer.c:133
msgid "Select folder"
msgstr "选择文件夹"
-#: mail/em-folder-tree.c:2083 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
msgid "C_opy"
msgstr "复制(_O)"
-#: mail/em-folder-tree.c:2123
+#: mail/em-folder-tree.c:2144
#, c-format
msgid "Creating folder `%s'"
msgstr "创建文件夹“%s”"
-#: mail/em-folder-tree.c:2310 mail/mail-component.c:709
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
msgid "Create folder"
msgstr "创建文件夹"
-#: mail/em-folder-tree.c:2499
+#: mail/em-folder-tree.c:2526
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "把文件夹“%s”重命名为:"
-#: mail/em-folder-tree.c:2501
+#: mail/em-folder-tree.c:2528
msgid "Rename Folder"
msgstr "重命名文件夹"
-#: mail/em-folder-tree.c:2572 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
msgid "_View"
msgstr "查看(_V)"
-#: mail/em-folder-tree.c:2573
+#: mail/em-folder-tree.c:2604
msgid "Open in _New Window"
msgstr "在新窗口中打开(_N)"
-#: mail/em-folder-tree.c:2577
+#: mail/em-folder-tree.c:2608
msgid "_Copy..."
msgstr "复制(_C)..."
-#: mail/em-folder-tree.c:2578
+#: mail/em-folder-tree.c:2609
msgid "_Move..."
msgstr "移动(_M)..."
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2582
+#: mail/em-folder-tree.c:2613
msgid "_New Folder..."
msgstr "新建文件夹(_N)..."
-#: mail/em-folder-tree.c:2585
+#: mail/em-folder-tree.c:2616
msgid "_Rename..."
msgstr "重命名(_R)..."
-#: mail/em-folder-tree.c:2588 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
msgid "_Properties"
msgstr "属性(_P)"
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:872
-msgid "VFolders"
-msgstr "虚拟文件夹"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "不匹配"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "收件箱"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "正在装入..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
-#: mail/mail-component.c:559
-msgid "Mail"
-msgstr "邮件"
-
#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
#: ui/evolution-mail-message.xml.h:113
msgid "_Edit as New Message..."
msgstr "作为新邮件进行编辑(_E)..."
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
msgid "_Print"
msgstr "打印(_P)"
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
#: ui/evolution-mail-message.xml.h:88
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
#: ui/evolution-mail-message.xml.h:87
msgid "Reply to _All"
msgstr "回复所有人(_A)"
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
#: ui/evolution-mail-message.xml.h:114
msgid "_Forward"
msgstr "转发(_F)"
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
msgid "Follo_w Up..."
msgstr "跟随(_W)..."
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
msgid "Fla_g Completed"
msgstr "已完成标志(_G)"
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
msgid "Cl_ear Flag"
msgstr "清除标志(_E)"
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
msgid "Mar_k as Read"
msgstr "标记为已读(_K)"
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
msgid "Mark as _Unread"
msgstr "标记为未读(_U)"
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
msgid "_Mark as Unimportant"
msgstr "标记为不重要(_M)"
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
msgid "Mark as _Junk"
msgstr "标记为垃圾(_J)"
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
msgid "Mark as _Not Junk"
msgstr "标记为非垃圾(_N)"
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
msgid "U_ndelete"
msgstr "取消删除(_N)"
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
msgid "Mo_ve to Folder..."
msgstr "移动到文件夹(_V)..."
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
msgid "_Copy to Folder..."
msgstr "复制到文件夹(_C)..."
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
msgid "Add Sender to Address_book"
msgstr "将发件人添加到地址簿(_B)"
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
msgid "Appl_y Filters"
msgstr "应用过滤规则(_Y)"
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
msgid "F_ilter Junk"
msgstr "过滤垃圾(_I)"
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
msgid "Crea_te Rule From Message"
msgstr "从邮件创建规则(_T)"
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
msgid "VFolder on _Subject"
msgstr "基于主题的虚拟文件夹(_S)"
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
msgid "VFolder on Se_nder"
msgstr "基于发件人的虚拟文件夹(_N)"
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
msgid "VFolder on _Recipients"
msgstr "基于收件人的虚拟文件夹(_R)"
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
msgid "VFolder on Mailing _List"
msgstr "基于邮件列表的虚拟文件夹(_L)"
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
msgid "Filter on Sub_ject"
msgstr "基于主题过滤(_J)"
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
msgid "Filter on Sen_der"
msgstr "基于发件人过滤(_D)"
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
msgid "Filter on Re_cipients"
msgstr "基于收件人过滤(_C)"
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
msgid "Filter on _Mailing List"
msgstr "基于邮件列表过滤(_M)"
#. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
#: mail/mail-config.glade.h:68
msgid "Default"
msgstr "默认"
-#: mail/em-folder-view.c:1847
+#: mail/em-folder-view.c:1851
msgid "Print Message"
msgstr "打印邮件"
-#: mail/em-folder-view.c:2108
+#: mail/em-folder-view.c:2112
msgid "_Copy Link Location"
msgstr "复制链接位置(_C)"
-#: mail/em-folder-view.c:2373
+#: mail/em-folder-view.c:2377
#, c-format
msgid "Click to mail %s"
msgstr "单击以给 %s 发送邮件"
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "发件人"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "回复至"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "收件人"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "抄送"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "密件抄送"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "日期"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "新闻组"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s 附件"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "无法解析 S/MIME 邮件:未知错误"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "无法解析 MIME 邮件。显示源文本。"
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "不支持的签名格式"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "校验签名错误"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "校验签名发生了未知错误"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
#, c-format
-msgid "Retrieving `%s'"
-msgstr "收取“%s”"
+msgid "Matches: %d"
+msgstr "匹配:%d"
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
msgid "Unsigned"
msgstr "未签名"
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:641
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "此邮件未签名。无法保证此邮件是可信的。"
+
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
msgid "Valid signature"
msgstr "有效签名"
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:642
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr "此邮件已签名,而且签名是有效的。这意味着这封邮件应该是可信的。"
+
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
msgid "Invalid signature"
msgstr "无效签名"
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr "签名有效但是无法校验发送者"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr "无法校验此邮件的签名,可能在传送的过程中邮件被篡改了。"
+
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
+msgstr "签名有效,无法校验发送者"
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr "此邮件的签名有效,但是无法校验邮件的发送者。"
+
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
msgid "Unencrypted"
msgstr "未加密"
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"The Internet."
+msgstr "此邮件未加密。在 Internet 上传送时所有人都可以看到其内容。"
+
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
msgid "Encrypted, weak"
msgstr "弱加密"
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:651
+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:652 mail/em-format-html.c:570
msgid "Encrypted"
msgstr "加密"
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:652
+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:653 mail/em-format-html.c:571
msgid "Encrypted, strong"
msgstr "强加密"
+#: mail/em-format-html-display.c:653
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+"此邮件已加密,且使用的是强加密算法。如果外人想要查看此邮件的内容,可能要花大"
+"量时间进行暴力破解,这十分困难。"
+
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
+msgid "_View Certificate"
+msgstr "查看证书(_V)"
+
+#: mail/em-format-html-display.c:769
+msgid "This certificate is not viewable"
+msgstr "此证书不可查看"
+
+#: mail/em-format-html-display.c:1004
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%Y年%m月%d日%A,%H:%M完成"
+
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
+msgstr "延误:"
+
+#: mail/em-format-html-display.c:1015
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "到 %m月%d日%A,%H:%M"
+
+#: mail/em-format-html-display.c:1085
+msgid "_View Inline"
+msgstr "嵌入视图(_V)"
+
+#: mail/em-format-html-display.c:1086
+msgid "_Hide"
+msgstr "隐藏(_H)"
+
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "第 %d 页,共 %d 页"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "收取“%s”"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr "签名有效但是无法校验发送者"
+
#: mail/em-format-html.c:820
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
@@ -12990,6 +13498,32 @@ msgstr "指向未知的外部数据 (“%s”类型)"
msgid "Formatting message"
msgstr "格式化邮件"
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "发件人"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "回复至"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "收件人"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "抄送"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "密件抄送"
+
#. pseudo-header
#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
#: mail/em-mailer-prefs.c:939
@@ -13006,102 +13540,43 @@ msgstr "<I> (%A,%R %Z)</I>"
msgid "<I> (%R %Z)</I>"
msgstr "<I> (%R %Z)</I>"
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
-msgstr "匹配:%d"
-
-#: mail/em-format-html-display.c:644
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr "此邮件未签名。无法保证此邮件是可信的。"
-
-#: mail/em-format-html-display.c:645
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr "此邮件已签名,而且签名是有效的。这意味着这封邮件应该是可信的。"
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr "无法校验此邮件的签名,可能在传送的过程中邮件被篡改了。"
-
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr "签名有效,无法校验发送者"
-
-#: mail/em-format-html-display.c:647
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr "此邮件的签名有效,但是无法校验邮件的发送者。"
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "日期"
-#: mail/em-format-html-display.c:653
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"The Internet."
-msgstr "此邮件未加密。在 Internet 上传送时所有人都可以看到其内容。"
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "新闻组"
-#: mail/em-format-html-display.c:654
-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.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s 附件"
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is encrypted. It would be difficult for an outsider to view "
-"the content of this message."
-msgstr "此邮件已加密。外人要想查看此邮件的内容十分困难。"
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "无法解析 S/MIME 邮件:未知错误"
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
msgstr ""
-"此邮件已加密,且使用的是强加密算法。如果外人想要查看此邮件的内容,可能要花大量"
-"时间进行暴力破解,这十分困难。"
-
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-msgid "_View Certificate"
-msgstr "查看证书(_V)"
-
-#: mail/em-format-html-display.c:772
-msgid "This certificate is not viewable"
-msgstr "此证书不可查看"
-
-#: mail/em-format-html-display.c:1007
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%Y年%m月%d日%A,%H:%M完成"
-
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
-msgstr "延误:"
-#: mail/em-format-html-display.c:1018
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "到 %m月%d日%A,%H:%M"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "无法解析 MIME 邮件。显示源文本。"
-#: mail/em-format-html-display.c:1088
-msgid "_View Inline"
-msgstr "嵌入视图(_V)"
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "不支持的签名格式"
-#: mail/em-format-html-display.c:1089
-msgid "_Hide"
-msgstr "隐藏(_H)"
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "校验签名错误"
-#: mail/em-format-html-print.c:130
-#, c-format
-msgid "Page %d of %d"
-msgstr "第 %d 页,共 %d 页"
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "校验签名发生了未知错误"
#: mail/em-junk-filter.c:86
msgid "Spamassassin (built-in)"
@@ -13179,8 +13654,8 @@ msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
msgstr ""
-"无法从先前的 Evolution 安装中读取设置,“evolution/config."
-"xmldb”不存在或者已损坏。"
+"无法从先前的 Evolution 安装中读取设置,“evolution/config.xmldb”不存在或者已损"
+"坏。"
#: mail/em-popup.c:700
msgid "Save As..."
@@ -13211,7 +13686,7 @@ msgstr "把邮件发送到列表(_N)..."
msgid "_Add to Addressbook"
msgstr "添加到地址簿(_A)"
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
#, c-format
msgid "Open in %s..."
msgstr "在 %s 中打开..."
@@ -13258,7 +13733,7 @@ msgid "Add address"
msgstr "添加地址"
#. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
#, c-format
msgid "Messages from %s"
msgstr "来自 %s 的邮件"
@@ -13267,11 +13742,11 @@ msgstr "来自 %s 的邮件"
msgid "Virtual _Folders"
msgstr "虚拟文件夹(_F)"
-#: mail/em-vfolder-rule.c:493
+#: mail/em-vfolder-rule.c:494
msgid "_Add"
msgstr "添加(_A)"
-#: mail/em-vfolder-rule.c:573
+#: mail/em-vfolder-rule.c:574
msgid "VFolder source"
msgstr "虚拟文件夹来源"
@@ -13737,62 +14212,33 @@ msgstr ""
msgid "spamd port"
msgstr "导入"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr "*Control*F1"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "编写器首选项"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "在此配置邮件首选项,包括安全和邮件显示"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "在此配置拼写检查、签名和邮件编写器"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "在这里配置您的电子邮件账户"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution 邮件"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution 邮件账户配置控制"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution 邮件组件"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm 导入器"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution 邮件撰写器"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape 邮件导入器"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution 邮件撰写控件"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 导入器"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution 邮件首选项控件"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine 导入器"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "邮件账户"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox 导入器"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "邮件首选项"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "邮件(_M)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
#: mail/importers/elm-importer.c:88
msgid "Evolution is importing your old Elm mail"
@@ -13850,34 +14296,6 @@ msgstr "导入“%s”"
msgid "Importing mailbox"
msgstr "导入邮箱"
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm 导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape 邮件导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine 导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox 导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
#: mail/importers/mail-importer.c:360
#, c-format
msgid "Scanning %s"
@@ -14107,14 +14525,6 @@ msgstr "创建新邮件文件夹"
msgid "Failed upgrading Mail settings or folders."
msgstr "升级邮件设置或文件夹失败。"
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "检查服务"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "正在连接服务器..."
-
#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
msgid "Identity"
msgstr "标识"
@@ -14172,6 +14582,14 @@ msgstr ""
"您即将完成邮件配置的过程了。您提供的用于收件服务器和发送方式将被组合在一起,"
"成为 Evolution 的邮件帐户。请在下面输入此帐户的名称。此名称只会用作显示。"
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "检查服务"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "正在连接服务器..."
+
#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
msgid " "
msgstr " "
@@ -14180,10 +14598,6 @@ msgstr " "
msgid " Ch_eck for Supported Types "
msgstr "检查支持的类型(_E)"
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>预览</b>"
-
#: mail/mail-config.glade.h:5
msgid "<b>SSL is not supported in this build of evolution</b>"
msgstr "<b>(在此版本的 evolution 中不支持 SSL)</b>"
@@ -14435,7 +14849,7 @@ msgstr "无法引用原始邮件"
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(同 Outlook 兼容)(_M)"
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
msgid "Done"
msgstr "完成"
@@ -14791,7 +15205,7 @@ msgstr "<span weight=\"bold\">加密</span>"
msgid "Accept License"
msgstr "接受协议"
-#: mail/mail-dialogs.glade.h:11
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
msgid "C_ompleted"
msgstr "已完成(_O)"
@@ -14808,6 +15222,7 @@ msgid "Find:"
msgstr "查找:"
#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
msgid "Flag to Follow Up"
msgstr "跟随的标志"
@@ -14831,7 +15246,7 @@ msgstr "服务器(_E):"
msgid "Security Information"
msgstr "安全信息"
-#: mail/mail-dialogs.glade.h:23
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
msgid ""
"The messages you have selected for follow up are listed below.\n"
"Please select a follow up action from the \"Flag\" menu."
@@ -14843,11 +15258,11 @@ msgstr ""
msgid "Tick this to accept the license agreement"
msgstr "选中此处以表明您接受许可协议"
-#: mail/mail-dialogs.glade.h:26
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
msgid "_Due By:"
msgstr "延期人(_D):"
-#: mail/mail-dialogs.glade.h:27
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
msgid "_Flag:"
msgstr "标志(_F):"
@@ -14894,12 +15309,13 @@ msgstr "您以登录到服务器“{0}”失败。"
#. mail:camel-service-auth-failed secondary
#: mail/mail-errors.xml.h:8
+#, fuzzy
msgid ""
"Check to make sure your password is spelled correctly. Remember that many "
"passwords are case sensitive; your caps lock might be on."
msgstr ""
-"选中此处以确保您的密码拼写正确。请记住,很多密码都是区分大小写的;"
-"您的 Caps Lock 灯可能为开。"
+"选中此处以确保您的密码拼写正确。请记住,很多密码都是区分大小写的;您的 Caps "
+"Lock 灯可能为开。"
#. mail:ask-send-html primary
#: mail/mail-errors.xml.h:10
@@ -14914,12 +15330,15 @@ msgid ""
"{0}\n"
"Send anyway?"
msgstr ""
-"请确定下列受检人想要并可以接收 HTML 邮件:\n{0}\n仍然发送吗?"
+"请确定下列受检人想要并可以接收 HTML 邮件:\n"
+"{0}\n"
+"仍然发送吗?"
#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
msgid "_Send"
-msgstr "发送(_S)"
+msgstr "发送"
#. mail:ask-send-no-subject primary
#: mail/mail-errors.xml.h:17
@@ -14934,7 +15353,6 @@ msgid ""
msgstr "在您的邮件中添加有意义的主题行可以让您的收件人更容易明白您邮件的内容。"
#. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
msgid "Are you sure you want to send a message with only BCC recipients?"
msgstr "您确定想要发送只有 BCC 收件人的邮件吗?"
@@ -14997,7 +15415,6 @@ msgid ""
msgstr "从该文件夹永久删除所有已删除的邮件"
#. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
msgid "If you continue, you will not be able to recover these messages."
msgstr ""
@@ -15064,21 +15481,6 @@ msgstr "执行操作时错误。"
msgid "{0}."
msgstr "{0}。"
-#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr "{0}"
-
#. mail:ask-session-password primary
#: mail/mail-errors.xml.h:82
msgid "Enter password."
@@ -15095,8 +15497,6 @@ msgid "Cannot save to directory \"{0}\"."
msgstr "无法保存到目录“{0}”。"
#. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
#: mail/mail-errors.xml.h:106
msgid "Cannot save to file \"{0}\"."
@@ -15133,7 +15533,6 @@ msgid "Cannot delete system folder \"{0}\"."
msgstr "无法删除系统文件夹“{0}”。"
#. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
msgid ""
"System folders are required for Ximian Evolution to function correctly and "
@@ -15164,13 +15563,11 @@ msgstr ""
"如果您删除了文件夹,其中的全部内容及其子文件夹的全部内容都将会被永久删除。"
#. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
msgid "Cannot rename \"{0}\" to \"{1}\"."
msgstr "无法将“{0}”重命名为“{1}”。"
#. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
msgid "A folder named \"{1}\" already exists. Please use a different name."
msgstr "名为“{1}”的文件夹已经存在。请使用不同的名称。"
@@ -15181,25 +15578,21 @@ msgid "Because \"{2}\"."
msgstr "原因是“{2}”。"
#. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
msgid "Cannot move folder \"{0}\" to \"{1}\"."
msgstr "无法将文件夹“{0}”移动到“{1}”。"
#. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
msgid "Cannot open source \"{2}\"."
msgstr "无法打开源“{2}”。"
#. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
msgid "Cannot open target \"{2}\"."
msgstr "无法打开目标“{2}”。"
#. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
msgid "Cannot copy folder \"{0}\" to \"{1}\"."
msgstr "无法将文件夹“{0}”复制到“{1}”。"
@@ -15215,7 +15608,6 @@ msgid "Cannot open source \"{1}\""
msgstr "无法打开源“{1}”"
#. mail:account-incomplete primary
-#. mail:account-notunique primary
#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
msgid "Cannot save changes to account."
msgstr "无法将更改保存到账户。"
@@ -15237,17 +15629,21 @@ msgstr "删除账户吗?"
#. mail:ask-delete-account primary
#: mail/mail-errors.xml.h:166
+#, fuzzy
msgid "Are you sure you want to delete this account?"
-msgstr "您确信您要删除该账户吗?"
+msgstr "您确定要删除此联系人吗?"
#. mail:ask-delete-account secondary
#: mail/mail-errors.xml.h:168
+#, fuzzy
msgid "If you proceed, the account information will be deleted permanently."
msgstr ""
+"如果您删除了文件夹,其中的全部内容及其子文件夹的全部内容都将会被永久删除。"
#: mail/mail-errors.xml.h:169
+#, fuzzy
msgid "Don't delete"
-msgstr "不删除"
+msgstr "取消删除(_U)"
#. mail:no-save-signature primary
#: mail/mail-errors.xml.h:171
@@ -15276,6 +15672,7 @@ msgstr "丢弃更改吗?"
#. mail:ask-signature-changed primary
#: mail/mail-errors.xml.h:181
+#, fuzzy
msgid "Do you wish to save your changes?"
msgstr "您希望保存更改吗?"
@@ -15815,6 +16212,53 @@ msgstr "全部回复"
msgid "Review"
msgstr "回顾"
+#: mail/searchtypes.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "含有"
+
+#: mail/searchtypes.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "不含有"
+
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "邮件体或主题含有"
+
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "邮件含有"
+
+#: mail/searchtypes.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "描述含有"
+
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "发件人含有"
+
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "主题含有"
+
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "主题不含有"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution 外壳"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution 测试"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution 测试组件"
+
#: shell/apps_evolution_shell.schemas.in.in.h:1
msgid "480"
msgstr "480"
@@ -15878,30 +16322,19 @@ msgstr "是否跳过开发警告对话框"
msgid "mail"
msgstr "邮件"
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: shell/e-shell.c:786
-msgid "Uknown system error."
-msgstr "未知的系统错误。"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "无效参数"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "无法注册到 OAF"
+#: shell/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Active Connections</b>"
+msgstr "<b>身份验证</b>"
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "找不到配置数据库"
+#: shell/e-active-connection-dialog.glade.h:2
+#, fuzzy
+msgid "Active Connections"
+msgstr "执行动作"
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "通用错误"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr ""
#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
msgid "(Untitled)"
@@ -16078,23 +16511,6 @@ msgstr "文件夹名不能含有字符“#”。"
msgid "'.' and '..' are reserved folder names."
msgstr "“.”和“..”是保留文件夹名。"
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Evolution 目前联机。单击该按钮可脱机工作。"
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution 正在脱机过程中。"
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "Evolution 目前脱机。单击该按钮可在线工作。"
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr "切换到 %s"
-
#: shell/e-shell-window-commands.c:66
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr "GNOME Pilot 工具好像并未安装到系统中。"
@@ -16128,10 +16544,88 @@ msgstr "脱机工作(_W)"
msgid "Work Offline"
msgstr "脱机工作"
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online. Click on this button to work offline."
+msgstr "Evolution 目前联机。单击该按钮可脱机工作。"
+
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution 正在脱机过程中。"
+
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline. Click on this button to work online."
+msgstr "Evolution 目前脱机。单击该按钮可在线工作。"
+
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
+msgstr "切换到 %s"
+
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "未知的系统错误。"
+
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "无效参数"
+
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "无法注册到 OAF"
+
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "找不到配置数据库"
+
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "通用错误"
+
#: shell/e-user-creatable-items-handler.c:691
msgid "New"
msgstr "新建"
+#: shell/evolution-startup-wizard.glade.h:2
+#, fuzzy
+msgid "Evolution Setup Assistant"
+msgstr "Evolution 导入助手"
+
+#: shell/evolution-startup-wizard.glade.h:3
+#, fuzzy
+msgid "Importing Files"
+msgstr "导入文件"
+
+#: shell/evolution-startup-wizard.glade.h:4
+#, fuzzy
+msgid "Timezone "
+msgstr "时区(_Z):"
+
+#: shell/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr ""
+
+#: shell/evolution-startup-wizard.glade.h:6
+msgid ""
+"Welcome to Evolution. The next few screens will allow\n"
+"Evolution to connect to your email accounts, and to import\n"
+"files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+
+#: shell/evolution-startup-wizard.glade.h:11
+msgid ""
+"You have successfully entered all of the information\n"
+"needed to set up Evolution. \n"
+"\n"
+"Click the \"Apply\" button to save your settings. "
+msgstr ""
+
#: shell/evolution-test-component.c:140
msgid "New Test"
msgstr "新建测试"
@@ -16144,18 +16638,6 @@ msgstr "测试(_T)"
msgid "Create a new test item"
msgstr "创建新测试项"
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution 外壳"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution 测试"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution 测试组件"
-
#: shell/importer/import.glade.h:1
msgid "Click \"Import\" to begin importing the file into Evolution. "
msgstr "单击“导入”以便开始将文件导入到 Evolution。"
@@ -16214,7 +16696,7 @@ msgid "Evolution can import data from the following files:"
msgstr "Evolution 可以从下列文件中导入数据:"
#. Preview/Alpha/Beta version warning message
-#: shell/main.c:235
+#: shell/main.c:225
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -16246,7 +16728,7 @@ msgstr ""
"\n"
"我们希望您尽情享受我们努力工作的成果,我们也热切盼望着您的意见!\n"
-#: shell/main.c:259
+#: shell/main.c:249
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -16254,39 +16736,39 @@ msgstr ""
"感谢\n"
"Evolution 团队\n"
-#: shell/main.c:266
+#: shell/main.c:256
msgid "Don't tell me again"
msgstr "不要再问我"
-#: shell/main.c:471
+#: shell/main.c:461
msgid "Start Evolution activating the specified component"
msgstr "启动 Evolution 并激活指定组件"
-#: shell/main.c:473
+#: shell/main.c:463
msgid "Start in offline mode"
msgstr "以脱机模式启动"
-#: shell/main.c:475
+#: shell/main.c:465
msgid "Start in online mode"
msgstr "以联机模式启动"
-#: shell/main.c:478
+#: shell/main.c:468
msgid "Forcibly shut down all evolution components"
msgstr "强制关闭所有 Evolution 组件"
-#: shell/main.c:482
+#: shell/main.c:472
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "强制从 Evolution 1.4 重新升迁"
-#: shell/main.c:485
+#: shell/main.c:475
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
-#: shell/main.c:509
+#: shell/main.c:502
msgid "Evolution"
msgstr "Evolution"
-#: shell/main.c:513
+#: shell/main.c:506
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -16295,6 +16777,94 @@ msgstr ""
"%s:不能同时使用 --online 和 --offline。\n"
" 详情请使用 %s --help。\n"
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: shell/shell-errors.xml.h:15
+#, fuzzy
+msgid "Continue"
+msgstr "含有"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "无法启动 wombat 服务器"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution 账户助手"
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
#: smime/gui/certificate-manager.c:556
msgid "Select a cert to import..."
@@ -16535,6 +17105,11 @@ msgstr "您的证书"
msgid "_Edit CA Trust"
msgstr "编辑 CA 信任(_E)"
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "证书已经存在"
+
#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
msgid "%d/%m/%Y"
msgstr "%Y-%m-%d"
@@ -16746,11 +17321,6 @@ msgstr "主题唯一 ID"
msgid "Certificate Signature Value"
msgstr "证书签名值"
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "证书已经存在"
-
#: smime/lib/e-pkcs12.c:266
msgid "PKCS12 File Password"
msgstr "PKCS12 文件密码"
@@ -16890,8 +17460,8 @@ msgstr "查看当前联系人"
#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
#: ui/evolution-contact-list-editor.xml.h:11
#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
msgid "_Actions"
msgstr "操作(_A)"
@@ -17364,16 +17934,6 @@ msgstr "反转选择(_I)"
msgid "_Threaded Message List"
msgstr "按线索编排的邮件列表(_T)"
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "关闭此窗口"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "关闭(_C)"
-
#: ui/evolution-mail-message.xml.h:1
msgid "A_dd Sender to Address Book"
msgstr "将发件人添加到地址簿(_D)"
@@ -17774,6 +18334,16 @@ msgstr "工具(_T)"
msgid "_Undelete"
msgstr "取消删除(_U)"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "关闭此窗口"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "关闭(_C)"
+
#: ui/evolution-message-composer.xml.h:1
msgid "Attach"
msgstr "附件"
@@ -17856,10 +18426,6 @@ msgstr "用不同的文件名保存当前文件"
msgid "Save the message in a specified folder"
msgstr "在指定的文件夹中保存邮件"
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "发送"
-
#: ui/evolution-message-composer.xml.h:25
#: ui/evolution-signature-editor.xml.h:11
msgid "Send the mail in HTML format"
@@ -18558,6 +19124,162 @@ msgstr "%s (...)"
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "选中要发布的日历"
+
+#~ msgid "Login name:"
+#~ msgstr "登录名:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "User Publishes"
+#~ msgstr "用户发布"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "无法启动 wombat"
+
+#~ msgid "C_alendar"
+#~ msgstr "日历(_A)"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "音频提醒选项"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "邮件提醒选项"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "邮件提醒选项"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "程序提醒选项"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "未知提醒选项"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "提醒重复"
+
+#~ msgid "Message to Display:"
+#~ msgstr "要显示的邮件:"
+
+#~ msgid "Message to Send"
+#~ msgstr "要发送的邮件"
+
+#~ msgid "Play sound:"
+#~ msgstr "播放声音:"
+
+#~ msgid "Run program:"
+#~ msgstr "运行程序:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "使用这些参数:"
+
+#~ msgid "Basics"
+#~ msgstr "基本"
+
+#~ msgid "Date/Time:"
+#~ msgstr "日期/时间:"
+
+#~ msgid "Reminders"
+#~ msgstr "提醒"
+
+#~ msgid "_Options..."
+#~ msgstr "选项(_O)..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "地址簿..."
+
+#~ msgid "Reminder"
+#~ msgstr "提醒"
+
+#~ msgid "B_usy"
+#~ msgstr "忙(_U)"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "机密(_N)"
+
+#~ msgid "Date & Time"
+#~ msgstr "日期和时间"
+
+#~ msgid "F_ree"
+#~ msgstr "闲(_R)"
+
+#~ msgid "Pri_vate"
+#~ msgstr "私有(_V)"
+
+#~ msgid "Pu_blic"
+#~ msgstr "公开(_B)"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "添加出席者(_T)"
+
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "从地址簿添加出席者。"
+
+#~ msgid "Preview"
+#~ msgstr "预览"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "再现规则"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "定制再现(_C)"
+
+#~ msgid "_Modify"
+#~ msgstr "修改(_M)"
+
+#~ msgid "_No recurrence"
+#~ msgstr "不再现(_N)"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "简单再现(_S)"
+
+#~ msgid "% _Complete"
+#~ msgstr "完成百分比(_C)"
+
+#~ msgid "Progress"
+#~ msgstr "进度"
+
+#~ msgid "Con_fidential"
+#~ msgstr "机密(_F)"
+
+#~ msgid "Folder:"
+#~ msgstr "文件夹:"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "CORBA 系统出错\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "找不到对象\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "您没有适当的权限打开日历\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "无法更新参与者状态!\n"
+
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "从地址簿添加出席者"
+
+#~ msgid "_Options"
+#~ msgstr "选项(_O)"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "会议开始时间(_S):"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "会议结束时间(_E):"
+
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "找不到“%s”的证书"
+
+#~ msgid "Can't create CMS Message"
+#~ msgstr "无法创建 CMS 邮件"
+
+#~ msgid "Can't create encoder context"
+#~ msgstr "无法创建编码器上下文"
+
#~ msgid ""
#~ "Selected calendar is read-only, events cannot be created. Please select a "
#~ "read-write calendar."
@@ -18571,21 +19293,6 @@ msgstr "%s (%d%% 完成)"
#~ msgid "_Score Rules"
#~ msgstr "计分规则(_S)"
-#~ msgid "Body or subject contains"
-#~ msgstr "邮件体或主题含有"
-
-#~ msgid "Message contains"
-#~ msgstr "邮件含有"
-
-#~ msgid "Sender contains"
-#~ msgstr "发件人含有"
-
-#~ msgid "Subject contains"
-#~ msgstr "主题含有"
-
-#~ msgid "Subject does not contain"
-#~ msgstr "主题不含有"
-
#~ msgid "Properties"
#~ msgstr "属性"