aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorJP Rosevear <jpr@src.gnome.org>2004-06-04 02:02:56 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-06-04 02:02:56 +0800
commit3048b4c9decd91d7c5baa0a9ec29f98a91976f1a (patch)
treeba6f25a662319846fd160fdb8d2211cc058f11af /po/zh_CN.po
parentdae1aa0ac0d5aa9e220f9de63b30f65ee0961665 (diff)
downloadgsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.tar
gsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.tar.gz
gsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.tar.bz2
gsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.tar.lz
gsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.tar.xz
gsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.tar.zst
gsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.zip
Merge from release branch.
svn path=/trunk/; revision=26178
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po3133
1 files changed, 1511 insertions, 1622 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0693034dcf..27771289ca 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,14 +8,14 @@
msgid ""
msgstr ""
"Project-Id-Version: Evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-22 19:19+0200\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
"PO-Revision-Date: 2004-05-23 04:53+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: a11y/addressbook/ea-addressbook-view.c:94
@@ -70,13 +70,13 @@ msgstr "无法读入 Pilot 的地址应用程序块"
msgid "Accessing LDAP Server anonymously"
msgstr "匿名访问 LDAP 服务器"
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
msgid "Failed to authenticate.\n"
msgstr "认证失败。\n"
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%s为 %s 输入口令 (用户 %s)"
@@ -121,34 +121,6 @@ msgstr "创建新联系人组"
msgid "Failed upgrading Addressbook settings or folders."
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "连接 LDAP 服务器失败"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "LDAP 服务器认证失败"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "无法在根 DSE 上执行查询"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "服务器响应为没有支持的搜索起点"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "此服务器不支持 LDAPv3 schema 信息"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "检索 schema 信息错误"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "服务器没有响应有效的 schema 信息"
-
#: addressbook/gui/component/addressbook-migrate.c:68
#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
msgid "Migrating..."
@@ -161,20 +133,16 @@ msgid "Migrating `%s':"
msgstr "升迁“%s”:"
#. create the local source group
-#. On This Computer is always first and VFolders is always last
-#: addressbook/gui/component/addressbook-migrate.c:508
+#: addressbook/gui/component/addressbook-migrate.c:464
#: 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:247 mail/mail-vfolder.c:218
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
msgid "On This Computer"
msgstr "在此计算机中"
#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
-#: addressbook/gui/component/addressbook-migrate.c:516
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: 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
@@ -182,19 +150,19 @@ msgid "Personal"
msgstr "个人"
#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:524
+#: addressbook/gui/component/addressbook-migrate.c:480
msgid "On LDAP Servers"
msgstr "在 LDAP 服务器上"
-#: addressbook/gui/component/addressbook-migrate.c:652
+#: addressbook/gui/component/addressbook-migrate.c:608
msgid "LDAP Servers"
msgstr "LDAP 服务器"
-#: addressbook/gui/component/addressbook-migrate.c:772
+#: addressbook/gui/component/addressbook-migrate.c:728
msgid "Autocompletion Settings"
msgstr "自动完成设置"
-#: addressbook/gui/component/addressbook-migrate.c:1148
+#: addressbook/gui/component/addressbook-migrate.c:1104
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -205,7 +173,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: addressbook/gui/component/addressbook-migrate.c:1162
+#: addressbook/gui/component/addressbook-migrate.c:1118
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -215,7 +183,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: addressbook/gui/component/addressbook-migrate.c:1171
+#: addressbook/gui/component/addressbook-migrate.c:1127
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -225,7 +193,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: addressbook/gui/component/addressbook-migrate.c:1181
+#: addressbook/gui/component/addressbook-migrate.c:1137
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -235,45 +203,33 @@ 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:674
+#: addressbook/gui/component/addressbook-view.c:675
#, c-format
msgid "Address book '%s' will be removed. Are you sure you want to continue?"
msgstr "即将删除日历“%s”。您确定想要继续吗?"
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
msgid "New Address Book"
msgstr "新地址簿"
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
#: ui/evolution-tasks.xml.h:6
msgid "Delete"
msgstr "删除"
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
msgid "Properties..."
msgstr "属性..."
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:1002
+#: addressbook/gui/component/addressbook-view.c:995
#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
#: calendar/gui/migration.c:373
msgid "Contacts"
msgstr "联系人"
@@ -349,10 +305,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
@@ -374,249 +326,209 @@ msgstr " 显示支持的基础(_H) "
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
+#: addressbook/gui/component/ldap-config.glade.h:17
#: calendar/gui/dialogs/task-editor.c:193
msgid "Basic"
msgstr "基本"
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "连接"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
#: smime/gui/smime-ui.glade.h:19
msgid "Details"
msgstr "细节"
-#: addressbook/gui/component/ldap-config.glade.h: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 将使用此已识别的名字在服务器上对您进行认证"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"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
+#, fuzzy
+msgid "Search _base:"
+msgstr "搜索基础:"
-#: 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
+#, fuzzy
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 服务器支持\n"
"SSL 或 TLS 时才连接到您的 LDAP 服务器。"
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
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。\n"
"例如,如果您和您的 LDAP 服务器工作时位于防火墙后,Evolution 就没有必\n"
"要使用 SSL/TLS,因为您的连接已经相当安全了。"
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
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。可能导致的结果将是\n"
"您的连接不太安全,您也易于受到安全漏洞的攻击。"
-#: 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
-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
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
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)。如果您将此处留空,搜索将从目\n"
"录树的根开始。"
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
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 ""
"搜索范围定义了您想要在目录树中搜索多深。搜索范围若为“子级”,则将包含您\n"
"指定的搜索基础下所属的全部项。搜索范围若为“一级”,则只会包含您指定的搜\n"
"索基础之下一级的项目。\n"
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:39
#, fuzzy
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 ""
"这是可下载条目的最大数量。将此数值设定\n"
"得太大将导致地址簿变慢。"
-#: 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 "
@@ -625,133 +537,112 @@ msgstr ""
"这是 evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
"对 ldap 服务器的匿名访问权限。"
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
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 文件夹列表中显示的名称。\n"
"它只用于显示。"
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
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 将试图连接到您所给出的标准端口列表。\n"
"如果您不清楚要指定端口,请询问您的系统管理员。"
-#: 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:"
-
-#: 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
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "查找可能的搜索基础"
+
+#: 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
+#, fuzzy
+msgid "_Log in:"
+msgstr "登录"
+
+#: 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
+#, fuzzy
+msgid "_Search scope:"
+msgstr "搜索范围:"
-#: 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
+#, fuzzy
+msgid "_Timeout:"
+msgstr "超时:"
-#: 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
-msgid "connecting-tab"
-msgstr "连接页"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-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
-msgid "searching-tab"
-msgstr "搜索页"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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:696
+#: 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"
@@ -791,7 +682,7 @@ msgstr "未命名的联系人"
#: addressbook/gui/component/select-names/e-select-names-table-model.c:351
#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
msgid "Source"
msgstr "来源"
@@ -856,9 +747,9 @@ msgid "<b>Work</b>"
msgstr "<b>工作</b>"
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
msgid "AIM"
msgstr "AIM"
@@ -892,15 +783,15 @@ msgid "Company:"
msgstr "公司:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:265
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: addressbook/gui/widgets/e-minicard.c:181
msgid "Contact"
msgstr "联系人"
#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:519
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
msgid "Contact Editor"
msgstr "联系人编辑器"
@@ -921,83 +812,81 @@ msgid "Full _Name..."
msgstr "全名(_N)..."
#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
-#: 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:196
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "其它"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+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
+#, fuzzy
+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
-msgid "Webcam:"
-msgstr "摄像头:"
+#, fuzzy
+msgid "Web Log:"
+msgstr "网页:"
#. red
#: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
#: mail/mail-config.glade.h:157
@@ -1017,17 +906,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:8
msgid "_Where:"
msgstr "何处(_W):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr "项目 7"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr "项目 8"
-
#: addressbook/gui/contact-editor/eab-editor.c:315
msgid ""
"Are you sure you want\n"
@@ -1041,16 +923,16 @@ 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 "地址"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:286
+#: 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:178
#: addressbook/gui/widgets/e-addressbook-model.c:309
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
#: addressbook/gui/widgets/e-minicard.c:174
@@ -2028,98 +1910,109 @@ msgstr "赞比亚"
msgid "Zimbabwe"
msgstr "津巴布韦"
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
msgid "Yahoo"
msgstr "雅虎"
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
msgid "MSN"
msgstr "MSN"
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: 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"
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
msgid "GroupWise"
msgstr "GroupWise"
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: 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
msgid "Source Book"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
msgid "Target Book"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
msgid "Is New Contact"
msgstr "为新联系人"
-#: addressbook/gui/contact-editor/e-contact-editor.c:279
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
msgid "Writable Fields"
msgstr "可写域"
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
msgid "Changed"
msgstr "已更改"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2294
-msgid "Category editor not available."
-msgstr "类别编辑器不可用。"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2302
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
msgid "This contact belongs to these categories:"
msgstr "此联系人属于这些类别:"
#. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2379
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
msgid "Please select an image for this contact"
msgstr "请选择此联系人的图像"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2383
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
msgid "No image"
msgstr "无图像"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2560
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
-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?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2607
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
msgid ""
"The contact data is invalid:\n"
"\n"
-msgstr "联系人数据无效:\n\n"
+msgstr ""
+"联系人数据无效:\n"
+"\n"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d 个联系人"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2700
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
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:2704
-#: addressbook/gui/contact-editor/e-contact-editor.c:2728
-#: addressbook/gui/widgets/eab-gui-util.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
msgid "_Discard"
msgstr "丢弃(_D)"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+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?"
+msgstr ""
+
#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
msgid "AOL Instant Messenger"
msgstr "AOL 即时通讯程序"
@@ -2296,30 +2189,30 @@ msgstr "列出姓名(_L):"
msgid "_Type an email address or drag a contact into the list below:"
msgstr "输入电子邮件地址或者把联系人拖放到下面的列表(_T):"
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
msgid "contact-list-editor"
msgstr "联系人列表编辑器"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
#: addressbook/gui/widgets/e-addressbook-model.c:295
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: 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 "名簿"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
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:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
msgid "Contact List Editor"
msgstr "联系人列表编辑器"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
msgid "Save List as VCard"
msgstr "将列表保存为 VCard"
@@ -2366,144 +2259,144 @@ msgstr ""
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 "主页"
#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
msgid "Success"
msgstr "成功"
#. E_BOOK_ERROR_INVALID_ARG
#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
msgid "Backend busy"
msgstr "后台忙"
#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
msgid "Repository offline"
msgstr "仓库脱机"
#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
msgid "Address Book does not exist"
msgstr "地址簿不存在"
#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
msgid "No Self Contact defined"
msgstr "未定义自身联系人"
#. E_BOOK_ERROR_URI_NOT_LOADED
#. E_BOOK_ERROR_URI_ALREADY_LOADED
#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
msgid "Permission denied"
msgstr "没有权限"
#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
msgid "Contact not found"
msgstr "找不到联系人"
#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
msgid "Contact ID already exists"
msgstr "联系人 ID 已经存在"
#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
msgid "Protocol not supported"
msgstr "不支持的协议"
#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
#: calendar/gui/dialogs/task-details-page.glade.h:3
#: calendar/gui/e-cal-component-preview.c:233
#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2516,43 +2409,43 @@ msgid "Cancelled"
msgstr "已经取消"
#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
msgid "Could not cancel"
msgstr "无法取消"
#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
msgid "Authentication Failed"
msgstr "认证失败"
#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
msgid "Authentication Required"
msgstr "必须认证"
#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
msgid "TLS not Available"
msgstr "TLS 不可用"
#. E_BOOK_ERROR_CORBA_EXCEPTION
#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
msgid "No such source"
msgstr "没有来源"
#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
msgid "Other error"
msgstr "其它错误"
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
msgid ""
"We were unable to open this addressbook. Please check that the path exists "
"and that you have permission to access it."
msgstr "我们无法打开此地址簿。请检查路径是否存在以及您是否有足够的权限访问它。"
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
msgid ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the LDAP server is unreachable."
@@ -2560,16 +2453,17 @@ msgstr ""
"我们无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为LDAP 服务器"
"已经关闭。"
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
msgid ""
"This version of Evolution does not have LDAP support compiled in to it. If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
msgstr ""
"本版本的 Evolution 并没有把 LDAP 支持编译进去。如果您希望在 Evolution 中使用 "
"LDAP,就必须先从以下链接获取 OpenLDAP,然后从程序的 CVS 源代码重新编译程序。"
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
msgid ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the server is unreachable."
@@ -2577,11 +2471,7 @@ msgstr ""
"我们无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为服务器已经"
"关闭。"
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "无法打开地址簿"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -2592,7 +2482,7 @@ msgstr ""
"Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
"搜索条件,或者在此地址簿的目录服务器参数中将结果限制调高。"
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
"you have configured for this addressbook. Please make your search\n"
@@ -2603,49 +2493,45 @@ msgstr ""
"请在搜索的时候指定更加严格的搜索条件,或者在此地址簿的目录服务器参数\n"
"中将时间限制调高。"
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
msgid "The backend for this addressbook was unable to parse this query."
msgstr "此地址簿的后端无法解析此查询。"
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
msgid "The backend for this addressbook refused to perform this query."
msgstr "此地址簿的后端拒绝执行此查询。"
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
msgid "This query did not complete successfully."
msgstr "此查询未成功完成。"
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "您希望保存修改吗?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
msgid "Error adding list"
msgstr "添加列表出错"
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
msgid "Error adding contact"
msgstr "添加联系人出错"
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
msgid "Error modifying list"
msgstr "修改列表出错"
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
msgid "Error modifying contact"
msgstr "修改联系人出错"
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
msgid "Error removing list"
msgstr "删除列表出错"
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
msgid "Error removing contact"
msgstr "删除联系人出错"
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
#, c-format
msgid ""
"Opening %d contacts will open %d new windows as well.\n"
@@ -2654,7 +2540,7 @@ msgstr ""
"打开 %d 个联系人将同时打开 %d 个新窗口。\n"
"您真的想要显示所有联系人吗?"
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
#, c-format
msgid ""
"%s already exists\n"
@@ -2663,49 +2549,44 @@ msgstr ""
"%s 已经存在\n"
"您打算覆盖它吗?"
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
msgid "Overwrite"
msgstr "覆盖"
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "保存 %s 出错:%s"
-
#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
msgid "card.vcf"
msgstr "card.vcf"
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
msgid "list"
msgstr "列表"
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
msgid "Move contact to"
msgstr "将联系人移动到"
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
msgid "Copy contact to"
msgstr "将联系人复制到"
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
msgid "Move contacts to"
msgstr "将联系人移动到"
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
msgid "Copy contacts to"
msgstr "将联系人复制到"
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
msgid "Select target addressbook."
msgstr "从地址簿中选择目标联系人。"
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
msgid "Multiple VCards"
msgstr "多个 VCard"
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
#, c-format
msgid "VCard for %s"
msgstr "%s 的 VCard"
@@ -2790,7 +2671,7 @@ msgstr[0] "%d 个联系人"
#: addressbook/gui/widgets/e-addressbook-model.c:302
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
#: addressbook/gui/widgets/e-minicard-view.c:467
#: addressbook/gui/widgets/e-minicard-view-widget.c:112
msgid "Query"
@@ -2808,140 +2689,130 @@ msgstr "模型"
msgid "Error modifying card"
msgstr "修改卡片错误"
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
msgid "Name begins with"
msgstr "姓名以此开头"
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
msgid "Email begins with"
msgstr "邮件以此开头"
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
msgid "Category is"
msgstr "类别为"
#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
msgid "Any field contains"
msgstr "任何域含有"
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
msgid "Advanced..."
msgstr "高级..."
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: 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:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
msgid "Address Book"
msgstr "地址簿"
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
#: addressbook/gui/widgets/e-addressbook-view.c:2080
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard..."
msgstr "另存为 VCard..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
msgid "New Contact..."
msgstr "新建联系人..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
msgid "New Contact List..."
msgstr "新建联系人列表..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
msgid "Go to Folder..."
msgstr "转到文件夹..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
msgid "Import..."
msgstr "导入..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
msgid "Search for Contacts..."
msgstr "搜索联系人..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
msgid "Address Book Sources..."
msgstr "地址簿来源..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
msgid "Pilot Settings..."
msgstr "Pilot 设置..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "转发联系人"
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
msgid "Send Message to Contact"
msgstr "给联系人发邮件"
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 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:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
msgid "Print Envelope"
msgstr "打印信封"
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
msgid "Copy to Address Book..."
msgstr "复制到地址簿..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
msgid "Move to Address Book..."
msgstr "移动到地址簿..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "剪切"
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: 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:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
msgid "Paste"
msgstr "粘贴"
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
msgid "Current View"
msgstr "当前视图"
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"%s\n"
-"的地址簿后端已经崩溃。您需要重新启动 Evolution 才能再次使用该后端"
-
#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
msgid "Any Category"
msgstr "任何类别"
@@ -3047,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 "角色"
@@ -3155,17 +3026,17 @@ msgstr "卡片视图"
msgid "GTK Tree View"
msgstr "GTK 树视图"
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
msgid "Reflow Test"
msgstr ""
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
#: addressbook/printing/test-contact-print-style-editor.c:54
#: addressbook/printing/test-print.c:53
msgid "Copyright (C) 2000, Ximian, Inc."
msgstr "版权 (C) 2000, Ximian, Inc."
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
msgid "This should test the reflow canvas item"
msgstr ""
@@ -3441,15 +3312,21 @@ msgstr ""
msgid "Impossible internal error."
msgstr "不可能的内部错误。"
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
msgid "Can not open file"
msgstr "无法打开文件"
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "无法装入 URI"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "无法装入地址簿"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "无法打开地址簿"
#: addressbook/tools/evolution-addressbook-import.c:46
msgid "Error loading default addressbook."
@@ -3467,7 +3344,7 @@ msgstr "没有提供文件名。"
msgid "Unnamed List"
msgstr "未命名的列表"
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
#: smime/gui/component.c:48
msgid "Enter password"
msgstr "输入密码"
@@ -3741,10 +3618,10 @@ msgid "Whether to show week numbers in date navigator"
msgstr "在日期浏览器中显示周数(_N)"
#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
msgid "Calendar"
msgstr "日历"
@@ -3766,7 +3643,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 "天数"
@@ -3776,10 +3653,6 @@ msgstr "%Y年%m月%d日%A"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
#: calendar/gui/e-week-view-main-item.c:329
@@ -3914,23 +3787,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:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
msgid "Unmatched"
msgstr "无匹配"
@@ -3951,23 +3824,23 @@ msgstr "没有权限打开日历"
msgid "open_client(): %s"
msgstr "open_client(): %s"
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
msgid "Audio Alarm Options"
msgstr "音频提醒选项"
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
msgid "Message Alarm Options"
msgstr "消息提醒选项"
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
msgid "Email Alarm Options"
msgstr "邮件提醒选项"
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
msgid "Program Alarm Options"
msgstr "程序提醒选项"
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
msgid "Unknown Alarm Options"
msgstr "未知提醒选项"
@@ -4003,7 +3876,7 @@ msgstr "发送给:"
msgid "With these arguments:"
msgstr "使用这些参数:"
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
msgid "dialog1"
msgstr "dialog1"
@@ -4012,7 +3885,7 @@ 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 "小时"
@@ -4058,7 +3931,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:920 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "概要:"
@@ -4088,7 +3961,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 "分钟"
@@ -4096,26 +3968,26 @@ msgstr "分钟"
msgid "start of appointment"
msgstr "约会开始"
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
msgid "You must specify a location to get the calendar from."
msgstr "您必须获取日历的位置。"
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
#, c-format
msgid "The source location '%s' is not well-formed."
msgstr "源位置“%s”不是规格的。"
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
#, c-format
msgid "The source location '%s' is not a webcal source."
msgstr ""
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
#, c-format
msgid "Source with name '%s' already exists in the selected group"
msgstr ""
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
#, c-format
msgid ""
"The group '%s' is remote. You must specify a location to get the calendar "
@@ -4134,51 +4006,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 "源 URI(_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 "周"
@@ -4290,7 +4142,7 @@ 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/e-itip-control.c:556
msgid "Friday"
msgstr "星期五"
@@ -4304,7 +4156,7 @@ 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/e-itip-control.c:552
msgid "Monday"
msgstr "星期一"
@@ -4314,7 +4166,7 @@ msgstr "周日(_U)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:557
msgid "Saturday"
msgstr "星期六"
@@ -4328,7 +4180,7 @@ msgstr "在日期浏览器中显示周数(_N)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:552
+#: calendar/gui/e-itip-control.c:551
msgid "Sunday"
msgstr "星期日"
@@ -4342,7 +4194,7 @@ msgstr "周四(_H)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:555
msgid "Thursday"
msgstr "星期四"
@@ -4356,7 +4208,7 @@ 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/e-itip-control.c:553
msgid "Tuesday"
msgstr "星期二"
@@ -4366,7 +4218,7 @@ msgstr "一周开始(_E):"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/e-itip-control.c:554
msgid "Wednesday"
msgstr "星期三"
@@ -4448,76 +4300,46 @@ msgstr "周三(_W)"
msgid "before every appointment"
msgstr "在每次约会前"
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr "即将删除的事件是一个会议,您是否想要发送一条取消通告?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "您真的要取消并删除此会议吗?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr "即将删除的任务已被指派,您是否想要要发送一条取消通告?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "您真的要取消并删除此任务吗?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr "即将删除的日历项已公布,您是否想要发送一条取消通告?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "您真的想要取消并删除该日志条目吗?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
msgid "This event has been deleted."
msgstr "该事件已经被删除。"
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
msgid "This task has been deleted."
msgstr "该任务已经被删除。"
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
msgid "This journal entry has been deleted."
msgstr "该日志条目已经被删除。"
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
#, c-format
msgid "%s You have made changes. Forget those changes and close the editor?"
msgstr "%s 您已经做了修改。放弃这些修改并关闭编辑器吗?"
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
#, c-format
msgid "%s You have made no changes, close the editor?"
msgstr "%s 您还没有进行修改,关闭编辑器吗?"
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
msgid "This event has been changed."
msgstr "该事件已经被更改。"
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
msgid "This task has been changed."
msgstr "该任务已经被更改。"
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
msgid "This journal entry has been changed."
msgstr "该日志条目已经被更改。"
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
#, c-format
msgid "%s You have made changes. Forget those changes and update the editor?"
msgstr "%s 您已经做出了修改。放弃这些修改并更新编辑器吗?"
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
#, c-format
msgid "%s You have made no changes, update the editor?"
msgstr "%s 您还没有进行修改,更新编辑器吗?"
@@ -4555,7 +4377,7 @@ msgid "No summary"
msgstr "没有概要"
#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
#: composer/e-msg-composer.c:1193
msgid "Save as..."
msgstr "另存为..."
@@ -4607,96 +4429,51 @@ msgstr "无法打开目的"
msgid "Destination is read only"
msgstr ""
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "您真的想要删除约会“%s”吗?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "您真的想要删除此无标题约会吗?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "您真的想要删除任务“%s”吗?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "您真的想要删除此无标题任务吗?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "您真的想要删除日志条目“%s”吗?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "您真的想要删除此无标题日志条目吗?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "您真的想要删除 %d 个约会吗?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "您真的想要删除 %d 个任务吗?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "您真的想要删除 %d 个日志条目吗?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
msgid "The event could not be deleted due to a corba error"
msgstr "无法删除事件,原因是 corbat 错误"
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
msgid "The task could not be deleted due to a corba error"
msgstr "无法删除任务,原因是 corbat 错误"
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
msgid "The journal entry could not be deleted due to a corba error"
msgstr "无法删除日记条目,原因是 corbat 错误"
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
msgid "The item could not be deleted due to a corba error"
msgstr "无法删除项目,原因是 corbat 错误"
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
msgid "The event could not be deleted because permission was denied"
msgstr "无法删除事件,原因是权限被禁止"
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
msgid "The task could not be deleted because permission was denied"
msgstr "无法删除任务,原因是权限被禁止"
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
msgid "The journal entry could not be deleted because permission was denied"
msgstr "无法删除日记条目,原因是权限被禁止"
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
msgid "The item could not be deleted because permission was denied"
msgstr "无法删除项目,原因是权限被禁止"
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
msgid "The event could not be deleted due to an error"
msgstr "由于错误,无法删除事件"
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
msgid "The task could not be deleted due to an error"
msgstr "由于错误,无法删除任务"
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
msgid "The journal entry could not be deleted due to an error"
msgstr "由于错误,无法删除日记条目"
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
msgid "The item could not be deleted due to an error"
msgstr "由于错误,无法删除项目"
@@ -4828,17 +4605,12 @@ msgid "_Start time:"
msgstr "开始时间(_S):"
#. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
#: 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:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:103
+#: 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
@@ -4864,8 +4636,8 @@ msgstr "授权于(_D)..."
#. FIXME: need to disable for undeletable folders
#: calendar/gui/dialogs/meeting-page.c:655
#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2562 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
#: 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
@@ -4873,7 +4645,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 "出席者"
@@ -4909,16 +4681,15 @@ 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:1047 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-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: 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 "状态"
@@ -4926,20 +4697,20 @@ msgstr "状态"
msgid "Add A_ttendee"
msgstr "添加出席者(_T)"
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "将发件人添加到地址簿(_B)"
+
+#: 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>"
@@ -5086,7 +4857,7 @@ msgid "_No recurrence"
msgstr "不再现(_N)"
#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
msgid "_Remove"
msgstr "删除(_R)"
@@ -5118,52 +4889,18 @@ msgstr "周"
msgid "year(s)"
msgstr "年"
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"该事件已经被改变,但还没有保存。\n"
-"\n"
-"您希望保存改动吗?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "丢弃修改(_D)"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "保存事件"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
msgid "Select destination"
msgstr "选择目的"
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
msgid "_Destination"
msgstr "目的(_D)"
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
msgid "Task List"
msgstr "任务列表"
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "会议信息已创建。发送此信息吗?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "会议信息已经改变。发送更新版本吗?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "任务分配信息已创建。发送此信息吗?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "任务信息已经改变。发送更新版本?"
-
#: calendar/gui/dialogs/task-details-page.c:406
msgid "Completed date is wrong"
msgstr "完成日期有错"
@@ -5261,7 +4998,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:975 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 "描述:"
@@ -5420,7 +5157,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:943
msgid "Status:"
msgstr "状态:"
@@ -5504,12 +5241,12 @@ msgstr "繁忙"
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:846 calendar/gui/e-calendar-view.c:750
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-view.c:1293 calendar/gui/e-calendar-view.c:1373
#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
msgid "_Open"
msgstr "打开(_O)"
@@ -5519,15 +5256,15 @@ msgid "Open _Web Page"
msgstr "打开网页(_W)"
#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: 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-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 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
@@ -5535,15 +5272,15 @@ msgid "_Print..."
msgstr "打印(_P)..."
#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
#: 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:958 mail/em-folder-tree.c:2555
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
#: 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
@@ -5551,8 +5288,8 @@ msgid "_Copy"
msgstr "复制(_C)"
#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c: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-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 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"
@@ -5618,67 +5355,67 @@ 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:1265 calendar/gui/e-calendar-view.c:1353
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:1266 calendar/gui/e-calendar-view.c:1358
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:1267 calendar/gui/e-calendar-view.c:1363
msgid "New Meeting"
msgstr "新会议"
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
msgid "New Task"
msgstr "新建任务"
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
msgid "Select _Today"
msgstr "选择今天(_T)"
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
msgid "_Select Date..."
msgstr "选择日期(_S)..."
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 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:1306
msgid "Cop_y to Calendar..."
msgstr "复制到日历(_Y)..."
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
msgid "Mo_ve to Calendar..."
msgstr "移动到日历(_V)..."
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
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:1314 calendar/gui/e-calendar-view.c:1346
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:1315 calendar/gui/e-calendar-view.c:1347
msgid "Delete _All Occurrences"
msgstr "删除所有出现(_A)"
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
msgid "Go to _Today"
msgstr "转到今天(_T)"
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
msgid "_Go to Date..."
msgstr "转到日期(_G)..."
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
msgid "_Settings..."
msgstr "设置(_S)..."
@@ -5692,9 +5429,9 @@ msgstr "开始日期"
#. This is the default filename used for temporary file creation
#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c: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:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
#: camel/camel-tcp-stream-openssl.c:631
@@ -5720,13 +5457,13 @@ msgid "Assigned"
msgstr "已委派"
#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c: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 "否"
@@ -5738,7 +5475,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 "东"
@@ -5757,20 +5494,12 @@ msgstr ""
"45.436845,125.862501"
#. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
#: e-util/e-time-utils.c:393
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%Y年%m月%d日%A%H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
#: e-util/e-time-utils.c:402
msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5801,10 +5530,6 @@ msgstr "下午"
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
msgid "%A %d %B"
@@ -5812,9 +5537,6 @@ msgstr "%B%d日%A"
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
#: calendar/gui/e-week-view-main-item.c:343
msgid "%d %b"
@@ -5825,396 +5547,400 @@ 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
+#: calendar/gui/e-itip-control.c:686
msgid "<b>Starts:</b> "
msgstr "<b>开始:</b>"
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:696
msgid "<b>Ends:</b> "
msgstr "<b>结束:</b>"
-#: calendar/gui/e-itip-control.c:717
+#: calendar/gui/e-itip-control.c:716
msgid "<b>Completed:</b> "
msgstr "<b>已完成:</b> "
-#: calendar/gui/e-itip-control.c:727
+#: calendar/gui/e-itip-control.c:726
msgid "<b>Due:</b> "
msgstr "<b>到期:</b>"
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
msgid "iCalendar Information"
msgstr "iCalendar 信息"
#. Title
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:781
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:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
msgid "An unknown person"
msgstr "未知的人"
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:903
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作。"
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:918
msgid "<i>None</i>"
msgstr "<i>无</i>"
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "位置:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
#: calendar/gui/e-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:952 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:956 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:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
msgid "Choose an action:"
msgstr "选择一项活动:"
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1016
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:1098 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "确定"
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1044
msgid "Accept"
msgstr "接受"
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1045
msgid "Tentatively accept"
msgstr "暂时接受"
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1046
msgid "Decline"
msgstr "拒绝"
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1070
msgid "Send Free/Busy Information"
msgstr "发送忙闲信息"
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1083
msgid "Update respondent status"
msgstr "更新应答者状态"
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1096
msgid "Send Latest Information"
msgstr "发送最新的信息"
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 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:1185
#, 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:1186
msgid "Meeting Information"
msgstr "会议信息"
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1191
#, 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:1193
#, 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:1194
msgid "Meeting Proposal"
msgstr "会议建议"
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1198
#, 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:1199
msgid "Meeting Update"
msgstr "会议更新"
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1203
#, 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:1204
msgid "Meeting Update Request"
msgstr "会议更新请求"
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1211
#, 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:1212
msgid "Meeting Reply"
msgstr "会议答复"
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1219
#, 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:1220
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:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
#, 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:1228
msgid "Bad Meeting Message"
msgstr "错误的会议信息"
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1253
#, 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:1254
msgid "Task Information"
msgstr "任务信息"
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1259
#, 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:1261
#, 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:1262
msgid "Task Proposal"
msgstr "任务建议"
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1266
#, 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:1267
msgid "Task Update"
msgstr "任务更新"
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1271
#, 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:1272
msgid "Task Update Request"
msgstr "任务更新请求"
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1279
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> 已经回复了任务委派。"
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1280
msgid "Task Reply"
msgstr "任务回复"
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1287
#, 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:1288
msgid "Task Cancellation"
msgstr "任务取消"
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1296
msgid "Bad Task Message"
msgstr "错误的任务邮件"
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1315
#, 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:1316
msgid "Free/Busy Information"
msgstr "忙闲信息"
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1320
#, 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:1321
msgid "Free/Busy Request"
msgstr "忙/闲请求"
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1325
#, 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:1326
msgid "Free/Busy Reply"
msgstr "忙闲应答"
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1331
msgid "Bad Free/Busy Message"
msgstr "错误的忙闲信息"
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1406
msgid "The message does not appear to be properly formed"
msgstr "邮件的格式可能不正确"
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1465
msgid "The message contains only unsupported requests."
msgstr "邮件只含有不支持的请求。"
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1496
msgid "The attachment does not contain a valid calendar message"
msgstr "附件中没有有效的日历信息"
-#: calendar/gui/e-itip-control.c:1529
+#: calendar/gui/e-itip-control.c:1528
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日历项目"
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:1762
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:1792 calendar/gui/e-itip-control.c:1864
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:1808 calendar/gui/e-itip-control.c:1846
msgid "Object is invalid and cannot be updated\n"
msgstr "对象无效,无法更新\n"
-#: calendar/gui/e-itip-control.c:1819
+#: calendar/gui/e-itip-control.c:1818
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:1830
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:1849
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:1852
msgid "Object could not be found\n"
msgstr "找不到对象\n"
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1855
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:1858
msgid "Attendee status updated\n"
msgstr "更新参与者状态\n"
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1861
msgid "Attendee status could not be updated!\n"
msgstr "无法更新参与者状态!\n"
-#: calendar/gui/e-itip-control.c:1893
+#: calendar/gui/e-itip-control.c:1892
msgid "Removal Complete"
msgstr "删除完成"
-#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
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:1917 calendar/gui/e-itip-control.c:1967
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
@@ -6255,74 +5981,74 @@ 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
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
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 "被委任的"
@@ -6339,20 +6065,28 @@ msgstr "办公室以外"
msgid "No Information"
msgstr "没有信息"
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "将发件人添加到地址簿(_B)"
+
#: 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"
+#, fuzzy
+msgid "Show _only working hours"
msgstr "只显示工作小时(_O)"
#: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
msgstr "显示缩放的输出(_Z)"
#: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
msgstr "更新忙闲(_U)"
#: calendar/gui/e-meeting-time-sel.c:497
@@ -6368,19 +6102,23 @@ msgid ">_>"
msgstr ">_>"
#: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
msgstr "所有人和资源(_A)"
#: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
msgstr "所有人和一个资源(_P)"
#: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
msgstr "必需的人(_R)"
#: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
msgstr "必需的人和一个资源(_O)"
#: calendar/gui/e-meeting-time-sel.c:593
@@ -6400,10 +6138,6 @@ msgstr "%Y年%m月%d日%A"
#. This is a strftime() format string %a = abbreviated weekday name,
#. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
#: calendar/gui/e-meeting-time-sel.c:2093
#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6412,10 +6146,6 @@ msgstr "%Y年%m月%d日%A"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
msgid "%m/%d/%Y"
@@ -6426,7 +6156,7 @@ msgstr "%Y-%m-%d"
msgid "Enter the password for %s"
msgstr "为 %s 输入密码"
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
#, c-format
msgid ""
"Error on %s:\n"
@@ -6435,19 +6165,14 @@ msgstr ""
"%s 错误:\n"
" %s"
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
#. FIXME Loading should be async
#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
#, c-format
msgid ""
"Error opening %s:\n"
@@ -6456,52 +6181,47 @@ msgstr ""
"打开 %s 出错:\n"
" %s"
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
msgid "Loading tasks"
msgstr "装入任务"
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
msgid "Completing tasks..."
msgstr "正在完成的日期..."
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
msgid "Deleting selected objects..."
msgstr "正在删除选中的对象..."
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
msgid "Expunging"
msgstr "销毁"
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
#: 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:1876
+#: calendar/gui/gnome-cal.c:1878
#, c-format
msgid "Loading appointments at %s"
msgstr "装入位于 %s 的约会"
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
#, c-format
msgid "Loading tasks at %s"
msgstr "装入位于 %s 的任务"
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
#, c-format
msgid "Opening %s"
msgstr "打开 %s"
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
msgid "Purging"
msgstr ""
@@ -6696,7 +6416,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 中升迁旧设置"
@@ -6707,7 +6427,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”"
@@ -6943,67 +6663,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:502
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
#, 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
+#: calendar/gui/tasks-component.c:749
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr ""
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
msgid "There is no calendar available for creating tasks"
msgstr ""
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
msgid ""
"Selected task list is read-only, events cannot be created. Please select a "
"read-write calendar."
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 "创建新任务组"
@@ -8829,17 +8549,17 @@ msgstr ""
msgid "(match-threads) requires a match type string"
msgstr ""
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
#, fuzzy
msgid "(match-threads) expects an array result"
msgstr "(match-all) 需要一个布尔结果"
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
#, fuzzy
msgid "(match-threads) requires the folder set"
msgstr "(match-all) 需要一个布尔结果"
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
#, c-format
msgid "Performing query on unknown header: %s"
msgstr "正在对未知的头进行查询:%s"
@@ -8874,7 +8594,8 @@ msgstr ""
#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:705
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
#: mail/mail-send-recv.c:611
msgid "Cancelled."
msgstr "已取消。"
@@ -9238,7 +8959,7 @@ msgstr "引用的证书已过期。"
#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1243
+#: camel/providers/imap/camel-imap-store.c:1240
msgid "Bad authentication response from server."
msgstr "来自服务器的无效认证应答。"
@@ -9619,40 +9340,40 @@ msgstr "命令尚未实现"
msgid "export keys: unimplemented"
msgstr ""
-#: camel/camel-store.c:215
+#: camel/camel-store.c:213
msgid "Cannot get folder: Invalid operation on this store"
msgstr "无法获取文件夹:对该存储的无效操作"
-#: camel/camel-store.c:245
+#: camel/camel-store.c:243
#, fuzzy, c-format
msgid "Cannot create folder `%s': folder exists"
msgstr "无法创建文件夹:%s:%s"
-#: camel/camel-store.c:299
+#: camel/camel-store.c:297
msgid "Cannot create folder: Invalid operation on this store"
msgstr "无法创建文件夹:对该存储的无效操作"
-#: camel/camel-store.c:327
+#: camel/camel-store.c:325
#, fuzzy, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "无法创建文件夹:%s:%s"
-#: camel/camel-store.c:391 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "无法删除文件夹:%s:无效操作"
-#: camel/camel-store.c:441 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "无法重命名文件夹:%s:无效操作"
-#: camel/camel-store.c:813
+#: camel/camel-store.c:777
msgid "Trash"
msgstr "回收站"
-#: camel/camel-store.c:815 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "垃圾"
@@ -9883,12 +9604,12 @@ msgstr "在 %2$s 中没有消息 %1$s"
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "无法将消息移动或复制到虚拟文件夹中"
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "无法删除文件夹:%s:没有该文件夹"
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "无法重命名文件夹:%s:没有该文件夹"
@@ -9932,16 +9653,16 @@ msgstr "地址簿"
msgid "Post Office Agent SOAP Port:"
msgstr ""
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
msgid "Novell GroupWise"
msgstr "Novell GroupWise"
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
#, fuzzy
msgid "For accessing Novell Groupwise servers"
msgstr "访问 Novell GroupWise 服务器"
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
#: camel/providers/imap4/camel-imap4-provider.c:70
#: camel/providers/imap/camel-imap-provider.c:93
#: camel/providers/imapp/camel-imapp-provider.c:65
@@ -9950,14 +9671,14 @@ msgstr "访问 Novell GroupWise 服务器"
msgid "Password"
msgstr "密码"
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
#: camel/providers/imap/camel-imap-provider.c:95
#: camel/providers/imapp/camel-imapp-provider.c:67
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
#, fuzzy
msgid "Checklist"
msgstr "列表"
@@ -10100,23 +9821,23 @@ msgid ""
msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: 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/imap/camel-imap-store.c:431
+#: 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/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:572
+#: 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
@@ -10125,18 +9846,18 @@ msgid "Could not connect to %s (port %d): %s"
msgstr "无法连接到 %s (端口 %d):%s"
#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:554
+#: 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/imap/camel-imap-store.c:569
-#: camel/providers/imap/camel-imap-store.c:846
+#: 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 "连接已取消"
@@ -10149,8 +9870,8 @@ msgid ""
msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/imap/camel-imap-store.c:711
+#: 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"
@@ -10159,7 +9880,7 @@ msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
#: camel/providers/imap/camel-imap-command.c:303
#: camel/providers/imap/camel-imap-command.c:400
#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1108
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
msgid "Unknown error"
msgstr "未知的错误"
@@ -10185,8 +9906,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
msgstr "无法获取文件夹:%s:%s"
#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1888
-#: camel/providers/imap/camel-imap-store.c:2266
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
#, fuzzy, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10264,12 +9985,12 @@ msgstr "服务器意外地中止了连接:%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:3199
+#: 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:3202
+#: camel/providers/imap/camel-imap-store.c:3197
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "服务器意外地中止了连接:%s"
@@ -10350,7 +10071,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 "该邮件目前不可用"
@@ -10436,43 +10157,43 @@ msgstr "IMAP"
msgid "For reading and storing mail on IMAP servers."
msgstr "IMAP 服务器上的邮件的读写。"
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:680
#: camel/providers/pop3/camel-pop3-store.c:228
msgid "SSL/TLS extension not supported."
msgstr "不支持 SSL/TLS 扩展。"
-#: camel/providers/imap/camel-imap-store.c:712
+#: camel/providers/imap/camel-imap-store.c:711
#: camel/providers/pop3/camel-pop3-store.c:269
msgid "SSL negotiations failed"
msgstr "SSL 协商失败"
-#: camel/providers/imap/camel-imap-store.c:849
+#: camel/providers/imap/camel-imap-store.c:848
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "无法使用命令“%s”连接:%s"
-#: camel/providers/imap/camel-imap-store.c:1273
+#: camel/providers/imap/camel-imap-store.c:1272
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
-#: camel/providers/imap/camel-imap-store.c:1283
+#: camel/providers/imap/camel-imap-store.c:1282
#: camel/providers/smtp/camel-smtp-transport.c:486
#, c-format
msgid "No support for authentication type %s"
msgstr "不支持验证类型 %s"
-#: camel/providers/imap/camel-imap-store.c:1306
+#: camel/providers/imap/camel-imap-store.c:1305
#: camel/providers/imapp/camel-imapp-store.c:344
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%s请为 %s@%s 输入 IMAP 密码"
-#: camel/providers/imap/camel-imap-store.c:1320
+#: camel/providers/imap/camel-imap-store.c:1319
msgid "You didn't enter a password."
msgstr "您没有输入密码。"
-#: camel/providers/imap/camel-imap-store.c:1349
+#: camel/providers/imap/camel-imap-store.c:1348
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -10483,18 +10204,18 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:1870
-#: camel/providers/imap/camel-imap-store.c:2060
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
#, c-format
msgid "No such folder %s"
msgstr "没有文件夹 %s"
-#: camel/providers/imap/camel-imap-store.c:1946
-#: camel/providers/imap/camel-imap-store.c:2327
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
msgid "The parent folder is not allowed to contain subfolders"
msgstr "父文件夹不允许含有子文件夹"
-#: camel/providers/imap/camel-imap-store.c:2001
+#: camel/providers/imap/camel-imap-store.c:1998
#: camel/providers/local/camel-maildir-store.c:137
#: camel/providers/local/camel-mbox-store.c:212
#: camel/providers/local/camel-mh-store.c:236
@@ -10502,7 +10223,7 @@ msgstr "父文件夹不允许含有子文件夹"
msgid "Cannot create folder `%s': folder exists."
msgstr "无法创建文件夹:%s:%s"
-#: camel/providers/imap/camel-imap-store.c:2277
+#: camel/providers/imap/camel-imap-store.c:2274
#, c-format
msgid "Unknown parent folder: %s"
msgstr "未知的父文件夹:%s"
@@ -10535,20 +10256,20 @@ msgid "Index message body data"
msgstr "给联系人发邮件"
#. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
#. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
#, c-format
msgid "mailbox:%s (%s)"
msgstr "邮件箱:%s (%s)"
#. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
@@ -10608,7 +10329,7 @@ msgstr ""
#: camel/providers/local/camel-local-store.c:142
#: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
#: camel/providers/local/camel-spool-store.c:116
#, c-format
msgid "Store root %s is not an absolute path"
@@ -10740,9 +10461,9 @@ msgstr "无法删除文件夹“%s”:%s"
msgid "not a maildir directory"
msgstr "不是邮件目录"
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
#, c-format
msgid "Could not scan folder `%s': %s"
msgstr "无法扫描文件夹“%s”:%s"
@@ -10800,7 +10521,7 @@ msgid "Message construction failed."
msgstr "邮件构造失败:邮件箱已损坏?"
#: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
msgid "Cannot create a folder by this name."
msgstr "无法以此名称创建文件夹。"
@@ -10830,30 +10551,30 @@ msgstr "“%s”并不是普通文件。"
msgid "Folder `%s' is not empty. Not deleted."
msgstr "文件夹“%s”非空。没有删除。"
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
#, c-format
msgid "Cannot create directory `%s': %s."
msgstr "无法创建目录“%s”:%s"
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
#, c-format
msgid "Cannot create folder: %s: %s"
msgstr "无法创建文件夹:%s:%s"
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
msgid "Folder already exists"
msgstr "文件夹已经存在"
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
msgid "The new folder name is illegal."
msgstr "指定的文件夹名称不合法。"
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
#, fuzzy, c-format
msgid "Could not rename `%s': `%s': %s"
msgstr "无法重命名“%s”:%s"
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
#, fuzzy, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "无法将 %s 改名为 %s:%s"
@@ -11046,7 +10767,7 @@ msgstr ""
"文件夹可能已损坏,副本保存在“%s”"
#: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
#, c-format
msgid "Please enter the NNTP password for %s@%s"
msgstr "请输入 %s@%s 的 NNTP 密码"
@@ -11063,18 +10784,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
@@ -11083,66 +10796,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 "无法获取组:%s"
-
-#: 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 "无法关闭临时文件夹:%s"
-#: 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 "无法获取组:%s"
-#: 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 ""
@@ -11172,27 +10872,29 @@ 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:640
-#, fuzzy
-msgid "Stream error"
-msgstr "解析错误"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
#, fuzzy, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -11202,75 +10904,75 @@ msgstr ""
"在将邮件保存到 %s 时发生错误:\n"
" %s"
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: 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:767
+#: 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:792
+#: 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:800
+#: 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:808
+#: camel/providers/nntp/camel-nntp-store.c:945
#, fuzzy
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
-#, c-format
-msgid "Could not get group: %s"
-msgstr "无法获取组:%s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "认证到 POP 服务器 %s 失败:%s"
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
#, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "无法发送邮件:%s"
+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
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "未知的服务器应答:%s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+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"
@@ -11749,19 +11451,19 @@ msgstr "%.0fM"
msgid "%.0fG"
msgstr "%.0fG"
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
msgid "attachment"
msgstr "附件"
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
msgid "Remove selected items from the attachment list"
msgstr "从附件列表中删除选定的条目"
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
msgid "Add attachment..."
msgstr "添加附件..."
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
msgid "Attach a file to the message"
msgstr "把文件附件到邮件"
@@ -11824,7 +11526,7 @@ msgstr "多封邮件"
msgid "Open file"
msgstr "打开文件"
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
msgid "Autogenerated"
msgstr "自动生成的"
@@ -11968,17 +11670,17 @@ msgstr "添加附件"
#. mail-composer:no-attach primary
#: composer/mail-composer-errors.xml.h:2
#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
msgstr "把文件附件到邮件"
#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
-msgstr ""
+#: 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."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
msgstr ""
#. mail-composer:attach-directory primary
@@ -12073,7 +11775,7 @@ msgstr "无法创建管道:%s"
#. mail-composer:no-build-message secondary
#: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
msgstr ""
#. mail-composer:no-sig-file primary
@@ -12083,9 +11785,11 @@ msgid "Could not read signature file \"{0}\"."
msgstr "无法保存签名文件:%s"
#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
-msgstr ""
+#: 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
@@ -12243,16 +11947,12 @@ msgstr "同步类别:"
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%Y-%m-%d %A %p %I:%M"
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
msgid "%a %m/%d/%Y %H:%M"
msgstr "%Y-%m-%d %A %H:%M"
@@ -12304,31 +12004,23 @@ msgid "%m/%d/%Y %H"
msgstr "%Y-%m-%d %H点"
#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
msgid "%I:%M:%S %p"
msgstr "%p %I:%M:%S"
#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
#. strptime format for time of day, without seconds,
#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
msgid "%I:%M %p"
msgstr "%p %I:%M"
#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
msgid "%H:%M"
@@ -12418,7 +12110,6 @@ msgid "Missing file name."
msgstr "缺少文件名。"
#. filter:no-file secondary
-#. filter:bad-file secondary
#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
msgid "You must specify a file name."
msgstr "您必须指定文件名。"
@@ -12450,7 +12141,6 @@ msgid "Could not compile regular expression \"{1}\"."
msgstr ""
#. filter:no-name primary
-#. filter:no-name-vfolder primary
#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
msgid "Missing name."
msgstr "缺少名称。"
@@ -12498,7 +12188,7 @@ msgid "<b>Then</b>"
msgstr "<b>则</b>"
#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
msgid "Select Folder"
msgstr "选择文件夹"
@@ -12584,8 +12274,8 @@ msgstr "以所有本地文件夹"
msgid "years"
msgstr "年"
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
msgid "Important"
msgstr "重要"
@@ -12653,252 +12343,6 @@ msgstr "接收"
msgid "outgoing"
msgstr "发送"
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "调整评分"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "指定颜色"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "指定分数"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "附件"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "响铃"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "含有"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "复制到文件夹"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "接收日期"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "发送日期"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "已删除"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "不含有"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "不以之结尾"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "不存在"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "不返回"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "听起来不像"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "不以之开始"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "不存在"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "草稿"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "以之结束"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "存在"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "存在"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "表达式"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "跟随"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "是"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "以后"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "以前"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "有标志"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "大于"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "小于"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "不是"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "未标志"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "垃圾测试"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "标签"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "邮件列表"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "邮件体"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "邮件头"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "邮件是垃圾"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "邮件不是垃圾"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "移动到文件夹"
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr "管道到程序"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "播放声音"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "已读"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "收件人"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "常规表达式匹配"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "已回复"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "返回"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "返回大于"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "返回小于"
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr "运行程序"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "分数"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "发件人"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "设置状态"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "大小 (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "听起来象"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "来源账户"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "指定邮件头"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "以之开始"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "停止处理"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "主题"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "未设置状态"
-
#: filter/rule-editor.c:285
msgid "Add Rule"
msgstr "添加规则"
@@ -12915,6 +12359,11 @@ msgstr "规则名"
msgid "_Score Rules"
msgstr "计分规则(_S)"
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "分数"
+
#: filter/searchtypes.xml.h:1
msgid "Body contains"
msgstr "邮件体含有"
@@ -12994,13 +12443,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写道:"
@@ -13038,8 +12487,8 @@ msgstr "<点击这里以便选择文件夹>"
msgid "Create New Folder"
msgstr "创建新文件夹"
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:706
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
msgid "Specify where to create the folder:"
msgstr "指定在哪里创建文件夹:"
@@ -13054,98 +12503,99 @@ msgstr "创建文件夹"
msgid "Folder _name:"
msgstr "文件夹名称(_N):"
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
#, c-format
msgid "Moving folder %s"
msgstr "正在移动文件夹“%s”"
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
#, c-format
msgid "Copying folder %s"
msgstr "正在复制文件夹 %s"
-#: mail/em-folder-tree.c:848 mail/message-list.c:1561
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
#, c-format
msgid "Moving messages into folder %s"
msgstr "正在把邮件移动到文件夹 %s"
-#: mail/em-folder-tree.c:850 mail/message-list.c:1563
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
#, c-format
msgid "Copying messages into folder %s"
msgstr "把邮件复制到文件夹 %s"
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
msgid "Cannot drop message(s) into toplevel store"
msgstr "无法将消息放到顶级文件夹存储"
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
msgid "_Copy to Folder"
msgstr "复制到文件夹(_C)"
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
msgid "_Move to Folder"
msgstr "移动到文件夹(_M)"
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2556 mail/em-folder-view.c:798
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
#: mail/message-list.c:1651
msgid "_Move"
msgstr "移动(_M)"
-#: mail/em-folder-tree.c:961 mail/message-list.c:1653
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
#, fuzzy
msgid "Cancel _Drag"
msgstr "取消任务"
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
#: 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:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
#, fuzzy
msgid "C_opy"
msgstr "复制"
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
#, fuzzy, c-format
msgid "Creating folder `%s'"
msgstr "正在存储文件夹“%s”"
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:706
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
msgid "Create folder"
msgstr "创建文件夹"
-#: mail/em-folder-tree.c:2477
+#: mail/em-folder-tree.c:2463
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "把文件夹“%s”重命名为:"
-#: mail/em-folder-tree.c:2479
+#: mail/em-folder-tree.c:2465
msgid "Rename Folder"
msgstr "重命名文件夹"
-#: mail/em-folder-tree.c:2550 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 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:2551
+#: mail/em-folder-tree.c:2537
msgid "Open in _New Window"
msgstr "在新窗口中打开(_N)"
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2560
+#: mail/em-folder-tree.c:2546
msgid "_New Folder..."
msgstr "新建文件夹(_N)..."
-#: mail/em-folder-tree.c:2563
+#: mail/em-folder-tree.c:2549
msgid "_Rename"
msgstr "重命名(_R)"
-#: mail/em-folder-tree.c:2566 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
msgid "_Properties..."
msgstr "属性(_P)..."
@@ -13164,19 +12614,19 @@ msgstr ""
msgid "Inbox"
msgstr "收件箱"
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
msgid "Loading..."
msgstr "正在装入..."
#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:510
-#: mail/mail-component.c:556
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:554
msgid "Mail"
msgstr "邮件"
#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
#: ui/evolution-mail-message.xml.h:113
msgid "_Edit as New Message..."
msgstr "作为新邮件进行编辑(_E)..."
@@ -13189,17 +12639,17 @@ msgstr "打印(_P)"
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
#: ui/evolution-mail-message.xml.h:88
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
#: ui/evolution-mail-message.xml.h:87
msgid "Reply to _All"
msgstr "回复所有人(_A)"
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
#: ui/evolution-mail-message.xml.h:114
msgid "_Forward"
msgstr "转发(_F)"
@@ -13252,6 +12702,10 @@ msgstr "移动到文件夹(_V)..."
msgid "_Copy to Folder..."
msgstr "复制到文件夹(_C)..."
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "标签"
+
#: mail/em-folder-view.c:932
msgid "Add Sender to Address_book"
msgstr "将发件人添加到地址簿(_B)"
@@ -13301,12 +12755,12 @@ msgid "Filter on _Mailing List"
msgstr "基于邮件列表过滤(_M)"
#. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
#: mail/mail-config.glade.h:68
msgid "Default"
msgstr "默认"
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
msgid "Print Message"
msgstr "打印消息"
@@ -13345,12 +12799,18 @@ msgstr "抄送"
msgid "Bcc"
msgstr "密件抄送"
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "主题"
+
#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
msgid "Date"
msgstr "日期"
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
msgid "Newsgroups"
msgstr ""
@@ -13541,7 +13001,7 @@ msgid ""
"practical amount of time."
msgstr ""
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
#, fuzzy
msgid "_View Certificate"
msgstr "证书 ID(_C):"
@@ -13658,36 +13118,36 @@ msgid ""
"xmldb' does not exist or is corrupt."
msgstr ""
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
msgid "Save As..."
msgstr "另存为..."
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
#, c-format
msgid "untitled_image.%s"
msgstr "无标题图像.%s"
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
msgid "Set as _Background"
msgstr "设为背景(_B)"
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
msgid "_Reply to sender"
msgstr "回复发件人(_R)"
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
msgid "_Open Link in Browser"
msgstr "在浏览器中打开链接(_O)"
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
msgid "Se_nd message to..."
msgstr "把邮件发送到列表(_N)..."
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
msgid "_Add to Addressbook"
msgstr "添加到地址簿(_A)"
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
#, c-format
msgid "Open in %s..."
msgstr "在 %s 中打开..."
@@ -14290,15 +13750,15 @@ msgid "Evolution is importing your old Elm mail"
msgstr "Evolution 正在导入您原来的电子邮件"
#: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
msgid "Importing..."
msgstr "正在导入..."
#: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
msgid "Please wait"
msgstr "请稍候"
@@ -14320,21 +13780,23 @@ msgid "Elm"
msgstr "Elm"
#: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
msgid "Destination folder:"
msgstr "目的文件夹:"
#: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
msgid "Select folder to import into"
msgstr "选择要导入到哪个文件夹"
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
#: mail/importers/mail-importer.c:226
#, c-format
msgid "Importing `%s'"
msgstr "导入“%s”"
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
#: mail/importers/mail-importer.c:140
msgid "Importing mailbox"
msgstr "导入邮箱"
@@ -14492,15 +13954,15 @@ msgstr ""
msgid "%s License Agreement"
msgstr "%s 许可协议"
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:167
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
msgid "_Host:"
msgstr "主机(_H):"
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:151
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
msgid "User_name:"
msgstr "用户名(_N):"
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:173
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
msgid "_Path:"
msgstr "路径(_P):"
@@ -14528,66 +13990,66 @@ msgstr "%s 邮件列表"
msgid "Add Filter Rule"
msgstr "添加过滤规则"
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
#, c-format
msgid "%d deleted"
msgstr "%d 封已删除"
-#: mail/mail-component.c:465
+#: mail/mail-component.c:463
#, c-format
msgid "%d junk"
msgstr "%d 封垃圾"
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
#, c-format
msgid "%d drafts"
msgstr "%d 封草稿"
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
#, c-format
msgid "%d sent"
msgstr "%d 已发"
-#: mail/mail-component.c:492
+#: mail/mail-component.c:490
#, c-format
msgid "%d unsent"
msgstr "%d 封未发"
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
#, c-format
msgid "%d total"
msgstr "总共 %d 封"
-#: mail/mail-component.c:498
+#: mail/mail-component.c:496
#, c-format
msgid ", %d unread"
msgstr ",%d 封未读"
-#: mail/mail-component.c:658
+#: mail/mail-component.c:656
msgid "New Mail Message"
msgstr "新建邮件"
-#: mail/mail-component.c:659
+#: mail/mail-component.c:657
msgid "_Mail Message"
msgstr "邮件(_M)"
-#: mail/mail-component.c:660
+#: mail/mail-component.c:658
msgid "Compose a new mail message"
msgstr "撰写一封新邮件"
-#: mail/mail-component.c:666
+#: mail/mail-component.c:664
msgid "New Mail Folder"
msgstr "新建邮件文件夹"
-#: mail/mail-component.c:667
+#: mail/mail-component.c:665
msgid "Mail _Folder"
msgstr "邮件文件夹(_F)"
-#: mail/mail-component.c:668
+#: mail/mail-component.c:666
msgid "Create a new mail folder"
msgstr "创建新邮件文件夹"
-#: mail/mail-component.c:800
+#: mail/mail-component.c:798
msgid "Failed upgrading Mail settings or folders."
msgstr ""
@@ -15317,7 +14779,6 @@ msgid ""
msgstr ""
#. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
#, fuzzy
msgid "Are you sure you want to send a message with only BCC recipients?"
@@ -15385,7 +14846,6 @@ msgid ""
msgstr "从该文件夹永久删除所有已删除的邮件"
#. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
msgid "If you continue, you will not be able to recover these messages."
msgstr ""
@@ -15420,7 +14880,7 @@ msgstr ""
#. mail:camel-exception primary
#: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
msgstr ""
#. mail:camel-exception secondary
@@ -15459,13 +14919,6 @@ msgid "{0}."
msgstr "{0}。"
#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
@@ -15481,8 +14934,7 @@ msgstr "输入密码。"
#. mail:filter-load-error primary
#: mail/mail-errors.xml.h:86
msgid "Error loading filter definitions."
-msgstr ""
-"装入过滤规则信息错误。"
+msgstr "装入过滤规则信息错误。"
#. mail:no-save-path primary
#: mail/mail-errors.xml.h:90
@@ -15490,19 +14942,11 @@ msgstr ""
msgid "Cannot save to directory \"{0}\"."
msgstr "无法创建目录“%s”:%s"
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
#. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
#: mail/mail-errors.xml.h:106
msgid "Cannot save to file \"{0}\"."
-msgstr ""
-"无法保存到文件“{0}”。"
+msgstr "无法保存到文件“{0}”。"
#. mail:no-create-path secondary
#: mail/mail-errors.xml.h:96
@@ -15516,15 +14960,6 @@ msgstr "无法创建目录“%s”:%s"
msgid "Cannot create temporary save directory."
msgstr "无法创建临时目录:%s"
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "原因是“{1}”。"
-
#. mail:no-write-path-exists secondary
#: mail/mail-errors.xml.h:104
#, fuzzy
@@ -15552,7 +14987,6 @@ msgid "Cannot delete system folder \"{0}\"."
msgstr "无法删除文件夹:%s:没有该文件夹"
#. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
msgid ""
"System folders are required for Ximian Evolution to function correctly and "
@@ -15584,13 +15018,11 @@ msgid ""
msgstr ""
#. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
msgid "Cannot rename \"{0}\" to \"{1}\"."
msgstr ""
#. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
#, fuzzy
msgid "A folder named \"{1}\" already exists. Please use a different name."
@@ -15602,28 +15034,24 @@ msgid "Because \"{2}\"."
msgstr "原因是“{2}”。"
#. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
#, fuzzy
msgid "Cannot move folder \"{0}\" to \"{1}\"."
msgstr "无法移动文件夹:%s"
#. 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 "无法打开“%s”:%s"
#. 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 "无法打开消息"
#. 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}\"."
@@ -15642,7 +15070,6 @@ msgid "Cannot open source \"{1}\""
msgstr "无法打开“%s”:%s"
#. 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 ""
@@ -15805,7 +15232,7 @@ msgstr "覆盖(_O)"
msgid "_Append"
msgstr "追加(_A)"
-#: mail/mail-folder-cache.c:791
+#: mail/mail-folder-cache.c:785
#, c-format
msgid "Pinging %s"
msgstr "正在查验 %s"
@@ -16245,6 +15672,10 @@ msgstr "转发"
msgid "No Response Necessary"
msgstr "不必回复"
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "已读"
+
#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
msgid "Reply"
msgstr "回复"
@@ -16345,44 +15776,48 @@ msgid ""
msgstr ""
#: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
msgstr ""
#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: 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:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
#, fuzzy, c-format
msgid "%ld KB"
msgstr "%m月%d日"
-#: shell/e-shell.c:743
+#: shell/e-shell.c:786
#, fuzzy
msgid "Uknown system error."
msgstr "未知的错误"
-#: shell/e-shell.c:1100
+#: shell/e-shell.c:1143
msgid "Invalid arguments"
msgstr "无效参数"
-#: shell/e-shell.c:1102
+#: shell/e-shell.c:1145
msgid "Cannot register on OAF"
msgstr "无法注册到 OAF"
-#: shell/e-shell.c:1104
+#: shell/e-shell.c:1147
msgid "Configuration Database not found"
msgstr "找不到配置数据库"
-#: shell/e-shell.c:1106
+#: shell/e-shell.c:1149
msgid "Generic error"
msgstr "通用错误"
@@ -16439,7 +15874,7 @@ msgstr ""
msgid "Select importer"
msgstr "选择导入器"
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
#, c-format
msgid "File %s does not exist"
msgstr "文件 %s 不存在"
@@ -16467,31 +15902,32 @@ 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
-msgid "_Filename:"
-msgstr "文件名(_F):"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "文件名:"
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
msgid "Select a file"
msgstr "选择一个文件"
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
msgid "File _type:"
msgstr "文件类型(_T):"
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
msgid "Import data and settings from _older programs"
msgstr "从老版程序中导入数据和设置(_O)"
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
msgid "Import a _single file"
msgstr "导入单个文件(_S)"
-#: shell/e-shell-importer.c:723 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"
@@ -16499,26 +15935,26 @@ msgstr ""
"请稍候...\n"
"正在扫描现有设置"
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
msgid "Starting Intelligent Importers"
msgstr "启动智能导入器"
-#: shell/e-shell-importer.c:853 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:1044
+#: shell/e-shell-importer.c:1073
#, fuzzy, c-format
msgid "No importer available for file %s"
msgstr "协议“%s”没有可用的提供者"
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
#, fuzzy
msgid "Unable to execute importer"
msgstr "执行 gpg 失败。"
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
msgid "_Import"
msgstr "导入(_I)"
@@ -16563,57 +15999,57 @@ msgstr "文件夹名不能含有字符“#”。"
msgid "'.' and '..' are reserved folder names."
msgstr "“.”和“..”是保留文件夹名。"
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
#, fuzzy
msgid "Evolution is currently online. Click on this button to work offline."
msgstr "Ximian Evolution 目前在线。点击该按钮则脱机工作。"
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
#, fuzzy
msgid "Evolution is in the process of going offline."
msgstr "Ximian Evolution 正在脱机过程中。"
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
#, fuzzy
msgid "Evolution is currently offline. Click on this button to work online."
msgstr "Ximian Evolution 目前脱机。点击该按钮则在线工作。"
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
#, fuzzy, 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
+#: shell/e-shell-window-commands.c:323
#, fuzzy
-msgid "About Evolution"
-msgstr "关于 Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Groupwise"
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
msgid "_Work Online"
msgstr "在线工作(_W)"
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 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:589 ui/evolution.xml.h:25
msgid "Work Offline"
msgstr "脱机工作"
@@ -16928,13 +16364,11 @@ 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 无法启动。"
@@ -16945,7 +16379,10 @@ msgid ""
"Your system configuration does not match your Evolution configuration.\n"
"\n"
"Click help for details"
-msgstr "您的系统配置与您的 Evolution 配置不相符。\n\n请单击帮助以查看细节"
+msgstr ""
+"您的系统配置与您的 Evolution 配置不相符。\n"
+"\n"
+"请单击帮助以查看细节"
#. shell:noshell-reason secondary
#: shell/shell-errors.xml.h:29
@@ -16957,30 +16394,30 @@ msgid ""
"Click help for details."
msgstr ""
-#: 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 "电子邮件地址"
@@ -17077,7 +16514,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 "证书"
@@ -17098,19 +16535,23 @@ 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:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "无效的证书颁发机构(CA)"
+
#: smime/gui/smime-ui.glade.h:24
msgid "Email Recipient Certificate"
msgstr ""
@@ -17145,253 +16586,263 @@ msgstr "组织单元(OU)"
msgid "SHA1 Fingerprint"
msgstr ""
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
msgid "SSL Client Certificate"
msgstr ""
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
msgid "SSL Server Certificate"
msgstr ""
#: 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
-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 ""
+
+#: 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
+#, fuzzy
+msgid "Sign"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "PGP 加密"
+
+#: 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 "证书 ID(_C):"
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
#, fuzzy
msgid "Netscape Certificate Type"
msgstr "证书 ID(_C):"
-#: 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
msgid "Subject Public Key Info"
msgstr ""
-#: 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
msgid "Object Signer"
msgstr ""
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
#, fuzzy
msgid "SSL Certificate Authority"
msgstr "无效的证书颁发机构(CA)"
-#: 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
#, fuzzy
msgid "Signing"
msgstr "Stauning"
-#: 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
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 "证书签名值"
@@ -17541,7 +16992,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)"
@@ -17700,7 +17151,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 "关闭"
@@ -17713,7 +17164,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 "主工具栏"
@@ -17756,7 +17207,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)"
@@ -18013,13 +17464,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)"
@@ -18415,7 +17866,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)"
@@ -18712,106 +18163,120 @@ msgid "_Open Task"
msgstr "打开任务(_O)"
#: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "关于 Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "关于 Ximian Evolution"
#: ui/evolution.xml.h:2
msgid "Change Evolution's settings"
msgstr "更改 Evolution 的设置"
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+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
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian 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
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
msgstr "显示关于 Ximian 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
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution 常见问题(_F)"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "主工具栏"
#: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "关于 Ximian Evolution(_A)..."
+msgid "Toggle whether we are working offline."
+msgstr "切换是否脱机工作。"
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "关于 Ximian Evolution"
+
+#: 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)"
@@ -19182,14 +18647,12 @@ msgstr "您打算覆盖它吗?"
#. system:no-save-file primary
#: widgets/misc/e-system-errors.xml.h:9
msgid "Cannot save file \"{0}\"."
-msgstr ""
-"无法保存文件“{0}”。"
+msgstr "无法保存文件“{0}”。"
#. system:no-load-file primary
#: widgets/misc/e-system-errors.xml.h:13
msgid "Cannot open file \"{0}\"."
-msgstr ""
-"无法打开文件“{0}”。"
+msgstr "无法打开文件“{0}”。"
#: widgets/misc/e-task-widget.c:212
#, c-format
@@ -19201,3 +18664,429 @@ msgstr "%s (...)"
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "连接 LDAP 服务器失败"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "LDAP 服务器认证失败"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "无法在根 DSE 上执行查询"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "服务器响应为没有支持的搜索起点"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "此服务器不支持 LDAPv3 schema 信息"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "检索 schema 信息错误"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "服务器没有响应有效的 schema 信息"
+
+#~ msgid " S_how Supported Bases "
+#~ msgstr " 显示支持的基础(_H) "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "连接"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "识别性名称(_N):"
+
+#~ msgid "Email address:"
+#~ msgstr "电子邮件地址:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution 将使用此已识别的名字在服务器上对您进行认证"
+
+#~ msgid "One"
+#~ msgstr "一级"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "搜索范围(_E):"
+
+#~ msgid "Searching"
+#~ msgstr "搜索"
+
+#~ msgid "Sub"
+#~ msgstr "子级"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "此选项控制搜索将运行多长时间。"
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "使用 _SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "显示名称(_D):"
+
+#~ msgid "_Port number:"
+#~ msgstr "端口号(_P):"
+
+#~ msgid "_Search base:"
+#~ msgstr "搜索起点(_S):"
+
+#~ msgid "_Server name:"
+#~ msgstr "服务器名(_S):"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "超时(分钟)(_T):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "连接页"
+
+#~ msgid "general-tab"
+#~ msgstr "常规页"
+
+#~ msgid "searching-tab"
+#~ msgstr "搜索页"
+
+#~ msgid "Webcam:"
+#~ msgstr "摄像头:"
+
+#~ msgid "item7"
+#~ msgstr "项目 7"
+
+#~ msgid "item8"
+#~ msgstr "项目 8"
+
+#~ msgid "Category editor not available."
+#~ msgstr "类别编辑器不可用。"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "您希望保存修改吗?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "保存 %s 出错:%s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "%s\n"
+#~ "的地址簿后端已经崩溃。您需要重新启动 Evolution 才能再次使用该后端"
+
+#~ msgid "Can not load URI"
+#~ msgstr "无法装入 URI"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "日历属性"
+
+#~ msgid "Remote"
+#~ msgstr "远程"
+
+#~ msgid "Task List Properties"
+#~ msgstr "任务列表属性"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "刷新间隔(_R):"
+
+#~ msgid "_Source URL:"
+#~ msgstr "源 URI(_S):"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr "即将删除的事件是一个会议,您是否想要发送一条取消通告?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "您真的要取消并删除此会议吗?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr "即将删除的任务已被指派,您是否想要要发送一条取消通告?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "您真的要取消并删除此任务吗?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr "即将删除的日历项已公布,您是否想要发送一条取消通告?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "您真的想要取消并删除该日志条目吗?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "您真的想要删除约会“%s”吗?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "您真的想要删除此无标题约会吗?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "您真的想要删除任务“%s”吗?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "您真的想要删除此无标题任务吗?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "您真的想要删除日志条目“%s”吗?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "您真的想要删除此无标题日志条目吗?"
+
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "您真的想要删除 %d 个约会吗?"
+
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "您真的想要删除 %d 个任务吗?"
+
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "您真的想要删除 %d 个日志条目吗?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "邀请其他人(_I)..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "该事件已经被改变,但还没有保存。\n"
+#~ "\n"
+#~ "您希望保存改动吗?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "丢弃修改(_D)"
+
+#~ msgid "Save Event"
+#~ msgstr "保存事件"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "会议信息已创建。发送此信息吗?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "会议信息已经改变。发送更新版本吗?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "任务分配信息已创建。发送此信息吗?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "任务信息已经改变。发送更新版本?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "无法获取组:%s"
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "自动存储邮件错误:%s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "解析错误"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "未知的错误:%s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "无法获取组:%s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "无法发送邮件:%s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "未知的服务器应答:%s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "调整评分"
+
+#~ msgid "Assign Color"
+#~ msgstr "指定颜色"
+
+#~ msgid "Assign Score"
+#~ msgstr "指定分数"
+
+#~ msgid "Attachments"
+#~ msgstr "附件"
+
+#~ msgid "Beep"
+#~ msgstr "响铃"
+
+#~ msgid "contains"
+#~ msgstr "含有"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "复制到文件夹"
+
+#~ msgid "Date received"
+#~ msgstr "接收日期"
+
+#~ msgid "Date sent"
+#~ msgstr "发送日期"
+
+#~ msgid "Deleted"
+#~ msgstr "已删除"
+
+#~ msgid "does not contain"
+#~ msgstr "不含有"
+
+#~ msgid "does not end with"
+#~ msgstr "不以之结尾"
+
+#~ msgid "does not exist"
+#~ msgstr "不存在"
+
+#~ msgid "does not return"
+#~ msgstr "不返回"
+
+#~ msgid "does not sound like"
+#~ msgstr "听起来不像"
+
+#~ msgid "does not start with"
+#~ msgstr "不以之开始"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "不存在"
+
+#~ msgid "Draft"
+#~ msgstr "草稿"
+
+#~ msgid "ends with"
+#~ msgstr "以之结束"
+
+#~ msgid "Exist"
+#~ msgstr "存在"
+
+#~ msgid "exists"
+#~ msgstr "存在"
+
+#~ msgid "Expression"
+#~ msgstr "表达式"
+
+#~ msgid "Follow Up"
+#~ msgstr "跟随"
+
+#~ msgid "is"
+#~ msgstr "是"
+
+#~ msgid "is after"
+#~ msgstr "以后"
+
+#~ msgid "is before"
+#~ msgstr "以前"
+
+#~ msgid "is Flagged"
+#~ msgstr "有标志"
+
+#~ msgid "is greater than"
+#~ msgstr "大于"
+
+#~ msgid "is less than"
+#~ msgstr "小于"
+
+#~ msgid "is not"
+#~ msgstr "不是"
+
+#~ msgid "is not Flagged"
+#~ msgstr "未标志"
+
+#~ msgid "Junk Test"
+#~ msgstr "垃圾测试"
+
+#~ msgid "Mailing list"
+#~ msgstr "邮件列表"
+
+#~ msgid "Message Body"
+#~ msgstr "邮件体"
+
+#~ msgid "Message Header"
+#~ msgstr "邮件头"
+
+#~ msgid "Message is Junk"
+#~ msgstr "邮件是垃圾"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "邮件不是垃圾"
+
+#~ msgid "Move to Folder"
+#~ msgstr "移动到文件夹"
+
+#~ msgid "Pipe to Program"
+#~ msgstr "管道到程序"
+
+#~ msgid "Play Sound"
+#~ msgstr "播放声音"
+
+#~ msgid "Recipients"
+#~ msgstr "收件人"
+
+#~ msgid "Regex Match"
+#~ msgstr "常规表达式匹配"
+
+#~ msgid "Replied to"
+#~ msgstr "已回复"
+
+#~ msgid "returns"
+#~ msgstr "返回"
+
+#~ msgid "returns greater than"
+#~ msgstr "返回大于"
+
+#~ msgid "returns less than"
+#~ msgstr "返回小于"
+
+#~ msgid "Run Program"
+#~ msgstr "运行程序"
+
+#~ msgid "Sender"
+#~ msgstr "发件人"
+
+#~ msgid "Set Status"
+#~ msgstr "设置状态"
+
+#~ msgid "Size (kB)"
+#~ msgstr "大小 (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "听起来象"
+
+#~ msgid "Source Account"
+#~ msgstr "来源账户"
+
+#~ msgid "Specific header"
+#~ msgstr "指定邮件头"
+
+#~ msgid "starts with"
+#~ msgstr "以之开始"
+
+#~ msgid "Stop Processing"
+#~ msgstr "停止处理"
+
+#~ msgid "Unset Status"
+#~ msgstr "未设置状态"
+
+#~ msgid "Brought to you by"
+#~ msgstr "制作团队"
+
+#~ msgid "_Filename:"
+#~ msgstr "文件名(_F):"
+
+#~ msgid "View Certificate"
+#~ msgstr "查看证书"
+
+#, fuzzy
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "无效的证书颁发机构(CA)"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "关于 Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "关于 Ximian Evolution(_A)..."