aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorFunda Wang <fwang@src.gnome.org>2004-06-06 18:13:10 +0800
committerFunda Wang <fwang@src.gnome.org>2004-06-06 18:13:10 +0800
commit0e299d8b9ffe8ba5d61d412b5742fd345d46c745 (patch)
treeeee9f14f7a43ed70095aef56104a2d0631460fda /po
parent0a3bbbac7057c942ad1feb542cd1b5b0798fe9bb (diff)
downloadgsoc2013-evolution-0e299d8b9ffe8ba5d61d412b5742fd345d46c745.tar
gsoc2013-evolution-0e299d8b9ffe8ba5d61d412b5742fd345d46c745.tar.gz
gsoc2013-evolution-0e299d8b9ffe8ba5d61d412b5742fd345d46c745.tar.bz2
gsoc2013-evolution-0e299d8b9ffe8ba5d61d412b5742fd345d46c745.tar.lz
gsoc2013-evolution-0e299d8b9ffe8ba5d61d412b5742fd345d46c745.tar.xz
gsoc2013-evolution-0e299d8b9ffe8ba5d61d412b5742fd345d46c745.tar.zst
gsoc2013-evolution-0e299d8b9ffe8ba5d61d412b5742fd345d46c745.zip
update
svn path=/trunk/; revision=26230
Diffstat (limited to 'po')
-rw-r--r--po/zh_CN.po3998
1 files changed, 3368 insertions, 630 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fc72503f5d..1d29a1f1db 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,14 +8,14 @@
msgid ""
msgstr ""
"Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-05-27 03:14+0200\n"
"PO-Revision-Date: 2004-06-05 12:14+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
@@ -117,6 +117,10 @@ msgstr "联系人组(_C):"
msgid "Create a new contacts group"
msgstr "创建新联系人组"
+#: addressbook/gui/component/addressbook-component.c:184
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr "升级地址簿设置或文件夹失败。"
+
#: addressbook/gui/component/addressbook-migrate.c:68
#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
msgid "Migrating..."
@@ -129,16 +133,20 @@ msgid "Migrating `%s':"
msgstr "升迁“%s”:"
#. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#. On This Computer is always first and VFolders is always last
+#: addressbook/gui/component/addressbook-migrate.c:508
#: 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/mail-component.c:245 mail/mail-vfolder.c:218
+#: mail/mail-component.c:233 mail/mail-vfolder.c:218
msgid "On This Computer"
msgstr "在此计算机中"
#. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#. Create the default Person calendar
+#. Create the default Person task list
+#. orange
+#: addressbook/gui/component/addressbook-migrate.c:516
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
#: mail/mail-config.glade.h:109
@@ -146,19 +154,19 @@ msgid "Personal"
msgstr "个人"
#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:524
msgid "On LDAP Servers"
msgstr "在 LDAP 服务器上"
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:652
msgid "LDAP Servers"
msgstr "LDAP 服务器"
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:772
msgid "Autocompletion Settings"
msgstr "自动完成设置"
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1148
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -169,7 +177,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1162
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -179,7 +187,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1171
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -189,7 +197,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1181
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -199,6 +207,12 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的 Pilot 同步数据..."
+#: addressbook/gui/component/addressbook-migrate.c:1194
+msgid ""
+"Some fields are no longer representable in the contact editor. Please wait "
+"while Evolution copies those fields to the 'Notes' field..."
+msgstr ""
+
#: addressbook/gui/component/addressbook-view.c:675
#, c-format
msgid "Address book '%s' will be removed. Are you sure you want to continue?"
@@ -210,7 +224,7 @@ msgstr "新地址簿"
#: addressbook/gui/component/addressbook-view.c:755
#: addressbook/gui/widgets/e-addressbook-view.c:1088
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
@@ -219,7 +233,7 @@ msgid "Delete"
msgstr "删除"
#: addressbook/gui/component/addressbook-view.c:756
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
msgid "Properties..."
msgstr "属性..."
@@ -230,6 +244,28 @@ msgstr "属性..."
msgid "Contacts"
msgstr "联系人"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid "Position of the vertical pane in main view"
+msgstr ""
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+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 "自动完成"
@@ -279,6 +315,10 @@ msgid "Manage your S/MIME certificates here"
msgstr "在此管理您的 S/MIME 证书"
#: addressbook/gui/component/ldap-config.glade.h:1
+msgid " S_how Supported Bases "
+msgstr " 显示支持的基础(_H)"
+
+#: addressbook/gui/component/ldap-config.glade.h:2
#: addressbook/gui/component/select-names/select-names.glade.h:1
#: addressbook/gui/contact-editor/contact-editor.glade.h:1
#: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -300,191 +340,250 @@ msgstr "在此管理您的 S/MIME 证书"
msgid "*"
msgstr "*"
-#: addressbook/gui/component/ldap-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:3
msgid "1"
msgstr "1"
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "1:00"
+msgstr "1:00"
+
+#: addressbook/gui/component/ldap-config.glade.h:5
msgid "3268"
msgstr "3268"
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:6
msgid "389"
msgstr "389"
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:7
msgid "5"
msgstr "5"
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:8
+msgid "5:00"
+msgstr "5:00"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
msgid "636"
msgstr "636"
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:10
msgid "<b>Authentication</b>"
msgstr "<b>身份验证</b>"
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:11
msgid "<b>Display</b>"
msgstr "<b>显示</b>"
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:12
msgid "<b>Downloading</b>"
msgstr "<b>下载</b>"
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:13
msgid "<b>Searching</b>"
msgstr "<b>搜索</b>"
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:14
msgid "<b>Server Information</b>"
msgstr "<b>服务器信息</b>"
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:15
msgid "<b>Type:</b>"
msgstr "<b>类型:</b>"
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:16
msgid "Add Contacts Group"
msgstr "添加联系人组"
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:17
msgid "Address Book Properties"
msgstr "地址簿属性"
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
#: mail/mail-config.glade.h:42
msgid "Always"
msgstr "总是"
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:19
msgid "Anonymously"
msgstr "匿名"
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:20
#: calendar/gui/dialogs/task-editor.c:193
msgid "Basic"
msgstr "基本"
-#: addressbook/gui/component/ldap-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:21
+msgid "Connecting"
+msgstr "连接"
+
+#: addressbook/gui/component/ldap-config.glade.h:22
#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
#: smime/gui/smime-ui.glade.h:19
msgid "Details"
msgstr "细节"
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:23
+msgid "Distinguished _name:"
+msgstr "识别性名称(_N):"
+
+#: addressbook/gui/component/ldap-config.glade.h:24
msgid "Distinguished name"
msgstr "识别性名称"
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:25
msgid "Download limit:"
msgstr "下载上限:"
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:26
msgid "Email address"
msgstr "电子邮件地址"
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:27
+msgid "Email address:"
+msgstr "电子邮件地址:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Evolution will use this DN to authenticate you with the server"
+msgstr "Evolution 将使用此 DN 在服务器上对您进行认证"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution 将使用此电子邮件地址在服务器上对您进行认证。"
+"Evolution will use this email address to authenticate you with the server"
+msgstr "Evolution 将使用此电子邮件地址在服务器上对您进行认证"
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:30
msgid "Find Possible Search Bases"
msgstr "查找可能的搜索基础"
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
msgid "General"
msgstr "常规"
-#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
#: mail/mail-config.glade.h:102
msgid "Never"
msgstr "从不"
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Search _base:"
-msgstr "搜索基础(_B):"
+#: addressbook/gui/component/ldap-config.glade.h:33
+msgid "One"
+msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:34
+msgid "Only locations within starting point"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+msgid "S_earch scope: "
+msgstr "搜索范围(_E):"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
msgid "Search base only"
msgstr "只搜索基础"
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:37
msgid "Search base:"
msgstr "搜索基础:"
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:38
msgid "Search scope:"
msgstr "搜索范围:"
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:39
+msgid "Searching"
+msgstr "搜索"
+
+#: addressbook/gui/component/ldap-config.glade.h:40
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL or TLS."
+"server if\n"
+"your LDAP server supports SSL or TLS."
msgstr ""
"选中此选项意味着 Evolution 只在您的 LDAP 服务器支持 SSL 或 TLS 时才连接到您"
"的 LDAP 服务器。"
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:42
msgid ""
"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a insecure environment. For example, if you and your LDAP server "
-"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
-"because your connection is already secure."
+"you are in a \n"
+"insecure environment. For example, if you and your LDAP server are behind a "
+"firewall\n"
+"at work, then Evolution doesn't need to use SSL/TLS because your connection "
+"is already\n"
+"secure."
msgstr ""
"选择此选项意味着 Evolution 将只会试图在非安全的环境中使用 SSL/TLS。例如,如果"
"您和您的 LDAP 服务器工作时位于防火墙后,Evolution 就没有必要使用 SSL/TLS,因"
"为您的连接已经相当安全了。"
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:46
msgid ""
"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits. "
+"TLS. This \n"
+"means that your connection will be insecure, and that you will be vulnerable "
+"to security\n"
+"exploits. "
msgstr ""
"选择此选项意味着您的服务器既不支持 SSL 也不支持 TLS。可能导致的结果将是您的连"
"接不太安全,您也易于受到安全漏洞的攻击。"
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:49
+msgid "Starting point and locations within it"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "Sub"
+msgstr "日"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
msgid "Supported Search Bases"
msgstr "支持的搜索起点"
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
+"searches will \n"
+"begin. If you leave this blank, the search will begin at the root of the "
+"directory tree."
msgstr ""
"搜索基础是您搜索开始项的可识别名称(DN)。如果您将此处留空,搜索将从目录树的根"
"开始。"
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:54
+#, fuzzy
msgid ""
"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
+"the \n"
+"directory tree. A search scope of \"sub\" will include all entries below "
+"your search base.\n"
+"A search scope of \"one\" will only include the entries one level beneath "
+"your base.\n"
msgstr ""
"搜索范围定义了您想要在目录树中搜索多深。搜索范围若为“子级”,则将包含您指定的"
"搜索基础下所属的全部项。搜索范围若为“一级”,则只会包含您指定的搜索基础之下一"
"级的项目。"
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:58
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr "这是您的 LDAP 服务器的完整名字。例如,“ldap.mycompany.com”。"
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:59
+#, fuzzy
msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
"too large will slow down your address book."
msgstr "这是可下载条目的最大数量。将此数值设定得太大将导致地址簿变慢。"
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:61
msgid ""
"This is the method evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -493,104 +592,136 @@ msgstr ""
"这是 evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
"对 ldap 服务器的匿名访问权限。"
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:62
+#, fuzzy
msgid ""
"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
+"list.\n"
+"It is for display purposes only. "
msgstr "这是此服务器在 Evolution 文件夹列表中显示的名称。它只用于显示。"
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:64
+#, fuzzy
msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
+"list of standard ports has been provided. Ask your system administrator\n"
+"what port you should specify."
msgstr ""
"这是 LDAP 服务器上的端口,Evolution 将试图连接到您所给出的标准端口列表。如果"
"您不清楚要指定的端口,请询问您的系统管理员。"
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:67
+msgid "This option controls how long a search will be run."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
msgid "Timeout:"
msgstr "超时:"
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:69
+msgid "U_se SSL/TLS:"
+msgstr "使用 SSL/TLS(_S):"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
msgid "Using distinguished name (DN)"
msgstr "使用已识别的姓名 (DN)"
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:71
msgid "Using email address"
msgstr "使用电子邮件地址"
-#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
#: mail/mail-config.glade.h:156
msgid "Whenever Possible"
msgstr "可能时"
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:73
msgid "_Add Contacts Group"
msgstr "添加联系人组(_A)"
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:74
+#: calendar/gui/dialogs/calendar-setup.glade.h:12
+msgid "_Display name:"
+msgstr "显示名(_D):"
+
+#: addressbook/gui/component/ldap-config.glade.h:75
msgid "_Download limit:"
msgstr "下载上限(_D):"
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:76
msgid "_Email address:"
msgstr "电子邮件地址(_E):"
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "_Find Possible Search Bases"
-msgstr "查找可能的搜索基础(_F)"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:77
msgid "_Log in method:"
msgstr "登录方式(_L):"
-#: addressbook/gui/component/ldap-config.glade.h:52
-msgid "_Log in:"
-msgstr "登录(_L):"
-
-#: addressbook/gui/component/ldap-config.glade.h:53
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
+#: addressbook/gui/component/ldap-config.glade.h:78
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:171
msgid "_Name:"
msgstr "名称(_N):"
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:79
+msgid "_Port number:"
+msgstr "端口号(_P):"
+
+#: addressbook/gui/component/ldap-config.glade.h:80
msgid "_Port:"
msgstr "端口(_P):"
-#: addressbook/gui/component/ldap-config.glade.h:55
-msgid "_Search scope:"
-msgstr "搜索范围(_S):"
+#: addressbook/gui/component/ldap-config.glade.h:81
+msgid "_Search base:"
+msgstr "搜索基础(_S):"
+
+#: addressbook/gui/component/ldap-config.glade.h:82
+msgid "_Server name:"
+msgstr "服务器名(_S):"
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:83
msgid "_Server:"
msgstr "服务器(_S):"
-#: addressbook/gui/component/ldap-config.glade.h:57
-msgid "_Timeout:"
-msgstr "超时(_T):"
+#: addressbook/gui/component/ldap-config.glade.h:84
+msgid "_Timeout (minutes):"
+msgstr "超时(分钟)(_T):"
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:85
msgid "_Use secure connection:"
msgstr "使用安全连接(_U):"
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:86
msgid "cards"
msgstr "卡片"
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:87
+#, fuzzy
+msgid "connecting-tab"
+msgstr "重新连接到 %s"
+
+#: addressbook/gui/component/ldap-config.glade.h:88
+#, fuzzy
+msgid "general-tab"
+msgstr "常规"
+
+#: addressbook/gui/component/ldap-config.glade.h:89
#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
#: mail/mail-config.glade.h:183
msgid "minutes"
msgstr "分钟"
-#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/ldap-config.glade.h:90
+#, fuzzy
+msgid "searching-tab"
+msgstr "<b>搜索</b>"
+
+#: addressbook/gui/component/select-names/e-select-names.c:492
#: addressbook/gui/component/select-names/select-names.glade.h:6
msgid "Select Contacts from Address Book"
msgstr "从地址簿中选择联系人"
-#: addressbook/gui/component/select-names/e-select-names.c:702
+#: addressbook/gui/component/select-names/e-select-names.c:691
#: addressbook/gui/component/select-names/e-select-names-popup.c:215
#: calendar/gui/dialogs/cal-prefs-dialog.c:724
msgid "Remove"
@@ -696,8 +827,8 @@ msgstr "<b>工作</b>"
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:361
msgid "AIM"
msgstr "AIM"
@@ -732,7 +863,7 @@ msgstr "公司:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:19
#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: addressbook/gui/widgets/e-minicard.c:181
msgid "Contact"
@@ -760,74 +891,80 @@ msgid "Full _Name..."
msgstr "全名(_N)..."
#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "家庭"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
msgid "Home Page:"
msgstr "主页:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: calendar/gui/e-itip-control.c:930
+msgid "Location:"
+msgstr "位置:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
msgid "MSN Messenger"
msgstr "MSN Messenger"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
msgid "Mailing Address"
msgstr "邮政地址"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
msgid "Manager:"
msgstr "经理:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
msgid "Ni_ckname:"
msgstr "昵称(_C):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
msgid "Notes:"
msgstr "注释:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
msgid "Novell Groupwise"
msgstr "Novell Groupwise"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "Office:"
-msgstr "办公室:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "其它"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "PO Box:"
msgstr "邮政邮箱:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
msgid "Personal Information"
msgstr "个人信息"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
msgid "Profession:"
msgstr "职业:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "Spouse:"
-msgstr "配偶:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
msgid "State/Province:"
msgstr "州/省:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
msgid "Title:"
msgstr "头衔:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
-msgid "Video Chat:"
-msgstr "视频聊天:"
-
#: addressbook/gui/contact-editor/contact-editor.glade.h:41
msgid "Wants to receive HTML mail"
msgstr "愿意接收 HTML 邮件"
#: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Web Log:"
-msgstr "Web 日志:"
+#, fuzzy
+msgid "Webcam:"
+msgstr "网页:"
#. red
#: addressbook/gui/contact-editor/contact-editor.glade.h:43
@@ -851,10 +988,19 @@ msgid "_File under:"
msgstr "存档于(_F):"
#: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
msgid "_Where:"
msgstr "何处(_W):"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:48
+#, fuzzy
+msgid "item7"
+msgstr "头衔"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:49
+#, fuzzy
+msgid "item8"
+msgstr "头衔"
+
#: addressbook/gui/contact-editor/eab-editor.c:315
msgid ""
"Are you sure you want\n"
@@ -868,8 +1014,8 @@ msgid ""
msgstr "您确定要删除此联系人吗?"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
msgid "Address"
msgstr "地址"
@@ -877,7 +1023,7 @@ msgstr "地址"
#: 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-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
#: addressbook/gui/widgets/e-addressbook-model.c:309
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
#: addressbook/gui/widgets/e-minicard.c:174
@@ -1857,27 +2003,27 @@ msgstr "津巴布韦"
#: addressbook/gui/contact-editor/e-contact-editor.c:179
#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
msgid "Jabber"
msgstr "Jabber"
#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
+#: addressbook/gui/widgets/eab-contact-display.c:347
+#: addressbook/gui/widgets/eab-contact-display.c:366
msgid "Yahoo"
msgstr "雅虎"
#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#: addressbook/gui/widgets/eab-contact-display.c:365
msgid "MSN"
msgstr "MSN"
#: addressbook/gui/contact-editor/e-contact-editor.c:182
#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/widgets/eab-contact-display.c:344
+#: addressbook/gui/widgets/eab-contact-display.c:363
msgid "ICQ"
msgstr "ICQ"
@@ -1885,15 +2031,15 @@ msgstr "ICQ"
msgid "GroupWise"
msgstr "GroupWise"
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "家庭"
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#, fuzzy
+msgid "Source Book"
+msgstr "来源"
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "其它"
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#, fuzzy
+msgid "Target Book"
+msgstr "地址簿"
#: addressbook/gui/contact-editor/e-contact-editor.c:273
msgid "Is New Contact"
@@ -1907,20 +2053,20 @@ msgstr "可写域"
msgid "Changed"
msgstr "已更改"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2297
msgid "This contact belongs to these categories:"
msgstr "此联系人属于这些类别:"
#. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2374
msgid "Please select an image for this contact"
msgstr "请选择此联系人的图像"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2378
msgid "No image"
msgstr "无图像"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2581
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -1928,22 +2074,22 @@ msgstr ""
"联系人数据无效:\n"
"\n"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2609
msgid "Invalid contact."
msgstr "无效的联系人。"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2668
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:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+#: addressbook/gui/contact-editor/e-contact-editor.c:2672
+#: addressbook/gui/contact-editor/e-contact-editor.c:2696
msgid "_Discard"
msgstr "丢弃(_D)"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2691
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?"
@@ -2127,11 +2273,11 @@ msgstr "列出姓名(_L):"
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:9
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
msgid "contact-list-editor"
msgstr "联系人列表编辑器"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
#: addressbook/gui/widgets/e-addressbook-model.c:295
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
#: addressbook/gui/widgets/e-addressbook-view.c:217
@@ -2140,17 +2286,17 @@ msgstr "联系人列表编辑器"
msgid "Book"
msgstr "名簿"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
msgid "Is New List"
msgstr "为新列表"
#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
msgid "Contact List Editor"
msgstr "联系人列表编辑器"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
msgid "Save List as VCard"
msgstr "将列表保存为 VCard"
@@ -2197,91 +2343,91 @@ msgstr ""
msgid "Advanced Search"
msgstr "高级搜索"
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
msgid "(map)"
msgstr "(地图)"
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
msgid "map"
msgstr "地图"
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
msgid "List Members"
msgstr "列出成员"
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
msgid "E-mail"
msgstr "电子邮件"
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:340
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
msgid "Organization"
msgstr "组织"
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:341
msgid "Position"
msgstr "位置"
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
msgid "Groupwise"
msgstr "Groupwise"
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:348
msgid "Video Conferencing"
msgstr "视频会议"
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
msgid "Phone"
msgstr "电话"
-#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:350
msgid "Fax"
msgstr "传真"
-#: addressbook/gui/widgets/eab-contact-display.c:346
+#: addressbook/gui/widgets/eab-contact-display.c:354
msgid "work"
msgstr "工作"
-#: addressbook/gui/widgets/eab-contact-display.c:359
+#: addressbook/gui/widgets/eab-contact-display.c:367
msgid "WWW"
msgstr "WWW"
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
msgid "Blog"
msgstr "Blog"
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:371
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
msgid "Mobile Phone"
msgstr "移动电话"
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:375
msgid "personal"
msgstr "个人"
-#: addressbook/gui/widgets/eab-contact-display.c:374
+#: addressbook/gui/widgets/eab-contact-display.c:382
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
msgid "Note"
msgstr "注释"
-#: addressbook/gui/widgets/eab-contact-display.c:540
+#: addressbook/gui/widgets/eab-contact-display.c:548
msgid "Job Title"
msgstr "职称"
-#: addressbook/gui/widgets/eab-contact-display.c:544
+#: addressbook/gui/widgets/eab-contact-display.c:552
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:774
msgid "Email"
msgstr "电子邮件"
-#: addressbook/gui/widgets/eab-contact-display.c:571
+#: addressbook/gui/widgets/eab-contact-display.c:579
msgid "Home page"
msgstr "主页"
@@ -2635,13 +2781,13 @@ msgid "Email begins with"
msgstr "邮件以此开头"
#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:57
msgid "Category is"
msgstr "类别为"
#. We attach subitems below
#: addressbook/gui/widgets/e-addressbook-view.c:166
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
msgid "Any field contains"
msgstr "任何域含有"
@@ -2653,7 +2799,7 @@ msgstr "高级..."
#: addressbook/gui/widgets/e-addressbook-view.c:238
#: calendar/gui/dialogs/meeting-page.etspec.h:11
#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:227
+#: calendar/gui/e-meeting-list-view.c:250
#: calendar/gui/e-meeting-time-sel.etspec.h:11
msgid "Type"
msgstr "类型"
@@ -2731,7 +2877,7 @@ msgid "Cut"
msgstr "剪切"
#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
@@ -2743,13 +2889,13 @@ msgid "Paste"
msgstr "粘贴"
#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1277
msgid "Current View"
msgstr "当前视图"
#. All, unmatched, separator
#: addressbook/gui/widgets/e-addressbook-view.c:1665
-#: calendar/gui/cal-search-bar.c:358
+#: calendar/gui/cal-search-bar.c:362
msgid "Any Category"
msgstr "任何类别"
@@ -2855,7 +3001,7 @@ 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-list-view.c:257
#: calendar/gui/e-meeting-time-sel.etspec.h:9
msgid "Role"
msgstr "角色"
@@ -2963,12 +3109,22 @@ msgstr "卡片视图"
msgid "GTK Tree View"
msgstr "GTK 树视图"
-#: addressbook/gui/widgets/test-reflow.c:107
+#: addressbook/gui/widgets/test-reflow.c:119
+#, fuzzy
+msgid "Reflow Test"
+msgstr "新建测试"
+
+#: addressbook/gui/widgets/test-reflow.c:120
#: 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
+#, fuzzy
+msgid "This should test the reflow canvas item"
+msgstr "这应该测试联系人打印代码"
+
#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
msgid "Evolution LDIF importer"
msgstr "Evolution LDIF 导入器"
@@ -3211,6 +3367,32 @@ msgstr "[vcard|csv]"
msgid "Export in asynchronous mode "
msgstr "以异步模式导出"
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there should not need size option."
+msgstr ""
+
#: addressbook/tools/evolution-addressbook-export.c:153
msgid "Impossible internal error."
msgstr "不可能的内部错误。"
@@ -3324,6 +3506,15 @@ msgstr "全部丢弃"
msgid "No description available."
msgstr "没有描述。"
+#: calendar/gui/alarm-notify/alarm-queue.c:969
+#, c-format
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+
#: calendar/gui/alarm-notify/alarm-queue.c:1069
#: calendar/gui/alarm-notify/alarm-queue.c:1093
msgid "Warning"
@@ -3409,14 +3600,91 @@ msgstr "工作日结束的小时"
msgid "Hour the workday starts on"
msgstr "工作日开始的小时"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "List of urls for free/busy publishing"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#, fuzzy
+msgid "Minute the workday ends on"
+msgstr "工作日结束的小时"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#, fuzzy
+msgid "Minute the workday starts on"
+msgstr "工作日开始的小时"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#, fuzzy
+msgid "Number of units for default reminder"
+msgstr "是否为事件发送默认提醒"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
msgid "Show where events end in week and month views"
msgstr "在周视图和月视图中显示事件结束"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#, fuzzy
+msgid "Weekday the week starts on"
+msgstr "工作日开始的小时"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Whether or not to use the notification tray for display alarms"
+msgstr ""
+
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
msgid "Whether to ask for confirmation on appointment deletion"
msgstr "删除约会时是否要求确认"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "删除约会时是否要求确认"
+
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
msgid "Whether to hide completed tasks"
msgstr "是否隐藏已完成的任务"
@@ -3425,6 +3693,10 @@ msgstr "是否隐藏已完成的任务"
msgid "Whether to set a default reminder for events"
msgstr "是否为事件发送默认提醒"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
msgid "Whether to show week numbers in date navigator"
msgstr "是否在日期浏览器中显示周数"
@@ -3445,9 +3717,13 @@ msgid ""
msgstr ""
"该操作将永久删除所有比选中时间量早的事件。如果您继续,您将无法恢复这些事件。"
+#: calendar/gui/calendar-commands.c:358
+msgid "Purge events older than"
+msgstr ""
+
#: calendar/gui/calendar-commands.c:363
#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
msgid "days"
msgstr "天数"
@@ -3457,6 +3733,10 @@ 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-week-view-main-item.c:329
@@ -3591,23 +3871,23 @@ msgstr "周视图"
msgid "Month View"
msgstr "月视图"
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
msgid "Summary contains"
msgstr "概要含有"
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
msgid "Description contains"
msgstr "描述含有"
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
msgid "Comment contains"
msgstr "注释含有"
-#: calendar/gui/cal-search-bar.c:53
+#: calendar/gui/cal-search-bar.c:56
msgid "Location contains"
msgstr "位置含有"
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:327
msgid "Unmatched"
msgstr "无匹配"
@@ -3680,7 +3960,7 @@ msgstr "发送给:"
msgid "With these arguments:"
msgstr "使用这些参数:"
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
msgid "dialog1"
msgstr "dialog1"
@@ -3689,7 +3969,7 @@ msgid "extra times every"
msgstr "每个额外时间"
#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
msgid "hours"
msgstr "小时"
@@ -3735,7 +4015,7 @@ 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:920 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "概要:"
@@ -3765,6 +4045,7 @@ msgid "hour(s)"
msgstr "小时"
#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:21
msgid "minute(s)"
msgstr "分钟"
@@ -3786,12 +4067,12 @@ msgstr "源位置“%s”不是规格的。"
msgid "The source location '%s' is not a webcal source."
msgstr "源位置“%s”不是 Webcal 源。"
-#: calendar/gui/dialogs/calendar-setup.c:275
+#: calendar/gui/dialogs/calendar-setup.c:264
#, c-format
msgid "Source with name '%s' already exists in the selected group"
msgstr "选中组中已经存在名为“%s”的源"
-#: calendar/gui/dialogs/calendar-setup.c:288
+#: calendar/gui/dialogs/calendar-setup.c:277
#, c-format
msgid ""
"The group '%s' is remote. You must specify a location to get the calendar "
@@ -3810,31 +4091,51 @@ msgstr "添加任务组"
msgid "C_olor:"
msgstr "颜色(_O):"
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+#: calendar/gui/dialogs/calendar-setup.glade.h:5
+msgid "Calendar Properties"
+msgstr "日历属性"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:110
msgid "Pick a color"
msgstr "选取一种颜色"
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/calendar-setup.glade.h:8
+msgid "Remote"
+msgstr "远程"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "Task List Properties"
+msgstr "任务列表属性"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
msgid "_Add Calendar"
msgstr "添加日历(_A)"
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
msgid "_Add Group"
msgstr "添加组(_A)"
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+msgid "_Refresh Interval:"
+msgstr "刷新间隔(_R):"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
msgid "_Refresh:"
msgstr "刷新(_R):"
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
+msgid "_Source URL:"
+msgstr "源 URL(_S):"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
msgid "_Type:"
msgstr "类型(_T):"
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
msgid "_URL:"
msgstr "_URL:"
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
msgid "weeks"
msgstr "周"
@@ -3946,7 +4247,7 @@ msgstr "忙/闲发布"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
#: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:557
msgid "Friday"
msgstr "星期五"
@@ -3960,7 +4261,7 @@ msgstr "分钟"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:552
+#: calendar/gui/e-itip-control.c:553
msgid "Monday"
msgstr "星期一"
@@ -3970,7 +4271,7 @@ msgstr "周日(_U)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:558
msgid "Saturday"
msgstr "星期六"
@@ -3984,7 +4285,7 @@ msgstr "在日期浏览器中显示周数(_N)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:551
+#: calendar/gui/e-itip-control.c:552
msgid "Sunday"
msgstr "星期日"
@@ -3998,7 +4299,7 @@ msgstr "周四(_H)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/e-itip-control.c:556
msgid "Thursday"
msgstr "星期四"
@@ -4012,7 +4313,7 @@ msgstr "时间格式:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:553
+#: calendar/gui/e-itip-control.c:554
msgid "Tuesday"
msgstr "星期二"
@@ -4022,7 +4323,7 @@ msgstr "一周开始(_E):"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:554
+#: calendar/gui/e-itip-control.c:555
msgid "Wednesday"
msgstr "星期三"
@@ -4181,7 +4482,7 @@ msgid "No summary"
msgstr "没有概要"
#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
#: composer/e-msg-composer.c:1193
msgid "Save as..."
msgstr "另存为..."
@@ -4229,6 +4530,10 @@ msgstr "无法打开源"
msgid "Could not open destination"
msgstr "无法打开目的"
+#: calendar/gui/dialogs/copy-source-dialog.c:74
+msgid "Destination is read only"
+msgstr "目的只读"
+
#: calendar/gui/dialogs/delete-error.c:54
msgid "The event could not be deleted due to a corba error"
msgstr "无法删除事件,原因是 corbat 错误"
@@ -4405,8 +4710,13 @@ 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.glade.h:3
#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
@@ -4436,8 +4746,8 @@ msgstr "授权于(_D)..."
#. FIXME: need to disable for undeletable folders
#: calendar/gui/dialogs/meeting-page.c:655
#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
+#: mail/em-folder-tree.c:2537 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
@@ -4445,7 +4755,7 @@ msgid "_Delete"
msgstr "删除(_D)"
#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:218
+#: calendar/gui/e-meeting-list-view.c:241
#: calendar/gui/e-meeting-time-sel.etspec.h:1
msgid "Attendee"
msgstr "出席者"
@@ -4481,14 +4791,14 @@ msgid "Member"
msgstr "成员"
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:264
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
#: calendar/gui/dialogs/meeting-page.etspec.h:10
#: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-list-view.c:271
#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
msgid "Status"
msgstr "状态"
@@ -4497,19 +4807,20 @@ msgstr "状态"
msgid "Add A_ttendee"
msgstr "添加出席者(_T)"
-#: calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Add attendees from addressbook."
-msgstr "从地址簿添加出席者。"
-
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:4
#: calendar/gui/e-itip-control.glade.h:9
msgid "Organizer:"
msgstr "组织者:"
-#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/dialogs/meeting-page.glade.h:5
msgid "_Change Organizer"
msgstr "改变组织者(_C)"
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-meeting-time-sel.c:417
+msgid "_Invite Others..."
+msgstr "邀请其他人(_I)..."
+
#: calendar/gui/dialogs/new-calendar.glade.h:2
msgid "<b>Calendar options</b>"
msgstr "<b>日历选项</b>"
@@ -4797,7 +5108,7 @@ msgstr "机密(_F)"
#: calendar/gui/dialogs/task-page.glade.h:6
#: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:976 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 "描述:"
@@ -4814,6 +5125,15 @@ msgstr "开始日期(_R):"
msgid "_Due date:"
msgstr "到期日期(_D):"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#, fuzzy
+msgid "Authentication Credentials for HTTP Server"
+msgstr "来自服务器的无效认证应答。"
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:3
+msgid "Calendars selected for publishing"
+msgstr ""
+
#: calendar/gui/dialogs/url-editor-dialog.glade.h:4
msgid "Daily"
msgstr "每日"
@@ -4846,6 +5166,10 @@ msgstr "记住密码"
msgid "URL:"
msgstr "URL:"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:12
+msgid "User Publishes"
+msgstr ""
+
#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
msgid "Weekly"
msgstr "每周"
@@ -4944,7 +5268,7 @@ msgstr "到期日期:"
#. write status
#: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:944
msgid "Status:"
msgstr "状态:"
@@ -5028,12 +5352,12 @@ msgstr "繁忙"
msgid "Deleting selected objects"
msgstr "删除选中的对象"
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
msgid "Updating objects"
msgstr "更新对象"
#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
+#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
msgid "_Open"
msgstr "打开(_O)"
@@ -5043,15 +5367,15 @@ msgid "Open _Web Page"
msgstr "打开网页(_W)"
#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
#: ui/evolution-mail-message.xml.h:128
msgid "_Save As..."
msgstr "另存为(_S)..."
#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
+#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
#: ui/evolution-tasks.xml.h:25
@@ -5059,15 +5383,15 @@ msgid "_Print..."
msgstr "打印(_P)..."
#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
#: ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "剪切(_U)"
#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2530
#: 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
@@ -5075,8 +5399,8 @@ msgid "_Copy"
msgstr "复制(_C)"
#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
+#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
msgid "_Paste"
@@ -5142,67 +5466,67 @@ msgstr "概要"
msgid "Task sort"
msgstr "任务排序"
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
msgid "New Meeting"
msgstr "新会议"
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
msgid "New Task"
msgstr "新建任务"
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
msgid "Select _Today"
msgstr "选择今天(_T)"
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1280
msgid "_Select Date..."
msgstr "选择日期(_S)..."
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
msgid "_Publish Free/Busy Information"
msgstr "发布忙闲信息(_P)"
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1303
msgid "Cop_y to Calendar..."
msgstr "复制到日历(_Y)..."
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1304
msgid "Mo_ve to Calendar..."
msgstr "移动到日历(_V)..."
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1305
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1306
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_F)..."
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
msgid "Delete this _Occurrence"
msgstr "删除此次出现(_O)"
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
msgid "Delete _All Occurrences"
msgstr "删除所有出现(_A)"
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1346
msgid "Go to _Today"
msgstr "转到今天(_T)"
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1348
msgid "_Go to Date..."
msgstr "转到日期(_G)..."
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
msgid "_Settings..."
msgstr "设置(_S)..."
@@ -5216,9 +5540,9 @@ 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:960 calendar/gui/e-itip-control.c:1162
-#: 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-itip-control.c:961 calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-meeting-list-view.c:145
+#: calendar/gui/e-meeting-list-view.c:159 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:1703 camel/camel-gpg-context.c:1754
#: camel/camel-tcp-stream-openssl.c:631
@@ -5244,13 +5568,13 @@ 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-list-view.c:169 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
+#: calendar/gui/e-meeting-list-view.c:170 calendar/gui/e-meeting-store.c:171
msgid "No"
msgstr "否"
@@ -5262,7 +5586,7 @@ msgstr "北"
msgid "S"
msgstr "南"
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
msgid "E"
msgstr "东"
@@ -5281,12 +5605,20 @@ msgstr ""
"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"
@@ -5317,6 +5649,10 @@ msgstr "下午"
#. 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-week-view-main-item.c:320 calendar/gui/print.c:1514
msgid "%A %d %B"
@@ -5324,6 +5660,9 @@ 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-week-view-main-item.c:343
msgid "%d %b"
@@ -5334,400 +5673,396 @@ msgstr "%B%d日"
msgid "%02i minute divisions"
msgstr "%02i 分钟分割"
-#: calendar/gui/e-itip-control.c:585
+#: calendar/gui/e-itip-control.c:586
msgid "Yes. (Complex Recurrence)"
msgstr "是(复杂重现)"
-#: calendar/gui/e-itip-control.c:596
+#: calendar/gui/e-itip-control.c:597
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
msgstr[0] "每 %d 天"
-#: calendar/gui/e-itip-control.c:601
+#: calendar/gui/e-itip-control.c:602
#, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
msgstr[0] "每 %d 周"
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:604
#, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
msgstr[0] "每 %d 周的"
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:612
msgid " and "
msgstr " 和 "
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:619
#, c-format
msgid "The %s day of "
msgstr "第 %s 天属于"
-#: calendar/gui/e-itip-control.c:631
+#: calendar/gui/e-itip-control.c:632
#, c-format
msgid "The %s %s of "
msgstr "%s %s 属于"
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:639
#, c-format
msgid "every month"
msgid_plural "every %d months"
msgstr[0] "每 %d 月"
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:643
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
msgstr[0] "每 %d 年"
-#: calendar/gui/e-itip-control.c:653
+#: calendar/gui/e-itip-control.c:654
#, c-format
msgid "a total of %d time"
msgid_plural " a total of %d times"
msgstr[0] " 总计 %d 次"
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:663
msgid ", ending on "
msgstr ",结束于 "
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:687
msgid "<b>Starts:</b> "
msgstr "<b>开始:</b>"
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:697
msgid "<b>Ends:</b> "
msgstr "<b>结束:</b>"
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:717
msgid "<b>Completed:</b> "
msgstr "<b>已完成:</b> "
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:727
msgid "<b>Due:</b> "
msgstr "<b>到期:</b>"
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
msgid "iCalendar Information"
msgstr "iCalendar 信息"
#. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:782
msgid "iCalendar Error"
msgstr "iCalendar 错误"
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
msgid "An unknown person"
msgstr "未知的人"
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:904
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作。"
-#: calendar/gui/e-itip-control.c:918
+#: calendar/gui/e-itip-control.c:919
msgid "<i>None</i>"
msgstr "<i>无</i>"
-#: calendar/gui/e-itip-control.c:929
-msgid "Location:"
-msgstr "位置:"
-
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
#: calendar/gui/itip-utils.c:422
msgid "Accepted"
msgstr "接受"
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
msgid "Tentatively Accepted"
msgstr "暂时接受"
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:182
#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
msgid "Declined"
msgstr "拒绝"
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
msgid "Choose an action:"
msgstr "选择一项活动:"
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1017
msgid "Update"
msgstr "更新"
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
+#: shell/e-shell.c:1132 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "确定"
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1045
msgid "Accept"
msgstr "接受"
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1046
msgid "Tentatively accept"
msgstr "暂时接受"
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1047
msgid "Decline"
msgstr "拒绝"
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1071
msgid "Send Free/Busy Information"
msgstr "发送忙闲信息"
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1084
msgid "Update respondent status"
msgstr "更新应答者状态"
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1097
msgid "Send Latest Information"
msgstr "发送最新的信息"
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
#: ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1186
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> 发布了会议信息。"
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1187
msgid "Meeting Information"
msgstr "会议信息"
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1192
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr "<b>%s</b> 请求 %s 参加一个会议。"
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1194
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请求您参加一个会议。"
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1195
msgid "Meeting Proposal"
msgstr "会议建议"
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1199
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> 希望加入到已存的会议。"
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1200
msgid "Meeting Update"
msgstr "会议更新"
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1204
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> 想收到最新的会议信息。"
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1205
msgid "Meeting Update Request"
msgstr "会议更新请求"
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1212
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> 已回复一个会议请求。"
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1213
msgid "Meeting Reply"
msgstr "会议答复"
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1220
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1221
msgid "Meeting Cancellation"
msgstr "会议取消"
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> 发送了一个无法理解的信息。"
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1229
msgid "Bad Meeting Message"
msgstr "错误的会议信息"
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1254
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> 发布了任务信息。"
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1255
msgid "Task Information"
msgstr "任务信息"
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1260
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> 请求 %s 完成一个任务。"
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1262
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请求您完成一个任务。"
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1263
msgid "Task Proposal"
msgstr "任务建议"
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1267
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s<b> 希望加入到已存在的任务。"
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1268
msgid "Task Update"
msgstr "任务更新"
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1272
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> 希望获取最新的任务信息。"
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1273
msgid "Task Update Request"
msgstr "任务更新请求"
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1280
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> 已经回复了任务委派。"
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1281
msgid "Task Reply"
msgstr "任务回复"
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1288
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> 取消了任务。"
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1289
msgid "Task Cancellation"
msgstr "任务取消"
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1297
msgid "Bad Task Message"
msgstr "错误的任务邮件"
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1316
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> 发布了忙闲信息。"
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1317
msgid "Free/Busy Information"
msgstr "忙闲信息"
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1321
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请求您的忙闲信息。"
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1322
msgid "Free/Busy Request"
msgstr "忙/闲请求"
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1326
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> 应答了忙闲请求。"
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1327
msgid "Free/Busy Reply"
msgstr "忙闲应答"
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1332
msgid "Bad Free/Busy Message"
msgstr "错误的忙闲信息"
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1407
msgid "The message does not appear to be properly formed"
msgstr "邮件的格式可能不正确"
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1466
msgid "The message contains only unsupported requests."
msgstr "邮件只含有不支持的请求。"
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1497
msgid "The attachment does not contain a valid calendar message"
msgstr "附件中没有有效的日历信息"
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1529
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日历项目"
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1763
msgid "Update complete\n"
msgstr "更新完成\n"
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1865
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新参与者状态"
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1809 calendar/gui/e-itip-control.c:1847
msgid "Object is invalid and cannot be updated\n"
msgstr "对象无效,无法更新\n"
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1819
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "此响应并非来自当前参与者。将响应者加为参与者吗?"
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1831
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新参与者状态!\n"
-#: calendar/gui/e-itip-control.c:1849
+#: calendar/gui/e-itip-control.c:1850
msgid "There was an error on the CORBA system\n"
msgstr "CORBA 系统出错\n"
-#: calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1853
msgid "Object could not be found\n"
msgstr "找不到对象\n"
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
msgid "You don't have the right permissions to update the calendar\n"
msgstr "您没有适当的权限打开日历\n"
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
msgid "Attendee status updated\n"
msgstr "更新参与者状态\n"
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
msgid "Attendee status could not be updated!\n"
msgstr "无法更新参与者状态!\n"
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1893
msgid "Removal Complete"
msgstr "删除完成"
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
msgid "Item sent!\n"
msgstr "项目已发送!\n"
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1918 calendar/gui/e-itip-control.c:1968
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
@@ -5768,74 +6103,74 @@ msgstr "日期-结束"
msgid "date-start"
msgstr "日期-开始"
-#: calendar/gui/e-meeting-list-view.c:59
+#: calendar/gui/e-meeting-list-view.c:62
msgid "Chair Persons"
msgstr "主席人员"
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
+#: calendar/gui/e-meeting-list-view.c:63
+#: calendar/gui/e-meeting-list-view.c:480
msgid "Required Participants"
msgstr "必需的参与者"
-#: calendar/gui/e-meeting-list-view.c:61
+#: calendar/gui/e-meeting-list-view.c:64
msgid "Optional Participants"
msgstr "可选的参与者"
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:65
msgid "Resources"
msgstr "资源"
-#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:90
#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
msgid "Individual"
msgstr "个人"
-#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:92
#: calendar/gui/e-meeting-store.c:109
msgid "Group"
msgstr "组"
-#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:94
#: calendar/gui/e-meeting-store.c:111
msgid "Resource"
msgstr "资源"
-#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:144 calendar/gui/e-meeting-store.c:96
#: calendar/gui/e-meeting-store.c:113
msgid "Room"
msgstr "房间"
-#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:125
#: calendar/gui/e-meeting-store.c:142
msgid "Chair"
msgstr "主席"
-#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:127
#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
msgid "Required Participant"
msgstr "必需的参与者"
-#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:129
#: calendar/gui/e-meeting-store.c:146
msgid "Optional Participant"
msgstr "可选的参与者"
-#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:131
#: calendar/gui/e-meeting-store.c:148
msgid "Non-Participant"
msgstr "不参加"
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:180 calendar/gui/e-meeting-store.c:177
#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
msgid "Needs Action"
msgstr "需要动作"
-#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:183
#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
msgid "Tentative"
msgstr "暂时的"
-#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:184 calendar/gui/e-meeting-store.c:185
#: calendar/gui/e-meeting-store.c:208
msgid "Delegated"
msgstr "被委任的"
@@ -5852,24 +6187,20 @@ msgstr "办公室以外"
msgid "No Information"
msgstr "没有信息"
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "Add attendees from addressbook"
-msgstr "从地址簿添加出席者"
-
#: calendar/gui/e-meeting-time-sel.c:440
msgid "_Options"
msgstr "选项(_O)"
#: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _only working hours"
+msgid "Show _Only Working Hours"
msgstr "只显示工作小时(_O)"
#: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _zoomed out"
+msgid "Show _Zoomed Out"
msgstr "显示缩放的输出(_Z)"
#: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update free/busy"
+msgid "_Update Free/Busy"
msgstr "更新忙闲(_U)"
#: calendar/gui/e-meeting-time-sel.c:497
@@ -5885,19 +6216,19 @@ msgid ">_>"
msgstr ">_>"
#: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All people and resources"
+msgid "_All People and Resources"
msgstr "全部人和资源(_A)"
#: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _people and one resource"
+msgid "All _People and One Resource"
msgstr "全部人和一个资源(_P)"
#: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required people"
+msgid "_Required People"
msgstr "必需的人(_R)"
#: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required people and _one resource"
+msgid "Required People and _One Resource"
msgstr "必需的人和一个资源(_O)"
#: calendar/gui/e-meeting-time-sel.c:593
@@ -5917,6 +6248,10 @@ 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:2093
#: 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
@@ -5925,6 +6260,10 @@ 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"
@@ -5935,7 +6274,7 @@ msgstr "%Y-%m-%d"
msgid "Enter the password for %s"
msgstr "为 %s 输入密码"
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:585 calendar/gui/gnome-cal.c:2020
#, c-format
msgid ""
"Error on %s:\n"
@@ -5946,12 +6285,12 @@ msgstr ""
#. FIXME Loading should be async
#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
+#: calendar/gui/e-tasks.c:680
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
-#: calendar/gui/e-tasks.c:824
+#: calendar/gui/e-tasks.c:703
#, c-format
msgid ""
"Error opening %s:\n"
@@ -5960,26 +6299,26 @@ msgstr ""
"打开 %s 出错:\n"
" %s"
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:724
msgid "Loading tasks"
msgstr "装入任务"
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:828
msgid "Completing tasks..."
msgstr "正在完成任务..."
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:851
msgid "Deleting selected objects..."
msgstr "正在删除选中的对象..."
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:878
msgid "Expunging"
msgstr "销毁"
-#: calendar/gui/e-tasks.c:1075
+#: calendar/gui/e-tasks.c:954
#: 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:884 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
+#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
#: calendar/importers/icalendar-importer.c:79
#: calendar/importers/icalendar-importer.c:705
msgid "Tasks"
@@ -6000,6 +6339,11 @@ msgstr "装入位于 %s 的任务"
msgid "Opening %s"
msgstr "打开 %s"
+#: calendar/gui/gnome-cal.c:2906
+#, fuzzy
+msgid "Purging"
+msgstr "发送"
+
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
msgid "*Control*F3"
msgstr "*Control*F3"
@@ -6191,7 +6535,7 @@ msgid "On The Web"
msgstr "网上"
#. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
msgid "Unable to migrate old settings from evolution/config.xmldb"
msgstr "无法从 evolution/config.xmldb 中升迁旧设置"
@@ -6202,7 +6546,7 @@ msgid "Unable to migrate calendar `%s'"
msgstr "无法升迁日历“%s”"
#. FIXME: domain/code
-#: calendar/gui/migration.c:889
+#: calendar/gui/migration.c:869
#, c-format
msgid "Unable to migrate tasks `%s'"
msgstr "无法升迁任务“%s”"
@@ -6438,52 +6782,69 @@ msgstr "打印项"
msgid "Print Setup"
msgstr "打印设置"
-#: calendar/gui/tasks-component.c:313
+#: calendar/gui/tasks-component.c:303
#, c-format
msgid "Task List '%s' will be removed. Are you sure you want to continue?"
msgstr "即将删除任务列表“%s”。您确定想要继续吗?"
-#: calendar/gui/tasks-component.c:371
+#: calendar/gui/tasks-component.c:361
msgid "New Task List"
msgstr "新建任务列表"
-#: calendar/gui/tasks-component.c:408
+#: calendar/gui/tasks-component.c:398
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d 个任务"
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:488
#, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
msgstr[0] ",已选中 %d 个"
-#: calendar/gui/tasks-component.c:457
+#: calendar/gui/tasks-component.c:447
msgid "Failed upgrading tasks."
msgstr "升级任务失败。"
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:526
+#, fuzzy, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr "无法打开日历“%s”来创建事件和会议"
+
+#: calendar/gui/tasks-component.c:538
+#, fuzzy
+msgid "There is no calendar available for creating tasks"
+msgstr "没有可创建事件和会议的日历"
+
+#: calendar/gui/tasks-component.c:576
+#, fuzzy
+msgid ""
+"Selected task list is read-only, events cannot be created. Please select a "
+"read-write calendar."
+msgstr "选中的日历只读,无法创建事件。请选择可写的日历。"
+
+#: calendar/gui/tasks-component.c:804
msgid "New task"
msgstr "新建任务"
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:805
msgid "_Task"
msgstr "任务(_T)"
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:806
msgid "Create a new task"
msgstr "创建新任务"
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:812
msgid "New tasks group"
msgstr "新建任务组"
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:813
msgid "_Tasks Group"
msgstr "任务组(_T)"
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:814
msgid "Create a new tasks group"
msgstr "创建新任务组"
@@ -8300,7 +8661,25 @@ msgstr ""
msgid "(match-all) requires a single bool result"
msgstr "(match-all) 需要一个布尔结果"
-#: camel/camel-folder-search.c:879
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
+msgid "(match-threads) requires a match type string"
+msgstr ""
+
+#: camel/camel-folder-search.c:785
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(match-all) 需要一个布尔结果"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(match-all) 需要一个布尔结果"
+
+#: camel/camel-folder-search.c:880
#, c-format
msgid "Performing query on unknown header: %s"
msgstr "对未知的头进行查询:%s"
@@ -8335,8 +8714,7 @@ msgstr ""
#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
-#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
+#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:705
#: mail/mail-send-recv.c:611
msgid "Cancelled."
msgstr "已取消。"
@@ -8924,6 +9302,10 @@ msgstr "完好签名"
msgid "Bad signature"
msgstr "无效签名"
+#: camel/camel-smime-context.c:520
+msgid "Content tampered with or altered in transit"
+msgstr ""
+
#: camel/camel-smime-context.c:522
msgid "Signing certificate not found"
msgstr "签名证书找不到"
@@ -8948,14 +9330,142 @@ msgstr "签名格式不对"
msgid "Processing error"
msgstr "处理错误"
+#: camel/camel-smime-context.c:569
+#, fuzzy
+msgid "No signedData in signature"
+msgstr "无效签名"
+
+#: camel/camel-smime-context.c:576
+msgid "Digests missing from enveloped data"
+msgstr ""
+
+#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
+#, fuzzy
+msgid "Cannot calculate digests"
+msgstr "无法创建 CMS 签名数据"
+
+#: camel/camel-smime-context.c:604
+#, fuzzy
+msgid "Cannot set message digests"
+msgstr "无法获取邮件 %s:%s"
+
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
+#, fuzzy
+msgid "Certificate import failed"
+msgstr "证书签名失败"
+
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
+msgstr ""
+
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
+msgstr ""
+
+#: camel/camel-smime-context.c:635
+#, fuzzy
+msgid "Can't find signature digests"
+msgstr "有效签名"
+
+#: camel/camel-smime-context.c:651
+#, fuzzy, c-format
+msgid "Signer: %s <%s>: %s\n"
+msgstr "服务器:%s,类型:%s"
+
+#: camel/camel-smime-context.c:752
+msgid "Decoder failed"
+msgstr ""
+
+#: camel/camel-smime-context.c:804
+#, fuzzy, c-format
+msgid "Can't find certificate for `%s'"
+msgstr "找不到“%s”的证书"
+
+#: camel/camel-smime-context.c:811
+msgid "Can't find common bulk encryption algorithm"
+msgstr ""
+
+#. PORT_GetError(); ??
+#: camel/camel-smime-context.c:820
+msgid "Can't allocate slot for encryption bulk key"
+msgstr ""
+
+#: camel/camel-smime-context.c:831
+#, fuzzy
+msgid "Can't create CMS Message"
+msgstr "无法创建 CMS 邮件"
+
+#: camel/camel-smime-context.c:837
+#, fuzzy
+msgid "Can't create CMS EnvelopedData"
+msgstr "无法创建 CMS 签名数据"
+
+#: camel/camel-smime-context.c:843
+#, fuzzy
+msgid "Can't attach CMS EnvelopedData"
+msgstr "无法附加 CMS 签名数据"
+
+#: camel/camel-smime-context.c:849
+#, fuzzy
+msgid "Can't attach CMS data object"
+msgstr "无法附加 CMS 数据"
+
+#: camel/camel-smime-context.c:858
+#, fuzzy
+msgid "Can't create CMS RecipientInfo"
+msgstr "无法创建 CMS 签名者信息"
+
+#: camel/camel-smime-context.c:863
+#, fuzzy
+msgid "Can't add CMS RecipientInfo"
+msgstr "无法添加 CMS 签名者信息"
+
+#: camel/camel-smime-context.c:877
+#, fuzzy
+msgid "Can't create encoder context"
+msgstr "无法创建编码器上下文"
+
+#: camel/camel-smime-context.c:888
+#, fuzzy
+msgid "Failed to add data to encoder"
+msgstr "将数据添加到 CMS 编码器失败"
+
+#: camel/camel-smime-context.c:974
+#, c-format
+msgid "Decoder failed, error %d"
+msgstr ""
+
+#: camel/camel-smime-context.c:981
+msgid "S/MIME Decrypt: No encrypted content found"
+msgstr ""
+
+#: camel/camel-smime-context.c:1008
+#, fuzzy
+msgid "import keys: unimplemented"
+msgstr "命令尚未实现"
+
+#: camel/camel-smime-context.c:1016
+msgid "export keys: unimplemented"
+msgstr ""
+
#: camel/camel-store.c:213
msgid "Cannot get folder: Invalid operation on this store"
msgstr "无法获取文件夹:对该存储的无效操作"
+#: camel/camel-store.c:243
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "无法创建文件夹:%s:%s"
+
#: camel/camel-store.c:297
msgid "Cannot create folder: Invalid operation on this store"
msgstr "无法创建文件夹:对该存储的无效操作"
+#: camel/camel-store.c:325
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "无法创建文件夹:%s:%s"
+
#: camel/camel-store.c:389 camel/camel-vee-store.c:351
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
@@ -8966,11 +9476,11 @@ msgstr "无法删除文件夹:%s:无效操作"
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "无法重命名文件夹:%s:无效操作"
-#: camel/camel-store.c:777
+#: camel/camel-store.c:809
msgid "Trash"
msgstr "回收站"
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: camel/camel-store.c:811 mail/mail-config.glade.h:95
#: ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "垃圾"
@@ -9271,6 +9781,12 @@ msgstr "密码"
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
+#, fuzzy
+msgid "Checklist"
+msgstr "列表"
+
#: camel/providers/imap4/camel-imap4-command.c:629
#, c-format
msgid "Unexpected response from IMAP4 server %s: %s"
@@ -9299,6 +9815,74 @@ msgstr "IMAP4 服务器 %s 意外断开连接:%s"
msgid "Got BYE response"
msgstr "得到 BYE 响应"
+#: camel/providers/imap4/camel-imap4-folder.c:335
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "无法选择文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "无法选择文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "无法获取文件夹:%s:%s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "无法选择文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"无法从文件夹 %2$s 获取邮件:%1$s\n"
+" %3$s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"无法从文件夹 %2$s 获取邮件:%1$s\n"
+" %3$s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "无法将邮件附加到 mh 文件夹:%s:%s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "无法选择文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-folder.c:854
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"无法从文件夹 %2$s 获取邮件:%1$s\n"
+" %3$s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:858
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"无法从文件夹 %2$s 获取邮件:%1$s\n"
+" %3$s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:866
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr "无法选择文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-folder.c:870
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "无法选择文件夹“%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
@@ -9320,6 +9904,22 @@ msgstr "覆盖服务器提供的文件夹命名空间"
msgid "Namespace"
msgstr "命名空间"
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "IMAP 服务器上的邮件的读写。"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
+
#: camel/providers/imap4/camel-imap4-store.c:165
#: camel/providers/imap/camel-imap-store.c:428
#, c-format
@@ -9337,7 +9937,7 @@ msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
#: camel/providers/imap/camel-imap-store.c:551
#: camel/providers/imap/camel-imap-store.c:571
#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/nntp/camel-nntp-store.c:140
#: camel/providers/pop3/camel-pop3-store.c:175
#: camel/providers/smtp/camel-smtp-transport.c:269
#: camel/providers/smtp/camel-smtp-transport.c:285
@@ -9356,12 +9956,19 @@ msgstr "SSL 不可用"
#: camel/providers/imap/camel-imap-store.c:568
#: camel/providers/imap/camel-imap-store.c:845
#: 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/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
#: camel/providers/pop3/camel-pop3-store.c:192
msgid "Connection cancelled"
msgstr "连接已取消"
+#: camel/providers/imap4/camel-imap4-store.c:261
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
+
#: camel/providers/imap4/camel-imap4-store.c:286
#: camel/providers/imap/camel-imap-store.c:679
#: camel/providers/imap/camel-imap-store.c:710
@@ -9373,19 +9980,117 @@ msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
#: camel/providers/imap/camel-imap-command.c:303
#: camel/providers/imap/camel-imap-command.c:400
#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1142
msgid "Unknown error"
msgstr "未知的错误"
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr "无法连接到 POP 服务器 %s:不支持请求认证机制。"
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, 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:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "认证到 POP 服务器 %s 失败:%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "无法获取文件夹:%s:%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:782
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "文件夹名不能含有字符“#”。"
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "无法选择文件夹“%s”:无效的邮箱名"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "无法选择文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "无法删除文件夹:%s:没有该文件夹"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "无法选择文件夹“%s”:无效的邮箱名"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "无法选择文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "命令:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "无法选择文件夹“%s”:无效的邮箱名"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "无法选择文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "无法选择文件夹“%s”:无效的邮箱名"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "无法选择文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "来自 IMAP4 服务器 %s 的意外响应:%s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+msgid "No data"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, 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
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3197
msgid "Operation cancelled"
msgstr "操作已取消"
#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3200
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "服务器意外地中止了连接:%s"
@@ -9466,7 +10171,7 @@ msgstr "没有该邮件"
#: camel/providers/imap/camel-imap-folder.c:2019
#: camel/providers/imap/camel-imap-folder.c:2622
-#: camel/providers/nntp/camel-nntp-folder.c:220
+#: camel/providers/nntp/camel-nntp-folder.c:238
msgid "This message is not currently available"
msgstr "该邮件目前不可用"
@@ -9475,6 +10180,22 @@ msgstr "该邮件目前不可用"
msgid "Fetching summary information for new messages"
msgstr "从新邮件中获取概要信息"
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
#: camel/providers/imap/camel-imap-folder.c:2660
msgid "Could not find message body in FETCH response."
msgstr "无法在 FETCH 应答中找到邮件体。"
@@ -9517,6 +10238,16 @@ msgstr "命令:"
msgid "Apply filters to new messages in INBOX on this server"
msgstr "应用过滤规则到本服务器上收件箱中的新邮件"
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "在所有文件夹中检查新邮件"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "在所有文件夹中检查新邮件"
+
#: camel/providers/imap/camel-imap-provider.c:76
msgid "IMAP"
msgstr "IMAP"
@@ -9583,6 +10314,14 @@ msgstr "没有文件夹 %s"
msgid "The parent folder is not allowed to contain subfolders"
msgstr "父文件夹不允许含有子文件夹"
+#: camel/providers/imap/camel-imap-store.c:1998
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:236
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "无法创建文件夹:%s:%s"
+
#: camel/providers/imap/camel-imap-store.c:2274
#, c-format
msgid "Unknown parent folder: %s"
@@ -9597,6 +10336,24 @@ msgstr "邮件存储"
msgid "IMAP+"
msgstr "IMAP+"
+#: camel/providers/imapp/camel-imapp-provider.c:49
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL !!!\n"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:328
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "无法连接到 POP 服务器 %s"
+
+#: camel/providers/local/camel-local-folder.c:179
+#, fuzzy
+msgid "Index message body data"
+msgstr "给联系人发邮件"
+
#. $HOME relative path + protocol string
#: camel/providers/local/camel-local-folder.c:388
#, c-format
@@ -9766,6 +10523,32 @@ msgstr ""
msgid "Invalid message contents"
msgstr "无效的邮件内容"
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mh-store.c:204
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "无法获取文件夹:%s:%s"
+
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mh-store.c:211
+#, fuzzy, 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-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "无法创建文件夹:%s:%s"
+
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
+msgstr "无法选择文件夹“%s”:无效的邮箱名"
+
#: camel/providers/local/camel-maildir-store.c:173
#: camel/providers/local/camel-maildir-store.c:211
#: camel/providers/local/camel-mh-store.c:260
@@ -9830,11 +10613,22 @@ msgstr "无法将邮件附加到邮件箱文件:%s:%s"
msgid "The folder appears to be irrecoverably corrupted."
msgstr "文件夹好像已经被不可恢复地破坏了。"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
+msgstr "事务失败"
+
#: camel/providers/local/camel-mbox-store.c:176
#: camel/providers/local/camel-mbox-store.c:361
msgid "Cannot create a folder by this name."
msgstr "无法以此名称创建文件夹。"
+#: camel/providers/local/camel-mbox-store.c:206
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "无法附加文件 %s:不是普通文件"
+
#: camel/providers/local/camel-mbox-store.c:236
#: camel/providers/local/camel-mbox-store.c:247
#: camel/providers/local/camel-mbox-store.c:270
@@ -9874,6 +10668,16 @@ msgstr "文件夹已经存在"
msgid "The new folder name is illegal."
msgstr "指定的文件夹名称不合法。"
+#: camel/providers/local/camel-mbox-store.c:485
+#, fuzzy, c-format
+msgid "Could not rename `%s': `%s': %s"
+msgstr "无法重命名“%s”:%s"
+
+#: camel/providers/local/camel-mbox-store.c:560
+#, fuzzy, c-format
+msgid "Could not rename '%s' to %s: %s"
+msgstr "无法重命名“%s”:%s"
+
#: camel/providers/local/camel-mbox-summary.c:375
#, c-format
msgid "Could not open folder: %s: %s"
@@ -9956,6 +10760,18 @@ msgstr "已取消 MH 附件邮件"
msgid "Cannot append message to mh folder: %s: %s"
msgstr "无法将邮件附加到 mh 文件夹:%s:%s"
+#: camel/providers/local/camel-mh-store.c:219
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"无法创建文件夹“%s”:\n"
+"%s"
+
+#: camel/providers/local/camel-mh-store.c:231
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "无法选择文件夹“%s”:无效的命令"
+
#: camel/providers/local/camel-mh-summary.c:244
#, c-format
msgid "Cannot open MH directory path: %s: %s"
@@ -10050,7 +10866,7 @@ msgstr ""
"文件夹可能已损坏,副本保存在“%s”"
#: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:1126
+#: camel/providers/nntp/camel-nntp-store.c:992
#, c-format
msgid "Please enter the NNTP password for %s@%s"
msgstr "请输入 %s@%s 的 NNTP 密码"
@@ -10067,10 +10883,18 @@ msgstr "向服务器发送用户名失败"
msgid "Server rejected username/password"
msgstr "服务器拒绝了用户名/密码"
-#: camel/providers/nntp/camel-nntp-folder.c:147
-#: camel/providers/nntp/camel-nntp-folder.c:149
-#: camel/providers/nntp/camel-nntp-folder.c:158
-#: camel/providers/nntp/camel-nntp-folder.c:234
+#: camel/providers/nntp/camel-nntp-folder.c:168
+#: camel/providers/nntp/camel-nntp-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "用户已取消"
+
+#: camel/providers/nntp/camel-nntp-folder.c:170
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
#: camel/providers/pop3/camel-pop3-folder.c:433
#: camel/providers/pop3/camel-pop3-folder.c:494
#: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10079,15 +10903,80 @@ msgstr "服务器拒绝了用户名/密码"
msgid "Cannot get message %s: %s"
msgstr "无法获取邮件 %s:%s"
-#: camel/providers/nntp/camel-nntp-folder.c:156
-#: camel/providers/nntp/camel-nntp-folder.c:232
-#: camel/providers/nntp/camel-nntp-folder.c:371
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "用户已取消"
+#: camel/providers/nntp/camel-nntp-folder.c:188
+#: camel/providers/nntp/camel-nntp-folder.c:228
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:201
+#, fuzzy, c-format
+msgid "Could not get article %s from NNTP server"
+msgstr "无法启动 wombat 服务器"
+
+#: camel/providers/nntp/camel-nntp-folder.c:362
+msgid "Posting not allowed by news server"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:373
+#, c-format
+msgid "Failed to send newsgroups header: %s: message not posted"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:413
+#: camel/providers/nntp/camel-nntp-folder.c:426
+#, c-format
+msgid "Error posting to newsgroup: %s: message not posted"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:438
+msgid "Error reading response to posted message: message not posted"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:441
+#, fuzzy, c-format
+msgid "Error posting message: %s: message not posted"
+msgstr ""
+"在将邮件保存到 %s 时发生错误:\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:457
+msgid "You cannot post NNTP messages while working offline!"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:468
+#, fuzzy
+msgid "You cannot copy messages from a NNTP folder!"
+msgstr "无法将邮件复制到回收站文件夹"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#, fuzzy
+msgid "Could not get group list from server."
+msgstr "无法启动 wombat 服务器"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#, fuzzy, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+"无法创建输出文件:%s\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#, fuzzy, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+"无法创建输出文件:%s\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-provider.c:43
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:45
+msgid "In the subscription dialog, show relative folder names"
+msgstr ""
#: camel/providers/nntp/camel-nntp-provider.c:52
msgid "USENET news"
@@ -10103,44 +10992,104 @@ msgid ""
"password."
msgstr "该选项将以明文密码向进行 NNTP 服务器进行认证。"
-#: camel/providers/nntp/camel-nntp-store.c:118
-#: camel/providers/nntp/camel-nntp-store.c:1233
-#: camel/providers/nntp/camel-nntp-store.c:1331
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP 命令失败:%s"
-
-#: camel/providers/nntp/camel-nntp-store.c:227
+#: camel/providers/nntp/camel-nntp-store.c:158
#, c-format
msgid "Could not read greeting from %s: %s"
msgstr "无法阅读来自 %s 的欢迎信息:%s"
-#: camel/providers/nntp/camel-nntp-store.c:239
+#: camel/providers/nntp/camel-nntp-store.c:170
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "NNTP 服务器 %s 返回错误码 %d:%s"
-#: camel/providers/nntp/camel-nntp-store.c:403
+#: camel/providers/nntp/camel-nntp-store.c:326
#, c-format
msgid "USENET News via %s"
msgstr "USENET 新闻 %s"
-#: camel/providers/nntp/camel-nntp-store.c:1311
+#: camel/providers/nntp/camel-nntp-store.c:635
+#, fuzzy
+msgid "Stream error"
+msgstr "解析错误"
+
+#: camel/providers/nntp/camel-nntp-store.c:638
+#, fuzzy, c-format
+msgid ""
+"Error retrieving newsgroups:\n"
+"\n"
+"%s"
+msgstr ""
+"打开 %s 出错:\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:730
+msgid ""
+"You cannot subscribe to this newsgroup:\n"
+"\n"
+"No such newsgroup. The selected item is a probably a parent folder."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:762
+msgid ""
+"You cannot unsubscribe to this newsgroup:\n"
+"\n"
+"newsgroup does not exist!"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:787
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:795
+#, fuzzy
+msgid "You cannot rename a folder in a News store."
+msgstr "无法将文件夹 %s 改名为 %s:%s"
+
+#: camel/providers/nntp/camel-nntp-store.c:803
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-summary.c:253
+#, fuzzy, c-format
+msgid "Connection error: %s"
+msgstr "未知的错误:%s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:262
#, c-format
msgid "No such folder: %s"
msgstr "没有文件夹:%s"
-#: camel/providers/nntp/camel-nntp-summary.c:218
-#: camel/providers/nntp/camel-nntp-summary.c:314
+#: camel/providers/nntp/camel-nntp-summary.c:268
+#, fuzzy, c-format
+msgid "Could not get group: %s"
+msgstr "无法创建管道:%s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:333
+#, fuzzy
+msgid "Could not get messages: unspecified error"
+msgstr "无法发送邮件:%s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:378
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP 命令失败:%s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:438
+#: camel/providers/nntp/camel-nntp-summary.c:543
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s:正在扫描新邮件"
-#: camel/providers/nntp/camel-nntp-summary.c:368
+#: camel/providers/nntp/camel-nntp-summary.c:558
+#, fuzzy, c-format
+msgid "Unknown server response: %s"
+msgstr "未知的错误:%s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:605
msgid "Use cancel"
msgstr "使用取消"
-#: camel/providers/nntp/camel-nntp-summary.c:370
+#: camel/providers/nntp/camel-nntp-summary.c:607
#, c-format
msgid "Operation failed: %s"
msgstr "操作失败:%s"
@@ -10253,6 +11202,11 @@ msgstr "无法登录到 POP 服务器 %s:SASL 协议错误"
msgid "Failed to authenticate on POP server %s: %s"
msgstr "认证到 POP 服务器 %s 失败:%s"
+#: camel/providers/pop3/camel-pop3-store.c:480
+#, fuzzy, c-format
+msgid "%sPlease enter the POP password for %s on host %s"
+msgstr "%s请为 %s@%s 输入 IMAP 密码"
+
#: camel/providers/pop3/camel-pop3-store.c:535
#: camel/providers/pop3/camel-pop3-store.c:542
#, c-format
@@ -10325,6 +11279,10 @@ msgstr "通过 sendmail 程序发送邮件"
msgid "SMTP"
msgstr "SMTP"
+#: camel/providers/smtp/camel-smtp-provider.c:39
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr ""
+
#: camel/providers/smtp/camel-smtp-transport.c:174
msgid "Syntax error, command unrecognized"
msgstr "语法错误,无法识别的命令"
@@ -10439,11 +11397,26 @@ msgstr "以安全模式连接 SMTP 服务器 %s 失败:%s"
msgid "server does not appear to support SSL"
msgstr "服务器似乎不支持 SSL"
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "STARTTLS command failed: %s"
+msgstr "IMAP 命令失败:%s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:373
+#, fuzzy
+msgid "STARTTLS command failed"
+msgstr "IMAP 命令失败:%s"
+
#: camel/providers/smtp/camel-smtp-transport.c:476
#, c-format
msgid "SMTP server %s does not support requested authentication type %s."
msgstr "SMTP 服务器 %s 不支持请求的认证类型 %s。"
+#: camel/providers/smtp/camel-smtp-transport.c:514
+#, fuzzy, c-format
+msgid "%sPlease enter the SMTP password for %s on host %s"
+msgstr "%s请为 %s@%s 输入 IMAP 密码"
+
#: camel/providers/smtp/camel-smtp-transport.c:533
#, c-format
msgid ""
@@ -10465,6 +11438,11 @@ msgstr "SMTP 服务器 %s"
msgid "SMTP mail delivery via %s"
msgstr "通过 %s 发送 SMTP 邮件"
+#: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "无法发送邮件:没有定义收件人。"
+
#: camel/providers/smtp/camel-smtp-transport.c:692
msgid "Cannot send message: sender address not valid."
msgstr "无法发送邮件:发件人地址不合法。"
@@ -10485,6 +11463,16 @@ msgstr "无法发送邮件:一个或多个非法收件人"
msgid "SMTP Greeting"
msgstr "SMTP 欢迎"
+#: camel/providers/smtp/camel-smtp-transport.c:943
+#, fuzzy, c-format
+msgid "HELO command failed: %s"
+msgstr "IMAP 命令失败:%s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#, fuzzy
+msgid "HELO command failed"
+msgstr "IMAP 命令失败:%s"
+
#: camel/providers/smtp/camel-smtp-transport.c:1026
msgid "SMTP Authentication"
msgstr "SMTP 认证"
@@ -10493,15 +11481,77 @@ msgstr "SMTP 认证"
msgid "Error creating SASL authentication object."
msgstr "创建 SASL 认证对象错误。"
+#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1060
+#, fuzzy, c-format
+msgid "AUTH command failed: %s"
+msgstr "IMAP 命令失败:%s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1066
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "IMAP 命令失败:%s"
+
#: camel/providers/smtp/camel-smtp-transport.c:1128
msgid "Bad authentication response from server.\n"
msgstr "来自服务器的错误认证应答。\n"
+#: camel/providers/smtp/camel-smtp-transport.c:1153
+#, fuzzy, c-format
+msgid "MAIL FROM command failed: %s: mail not sent"
+msgstr "IMAP 命令失败:%s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+#, fuzzy
+msgid "MAIL FROM command failed"
+msgstr "IMAP 命令失败:%s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1194
+#, fuzzy, c-format
+msgid "RCPT TO command failed: %s: mail not sent"
+msgstr "无法创建 sendmail 进程:%s:邮件未发送"
+
#: camel/providers/smtp/camel-smtp-transport.c:1213
#, c-format
msgid "RCPT TO <%s> failed"
msgstr "RCPT TO <%s> 失败"
+#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1310
+#: camel/providers/smtp/camel-smtp-transport.c:1329
+#, fuzzy, c-format
+msgid "DATA command failed: %s: mail not sent"
+msgstr "IMAP 命令失败:%s"
+
+#. we should have gotten instructions on how to use the DATA command:
+#. * 354 Enter mail, end with "." on a line by itself
+#.
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+#, fuzzy
+msgid "DATA command failed"
+msgstr "IMAP 命令失败:%s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "IMAP 命令失败:%s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1384
+#, fuzzy
+msgid "RSET command failed"
+msgstr "IMAP 命令失败:%s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1407
+#, fuzzy, c-format
+msgid "QUIT command failed: %s"
+msgstr "IMAP 命令失败:%s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+#, fuzzy
+msgid "QUIT command failed"
+msgstr "IMAP 命令失败:%s"
+
#: composer/e-msg-composer-attachment-bar.c:106
#, c-format
msgid "%.0fK"
@@ -10561,10 +11611,32 @@ msgstr "MIME 类型:"
msgid "Suggest automatic display of attachment"
msgstr "建议自动显示附件"
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "当使用该账户时总是发送签名邮件(_S)"
+
+#: 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
+#, fuzzy
+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
+#, fuzzy
+msgid "Untitled Message"
+msgstr "多封邮件"
+
#: composer/e-msg-composer.c:1591
msgid "Open file"
msgstr "打开文件"
@@ -10634,6 +11706,11 @@ msgstr "<b>(编写器含有不可编辑的非文本邮件体。)<b>"
msgid "Posting destination"
msgstr "投递目的"
+#: composer/e-msg-composer-hdrs.c:513
+#, fuzzy
+msgid "Choose folders to post the message to."
+msgstr "把文件附件到邮件"
+
#: composer/e-msg-composer-hdrs.c:547
msgid "Click here for the address book"
msgstr "点击此处以使用地址簿"
@@ -10696,27 +11773,142 @@ msgstr "输入将接收该邮件副本,但不出现在收件人列表中的收
msgid "Post To:"
msgstr "投递到:"
+#: composer/e-msg-composer-hdrs.c:619
+#, fuzzy
+msgid "Click here to select folders to post to"
+msgstr "<点击这里以便选择文件夹>"
+
#: composer/e-msg-composer-select-file.c:127
msgid "Attach file(s)"
msgstr "添加附件"
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+#, fuzzy
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "把文件附件到邮件"
+
#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
+#: composer/mail-composer-errors.xml.h:4
+#, fuzzy
+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."
+msgstr ""
+
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
+msgstr ""
+
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Unfinished messages found"
+msgstr "下一封未读邮件"
+
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+msgid "Do you want to recover unfinished messages?"
+msgstr ""
+
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.h:17
+#, fuzzy
+msgid "Don't Recover"
+msgstr "不删除"
+
+#: composer/mail-composer-errors.xml.h:18
+#, fuzzy
+msgid "Recover"
+msgstr "删除"
+
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
+#, fuzzy
+msgid "Could not save to autosave file \"{0}\"."
+msgstr "无法保存到文件“{0}”。"
+
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+msgid "Error saving to autosave because \"{1}\"."
+msgstr ""
+
#. mail-composer:exit-unsaved title
#: composer/mail-composer-errors.xml.h:24
msgid "Warning: Modified Message"
msgstr "警告:已改动的邮件"
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
+#, fuzzy
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "您确信您要删除该账户吗?"
+
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.h:29
+#, fuzzy
+msgid "Discard Changes"
+msgstr "丢弃更改(_D)"
+
+#: composer/mail-composer-errors.xml.h:30
+#, fuzzy
+msgid "Save Message"
+msgstr "保存邮件..."
+
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "无法创建管道:%s"
+
+#. mail-composer:no-build-message secondary
+#: composer/mail-composer-errors.xml.h:34
+msgid "Because \"${0}\", you may need to select different mail options."
+msgstr ""
+
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
+#, fuzzy
+msgid "Could not read signature file \"{0}\"."
+msgstr "无法保存文件“{0}”。"
+
#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
+#: composer/mail-composer-errors.xml.h:38
+#, fuzzy
+msgid "Because \"${1}\"."
msgstr "原因是“{1}”。"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
+
#. mail-composer:all-accounts-deleted secondary
#: composer/mail-composer-errors.xml.h:42
msgid "You need to configure an account before you can compose mail."
@@ -10868,12 +12060,16 @@ 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"
@@ -10925,23 +12121,31 @@ 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"
@@ -11031,10 +12235,17 @@ 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 "您必须指定文件名。"
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+#, fuzzy
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "“%s”并不是普通文件。"
+
#. filter:no-folder primary
#: filter/filter-errors.xml.h:14
msgid "Missing folder."
@@ -11050,7 +12261,14 @@ msgstr "您必须指定文件夹。"
msgid "Bad regular expression \"{0}\"."
msgstr "无效的正规表达式“{0}”。"
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+#, fuzzy
+msgid "Could not compile regular expression \"{1}\"."
+msgstr "无效的正规表达式“{0}”。"
+
#. filter:no-name primary
+#. filter:no-name-vfolder primary
#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
msgid "Missing name."
msgstr "缺少名称。"
@@ -11080,6 +12298,14 @@ msgstr "请另选一个名称。"
msgid "No sources selected."
msgstr "没有选定来源。"
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
#: filter/filter-file.c:288
msgid "Choose a file"
msgstr "选择文件"
@@ -11217,6 +12443,25 @@ msgstr "如果满足任一条件"
msgid "Execute actions"
msgstr "执行动作"
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "被委任的"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "回复"
+
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr ""
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "包含远程测试(_N)"
+
#: filter/filter-rule.c:974
msgid "incoming"
msgstr "接收"
@@ -11282,6 +12527,11 @@ msgstr "主题不含有"
msgid "Virtual _Folders"
msgstr "虚拟文件夹(_F)"
+#: filter/vfolder-rule.c:493
+#, fuzzy
+msgid "_Add"
+msgstr "添加(_D)"
+
#: filter/vfolder-rule.c:573
msgid "VFolder source"
msgstr "虚拟文件夹来源"
@@ -11320,13 +12570,13 @@ msgstr "签名"
msgid "-------- Forwarded Message --------"
msgstr "-------- 转发的邮件 --------"
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1499
msgid "an unknown sender"
msgstr "未知的发件人"
#. translators: attribution string used when quoting messages,
#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1505
+#: mail/em-composer-utils.c:1509
msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
msgstr "在%Y年%m月%d日的%H:%M,%%s写道:"
@@ -11364,12 +12614,17 @@ msgstr "<点击这里以便选择文件夹>"
msgid "Create New Folder"
msgstr "创建新文件夹"
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2263
+#: mail/mail-component.c:692
#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
msgid "Specify where to create the folder:"
msgstr "指定在哪里创建文件夹:"
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "创建文件夹"
+
#: mail/em-folder-selector.c:303
#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
msgid "Folder _name:"
@@ -11407,8 +12662,8 @@ msgstr "复制到文件夹(_C)"
msgid "_Move to Folder"
msgstr "移动到文件夹(_M)"
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2050
+#: mail/em-folder-tree.c:2531 mail/em-folder-view.c:798
#: mail/message-list.c:1651
msgid "_Move"
msgstr "移动(_M)"
@@ -11417,55 +12672,55 @@ msgstr "移动(_M)"
msgid "Cancel _Drag"
msgstr "取消拖曳(_D)"
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2037 mail/em-folder-tree.c:2050
#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
#: mail/importers/evolution-mbox-importer.c:119
#: mail/importers/evolution-outlook-importer.c:133
msgid "Select folder"
msgstr "选择文件夹"
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2037 mail/em-folder-view.c:812
msgid "C_opy"
msgstr "复制(_O)"
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2077
#, c-format
msgid "Creating folder `%s'"
msgstr "创建文件夹“%s”"
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2263 mail/mail-component.c:692
msgid "Create folder"
msgstr "创建文件夹"
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2452
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "把文件夹“%s”重命名为:"
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2454
msgid "Rename Folder"
msgstr "重命名文件夹"
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2525 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
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
msgid "_View"
msgstr "查看(_V)"
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2526
msgid "Open in _New Window"
msgstr "在新窗口中打开(_N)"
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2535
msgid "_New Folder..."
msgstr "新建文件夹(_N)..."
-#: mail/em-folder-tree.c:2549
+#: mail/em-folder-tree.c:2538
msgid "_Rename"
msgstr "重命名(_R)"
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2541 ui/evolution-mail-list.xml.h:27
msgid "_Properties..."
msgstr "属性(_P)..."
@@ -11474,6 +12729,11 @@ msgstr "属性(_P)..."
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"
@@ -11485,8 +12745,8 @@ 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:508
-#: mail/mail-component.c:554
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:496
+#: mail/mail-component.c:542
msgid "Mail"
msgstr "邮件"
@@ -11666,7 +12926,7 @@ msgstr "密件抄送"
#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1079
msgid "Subject"
msgstr "主题"
@@ -11675,15 +12935,44 @@ msgstr "主题"
msgid "Date"
msgstr "日期"
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
+#, fuzzy
+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
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "无法解析 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
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "不支持的安全层。"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "修改卡片错误"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "无法校验叶子签名"
+
#: mail/em-format-html.c:452 mail/em-format-html.c:454
#, c-format
msgid "Retrieving `%s'"
@@ -11701,6 +12990,30 @@ msgstr "有效签名"
msgid "Invalid signature"
msgstr "无效签名"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#, fuzzy
+msgid "Unencrypted"
+msgstr "未定义"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+#, fuzzy
+msgid "Encrypted, weak"
+msgstr "加密内容"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP 加密"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "加密内容"
+
#: mail/em-format-html.c:820
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
@@ -11740,12 +13053,92 @@ msgstr "格式化邮件"
msgid "Mailer"
msgstr "邮件程序"
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+msgid "<I> (%a, %R %Z)</I>"
+msgstr ""
+
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1553
+msgid "<I> (%R %Z)</I>"
+msgstr ""
+
#. 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
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr "input_token 包含无效的签名,或者无法验证签名。"
+
+#: mail/em-format-html-display.c:653
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"The Internet."
+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-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-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."
+msgstr ""
+
+#: mail/em-format-html-display.c:757
+#, fuzzy
+msgid "_View Certificate"
+msgstr "证书"
+
+#: mail/em-format-html-display.c:772
+#, fuzzy
+msgid "This certificate is not viewable"
+msgstr "证书未生效"
+
+#: mail/em-format-html-display.c:1007
+#, fuzzy
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "到 %m月%d日%A,%H:%M"
+
#: mail/em-format-html-display.c:1015
msgid "Overdue:"
msgstr "延误:"
@@ -11767,6 +13160,91 @@ msgstr "隐藏(_H)"
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
+#: mail/em-junk-filter.c:86
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:100
+#, fuzzy
+msgid "Every time"
+msgstr "每 %d 年"
+
+#: mail/em-mailer-prefs.c:101
+msgid "Once per day"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:102
+#, fuzzy
+msgid "Once per week"
+msgstr "每 %d 周"
+
+#: mail/em-mailer-prefs.c:103
+#, fuzzy
+msgid "Once per month"
+msgstr "每 %d 月"
+
+#: mail/em-migrate.c:1168
+#, fuzzy
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution 任务文件夹的位置和层次与 Evolution 1.x 不同。\n"
+"\n"
+"请稍候,Evolution 正在升迁您的文件夹..."
+
+#: mail/em-migrate.c:1602
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr ""
+"无法创建输出文件:%s\n"
+" %s"
+
+#: mail/em-migrate.c:1628
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "无法将文件夹 %s 改名为 %s:%s"
+
+#: mail/em-migrate.c:1811
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2015
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "认证到 POP 服务器 %s 失败:%s"
+
+#: mail/em-migrate.c:2029
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "无法创建目录“%s”:%s"
+
+#: mail/em-migrate.c:2058
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "创建到“%s”的管道失败:%s"
+
+#: mail/em-migrate.c:2576
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"无法创建输出文件:%s\n"
+" %s"
+
+#: mail/em-migrate.c:2594
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
#: mail/em-popup.c:700
msgid "Save As..."
msgstr "另存为..."
@@ -11848,10 +13326,324 @@ msgstr "添加地址"
msgid "Messages from %s"
msgstr "来自 %s 的邮件"
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:3
+#, fuzzy
+msgid "Check incoming mail being junk"
+msgstr "检查收到的邮件是否是垃圾邮件(_I)"
+
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight color"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight color."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
+msgid "Composer Window default height"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "邮件的默认主题。"
+
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "邮件的默认主题。"
+
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "在显示邮件的邮件体中搜索文本"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "在显示邮件的邮件体中搜索文本"
+
#: mail/evolution-mail.schemas.in.in.h:12
msgid "Default forward style"
msgstr "默认转发方式"
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "文件夹栏面板的默认宽度"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Default height of the Message Window"
+msgstr "邮件的默认主题。"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Default height of the Subscribe dialog"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default reply style"
+msgstr "默认转发方式"
+
+#: mail/evolution-mail.schemas.in.in.h:17
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "文件夹栏面板的默认宽度"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+#, fuzzy
+msgid "Default width of the Message Window"
+msgstr "文件夹栏面板的默认宽度"
+
+#: mail/evolution-mail.schemas.in.in.h:19
+#, fuzzy
+msgid "Default width of the Subscribe dialog"
+msgstr "文件夹栏面板的默认宽度"
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "退出时清空已删除邮件(_X)"
+
+#: mail/evolution-mail.schemas.in.in.h:22
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "退出时清空已删除邮件(_X)"
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "List of Labels and their associated colors"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "List of accepted licenses"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "邮件账户"
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "List of custom headers and whether they are enabled."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+#, fuzzy
+msgid "Log filter actions"
+msgstr "执行动作"
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+#, fuzzy
+msgid "Logfile to log filter actions."
+msgstr "装入过滤规则信息错误。"
+
+#: mail/evolution-mail.schemas.in.in.h:43
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:44
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+#, fuzzy
+msgid "Message Window default height"
+msgstr "默认窗口高度"
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Message Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:52
+msgid "New Mail Notify sound file"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "新建邮件文件夹"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:57
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "发送只有暗送收件人的邮件时提示(_O)"
+
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:62
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "发送 HTML 邮件吗?"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "发送 HTML 邮件吗?"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+#, fuzzy
+msgid "Show Animations"
+msgstr "显示动画图像(_S)"
+
+#: mail/evolution-mail.schemas.in.in.h:68
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "显示动画图像(_S)"
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "以普通样式显示邮件"
+
#: mail/evolution-mail.schemas.in.in.h:71
msgid "Show the \"Preview\" pane"
msgstr "显示“预览”面板"
@@ -11860,10 +13652,164 @@ msgstr "显示“预览”面板"
msgid "Show the \"Preview\" pane."
msgstr "显示“预览”面板。"
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "新邮件到达时播放声音文件(_V)"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+#, fuzzy
+msgid "Spell check inline"
+msgstr "拼写检查"
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default height"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
#: mail/evolution-mail.schemas.in.in.h:78
msgid "Terminal font"
msgstr "终端字体"
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "选择用于打印的 HTML 变宽度字体"
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+#, fuzzy
+msgid "Thread the message list."
+msgstr "按线索编排的邮件列表"
+
+#: mail/evolution-mail.schemas.in.in.h:84
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "按线索编排的邮件列表"
+
+#: mail/evolution-mail.schemas.in.in.h:85
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:86
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:87
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:88
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "使它成为我的默认账户(_M)"
+
+#: mail/evolution-mail.schemas.in.in.h:89
+msgid "Use Spamasssassin daemon and client"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:90
+msgid "Use Spamasssassin daemon and client (spamc/spamd)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:91
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:92
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:93
+msgid "Use only local spam tests."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:94
+msgid "Use only the local spam tests (no DNS)."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:95
+#, fuzzy
+msgid "Variable width font"
+msgstr "变宽(_A):"
+
+#: mail/evolution-mail.schemas.in.in.h:96
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:97
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:98
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:99
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:100
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:101
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:102
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:103
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:104
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:105
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:106
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:107
+msgid "port for starting user runned spamd"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:108
+#, fuzzy
+msgid "spamd port"
+msgstr "导入"
+
#: mail/GNOME_Evolution_Mail.server.in.in.h:1
msgid "*Control*F1"
msgstr "*Control*F1"
@@ -12114,6 +14060,15 @@ msgstr "Pine"
msgid "Evolution Account Editor"
msgstr "Evolution 账户编辑器"
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+msgstr ""
+
#: mail/mail-account-gui.c:252
#, c-format
msgid "%s License Agreement"
@@ -12155,66 +14110,66 @@ msgstr "%s 邮件列表"
msgid "Add Filter Rule"
msgstr "添加过滤规则"
-#: mail/mail-component.c:461
+#: mail/mail-component.c:449
#, c-format
msgid "%d deleted"
msgstr "%d 封已删除"
-#: mail/mail-component.c:463
+#: mail/mail-component.c:451
#, c-format
msgid "%d junk"
msgstr "%d 封垃圾"
-#: mail/mail-component.c:486
+#: mail/mail-component.c:474
#, c-format
msgid "%d drafts"
msgstr "%d 封草稿"
-#: mail/mail-component.c:488
+#: mail/mail-component.c:476
#, c-format
msgid "%d sent"
msgstr "%d 已发"
-#: mail/mail-component.c:490
+#: mail/mail-component.c:478
#, c-format
msgid "%d unsent"
msgstr "%d 封未发"
-#: mail/mail-component.c:494
+#: mail/mail-component.c:482
#, c-format
msgid "%d total"
msgstr "总共 %d 封"
-#: mail/mail-component.c:496
+#: mail/mail-component.c:484
#, c-format
msgid ", %d unread"
msgstr ",%d 封未读"
-#: mail/mail-component.c:656
+#: mail/mail-component.c:644
msgid "New Mail Message"
msgstr "新建邮件"
-#: mail/mail-component.c:657
+#: mail/mail-component.c:645
msgid "_Mail Message"
msgstr "邮件(_M)"
-#: mail/mail-component.c:658
+#: mail/mail-component.c:646
msgid "Compose a new mail message"
msgstr "撰写一封新邮件"
-#: mail/mail-component.c:664
+#: mail/mail-component.c:652
msgid "New Mail Folder"
msgstr "新建邮件文件夹"
-#: mail/mail-component.c:665
+#: mail/mail-component.c:653
msgid "Mail _Folder"
msgstr "邮件文件夹(_F)"
-#: mail/mail-component.c:666
+#: mail/mail-component.c:654
msgid "Create a new mail folder"
msgstr "创建新邮件文件夹"
-#: mail/mail-component.c:798
+#: mail/mail-component.c:786
msgid "Failed upgrading Mail settings or folders."
msgstr "升级邮件设置或文件夹失败。"
@@ -12491,6 +14446,11 @@ msgstr "检查收到的邮件是否是垃圾邮件(_I)"
msgid "Check spelling while I _type"
msgstr "在我输入时进行拼写检查(_T)"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Checks incoming mail messages to be Junk"
+msgstr "检查收到的邮件是否是垃圾邮件(_I)"
+
#: mail/mail-config.glade.h:58
msgid "Color for _misspelled words:"
msgstr "给错误拼写的单词上色(_M):"
@@ -12876,23 +14836,171 @@ msgstr "描述"
msgid "Invalid authentication"
msgstr "无效的身份验证"
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP 服务器 %s 不支持请求的认证类型 %s。"
+
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
+#, fuzzy
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "您确定您想要删除此 URL 吗?"
+
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+
#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
msgid "_Send"
msgstr "发送(_S)"
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
+#, fuzzy
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "您确定要删除此联系人吗?"
+
+#. mail:ask-send-no-subject secondary
+#: mail/mail-errors.xml.h:19
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+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
+#, fuzzy
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "您确定要删除这些联系人吗?"
+
+#. mail:ask-send-only-bcc-contact secondary
+#: mail/mail-errors.xml.h:24
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
+msgstr ""
+
+#. mail:ask-send-only-bcc secondary
+#: mail/mail-errors.xml.h:31
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+
+#. mail:send-no-recipients primary
+#: mail/mail-errors.xml.h:34
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
+msgstr ""
+
+#. mail:send-no-recipients secondary
+#: mail/mail-errors.xml.h:36
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+msgid "Use default drafts folder?"
+msgstr ""
+
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+
#: mail/mail-errors.xml.h:41
msgid "Use _Default"
msgstr "使用默认值(_D)"
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
+#, fuzzy
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+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 ""
+
#: mail/mail-errors.xml.h:46
msgid "_Expunge"
msgstr "销毁(_E)"
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
+#, fuzzy
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "永久删除所有文件夹中的所有已删除的邮件"
+
#: mail/mail-errors.xml.h:51
msgid "_Empty Trash"
msgstr "清空回收站(_E)"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#. mail:exit-unsaved secondary
+#: mail/mail-errors.xml.h:55
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message with the subject \"{0}\" was not delivered."
+msgstr ""
+
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
+msgid ""
+"The message was sent via the \"sendmail\" external application. Sendmail "
+"reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder. Check the message for errors "
+"and resend."
+msgstr ""
+
#. mail:async-error primary
#: mail/mail-errors.xml.h:62
msgid "Error while {0}."
@@ -12914,6 +15022,13 @@ 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
@@ -12931,22 +15046,168 @@ msgstr "输入密码。"
msgid "Error loading filter definitions."
msgstr "装入过滤规则信息错误。"
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
+msgstr "无法保存到文件“{0}”。"
+
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
#. 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}\"."
msgstr "无法保存到文件“{0}”。"
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "无法创建目录“%s”:%s"
+
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+msgid "Cannot create temporary save directory."
+msgstr "无法创建目录“%s”:%s"
+
+#. mail:no-create-tmp-path secondary
+#. mail:no-delete-folder secondary
+#. system:no-save-file secondary
+#. system:no-load-file secondary
+#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
+#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "原因是“{1}”。"
+
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
+#, fuzzy
+msgid "File exists but cannot overwrite it."
+msgstr ""
+"%s 已经存在\n"
+"您打算覆盖它吗?"
+
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+#, fuzzy
+msgid "File exists but is not a regular file."
+msgstr "“%s”并不是普通文件。"
+
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr "无法保存文件“{0}”。"
+
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+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 "
+"cannot be renamed, moved, or deleted."
+msgstr ""
+
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "无法保存到文件“{0}”。"
+
#. mail:ask-delete-folder title
#: mail/mail-errors.xml.h:122
msgid "Delete \"{0}\"?"
msgstr "删除“{0}”吗?"
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "父文件夹不允许含有子文件夹"
+
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+
+#. mail:no-rename-folder-exists primary
+#. mail:no-rename-folder primary
+#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "无法保存到文件“{0}”。"
+
+#. 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 ""
+
#. mail:no-rename-folder secondary
#: mail/mail-errors.xml.h:134
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
+#, fuzzy
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "无法打开文件“{0}”。"
+
+#. mail:no-move-folder-nostore secondary
+#. mail:no-copy-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "无法打开文件“{0}”。"
+
+#. 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
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
+msgstr "无法打开文件“{0}”。"
+
+#. 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
+#, fuzzy
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "无法打开文件“{0}”。"
+
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "无法保存文件“{0}”。"
+
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "无法打开文件“{0}”。"
+
+#. 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 ""
+
#. mail:account-incomplete secondary
#: mail/mail-errors.xml.h:158
msgid "You have not filled in all of the required information."
@@ -12967,15 +15228,37 @@ msgstr "删除账户吗?"
msgid "Are you sure you want to delete this account?"
msgstr "您确信您要删除该账户吗?"
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr ""
+
#: mail/mail-errors.xml.h:169
msgid "Don't delete"
msgstr "不要删除"
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+#, fuzzy
+msgid "Could not save signature file."
+msgstr "证书签名失败"
+
#. mail:no-save-signature secondary
#: mail/mail-errors.xml.h:173
msgid "Because \"{0}\"."
msgstr "原因是“{0}”。"
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "无法保存文件“{0}”。"
+
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
+msgstr ""
+
#. mail:ask-signature-changed title
#: mail/mail-errors.xml.h:179
msgid "Discard changed?"
@@ -12986,10 +15269,78 @@ msgstr "丢弃更改吗?"
msgid "Do you wish to save your changes?"
msgstr "您希望保存更改吗?"
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+
#: mail/mail-errors.xml.h:184
msgid "_Discard changes"
msgstr "丢弃更改(_D)"
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+#, fuzzy
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "文件夹“%s”不存在。"
+
+#. mail:vfolder-notexist secondary
+#: mail/mail-errors.xml.h:188
+msgid ""
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
+msgstr ""
+
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+#, fuzzy
+msgid "Cannot add vFolder \"{0}\"."
+msgstr "无法保存文件“{0}”。"
+
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
+
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+" \"{1}\"\n"
+"And have been updated."
+msgstr ""
+
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
+
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+" \"{1}\"\n"
+"And have been updated."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr ""
+
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:212
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
+msgstr ""
+
#: mail/mail-errors.xml.h:216
msgid "Ignore"
msgstr "忽略"
@@ -13039,6 +15390,11 @@ msgstr "追加到本地“已发”文件夹失败:%s"
msgid "Sending message %d of %d"
msgstr "发送第 %d 个邮件,共 %d 个"
+#: mail/mail-ops.c:703
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "在第%d封邮件失败,共%d封"
+
#: mail/mail-ops.c:707
msgid "Complete."
msgstr "完成。"
@@ -13086,6 +15442,11 @@ msgstr "删除文件夹“%s”"
msgid "Storing folder '%s'"
msgstr "存储文件夹“%s”"
+#: mail/mail-ops.c:1467
+#, fuzzy, c-format
+msgid "Expunging and storing account '%s'"
+msgstr "存储账户“%s”"
+
#: mail/mail-ops.c:1468
#, c-format
msgid "Storing account '%s'"
@@ -13263,6 +15624,16 @@ msgstr "输入该签名的名字。"
msgid "Name:"
msgstr "名称:"
+#: mail/mail-tools.c:114
+#, fuzzy, c-format
+msgid "Could not create spool directory `%s': %s"
+msgstr "无法创建目录 %s:%s"
+
+#: mail/mail-tools.c:141
+#, c-format
+msgid "Trying to movemail a non-mbox source `%s'"
+msgstr ""
+
#: mail/mail-tools.c:276
#, c-format
msgid "Forwarded message - %s"
@@ -13500,48 +15871,67 @@ msgstr "默认窗口宽度"
msgid "Evolution configuration version"
msgstr "Evolution 配置版本"
-#: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Toolbar is visible"
-msgstr "工具栏可见"
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "默认让附件只能嵌入显示。"
-#: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether Evolution should start up in offline mode"
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid ""
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
msgstr "Evolution 是否要以脱机模式启动"
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Whether the toolbar should be visible."
-msgstr "工具栏是否可见。"
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:13
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Whether Evolution should start up in offline mode"
+msgstr "Evolution 是否要以脱机模式启动"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
msgid "Whether to skip the development warning dialog"
msgstr "是否跳过开发警告对话框"
-#: shell/apps_evolution_shell.schemas.in.in.h:14
+#: shell/apps_evolution_shell.schemas.in.in.h:12
msgid "mail"
msgstr "邮件"
-#: shell/e-shell.c:588 shell/e-shell.c:589
+#: shell/e-shell-about-box.c:45
+msgid "Brought to you by"
+msgstr ""
+
+#: shell/e-shell.c:579 shell/e-shell.c:580
#, c-format
msgid "%ld KB"
msgstr "%ld KB"
-#: shell/e-shell.c:786
+#: shell/e-shell.c:777
msgid "Uknown system error."
msgstr "未知的系统错误。"
-#: shell/e-shell.c:1143
+#: shell/e-shell.c:1134
msgid "Invalid arguments"
msgstr "无效参数"
-#: shell/e-shell.c:1145
+#: shell/e-shell.c:1136
msgid "Cannot register on OAF"
msgstr "无法注册到 OAF"
-#: shell/e-shell.c:1147
+#: shell/e-shell.c:1138
msgid "Configuration Database not found"
msgstr "找不到配置数据库"
-#: shell/e-shell.c:1149
+#: shell/e-shell.c:1140
msgid "Generic error"
msgstr "通用错误"
@@ -13597,7 +15987,7 @@ msgstr ""
msgid "Select importer"
msgstr "选择导入器"
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1027
#, c-format
msgid "File %s does not exist"
msgstr "文件 %s 不存在"
@@ -13625,31 +16015,31 @@ msgstr ""
"导入 %s\n"
"导入第1项。"
-#: shell/e-shell-importer.c:570
+#: shell/e-shell-importer.c:549
msgid "Automatic"
msgstr "自动"
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:598
msgid "F_ilename:"
msgstr "文件名(_I):"
-#: shell/e-shell-importer.c:631
+#: shell/e-shell-importer.c:603
msgid "Select a file"
msgstr "选择一个文件"
-#: shell/e-shell-importer.c:642
+#: shell/e-shell-importer.c:614
msgid "File _type:"
msgstr "文件类型(_T):"
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:653
msgid "Import data and settings from _older programs"
msgstr "从老版程序中导入数据和设置(_O)"
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:656
msgid "Import a _single file"
msgstr "导入单个文件(_S)"
-#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:571
msgid ""
"Please wait...\n"
"Scanning for existing setups"
@@ -13657,25 +16047,25 @@ msgstr ""
"请稍候...\n"
"正在扫描现有设置"
-#: shell/e-shell-importer.c:756
+#: shell/e-shell-importer.c:728
msgid "Starting Intelligent Importers"
msgstr "启动智能导入器"
-#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:854 shell/e-shell-startup-wizard.c:698
#, c-format
msgid "From %s:"
msgstr "从 %s:"
-#: shell/e-shell-importer.c:1073
+#: shell/e-shell-importer.c:1045
#, c-format
msgid "No importer available for file %s"
msgstr "没有可供文件 %s 使用的导入器"
-#: shell/e-shell-importer.c:1085
+#: shell/e-shell-importer.c:1057
msgid "Unable to execute importer"
msgstr "无法执行导入器"
-#: shell/e-shell-importer.c:1199
+#: shell/e-shell-importer.c:1170
msgid "_Import"
msgstr "导入(_I)"
@@ -13691,6 +16081,15 @@ msgstr "Evolution 设置"
msgid "Starting import"
msgstr "开始导入"
+#: shell/e-shell-startup-wizard.c:795
+msgid ""
+"If you quit the Evolution Setup Assistant now, all of the information that "
+"you have entered will be forgotten. You will need to run this assistant "
+"again before using Evolution.\n"
+"\n"
+"Do you want to quit using the Assistant now?"
+msgstr ""
+
#: shell/e-shell-utils.c:116
msgid "No folder name specified."
msgstr "没有指定文件夹名称。"
@@ -13711,53 +16110,54 @@ msgstr "文件夹名不能含有字符“#”。"
msgid "'.' and '..' are reserved folder names."
msgstr "“.”和“..”是保留文件夹名。"
-#: shell/e-shell-window.c:337
+#: shell/e-shell-window.c:336
msgid "Evolution is currently online. Click on this button to work offline."
msgstr "Evolution 目前联机。点击该按钮可脱机工作。"
-#: shell/e-shell-window.c:344
+#: shell/e-shell-window.c:343
msgid "Evolution is in the process of going offline."
msgstr "Evolution 正在脱机过程中。"
-#: shell/e-shell-window.c:350
+#: shell/e-shell-window.c:349
msgid "Evolution is currently offline. Click on this button to work online."
msgstr "Evolution 目前脱机。点击该按钮可在线工作。"
-#: shell/e-shell-window.c:637
+#: shell/e-shell-window.c:621
#, c-format
msgid "Switch to %s"
msgstr "切换到 %s"
-#: shell/e-shell-window-commands.c:66
+#: shell/e-shell-window-commands.c:64
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr "GNOME Pilot 工具好像并未安装到系统中。"
-#: shell/e-shell-window-commands.c:74
+#: shell/e-shell-window-commands.c:72
#, c-format
msgid "Error executing %s."
msgstr "执行 %s 错误。"
-#: shell/e-shell-window-commands.c:123
+#: shell/e-shell-window-commands.c:121
msgid "Bug buddy is not installed."
msgstr "未安装 Bug buddy。"
-#: shell/e-shell-window-commands.c:131
+#: shell/e-shell-window-commands.c:129
msgid "Bug buddy could not be run."
msgstr "无法运行 Bug buddy。"
-#: shell/e-shell-window-commands.c:323
-msgid "Groupware Suite"
-msgstr "Groupwise 套件"
+#: shell/e-shell-window-commands.c:171
+#, fuzzy
+msgid "About Evolution"
+msgstr "关于 Evolution..."
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:382
msgid "_Work Online"
msgstr "联机工作(_W)"
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
msgid "_Work Offline"
msgstr "脱机工作(_W)"
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
msgid "Work Offline"
msgstr "脱机工作"
@@ -13999,6 +16399,10 @@ msgstr "以联机模式启动"
msgid "Forcibly shut down all evolution components"
msgstr "强制关闭所有 Evolution 组件"
+#: shell/main.c:507
+msgid "Forcibly re-migrate from Evolution 1.4"
+msgstr ""
+
#: shell/main.c:510
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
@@ -14021,16 +16425,44 @@ msgstr ""
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
msgid "Continue"
msgstr "继续"
#. shell:noshell title
+#. shell:noshell-reason title
#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
msgid "Cannot start Evolution"
msgstr "无法启动 Evolution"
#. shell:noshell primary
+#. shell:noshell-reason primary
#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
msgid "Evolution can not start."
msgstr "Evolution 无法启动。"
@@ -14046,30 +16478,44 @@ msgstr ""
"\n"
"请单击帮助以查看细节"
-#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
-#: smime/gui/certificate-manager.c:556
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+#, fuzzy
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+"您的系统配置与您的 Evolution 配置不相符。\n"
+"\n"
+"请单击帮助以查看细节"
+
+#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
+#: smime/gui/certificate-manager.c:522
msgid "Select a cert to import..."
msgstr "选择要导入的证书..."
-#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
-#: smime/gui/certificate-manager.c:638
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:604
msgid "Certificate Name"
msgstr "证书名称"
-#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
msgid "Purposes"
msgstr "用途"
-#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:569
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
msgid "Serial Number"
msgstr "序列号"
-#: smime/gui/certificate-manager.c:271
+#: smime/gui/certificate-manager.c:267
msgid "Expires"
msgstr "到期"
-#: smime/gui/certificate-manager.c:446
+#: smime/gui/certificate-manager.c:417
msgid "E-Mail Address"
msgstr "电子邮件地址"
@@ -14092,6 +16538,21 @@ msgstr "输入证书数据库的新密码"
msgid "Enter new password"
msgstr "输入新密码"
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:121
+#, c-format
+msgid ""
+"Issued to:\n"
+" Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:122
+#, c-format
+msgid ""
+"Issued by:\n"
+" Subject: %s\n"
+msgstr ""
+
#: smime/gui/e-cert-selector.c:169
msgid "Select certificate"
msgstr "选择证书"
@@ -14124,6 +16585,10 @@ msgstr "<b>颁发者</b>"
msgid "<b>Issued To</b>"
msgstr "<b>颁发给</b>"
+#: smime/gui/smime-ui.glade.h:8
+msgid "<b>This certificate has been verified for the following uses:</b>"
+msgstr ""
+
#: smime/gui/smime-ui.glade.h:9
msgid "<b>Validity</b>"
msgstr "<b>有效性</b>"
@@ -14140,7 +16605,13 @@ msgstr "备份"
msgid "Backup All"
msgstr "全部备份"
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
+#: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
msgid "Certificate"
msgstr "证书"
@@ -14160,10 +16631,44 @@ msgstr "通用名(CN)"
msgid "Contact Certificates"
msgstr "联系人证书"
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
msgid "Edit"
msgstr "编辑"
+#: smime/gui/smime-ui.glade.h:24
+#, fuzzy
+msgid "Email Recipient Certificate"
+msgstr "选择证书"
+
+#: smime/gui/smime-ui.glade.h:25
+#, fuzzy
+msgid "Email Signer Certificate"
+msgstr "签名证书(_G):"
+
+#: smime/gui/smime-ui.glade.h:26
+#, fuzzy
+msgid "Expires On"
+msgstr "到期"
+
+#: smime/gui/smime-ui.glade.h:29
+#, fuzzy
+msgid "Issued On"
+msgstr "发行者"
+
+#: smime/gui/smime-ui.glade.h:30
+#, fuzzy
+msgid "MD5 Fingerprint"
+msgstr "<b>指纹</b>"
+
#: smime/gui/smime-ui.glade.h:31
msgid "Organization (O)"
msgstr "组织(O)"
@@ -14172,120 +16677,263 @@ msgstr "组织(O)"
msgid "Organizational Unit (OU)"
msgstr "组织单元(OU)"
-#: smime/gui/smime-ui.glade.h:41
+#: smime/gui/smime-ui.glade.h:33
+#, fuzzy
+msgid "SHA1 Fingerprint"
+msgstr "<b>指纹</b>"
+
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#, fuzzy
+msgid "SSL Client Certificate"
+msgstr "选择证书"
+
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#, fuzzy
+msgid "SSL Server Certificate"
+msgstr "选择证书"
+
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
msgid "View"
msgstr "查看"
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "证书"
+
+#: smime/gui/smime-ui.glade.h:42
+#, fuzzy
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr "无效的证书颁发机构(CA)"
+
+#: smime/gui/smime-ui.glade.h:43
+msgid "You have certificates from these organizations that identify you:"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:44
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
+msgstr ""
+
#: smime/gui/smime-ui.glade.h:45
+msgid "You have certificates on file that identify these people:"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:46
msgid "Your Certificates"
msgstr "您的证书"
-#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
msgid "%d/%m/%Y"
msgstr "%Y-%m-%d"
-#: smime/lib/e-cert.c:530
+#: smime/lib/e-cert.c:478
msgid "Version"
msgstr "版本"
-#: smime/lib/e-cert.c:545
+#: smime/lib/e-cert.c:493
msgid "Version 1"
msgstr "版本 1"
-#: smime/lib/e-cert.c:548
+#: smime/lib/e-cert.c:496
msgid "Version 2"
msgstr "版本 2"
-#: smime/lib/e-cert.c:551
+#: smime/lib/e-cert.c:499
msgid "Version 3"
msgstr "版本 3"
-#: smime/lib/e-cert.c:642
+#: smime/lib/e-cert.c:581
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:584
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:587
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:590
msgid "C"
msgstr "C"
-#: smime/lib/e-cert.c:645
+#: smime/lib/e-cert.c:593
msgid "CN"
msgstr "CN"
-#: smime/lib/e-cert.c:648
+#: smime/lib/e-cert.c:596
msgid "OU"
msgstr "OU"
-#: smime/lib/e-cert.c:651
+#: smime/lib/e-cert.c:599
msgid "O"
msgstr "O"
-#: smime/lib/e-cert.c:654
+#: smime/lib/e-cert.c:602
msgid "L"
msgstr "L"
-#: smime/lib/e-cert.c:657
+#: smime/lib/e-cert.c:605
msgid "DN"
msgstr "DN"
-#: smime/lib/e-cert.c:660
+#: smime/lib/e-cert.c:608
msgid "DC"
msgstr "DC"
-#: smime/lib/e-cert.c:663
+#: smime/lib/e-cert.c:611
msgid "ST"
msgstr "ST"
-#: smime/lib/e-cert.c:678
+#: smime/lib/e-cert.c:614
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:617
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "证书名称"
+
+#: smime/lib/e-cert.c:620
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "证书名称"
+
+#: smime/lib/e-cert.c:623
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "证书颁发机构信任"
+
+#: smime/lib/e-cert.c:626
msgid "UID"
msgstr "UID"
-#: smime/lib/e-cert.c:866
+#: smime/lib/e-cert.c:635
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:686
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:694
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr "主题唯一 ID"
+
+#: smime/lib/e-cert.c:721
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:736
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "主题是 %s"
+
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "无法处理脱机文件夹"
+
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#, fuzzy
+msgid "Object Signer"
+msgstr "证书签名者"
+
+#: smime/lib/e-cert.c:782
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "证书颁发机构信任"
+
+#: smime/lib/e-cert.c:786
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "无效的证书颁发机构(CA)"
+
+#: smime/lib/e-cert.c:814
msgid "Signing"
msgstr "签名"
-#: smime/lib/e-cert.c:882
+#: smime/lib/e-cert.c:818
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "没有信息"
+
+#: smime/lib/e-cert.c:822
+#, fuzzy
+msgid "Key Encipherment"
+msgstr "密钥协议"
+
+#: smime/lib/e-cert.c:826
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "附件"
+
+#: smime/lib/e-cert.c:830
msgid "Key Agreement"
msgstr "密钥协议"
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:834
msgid "Certificate Signer"
msgstr "证书签名者"
-#: smime/lib/e-cert.c:890
+#: smime/lib/e-cert.c:838
msgid "CRL Signer"
msgstr "CRL 签名者"
-#: smime/lib/e-cert.c:938
+#: smime/lib/e-cert.c:886
msgid "Critical"
msgstr "关键"
-#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
msgid "Not Critical"
msgstr "非关键"
-#: smime/lib/e-cert.c:964
+#: smime/lib/e-cert.c:912
msgid "Extensions"
msgstr "扩展"
-#: smime/lib/e-cert.c:1035
+#: smime/lib/e-cert.c:983
#, c-format
msgid "%s = %s"
msgstr "%s = %s"
-#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
msgid "Certificate Signature Algorithm"
msgstr "证书签名算法"
-#: smime/lib/e-cert.c:1100
+#: smime/lib/e-cert.c:1048
msgid "Issuer"
msgstr "发行者"
-#: smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1102
msgid "Issuer Unique ID"
msgstr "发行者唯一 ID"
-#: smime/lib/e-cert.c:1173
+#: smime/lib/e-cert.c:1121
msgid "Subject Unique ID"
msgstr "主题唯一 ID"
-#: smime/lib/e-cert.c:1216
+#: smime/lib/e-cert.c:1164
msgid "Certificate Signature Value"
msgstr "证书签名值"
@@ -14435,7 +17083,7 @@ msgstr "查看当前联系人"
#: 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-tasks.xml.h:19 ui/evolution.xml.h:27
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
msgid "_Actions"
msgstr "操作(_A)"
@@ -14594,7 +17242,7 @@ msgstr "关闭(_L)"
#: ui/evolution-contact-list-editor.xml.h:2
#: ui/evolution-mail-messagedisplay.xml.h:1
#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:3
msgid "Close"
msgstr "关闭"
@@ -14607,7 +17255,7 @@ msgid "Delete this item"
msgstr "删除此项"
#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
msgid "Main toolbar"
msgstr "主工具栏"
@@ -14650,7 +17298,7 @@ msgstr "把此项保存到磁盘"
#: ui/evolution-mail-messagedisplay.xml.h:7
#: ui/evolution-message-composer.xml.h:44
#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
msgid "_File"
msgstr "文件(_F)"
@@ -14907,13 +17555,13 @@ msgstr "反转选择(_I)"
msgid "_Threaded Message List"
msgstr "按线索编排的邮件列表(_T)"
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
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
+#: ui/evolution.xml.h:26
msgid "_Close"
msgstr "关闭(_C)"
@@ -15309,7 +17957,7 @@ msgstr "上一封邮件(_P)"
msgid "_Quoted"
msgstr "引用(_Q)"
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
msgid "_Tools"
msgstr "工具(_T)"
@@ -15606,114 +18254,110 @@ msgid "_Open Task"
msgstr "打开任务(_O)"
#: ui/evolution.xml.h:1
-msgid "About Evolution..."
+#, fuzzy
+msgid "About Ximian Evolution..."
msgstr "关于 Evolution..."
#: ui/evolution.xml.h:2
msgid "Change Evolution's settings"
msgstr "更改 Evolution 的设置"
-#: ui/evolution.xml.h:3
-msgid "Change the visibility of the toolbar"
-msgstr "改变工具栏的可见性"
-
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:5
msgid "Create a new window displaying this folder"
msgstr "创建显示此文件加的新窗口"
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:6
msgid "E_xit"
msgstr "退出(_X)"
-#: ui/evolution.xml.h:8
-msgid "Evolution _FAQ"
-msgstr "Evolution 常见问题(_F)"
-
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:7
msgid "Exit the program"
msgstr "退出程序"
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:8
msgid "Forget _Passwords"
msgstr "丢弃密码(_P)"
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:9
msgid "Forget remembered passwords so you will be prompted for them again"
msgstr "保存的密码被丢弃,所以将再次提示您输入密码"
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:10
msgid "Import data from other programs"
msgstr "从其它程序导入数据"
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:12
msgid "New _Window"
msgstr "新建窗口(_W)"
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:13
msgid "Pi_lot Settings..."
msgstr "Pilot 设置(_L)..."
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:14
msgid "Send / Receive"
msgstr "发送/接收"
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:15
msgid "Send queued items and retrieve new items"
msgstr "发送队列中的的邮件并收取新邮件"
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:16
msgid "Set up Pilot configuration"
msgstr "配置 Pilot"
-#: ui/evolution.xml.h:19
-msgid "Show information about Evolution"
+#: ui/evolution.xml.h:17
+#, fuzzy
+msgid "Show information about Ximian Evolution"
msgstr "显示关于 Evolution 的信息"
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:18
msgid "Submit Bug Report"
msgstr "提交错误报告"
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:19
msgid "Submit _Bug Report"
msgstr "提交错误报告(_B)"
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:20
msgid "Submit a bug report using Bug Buddy"
msgstr "用 Bug Buddy 提交错误报告"
-#: ui/evolution.xml.h:23
-msgid "T_oolbar"
-msgstr "工具栏(_O)"
-
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:21
msgid "Toggle whether we are working offline."
msgstr "切换是否脱机工作。"
-#: ui/evolution.xml.h:26
-msgid "_About Evolution..."
+#: ui/evolution.xml.h:23
+#, fuzzy
+msgid "Ximian Evolution _FAQ"
+msgstr "Evolution 常见问题(_F)"
+
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "_About Ximian Evolution..."
msgstr "关于 Evolution(_A)..."
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:28
msgid "_Help"
msgstr "帮助(_H)"
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:29
msgid "_Import..."
msgstr "导入(_I)..."
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
msgid "_New"
msgstr "新建(_N)"
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
msgid "_Quick Reference"
msgstr "快速首选项(_Q)"
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
msgid "_Send / Receive"
msgstr "发送/接收(_S)"
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
msgid "_Window"
msgstr "窗口(_W)"
@@ -15953,22 +18597,68 @@ msgstr "Evolution 信息"
msgid "Evolution Query"
msgstr "Evolution 查询"
+#. setup a dummy error
+#: widgets/misc/e-error.c:415
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">打印字体</span>"
+
#: widgets/misc/e-expander.c:181
msgid "Expanded"
msgstr "已展开"
+#: widgets/misc/e-expander.c:182
+msgid "Whether or not the expander is expanded"
+msgstr ""
+
+#: widgets/misc/e-expander.c:190
+msgid "Text of the expander's label"
+msgstr ""
+
#: widgets/misc/e-expander.c:197
msgid "Use underline"
msgstr "使用下划线"
+#: widgets/misc/e-expander.c:198
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
+msgstr ""
+
#: widgets/misc/e-expander.c:205
msgid "Spacing"
msgstr "间距"
+#: widgets/misc/e-expander.c:206
+msgid "Space to put between the label and the child"
+msgstr ""
+
+#: widgets/misc/e-expander.c:215
+msgid "Label widget"
+msgstr ""
+
+#: widgets/misc/e-expander.c:216
+msgid "A widget to display in place of the usual expander label"
+msgstr ""
+
+#: widgets/misc/e-expander.c:222
+#, fuzzy
+msgid "Expander Size"
+msgstr "已展开"
+
+#: widgets/misc/e-expander.c:223
+msgid "Size of the expander arrow"
+msgstr ""
+
#: widgets/misc/e-expander.c:231
msgid "Indicator Spacing"
msgstr "标识器间距"
+#: widgets/misc/e-expander.c:232
+msgid "Spacing around expander arrow"
+msgstr ""
+
#: widgets/misc/e-filter-bar.c:195
msgid "_Searches"
msgstr "搜索(_S)"
@@ -16055,3 +18745,51 @@ msgstr "%s (...)"
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
+
+#~ msgid "Search _base:"
+#~ msgstr "搜索基础(_B):"
+
+#~ msgid "_Find Possible Search Bases"
+#~ msgstr "查找可能的搜索基础(_F)"
+
+#~ msgid "_Log in:"
+#~ msgstr "登录(_L):"
+
+#~ msgid "_Search scope:"
+#~ msgstr "搜索范围(_S):"
+
+#~ msgid "_Timeout:"
+#~ msgstr "超时(_T):"
+
+#~ msgid "Office:"
+#~ msgstr "办公室:"
+
+#~ msgid "Spouse:"
+#~ msgstr "配偶:"
+
+#~ msgid "Video Chat:"
+#~ msgstr "视频聊天:"
+
+#~ msgid "Web Log:"
+#~ msgstr "Web 日志:"
+
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "从地址簿添加出席者。"
+
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "从地址簿添加出席者"
+
+#~ msgid "Toolbar is visible"
+#~ msgstr "工具栏可见"
+
+#~ msgid "Whether the toolbar should be visible."
+#~ msgstr "工具栏是否可见。"
+
+#~ msgid "Groupware Suite"
+#~ msgstr "Groupwise 套件"
+
+#~ msgid "Change the visibility of the toolbar"
+#~ msgstr "改变工具栏的可见性"
+
+#~ msgid "T_oolbar"
+#~ msgstr "工具栏(_O)"