aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po3075
1 files changed, 1339 insertions, 1736 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1d29a1f1db..df1367b491 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Evolution\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"
+"POT-Creation-Date: 2004-06-13 03:17+0200\n"
+"PO-Revision-Date: 2004-06-13 12:59+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"
@@ -56,13 +56,13 @@ msgstr " 张卡片"
msgid "Default Sync Address:"
msgstr "默认的同步地址:"
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1155
+#: addressbook/conduit/address-conduit.c:1156
msgid "Could not load addressbook"
msgstr "无法装入地址簿"
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1224
+#: addressbook/conduit/address-conduit.c:1227
msgid "Could not read pilot's Address application block"
msgstr "无法读入 Pilot 的地址应用程序块"
@@ -134,10 +134,10 @@ msgstr "升迁“%s”:"
#. create the local source group
#. On This Computer is always first and VFolders is always last
-#: addressbook/gui/component/addressbook-migrate.c:508
+#: addressbook/gui/component/addressbook-migrate.c:489
#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:233 mail/mail-vfolder.c:218
+#: mail/mail-component.c:246 mail/mail-vfolder.c:218
msgid "On This Computer"
msgstr "在此计算机中"
@@ -145,8 +145,8 @@ msgstr "在此计算机中"
#. 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
+#: addressbook/gui/component/addressbook-migrate.c:497
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
#: mail/mail-config.glade.h:109
@@ -154,19 +154,19 @@ msgid "Personal"
msgstr "个人"
#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:524
+#: addressbook/gui/component/addressbook-migrate.c:505
msgid "On LDAP Servers"
msgstr "在 LDAP 服务器上"
-#: addressbook/gui/component/addressbook-migrate.c:652
+#: addressbook/gui/component/addressbook-migrate.c:633
msgid "LDAP Servers"
msgstr "LDAP 服务器"
-#: addressbook/gui/component/addressbook-migrate.c:772
+#: addressbook/gui/component/addressbook-migrate.c:753
msgid "Autocompletion Settings"
msgstr "自动完成设置"
-#: addressbook/gui/component/addressbook-migrate.c:1148
+#: addressbook/gui/component/addressbook-migrate.c:1129
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -177,7 +177,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: addressbook/gui/component/addressbook-migrate.c:1162
+#: addressbook/gui/component/addressbook-migrate.c:1143
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -187,7 +187,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: addressbook/gui/component/addressbook-migrate.c:1171
+#: addressbook/gui/component/addressbook-migrate.c:1152
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -197,7 +197,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: addressbook/gui/component/addressbook-migrate.c:1181
+#: addressbook/gui/component/addressbook-migrate.c:1162
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -207,12 +207,6 @@ 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?"
@@ -223,8 +217,8 @@ msgid "New Address Book"
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:365
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
#: 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
@@ -233,7 +227,7 @@ msgid "Delete"
msgstr "删除"
#: addressbook/gui/component/addressbook-view.c:756
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
msgid "Properties..."
msgstr "属性..."
@@ -315,10 +309,6 @@ 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
@@ -335,255 +325,203 @@ msgstr " 显示支持的基础(_H)"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
msgid "*"
msgstr "*"
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
msgid "1"
msgstr "1"
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
msgid "3268"
msgstr "3268"
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
msgid "389"
msgstr "389"
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
msgid "5"
msgstr "5"
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
msgid "636"
msgstr "636"
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
msgid "<b>Authentication</b>"
msgstr "<b>身份验证</b>"
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
msgid "<b>Display</b>"
msgstr "<b>显示</b>"
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
msgid "<b>Downloading</b>"
msgstr "<b>下载</b>"
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
msgid "<b>Searching</b>"
msgstr "<b>搜索</b>"
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
msgid "<b>Server Information</b>"
msgstr "<b>服务器信息</b>"
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
msgid "<b>Type:</b>"
msgstr "<b>类型:</b>"
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
msgid "Add Contacts Group"
msgstr "添加联系人组"
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
msgid "Address Book Properties"
msgstr "地址簿属性"
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
#: mail/mail-config.glade.h:42
msgid "Always"
msgstr "总是"
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
msgid "Anonymously"
msgstr "匿名"
-#: addressbook/gui/component/ldap-config.glade.h:20
-#: calendar/gui/dialogs/task-editor.c:193
+#: addressbook/gui/component/ldap-config.glade.h:17
+#: calendar/gui/dialogs/task-editor.c:199
msgid "Basic"
msgstr "基本"
-#: addressbook/gui/component/ldap-config.glade.h: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
+#: addressbook/gui/component/ldap-config.glade.h:18
+#: calendar/gui/dialogs/task-editor.c:208 mail/mail-security.glade.h:3
#: smime/gui/smime-ui.glade.h:19
msgid "Details"
msgstr "细节"
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "识别性名称(_N):"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
msgid "Distinguished name"
msgstr "识别性名称"
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
msgid "Download limit:"
msgstr "下载上限:"
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
msgid "Email address"
msgstr "电子邮件地址"
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:22
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:30
+#: addressbook/gui/component/ldap-config.glade.h:23
msgid "Find Possible Search Bases"
msgstr "查找可能的搜索基础"
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
#: 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:32 mail/mail-account-gui.c:81
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
#: mail/mail-config.glade.h:102
msgid "Never"
msgstr "从不"
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
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:27
+msgid "Search _base:"
+msgstr "搜索基础(_B):"
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
msgid "Search base only"
msgstr "只搜索基础"
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
msgid "Search base:"
msgstr "搜索基础:"
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
msgid "Search scope:"
msgstr "搜索范围:"
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "搜索"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
msgstr ""
"选中此选项意味着 Evolution 只在您的 LDAP 服务器支持 SSL 或 TLS 时才连接到您"
"的 LDAP 服务器。"
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
msgid ""
"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"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."
+"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."
msgstr ""
"选择此选项意味着 Evolution 将只会试图在非安全的环境中使用 SSL/TLS。例如,如果"
"您和您的 LDAP 服务器工作时位于防火墙后,Evolution 就没有必要使用 SSL/TLS,因"
"为您的连接已经相当安全了。"
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
msgid ""
"Selecting this option means that your server does not support either SSL or "
-"TLS. This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
msgstr ""
"选择此选项意味着您的服务器既不支持 SSL 也不支持 TLS。可能导致的结果将是您的连"
"接不太安全,您也易于受到安全漏洞的攻击。"
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
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
+#: addressbook/gui/component/ldap-config.glade.h:35
msgid "Supported Search Bases"
msgstr "支持的搜索起点"
-#: addressbook/gui/component/ldap-config.glade.h:52
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:36
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will 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:54
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:37
msgid ""
"The search scope defines how deep you would like the search to extend down "
-"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"
+"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."
msgstr ""
"搜索范围定义了您想要在目录树中搜索多深。搜索范围若为“子级”,则将包含您指定的"
"搜索基础下所属的全部项。搜索范围若为“一级”,则只会包含您指定的搜索基础之下一"
"级的项目。"
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
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:59
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:39
msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
"too large will slow down your address book."
msgstr "这是可下载条目的最大数量。将此数值设定得太大将导致地址簿变慢。"
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
msgid ""
"This is the method evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -592,136 +530,104 @@ msgstr ""
"这是 evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
"对 ldap 服务器的匿名访问权限。"
-#: addressbook/gui/component/ldap-config.glade.h:62
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:41
msgid ""
"This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
msgstr "这是此服务器在 Evolution 文件夹列表中显示的名称。它只用于显示。"
-#: addressbook/gui/component/ldap-config.glade.h:64
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:42
msgid ""
-"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."
+"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."
msgstr ""
"这是 LDAP 服务器上的端口,Evolution 将试图连接到您所给出的标准端口列表。如果"
"您不清楚要指定的端口,请询问您的系统管理员。"
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:43
msgid "Timeout:"
msgstr "超时:"
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:44
msgid "Using distinguished name (DN)"
msgstr "使用已识别的姓名 (DN)"
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
msgid "Using email address"
msgstr "使用电子邮件地址"
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
#: mail/mail-config.glade.h:156
msgid "Whenever Possible"
msgstr "可能时"
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
msgid "_Add Contacts Group"
msgstr "添加联系人组(_A)"
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:48
msgid "_Download limit:"
msgstr "下载上限(_D):"
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
msgid "_Email address:"
msgstr "电子邮件地址(_E):"
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+msgid "_Find Possible Search Bases"
+msgstr "查找可能的搜索基础(_F)"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
msgid "_Log in method:"
msgstr "登录方式(_L):"
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:171
+#: 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
msgid "_Name:"
msgstr "名称(_N):"
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "端口号(_P):"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
msgid "_Port:"
msgstr "端口(_P):"
-#: 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:55
+msgid "_Search scope:"
+msgstr "搜索范围(_S):"
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
msgid "_Server:"
msgstr "服务器(_S):"
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "超时(分钟)(_T):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+msgid "_Timeout:"
+msgstr "超时(_T):"
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
msgid "_Use secure connection:"
msgstr "使用安全连接(_U):"
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
msgid "cards"
msgstr "卡片"
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:60
#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
#: mail/mail-config.glade.h:183
msgid "minutes"
msgstr "分钟"
-#: 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/e-select-names.c:503
#: addressbook/gui/component/select-names/select-names.glade.h:6
msgid "Select Contacts from Address Book"
msgstr "从地址簿中选择联系人"
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:702
#: addressbook/gui/component/select-names/e-select-names-popup.c:215
#: calendar/gui/dialogs/cal-prefs-dialog.c:724
msgid "Remove"
@@ -827,8 +733,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:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
msgid "AIM"
msgstr "AIM"
@@ -863,7 +769,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:160
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: addressbook/gui/widgets/e-minicard.c:181
msgid "Contact"
@@ -891,80 +797,74 @@ 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:27
-#: calendar/gui/e-itip-control.c:930
-msgid "Location:"
-msgstr "位置:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
msgid "MSN Messenger"
msgstr "MSN Messenger"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
msgid "Mailing Address"
msgstr "邮政地址"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
msgid "Manager:"
msgstr "经理:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
msgid "Ni_ckname:"
msgstr "昵称(_C):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
msgid "Notes:"
msgstr "注释:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
msgid "Novell Groupwise"
msgstr "Novell Groupwise"
-#: 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:32
+msgid "Office:"
+msgstr "办公室:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
msgid "PO Box:"
msgstr "邮政邮箱:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "Personal Information"
msgstr "个人信息"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
msgid "Profession:"
msgstr "职业:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+msgid "Spouse:"
+msgstr "配偶:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
msgid "State/Province:"
msgstr "州/省:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
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
-#, fuzzy
-msgid "Webcam:"
-msgstr "网页:"
+msgid "Web Log:"
+msgstr "Web 日志:"
#. red
#: addressbook/gui/contact-editor/contact-editor.glade.h:43
@@ -988,19 +888,10 @@ msgid "_File under:"
msgstr "存档于(_F):"
#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
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"
@@ -1014,8 +905,8 @@ msgid ""
msgstr "您确定要删除此联系人吗?"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
msgid "Address"
msgstr "地址"
@@ -1023,7 +914,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:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
#: addressbook/gui/widgets/e-addressbook-model.c:309
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
#: addressbook/gui/widgets/e-minicard.c:174
@@ -2003,27 +1894,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:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
msgid "Jabber"
msgstr "Jabber"
#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
msgid "Yahoo"
msgstr "雅虎"
#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
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:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
msgid "ICQ"
msgstr "ICQ"
@@ -2031,15 +1922,23 @@ 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:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "其它"
+
#: addressbook/gui/contact-editor/e-contact-editor.c:252
-#, fuzzy
msgid "Source Book"
-msgstr "来源"
+msgstr "来源地址簿"
#: addressbook/gui/contact-editor/e-contact-editor.c:259
-#, fuzzy
msgid "Target Book"
-msgstr "地址簿"
+msgstr "目标地址簿"
#: addressbook/gui/contact-editor/e-contact-editor.c:273
msgid "Is New Contact"
@@ -2053,20 +1952,20 @@ msgstr "可写域"
msgid "Changed"
msgstr "已更改"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2297
+#: addressbook/gui/contact-editor/e-contact-editor.c:2353
msgid "This contact belongs to these categories:"
msgstr "此联系人属于这些类别:"
#. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2374
+#: addressbook/gui/contact-editor/e-contact-editor.c:2430
msgid "Please select an image for this contact"
msgstr "请选择此联系人的图像"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2378
+#: addressbook/gui/contact-editor/e-contact-editor.c:2434
msgid "No image"
msgstr "无图像"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2581
+#: addressbook/gui/contact-editor/e-contact-editor.c:2637
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2074,22 +1973,22 @@ msgstr ""
"联系人数据无效:\n"
"\n"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2609
+#: addressbook/gui/contact-editor/e-contact-editor.c:2665
msgid "Invalid contact."
msgstr "无效的联系人。"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2668
+#: addressbook/gui/contact-editor/e-contact-editor.c:2724
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:2672
-#: addressbook/gui/contact-editor/e-contact-editor.c:2696
+#: addressbook/gui/contact-editor/e-contact-editor.c:2728
+#: addressbook/gui/contact-editor/e-contact-editor.c:2752
msgid "_Discard"
msgstr "丢弃(_D)"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2691
+#: addressbook/gui/contact-editor/e-contact-editor.c:2747
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?"
@@ -2258,48 +2157,66 @@ msgid "\n"
msgstr "\n"
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "Insert email adresses from Adress Book"
+msgstr "从地址簿中插入电子邮件地址"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
msgid "Members"
msgstr "成员"
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "Remove an email address from the List"
+msgstr "从列表中删除电子邮件地址"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+msgid "Select"
+msgstr "选择"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
msgid "_Hide addresses when sending mail to this list"
msgstr "在往该列表发送邮件时隐藏地址(_H)"
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
msgid "_List name:"
msgstr "列出姓名(_L):"
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
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:8
-msgid "contact-list-editor"
-msgstr "联系人列表编辑器"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
#: addressbook/gui/widgets/e-addressbook-model.c:295
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
#: addressbook/gui/widgets/e-addressbook-view.c:217
#: addressbook/gui/widgets/e-minicard-view.c:460
#: addressbook/gui/widgets/e-minicard-view-widget.c:105
msgid "Book"
-msgstr "名簿"
+msgstr "地址簿"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
msgid "Is New List"
msgstr "为新列表"
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "必需的参与者"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
msgid "Contact List Editor"
msgstr "联系人列表编辑器"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
-msgid "Save List as VCard"
-msgstr "将列表保存为 VCard"
-
#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
msgid "Changed Contact:"
msgstr "被改变的联系人:"
@@ -2338,96 +2255,96 @@ msgstr ""
"您一定要添加吗?"
#. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
#: widgets/misc/e-filter-bar.c:156
msgid "Advanced Search"
msgstr "高级搜索"
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
msgid "(map)"
msgstr "(地图)"
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
msgid "map"
msgstr "地图"
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
msgid "List Members"
msgstr "列出成员"
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
msgid "E-mail"
msgstr "电子邮件"
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
msgid "Organization"
msgstr "组织"
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
msgid "Position"
msgstr "位置"
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
msgid "Groupwise"
msgstr "Groupwise"
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
msgid "Video Conferencing"
msgstr "视频会议"
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
msgid "Phone"
msgstr "电话"
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
msgid "Fax"
msgstr "传真"
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
msgid "work"
msgstr "工作"
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
msgid "WWW"
msgstr "WWW"
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
msgid "Blog"
msgstr "Blog"
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
msgid "Mobile Phone"
msgstr "移动电话"
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
msgid "personal"
msgstr "个人"
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
msgid "Note"
msgstr "注释"
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
msgid "Job Title"
msgstr "职称"
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
msgid "Email"
msgstr "电子邮件"
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
msgid "Home page"
msgstr "主页"
@@ -2781,13 +2698,13 @@ msgid "Email begins with"
msgstr "邮件以此开头"
#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:54
msgid "Category is"
msgstr "类别为"
#. We attach subitems below
#: addressbook/gui/widgets/e-addressbook-view.c:166
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:49
msgid "Any field contains"
msgstr "任何域含有"
@@ -2799,103 +2716,103 @@ 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:250
+#: calendar/gui/e-meeting-list-view.c:227
#: calendar/gui/e-meeting-time-sel.etspec.h:11
msgid "Type"
msgstr "类型"
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:535
msgid "Address Book"
msgstr "地址簿"
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:1099
+#: addressbook/gui/widgets/e-addressbook-view.c:2107
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard..."
msgstr "另存为 VCard..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
msgid "New Contact..."
msgstr "新建联系人..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
msgid "New Contact List..."
msgstr "新建联系人列表..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
msgid "Go to Folder..."
msgstr "转到文件夹..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
msgid "Import..."
msgstr "导入..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1093
msgid "Search for Contacts..."
msgstr "搜索联系人..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
msgid "Address Book Sources..."
msgstr "地址簿来源..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1096
msgid "Pilot Settings..."
msgstr "Pilot 设置..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "转发联系人"
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1101
msgid "Send Message to Contact"
msgstr "给联系人发邮件"
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1102 calendar/gui/print.c:2480
#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
msgid "Print"
msgstr "打印"
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
msgid "Print Envelope"
msgstr "打印信封"
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
msgid "Copy to Address Book..."
msgstr "复制到地址簿..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1109
msgid "Move to Address Book..."
msgstr "移动到地址簿..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "剪切"
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr "复制"
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1114
#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
msgid "Paste"
msgstr "粘贴"
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
+#: calendar/gui/e-calendar-view.c:1327
msgid "Current View"
msgstr "当前视图"
#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1692
+#: calendar/gui/cal-search-bar.c:358
msgid "Any Category"
msgstr "任何类别"
@@ -3001,7 +2918,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:257
+#: calendar/gui/e-meeting-list-view.c:234
#: calendar/gui/e-meeting-time-sel.etspec.h:9
msgid "Role"
msgstr "角色"
@@ -3432,22 +3349,22 @@ msgstr "未命名的列表"
msgid "Enter password"
msgstr "输入密码"
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
msgid "Split Multi-Day Events:"
msgstr "分割多日事件:"
-#: calendar/conduits/calendar/calendar-conduit.c:1313
+#: calendar/conduits/calendar/calendar-conduit.c:1330
#: calendar/conduits/todo/todo-conduit.c:849
msgid "Could not start wombat server"
msgstr "无法启动 wombat 服务器"
-#: calendar/conduits/calendar/calendar-conduit.c:1314
+#: calendar/conduits/calendar/calendar-conduit.c:1331
#: calendar/conduits/todo/todo-conduit.c:850
msgid "Could not start wombat"
msgstr "无法启动 wombat"
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
msgid "Could not read pilot's Calendar application block"
msgstr "无法读入 Pilot 日历应用程序块"
@@ -3609,19 +3526,16 @@ 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 "工作日结束的小时"
+msgstr "工作日结束的分钟"
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
-#, fuzzy
msgid "Minute the workday starts on"
-msgstr "工作日开始的小时"
+msgstr "工作日开始的分钟"
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
-#, fuzzy
msgid "Number of units for default reminder"
-msgstr "是否为事件发送默认提醒"
+msgstr "默认提醒的单位数量"
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
msgid "Number of units for determining when to hide tasks"
@@ -3665,12 +3579,11 @@ msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
msgid "Units of default reminder"
-msgstr ""
+msgstr "默认提醒的单元"
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
-#, fuzzy
msgid "Weekday the week starts on"
-msgstr "工作日开始的小时"
+msgstr "一周开始的日子"
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
msgid "Whether or not to use the notification tray for display alarms"
@@ -3702,8 +3615,8 @@ msgid "Whether to show week numbers in date navigator"
msgstr "是否在日期浏览器中显示周数"
#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/gnome-cal.c:1827
#: camel/providers/groupwise/camel-gw-listener.c:311
#: camel/providers/groupwise/camel-gw-listener.c:334
msgid "Calendar"
@@ -3723,7 +3636,7 @@ msgstr ""
#: calendar/gui/calendar-commands.c:363
#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
msgid "days"
msgstr "天数"
@@ -3871,23 +3784,23 @@ msgstr "周视图"
msgid "Month View"
msgstr "月视图"
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
msgid "Summary contains"
msgstr "概要含有"
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
msgid "Description contains"
msgstr "描述含有"
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
msgid "Comment contains"
msgstr "注释含有"
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
msgid "Location contains"
msgstr "位置含有"
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:327
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
msgid "Unmatched"
msgstr "无匹配"
@@ -3960,20 +3873,16 @@ msgstr "发送给:"
msgid "With these arguments:"
msgstr "使用这些参数:"
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
-msgid "dialog1"
-msgstr "dialog1"
-
#: calendar/gui/dialogs/alarm-options.glade.h:12
msgid "extra times every"
msgstr "每个额外时间"
#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
msgid "hours"
msgstr "小时"
-#: calendar/gui/dialogs/alarm-page.c:802
+#: calendar/gui/dialogs/alarm-page.c:815
msgid "Action/Trigger"
msgstr "动作/触发器"
@@ -4015,7 +3924,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:921 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "概要:"
@@ -4045,7 +3954,6 @@ msgid "hour(s)"
msgstr "小时"
#: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
msgid "minute(s)"
msgstr "分钟"
@@ -4067,12 +3975,12 @@ msgstr "源位置“%s”不是规格的。"
msgid "The source location '%s' is not a webcal source."
msgstr "源位置“%s”不是 Webcal 源。"
-#: calendar/gui/dialogs/calendar-setup.c:264
+#: calendar/gui/dialogs/calendar-setup.c:275
#, c-format
msgid "Source with name '%s' already exists in the selected group"
msgstr "选中组中已经存在名为“%s”的源"
-#: calendar/gui/dialogs/calendar-setup.c:277
+#: calendar/gui/dialogs/calendar-setup.c:288
#, c-format
msgid ""
"The group '%s' is remote. You must specify a location to get the calendar "
@@ -4091,51 +3999,31 @@ msgstr "添加任务组"
msgid "C_olor:"
msgstr "颜色(_O):"
-#: 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
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
msgid "Pick a color"
msgstr "选取一种颜色"
-#: calendar/gui/dialogs/calendar-setup.glade.h: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
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
msgid "_Add Calendar"
msgstr "添加日历(_A)"
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
msgid "_Add Group"
msgstr "添加组(_A)"
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "刷新间隔(_R):"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
msgid "_Refresh:"
msgstr "刷新(_R):"
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "源 URL(_S):"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
msgid "_Type:"
msgstr "类型(_T):"
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
msgid "_URL:"
msgstr "_URL:"
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
msgid "weeks"
msgstr "周"
@@ -4246,8 +4134,8 @@ msgid "Free/Busy Publishing"
msgstr "忙/闲发布"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/e-itip-control.c:556
msgid "Friday"
msgstr "星期五"
@@ -4260,8 +4148,8 @@ msgid "Minutes"
msgstr "分钟"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:553
+#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/e-itip-control.c:552
msgid "Monday"
msgstr "星期一"
@@ -4270,8 +4158,8 @@ msgid "S_un"
msgstr "周日(_U)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/dialogs/recurrence-page.c:1077
+#: calendar/gui/e-itip-control.c:557
msgid "Saturday"
msgstr "星期六"
@@ -4284,8 +4172,8 @@ msgid "Show week _numbers in date navigator"
msgstr "在日期浏览器中显示周数(_N)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:552
+#: calendar/gui/dialogs/recurrence-page.c:1078
+#: calendar/gui/e-itip-control.c:551
msgid "Sunday"
msgstr "星期日"
@@ -4298,8 +4186,8 @@ msgid "T_hu"
msgstr "周四(_H)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/e-itip-control.c:555
msgid "Thursday"
msgstr "星期四"
@@ -4312,8 +4200,8 @@ msgid "Time format:"
msgstr "时间格式:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:554
+#: calendar/gui/dialogs/recurrence-page.c:1073
+#: calendar/gui/e-itip-control.c:553
msgid "Tuesday"
msgstr "星期二"
@@ -4322,8 +4210,8 @@ msgid "W_eek starts:"
msgstr "一周开始(_E):"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/e-itip-control.c:554
msgid "Wednesday"
msgstr "星期三"
@@ -4449,55 +4337,55 @@ msgstr "%s 您已经做出了修改。放弃这些修改并更新编辑器吗
msgid "%s You have made no changes, update the editor?"
msgstr "%s 您还没有进行修改,更新编辑器吗?"
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor.c:429
msgid "Could not update object"
msgstr "无法更新对象"
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:937
msgid "Edit Appointment"
msgstr "编辑约会"
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:905
+#: calendar/gui/dialogs/comp-editor.c:942
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
#, c-format
msgid "Journal entry - %s"
msgstr "日志条目 - %s"
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:922
+#: calendar/gui/dialogs/comp-editor.c:958
msgid "No summary"
msgstr "没有概要"
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/dialogs/comp-editor.c:1398
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
#: composer/e-msg-composer.c:1193
msgid "Save as..."
msgstr "另存为..."
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1501
+#: calendar/gui/dialogs/comp-editor.c:1536
+#: calendar/gui/dialogs/comp-editor.c:1562
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "如果更新到达的话,对此项目的更改将被丢弃"
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1586
msgid "Unable to use current version!"
msgstr "无法使用当前版本!"
-#: calendar/gui/dialogs/comp-editor-page.c:463
+#: calendar/gui/dialogs/comp-editor-page.c:464
#, c-format
msgid "Validation error: %s"
msgstr "校验错误:%s"
@@ -4594,55 +4482,55 @@ msgstr "授权给:"
msgid "Enter Delegate"
msgstr "输入代表"
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:207 calendar/gui/print.c:2295
msgid "Appointment"
msgstr "约会"
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:216
msgid "Reminder"
msgstr "提醒"
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:223
msgid "Recurrence"
msgstr "再现"
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:230
+#: calendar/gui/dialogs/event-editor.c:303
+#: calendar/gui/dialogs/event-editor.c:447
msgid "Scheduling"
msgstr "调度"
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:237
+#: calendar/gui/dialogs/event-editor.c:306
+#: calendar/gui/dialogs/event-editor.c:450 ui/evolution-event-editor.xml.h:6
msgid "Meeting"
msgstr "会议"
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:490
msgid "Event with no start date"
msgstr "没有开始日期的事件"
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:493
msgid "Event with no end date"
msgstr "没有结束日期的事件"
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:649 calendar/gui/dialogs/task-page.c:516
msgid "Start date is wrong"
msgstr "开始日期有错"
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:659
msgid "End date is wrong"
msgstr "结束日期有错"
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:682
msgid "Start time is wrong"
msgstr "开始时间有错"
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:689
msgid "End time is wrong"
msgstr "结束时间有错"
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1296
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "无法打开日历“%s”。"
@@ -4716,11 +4604,12 @@ msgstr "开始时间(_S):"
#. 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: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
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:928
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4745,9 +4634,9 @@ 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:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2537 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2583 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
@@ -4755,7 +4644,7 @@ msgid "_Delete"
msgstr "删除(_D)"
#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:218
#: calendar/gui/e-meeting-time-sel.etspec.h:1
msgid "Attendee"
msgstr "出席者"
@@ -4763,7 +4652,7 @@ msgstr "出席者"
#: calendar/gui/dialogs/meeting-page.etspec.h:2
#: calendar/gui/e-meeting-time-sel.etspec.h:2
msgid "Click here to add an attendee"
-msgstr "点击此处添加出席者"
+msgstr "单击此处添加出席者"
#: calendar/gui/dialogs/meeting-page.etspec.h:3
#: calendar/gui/e-meeting-time-sel.etspec.h:3
@@ -4791,14 +4680,14 @@ msgid "Member"
msgstr "成员"
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:264
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
#: 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:271
+#: calendar/gui/e-meeting-list-view.c:248
#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
msgid "Status"
msgstr "状态"
@@ -4807,20 +4696,19 @@ msgstr "状态"
msgid "Add A_ttendee"
msgstr "添加出席者(_T)"
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "Add attendees from addressbook."
+msgstr "从地址簿添加出席者。"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
#: calendar/gui/e-itip-control.glade.h:9
msgid "Organizer:"
msgstr "组织者:"
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
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>"
@@ -4890,51 +4778,51 @@ msgstr "所有各次"
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "此约会含有 Evolution 无法编辑的循环。"
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:844
msgid "Recurrence date is invalid"
msgstr "再现日期无效"
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:955
msgid "on"
msgstr "在"
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:1016
msgid "first"
msgstr "第一"
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:1017
msgid "second"
msgstr "第二"
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:1018
msgid "third"
msgstr "第三"
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:1019
msgid "fourth"
msgstr "第四"
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:1020
msgid "last"
msgstr "最后"
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1043
msgid "Other Date"
msgstr "其它日期"
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1071
msgid "day"
msgstr "天"
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1208
msgid "on the"
msgstr "在"
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1394
msgid "occurrences"
msgstr "循环"
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2364
msgid "Date/Time"
msgstr "日期/时间"
@@ -4999,15 +4887,15 @@ msgstr "周"
msgid "year(s)"
msgstr "年"
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:77
msgid "Select destination"
msgstr "选择目的"
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:98
msgid "_Destination"
msgstr "目的(_D)"
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:100
msgid "Task List"
msgstr "任务列表"
@@ -5020,11 +4908,14 @@ msgstr "完成日期有错"
msgid "% _Complete"
msgstr "完成百分比(_C)"
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
#: calendar/gui/dialogs/task-details-page.glade.h:4
#: calendar/gui/e-cal-component-preview.c:230
#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
msgid "Completed"
msgstr "已完成"
@@ -5087,17 +4978,17 @@ msgstr "状态(_S):"
msgid "_Web Page:"
msgstr "网页(_W):"
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:215
+#: calendar/gui/dialogs/task-editor.c:278
+#: calendar/gui/dialogs/task-editor.c:415
msgid "Assignment"
msgstr "指派"
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:489
msgid "Due date is wrong"
msgstr "到期日期错误"
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:826
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "无法打开“%s”中的任务。"
@@ -5108,7 +4999,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:976 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
msgid "Description:"
msgstr "描述:"
@@ -5126,9 +5017,8 @@ msgid "_Due date:"
msgstr "到期日期(_D):"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-#, fuzzy
msgid "Authentication Credentials for HTTP Server"
-msgstr "来自服务器的无效认证应答。"
+msgstr ""
#: calendar/gui/dialogs/url-editor-dialog.glade.h:3
msgid "Calendars selected for publishing"
@@ -5248,10 +5138,10 @@ msgstr "在 %2$s 时 %1$s"
msgid "%s for an unknown trigger type"
msgstr "%s 为未知触发类型"
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2350
#, c-format
msgid "Click to open %s"
-msgstr "点击以打开 %s"
+msgstr "单击以打开 %s"
#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
msgid "Untitled"
@@ -5268,7 +5158,7 @@ msgstr "到期日期:"
#. write status
#: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:944
+#: calendar/gui/e-itip-control.c:956
msgid "Status:"
msgstr "状态:"
@@ -5348,96 +5238,96 @@ msgstr "空闲"
msgid "Busy"
msgstr "繁忙"
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
msgid "Deleting selected objects"
msgstr "删除选中的对象"
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
msgid "Updating objects"
msgstr "更新对象"
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
msgid "_Open"
msgstr "打开(_O)"
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
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:1291 calendar/gui/e-calendar-view.c:1376
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
#: 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:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 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
msgid "_Print..."
msgstr "打印(_P)..."
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
#: 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: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
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:960 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
msgid "_Copy"
msgstr "复制(_C)"
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: 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
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 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"
msgstr "粘贴(_P)"
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
msgid "_Assign Task"
-msgstr "委派任务(_A)"
+msgstr "指派任务(_A)"
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
msgid "_Forward as iCalendar"
msgstr "作为 iCalendar 转发(_F)"
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
msgid "_Mark Selected Tasks as Complete"
msgstr "把任务标记为完成(_M)"
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
msgid "_Delete Selected Tasks"
msgstr "删除选定的任务(_D)"
-#: calendar/gui/e-calendar-table.c:1353
+#: calendar/gui/e-calendar-table.c:1350
#: calendar/gui/e-calendar-table.etspec.h:3
msgid "Click to add a task"
-msgstr "点击以添加任务"
+msgstr "单击以添加任务"
#: calendar/gui/e-calendar-table.etspec.h:2
#, no-c-format
msgid "% Complete"
msgstr "% 完成"
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
msgid "Complete"
msgstr "完成"
@@ -5466,67 +5356,75 @@ msgstr "概要"
msgid "Task sort"
msgstr "任务排序"
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1156
+msgid "Moving items"
+msgstr "移动项目"
+
+#: calendar/gui/e-calendar-view.c:1158
+msgid "Copying items"
+msgstr "复制项目"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
msgid "New Meeting"
msgstr "新会议"
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
msgid "New Task"
msgstr "新建任务"
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
msgid "Select _Today"
msgstr "选择今天(_T)"
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1330
msgid "_Select Date..."
msgstr "选择日期(_S)..."
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
msgid "_Publish Free/Busy Information"
msgstr "发布忙闲信息(_P)"
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1353
msgid "Cop_y to Calendar..."
msgstr "复制到日历(_Y)..."
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1354
msgid "Mo_ve to Calendar..."
msgstr "移动到日历(_V)..."
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1355
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1356
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_F)..."
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
msgid "Delete this _Occurrence"
msgstr "删除此次出现(_O)"
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
msgid "Delete _All Occurrences"
msgstr "删除所有出现(_A)"
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1396
msgid "Go to _Today"
msgstr "转到今天(_T)"
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1398
msgid "_Go to Date..."
msgstr "转到日期(_G)..."
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
msgid "_Settings..."
msgstr "设置(_S)..."
@@ -5540,18 +5438,18 @@ 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: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-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
+#: camel/camel-gpg-context.c:1704 camel/camel-gpg-context.c:1755
#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1173
+#: camel/providers/imap4/camel-imap4-utils.c:293
#: camel/providers/smtp/camel-smtp-transport.c:172
#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
@@ -5565,16 +5463,16 @@ msgstr "重复"
#: calendar/gui/e-cal-model.c:913
msgid "Assigned"
-msgstr "已委派"
+msgstr "已指派"
#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
msgid "Yes"
msgstr "是"
#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:170 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
msgid "No"
msgstr "否"
@@ -5586,7 +5484,7 @@ msgstr "北"
msgid "S"
msgstr "南"
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
msgid "E"
msgstr "东"
@@ -5636,13 +5534,13 @@ msgstr ""
"%s"
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
#: calendar/gui/print.c:838
msgid "am"
msgstr "上午"
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
#: calendar/gui/print.c:840
msgid "pm"
msgstr "下午"
@@ -5673,396 +5571,392 @@ msgstr "%B%d日"
msgid "%02i minute divisions"
msgstr "%02i 分钟分割"
-#: calendar/gui/e-itip-control.c:586
+#: calendar/gui/e-itip-control.c:585
msgid "Yes. (Complex Recurrence)"
msgstr "是(复杂重现)"
-#: calendar/gui/e-itip-control.c:597
+#: calendar/gui/e-itip-control.c:596
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
msgstr[0] "每 %d 天"
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:601
#, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
msgstr[0] "每 %d 周"
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:603
#, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
msgstr[0] "每 %d 周的"
-#: calendar/gui/e-itip-control.c:612
+#: calendar/gui/e-itip-control.c:611
msgid " and "
msgstr " 和 "
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:618
#, c-format
msgid "The %s day of "
msgstr "第 %s 天属于"
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:631
#, c-format
msgid "The %s %s of "
msgstr "%s %s 属于"
-#: calendar/gui/e-itip-control.c:639
+#: calendar/gui/e-itip-control.c:638
#, c-format
msgid "every month"
msgid_plural "every %d months"
msgstr[0] "每 %d 月"
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:642
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
msgstr[0] "每 %d 年"
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/e-itip-control.c:653
#, c-format
msgid "a total of %d time"
msgid_plural " a total of %d times"
msgstr[0] " 总计 %d 次"
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:662
msgid ", ending on "
msgstr ",结束于 "
-#: calendar/gui/e-itip-control.c:687
-msgid "<b>Starts:</b> "
-msgstr "<b>开始:</b>"
-
-#: calendar/gui/e-itip-control.c:697
-msgid "<b>Ends:</b> "
-msgstr "<b>结束:</b>"
+#: calendar/gui/e-itip-control.c:686
+msgid "Starts"
+msgstr "开始"
-#: calendar/gui/e-itip-control.c:717
-msgid "<b>Completed:</b> "
-msgstr "<b>已完成:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr "结束"
-#: calendar/gui/e-itip-control.c:727
-msgid "<b>Due:</b> "
-msgstr "<b>到期:</b>"
+#: calendar/gui/e-itip-control.c:733
+msgid "Due"
+msgstr "到期"
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
msgid "iCalendar Information"
msgstr "iCalendar 信息"
#. Title
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:790
msgid "iCalendar Error"
msgstr "iCalendar 错误"
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
-#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
msgid "An unknown person"
msgstr "未知的人"
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:913
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作。"
-#: calendar/gui/e-itip-control.c:919
-msgid "<i>None</i>"
-msgstr "<i>无</i>"
+#: calendar/gui/e-itip-control.c:942
+msgid "Location:"
+msgstr "位置:"
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
#: calendar/gui/itip-utils.c:422
msgid "Accepted"
msgstr "接受"
-#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
msgid "Tentatively Accepted"
msgstr "暂时接受"
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:182
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
msgid "Declined"
msgstr "拒绝"
-#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
-#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
msgid "Choose an action:"
msgstr "选择一项活动:"
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1029
msgid "Update"
msgstr "更新"
-#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
-#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
-#: shell/e-shell.c:1132 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "确定"
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1057
msgid "Accept"
msgstr "接受"
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1058
msgid "Tentatively accept"
msgstr "暂时接受"
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1059
msgid "Decline"
msgstr "拒绝"
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1083
msgid "Send Free/Busy Information"
msgstr "发送忙闲信息"
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1096
msgid "Update respondent status"
msgstr "更新应答者状态"
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1109
msgid "Send Latest Information"
msgstr "发送最新的信息"
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
#: ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1198
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> 发布了会议信息。"
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1199
msgid "Meeting Information"
msgstr "会议信息"
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1204
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr "<b>%s</b> 请求 %s 参加一个会议。"
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1206
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请求您参加一个会议。"
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1207
msgid "Meeting Proposal"
msgstr "会议建议"
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1211
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> 希望加入到已存的会议。"
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1212
msgid "Meeting Update"
msgstr "会议更新"
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1216
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> 想收到最新的会议信息。"
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1217
msgid "Meeting Update Request"
msgstr "会议更新请求"
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1224
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> 已回复一个会议请求。"
-#: calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1225
msgid "Meeting Reply"
msgstr "会议答复"
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1232
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1233
msgid "Meeting Cancellation"
msgstr "会议取消"
-#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> 发送了一个无法理解的信息。"
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1241
msgid "Bad Meeting Message"
msgstr "错误的会议信息"
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1266
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> 发布了任务信息。"
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1267
msgid "Task Information"
msgstr "任务信息"
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1272
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> 请求 %s 完成一个任务。"
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1274
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请求您完成一个任务。"
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1275
msgid "Task Proposal"
msgstr "任务建议"
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1279
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s<b> 希望加入到已存在的任务。"
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1280
msgid "Task Update"
msgstr "任务更新"
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1284
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> 希望获取最新的任务信息。"
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1285
msgid "Task Update Request"
msgstr "任务更新请求"
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1292
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> 已经回复了任务委派。"
+msgstr "<b>%s</b> 已经回复了任务指派。"
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1293
msgid "Task Reply"
msgstr "任务回复"
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1300
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> 取消了任务。"
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1301
msgid "Task Cancellation"
msgstr "任务取消"
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1309
msgid "Bad Task Message"
msgstr "错误的任务邮件"
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1328
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> 发布了忙闲信息。"
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1329
msgid "Free/Busy Information"
msgstr "忙闲信息"
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1333
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请求您的忙闲信息。"
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1334
msgid "Free/Busy Request"
msgstr "忙/闲请求"
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1338
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> 应答了忙闲请求。"
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1339
msgid "Free/Busy Reply"
msgstr "忙闲应答"
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1344
msgid "Bad Free/Busy Message"
msgstr "错误的忙闲信息"
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1419
msgid "The message does not appear to be properly formed"
msgstr "邮件的格式可能不正确"
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1478
msgid "The message contains only unsupported requests."
msgstr "邮件只含有不支持的请求。"
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1509
msgid "The attachment does not contain a valid calendar message"
msgstr "附件中没有有效的日历信息"
-#: calendar/gui/e-itip-control.c:1529
+#: calendar/gui/e-itip-control.c:1541
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日历项目"
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:1775
msgid "Update complete\n"
msgstr "更新完成\n"
-#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1805 calendar/gui/e-itip-control.c:1877
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新参与者状态"
-#: calendar/gui/e-itip-control.c:1809 calendar/gui/e-itip-control.c:1847
+#: calendar/gui/e-itip-control.c:1821 calendar/gui/e-itip-control.c:1859
msgid "Object is invalid and cannot be updated\n"
msgstr "对象无效,无法更新\n"
-#: calendar/gui/e-itip-control.c:1819
+#: calendar/gui/e-itip-control.c:1831
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "此响应并非来自当前参与者。将响应者加为参与者吗?"
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1843
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新参与者状态!\n"
-#: calendar/gui/e-itip-control.c:1850
+#: calendar/gui/e-itip-control.c:1862
msgid "There was an error on the CORBA system\n"
msgstr "CORBA 系统出错\n"
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1865
msgid "Object could not be found\n"
msgstr "找不到对象\n"
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1868
msgid "You don't have the right permissions to update the calendar\n"
msgstr "您没有适当的权限打开日历\n"
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1871
msgid "Attendee status updated\n"
msgstr "更新参与者状态\n"
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1874
msgid "Attendee status could not be updated!\n"
msgstr "无法更新参与者状态!\n"
-#: calendar/gui/e-itip-control.c:1893
+#: calendar/gui/e-itip-control.c:1905
msgid "Removal Complete"
msgstr "删除完成"
-#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
+#: calendar/gui/e-itip-control.c:1928 calendar/gui/e-itip-control.c:1976
msgid "Item sent!\n"
msgstr "项目已发送!\n"
-#: calendar/gui/e-itip-control.c:1918 calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1980
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
@@ -6103,74 +5997,69 @@ msgstr "日期-结束"
msgid "date-start"
msgstr "日期-开始"
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
msgid "Chair Persons"
msgstr "主席人员"
-#: 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:64
+#: calendar/gui/e-meeting-list-view.c:61
msgid "Optional Participants"
msgstr "可选的参与者"
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
msgid "Resources"
msgstr "资源"
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 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:142 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
#: calendar/gui/e-meeting-store.c:109
msgid "Group"
msgstr "组"
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
#: calendar/gui/e-meeting-store.c:111
msgid "Resource"
msgstr "资源"
-#: calendar/gui/e-meeting-list-view.c:144 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
#: calendar/gui/e-meeting-store.c:113
msgid "Room"
msgstr "房间"
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
#: calendar/gui/e-meeting-store.c:142
msgid "Chair"
msgstr "主席"
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 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:157 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 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:158 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 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:180 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 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:183 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
msgid "Tentative"
msgstr "暂时的"
-#: calendar/gui/e-meeting-list-view.c:184 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
#: calendar/gui/e-meeting-store.c:208
msgid "Delegated"
msgstr "被委任的"
@@ -6187,20 +6076,24 @@ 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
@@ -6216,19 +6109,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
@@ -6274,7 +6167,7 @@ msgstr "%Y-%m-%d"
msgid "Enter the password for %s"
msgstr "为 %s 输入密码"
-#: calendar/gui/e-tasks.c:585 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
#, c-format
msgid ""
"Error on %s:\n"
@@ -6283,63 +6176,58 @@ msgstr ""
"%s 错误:\n"
" %s"
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "装入任务"
+
#. FIXME Loading should be async
#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:680
+#: calendar/gui/e-tasks.c:845
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
-#: calendar/gui/e-tasks.c:703
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"打开 %s 出错:\n"
-" %s"
-
-#: calendar/gui/e-tasks.c:724
-msgid "Loading tasks"
-msgstr "装入任务"
-
-#: calendar/gui/e-tasks.c:828
+#: calendar/gui/e-tasks.c:962
msgid "Completing tasks..."
msgstr "正在完成任务..."
-#: calendar/gui/e-tasks.c:851
+#: calendar/gui/e-tasks.c:985
msgid "Deleting selected objects..."
msgstr "正在删除选中的对象..."
-#: calendar/gui/e-tasks.c:878
+#: calendar/gui/e-tasks.c:1012
msgid "Expunging"
msgstr "销毁"
-#: calendar/gui/e-tasks.c:954
+#: calendar/gui/e-tasks.c:1088
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
#: calendar/importers/icalendar-importer.c:79
#: calendar/importers/icalendar-importer.c:705
msgid "Tasks"
msgstr "任务"
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:704
+msgid "Updating query"
+msgstr "更新查询"
+
+#: calendar/gui/gnome-cal.c:2006
#, c-format
msgid "Loading appointments at %s"
msgstr "装入位于 %s 的约会"
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
#, c-format
msgid "Loading tasks at %s"
msgstr "装入位于 %s 的任务"
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
#, c-format
msgid "Opening %s"
msgstr "打开 %s"
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
#, fuzzy
msgid "Purging"
msgstr "发送"
@@ -6535,7 +6423,7 @@ msgid "On The Web"
msgstr "网上"
#. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
msgid "Unable to migrate old settings from evolution/config.xmldb"
msgstr "无法从 evolution/config.xmldb 中升迁旧设置"
@@ -6546,7 +6434,7 @@ msgid "Unable to migrate calendar `%s'"
msgstr "无法升迁日历“%s”"
#. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
#, c-format
msgid "Unable to migrate tasks `%s'"
msgstr "无法升迁任务“%s”"
@@ -6782,69 +6670,67 @@ msgstr "打印项"
msgid "Print Setup"
msgstr "打印设置"
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
#, c-format
msgid "Task List '%s' will be removed. Are you sure you want to continue?"
msgstr "即将删除任务列表“%s”。您确定想要继续吗?"
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
msgid "New Task List"
msgstr "新建任务列表"
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d 个任务"
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:488
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:508
#, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
msgstr[0] ",已选中 %d 个"
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
msgid "Failed upgrading tasks."
msgstr "升级任务失败。"
-#: calendar/gui/tasks-component.c:526
-#, fuzzy, c-format
+#: calendar/gui/tasks-component.c:749
+#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "无法打开日历“%s”来创建事件和会议"
+msgstr "无法打开任务列表“%s”来创建事件和会议"
-#: calendar/gui/tasks-component.c:538
-#, fuzzy
+#: calendar/gui/tasks-component.c:761
msgid "There is no calendar available for creating tasks"
-msgstr "没有可创建事件和会议的日历"
+msgstr "没有可创建任务的日历"
-#: calendar/gui/tasks-component.c:576
-#, fuzzy
+#: calendar/gui/tasks-component.c:799
msgid ""
"Selected task list is read-only, events cannot be created. Please select a "
"read-write calendar."
-msgstr "选中的日历只读,无法创建事件。请选择可写的日历。"
+msgstr "选中的任务列表只读,无法创建事件。请选择可写的日历。"
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
msgid "New task"
msgstr "新建任务"
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
msgid "_Task"
msgstr "任务(_T)"
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
msgid "Create a new task"
msgstr "创建新任务"
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
msgid "New tasks group"
msgstr "新建任务组"
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
msgid "_Tasks Group"
msgstr "任务组(_T)"
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
msgid "Create a new tasks group"
msgstr "创建新任务组"
@@ -8520,69 +8406,69 @@ msgstr "准备脱机文件夹“%s”"
msgid "You must be working online to complete this operation"
msgstr "您必须在线工作以便完成该操作"
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
#: camel/camel-process.c:48
#, c-format
msgid "Failed to create pipe to '%s': %s"
msgstr "创建到“%s”的管道失败:%s"
-#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 camel/camel-filter-search.c:549
#: camel/camel-process.c:90
#, c-format
msgid "Failed to create create child process '%s': %s"
msgstr "创建子进程“%s”失败:%s"
-#: camel/camel-filter-driver.c:754
+#: camel/camel-filter-driver.c:756
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "收到 %s 发来的无效信息流:%s"
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
msgid "Syncing folders"
msgstr "同步文件夹"
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "解析过滤规则出错:%s:%s"
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "执行过滤规则错误:%s:%s"
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
msgid "Unable to open spool folder"
msgstr "无法打开脱机文件夹"
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
msgid "Unable to process spool folder"
msgstr "无法处理脱机文件夹"
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "获取第%d封邮件(%d%%)"
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
msgid "Cannot open message"
msgstr "无法打开邮件"
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
#, c-format
msgid "Failed on message %d"
msgstr "在第%d封邮件失败"
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
msgid "Syncing folder"
msgstr "同步文件夹"
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
#, c-format
msgid "Getting message %d of %d"
msgstr "获取第%d封邮件,共%d封"
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
#, c-format
msgid "Failed at message %d of %d"
msgstr "在第%d封邮件失败,共%d封"
@@ -8669,22 +8555,20 @@ msgstr ""
msgid "(match-threads) requires a match type string"
msgstr ""
-#: camel/camel-folder-search.c:785
-#, fuzzy
+#: camel/camel-folder-search.c:784
msgid "(match-threads) expects an array result"
-msgstr "(match-all) 需要一个布尔结果"
+msgstr "(match-threads) 需要一个数组结果"
-#: camel/camel-folder-search.c:791
-#, fuzzy
+#: camel/camel-folder-search.c:790
msgid "(match-threads) requires the folder set"
-msgstr "(match-all) 需要一个布尔结果"
+msgstr "(match-threads) 需要文件夹集"
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
#, c-format
msgid "Performing query on unknown header: %s"
msgstr "对未知的头进行查询:%s"
-#: camel/camel-gpg-context.c:720
+#: camel/camel-gpg-context.c:722
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -8695,15 +8579,15 @@ msgstr ""
"\n"
"%s"
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
msgid "Failed to parse gpg userid hint."
msgstr "解析 gpg userid 提示失败。"
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
msgid "Failed to parse gpg passphrase request."
msgstr "解析 gpg 密码句请求失败。"
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -8712,27 +8596,28 @@ msgstr ""
"您需要一个密码句用来解锁以下用户:\n"
"“%s”"
-#: 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 mail/mail-ops.c:705
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1440 camel/camel-gpg-context.c:1531
+#: camel/camel-gpg-context.c:1638 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
#: mail/mail-send-recv.c:611
msgid "Cancelled."
msgstr "已取消。"
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr "解锁密钥失败:给出了 3 个错误的密码句。"
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "来自 GnuPG 的意外应答:%s"
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
msgid "Failed to encrypt: No valid recipients specified."
msgstr "加密失败:没有指定有效的收件人。"
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
#, c-format
msgid ""
"Failed to GPG %s: %s\n"
@@ -8743,58 +8628,58 @@ msgstr ""
"\n"
"%s"
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
#, c-format
msgid "Failed to GPG %s: %s\n"
msgstr "GPG %s 失败:%s\n"
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
#, c-format
msgid "Could not generate signing data: %s"
msgstr "无法生成签名数据:%s"
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1703
+#: camel/camel-gpg-context.c:1754
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "执行 gpg 失败:%s"
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1433
+#: camel/camel-gpg-context.c:1524 camel/camel-gpg-context.c:1547
+#: camel/camel-gpg-context.c:1631 camel/camel-gpg-context.c:1655
+#: camel/camel-gpg-context.c:1725 camel/camel-gpg-context.c:1776
msgid "Failed to execute gpg."
msgstr "执行 gpg 失败。"
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
msgid "This is a digitally signed message part"
msgstr "这是邮件的数字签名部分"
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1409
#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
#: camel/camel-smime-context.c:739
msgid "Cannot verify message signature: Incorrect message format"
msgstr "无法校验邮件签名:邮件格式不对"
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1416
#, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr "无法校验邮件签名:无法创建临时文件:%s"
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1507
#, c-format
msgid "Could not generate encrypting data: %s"
msgstr "无法生成加密数据:%s"
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1565
msgid "This is a digitally encrypted message part"
msgstr "这是邮件的数字加密部分"
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1662 camel/camel-smime-context.c:994
msgid "Encrypted content"
msgstr "加密内容"
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1681
msgid "Unable to parse message content"
msgstr "无法分析邮件内容"
@@ -8831,7 +8716,7 @@ msgstr "无法创建锁定助手进程:%s"
#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
#, c-format
msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "无法锁定 “%s”:lock-helper 协议错误"
+msgstr "无法锁定“%s”:lock-helper 协议错误"
#: camel/camel-lock-client.c:204
#, c-format
@@ -9109,7 +8994,7 @@ msgstr ""
#: camel/camel-sasl-login.c:32
msgid "Login"
-msgstr "登录"
+msgstr "Login"
#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
msgid "This option will connect to the server using a simple password."
@@ -9171,7 +9056,7 @@ msgstr "URL“%s”需要主机组件"
#: camel/camel-service.c:283
#, c-format
msgid "URL '%s' needs a path component"
-msgstr "URL “%s” 需要路径组件"
+msgstr "URL“%s”需要路径组件"
#: camel/camel-service.c:733
#, c-format
@@ -9363,21 +9248,20 @@ msgid "Certificate only message, certificates imported and verified"
msgstr ""
#: camel/camel-smime-context.c:635
-#, fuzzy
msgid "Can't find signature digests"
-msgstr "有效签名"
+msgstr ""
#: camel/camel-smime-context.c:651
-#, fuzzy, c-format
+#, c-format
msgid "Signer: %s <%s>: %s\n"
-msgstr "服务器:%s,类型:%s"
+msgstr "签名者:%s <%s>:%s"
#: camel/camel-smime-context.c:752
msgid "Decoder failed"
-msgstr ""
+msgstr "解码器失败"
#: camel/camel-smime-context.c:804
-#, fuzzy, c-format
+#, c-format
msgid "Can't find certificate for `%s'"
msgstr "找不到“%s”的证书"
@@ -9391,44 +9275,36 @@ 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 签名数据"
+msgstr "无法创建 CMS 信封数据"
#: camel/camel-smime-context.c:843
-#, fuzzy
msgid "Can't attach CMS EnvelopedData"
-msgstr "无法附加 CMS 签名数据"
+msgstr "无法附加 CMS 信封数据"
#: camel/camel-smime-context.c:849
-#, fuzzy
msgid "Can't attach CMS data object"
-msgstr "无法附加 CMS 数据"
+msgstr "无法附加 CMS 数据对象"
#: camel/camel-smime-context.c:858
-#, fuzzy
msgid "Can't create CMS RecipientInfo"
-msgstr "无法创建 CMS 签名者信息"
+msgstr "无法创建 CMS 收件人信息"
#: camel/camel-smime-context.c:863
-#, fuzzy
msgid "Can't add CMS RecipientInfo"
-msgstr "无法添加 CMS 签名者信息"
+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 编码器失败"
+msgstr "将数据添加到编码器失败"
#: camel/camel-smime-context.c:974
#, c-format
@@ -9453,18 +9329,18 @@ msgid "Cannot get folder: Invalid operation on this store"
msgstr "无法获取文件夹:对该存储的无效操作"
#: camel/camel-store.c:243
-#, fuzzy, c-format
+#, c-format
msgid "Cannot create folder `%s': folder exists"
-msgstr "无法创建文件夹:%s:%s"
+msgstr "无法创建文件夹:%s:文件夹已存在"
#: camel/camel-store.c:297
msgid "Cannot create folder: Invalid operation on this store"
msgstr "无法创建文件夹:对该存储的无效操作"
#: camel/camel-store.c:325
-#, fuzzy, c-format
+#, c-format
msgid "Cannot create folder: %s: folder exists"
-msgstr "无法创建文件夹:%s:%s"
+msgstr "无法创建文件夹:%s:文件夹已存在"
#: camel/camel-store.c:389 camel/camel-vee-store.c:351
#, c-format
@@ -9476,11 +9352,11 @@ msgstr "无法删除文件夹:%s:无效操作"
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "无法重命名文件夹:%s:无效操作"
-#: camel/camel-store.c:809
+#: camel/camel-store.c:777
msgid "Trash"
msgstr "回收站"
-#: camel/camel-store.c:811 mail/mail-config.glade.h:95
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
#: ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "垃圾"
@@ -9601,7 +9477,7 @@ msgstr "密钥不支持证书签名"
msgid "Error in application verification"
msgstr "应用程序验证错误"
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
#, c-format
msgid ""
"Issuer: %s\n"
@@ -9614,11 +9490,11 @@ msgstr ""
"指纹: %s\n"
"签名: %s"
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
msgid "GOOD"
msgstr "好"
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
msgid "BAD"
msgstr "坏"
@@ -9642,7 +9518,7 @@ msgstr ""
"您仍然希望接受吗?"
#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -9657,7 +9533,7 @@ msgstr ""
"\n"
"您希望接受吗?"
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -9666,7 +9542,7 @@ msgstr ""
"证书问题:%s\n"
"发行者:%s"
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -9675,7 +9551,7 @@ msgstr ""
"无效的证书域名:%s\n"
"发行者:%s"
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -9684,7 +9560,7 @@ msgstr ""
"证书过期:%s\n"
"发行者:%s"
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -9693,10 +9569,10 @@ msgstr ""
"证书撤销列表已过期:%s\n"
"发行者:%s"
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
#, c-format
msgid "Could not parse URL `%s'"
-msgstr "无法解析 URL “%s”"
+msgstr "无法解析 URL“%s”"
#: camel/camel-vee-folder.c:633
#, c-format
@@ -9783,105 +9659,114 @@ msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
#: camel/providers/groupwise/camel-gw-listener.c:312
#: camel/providers/groupwise/camel-gw-listener.c:335
-#, fuzzy
msgid "Checklist"
-msgstr "列表"
+msgstr "待办清单"
+
+#: camel/providers/imap4/camel-imap4-command.c:531
+#: camel/providers/imap4/camel-imap4-command.c:538
+#, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "向 IMAP 服务器 %s 发送命令失败:%s"
-#: camel/providers/imap4/camel-imap4-command.c:629
+#: camel/providers/imap4/camel-imap4-command.c:637
#, c-format
msgid "Unexpected response from IMAP4 server %s: %s"
msgstr "来自 IMAP4 服务器 %s 的意外响应:%s"
-#: camel/providers/imap4/camel-imap4-engine.c:415
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "来自 IMAP 服务器 %s 的意外应答。"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
#, c-format
msgid "Cannot select folder `%s': Invalid mailbox name"
msgstr "无法选择文件夹“%s”:无效的邮箱名"
-#: camel/providers/imap4/camel-imap4-engine.c:421
+#: camel/providers/imap4/camel-imap4-engine.c:422
#, c-format
msgid "Cannot select folder `%s': Bad command"
msgstr "无法选择文件夹“%s”:无效的命令"
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
#, c-format
msgid "IMAP4 server %s unexpectedly disconnected: %s"
msgstr "IMAP4 服务器 %s 意外断开连接:%s"
-#: camel/providers/imap4/camel-imap4-engine.c:1145
+#: camel/providers/imap4/camel-imap4-engine.c:998
msgid "Got BYE response"
msgstr "得到 BYE 响应"
-#: camel/providers/imap4/camel-imap4-folder.c:335
+#: camel/providers/imap4/camel-imap4-folder.c:424
#, fuzzy, c-format
msgid "Cannot sync flags to folder `%s': Unknown"
msgstr "无法选择文件夹“%s”:无效的命令"
-#: camel/providers/imap4/camel-imap4-folder.c:341
+#: camel/providers/imap4/camel-imap4-folder.c:430
#, fuzzy, c-format
msgid "Cannot sync flags to folder `%s': Bad command"
msgstr "无法选择文件夹“%s”:无效的命令"
-#: camel/providers/imap4/camel-imap4-folder.c:476
+#: camel/providers/imap4/camel-imap4-folder.c:567
#, fuzzy, c-format
msgid "Cannot expunge folder `%s': Unknown"
msgstr "无法获取文件夹:%s:%s"
-#: camel/providers/imap4/camel-imap4-folder.c:481
+#: camel/providers/imap4/camel-imap4-folder.c:572
#, fuzzy, c-format
msgid "Cannot expunge folder `%s': Bad command"
msgstr "无法选择文件夹“%s”:无效的命令"
-#: camel/providers/imap4/camel-imap4-folder.c:616
+#: camel/providers/imap4/camel-imap4-folder.c:748
#, 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
+#: camel/providers/imap4/camel-imap4-folder.c:753
+#, c-format
msgid "Cannot get message %s from folder `%s': Bad command"
msgstr ""
-"无法从文件夹 %2$s 获取邮件:%1$s\n"
-" %3$s"
+"无法从文件夹“%2$s”获取邮件 %1$s:命令无效"
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-folder.c:878
+#, c-format
msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "无法将邮件附加到 mh 文件夹:%s:%s"
+msgstr "无法将邮件附加到 mh 文件夹:%s:未知错误"
-#: camel/providers/imap4/camel-imap4-folder.c:775
+#: camel/providers/imap4/camel-imap4-folder.c:907
#, fuzzy, c-format
msgid "Cannot append message to folder `%s': Bad command"
msgstr "无法选择文件夹“%s”:无效的命令"
-#: camel/providers/imap4/camel-imap4-folder.c:854
+#: camel/providers/imap4/camel-imap4-folder.c:986
#, 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
+#: camel/providers/imap4/camel-imap4-folder.c:990
#, 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
+#: camel/providers/imap4/camel-imap4-folder.c:998
+#, c-format
msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "无法选择文件夹“%s”:无效的命令"
+msgstr "无法将邮件从文件夹“%s”移动到文件夹“%s”:无效的命令"
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-folder.c:1002
+#, c-format
msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "无法选择文件夹“%s”:无效的命令"
+msgstr "无法将邮件从文件夹“%s”复制到文件夹“%s”:无效的命令"
#: camel/providers/imap4/camel-imap4-provider.c:40
#: camel/providers/imap/camel-imap-provider.c:55
@@ -9892,7 +9777,7 @@ msgstr "文件夹"
#: camel/providers/imap4/camel-imap4-provider.c:42
#: camel/providers/imap/camel-imap-provider.c:57
msgid "Show only subscribed folders"
-msgstr "只显示订约了的文件夹"
+msgstr "只显示订阅了的文件夹"
#: camel/providers/imap4/camel-imap4-provider.c:44
#: camel/providers/imap/camel-imap-provider.c:59
@@ -9905,9 +9790,8 @@ msgid "Namespace"
msgstr "命名空间"
#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
msgid "IMAPv4rev1"
-msgstr "IMAPv4"
+msgstr "IMAPv4rev1"
#: camel/providers/imap4/camel-imap4-provider.c:55
#, fuzzy
@@ -9915,29 +9799,28 @@ 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 服务器。"
+msgstr "该选项将使用纯文本密码连接到 IMAPv4rev1 服务器。"
-#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap4/camel-imap4-store.c:173
#: camel/providers/imap/camel-imap-store.c:428
#, c-format
msgid "IMAP server %s"
msgstr "IMAP 服务器 %s"
-#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap4/camel-imap4-store.c:175
#: camel/providers/imap/camel-imap-store.c:430
#, c-format
msgid "IMAP service for %s on %s"
msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
+#: camel/providers/imap4/camel-imap4-store.c:216
+#: camel/providers/imap4/camel-imap4-store.c:233
#: 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:140
+#: camel/providers/nntp/camel-nntp-store.c:209
#: camel/providers/pop3/camel-pop3-store.c:175
#: camel/providers/smtp/camel-smtp-transport.c:269
#: camel/providers/smtp/camel-smtp-transport.c:285
@@ -9945,67 +9828,67 @@ msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
msgid "Could not connect to %s (port %d): %s"
msgstr "无法连接到 %s (端口 %d):%s"
-#: camel/providers/imap4/camel-imap4-store.c:210
+#: camel/providers/imap4/camel-imap4-store.c:218
#: camel/providers/imap/camel-imap-store.c:553
#: camel/providers/pop3/camel-pop3-store.c:177
#: camel/providers/smtp/camel-smtp-transport.c:271
msgid "SSL unavailable"
msgstr "SSL 不可用"
-#: camel/providers/imap4/camel-imap4-store.c:222
+#: camel/providers/imap4/camel-imap4-store.c:230
#: 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:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
#: camel/providers/pop3/camel-pop3-store.c:192
msgid "Connection cancelled"
msgstr "连接已取消"
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:269
+#, c-format
msgid ""
"Failed to connect to IMAP server %s in secure mode: Server does not support "
"STARTTLS"
-msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
+msgstr "以安全模式连接到 IMAP 服务器 %s 失败:服务器不支持 STARTTLS"
-#: camel/providers/imap4/camel-imap4-store.c:286
+#: camel/providers/imap4/camel-imap4-store.c:294
#: camel/providers/imap/camel-imap-store.c:679
#: camel/providers/imap/camel-imap-store.c:710
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
-#: camel/providers/imap4/camel-imap4-store.c:287
+#: camel/providers/imap4/camel-imap4-store.c:295
#: 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:1142
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
msgid "Unknown error"
msgstr "未知的错误"
-#: camel/providers/imap4/camel-imap4-store.c:373
+#: camel/providers/imap4/camel-imap4-store.c:381
#, 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
+#: camel/providers/imap4/camel-imap4-store.c:426
#, 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
+#: camel/providers/imap4/camel-imap4-store.c:500
#, fuzzy, c-format
msgid "Cannot authenticate to IMAP server %s using %s"
msgstr "认证到 POP 服务器 %s 失败:%s"
-#: camel/providers/imap4/camel-imap4-store.c:723
+#: camel/providers/imap4/camel-imap4-store.c:731
#, 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/imap4/camel-imap4-store.c:793
#: camel/providers/imap/camel-imap-store.c:1885
#: camel/providers/imap/camel-imap-store.c:2263
#, fuzzy, c-format
@@ -10013,84 +9896,98 @@ msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
msgstr "文件夹名不能含有字符“#”。"
-#: camel/providers/imap4/camel-imap4-store.c:826
+#: camel/providers/imap4/camel-imap4-store.c:837
#, fuzzy, c-format
msgid "Cannot create folder `%s': Invalid mailbox name"
msgstr "无法选择文件夹“%s”:无效的邮箱名"
-#: camel/providers/imap4/camel-imap4-store.c:831
+#: camel/providers/imap4/camel-imap4-store.c:842
#, fuzzy, c-format
msgid "Cannot create folder `%s': Bad command"
msgstr "无法选择文件夹“%s”:无效的命令"
-#: camel/providers/imap4/camel-imap4-store.c:859
+#: camel/providers/imap4/camel-imap4-store.c:870
#, fuzzy, c-format
msgid "Cannot delete folder `%s': Special folder"
msgstr "无法删除文件夹:%s:没有该文件夹"
-#: camel/providers/imap4/camel-imap4-store.c:891
+#: camel/providers/imap4/camel-imap4-store.c:903
#, fuzzy, c-format
msgid "Cannot delete folder `%s': Invalid mailbox name"
msgstr "无法选择文件夹“%s”:无效的邮箱名"
-#: camel/providers/imap4/camel-imap4-store.c:896
+#: camel/providers/imap4/camel-imap4-store.c:908
#, fuzzy, c-format
msgid "Cannot delete folder `%s': Bad command"
msgstr "无法选择文件夹“%s”:无效的命令"
-#: camel/providers/imap4/camel-imap4-store.c:1037
+#: camel/providers/imap4/camel-imap4-store.c:928
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "无法删除文件夹:%s:没有该文件夹"
+
+#: camel/providers/imap4/camel-imap4-store.c:960
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "无法选择文件夹“%s”:无效的邮箱名"
+
+#: camel/providers/imap4/camel-imap4-store.c:965
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "无法选择文件夹“%s”:无效的命令"
+
+#: camel/providers/imap4/camel-imap4-store.c:1171
#, 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
+#: camel/providers/imap4/camel-imap4-store.c:1173
msgid "Bad command"
-msgstr "命令:"
+msgstr "无效命令"
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:1235
+#, c-format
msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "无法选择文件夹“%s”:无效的邮箱名"
+msgstr "无法订阅文件夹“%s”:无效的邮箱名"
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:1240
+#, c-format
msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "无法选择文件夹“%s”:无效的命令"
+msgstr "无法订阅文件夹“%s”:无效的命令"
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:1285
+#, c-format
msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "无法选择文件夹“%s”:无效的邮箱名"
+msgstr "无法退订文件夹“%s”:无效的邮箱名"
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-store.c:1290
+#, c-format
msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "无法选择文件夹“%s”:无效的命令"
+msgstr "无法退订文件夹“%s”:无效的命令"
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-utils.c:86
+#, c-format
msgid "Unexpected token in response from IMAP server %s: "
-msgstr "来自 IMAP4 服务器 %s 的意外响应:%s"
+msgstr "来自 IMAP4 服务器 %s 的意外响应:"
-#: camel/providers/imap4/camel-imap4-utils.c:108
+#: camel/providers/imap4/camel-imap4-utils.c:109
msgid "No data"
-msgstr ""
+msgstr "无数据"
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-utils.c:292
+#, c-format
msgid "IMAP server %s unexpectedly disconnected: %s"
msgstr "IMAP4 服务器 %s 意外断开连接:%s"
#: camel/providers/imap/camel-imap-command.c:218
#: camel/providers/imap/camel-imap-command.c:257
#: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3194
msgid "Operation cancelled"
msgstr "操作已取消"
#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3200
+#: camel/providers/imap/camel-imap-store.c:3197
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "服务器意外地中止了连接:%s"
@@ -10171,7 +10068,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:238
+#: camel/providers/nntp/camel-nntp-folder.c:220
msgid "This message is not currently available"
msgstr "该邮件目前不可用"
@@ -10239,14 +10136,12 @@ 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 "在所有文件夹中检查新邮件"
+msgstr "检查新邮件的垃圾内容"
#: camel/providers/imap/camel-imap-provider.c:68
-#, fuzzy
msgid "Only check for Junk messages in the INBOX folder"
-msgstr "在所有文件夹中检查新邮件"
+msgstr "仅在收件箱中检查垃圾邮件"
#: camel/providers/imap/camel-imap-provider.c:76
msgid "IMAP"
@@ -10318,9 +10213,9 @@ msgstr "父文件夹不允许含有子文件夹"
#: 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
+#, c-format
msgid "Cannot create folder `%s': folder exists."
-msgstr "无法创建文件夹:%s:%s"
+msgstr "无法创建文件夹:%s:文件夹已存在。"
#: camel/providers/imap/camel-imap-store.c:2274
#, c-format
@@ -10345,14 +10240,13 @@ msgid ""
msgstr ""
#: camel/providers/imapp/camel-imapp-store.c:328
-#, fuzzy, c-format
+#, c-format
msgid "Could not connect to POP server on %s"
-msgstr "无法连接到 POP 服务器 %s"
+msgstr "无法连接到 %s 上的 POP 服务器"
#: camel/providers/local/camel-local-folder.c:179
-#, fuzzy
msgid "Index message body data"
-msgstr "给联系人发邮件"
+msgstr ""
#. $HOME relative path + protocol string
#: camel/providers/local/camel-local-folder.c:388
@@ -10469,13 +10363,13 @@ msgstr "无法重命名“%s”:%s"
#: camel/providers/local/camel-mbox-store.c:284
#, c-format
msgid "Could not delete folder summary file `%s': %s"
-msgstr "无法删除文件夹概要文件 “%s”:%s"
+msgstr "无法删除文件夹概要文件“%s”:%s"
#: camel/providers/local/camel-local-store.c:433
#: camel/providers/local/camel-mbox-store.c:296
#, c-format
msgid "Could not delete folder index file `%s': %s"
-msgstr "无法删除文件夹索引文件 “%s”:%s"
+msgstr "无法删除文件夹索引文件“%s”:%s"
#: camel/providers/local/camel-local-store.c:456
#: camel/providers/local/camel-mbox-store.c:320
@@ -10526,28 +10420,28 @@ 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
+#, c-format
msgid "Cannot get folder `%s': %s"
-msgstr "无法获取文件夹:%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
+#, c-format
msgid "Cannot get folder `%s': folder does not exist."
-msgstr "文件夹“%s”不存在。"
+msgstr "无法获得文件夹“%s”:文件夹“%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
+#, c-format
msgid "Cannot create folder `%s': %s"
-msgstr "无法创建文件夹:%s:%s"
+msgstr "无法创建文件夹“%s”:%s"
#: camel/providers/local/camel-maildir-store.c:134
-#, fuzzy, c-format
+#, c-format
msgid "Cannot get folder `%s': not a maildir directory."
-msgstr "无法选择文件夹“%s”:无效的邮箱名"
+msgstr "无法获取文件夹“%s”:不是 maildir 目录。"
#: camel/providers/local/camel-maildir-store.c:173
#: camel/providers/local/camel-maildir-store.c:211
@@ -10558,7 +10452,7 @@ msgstr "无法删除文件夹“%s”:%s"
#: camel/providers/local/camel-maildir-store.c:175
msgid "not a maildir directory"
-msgstr "不是邮件目录"
+msgstr "不是 maildir 目录"
#: camel/providers/local/camel-maildir-store.c:340
#: camel/providers/local/camel-spool-store.c:284
@@ -10615,9 +10509,8 @@ msgstr "文件夹好像已经被不可恢复地破坏了。"
#: camel/providers/local/camel-mbox-folder.c:476
#: camel/providers/local/camel-mh-folder.c:222
-#, fuzzy
msgid "Message construction failed."
-msgstr "事务失败"
+msgstr "邮件构建失败。"
#: camel/providers/local/camel-mbox-store.c:176
#: camel/providers/local/camel-mbox-store.c:361
@@ -10625,9 +10518,9 @@ msgid "Cannot create a folder by this name."
msgstr "无法以此名称创建文件夹。"
#: camel/providers/local/camel-mbox-store.c:206
-#, fuzzy, c-format
+#, c-format
msgid "Cannot get folder `%s': not a regular file."
-msgstr "无法附加文件 %s:不是普通文件"
+msgstr "无法获取文件夹“%s”:不是普通文件"
#: camel/providers/local/camel-mbox-store.c:236
#: camel/providers/local/camel-mbox-store.c:247
@@ -10669,14 +10562,14 @@ msgid "The new folder name is illegal."
msgstr "指定的文件夹名称不合法。"
#: camel/providers/local/camel-mbox-store.c:485
-#, fuzzy, c-format
+#, c-format
msgid "Could not rename `%s': `%s': %s"
-msgstr "无法重命名“%s”:%s"
+msgstr "无法重命名“%s”:“%s”:%s"
#: camel/providers/local/camel-mbox-store.c:560
-#, fuzzy, c-format
+#, c-format
msgid "Could not rename '%s' to %s: %s"
-msgstr "无法重命名“%s”:%s"
+msgstr "无法将“%s”重命名为 %s:%s"
#: camel/providers/local/camel-mbox-summary.c:375
#, c-format
@@ -10761,16 +10654,16 @@ msgid "Cannot append message to mh folder: %s: %s"
msgstr "无法将邮件附加到 mh 文件夹:%s:%s"
#: camel/providers/local/camel-mh-store.c:219
-#, fuzzy, c-format
+#, c-format
msgid "Could not create folder `%s': %s"
msgstr ""
-"无法创建文件夹“%s”:\n"
+"无法创建文件夹“%s”:"
"%s"
#: camel/providers/local/camel-mh-store.c:231
-#, fuzzy, c-format
+#, c-format
msgid "Cannot get folder `%s': not a directory."
-msgstr "无法选择文件夹“%s”:无效的命令"
+msgstr "无法获取文件夹“%s”:不是目录。"
#: camel/providers/local/camel-mh-summary.c:244
#, c-format
@@ -10798,7 +10691,7 @@ msgid ""
"Could not open folder `%s':\n"
"%s"
msgstr ""
-"无法打开文件夹 “%s”:\n"
+"无法打开文件夹“%s”:\n"
"%s"
#: camel/providers/local/camel-spool-store.c:167
@@ -10866,7 +10759,7 @@ msgstr ""
"文件夹可能已损坏,副本保存在“%s”"
#: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:992
+#: camel/providers/nntp/camel-nntp-store.c:1126
#, c-format
msgid "Please enter the NNTP password for %s@%s"
msgstr "请输入 %s@%s 的 NNTP 密码"
@@ -10883,18 +10776,10 @@ msgstr "向服务器发送用户名失败"
msgid "Server rejected username/password"
msgstr "服务器拒绝了用户名/密码"
-#: 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/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/pop3/camel-pop3-folder.c:433
#: camel/providers/pop3/camel-pop3-folder.c:494
#: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10903,66 +10788,53 @@ msgstr "用户已取消"
msgid "Cannot get message %s: %s"
msgstr "无法获取邮件 %s:%s"
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: 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:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
#, 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:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
#: 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
+#: camel/providers/nntp/camel-nntp-folder.c:375
#, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"在将邮件保存到 %s 时发生错误:\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "操作失败:%s"
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
msgid "You cannot post NNTP messages while working offline!"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
#, fuzzy
msgid "You cannot copy messages from a NNTP folder!"
msgstr "无法将邮件复制到回收站文件夹"
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
#, 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
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
#, fuzzy, c-format
msgid "Unable to load grouplist file for %s: %s"
msgstr ""
"无法创建输出文件:%s\n"
" %s"
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
#, fuzzy, c-format
msgid "Unable to save grouplist file for %s: %s"
msgstr ""
@@ -10992,104 +10864,105 @@ msgid ""
"password."
msgstr "该选项将以明文密码向进行 NNTP 服务器进行认证。"
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: 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
#, c-format
msgid "Could not read greeting from %s: %s"
msgstr "无法阅读来自 %s 的欢迎信息:%s"
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "NNTP 服务器 %s 返回错误码 %d:%s"
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
#, c-format
msgid "USENET News via %s"
msgstr "USENET 新闻 %s"
-#: camel/providers/nntp/camel-nntp-store.c:635
-#, fuzzy
-msgid "Stream error"
-msgstr "解析错误"
-
-#: camel/providers/nntp/camel-nntp-store.c:638
-#, fuzzy, c-format
+#: camel/providers/nntp/camel-nntp-store.c:777
+#, c-format
msgid ""
"Error retrieving newsgroups:\n"
"\n"
"%s"
msgstr ""
-"打开 %s 出错:\n"
-" %s"
+"收取新闻组出错:\n\n"
+"%s"
-#: camel/providers/nntp/camel-nntp-store.c:730
+#: camel/providers/nntp/camel-nntp-store.c:872
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
+#: camel/providers/nntp/camel-nntp-store.c:904
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
"\n"
"newsgroup does not exist!"
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:787
+#: camel/providers/nntp/camel-nntp-store.c:929
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:795
+#: camel/providers/nntp/camel-nntp-store.c:937
#, fuzzy
msgid "You cannot rename a folder in a News store."
msgstr "无法将文件夹 %s 改名为 %s:%s"
-#: camel/providers/nntp/camel-nntp-store.c:803
+#: camel/providers/nntp/camel-nntp-store.c:945
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-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "必须认证"
-#: camel/providers/nntp/camel-nntp-summary.c:268
+#: camel/providers/nntp/camel-nntp-store.c:1146
#, fuzzy, c-format
-msgid "Could not get group: %s"
-msgstr "无法创建管道:%s"
+msgid "Cannot authenticate to server: %s"
+msgstr "认证到 POP 服务器 %s 失败:%s"
-#: camel/providers/nntp/camel-nntp-summary.c:333
-#, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "无法发送邮件:%s"
+#: camel/providers/nntp/camel-nntp-store.c:1262
+msgid "Not connected."
+msgstr "未连接。"
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP 命令失败:%s"
+msgid "No such folder: %s"
+msgstr "没有文件夹:%s"
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s:正在扫描新邮件"
-#: camel/providers/nntp/camel-nntp-summary.c:558
+#: camel/providers/nntp/camel-nntp-summary.c:225
#, fuzzy, c-format
-msgid "Unknown server response: %s"
-msgstr "未知的错误:%s"
+msgid "Unexpected server response from xover: %s"
+msgstr "来自 IMAP 服务器的意外应答:%s"
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "来自 GnuPG 的意外应答:%s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
msgid "Use cancel"
msgstr "使用取消"
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
#, c-format
msgid "Operation failed: %s"
msgstr "操作失败:%s"
@@ -11398,14 +11271,13 @@ msgid "server does not appear to support SSL"
msgstr "服务器似乎不支持 SSL"
#: camel/providers/smtp/camel-smtp-transport.c:358
-#, fuzzy, c-format
+#, c-format
msgid "STARTTLS command failed: %s"
-msgstr "IMAP 命令失败:%s"
+msgstr "STARTTLS 命令失败:%s"
#: camel/providers/smtp/camel-smtp-transport.c:373
-#, fuzzy
msgid "STARTTLS command failed"
-msgstr "IMAP 命令失败:%s"
+msgstr "STARTTLS 命令失败"
#: camel/providers/smtp/camel-smtp-transport.c:476
#, c-format
@@ -11413,9 +11285,9 @@ 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
+#, c-format
msgid "%sPlease enter the SMTP password for %s on host %s"
-msgstr "%s请为 %s@%s 输入 IMAP 密码"
+msgstr "%s请为 %s@%s 输入 SMTP 密码"
#: camel/providers/smtp/camel-smtp-transport.c:533
#, c-format
@@ -11439,9 +11311,8 @@ 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 "无法发送邮件:没有定义收件人。"
+msgstr "无法发送邮件:服务未连接。"
#: camel/providers/smtp/camel-smtp-transport.c:692
msgid "Cannot send message: sender address not valid."
@@ -11464,14 +11335,13 @@ msgid "SMTP Greeting"
msgstr "SMTP 欢迎"
#: camel/providers/smtp/camel-smtp-transport.c:943
-#, fuzzy, c-format
+#, c-format
msgid "HELO command failed: %s"
-msgstr "IMAP 命令失败:%s"
+msgstr "HELO 命令失败:%s"
#: camel/providers/smtp/camel-smtp-transport.c:960
-#, fuzzy
msgid "HELO command failed"
-msgstr "IMAP 命令失败:%s"
+msgstr "HELO 命令失败"
#: camel/providers/smtp/camel-smtp-transport.c:1026
msgid "SMTP Authentication"
@@ -11483,14 +11353,13 @@ msgstr "创建 SASL 认证对象错误。"
#: camel/providers/smtp/camel-smtp-transport.c:1049
#: camel/providers/smtp/camel-smtp-transport.c:1060
-#, fuzzy, c-format
+#, c-format
msgid "AUTH command failed: %s"
-msgstr "IMAP 命令失败:%s"
+msgstr "AUTH 命令失败:%s"
#: camel/providers/smtp/camel-smtp-transport.c:1066
-#, fuzzy
msgid "AUTH command failed"
-msgstr "IMAP 命令失败:%s"
+msgstr "AUTH 命令失败"
#: camel/providers/smtp/camel-smtp-transport.c:1128
msgid "Bad authentication response from server.\n"
@@ -11519,38 +11388,35 @@ 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
+#, c-format
msgid "DATA command failed: %s: mail not sent"
-msgstr "IMAP 命令失败:%s"
+msgstr "DATA 命令失败:%s:邮件未发送"
#. we should have gotten instructions on how to use the DATA command:
#. * 354 Enter mail, end with "." on a line by itself
#.
#: camel/providers/smtp/camel-smtp-transport.c:1269
#: camel/providers/smtp/camel-smtp-transport.c:1345
-#, fuzzy
msgid "DATA command failed"
-msgstr "IMAP 命令失败:%s"
+msgstr "DATP 命令失败"
#: camel/providers/smtp/camel-smtp-transport.c:1368
-#, fuzzy, c-format
+#, c-format
msgid "RSET command failed: %s"
-msgstr "IMAP 命令失败:%s"
+msgstr "RSET 命令失败:%s"
#: camel/providers/smtp/camel-smtp-transport.c:1384
-#, fuzzy
msgid "RSET command failed"
-msgstr "IMAP 命令失败:%s"
+msgstr "RSET 命令失败"
#: camel/providers/smtp/camel-smtp-transport.c:1407
-#, fuzzy, c-format
+#, c-format
msgid "QUIT command failed: %s"
-msgstr "IMAP 命令失败:%s"
+msgstr "QUIT 命令失败:%s"
#: camel/providers/smtp/camel-smtp-transport.c:1421
-#, fuzzy
msgid "QUIT command failed"
-msgstr "IMAP 命令失败:%s"
+msgstr "QUIT 命令失败"
#: composer/e-msg-composer-attachment-bar.c:106
#, c-format
@@ -11624,7 +11490,6 @@ msgid ""
msgstr ""
#: composer/e-msg-composer.c:1283
-#, fuzzy
msgid "Could not open file"
msgstr "无法打开文件"
@@ -11633,9 +11498,8 @@ msgid "Unable to retrieve message from editor"
msgstr "无法从编辑器检索邮件"
#: composer/e-msg-composer.c:1561
-#, fuzzy
msgid "Untitled Message"
-msgstr "多封邮件"
+msgstr "无标题邮件"
#: composer/e-msg-composer.c:1591
msgid "Open file"
@@ -11659,7 +11523,7 @@ msgstr[0] "附加了 <b>%d</b> 个文件"
msgid "Hide _Attachment Bar (drop attachments here)"
msgstr "隐藏附件栏(将附件拖至此处)(_A)"
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3224
msgid "Show _Attachment Bar (drop attachments here)"
msgstr "显示附件栏(将附件拖至此处)(_A)"
@@ -11668,35 +11532,7 @@ msgstr "显示附件栏(将附件拖至此处)(_A)"
msgid "Compose a message"
msgstr "撰写邮件"
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"无法创建撰写窗口:\n"
-"无法激活地址选择控制。"
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"无法创建撰写窗口:\n"
-"无法激活 HTML 编辑器组件。\n"
-"请确定您的 gtkhtml 和 libgtkhtml 所安装的版\n"
-"本正确。\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"无法创建撰写窗口:\n"
-"无法激活 HTML 编辑器组件。"
-
-#: composer/e-msg-composer.c:4284
+#: composer/e-msg-composer.c:4270
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -11707,13 +11543,12 @@ msgid "Posting destination"
msgstr "投递目的"
#: composer/e-msg-composer-hdrs.c:513
-#, fuzzy
msgid "Choose folders to post the message to."
-msgstr "把文件附件到邮件"
+msgstr "选择要将邮件投递到哪个文件夹。"
#: composer/e-msg-composer-hdrs.c:547
msgid "Click here for the address book"
-msgstr "点击此处以使用地址簿"
+msgstr "单击此处以使用地址簿"
#.
#. * Reply-To:
@@ -11774,9 +11609,8 @@ msgid "Post To:"
msgstr "投递到:"
#: composer/e-msg-composer-hdrs.c:619
-#, fuzzy
msgid "Click here to select folders to post to"
-msgstr "<点击这里以便选择文件夹>"
+msgstr "单击此处以选择要投递到的文件夹"
#: composer/e-msg-composer-select-file.c:127
msgid "Attach file(s)"
@@ -11784,25 +11618,24 @@ 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 "把文件附件到邮件"
+msgid "You cannot attach the file `{0}' to this message."
+msgstr "您无法将文件“{0}”作为此邮件的附件。"
#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-#, fuzzy
-msgid "${1}"
+#. mail:no-save-path secondary
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
msgstr "{1}"
#. mail-composer:attach-notfile primary
#: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgstr "文件“{0}”不是普通文件,无法在邮件中发送。"
#. mail-composer:attach-directory primary
#: composer/mail-composer-errors.xml.h:8
msgid "Directories can not be attached to Messages."
-msgstr ""
+msgstr "无法将目录作为邮件的附件。"
#. mail-composer:attach-directory secondary
#: composer/mail-composer-errors.xml.h:10
@@ -11813,9 +11646,8 @@ msgstr ""
#. mail-composer:recover-autosave title
#: composer/mail-composer-errors.xml.h:12
-#, fuzzy
msgid "Unfinished messages found"
-msgstr "下一封未读邮件"
+msgstr ""
#. mail-composer:recover-autosave primary
#: composer/mail-composer-errors.xml.h:14
@@ -11830,25 +11662,22 @@ msgid ""
msgstr ""
#: composer/mail-composer-errors.xml.h:17
-#, fuzzy
msgid "Don't Recover"
-msgstr "不删除"
+msgstr "不恢复"
#: composer/mail-composer-errors.xml.h:18
-#, fuzzy
msgid "Recover"
-msgstr "删除"
+msgstr "恢复"
#. mail-composer:no-autosave primary
#: composer/mail-composer-errors.xml.h:20
-#, fuzzy
msgid "Could not save to autosave file \"{0}\"."
-msgstr "无法保存到文件“{0}”。"
+msgstr "无法保存到自动保存文件“{0}”。"
#. mail-composer:no-autosave secondary
#: composer/mail-composer-errors.xml.h:22
msgid "Error saving to autosave because \"{1}\"."
-msgstr ""
+msgstr "保存到自动保存出错,原因是“{1}”。"
#. mail-composer:exit-unsaved title
#: composer/mail-composer-errors.xml.h:24
@@ -11872,48 +11701,73 @@ msgid ""
msgstr ""
#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
msgid "Discard Changes"
-msgstr "丢弃更改(_D)"
+msgstr "丢弃更改"
#: composer/mail-composer-errors.xml.h:30
-#, fuzzy
msgid "Save Message"
-msgstr "保存邮件..."
+msgstr "保存邮件"
#. mail-composer:no-build-message primary
#: composer/mail-composer-errors.xml.h:32
-#, fuzzy
msgid "Could not create message."
-msgstr "无法创建管道:%s"
+msgstr "无法创建邮件。"
#. mail-composer:no-build-message secondary
#: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+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}”。"
+msgstr "无法读取签名文件“{0}”。"
#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-#, fuzzy
-msgid "Because \"${1}\"."
+#. mail:no-create-tmp-path secondary
+#. mail:no-delete-folder secondary
+#. system:no-save-file secondary
+#. system:no-load-file secondary
+#: composer/mail-composer-errors.xml.h: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}\"."
msgstr "原因是“{1}”。"
#. mail-composer:all-accounts-deleted primary
#: composer/mail-composer-errors.xml.h:40
msgid "All accounts have been removed."
-msgstr ""
+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."
msgstr "在您可以撰写邮件之前您需要配置一个帐户。"
+#. mail-composer:no-address-control primary
+#. mail-composer:no-editor-control primary
+#: composer/mail-composer-errors.xml.h:44
+#: composer/mail-composer-errors.xml.h:48
+msgid "Could not create composer window."
+msgstr "无法创建撰写器窗口。"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:46
+msgid "Unable to activate the address selector control."
+msgstr "无法激活地址选择控制。"
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:50
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"无法激活 HTML 编辑器组件。\n"
+"请确定您的 gtkhtml 和 libgtkhtml 所安装的版"
+"本正确。\n"
+
#: data/evolution.desktop.in.in.h:1
msgid "The Ximian Evolution Groupware Suite"
msgstr "Ximian Evolution 群件套件"
@@ -12200,7 +12054,7 @@ msgstr[0] "%d 年前"
#: filter/filter-datespec.c:280
msgid "<click here to select a date>"
-msgstr "<点击这里以选择日期>"
+msgstr "<单击此处以选择日期>"
#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
msgid "now"
@@ -12444,12 +12298,10 @@ msgid "Execute actions"
msgstr "执行动作"
#: filter/filter-rule.c:877
-#, fuzzy
msgid "All related"
-msgstr "被委任的"
+msgstr "相关的全部"
#: filter/filter-rule.c:877
-#, fuzzy
msgid "Replies"
msgstr "回复"
@@ -12458,9 +12310,8 @@ msgid "Replies and parents"
msgstr ""
#: filter/filter-rule.c:879
-#, fuzzy
msgid "Include threads"
-msgstr "包含远程测试(_N)"
+msgstr "包含线索"
#: filter/filter-rule.c:974
msgid "incoming"
@@ -12528,9 +12379,8 @@ msgid "Virtual _Folders"
msgstr "虚拟文件夹(_F)"
#: filter/vfolder-rule.c:493
-#, fuzzy
msgid "_Add"
-msgstr "添加(_D)"
+msgstr "添加(_A)"
#: filter/vfolder-rule.c:573
msgid "VFolder source"
@@ -12570,13 +12420,13 @@ msgstr "签名"
msgid "-------- Forwarded Message --------"
msgstr "-------- 转发的邮件 --------"
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
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:1509
+#: mail/em-composer-utils.c:1505
msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
msgstr "在%Y年%m月%d日的%H:%M,%%s写道:"
@@ -12608,121 +12458,125 @@ msgstr "下一封未读邮件"
#: mail/em-folder-selection-button.c:120
msgid "<click here to select a folder>"
-msgstr "<点击这里以便选择文件夹>"
+msgstr "<单击此处以便选择文件夹>"
#: mail/em-folder-selector.c:166
msgid "Create New Folder"
msgstr "创建新文件夹"
-#: 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
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2309
+#: mail/mail-component.c:719
msgid "Specify where to create the folder:"
msgstr "指定在哪里创建文件夹:"
-#: mail/em-folder-selector.c:299
-#, fuzzy
+#: mail/em-folder-selector.c:300
msgid "Create"
-msgstr "创建文件夹"
+msgstr "创建"
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
msgid "Folder _name:"
msgstr "文件夹名称(_N):"
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree.c:841
#, c-format
msgid "Moving folder %s"
msgstr "移动文件夹“%s”"
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:843
#, c-format
msgid "Copying folder %s"
msgstr "复制文件夹 %s"
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:850 mail/message-list.c:1561
#, c-format
msgid "Moving messages into folder %s"
msgstr "把邮件移动到文件夹 %s"
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:852 mail/message-list.c:1563
#, c-format
msgid "Copying messages into folder %s"
msgstr "把邮件复制到文件夹 %s"
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:868
msgid "Cannot drop message(s) into toplevel store"
msgstr "无法将邮件放到顶级文件夹存储"
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:958 ui/evolution-mail-message.xml.h:110
msgid "_Copy to Folder"
msgstr "复制到文件夹(_C)"
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:959 ui/evolution-mail-message.xml.h:119
msgid "_Move to Folder"
msgstr "移动到文件夹(_M)"
-#: 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
+#: mail/em-folder-tree.c:961 mail/em-folder-tree.c:2096
+#: mail/em-folder-view.c:798 mail/message-list.c:1651
msgid "_Move"
msgstr "移动(_M)"
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:963 mail/message-list.c:1653
msgid "Cancel _Drag"
msgstr "取消拖曳(_D)"
-#: mail/em-folder-tree.c:2037 mail/em-folder-tree.c:2050
+#: mail/em-folder-tree.c:2083 mail/em-folder-tree.c:2096
#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
#: mail/importers/evolution-mbox-importer.c:119
#: mail/importers/evolution-outlook-importer.c:133
msgid "Select folder"
msgstr "选择文件夹"
-#: mail/em-folder-tree.c:2037 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2083 mail/em-folder-view.c:812
msgid "C_opy"
msgstr "复制(_O)"
-#: mail/em-folder-tree.c:2077
+#: mail/em-folder-tree.c:2123
#, c-format
msgid "Creating folder `%s'"
msgstr "创建文件夹“%s”"
-#: mail/em-folder-tree.c:2263 mail/mail-component.c:692
+#: mail/em-folder-tree.c:2309 mail/mail-component.c:719
msgid "Create folder"
msgstr "创建文件夹"
-#: mail/em-folder-tree.c:2452
+#: mail/em-folder-tree.c:2498
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "把文件夹“%s”重命名为:"
-#: mail/em-folder-tree.c:2454
+#: mail/em-folder-tree.c:2500
msgid "Rename Folder"
msgstr "重命名文件夹"
-#: mail/em-folder-tree.c:2525 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2571 ui/evolution-addressbook.xml.h:44
#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
msgid "_View"
msgstr "查看(_V)"
-#: mail/em-folder-tree.c:2526
+#: mail/em-folder-tree.c:2572
msgid "Open in _New Window"
msgstr "在新窗口中打开(_N)"
+#: mail/em-folder-tree.c:2576
+msgid "_Copy..."
+msgstr "复制(_C)..."
+
+#: mail/em-folder-tree.c:2577
+msgid "_Move..."
+msgstr "移动(_M)..."
+
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2535
+#: mail/em-folder-tree.c:2581
msgid "_New Folder..."
msgstr "新建文件夹(_N)..."
-#: mail/em-folder-tree.c:2538
-msgid "_Rename"
-msgstr "重命名(_R)"
+#: mail/em-folder-tree.c:2584
+msgid "_Rename..."
+msgstr "重命名(_R)..."
-#: mail/em-folder-tree.c:2541 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "属性(_P)..."
+#: mail/em-folder-tree.c:2587 ui/evolution-mail-list.xml.h:27
+msgid "_Properties"
+msgstr "属性(_P)"
#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
#: mail/mail-vfolder.c:888
@@ -12745,8 +12599,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:496
-#: mail/mail-component.c:542
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:516
+#: mail/mail-component.c:569
msgid "Mail"
msgstr "邮件"
@@ -12880,23 +12734,23 @@ msgid "Filter on _Mailing List"
msgstr "基于邮件列表过滤(_M)"
#. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
#: mail/mail-config.glade.h:68
msgid "Default"
msgstr "默认"
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1800
msgid "Print Message"
msgstr "打印邮件"
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2080
msgid "_Copy Link Location"
msgstr "复制链接位置(_C)"
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2345
#, c-format
msgid "Click to mail %s"
-msgstr "点击以给 %s 发送邮件"
+msgstr "单击以给 %s 发送邮件"
#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
@@ -12926,7 +12780,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:1079
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
msgid "Subject"
msgstr "主题"
@@ -12936,9 +12790,8 @@ msgid "Date"
msgstr "日期"
#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-#, fuzzy
msgid "Newsgroups"
-msgstr "新建任务组"
+msgstr "新闻组"
#: mail/em-format.c:993
#, c-format
@@ -12946,9 +12799,8 @@ 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 邮件。显示源文本。"
+msgstr "无法解析 S/MIME 邮件:未知错误"
#: mail/em-format.c:1133
msgid "Unsupported encryption type for multipart/encrypted"
@@ -12995,24 +12847,20 @@ 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 "未定义"
+msgstr "未加密"
#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-#, fuzzy
msgid "Encrypted, weak"
-msgstr "加密内容"
+msgstr "弱加密"
#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-#, fuzzy
msgid "Encrypted"
-msgstr "PGP 加密"
+msgstr "加密"
#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-#, fuzzy
msgid "Encrypted, strong"
-msgstr "加密内容"
+msgstr "强加密"
#: mail/em-format-html.c:820
msgid "Malformed external-body part."
@@ -13056,12 +12904,12 @@ 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 ""
+msgstr "<I> (%A,%R %Z)</I>"
#. 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 ""
+msgstr "<I> (%R %Z)</I>"
#. message-search popup match count string
#: mail/em-format-html-display.c:410
@@ -13124,20 +12972,17 @@ msgid ""
"practical amount of time."
msgstr ""
-#: mail/em-format-html-display.c:757
-#, fuzzy
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
msgid "_View Certificate"
-msgstr "证书"
+msgstr "查看证书(_V)"
#: mail/em-format-html-display.c:772
-#, fuzzy
msgid "This certificate is not viewable"
-msgstr "证书未生效"
+msgstr "此证书不可查看"
#: mail/em-format-html-display.c:1007
-#, fuzzy
msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "到 %m月%d日%A,%H:%M"
+msgstr "%Y年%m月%d日%A,%H:%M完成"
#: mail/em-format-html-display.c:1015
msgid "Overdue:"
@@ -13165,26 +13010,22 @@ msgid "Spamassassin (built-in)"
msgstr ""
#: mail/em-mailer-prefs.c:100
-#, fuzzy
msgid "Every time"
-msgstr "每 %d 年"
+msgstr "每次"
#: mail/em-mailer-prefs.c:101
msgid "Once per day"
-msgstr ""
+msgstr "每天一次"
#: mail/em-mailer-prefs.c:102
-#, fuzzy
msgid "Once per week"
-msgstr "每 %d 周"
+msgstr "每周一次"
#: mail/em-mailer-prefs.c:103
-#, fuzzy
msgid "Once per month"
-msgstr "每 %d 月"
+msgstr "每月一次"
#: mail/em-migrate.c:1168
-#, fuzzy
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
"since Evolution 1.x.\n"
@@ -13196,16 +13037,15 @@ msgstr ""
"请稍候,Evolution 正在升迁您的文件夹..."
#: mail/em-migrate.c:1602
-#, fuzzy, c-format
+#, c-format
msgid "Unable to create new folder `%s': %s"
msgstr ""
-"无法创建输出文件:%s\n"
-" %s"
+"无法创建新文件夹“%s”:%s"
#: mail/em-migrate.c:1628
-#, fuzzy, c-format
+#, c-format
msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "无法将文件夹 %s 改名为 %s:%s"
+msgstr "无法将文件夹“%s”复制为“%s”:%s"
#: mail/em-migrate.c:1811
#, c-format
@@ -13287,7 +13127,7 @@ msgstr "此存储不支持订阅,或订阅未启用。"
msgid "Subscribed"
msgstr "已订阅"
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
msgid "Folder"
msgstr "文件夹"
@@ -13463,9 +13303,8 @@ msgid "List of accepted licenses"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:31
-#, fuzzy
msgid "List of accounts"
-msgstr "邮件账户"
+msgstr "账户列表"
#: mail/evolution-mail.schemas.in.in.h:32
msgid ""
@@ -13616,14 +13455,12 @@ 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 邮件吗?"
+msgstr "默认以 HTML 发送邮件"
#: mail/evolution-mail.schemas.in.in.h:66
-#, fuzzy
msgid "Send HTML mail by default."
-msgstr "发送 HTML 邮件吗?"
+msgstr "默认以 HTML 发送邮件。"
#: mail/evolution-mail.schemas.in.in.h:67
#, fuzzy
@@ -13653,18 +13490,16 @@ 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)"
+msgstr "新邮件到达时要播放的声音文件。"
#: 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 "拼写检查"
+msgstr "内嵌拼写检查"
#: mail/evolution-mail.schemas.in.in.h:76
msgid "Subscribe dialog default height"
@@ -13751,9 +13586,8 @@ 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):"
+msgstr "变宽字体"
#: mail/evolution-mail.schemas.in.in.h:96
msgid "View/Bcc menu item is checked"
@@ -14110,66 +13944,73 @@ msgstr "%s 邮件列表"
msgid "Add Filter Rule"
msgstr "添加过滤规则"
-#: mail/mail-component.c:449
+#: mail/mail-component.c:469
#, c-format
msgid "%d deleted"
-msgstr "%d 封已删除"
+msgid_plural "%d deleted"
+msgstr[0] "%d 封已删除"
-#: mail/mail-component.c:451
+#: mail/mail-component.c:471
#, c-format
msgid "%d junk"
-msgstr "%d 封垃圾"
+msgid_plural "%d junk"
+msgstr[0] "%d 封垃圾"
-#: mail/mail-component.c:474
+#: mail/mail-component.c:494
#, c-format
-msgid "%d drafts"
-msgstr "%d 封草稿"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d 封草稿"
-#: mail/mail-component.c:476
+#: mail/mail-component.c:496
#, c-format
msgid "%d sent"
-msgstr "%d 已发"
+msgid_plural "%d send"
+msgstr[0] "%d 已发"
-#: mail/mail-component.c:478
+#: mail/mail-component.c:498
#, c-format
msgid "%d unsent"
-msgstr "%d 封未发"
+msgid_plural "%d unsent"
+msgstr[0] "%d 封未发"
-#: mail/mail-component.c:482
+#: mail/mail-component.c:502
#, c-format
msgid "%d total"
-msgstr "总共 %d 封"
+msgid_plural "%d total"
+msgstr[0] "总共 %d 封"
-#: mail/mail-component.c:484
+#: mail/mail-component.c:504
#, c-format
msgid ", %d unread"
-msgstr ",%d 封未读"
+msgid_plural ", %d unread"
+msgstr[0] ",%d 封未读"
-#: mail/mail-component.c:644
+#: mail/mail-component.c:671
msgid "New Mail Message"
msgstr "新建邮件"
-#: mail/mail-component.c:645
+#: mail/mail-component.c:672
msgid "_Mail Message"
msgstr "邮件(_M)"
-#: mail/mail-component.c:646
+#: mail/mail-component.c:673
msgid "Compose a new mail message"
msgstr "撰写一封新邮件"
-#: mail/mail-component.c:652
+#: mail/mail-component.c:679
msgid "New Mail Folder"
msgstr "新建邮件文件夹"
-#: mail/mail-component.c:653
+#: mail/mail-component.c:680
msgid "Mail _Folder"
msgstr "邮件文件夹(_F)"
-#: mail/mail-component.c:654
+#: mail/mail-component.c:681
msgid "Create a new mail folder"
msgstr "创建新邮件文件夹"
-#: mail/mail-component.c:786
+#: mail/mail-component.c:813
msgid "Failed upgrading Mail settings or folders."
msgstr "升级邮件设置或文件夹失败。"
@@ -14447,13 +14288,12 @@ 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)"
+msgstr "检查收到的邮件是否是垃圾邮件"
#: mail/mail-config.glade.h:58
msgid "Color for _misspelled words:"
-msgstr "给错误拼写的单词上色(_M):"
+msgstr "给错误拼写的单词着色(_M):"
#: mail/mail-config.glade.h:59
msgid "Colors"
@@ -14498,7 +14338,7 @@ msgstr "无法引用原始邮件"
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(同 Outlook 兼容)(_M)"
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74
msgid "Done"
msgstr "完成"
@@ -15048,14 +14888,8 @@ 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}"
+msgstr "无法保存到目录“{0}”。"
#. mail:no-create-path primary
#. mail:no-write-path-exists primary
@@ -15067,50 +14901,33 @@ 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"
+msgstr "无法创建保存目录,原因是“{0}”"
#. 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}”。"
+msgstr "无法创建临时保存目录。"
#. mail:no-write-path-exists secondary
#: mail/mail-errors.xml.h:104
-#, fuzzy
msgid "File exists but cannot overwrite it."
-msgstr ""
-"%s 已经存在\n"
-"您打算覆盖它吗?"
+msgstr "文件已存在,但无法覆盖。"
#. mail:no-write-path-notfile secondary
#: mail/mail-errors.xml.h:108
-#, fuzzy
msgid "File exists but is not a regular file."
-msgstr "“%s”并不是普通文件。"
+msgstr "文件已存在但并不是普通文件。"
#. mail:no-delete-folder primary
#: mail/mail-errors.xml.h:110
-#, fuzzy
msgid "Cannot delete folder \"{0}\"."
-msgstr "无法保存文件“{0}”。"
+msgstr "无法删除文件夹“{0}”。"
#. mail:no-delete-spethal-folder primary
#: mail/mail-errors.xml.h:114
-#, fuzzy
msgid "Cannot delete system folder \"{0}\"."
-msgstr "无法保存文件“{0}”。"
+msgstr "无法删除系统文件夹“{0}”。"
#. mail:no-delete-spethal-folder secondary
#. mail:no-rename-spethal-folder secondary
@@ -15122,9 +14939,8 @@ msgstr ""
#. mail:no-rename-spethal-folder primary
#: mail/mail-errors.xml.h:118
-#, fuzzy
msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "无法保存到文件“{0}”。"
+msgstr "无法重命名或移动系统文件夹“{0}”。"
#. mail:ask-delete-folder title
#: mail/mail-errors.xml.h:122
@@ -15133,9 +14949,8 @@ 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 "父文件夹不允许含有子文件夹"
+msgstr "真的要删除文件夹“{0}”及其全部子文件夹吗??"
#. mail:ask-delete-folder secondary
#: mail/mail-errors.xml.h:126
@@ -15147,9 +14962,8 @@ 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}”。"
+msgstr "无法将“{0}”重命名为“{1}”。"
#. mail:no-rename-folder-exists secondary
#. mail:vfolder-notunique secondary
@@ -15165,53 +14979,47 @@ 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}”。"
+msgstr "无法将文件夹“{0}”移动到“{1}”。"
#. mail:no-move-folder-nostore secondary
#. mail:no-copy-folder-nostore secondary
#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
-#, fuzzy
msgid "Cannot open source \"{2}\"."
-msgstr "无法打开文件“{0}”。"
+msgstr "无法打开源“{2}”。"
#. mail:no-move-folder-to-nostore secondary
#. mail:no-copy-folder-to-nostore secondary
#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
-#, fuzzy
msgid "Cannot open target \"{2}\"."
-msgstr "无法打开文件“{0}”。"
+msgstr "无法打开目标“{2}”。"
#. mail:no-copy-folder-nostore primary
#. mail:no-copy-folder-to-nostore primary
#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
-#, fuzzy
msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "无法打开文件“{0}”。"
+msgstr "无法将文件夹“{0}”复制到“{1}”。"
#. mail:no-create-folder-nostore primary
#: mail/mail-errors.xml.h:152
-#, fuzzy
msgid "Cannot create folder \"{0}\"."
-msgstr "无法保存文件“{0}”。"
+msgstr "无法创建文件夹“{0}”。"
#. mail:no-create-folder-nostore secondary
#: mail/mail-errors.xml.h:154
-#, fuzzy
msgid "Cannot open source \"{1}\""
-msgstr "无法打开文件“{0}”。"
+msgstr "无法打开源“{1}”"
#. mail:account-incomplete primary
#. mail:account-notunique primary
#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
msgid "Cannot save changes to account."
-msgstr ""
+msgstr "无法将更改保存到账户。"
#. mail:account-incomplete secondary
#: mail/mail-errors.xml.h:158
msgid "You have not filled in all of the required information."
-msgstr "您还没有填写所有必须的信息。"
+msgstr "您还没有填写所有必需的信息。"
#. mail:account-notunique secondary
#: mail/mail-errors.xml.h:162
@@ -15235,13 +15043,12 @@ msgstr ""
#: mail/mail-errors.xml.h:169
msgid "Don't delete"
-msgstr "不要删除"
+msgstr "不删除"
#. mail:no-save-signature primary
#: mail/mail-errors.xml.h:171
-#, fuzzy
msgid "Could not save signature file."
-msgstr "证书签名失败"
+msgstr "无法保存签名文件。"
#. mail:no-save-signature secondary
#: mail/mail-errors.xml.h:173
@@ -15250,9 +15057,8 @@ msgstr "原因是“{0}”。"
#. mail:signature-notscript primary
#: mail/mail-errors.xml.h:175
-#, fuzzy
msgid "Cannot set signature script \"{0}\"."
-msgstr "无法保存文件“{0}”。"
+msgstr "无法设置签名脚本“{0}”。"
#. mail:signature-notscript secondary
#: mail/mail-errors.xml.h:177
@@ -15280,9 +15086,8 @@ 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”不存在。"
+msgstr "无法编辑虚拟文件夹“{0}”,因为它不存在。"
#. mail:vfolder-notexist secondary
#: mail/mail-errors.xml.h:188
@@ -15293,9 +15098,8 @@ msgstr ""
#. mail:vfolder-notunique primary
#: mail/mail-errors.xml.h:190
-#, fuzzy
msgid "Cannot add vFolder \"{0}\"."
-msgstr "无法保存文件“{0}”。"
+msgstr "无法添加虚拟文件夹“{0}”。"
#. mail:vfolder-updated primary
#: mail/mail-errors.xml.h:194
@@ -15591,24 +15395,24 @@ msgstr "正在更新..."
msgid "Waiting..."
msgstr "正在等待..."
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
msgid "User canceled operation."
msgstr "用户己取消操作。"
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
msgid "Enter Password"
msgstr "输入密码"
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
msgid "_Remember this password"
msgstr "记住该密码(_R)"
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
msgid "_Remember this password for the remainder of this session"
msgstr "在本会话中记住该密码(_R)"
@@ -15735,7 +15539,7 @@ msgstr "%m月%d日 %H:%M"
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
msgid "Generating message list"
msgstr "生成邮件列表"
@@ -15895,43 +15699,47 @@ msgid ""
msgstr ""
#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr "工具栏可见"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
msgid "Whether Evolution should start up in offline mode"
msgstr "Evolution 是否要以脱机模式启动"
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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:13
msgid "Whether to skip the development warning dialog"
msgstr "是否跳过开发警告对话框"
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
msgid "mail"
msgstr "邮件"
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr ""
-
-#: shell/e-shell.c:579 shell/e-shell.c:580
+#: shell/e-shell.c:588 shell/e-shell.c:589
#, c-format
msgid "%ld KB"
msgstr "%ld KB"
-#: shell/e-shell.c:777
+#: shell/e-shell.c:786
msgid "Uknown system error."
msgstr "未知的系统错误。"
-#: shell/e-shell.c:1134
+#: shell/e-shell.c:1143
msgid "Invalid arguments"
msgstr "无效参数"
-#: shell/e-shell.c:1136
+#: shell/e-shell.c:1145
msgid "Cannot register on OAF"
msgstr "无法注册到 OAF"
-#: shell/e-shell.c:1138
+#: shell/e-shell.c:1147
msgid "Configuration Database not found"
msgstr "找不到配置数据库"
-#: shell/e-shell.c:1140
+#: shell/e-shell.c:1149
msgid "Generic error"
msgstr "通用错误"
@@ -15987,7 +15795,7 @@ msgstr ""
msgid "Select importer"
msgstr "选择导入器"
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
#, c-format
msgid "File %s does not exist"
msgstr "文件 %s 不存在"
@@ -16015,31 +15823,31 @@ msgstr ""
"导入 %s\n"
"导入第1项。"
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
msgid "Automatic"
msgstr "自动"
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
msgid "F_ilename:"
msgstr "文件名(_I):"
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
msgid "Select a file"
msgstr "选择一个文件"
-#: shell/e-shell-importer.c:614
+#: shell/e-shell-importer.c:642
msgid "File _type:"
msgstr "文件类型(_T):"
-#: shell/e-shell-importer.c:653
+#: shell/e-shell-importer.c:681
msgid "Import data and settings from _older programs"
-msgstr "从老版程序中导入数据和设置(_O)"
+msgstr "从旧版程序中导入数据和设置(_O)"
-#: shell/e-shell-importer.c:656
+#: shell/e-shell-importer.c:684
msgid "Import a _single file"
msgstr "导入单个文件(_S)"
-#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
msgid ""
"Please wait...\n"
"Scanning for existing setups"
@@ -16047,25 +15855,25 @@ msgstr ""
"请稍候...\n"
"正在扫描现有设置"
-#: shell/e-shell-importer.c:728
+#: shell/e-shell-importer.c:756
msgid "Starting Intelligent Importers"
msgstr "启动智能导入器"
-#: shell/e-shell-importer.c:854 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
#, c-format
msgid "From %s:"
msgstr "从 %s:"
-#: shell/e-shell-importer.c:1045
+#: shell/e-shell-importer.c:1073
#, c-format
msgid "No importer available for file %s"
msgstr "没有可供文件 %s 使用的导入器"
-#: shell/e-shell-importer.c:1057
+#: shell/e-shell-importer.c:1085
msgid "Unable to execute importer"
msgstr "无法执行导入器"
-#: shell/e-shell-importer.c:1170
+#: shell/e-shell-importer.c:1199
msgid "_Import"
msgstr "导入(_I)"
@@ -16110,61 +15918,56 @@ msgstr "文件夹名不能含有字符“#”。"
msgid "'.' and '..' are reserved folder names."
msgstr "“.”和“..”是保留文件夹名。"
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Evolution 目前联机。点击该按钮可脱机工作。"
+msgstr "Evolution 目前联机。单击该按钮可脱机工作。"
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
msgid "Evolution is in the process of going offline."
msgstr "Evolution 正在脱机过程中。"
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "Evolution 目前脱机。点击该按钮可在线工作。"
+msgstr "Evolution 目前脱机。单击该按钮可在线工作。"
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
#, c-format
msgid "Switch to %s"
msgstr "切换到 %s"
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr "GNOME Pilot 工具好像并未安装到系统中。"
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
#, c-format
msgid "Error executing %s."
msgstr "执行 %s 错误。"
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
msgid "Bug buddy is not installed."
msgstr "未安装 Bug buddy。"
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
msgid "Bug buddy could not be run."
msgstr "无法运行 Bug buddy。"
-#: shell/e-shell-window-commands.c:171
-#, fuzzy
-msgid "About Evolution"
-msgstr "关于 Evolution..."
+#: shell/e-shell-window-commands.c:322
+msgid "Groupware Suite"
+msgstr "Groupwise 套件"
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:562
msgid "_Work Online"
msgstr "联机工作(_W)"
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
msgid "_Work Offline"
msgstr "脱机工作(_W)"
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
msgid "Work Offline"
msgstr "脱机工作"
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "复选框"
-
#: shell/e-user-creatable-items-handler.c:691
msgid "New"
msgstr "新建"
@@ -16181,94 +15984,6 @@ msgstr "测试(_T)"
msgid "Create a new test item"
msgstr "创建新测试项"
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>当前连接</b>"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "当前连接"
-
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "点击确定以关闭这些连接并下线"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "日历(_A):"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-msgid "_Contacts:"
-msgstr "联系人(_C):"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "邮件(_M):"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "任务(_T):"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "文件夹类型(_T):"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "打开其他用户的文件夹"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "账户(_A):"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "文件夹名称(_F):"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "用户(_U):"
-
-#: shell/glade/evolution-startup-wizard.glade.h:2
-msgid "Evolution Setup Assistant"
-msgstr "Evolution 设置助手"
-
-#: shell/glade/evolution-startup-wizard.glade.h:3
-msgid "Importing Files"
-msgstr "导入文件"
-
-#: shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Timezone "
-msgstr "时区"
-
-#: shell/glade/evolution-startup-wizard.glade.h:5
-msgid "Welcome"
-msgstr "欢迎"
-
-#: shell/glade/evolution-startup-wizard.glade.h:6
-msgid ""
-"Welcome to Evolution. The next few screens will allow\n"
-"Evolution to connect to your email accounts, and to import\n"
-"files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"欢迎使用 Evolution。下面的几个屏幕将允许 Evolution\n"
-"连接到您的电子邮件帐户,并且从其它程序中导入文件。\n"
-"\n"
-"请单击“前进”按钮继续。"
-
-#: shell/glade/evolution-startup-wizard.glade.h:11
-msgid ""
-"You have successfully entered all of the information\n"
-"needed to set up Evolution. \n"
-"\n"
-"Click the \"Apply\" button to save your settings. "
-msgstr ""
-"您已经成功输入了设置 Evolution 所有必需的信息。\n"
-"\n"
-"单击“应用”按钮可保存您的设置。"
-
#: shell/GNOME_Evolution_Shell.server.in.in.h:1
msgid "Evolution Shell"
msgstr "Evolution 外壳"
@@ -16283,7 +15998,7 @@ msgstr "Evolution 测试组件"
#: shell/importer/import.glade.h:1
msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "点击“导入”以便开始将文件导入到 Evolution。"
+msgstr "单击“导入”以便开始将文件导入到 Evolution。"
#: shell/importer/import.glade.h:2
msgid "Evolution Import Assistant"
@@ -16420,102 +16135,30 @@ msgstr ""
"%s:不能同时使用 --online 和 --offline。\n"
" 详情请使用 %s --help。\n"
-#. shell:upgrade-nospace primary
-#: shell/shell-errors.xml.h:2
-msgid "Insufficient disk space for upgrade."
-msgstr "磁盘空间不足以升级。"
-
-#. shell:upgrade-nospace secondary
-#: shell/shell-errors.xml.h:4
-msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-
-#. shell:upgrade-failed primary
-#: shell/shell-errors.xml.h:8
-msgid ""
-"Upgrade from previous version failed:\n"
-"{0}"
-msgstr ""
-
-#. shell:upgrade-failed secondary
-#: shell/shell-errors.xml.h:11
-msgid ""
-"{1}\n"
-"\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
-msgstr ""
-
-#: shell/shell-errors.xml.h:15
-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 无法启动。"
-
-#. shell:noshell secondary
-#: shell/shell-errors.xml.h:21
-msgid ""
-"Your system configuration does not match your Evolution configuration.\n"
-"\n"
-"Click help for details"
-msgstr ""
-"您的系统配置与您的 Evolution 配置不相符。\n"
-"\n"
-"请单击帮助以查看细节"
-
-#. 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
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
msgid "Select a cert to import..."
msgstr "选择要导入的证书..."
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
msgid "Certificate Name"
msgstr "证书名称"
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
msgid "Purposes"
msgstr "用途"
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
msgid "Serial Number"
msgstr "序列号"
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
msgid "Expires"
msgstr "到期"
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
msgid "E-Mail Address"
msgstr "电子邮件地址"
@@ -16544,14 +16187,14 @@ msgstr "输入新密码"
msgid ""
"Issued to:\n"
" Subject: %s\n"
-msgstr ""
+msgstr "发行给:\n 主题:%s\n"
#: smime/gui/e-cert-selector.c:122
#, c-format
msgid ""
"Issued by:\n"
" Subject: %s\n"
-msgstr ""
+msgstr "发行者:\n 主题:%s\n"
#: smime/gui/e-cert-selector.c:169
msgid "Select certificate"
@@ -16611,7 +16254,7 @@ msgid ""
"and its policy and procedures (if available)."
msgstr ""
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
msgid "Certificate"
msgstr "证书"
@@ -16631,43 +16274,42 @@ 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?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
msgstr ""
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
msgid "Dummy window only"
msgstr ""
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
msgid "Edit"
msgstr "编辑"
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:23
#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "无效的证书颁发机构(CA)"
+
+#: smime/gui/smime-ui.glade.h:24
msgid "Email Recipient Certificate"
-msgstr "选择证书"
+msgstr "电子邮件收件人证书"
#: smime/gui/smime-ui.glade.h:25
-#, fuzzy
msgid "Email Signer Certificate"
-msgstr "签名证书(_G):"
+msgstr "电子邮件签名者证书"
#: smime/gui/smime-ui.glade.h:26
-#, fuzzy
msgid "Expires On"
msgstr "到期"
#: smime/gui/smime-ui.glade.h:29
-#, fuzzy
msgid "Issued On"
-msgstr "发行者"
+msgstr "发行日期"
#: smime/gui/smime-ui.glade.h:30
-#, fuzzy
msgid "MD5 Fingerprint"
-msgstr "<b>指纹</b>"
+msgstr "MD5 指纹"
#: smime/gui/smime-ui.glade.h:31
msgid "Organization (O)"
@@ -16678,267 +16320,271 @@ msgid "Organizational Unit (OU)"
msgstr "组织单元(OU)"
#: smime/gui/smime-ui.glade.h:33
-#, fuzzy
msgid "SHA1 Fingerprint"
-msgstr "<b>指纹</b>"
+msgstr "SHA1 指纹"
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
-#, fuzzy
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
msgid "SSL Client Certificate"
-msgstr "选择证书"
+msgstr "SSL 客户证书"
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
-#, fuzzy
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
msgid "SSL Server Certificate"
-msgstr "选择证书"
+msgstr "SSL 服务器证书"
#: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
msgstr ""
#: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
msgstr ""
#: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
msgstr ""
#: smime/gui/smime-ui.glade.h:40
-msgid "View"
-msgstr "查看"
+msgid "Trust this CA to identify web sites."
+msgstr ""
#: smime/gui/smime-ui.glade.h:41
-#, fuzzy
-msgid "View Certificate"
-msgstr "证书"
+msgid "View"
+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
+#: smime/gui/smime-ui.glade.h:43
msgid ""
"You have certificates on file that identify these certificate authorities:"
msgstr ""
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
msgid "You have certificates on file that identify these people:"
msgstr ""
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
msgid "Your Certificates"
msgstr "您的证书"
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr "编辑 CA 信任(_E)"
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
msgid "%d/%m/%Y"
msgstr "%Y-%m-%d"
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+msgid "Sign"
+msgstr "签名"
+
+#: smime/lib/e-cert.c:425
+msgid "Encrypt"
+msgstr "加密"
+
+#: smime/lib/e-cert.c:530
msgid "Version"
msgstr "版本"
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
msgid "Version 1"
msgstr "版本 1"
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
msgid "Version 2"
msgstr "版本 2"
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
msgid "Version 3"
msgstr "版本 3"
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
msgid "PKCS #1 MD2 With RSA Encryption"
msgstr ""
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
msgid "PKCS #1 MD5 With RSA Encryption"
msgstr ""
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
msgid "PKCS #1 SHA-1 With RSA Encryption"
msgstr ""
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
msgid "C"
msgstr "C"
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
msgid "CN"
msgstr "CN"
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
msgid "OU"
msgstr "OU"
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
msgid "O"
msgstr "O"
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
msgid "L"
msgstr "L"
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
msgid "DN"
msgstr "DN"
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
msgid "DC"
msgstr "DC"
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
msgid "ST"
msgstr "ST"
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
msgid "PKCS #1 RSA Encryption"
msgstr ""
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
#, fuzzy
msgid "Certificate Key Usage"
msgstr "证书名称"
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
#, fuzzy
msgid "Netscape Certificate Type"
msgstr "证书名称"
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
#, fuzzy
msgid "Certificate Authority Key Identifier"
msgstr "证书颁发机构信任"
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
msgid "UID"
msgstr "UID"
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
#, c-format
msgid "Object Identifier (%s)"
msgstr ""
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
msgid "Algorithm Identifier"
msgstr ""
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
msgid "Algorithm Parameters"
msgstr ""
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
#, fuzzy
msgid "Subject Public Key Info"
msgstr "主题唯一 ID"
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
msgid "Subject Public Key Algorithm"
msgstr ""
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
#, fuzzy
msgid "Subject's Public Key"
msgstr "主题是 %s"
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
#, fuzzy
msgid "Error: Unable to process extension"
msgstr "无法处理脱机文件夹"
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
#, fuzzy
msgid "Object Signer"
msgstr "证书签名者"
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
#, fuzzy
msgid "SSL Certificate Authority"
msgstr "证书颁发机构信任"
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
#, fuzzy
msgid "Email Certificate Authority"
msgstr "无效的证书颁发机构(CA)"
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
msgid "Signing"
msgstr "签名"
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
#, fuzzy
msgid "Non-repudiation"
msgstr "没有信息"
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
#, fuzzy
msgid "Key Encipherment"
msgstr "密钥协议"
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
#, fuzzy
msgid "Data Encipherment"
msgstr "附件"
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
msgid "Key Agreement"
msgstr "密钥协议"
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
msgid "Certificate Signer"
msgstr "证书签名者"
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
msgid "CRL Signer"
msgstr "CRL 签名者"
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
msgid "Critical"
msgstr "关键"
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
msgid "Not Critical"
msgstr "非关键"
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
msgid "Extensions"
msgstr "扩展"
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
#, c-format
msgid "%s = %s"
msgstr "%s = %s"
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
msgid "Certificate Signature Algorithm"
msgstr "证书签名算法"
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
msgid "Issuer"
msgstr "发行者"
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
msgid "Issuer Unique ID"
msgstr "发行者唯一 ID"
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
msgid "Subject Unique ID"
msgstr "主题唯一 ID"
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
msgid "Certificate Signature Value"
msgstr "证书签名值"
#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
+#: smime/lib/e-cert-db.c:612
msgid "Certificate already exists"
msgstr "证书已经存在"
@@ -17083,7 +16729,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:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
msgid "_Actions"
msgstr "操作(_A)"
@@ -17242,7 +16888,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:3
+#: ui/evolution.xml.h:4
msgid "Close"
msgstr "关闭"
@@ -17255,7 +16901,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:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
msgid "Main toolbar"
msgstr "主工具栏"
@@ -17298,7 +16944,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:27
+#: ui/evolution.xml.h:29
msgid "_File"
msgstr "文件(_F)"
@@ -17555,13 +17201,13 @@ msgstr "反转选择(_I)"
msgid "_Threaded Message List"
msgstr "按线索编排的邮件列表(_T)"
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
msgid "Close this window"
msgstr "关闭此窗口"
#: ui/evolution-mail-messagedisplay.xml.h:5
#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
msgid "_Close"
msgstr "关闭(_C)"
@@ -17835,7 +17481,7 @@ msgstr "打印该邮件"
#: ui/evolution-mail-message.xml.h:83
msgid "Re_direct"
-msgstr "重定向(_D)"
+msgstr "重发(_D)"
#: ui/evolution-mail-message.xml.h:84
msgid "Redirect (bounce) the selected message to someone"
@@ -17957,7 +17603,7 @@ msgstr "上一封邮件(_P)"
msgid "_Quoted"
msgstr "引用(_Q)"
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
msgid "_Tools"
msgstr "工具(_T)"
@@ -18110,11 +17756,11 @@ msgstr "附件(_A)..."
#: ui/evolution-message-composer.xml.h:39
msgid "_Bcc Field"
-msgstr "暗中转发域(_B)"
+msgstr "暗送域(_B)"
#: ui/evolution-message-composer.xml.h:40
msgid "_Cc Field"
-msgstr "转发域(_C)"
+msgstr "抄送域(_C)"
#: ui/evolution-message-composer.xml.h:42
msgid "_Delete all"
@@ -18183,15 +17829,15 @@ msgstr "订阅"
#: ui/evolution-subscribe.xml.h:8
msgid "Unsubscribe"
-msgstr "取消订阅"
+msgstr "退订"
#: ui/evolution-task-editor.xml.h:1
msgid "Assign Task"
-msgstr "委派任务"
+msgstr "指派任务"
#: ui/evolution-task-editor.xml.h:2
msgid "Assign this task to others"
-msgstr "把该任务委派给别人"
+msgstr "把该任务指派给别人"
#: ui/evolution-task-editor.xml.h:3
msgid "Cancel Task"
@@ -18254,110 +17900,114 @@ msgid "_Open Task"
msgstr "打开任务(_O)"
#: ui/evolution.xml.h:1
-#, fuzzy
-msgid "About Ximian Evolution..."
+msgid "About Evolution..."
msgstr "关于 Evolution..."
#: ui/evolution.xml.h:2
msgid "Change Evolution's settings"
msgstr "更改 Evolution 的设置"
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+msgid "Change the visibility of the toolbar"
+msgstr "改变工具栏的可见性"
+
+#: ui/evolution.xml.h:6
msgid "Create a new window displaying this folder"
msgstr "创建显示此文件加的新窗口"
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
msgid "E_xit"
msgstr "退出(_X)"
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+msgid "Evolution _FAQ"
+msgstr "Evolution 常见问题(_F)"
+
+#: ui/evolution.xml.h:9
msgid "Exit the program"
msgstr "退出程序"
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
msgid "Forget _Passwords"
msgstr "丢弃密码(_P)"
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
msgid "Forget remembered passwords so you will be prompted for them again"
msgstr "保存的密码被丢弃,所以将再次提示您输入密码"
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
msgid "Import data from other programs"
msgstr "从其它程序导入数据"
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
msgid "New _Window"
msgstr "新建窗口(_W)"
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
msgid "Pi_lot Settings..."
msgstr "Pilot 设置(_L)..."
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
msgid "Send / Receive"
msgstr "发送/接收"
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
msgid "Send queued items and retrieve new items"
msgstr "发送队列中的的邮件并收取新邮件"
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
msgid "Set up Pilot configuration"
msgstr "配置 Pilot"
-#: ui/evolution.xml.h:17
-#, fuzzy
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+msgid "Show information about Evolution"
msgstr "显示关于 Evolution 的信息"
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
msgid "Submit Bug Report"
msgstr "提交错误报告"
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
msgid "Submit _Bug Report"
msgstr "提交错误报告(_B)"
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
msgid "Submit a bug report using Bug Buddy"
msgstr "用 Bug Buddy 提交错误报告"
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "切换是否脱机工作。"
-
#: ui/evolution.xml.h:23
-#, fuzzy
-msgid "Ximian Evolution _FAQ"
-msgstr "Evolution 常见问题(_F)"
+msgid "T_oolbar"
+msgstr "工具栏(_O)"
#: ui/evolution.xml.h:24
-#, fuzzy
-msgid "_About Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "切换是否脱机工作。"
+
+#: ui/evolution.xml.h:26
+msgid "_About Evolution..."
msgstr "关于 Evolution(_A)..."
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
msgid "_Help"
msgstr "帮助(_H)"
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
msgid "_Import..."
msgstr "导入(_I)..."
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
msgid "_New"
msgstr "新建(_N)"
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
msgid "_Quick Reference"
msgstr "快速首选项(_Q)"
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
msgid "_Send / Receive"
msgstr "发送/接收(_S)"
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
msgid "_Window"
msgstr "窗口(_W)"
@@ -18598,11 +18248,11 @@ msgid "Evolution Query"
msgstr "Evolution 查询"
#. setup a dummy error
-#: widgets/misc/e-error.c:415
-#, fuzzy, c-format
+#: widgets/misc/e-error.c:417
+#, c-format
msgid ""
"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr "<span weight=\"bold\">打印字体</span>"
+msgstr "<span weight=\"bold\">内部错误,请求了未知的错误“%s”</span>"
#: widgets/misc/e-expander.c:181
msgid "Expanded"
@@ -18746,50 +18396,3 @@ msgstr "%s (...)"
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)"