aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po1277
1 files changed, 711 insertions, 566 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 54cb4d874d..5cec983489 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2004-07-19 15:12-0400\n"
+"POT-Creation-Date: 2004-08-02 15:35-0400\n"
"PO-Revision-Date: 2004-07-13 15:30+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -205,17 +205,17 @@ msgid ""
"Your contacts for {0} will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则 {0} 的联系人无法使用。"
-#: addressbook/conduit/address-conduit.c:275
+#: addressbook/conduit/address-conduit.c:298
msgid "Default Sync Address:"
msgstr "默认的同步地址:"
-#: addressbook/conduit/address-conduit.c:1156
-#: addressbook/conduit/address-conduit.c:1157
+#: addressbook/conduit/address-conduit.c:1181
+#: addressbook/conduit/address-conduit.c:1182
msgid "Could not load addressbook"
msgstr "无法装入地址簿"
-#: addressbook/conduit/address-conduit.c:1225
-#: addressbook/conduit/address-conduit.c:1228
+#: addressbook/conduit/address-conduit.c:1250
+#: addressbook/conduit/address-conduit.c:1253
msgid "Could not read pilot's Address application block"
msgstr "无法读入 Pilot 的地址应用程序块"
@@ -241,8 +241,8 @@ msgstr "在此配置自动完成"
#. Create the contacts group
#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/gui/component/addressbook-view.c:1044
-#: calendar/gui/migration.c:373
+#: addressbook/gui/component/addressbook-view.c:1104
+#: calendar/gui/migration.c:377
msgid "Contacts"
msgstr "联系人"
@@ -303,63 +303,66 @@ msgid "Create a new contact list"
msgstr "创建一个新的联系人列表"
#: addressbook/gui/component/addressbook-component.c:109
-msgid "New Contacts Group"
-msgstr "新建联系人组"
+#: addressbook/gui/component/addressbook-view.c:773
+msgid "New Address Book"
+msgstr "新地址簿"
#: addressbook/gui/component/addressbook-component.c:110
-msgid "Contacts Grou_p"
-msgstr "联系人组(_P)"
+#, fuzzy
+msgid "Address _Book"
+msgstr "地址簿(_B):"
#: addressbook/gui/component/addressbook-component.c:111
-msgid "Create a new contacts group"
-msgstr "创建新联系人组"
+#, fuzzy
+msgid "Create a new address book"
+msgstr "创建新任务"
#: addressbook/gui/component/addressbook-component.c:184
msgid "Failed upgrading Addressbook settings or folders."
msgstr "升级地址簿设置或文件夹失败。"
-#: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
+#: addressbook/gui/component/addressbook-migrate.c:72
+#: calendar/gui/migration.c:141 mail/em-migrate.c:1160
msgid "Migrating..."
msgstr "正在升迁..."
-#: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
+#: addressbook/gui/component/addressbook-migrate.c:124
+#: calendar/gui/migration.c:188 mail/em-migrate.c:1201
#, c-format
msgid "Migrating `%s':"
msgstr "升迁“%s”:"
#. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:489
-#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
+#: addressbook/gui/component/addressbook-migrate.c:493
+#: calendar/gui/migration.c:450 calendar/gui/migration.c:532
#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
#: mail/mail-component.c:245 mail/mail-vfolder.c:218
msgid "On This Computer"
msgstr "在此计算机中"
#. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:497
+#: addressbook/gui/component/addressbook-migrate.c:501
#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
+#: calendar/gui/migration.c:458 calendar/gui/migration.c:540
#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
#: mail/mail-config.glade.h:109
msgid "Personal"
msgstr "个人"
#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:505
+#: addressbook/gui/component/addressbook-migrate.c:509
msgid "On LDAP Servers"
msgstr "在 LDAP 服务器上"
-#: addressbook/gui/component/addressbook-migrate.c:633
+#: addressbook/gui/component/addressbook-migrate.c:637
msgid "LDAP Servers"
msgstr "LDAP 服务器"
-#: addressbook/gui/component/addressbook-migrate.c:748
+#: addressbook/gui/component/addressbook-migrate.c:752
msgid "Autocompletion Settings"
msgstr "自动补全设置"
-#: addressbook/gui/component/addressbook-migrate.c:1119
+#: addressbook/gui/component/addressbook-migrate.c:1123
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -370,7 +373,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: addressbook/gui/component/addressbook-migrate.c:1133
+#: addressbook/gui/component/addressbook-migrate.c:1137
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -380,7 +383,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: addressbook/gui/component/addressbook-migrate.c:1142
+#: addressbook/gui/component/addressbook-migrate.c:1146
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -390,7 +393,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: addressbook/gui/component/addressbook-migrate.c:1152
+#: addressbook/gui/component/addressbook-migrate.c:1156
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -400,18 +403,14 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的 Pilot 同步数据..."
-#: addressbook/gui/component/addressbook-view.c:633
+#: addressbook/gui/component/addressbook-view.c:671
#, c-format
msgid "Address book '%s' will be removed. Are you sure you want to continue?"
msgstr "即将删除日历“%s”。您确定想要继续吗?"
-#: addressbook/gui/component/addressbook-view.c:714
-msgid "New Address Book"
-msgstr "新地址簿"
-
-#: addressbook/gui/component/addressbook-view.c:715
-#: addressbook/gui/widgets/e-addressbook-view.c:1119
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: addressbook/gui/component/addressbook-view.c:774
+#: addressbook/gui/widgets/e-addressbook-view.c:1124
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:376
#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
#: ui/evolution-contact-editor.xml.h:3
@@ -420,8 +419,8 @@ msgstr "新地址簿"
msgid "Delete"
msgstr "删除"
-#: addressbook/gui/component/addressbook-view.c:716
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
+#: addressbook/gui/component/addressbook-view.c:775
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:378
msgid "Properties..."
msgstr "属性..."
@@ -430,12 +429,12 @@ msgid "Accessing LDAP Server anonymously"
msgstr "匿名访问 LDAP 服务器"
#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:388
+#: camel/providers/groupwise/camel-gw-listener.c:417
msgid "Failed to authenticate.\n"
msgstr "认证失败。\n"
#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:377
+#: camel/providers/groupwise/camel-gw-listener.c:406
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%s为 %s 输入口令 (用户 %s)"
@@ -525,8 +524,9 @@ msgid "<b>Type:</b>"
msgstr "<b>类型:</b>"
#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Add Contacts Group"
-msgstr "添加联系人组"
+#, fuzzy
+msgid "Add Address Book"
+msgstr "地址簿"
#: addressbook/gui/component/ldap-config.glade.h:14
msgid "Address Book Properties"
@@ -555,54 +555,43 @@ msgid "Distinguished name"
msgstr "识别性名称"
#: addressbook/gui/component/ldap-config.glade.h:20
-msgid "Download limit:"
-msgstr "下载上限:"
-
-#: addressbook/gui/component/ldap-config.glade.h:21
msgid "Email address"
msgstr "电子邮件地址"
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
msgid ""
"Evolution will use this email address to authenticate you with the server."
msgstr "Evolution 将使用此电子邮件地址在服务器上对您进行认证。"
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
msgid "Find Possible Search Bases"
msgstr "查找可能的搜索基础"
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
#: 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:24
+#, fuzzy
+msgid "Lo_gin:"
+msgstr "Login"
+
#: 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:26
-msgid "Only locations within starting point"
-msgstr "只在起点的位置内"
+msgid "One"
+msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:27
msgid "Search _base:"
msgstr "搜索基础(_B):"
#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Search base only"
-msgstr "只搜索基础"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
-msgid "Search base:"
-msgstr "搜索基础:"
-
-#: addressbook/gui/component/ldap-config.glade.h:30
-msgid "Search scope:"
-msgstr "搜索范围:"
-
-#: addressbook/gui/component/ldap-config.glade.h:31
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if your LDAP server supports SSL or TLS."
@@ -610,7 +599,7 @@ msgstr ""
"选中此选项意味着 Evolution 只在您的 LDAP 服务器支持 SSL 或 TLS 时才连接到您"
"的 LDAP 服务器。"
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:29
msgid ""
"Selecting this option means that Evolution will only try to use SSL/TLS if "
"you are in a insecure environment. For example, if you and your LDAP server "
@@ -621,7 +610,7 @@ msgstr ""
"您和您的 LDAP 服务器工作时位于防火墙后,Evolution 就没有必要使用 SSL/TLS,因"
"为您的连接已经相当安全了。"
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:30
msgid ""
"Selecting this option means that your server does not support either SSL or "
"TLS. This means that your connection will be insecure, and that you will be "
@@ -630,15 +619,16 @@ msgstr ""
"选择此选项意味着您的服务器既不支持 SSL 也不支持 TLS。可能导致的结果将是您的连"
"接不太安全,您也易于受到安全漏洞的攻击。"
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "Starting point and locations within it"
-msgstr "起点及其中的位置"
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
+msgid "Sub"
+msgstr "日"
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:32
msgid "Supported Search Bases"
msgstr "支持的搜索起点"
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:33
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
"searches will begin. If you leave this blank, the search will begin at the "
@@ -647,7 +637,7 @@ msgstr ""
"搜索基础是您搜索开始项的可识别名称(DN)。如果您将此处留空,搜索将从目录树的根"
"开始。"
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:34
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the directory tree. A search scope of \"sub\" will include all entries below "
@@ -658,19 +648,19 @@ msgstr ""
"搜索基础下所属的全部项。搜索范围若为“一级”,则只会包含您指定的搜索基础之下一"
"级的项目。"
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:35
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr "这是您的 LDAP 服务器的完整名字。例如,“ldap.mycompany.com”。"
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:36
msgid ""
"This is the maximum number of entries to download. Setting this number to be "
"too large will slow down your address book."
msgstr "这是可下载条目的最大数量。将此数值设定得太大将导致地址簿变慢。"
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:37
msgid ""
"This is the method evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -679,13 +669,13 @@ msgstr ""
"这是 evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
"对 ldap 服务器的匿名访问权限。"
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:38
msgid ""
"This is the name for this server that will appear in your Evolution folder "
"list. It is for display purposes only. "
msgstr "这是此服务器在 Evolution 文件夹列表中显示的名称。它只用于显示。"
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:39
msgid ""
"This is the port on the LDAP server that Evolution will try to connect to. A "
"list of standard ports has been provided. Ask your system administrator what "
@@ -694,77 +684,66 @@ msgstr ""
"这是 LDAP 服务器上的端口,Evolution 将试图连接到您所给出的标准端口列表。如果"
"您不清楚要指定的端口,请询问您的系统管理员。"
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Timeout:"
-msgstr "超时:"
-
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:40
msgid "Using distinguished name (DN)"
msgstr "使用已识别的姓名(DN)"
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:41
msgid "Using email address"
msgstr "使用电子邮件地址"
-#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:42 mail/mail-account-gui.c:80
#: mail/mail-config.glade.h:156
msgid "Whenever Possible"
msgstr "可能时"
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid "_Add Contacts Group"
-msgstr "添加联系人组(_A)"
+#: addressbook/gui/component/ldap-config.glade.h:43
+#, fuzzy
+msgid "_Add Address Book"
+msgstr "添加到地址簿(_A)"
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:44
msgid "_Download limit:"
msgstr "下载上限(_D):"
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Email address:"
-msgstr "电子邮件地址(_E):"
-
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:45
msgid "_Find Possible Search Bases"
msgstr "查找可能的搜索基础(_F)"
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
msgid "_Log in method:"
msgstr "登录方式(_L):"
-#: addressbook/gui/component/ldap-config.glade.h:52
-msgid "_Log in:"
-msgstr "登录(_L):"
-
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:47
#: 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:54
+#: addressbook/gui/component/ldap-config.glade.h:48
msgid "_Port:"
msgstr "端口(_P):"
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:49
msgid "_Search scope:"
msgstr "搜索范围(_S):"
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:50
msgid "_Server:"
msgstr "服务器(_S):"
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:51
msgid "_Timeout:"
msgstr "超时(_T):"
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:52
msgid "_Use secure connection:"
msgstr "使用安全连接(_U):"
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:53
msgid "cards"
msgstr "卡片"
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:54
#: calendar/gui/dialogs/alarm-dialog.glade.h:27
#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
#: mail/mail-config.glade.h:183
@@ -886,7 +865,7 @@ msgstr "<b>工作</b>"
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:333
msgid "AIM"
msgstr "AIM"
@@ -1044,8 +1023,8 @@ msgid "_Where:"
msgstr "何处(_W):"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:350
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:352
+#: addressbook/gui/widgets/eab-contact-display.c:367
msgid "Address"
msgstr "地址"
@@ -2037,7 +2016,7 @@ msgstr "AOL 即时通讯程序"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:336
msgid "Jabber"
msgstr "Jabber"
@@ -2047,7 +2026,7 @@ msgstr "雅虎通"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
#: addressbook/gui/contact-editor/e-contact-editor.c:188
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:335
msgid "ICQ"
msgstr "ICQ"
@@ -2076,17 +2055,17 @@ msgid "Other"
msgstr "其它"
#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:338
msgid "Yahoo"
msgstr "雅虎"
#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:337
msgid "MSN"
msgstr "MSN"
#: addressbook/gui/contact-editor/e-contact-editor.c:189
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:334
msgid "GroupWise"
msgstr "GroupWise"
@@ -2166,13 +2145,13 @@ msgstr "全名(_F):"
msgid "E-_mail:"
msgstr "电子邮件(_M):"
-#: addressbook/gui/contact-editor/eab-editor.c:315
+#: addressbook/gui/contact-editor/eab-editor.c:319
msgid ""
"Are you sure you want\n"
"to delete these contacts?"
msgstr "您确定要删除这些联系人吗?"
-#: addressbook/gui/contact-editor/eab-editor.c:318
+#: addressbook/gui/contact-editor/eab-editor.c:322
msgid ""
"Are you sure you want\n"
"to delete this contact?"
@@ -2465,97 +2444,97 @@ msgstr "高级..."
msgid "Type"
msgstr "类型"
-#: addressbook/gui/widgets/e-addressbook-view.c:539
+#: addressbook/gui/widgets/e-addressbook-view.c:544
msgid "Address Book"
msgstr "地址簿"
-#: addressbook/gui/widgets/e-addressbook-view.c:883
-#: addressbook/gui/widgets/e-addressbook-view.c:1103
-#: addressbook/gui/widgets/e-addressbook-view.c:2093
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
+#: addressbook/gui/widgets/e-addressbook-view.c:2098
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard..."
msgstr "另存为 VCard..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
msgid "New Contact..."
msgstr "新建联系人..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
+#: addressbook/gui/widgets/e-addressbook-view.c:1096
msgid "New Contact List..."
msgstr "新建联系人列表..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1094
+#: addressbook/gui/widgets/e-addressbook-view.c:1099
msgid "Go to Folder..."
msgstr "转到文件夹..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1095
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
msgid "Import..."
msgstr "导入..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1097
+#: addressbook/gui/widgets/e-addressbook-view.c:1102
msgid "Search for Contacts..."
msgstr "搜索联系人..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1098
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
msgid "Address Book Sources..."
msgstr "地址簿来源..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
msgid "Pilot Settings..."
msgstr "Pilot 设置..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: addressbook/gui/widgets/e-addressbook-view.c:1109
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "转发联系人"
-#: addressbook/gui/widgets/e-addressbook-view.c:1105
+#: addressbook/gui/widgets/e-addressbook-view.c:1110
msgid "Send Message to Contact"
msgstr "给联系人发邮件"
-#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1111 calendar/gui/print.c:2480
#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
msgid "Print"
msgstr "打印"
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
msgid "Print Envelope"
msgstr "打印信封"
-#: addressbook/gui/widgets/e-addressbook-view.c:1112
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
msgid "Copy to Address Book..."
msgstr "复制到地址簿..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
msgid "Move to Address Book..."
msgstr "移动到地址簿..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1116
+#: addressbook/gui/widgets/e-addressbook-view.c:1121
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "剪切"
-#: addressbook/gui/widgets/e-addressbook-view.c:1117
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: addressbook/gui/widgets/e-addressbook-view.c:1122
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:374
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr "复制"
-#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
msgid "Paste"
msgstr "粘贴"
-#: addressbook/gui/widgets/e-addressbook-view.c:1123
-#: calendar/gui/e-calendar-view.c:1351
+#: addressbook/gui/widgets/e-addressbook-view.c:1128
+#: calendar/gui/e-calendar-view.c:1347
msgid "Current View"
msgstr "当前视图"
#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: addressbook/gui/widgets/e-addressbook-view.c:1683
#: calendar/gui/cal-search-bar.c:358
msgid "Any Category"
msgstr "任何类别"
@@ -2599,7 +2578,7 @@ msgid "Company Phone"
msgstr "公司电话"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+#: addressbook/gui/widgets/eab-contact-display.c:547 smime/lib/e-cert.c:826
msgid "Email"
msgstr "电子邮件"
@@ -2650,7 +2629,7 @@ msgid "Manager"
msgstr "经理"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:366
msgid "Mobile Phone"
msgstr "移动电话"
@@ -2659,7 +2638,7 @@ msgid "Nickname"
msgstr "昵称"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:377
msgid "Note"
msgstr "注释"
@@ -2668,7 +2647,7 @@ msgid "Office"
msgstr "办公室"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:347
msgid "Organization"
msgstr "组织"
@@ -2794,65 +2773,65 @@ msgstr "已选择"
msgid "Has Cursor"
msgstr "有光标"
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
+#: addressbook/gui/widgets/eab-contact-display.c:133
+#: addressbook/gui/widgets/eab-contact-display.c:196
msgid "(map)"
msgstr "(地图)"
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
+#: addressbook/gui/widgets/eab-contact-display.c:143
+#: addressbook/gui/widgets/eab-contact-display.c:209
msgid "map"
msgstr "地图"
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:526
+#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:528
msgid "List Members"
msgstr "列出成员"
-#: addressbook/gui/widgets/eab-contact-display.c:322
#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:326
msgid "E-mail"
msgstr "电子邮件"
-#: addressbook/gui/widgets/eab-contact-display.c:346
+#: addressbook/gui/widgets/eab-contact-display.c:348
msgid "Position"
msgstr "位置"
-#: addressbook/gui/widgets/eab-contact-display.c:347
+#: addressbook/gui/widgets/eab-contact-display.c:349
msgid "Video Conferencing"
msgstr "视频会议"
-#: addressbook/gui/widgets/eab-contact-display.c:348
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
msgid "Phone"
msgstr "电话"
-#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:351
msgid "Fax"
msgstr "传真"
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/widgets/eab-contact-display.c:355
msgid "work"
msgstr "工作"
-#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:362
msgid "WWW"
msgstr "WWW"
-#: addressbook/gui/widgets/eab-contact-display.c:361
-#: addressbook/gui/widgets/eab-contact-display.c:580
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:582
msgid "Blog"
msgstr "Blog"
-#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:370
msgid "personal"
msgstr "个人"
-#: addressbook/gui/widgets/eab-contact-display.c:541
+#: addressbook/gui/widgets/eab-contact-display.c:543
msgid "Job Title"
msgstr "职称"
-#: addressbook/gui/widgets/eab-contact-display.c:572
+#: addressbook/gui/widgets/eab-contact-display.c:574
msgid "Home page"
msgstr "主页"
@@ -3145,7 +3124,7 @@ msgid_plural "and %d other contacts."
msgstr[0] "以及另外 %d 个联系人。"
#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
+#: addressbook/gui/widgets/eab-vcard-control.c:272
msgid "Show Full VCard"
msgstr "显示完整 VCard"
@@ -3153,7 +3132,7 @@ msgstr "显示完整 VCard"
msgid "Show Compact VCard"
msgstr "显示紧凑 VCard"
-#: addressbook/gui/widgets/eab-vcard-control.c:278
+#: addressbook/gui/widgets/eab-vcard-control.c:277
msgid "Save in addressbook"
msgstr "保存在地址簿中"
@@ -3720,33 +3699,33 @@ msgstr "Evolution 日历异常退出。"
msgid "Your calendars will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的日历无法使用。"
-#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:48 calendar/gui/e-pub-utils.c:301
#: smime/gui/component.c:48
msgid "Enter password"
msgstr "输入密码"
-#: calendar/conduits/calendar/calendar-conduit.c:223
+#: calendar/conduits/calendar/calendar-conduit.c:246
msgid "Split Multi-Day Events:"
msgstr "分割多日事件:"
-#: calendar/conduits/calendar/calendar-conduit.c:1330
-#: calendar/conduits/calendar/calendar-conduit.c:1331
-#: calendar/conduits/todo/todo-conduit.c:852
-#: calendar/conduits/todo/todo-conduit.c:853
+#: calendar/conduits/calendar/calendar-conduit.c:1356
+#: calendar/conduits/calendar/calendar-conduit.c:1357
+#: calendar/conduits/todo/todo-conduit.c:879
+#: calendar/conduits/todo/todo-conduit.c:880
msgid "Could not start evolution-data-server"
msgstr "无法启动 evolution-data-server"
-#: calendar/conduits/calendar/calendar-conduit.c:1439
-#: calendar/conduits/calendar/calendar-conduit.c:1442
+#: calendar/conduits/calendar/calendar-conduit.c:1465
+#: calendar/conduits/calendar/calendar-conduit.c:1468
msgid "Could not read pilot's Calendar application block"
msgstr "无法读入 Pilot 日历应用程序块"
-#: calendar/conduits/todo/todo-conduit.c:209
+#: calendar/conduits/todo/todo-conduit.c:234
msgid "Default Priority:"
msgstr "默认优先级:"
-#: calendar/conduits/todo/todo-conduit.c:932
-#: calendar/conduits/todo/todo-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:959
+#: calendar/conduits/todo/todo-conduit.c:962
msgid "Could not read pilot's ToDo application block"
msgstr "无法读入 Pilot ToDo 应用程序块"
@@ -3796,10 +3775,10 @@ msgid "Evolution's Tasks component"
msgstr "Evolution 任务组件"
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1194 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:418 calendar/gui/tasks-component.c:880
-#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
+#: calendar/gui/e-tasks.c:1198 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:419 calendar/gui/tasks-component.c:884
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:83
+#: calendar/importers/icalendar-importer.c:709
msgid "Tasks"
msgstr "任务"
@@ -3920,7 +3899,7 @@ msgstr "无法初始化 Bonobo"
msgid "Could not create the alarm notify service factory"
msgstr "无法创建提醒服务车间"
-#: calendar/gui/alarm-notify/util.c:37
+#: calendar/gui/alarm-notify/util.c:41
msgid "invalid time"
msgstr "无效时间"
@@ -4073,10 +4052,10 @@ msgid "Unmatched"
msgstr "无匹配"
#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:564
-#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/dialogs/select-source-dialog.c:112
#: calendar/gui/gnome-cal.c:1858
-#: camel/providers/groupwise/camel-gw-listener.c:315
-#: camel/providers/groupwise/camel-gw-listener.c:338
+#: camel/providers/groupwise/camel-gw-listener.c:331
+#: camel/providers/groupwise/camel-gw-listener.c:361
msgid "Calendar"
msgstr "日历"
@@ -4199,7 +4178,8 @@ msgid "New all day appointment"
msgstr "新建全天约会"
#: calendar/gui/calendar-component.c:1255
-msgid "All _Day Appointment"
+#, fuzzy
+msgid "All Day A_ppointment"
msgstr "全天约会(_D)"
#: calendar/gui/calendar-component.c:1256
@@ -4676,8 +4656,9 @@ msgid "Add Calendar"
msgstr "添加日历"
#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "添加任务组"
+#, fuzzy
+msgid "Add Task List"
+msgstr "添加新任务列表"
#: calendar/gui/dialogs/calendar-setup.glade.h:4
msgid "C_olor:"
@@ -4822,15 +4803,15 @@ msgstr "如果更新到达的话,对此项目的更改将被丢弃"
msgid "Unable to use current version!"
msgstr "无法使用当前版本!"
-#: calendar/gui/dialogs/copy-source-dialog.c:57
+#: calendar/gui/dialogs/copy-source-dialog.c:61
msgid "Could not open source"
msgstr "无法打开源"
-#: calendar/gui/dialogs/copy-source-dialog.c:65
+#: calendar/gui/dialogs/copy-source-dialog.c:69
msgid "Could not open destination"
msgstr "无法打开目的"
-#: calendar/gui/dialogs/copy-source-dialog.c:74
+#: calendar/gui/dialogs/copy-source-dialog.c:78
msgid "Destination is read only"
msgstr "目的只读"
@@ -4909,14 +4890,11 @@ msgid "Scheduling"
msgstr "调度"
#: calendar/gui/dialogs/event-editor.c:176
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384
msgid "Invitations"
msgstr "邀请"
-#: calendar/gui/dialogs/event-editor.c:242
-#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
-msgid "Meeting"
-msgstr "会议"
-
#: calendar/gui/dialogs/event-page.c:692
msgid "Event with no start date"
msgstr "没有开始日期的事件"
@@ -5008,23 +4986,24 @@ msgstr "分类(_F):"
#: calendar/gui/dialogs/event-page.glade.h:12
#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:349 calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-cal-model.c:355 calendar/gui/e-calendar-table.c:377
msgid "Confidential"
msgstr "机密"
#: calendar/gui/dialogs/event-page.glade.h:13
-msgid "L_ocation:"
-msgstr "位置(_O):"
+#, fuzzy
+msgid "Locat_ion:"
+msgstr "位置:"
#: calendar/gui/dialogs/event-page.glade.h:14
#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:347 calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-cal-model.c:353 calendar/gui/e-calendar-table.c:376
msgid "Private"
msgstr "保密"
#: calendar/gui/dialogs/event-page.glade.h:15
#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:338 calendar/gui/e-cal-model.c:345
+#: calendar/gui/e-cal-model.c:344 calendar/gui/e-cal-model.c:351
#: calendar/gui/e-calendar-table.c:375
msgid "Public"
msgstr "公开"
@@ -5061,10 +5040,10 @@ msgid "_Start time:"
msgstr "开始时间(_S):"
#. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:313
-#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/dialogs/meeting-page.c:316
+#: calendar/gui/dialogs/meeting-page.glade.h:5
#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
-#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: composer/e-msg-composer.c:2097 filter/filter-rule.c:877
#: mail/em-account-prefs.c:427 mail/em-folder-view.c:933
#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
#: mail/mail-config.glade.h:103
@@ -5074,23 +5053,23 @@ msgstr "开始时间(_S):"
msgid "None"
msgstr "无"
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:449
msgid "The organizer selected no longer has an account."
msgstr "选中的组织者没有帐户了。"
-#: calendar/gui/dialogs/meeting-page.c:449
+#: calendar/gui/dialogs/meeting-page.c:455
msgid "An organizer is required."
msgstr "需要一名组织者。"
-#: calendar/gui/dialogs/meeting-page.c:464
+#: calendar/gui/dialogs/meeting-page.c:470
msgid "At least one attendee is required."
msgstr "需要至少一个参加者。"
-#: calendar/gui/dialogs/meeting-page.c:753
+#: calendar/gui/dialogs/meeting-page.c:764
msgid "_Delegate To..."
msgstr "授权于(_D)..."
-#: calendar/gui/dialogs/meeting-page.c:757
+#: calendar/gui/dialogs/meeting-page.c:768
#: composer/e-msg-composer-attachment-bar.c:453
msgid "_Remove"
msgstr "删除(_R)"
@@ -5147,25 +5126,29 @@ msgid "Status"
msgstr "状态"
#: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "<b>Attendees</b>"
+#, fuzzy
+msgid "<b>Att_endees</b>"
msgstr "<b>与会者</b>"
#: calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "<b>Organizer</b>"
-msgstr "<b>组织者</b>"
-
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "Change Or_ganizer"
+#, fuzzy
+msgid "C_hange Organizer"
msgstr "更改组织者(_G)"
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:4
#: calendar/gui/e-meeting-time-sel.c:415
msgid "Con_tacts..."
msgstr "联系人(_T)..."
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#, fuzzy
+msgid "Or_ganizer:"
+msgstr "组织者:"
+
#: calendar/gui/dialogs/meeting-page.glade.h:7
-msgid "_Organizer:"
-msgstr "组织者(_O):"
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "组织者:"
#: calendar/gui/dialogs/new-calendar.glade.h:2
msgid "<b>Calendar options</b>"
@@ -5328,15 +5311,15 @@ msgstr "周"
msgid "year(s)"
msgstr "年"
-#: calendar/gui/dialogs/select-source-dialog.c:84
+#: calendar/gui/dialogs/select-source-dialog.c:88
msgid "Select destination"
msgstr "选择目的"
-#: calendar/gui/dialogs/select-source-dialog.c:106
+#: calendar/gui/dialogs/select-source-dialog.c:110
msgid "_Destination"
msgstr "目的(_D)"
-#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/dialogs/select-source-dialog.c:112
msgid "Task List"
msgstr "任务列表"
@@ -5365,7 +5348,7 @@ msgstr "已完成"
#: calendar/gui/dialogs/task-details-page.glade.h:5
#: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:397 mail/message-list.c:960
+#: calendar/gui/e-calendar-table.c:397 mail/message-list.c:1012
msgid "High"
msgstr "高"
@@ -5379,13 +5362,13 @@ msgstr "进行中"
#: calendar/gui/dialogs/task-details-page.glade.h:7
#: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:399 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:399 mail/message-list.c:1010
msgid "Low"
msgstr "低"
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:930
-#: calendar/gui/e-calendar-table.c:398 mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:943
+#: calendar/gui/e-calendar-table.c:398 mail/message-list.c:1011
msgid "Normal"
msgstr "中"
@@ -5449,10 +5432,8 @@ msgid "<span weight=\"bold\">Date and Time</span>"
msgstr "<span weight=\"bold\">日期和时间</span>"
#: calendar/gui/dialogs/task-page.glade.h:7
-#: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
-msgid "Description:"
+#, fuzzy
+msgid "D_escription:"
msgstr "描述:"
#: calendar/gui/dialogs/task-page.glade.h:10
@@ -5581,7 +5562,7 @@ msgstr "在 %2$s 时 %1$s"
msgid "%s for an unknown trigger type"
msgstr "%s 为未知触发类型"
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2380
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2385
#, c-format
msgid "Click to open %s"
msgstr "单击以打开 %s"
@@ -5614,6 +5595,12 @@ msgstr "状态:"
msgid "Priority:"
msgstr "优先级:"
+#: calendar/gui/e-cal-component-preview.c:268
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
+msgid "Description:"
+msgstr "描述:"
+
#: calendar/gui/e-cal-component-preview.c:300
msgid "Web Page:"
msgstr "网页:"
@@ -5631,11 +5618,11 @@ msgstr "开始日期"
msgid "Summary"
msgstr "概要"
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-cal-model-calendar.c:175 calendar/gui/e-calendar-table.c:449
msgid "Free"
msgstr "空闲"
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:450
+#: calendar/gui/e-cal-model-calendar.c:178 calendar/gui/e-calendar-table.c:450
#: calendar/gui/e-meeting-time-sel.c:399
msgid "Busy"
msgstr "繁忙"
@@ -5666,43 +5653,43 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:936
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:949
#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
msgid "Yes"
msgstr "是"
-#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:936
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:949
#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
msgid "No"
msgstr "否"
#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:351 calendar/gui/e-cal-model.c:354
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-cal-model.c:357 calendar/gui/e-cal-model.c:360
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1187
#: 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:1763 camel/camel-gpg-context.c:1814
#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1379
-#: camel/providers/imap4/camel-imap4-engine.c:1406
-#: camel/providers/imap4/camel-imap4-engine.c:1436
-#: camel/providers/imap4/camel-imap4-engine.c:1476
-#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-engine.c:1382
+#: camel/providers/imap4/camel-imap4-engine.c:1412
+#: camel/providers/imap4/camel-imap4-engine.c:1444
+#: camel/providers/imap4/camel-imap4-engine.c:1486
+#: camel/providers/imap4/camel-imap4-store.c:1222
#: camel/providers/imap4/camel-imap4-utils.c:457
#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1123
#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
#: widgets/misc/e-charset-picker.c:62
msgid "Unknown"
msgstr "未知"
-#: calendar/gui/e-cal-model.c:932
+#: calendar/gui/e-cal-model.c:945
msgid "Recurring"
msgstr "重复"
-#: calendar/gui/e-cal-model.c:934
+#: calendar/gui/e-cal-model.c:947
msgid "Assigned"
msgstr "已指派"
@@ -5754,79 +5741,79 @@ msgstr "100%"
msgid "Deleting selected objects"
msgstr "删除选中的对象"
-#: calendar/gui/e-calendar-table.c:866 calendar/gui/e-calendar-view.c:762
+#: calendar/gui/e-calendar-table.c:867 calendar/gui/e-calendar-view.c:762
msgid "Updating objects"
msgstr "更新对象"
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1083
-#: calendar/gui/e-calendar-view.c:1364 calendar/gui/e-calendar-view.c:1444
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1084
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1440
#: mail/em-folder-view.c:899 ui/evolution-addressbook.xml.h:37
msgid "_Open"
msgstr "打开(_O)"
-#: calendar/gui/e-calendar-table.c:1043
+#: calendar/gui/e-calendar-table.c:1044
msgid "Open _Web Page"
msgstr "打开网页(_W)"
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1089
-#: calendar/gui/e-calendar-view.c:1365 calendar/gui/e-calendar-view.c:1450
+#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1090
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1446
#: mail/em-folder-view.c:901 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:1045 calendar/gui/e-calendar-table.c:1087
-#: calendar/gui/e-calendar-view.c:1343 calendar/gui/e-calendar-view.c:1366
-#: calendar/gui/e-calendar-view.c:1448 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1088
+#: calendar/gui/e-calendar-view.c:1339 calendar/gui/e-calendar-view.c:1362
+#: calendar/gui/e-calendar-view.c:1444 ui/evolution-addressbook.xml.h:40
#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
#: ui/evolution-tasks.xml.h:25
msgid "_Print..."
msgstr "打印(_P)..."
-#: calendar/gui/e-calendar-table.c:1049 calendar/gui/e-calendar-table.c:1078
-#: calendar/gui/e-calendar-view.c:1371 calendar/gui/e-calendar-view.c:1414
+#: calendar/gui/e-calendar-table.c:1050 calendar/gui/e-calendar-table.c:1079
+#: calendar/gui/e-calendar-view.c:1367 calendar/gui/e-calendar-view.c:1410
#: 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:1050 calendar/gui/e-calendar-table.c:1076
-#: calendar/gui/e-calendar-view.c:1372 calendar/gui/e-calendar-view.c:1412
-#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: calendar/gui/e-calendar-table.c:1051 calendar/gui/e-calendar-table.c:1077
+#: calendar/gui/e-calendar-view.c:1368 calendar/gui/e-calendar-view.c:1408
+#: mail/em-folder-tree.c:965 mail/message-list.c:1702
#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
#: ui/evolution-tasks.xml.h:20
msgid "_Copy"
msgstr "复制(_C)"
-#: calendar/gui/e-calendar-table.c:1051 calendar/gui/e-calendar-table.c:1085
-#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1373
-#: calendar/gui/e-calendar-view.c:1446 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1052 calendar/gui/e-calendar-table.c:1086
+#: calendar/gui/e-calendar-view.c:1343 calendar/gui/e-calendar-view.c:1369
+#: calendar/gui/e-calendar-view.c:1442 ui/evolution-addressbook.xml.h:38
#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
msgid "_Paste"
msgstr "粘贴(_P)"
-#: calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-table.c:1056
msgid "_Assign Task"
msgstr "指派任务(_A)"
-#: calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-table.c:1057
msgid "_Forward as iCalendar"
msgstr "作为 iCalendar 转发(_F)"
-#: calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1058
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
-#: calendar/gui/e-calendar-table.c:1058
+#: calendar/gui/e-calendar-table.c:1059
msgid "_Mark Selected Tasks as Complete"
msgstr "把任务标记为完成(_M)"
#. FIXME: need to disable for undeletable folders
-#: calendar/gui/e-calendar-table.c:1062 calendar/gui/e-calendar-table.c:1080
-#: calendar/gui/e-calendar-view.c:1384 calendar/gui/e-calendar-view.c:1416
+#: calendar/gui/e-calendar-table.c:1063 calendar/gui/e-calendar-table.c:1081
+#: calendar/gui/e-calendar-view.c:1380 calendar/gui/e-calendar-view.c:1412
#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:924
#: 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
@@ -5834,16 +5821,16 @@ msgstr "把任务标记为完成(_M)"
msgid "_Delete"
msgstr "删除(_D)"
-#: calendar/gui/e-calendar-table.c:1063 calendar/gui/e-calendar-table.c:1081
+#: calendar/gui/e-calendar-table.c:1064 calendar/gui/e-calendar-table.c:1082
msgid "_Delete Selected Tasks"
msgstr "删除选定的任务(_D)"
-#: calendar/gui/e-calendar-table.c:1195 calendar/gui/e-calendar-view.c:1064
-#: composer/e-msg-composer.c:1193
+#: calendar/gui/e-calendar-table.c:1196 calendar/gui/e-calendar-view.c:1060
+#: composer/e-msg-composer.c:1178
msgid "Save as..."
msgstr "另存为..."
-#: calendar/gui/e-calendar-table.c:1373
+#: calendar/gui/e-calendar-table.c:1374
#: calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
msgstr "单击以添加任务"
@@ -5878,75 +5865,75 @@ msgstr "开始日期"
msgid "Task sort"
msgstr "任务排序"
-#: calendar/gui/e-calendar-view.c:1180
+#: calendar/gui/e-calendar-view.c:1176
msgid "Moving items"
msgstr "移动项目"
-#: calendar/gui/e-calendar-view.c:1182
+#: calendar/gui/e-calendar-view.c:1178
msgid "Copying items"
msgstr "复制项目"
-#: calendar/gui/e-calendar-view.c:1336 calendar/gui/e-calendar-view.c:1424
+#: calendar/gui/e-calendar-view.c:1332 calendar/gui/e-calendar-view.c:1420
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
-#: calendar/gui/e-calendar-view.c:1337 calendar/gui/e-calendar-view.c:1429
+#: calendar/gui/e-calendar-view.c:1333 calendar/gui/e-calendar-view.c:1425
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
-#: calendar/gui/e-calendar-view.c:1338 calendar/gui/e-calendar-view.c:1434
+#: calendar/gui/e-calendar-view.c:1334 calendar/gui/e-calendar-view.c:1430
msgid "New Meeting"
msgstr "新会议"
-#: calendar/gui/e-calendar-view.c:1339 calendar/gui/e-calendar-view.c:1439
+#: calendar/gui/e-calendar-view.c:1335 calendar/gui/e-calendar-view.c:1435
msgid "New Task"
msgstr "新建任务"
-#: calendar/gui/e-calendar-view.c:1353 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1349 ui/evolution-calendar.xml.h:26
msgid "Select _Today"
msgstr "选择今天(_T)"
-#: calendar/gui/e-calendar-view.c:1354
+#: calendar/gui/e-calendar-view.c:1350
msgid "_Select Date..."
msgstr "选择日期(_S)..."
-#: calendar/gui/e-calendar-view.c:1358 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1354 ui/evolution-calendar.xml.h:45
msgid "_Publish Free/Busy Information"
msgstr "发布忙闲信息(_P)"
-#: calendar/gui/e-calendar-view.c:1377
+#: calendar/gui/e-calendar-view.c:1373
msgid "Cop_y to Calendar..."
msgstr "复制到日历(_Y)..."
-#: calendar/gui/e-calendar-view.c:1378
+#: calendar/gui/e-calendar-view.c:1374
msgid "Mo_ve to Calendar..."
msgstr "移动到日历(_V)..."
-#: calendar/gui/e-calendar-view.c:1379
+#: calendar/gui/e-calendar-view.c:1375
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
-#: calendar/gui/e-calendar-view.c:1380
+#: calendar/gui/e-calendar-view.c:1376
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_F)..."
-#: calendar/gui/e-calendar-view.c:1385 calendar/gui/e-calendar-view.c:1417
+#: calendar/gui/e-calendar-view.c:1381 calendar/gui/e-calendar-view.c:1413
msgid "Delete this _Occurrence"
msgstr "删除此次出现(_O)"
-#: calendar/gui/e-calendar-view.c:1386 calendar/gui/e-calendar-view.c:1418
+#: calendar/gui/e-calendar-view.c:1382 calendar/gui/e-calendar-view.c:1414
msgid "Delete _All Occurrences"
msgstr "删除所有出现(_A)"
-#: calendar/gui/e-calendar-view.c:1420
+#: calendar/gui/e-calendar-view.c:1416
msgid "Go to _Today"
msgstr "转到今天(_T)"
-#: calendar/gui/e-calendar-view.c:1422
+#: calendar/gui/e-calendar-view.c:1418
msgid "_Go to Date..."
msgstr "转到日期(_G)..."
-#: calendar/gui/e-calendar-view.c:1452 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1448 ui/evolution.xml.h:35
msgid "_Settings..."
msgstr "设置(_S)..."
@@ -5986,13 +5973,13 @@ msgid "%A %d %B"
msgstr "%B%d日%A"
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:583
#: calendar/gui/print.c:838
msgid "am"
msgstr "上午"
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:586
#: calendar/gui/print.c:840
msgid "pm"
msgstr "下午"
@@ -6110,7 +6097,7 @@ msgstr "拒绝"
#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
-#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1133
msgid "Choose an action:"
msgstr "选择一项活动:"
@@ -6120,8 +6107,8 @@ msgstr "更新"
#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
-#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1135
+#: shell/e-shell.c:1210 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "确定"
@@ -6149,224 +6136,235 @@ msgstr "更新应答者状态"
msgid "Send Latest Information"
msgstr "发送最新的信息"
-#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1119
+msgid ""
+"The meeting has been cancelled, however it could not be found in your "
+"calendars"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1121
+msgid ""
+"The task has been cancelled, however it could not be found in your task lists"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1134 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:1198
+#: calendar/gui/e-itip-control.c:1210
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> 发布了会议信息。"
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1211
msgid "Meeting Information"
msgstr "会议信息"
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1216
#, 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:1206
+#: calendar/gui/e-itip-control.c:1218
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请求您参加一个会议。"
-#: calendar/gui/e-itip-control.c:1207
+#: calendar/gui/e-itip-control.c:1219
msgid "Meeting Proposal"
msgstr "会议建议"
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1253
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> 希望加入到已存的会议。"
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1254
msgid "Meeting Update"
msgstr "会议更新"
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1258
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> 想收到最新的会议信息。"
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1259
msgid "Meeting Update Request"
msgstr "会议更新请求"
-#: calendar/gui/e-itip-control.c:1224
+#: calendar/gui/e-itip-control.c:1266
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> 已回复一个会议请求。"
-#: calendar/gui/e-itip-control.c:1225
+#: calendar/gui/e-itip-control.c:1267
msgid "Meeting Reply"
msgstr "会议答复"
-#: calendar/gui/e-itip-control.c:1232
+#: calendar/gui/e-itip-control.c:1274
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
-#: calendar/gui/e-itip-control.c:1233
+#: calendar/gui/e-itip-control.c:1275
msgid "Meeting Cancellation"
msgstr "会议取消"
-#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1282 calendar/gui/e-itip-control.c:1350
+#: calendar/gui/e-itip-control.c:1385
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> 发送了一个无法理解的信息。"
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1283
msgid "Bad Meeting Message"
msgstr "错误的会议信息"
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1308
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> 发布了任务信息。"
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1309
msgid "Task Information"
msgstr "任务信息"
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1314
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> 请求 %s 完成一个任务。"
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1316
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请求您完成一个任务。"
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1317
msgid "Task Proposal"
msgstr "任务建议"
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1321
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s<b> 希望加入到已存在的任务。"
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1322
msgid "Task Update"
msgstr "任务更新"
-#: calendar/gui/e-itip-control.c:1284
+#: calendar/gui/e-itip-control.c:1326
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> 希望获取最新的任务信息。"
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1327
msgid "Task Update Request"
msgstr "任务更新请求"
-#: calendar/gui/e-itip-control.c:1292
+#: calendar/gui/e-itip-control.c:1334
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> 已经回复了任务指派。"
-#: calendar/gui/e-itip-control.c:1293
+#: calendar/gui/e-itip-control.c:1335
msgid "Task Reply"
msgstr "任务回复"
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1342
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> 取消了任务。"
-#: calendar/gui/e-itip-control.c:1301
+#: calendar/gui/e-itip-control.c:1343
msgid "Task Cancellation"
msgstr "任务取消"
-#: calendar/gui/e-itip-control.c:1309
+#: calendar/gui/e-itip-control.c:1351
msgid "Bad Task Message"
msgstr "错误的任务邮件"
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1370
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> 发布了忙闲信息。"
-#: calendar/gui/e-itip-control.c:1329
+#: calendar/gui/e-itip-control.c:1371
msgid "Free/Busy Information"
msgstr "忙闲信息"
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1375
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请求您的忙闲信息。"
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1376
msgid "Free/Busy Request"
msgstr "忙/闲请求"
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1380
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> 应答了忙闲请求。"
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1381
msgid "Free/Busy Reply"
msgstr "忙闲应答"
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1386
msgid "Bad Free/Busy Message"
msgstr "错误的忙闲信息"
-#: calendar/gui/e-itip-control.c:1419
+#: calendar/gui/e-itip-control.c:1461
msgid "The message does not appear to be properly formed"
msgstr "邮件的格式可能不正确"
-#: calendar/gui/e-itip-control.c:1478
+#: calendar/gui/e-itip-control.c:1520
msgid "The message contains only unsupported requests."
msgstr "邮件只含有不支持的请求。"
-#: calendar/gui/e-itip-control.c:1509
+#: calendar/gui/e-itip-control.c:1551
msgid "The attachment does not contain a valid calendar message"
msgstr "附件中没有有效的日历信息"
-#: calendar/gui/e-itip-control.c:1541
+#: calendar/gui/e-itip-control.c:1583
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日历项目"
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1817
msgid "Update complete\n"
msgstr "更新完成\n"
-#: calendar/gui/e-itip-control.c:1803
+#: calendar/gui/e-itip-control.c:1845
msgid "Object is invalid and cannot be updated\n"
msgstr "对象无效,无法更新\n"
-#: calendar/gui/e-itip-control.c:1813
+#: calendar/gui/e-itip-control.c:1855
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "此响应并非来自当前参与者。将响应者加为参与者吗?"
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1867
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新参与者状态!\n"
-#: calendar/gui/e-itip-control.c:1842
+#: calendar/gui/e-itip-control.c:1884
msgid "Attendee status updated\n"
msgstr "更新参与者状态\n"
-#: calendar/gui/e-itip-control.c:1845
+#: calendar/gui/e-itip-control.c:1887
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新参与者状态"
-#: calendar/gui/e-itip-control.c:1872
+#: calendar/gui/e-itip-control.c:1914
msgid "Removal Complete"
msgstr "删除完成"
-#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
+#: calendar/gui/e-itip-control.c:1937 calendar/gui/e-itip-control.c:1985
msgid "Item sent!\n"
msgstr "项目已发送!\n"
-#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
+#: calendar/gui/e-itip-control.c:1939 calendar/gui/e-itip-control.c:1989
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
@@ -6395,10 +6393,6 @@ msgstr "装入日历"
msgid "Loading calendar..."
msgstr "正在装入日历..."
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "组织者:"
-
#: calendar/gui/e-itip-control.glade.h:10
msgid "Server Message:"
msgstr "服务器消息:"
@@ -6485,14 +6479,14 @@ msgstr "处理中"
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:452
-#: calendar/gui/e-meeting-time-sel.c:2053
+#: calendar/gui/e-meeting-time-sel.c:2069
msgid "%A, %B %d, %Y"
msgstr "%Y年%m月%d日%A"
#. This is a strftime() format string %a = abbreviated weekday
#. name, %m = month number, %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2086 e-util/e-time-utils.c:203
+#: calendar/gui/e-meeting-time-sel.c:2102 e-util/e-time-utils.c:203
#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
msgid "%a %m/%d/%Y"
msgstr "%Y年%m月%d日%A"
@@ -6561,7 +6555,7 @@ msgstr "必需的人和一个资源(_O)"
msgid "Enter the password for %s"
msgstr "为 %s 输入密码"
-#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2250
+#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2255
#, c-format
msgid ""
"Error on %s:\n"
@@ -6574,20 +6568,20 @@ msgstr ""
msgid "Loading tasks"
msgstr "装入任务"
-#: calendar/gui/e-tasks.c:869
+#: calendar/gui/e-tasks.c:873
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
-#: calendar/gui/e-tasks.c:1066
+#: calendar/gui/e-tasks.c:1070
msgid "Completing tasks..."
msgstr "正在完成任务..."
-#: calendar/gui/e-tasks.c:1089
+#: calendar/gui/e-tasks.c:1093
msgid "Deleting selected objects..."
msgstr "正在删除选中的对象..."
-#: calendar/gui/e-tasks.c:1116
+#: calendar/gui/e-tasks.c:1120
msgid "Expunging"
msgstr "销毁"
@@ -6595,22 +6589,22 @@ msgstr "销毁"
msgid "Updating query"
msgstr "更新查询"
-#: calendar/gui/gnome-cal.c:2036
+#: calendar/gui/gnome-cal.c:2038
#, c-format
msgid "Loading appointments at %s"
msgstr "装入位于 %s 的约会"
-#: calendar/gui/gnome-cal.c:2055
+#: calendar/gui/gnome-cal.c:2057
#, c-format
msgid "Loading tasks at %s"
msgstr "装入位于 %s 的任务"
-#: calendar/gui/gnome-cal.c:2139
+#: calendar/gui/gnome-cal.c:2144
#, c-format
msgid "Opening %s"
msgstr "打开 %s"
-#: calendar/gui/gnome-cal.c:3106
+#: calendar/gui/gnome-cal.c:3111
msgid "Purging"
msgstr "销毁"
@@ -6724,7 +6718,7 @@ msgstr "iCalendar 信息"
msgid "You must be an attendee of the event."
msgstr "您必须是事件的参与者。"
-#: calendar/gui/migration.c:146
+#: calendar/gui/migration.c:150
msgid ""
"The location and hierarchy of the Evolution task folders has changed since "
"Evolution 1.x.\n"
@@ -6735,7 +6729,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: calendar/gui/migration.c:150
+#: calendar/gui/migration.c:154
msgid ""
"The location and hierarchy of the Evolution calendar folders has changed "
"since Evolution 1.x.\n"
@@ -6746,28 +6740,28 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: calendar/gui/migration.c:376
+#: calendar/gui/migration.c:380
msgid "Birthdays & Anniversaries"
msgstr "生日和纪念日"
#. Create the Webcal source group
-#: calendar/gui/migration.c:462 calendar/gui/migration.c:544
+#: calendar/gui/migration.c:466 calendar/gui/migration.c:548
msgid "On The Web"
msgstr "网上"
#. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
+#: calendar/gui/migration.c:712 calendar/gui/migration.c:864
msgid "Unable to migrate old settings from evolution/config.xmldb"
msgstr "无法从 evolution/config.xmldb 中升迁旧设置"
#. FIXME: domain/code
-#: calendar/gui/migration.c:737
+#: calendar/gui/migration.c:741
#, c-format
msgid "Unable to migrate calendar `%s'"
msgstr "无法升迁日历“%s”"
#. FIXME: domain/code
-#: calendar/gui/migration.c:889
+#: calendar/gui/migration.c:893
#, c-format
msgid "Unable to migrate tasks `%s'"
msgstr "无法升迁任务“%s”"
@@ -6999,63 +6993,81 @@ msgstr "打印项"
msgid "Print Setup"
msgstr "打印设置"
-#: calendar/gui/tasks-component.c:313
+#: calendar/gui/tasks-component.c:314
#, c-format
msgid "Task List '%s' will be removed. Are you sure you want to continue?"
msgstr "即将删除任务列表“%s”。您确定想要继续吗?"
-#: calendar/gui/tasks-component.c:371
+#: calendar/gui/tasks-component.c:372
msgid "New Task List"
msgstr "新建任务列表"
-#: calendar/gui/tasks-component.c:414
+#: calendar/gui/tasks-component.c:415
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d 个任务"
-#: calendar/gui/tasks-component.c:416 mail/mail-component.c:498
+#: calendar/gui/tasks-component.c:417 mail/mail-component.c:498
#, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
msgstr[0] ",已选中 %d 个"
-#: calendar/gui/tasks-component.c:463
+#: calendar/gui/tasks-component.c:464
msgid "Failed upgrading tasks."
msgstr "升级任务失败。"
-#: calendar/gui/tasks-component.c:755
+#: calendar/gui/tasks-component.c:756
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr "无法打开任务列表“%s”来创建事件和会议"
-#: calendar/gui/tasks-component.c:767
+#: calendar/gui/tasks-component.c:768
msgid "There is no calendar available for creating tasks"
msgstr "没有可创建任务的日历"
-#: calendar/gui/tasks-component.c:1038
+#: calendar/gui/tasks-component.c:1042
msgid "New task"
msgstr "新建任务"
-#: calendar/gui/tasks-component.c:1039
+#: calendar/gui/tasks-component.c:1043
msgid "_Task"
msgstr "任务(_T)"
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1044
msgid "Create a new task"
msgstr "创建新任务"
-#: calendar/gui/tasks-component.c:1046
-msgid "New tasks group"
-msgstr "新建任务组"
+#: calendar/gui/tasks-component.c:1050
+#, fuzzy
+msgid "New assigned task"
+msgstr "指派任务"
+
+#: calendar/gui/tasks-component.c:1051
+#, fuzzy
+msgid "Assigne_d Task"
+msgstr "指派任务"
+
+#: calendar/gui/tasks-component.c:1052
+#, fuzzy
+msgid "Create a new assigned task"
+msgstr "创建新任务"
+
+#: calendar/gui/tasks-component.c:1058
+#, fuzzy
+msgid "New task list"
+msgstr "新建任务列表"
-#: calendar/gui/tasks-component.c:1047
-msgid "Tasks Gro_up"
-msgstr "任务组(_U)"
+#: calendar/gui/tasks-component.c:1059
+#, fuzzy
+msgid "Task l_ist"
+msgstr "任务列表"
-#: calendar/gui/tasks-component.c:1048
-msgid "Create a new tasks group"
-msgstr "创建新任务组"
+#: calendar/gui/tasks-component.c:1060
+#, fuzzy
+msgid "Create a new task list"
+msgstr "创建新任务"
#: calendar/gui/tasks-control.c:367
msgid ""
@@ -7100,19 +7112,19 @@ msgstr "iCalendar 文件(.ics)"
msgid "vCalendar files (.vcf)"
msgstr "vCalendar 文件(.vcf)"
-#: calendar/importers/icalendar-importer.c:78
+#: calendar/importers/icalendar-importer.c:82
msgid "Appointments and Meetings"
msgstr "约会和会议"
-#: calendar/importers/icalendar-importer.c:490
+#: calendar/importers/icalendar-importer.c:494
msgid "Reminder!!"
msgstr "提醒!!"
-#: calendar/importers/icalendar-importer.c:698
+#: calendar/importers/icalendar-importer.c:702
msgid "Calendar Events"
msgstr "日历事件"
-#: calendar/importers/icalendar-importer.c:723
+#: calendar/importers/icalendar-importer.c:727
msgid ""
"Evolution has found Gnome Calendar files.\n"
"Would you like to import them into Evolution?"
@@ -7120,7 +7132,7 @@ msgstr ""
"Evolution 已找到 Gnome 日历文件。\n"
"您是否原意把它们导入 Evolution?"
-#: calendar/importers/icalendar-importer.c:730
+#: calendar/importers/icalendar-importer.c:734
msgid "Gnome Calendar"
msgstr "Gnome 日历"
@@ -9960,28 +9972,47 @@ msgstr "在所有文件夹中检查新邮件"
msgid "Apply filters to new messages in Inbox on this server"
msgstr "应用过滤规则到此服务器上收件箱中的新邮件"
-#: camel/providers/groupwise/camel-groupwise-provider.c:62
+#: camel/providers/groupwise/camel-groupwise-provider.c:61
+#: camel/providers/imap/camel-imap-provider.c:66
+msgid "Check new messages for Junk contents"
+msgstr "检查新邮件的垃圾内容"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:63
+#: camel/providers/imap/camel-imap-provider.c:68
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "仅在收件箱中检查垃圾邮件"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:65
#: camel/providers/imap/camel-imap-provider.c:70
msgid "Automatically synchronize remote mail locally"
msgstr "自动将远程邮件同步到本地"
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: camel/providers/groupwise/camel-groupwise-provider.c:69
msgid "Address Book And Calendar"
msgstr "地址簿和日历"
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:72
+#, fuzzy
+msgid "Post Office Agent:"
+msgstr "邮局代理 SOAP 端口:"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:75
msgid "Post Office Agent SOAP Port:"
msgstr "邮局代理 SOAP 端口:"
-#: camel/providers/groupwise/camel-groupwise-provider.c:83
+#: camel/providers/groupwise/camel-groupwise-provider.c:78
+msgid "Use ssl"
+msgstr ""
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:92
msgid "Novell GroupWise"
msgstr "Novell GroupWise"
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:94
msgid "For accessing Novell Groupwise servers"
msgstr "访问 Novell GroupWise 服务器"
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:109
#: camel/providers/imap/camel-imap-provider.c:93
#: camel/providers/imap4/camel-imap4-provider.c:70
#: camel/providers/imapp/camel-imapp-provider.c:65
@@ -9990,36 +10021,36 @@ msgstr "访问 Novell GroupWise 服务器"
msgid "Password"
msgstr "密码"
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/groupwise/camel-groupwise-provider.c:111
#: 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:316
-#: camel/providers/groupwise/camel-gw-listener.c:339
+#: camel/providers/groupwise/camel-gw-listener.c:332
+#: camel/providers/groupwise/camel-gw-listener.c:362
msgid "Checklist"
msgstr "待办清单"
#: 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:3190
+#: camel/providers/imap/camel-imap-store.c:3191
msgid "Operation cancelled"
msgstr "操作已取消"
#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3193
+#: camel/providers/imap/camel-imap-store.c:3194
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "服务器意外地中止了连接:%s"
#: camel/providers/imap/camel-imap-command.c:303
#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/imap4/camel-imap4-store.c:282
#: camel/providers/pop3/camel-pop3-store.c:543
#: camel/providers/pop3/camel-pop3-store.c:550
-#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1220
msgid "Unknown error"
msgstr "未知的错误"
@@ -10187,14 +10218,6 @@ msgstr "命名空间"
msgid "Apply filters to new messages in INBOX on this server"
msgstr "应用过滤规则到本服务器上收件箱中的新邮件"
-#: camel/providers/imap/camel-imap-provider.c:66
-msgid "Check new messages for Junk contents"
-msgstr "检查新邮件的垃圾内容"
-
-#: camel/providers/imap/camel-imap-provider.c:68
-msgid "Only check for Junk messages in the INBOX folder"
-msgstr "仅在收件箱中检查垃圾邮件"
-
#: camel/providers/imap/camel-imap-provider.c:76
msgid "IMAP"
msgstr "IMAP"
@@ -10204,21 +10227,21 @@ msgid "For reading and storing mail on IMAP servers."
msgstr "IMAP 服务器上的邮件的读写。"
#: camel/providers/imap/camel-imap-store.c:424
-#: camel/providers/imap4/camel-imap4-store.c:175
+#: camel/providers/imap4/camel-imap4-store.c:176
#, c-format
msgid "IMAP server %s"
msgstr "IMAP 服务器 %s"
#: camel/providers/imap/camel-imap-store.c:426
-#: camel/providers/imap4/camel-imap4-store.c:177
+#: camel/providers/imap4/camel-imap4-store.c:178
#, c-format
msgid "IMAP service for %s on %s"
msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
#: camel/providers/imap/camel-imap-store.c:547
#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imap4/camel-imap4-store.c:218
-#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imap4/camel-imap4-store.c:213
+#: camel/providers/imap4/camel-imap4-store.c:229
#: camel/providers/imapp/camel-imapp-store.c:231
#: camel/providers/nntp/camel-nntp-store.c:209
#: camel/providers/pop3/camel-pop3-store.c:175
@@ -10229,7 +10252,7 @@ msgid "Could not connect to %s (port %d): %s"
msgstr "无法连接到 %s (端口 %d):%s"
#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/imap4/camel-imap4-store.c:215
#: camel/providers/pop3/camel-pop3-store.c:177
#: camel/providers/smtp/camel-smtp-transport.c:271
msgid "SSL unavailable"
@@ -10237,7 +10260,7 @@ msgstr "SSL 不可用"
#: camel/providers/imap/camel-imap-store.c:564
#: camel/providers/imap/camel-imap-store.c:841
-#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imap4/camel-imap4-store.c:226
#: camel/providers/imapp/camel-imapp-store.c:228
#: camel/providers/nntp/camel-nntp-store.c:206
#: camel/providers/nntp/camel-nntp-store.c:224
@@ -10247,7 +10270,7 @@ msgstr "连接已取消"
#: camel/providers/imap/camel-imap-store.c:675
#: camel/providers/imap/camel-imap-store.c:706
-#: camel/providers/imap4/camel-imap4-store.c:296
+#: camel/providers/imap4/camel-imap4-store.c:281
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
@@ -10307,7 +10330,7 @@ msgstr "没有文件夹 %s"
#: camel/providers/imap/camel-imap-store.c:1881
#: camel/providers/imap/camel-imap-store.c:2259
-#: camel/providers/imap4/camel-imap4-store.c:796
+#: camel/providers/imap4/camel-imap4-store.c:763
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10342,34 +10365,29 @@ msgstr "向 IMAP 服务器 %s 发送命令失败:%s"
msgid "Unexpected response from IMAP4 server %s: %s"
msgstr "来自 IMAP4 服务器 %s 的意外响应:%s"
-#: camel/providers/imap4/camel-imap4-engine.c:232
+#: camel/providers/imap4/camel-imap4-engine.c:229
#, c-format
msgid "Unexpected greeting from IMAP server %s."
msgstr "来自 IMAP 服务器 %s 的意外应答。"
-#: camel/providers/imap4/camel-imap4-engine.c:416
+#: camel/providers/imap4/camel-imap4-engine.c:413
#, c-format
msgid "Cannot select folder `%s': Invalid mailbox name"
msgstr "无法选择文件夹“%s”:无效的邮箱名"
-#: camel/providers/imap4/camel-imap4-engine.c:422
+#: camel/providers/imap4/camel-imap4-engine.c:419
#, c-format
msgid "Cannot select folder `%s': Bad command"
msgstr "无法选择文件夹“%s”:无效的命令"
-#: camel/providers/imap4/camel-imap4-engine.c:997
-#: camel/providers/imap4/camel-imap4-engine.c:1378
-#: camel/providers/imap4/camel-imap4-engine.c:1405
-#: camel/providers/imap4/camel-imap4-engine.c:1435
-#: camel/providers/imap4/camel-imap4-engine.c:1475
+#: camel/providers/imap4/camel-imap4-engine.c:1381
+#: camel/providers/imap4/camel-imap4-engine.c:1411
+#: camel/providers/imap4/camel-imap4-engine.c:1443
+#: camel/providers/imap4/camel-imap4-engine.c:1485
#, c-format
msgid "IMAP4 server %s unexpectedly disconnected: %s"
msgstr "IMAP4 服务器 %s 意外断开连接:%s"
-#: camel/providers/imap4/camel-imap4-engine.c:998
-msgid "Got BYE response"
-msgstr "得到 BYE 响应"
-
#: camel/providers/imap4/camel-imap4-folder.c:359
#, c-format
msgid "Cannot sync flags to folder `%s': Unknown"
@@ -10443,99 +10461,99 @@ msgid ""
"This option will connect to the IMAPv4rev1 server using a plaintext password."
msgstr "该选项将使用纯文本密码连接到 IMAPv4rev1 服务器。"
-#: camel/providers/imap4/camel-imap4-store.c:271
+#: camel/providers/imap4/camel-imap4-store.c:256
#, c-format
msgid ""
"Failed to connect to IMAP server %s in secure mode: Server does not support "
"STARTTLS"
msgstr "以安全模式连接到 IMAP 服务器 %s 失败:服务器不支持 STARTTLS"
-#: camel/providers/imap4/camel-imap4-store.c:383
+#: camel/providers/imap4/camel-imap4-store.c:362
#, c-format
msgid ""
"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
msgstr "无法使用 %2$s 身份验证算法对 IMAP 服务器 %1$s 进行身份验证"
-#: camel/providers/imap4/camel-imap4-store.c:428
+#: camel/providers/imap4/camel-imap4-store.c:407
#, c-format
msgid "%sPlease enter the IMAP password for %s on host %s"
msgstr "%s请输入 %s@%s 的 IMAP 密码"
-#: camel/providers/imap4/camel-imap4-store.c:502
+#: camel/providers/imap4/camel-imap4-store.c:477
#, c-format
msgid "Cannot authenticate to IMAP server %s using %s"
msgstr "无法使用 %2$s 认证到 IMAP 服务器 %1$s"
-#: camel/providers/imap4/camel-imap4-store.c:733
+#: camel/providers/imap4/camel-imap4-store.c:700
#, c-format
msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
msgstr "无法获取 IMAP 服务器 %2$s 上的文件夹 %1$s:未知"
-#: camel/providers/imap4/camel-imap4-store.c:847
+#: camel/providers/imap4/camel-imap4-store.c:814
#, c-format
msgid "Cannot create folder `%s': Invalid mailbox name"
msgstr "无法创建文件夹“%s”:无效的邮箱名"
-#: camel/providers/imap4/camel-imap4-store.c:853
+#: camel/providers/imap4/camel-imap4-store.c:820
#, c-format
msgid "Cannot create folder `%s': Bad command"
msgstr "无法创建文件夹“%s”:无效的命令"
-#: camel/providers/imap4/camel-imap4-store.c:884
+#: camel/providers/imap4/camel-imap4-store.c:851
#, c-format
msgid "Cannot delete folder `%s': Special folder"
msgstr "无法删除文件夹“%s”:特殊文件夹"
-#: camel/providers/imap4/camel-imap4-store.c:943
+#: camel/providers/imap4/camel-imap4-store.c:910
#, c-format
msgid "Cannot delete folder `%s': Invalid mailbox name"
msgstr "无法删除文件夹“%s”:无效的邮箱名"
-#: camel/providers/imap4/camel-imap4-store.c:948
+#: camel/providers/imap4/camel-imap4-store.c:915
#, c-format
msgid "Cannot delete folder `%s': Bad command"
msgstr "无法删除文件夹“%s”:无效的命令"
-#: camel/providers/imap4/camel-imap4-store.c:968
+#: camel/providers/imap4/camel-imap4-store.c:935
#, c-format
msgid "Cannot rename folder `%s' to `%s': Special folder"
msgstr "无法将文件夹“%s”重命名为“%s”:特殊文件夹"
-#: camel/providers/imap4/camel-imap4-store.c:1000
+#: camel/providers/imap4/camel-imap4-store.c:967
#, c-format
msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
msgstr "无法将文件夹“%s”重命名为“%s”:无效的邮箱名"
-#: camel/providers/imap4/camel-imap4-store.c:1005
+#: camel/providers/imap4/camel-imap4-store.c:972
#, c-format
msgid "Cannot rename folder `%s' to `%s': Bad command"
msgstr "无法将文件夹“%s”重命名为“%s”:无效的命令"
-#: camel/providers/imap4/camel-imap4-store.c:1253
+#: camel/providers/imap4/camel-imap4-store.c:1220
#, c-format
msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
msgstr ""
-#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-store.c:1222
msgid "Bad command"
msgstr "无效命令"
-#: camel/providers/imap4/camel-imap4-store.c:1331
+#: camel/providers/imap4/camel-imap4-store.c:1298
#, c-format
msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
msgstr "无法订阅文件夹“%s”:无效的邮箱名"
-#: camel/providers/imap4/camel-imap4-store.c:1336
+#: camel/providers/imap4/camel-imap4-store.c:1303
#, c-format
msgid "Cannot subscribe to folder `%s': Bad command"
msgstr "无法订阅文件夹“%s”:无效的命令"
-#: camel/providers/imap4/camel-imap4-store.c:1396
+#: camel/providers/imap4/camel-imap4-store.c:1363
#, c-format
msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
msgstr "无法退订文件夹“%s”:无效的邮箱名"
-#: camel/providers/imap4/camel-imap4-store.c:1401
+#: camel/providers/imap4/camel-imap4-store.c:1368
#, c-format
msgid "Cannot unsubscribe from folder `%s': Bad command"
msgstr "无法退订文件夹“%s”:无效的命令"
@@ -11329,8 +11347,8 @@ msgstr "没有 uid 为 %s 的邮件"
msgid "Retrieving POP message %d"
msgstr "正在获取 POP 邮件 %d"
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
-#: composer/e-msg-composer.c:1246
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1210
+#: composer/e-msg-composer.c:1231
msgid "Unknown reason"
msgstr "未知原因"
@@ -11783,7 +11801,7 @@ msgstr "%.0fM"
msgid "%.0fG"
msgstr "%.0fG"
-#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:410
msgid "attachment"
msgstr "附件"
@@ -11799,13 +11817,13 @@ msgstr "添加附件..."
msgid "Attach a file to the message"
msgstr "把文件附件到邮件"
-#: composer/e-msg-composer-attachment.c:169
-#: composer/e-msg-composer-attachment.c:185
+#: composer/e-msg-composer-attachment.c:173
+#: composer/e-msg-composer-attachment.c:189
#, c-format
msgid "Cannot attach file %s: %s"
msgstr "无法附加文件 %s:%s"
-#: composer/e-msg-composer-attachment.c:177
+#: composer/e-msg-composer-attachment.c:181
#, c-format
msgid "Cannot attach file %s: not a regular file"
msgstr "无法附加文件 %s:不是普通文件"
@@ -11916,62 +11934,62 @@ msgid ""
"account"
msgstr "无法对寄出的邮件加密:未对此账户设置加密证书"
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1268
msgid "Could not open file"
msgstr "无法打开文件"
-#: composer/e-msg-composer.c:1291
+#: composer/e-msg-composer.c:1276
msgid "Unable to retrieve message from editor"
msgstr "无法从编辑器获取邮件"
-#: composer/e-msg-composer.c:1561
+#: composer/e-msg-composer.c:1546
msgid "Untitled Message"
msgstr "无标题邮件"
-#: composer/e-msg-composer.c:1591
+#: composer/e-msg-composer.c:1576
msgid "Open file"
msgstr "打开文件"
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+#: composer/e-msg-composer.c:1983 mail/mail-account-gui.c:1491
msgid "Autogenerated"
msgstr "自动生成的"
-#: composer/e-msg-composer.c:2097
+#: composer/e-msg-composer.c:2082
msgid "Signature:"
msgstr "签名:"
-#: composer/e-msg-composer.c:2298
+#: composer/e-msg-composer.c:2283
#, c-format
msgid "<b>%d</b> File Attached"
msgid_plural "<b>%d</b> Files Attached"
msgstr[0] "附加了 <b>%d</b> 个文件"
-#: composer/e-msg-composer.c:2327
+#: composer/e-msg-composer.c:2312
msgid "Hide _Attachment Bar (drop attachments here)"
msgstr "隐藏附件栏(将附件拖至此处)(_A)"
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+#: composer/e-msg-composer.c:2315 composer/e-msg-composer.c:3271
msgid "Show _Attachment Bar (drop attachments here)"
msgstr "显示附件栏(将附件拖至此处)(_A)"
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
-#: composer/e-msg-composer.c:3179
+#: composer/e-msg-composer.c:2332 composer/e-msg-composer.c:3163
+#: composer/e-msg-composer.c:3164
msgid "Compose a message"
msgstr "撰写邮件"
-#: composer/e-msg-composer.c:2649
+#: composer/e-msg-composer.c:2634
#, c-format
msgid "Attached message - %s"
msgstr "附加的邮件 - %s"
#. translators, this count will always be >1
-#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#: composer/e-msg-composer.c:2639 composer/e-msg-composer.c:2783
#, c-format
msgid "Attached message"
msgid_plural "%d attached messages"
msgstr[0] "%d 封附加的邮件"
-#: composer/e-msg-composer.c:4332
+#: composer/e-msg-composer.c:4341
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -12235,7 +12253,7 @@ msgid ""
"do?"
msgstr "当您收到请求阅读收条的邮件,Evolution 应该做什么?"
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:253
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -12244,7 +12262,7 @@ msgstr ""
"覆盖它?"
#. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.h:2
+#: e-util/e-dialog-utils.c:255 widgets/misc/e-system-errors.xml.h:2
msgid "Overwrite file?"
msgstr "覆盖文件吗?"
@@ -12256,14 +12274,6 @@ msgstr "记住该密码"
msgid "Remember this password for the remainder of this session"
msgstr "在本会话中记住该密码"
-#: e-util/e-pilot-settings.c:93
-msgid "Sync Private Records:"
-msgstr "同步私有记录:"
-
-#: e-util/e-pilot-settings.c:102
-msgid "Sync Categories:"
-msgstr "同步类别:"
-
#. strptime 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
@@ -12651,7 +12661,7 @@ msgstr "Evolution 邮件首选项控件"
#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:419
#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
-#: mail/mail-component.c:559
+#: mail/mail-component.c:557
msgid "Mail"
msgstr "邮件"
@@ -12697,18 +12707,18 @@ msgstr "添加签名脚本"
msgid "Signature(s)"
msgstr "签名"
-#: mail/em-composer-utils.c:887
+#: mail/em-composer-utils.c:889
msgid "-------- Forwarded Message --------"
msgstr "-------- 转发的邮件 --------"
-#: mail/em-composer-utils.c:1500
+#: mail/em-composer-utils.c:1502
msgid "an unknown sender"
msgstr "未知的发件人"
#. Note to translators: this is the attribution string used when quoting messages.
#. * each ${Variable} gets replaced with a value. To see a full list of available
#. * variables, see em-composer-utils.c:1514
-#: mail/em-composer-utils.c:1547
+#: mail/em-composer-utils.c:1549
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@ -13001,7 +13011,7 @@ msgid "Create New Folder"
msgstr "创建新文件夹"
#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
-#: mail/mail-component.c:709
+#: mail/mail-component.c:707
msgid "Specify where to create the folder:"
msgstr "指定在哪里创建文件夹:"
@@ -13037,12 +13047,12 @@ msgstr "移动文件夹“%s”"
msgid "Copying folder %s"
msgstr "复制文件夹 %s"
-#: mail/em-folder-tree.c:855 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1613
#, c-format
msgid "Moving messages into folder %s"
msgstr "把邮件移动到文件夹 %s"
-#: mail/em-folder-tree.c:857 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1615
#, c-format
msgid "Copying messages into folder %s"
msgstr "把邮件复制到文件夹 %s"
@@ -13060,11 +13070,11 @@ msgid "_Move to Folder"
msgstr "移动到文件夹(_M)"
#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
-#: mail/em-folder-view.c:803 mail/message-list.c:1651
+#: mail/em-folder-view.c:803 mail/message-list.c:1703
msgid "_Move"
msgstr "移动(_M)"
-#: mail/em-folder-tree.c:968 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1705
msgid "Cancel _Drag"
msgstr "取消拖曳(_D)"
@@ -13084,7 +13094,7 @@ msgstr "复制(_O)"
msgid "Creating folder `%s'"
msgstr "创建文件夹“%s”"
-#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:707
msgid "Create folder"
msgstr "创建文件夹"
@@ -13254,20 +13264,20 @@ msgid "Filter on _Mailing List"
msgstr "基于邮件列表过滤(_M)"
#. default charset used in mail view
-#: mail/em-folder-view.c:1712 mail/em-folder-view.c:1752
+#: mail/em-folder-view.c:1711 mail/em-folder-view.c:1751
#: mail/mail-config.glade.h:68
msgid "Default"
msgstr "默认"
-#: mail/em-folder-view.c:1849
+#: mail/em-folder-view.c:1848
msgid "Print Message"
msgstr "打印邮件"
-#: mail/em-folder-view.c:2110
+#: mail/em-folder-view.c:2115
msgid "_Copy Link Location"
msgstr "复制链接位置(_C)"
-#: mail/em-folder-view.c:2375
+#: mail/em-folder-view.c:2380
#, c-format
msgid "Click to mail %s"
msgstr "单击以给 %s 发送邮件"
@@ -13560,37 +13570,37 @@ msgstr "无法创建新文件夹“%s”:%s"
msgid "Unable to copy folder `%s' to `%s': %s"
msgstr "无法将文件夹“%s”复制为“%s”:%s"
-#: mail/em-migrate.c:1811
+#: mail/em-migrate.c:1813
#, c-format
msgid "Unable to scan for existing mailboxes at `%s': %s"
msgstr "无法扫描位于“%s”的已有邮箱:%s"
-#: mail/em-migrate.c:2015
+#: mail/em-migrate.c:2017
#, c-format
msgid "Unable to open old POP keep-on-server data `%s': %s"
msgstr "无法打开旧的 POP 保留在服务器上的数据“%s”:%s"
-#: mail/em-migrate.c:2029
+#: mail/em-migrate.c:2031
#, c-format
msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
msgstr "无法创建 POP3 保留在服务器上的数据目录“%s”:%s"
-#: mail/em-migrate.c:2058
+#: mail/em-migrate.c:2060
#, c-format
msgid "Unable to copy POP3 keep-on-server data `%s': %s"
msgstr "无法复制 POP3 在服务器上保留的数据“%s”:%s"
-#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
+#: mail/em-migrate.c:2415 mail/em-migrate.c:2427
#, c-format
msgid "Failed to create local mail storage `%s': %s"
msgstr "创建本地邮件存储“%s”失败:%s"
-#: mail/em-migrate.c:2576
+#: mail/em-migrate.c:2578
#, c-format
msgid "Unable to create local mail folders at `%s': %s"
msgstr "无法在“%s”创建本地邮件文件夹:%s"
-#: mail/em-migrate.c:2594
+#: mail/em-migrate.c:2596
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
@@ -13653,28 +13663,28 @@ msgstr "请选择服务器。"
msgid "No server has been selected"
msgstr "没有选定服务器"
-#: mail/em-utils.c:102
+#: mail/em-utils.c:104
msgid "Don't show this message again."
msgstr "不再显示此信息。"
-#: mail/em-utils.c:292
+#: mail/em-utils.c:294
msgid "Filters"
msgstr "过滤规则"
-#: mail/em-utils.c:406
+#: mail/em-utils.c:408
msgid "message"
msgstr "邮件"
-#: mail/em-utils.c:509
+#: mail/em-utils.c:511
msgid "Save Message..."
msgstr "保存邮件..."
-#: mail/em-utils.c:558
+#: mail/em-utils.c:560
msgid "Add address"
msgstr "添加地址"
#. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1019
+#: mail/em-utils.c:1021
#, c-format
msgid "Messages from %s"
msgstr "来自 %s 的邮件"
@@ -14430,31 +14440,31 @@ msgid ", %d unread"
msgid_plural ", %d unread"
msgstr[0] ",%d 封未读"
-#: mail/mail-component.c:661
+#: mail/mail-component.c:659
msgid "New Mail Message"
msgstr "新建邮件"
-#: mail/mail-component.c:662
+#: mail/mail-component.c:660
msgid "_Mail Message"
msgstr "邮件(_M)"
-#: mail/mail-component.c:663
+#: mail/mail-component.c:661
msgid "Compose a new mail message"
msgstr "撰写一封新邮件"
-#: mail/mail-component.c:669
+#: mail/mail-component.c:667
msgid "New Mail Folder"
msgstr "新建邮件文件夹"
-#: mail/mail-component.c:670
+#: mail/mail-component.c:668
msgid "Mail _Folder"
msgstr "邮件文件夹(_F)"
-#: mail/mail-component.c:671
+#: mail/mail-component.c:669
msgid "Create a new mail folder"
msgstr "创建新邮件文件夹"
-#: mail/mail-component.c:803
+#: mail/mail-component.c:801
msgid "Failed upgrading Mail settings or folders."
msgstr "升级邮件设置或文件夹失败。"
@@ -15710,7 +15720,14 @@ msgstr "覆盖(_O)"
msgid "_Append"
msgstr "追加(_A)"
-#: mail/mail-folder-cache.c:785
+#. mail:gw-accountsetup-error primary
+#: mail/mail-errors.xml.h:234
+msgid ""
+"Could not connect to {0}. Groupwise account setup is incomplete. You may "
+"need to setup the account again"
+msgstr ""
+
+#: mail/mail-folder-cache.c:795
#, c-format
msgid "Pinging %s"
msgstr "查验 %s"
@@ -16008,67 +16025,67 @@ msgstr "编辑虚拟文件夹"
msgid "New VFolder"
msgstr "新建虚拟文件夹"
-#: mail/message-list.c:948
+#: mail/message-list.c:1000
msgid "Unseen"
msgstr "不可见"
-#: mail/message-list.c:949
+#: mail/message-list.c:1001
msgid "Seen"
msgstr "可见"
-#: mail/message-list.c:950
+#: mail/message-list.c:1002
msgid "Answered"
msgstr "已答复"
-#: mail/message-list.c:951
+#: mail/message-list.c:1003
msgid "Multiple Unseen Messages"
msgstr "多封不可见邮件"
-#: mail/message-list.c:952
+#: mail/message-list.c:1004
msgid "Multiple Messages"
msgstr "多封邮件"
-#: mail/message-list.c:956
+#: mail/message-list.c:1008
msgid "Lowest"
msgstr "最低"
-#: mail/message-list.c:957
+#: mail/message-list.c:1009
msgid "Lower"
msgstr "较低"
-#: mail/message-list.c:961
+#: mail/message-list.c:1013
msgid "Higher"
msgstr "较高"
-#: mail/message-list.c:962
+#: mail/message-list.c:1014
msgid "Highest"
msgstr "最高"
-#: mail/message-list.c:1285
+#: mail/message-list.c:1337
msgid "?"
msgstr "?"
-#: mail/message-list.c:1292
+#: mail/message-list.c:1344
msgid "Today %l:%M %p"
msgstr "今天 %H:%M"
-#: mail/message-list.c:1301
+#: mail/message-list.c:1353
msgid "Yesterday %l:%M %p"
msgstr "昨天 %H:%M"
-#: mail/message-list.c:1313
+#: mail/message-list.c:1365
msgid "%a %l:%M %p"
msgstr "%A %H:%M"
-#: mail/message-list.c:1321
+#: mail/message-list.c:1373
msgid "%b %d %l:%M %p"
msgstr "%m月%d日 %H:%M"
-#: mail/message-list.c:1323
+#: mail/message-list.c:1375
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
-#: mail/message-list.c:3324
+#: mail/message-list.c:3376
msgid "Generating message list"
msgstr "生成邮件列表"
@@ -16217,23 +16234,28 @@ msgid ""
msgstr "若设为 true,将不会显示 Evoltuion 开发版本的警告。"
#: shell/apps_evolution_shell.schemas.in.in.h:9
+#, fuzzy
+msgid "Last upgraded Evolution configuration version"
+msgstr "Evolution 配置版本"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
msgid ""
"List of paths for the folders to be synchronized to disk for offline usage"
msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: shell/apps_evolution_shell.schemas.in.in.h:11
msgid "Toolbar is visible"
msgstr "工具栏可见"
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
msgid "Whether Evolution should start up in offline mode"
msgstr "Evolution 是否要以脱机模式启动"
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:13
msgid "Whether the toolbar should be visible."
msgstr "工具栏是否可见。"
-#: shell/apps_evolution_shell.schemas.in.in.h:13
+#: shell/apps_evolution_shell.schemas.in.in.h:14
msgid "Whether to skip the development warning dialog"
msgstr "是否跳过开发警告对话框"
@@ -16424,36 +16446,36 @@ msgstr "文件夹名不能含有字符“#”。"
msgid "'.' and '..' are reserved folder names."
msgstr "“.”和“..”是保留文件夹名。"
-#: shell/e-shell-window-commands.c:66
+#: shell/e-shell-window-commands.c:67
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr "GNOME Pilot 工具好像并未安装到系统中。"
-#: shell/e-shell-window-commands.c:74
+#: shell/e-shell-window-commands.c:75
#, c-format
msgid "Error executing %s."
msgstr "执行 %s 错误。"
-#: shell/e-shell-window-commands.c:123
+#: shell/e-shell-window-commands.c:124
msgid "Bug buddy is not installed."
msgstr "未安装 Bug buddy。"
-#: shell/e-shell-window-commands.c:131
+#: shell/e-shell-window-commands.c:132
msgid "Bug buddy could not be run."
msgstr "无法运行 Bug buddy。"
-#: shell/e-shell-window-commands.c:322
+#: shell/e-shell-window-commands.c:323
msgid "Groupware Suite"
msgstr "Groupwise 套件"
-#: shell/e-shell-window-commands.c:562
+#: shell/e-shell-window-commands.c:563
msgid "_Work Online"
msgstr "联机工作(_W)"
-#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
msgid "_Work Offline"
msgstr "脱机工作(_W)"
-#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
msgid "Work Offline"
msgstr "脱机工作"
@@ -16474,28 +16496,28 @@ msgstr "Evolution 目前脱机。单击该按钮可在线工作。"
msgid "Switch to %s"
msgstr "切换到 %s"
-#: shell/e-shell.c:588 shell/e-shell.c:589
+#: shell/e-shell.c:585
+msgid "Uknown system error."
+msgstr "未知的系统错误。"
+
+#: shell/e-shell.c:789 shell/e-shell.c:790
#, c-format
msgid "%ld KB"
msgstr "%ld KB"
-#: shell/e-shell.c:774
-msgid "Uknown system error."
-msgstr "未知的系统错误。"
-
-#: shell/e-shell.c:1131
+#: shell/e-shell.c:1212
msgid "Invalid arguments"
msgstr "无效参数"
-#: shell/e-shell.c:1133
+#: shell/e-shell.c:1214
msgid "Cannot register on OAF"
msgstr "无法注册到 OAF"
-#: shell/e-shell.c:1135
+#: shell/e-shell.c:1216
msgid "Configuration Database not found"
msgstr "找不到配置数据库"
-#: shell/e-shell.c:1137
+#: shell/e-shell.c:1218
msgid "Generic error"
msgstr "通用错误"
@@ -16729,18 +16751,58 @@ msgstr ""
msgid "Continue"
msgstr "继续"
+#. shell:upgrade-remove-1-4 title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:19
+msgid "Delete old data from version {0}?"
+msgstr ""
+
+#. shell:upgrade-remove-1-4 secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"The previous version of evolution stored its data in a different location.\n"
+"\n"
+"If you choose to remove this data, the entire contents of the \"evolution\" "
+"directory will be removed permanently. If you choose to keep this data, "
+"then you may manually remove the contents of \"evolution\" at your "
+"convenience.\n"
+msgstr ""
+
+#: shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Keep"
+msgstr "响铃"
+
+#. shell:upgrade-remove-1-4-confirm title
+#: shell/shell-errors.xml.h:27 shell/shell-errors.xml.h:29
+msgid "Really delete old data?"
+msgstr ""
+
+#. shell:upgrade-remove-1-4-confirm secondary
+#: shell/shell-errors.xml.h:31
+msgid ""
+"The entire contents of the \"evolution\" directory is about to be be "
+"permanently removed.\n"
+"\n"
+"It is suggested you manually verify that all of your mail, contact, and "
+"calendar data is present, and that this version of Evolution operates "
+"correctly before deleting this old data.\n"
+"\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution "
+"without manual intervention.\n"
+msgstr ""
+
#. shell:noshell title
-#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#: shell/shell-errors.xml.h:38 shell/shell-errors.xml.h:46
msgid "Cannot start Evolution"
msgstr "无法启动 Evolution"
#. shell:noshell primary
-#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#: shell/shell-errors.xml.h:40 shell/shell-errors.xml.h:48
msgid "Evolution can not start."
msgstr "Evolution 无法启动。"
#. shell:noshell secondary
-#: shell/shell-errors.xml.h:21
+#: shell/shell-errors.xml.h:42
msgid ""
"Your system configuration does not match your Evolution configuration.\n"
"\n"
@@ -16751,7 +16813,7 @@ msgstr ""
"请单击帮助查看详情"
#. shell:noshell-reason secondary
-#: shell/shell-errors.xml.h:29
+#: shell/shell-errors.xml.h:50
msgid ""
"Your system configuration does not match your Evolution configuration:\n"
"\n"
@@ -17237,15 +17299,15 @@ msgstr "主题唯一 ID"
msgid "Certificate Signature Value"
msgstr "证书签名值"
-#: smime/lib/e-pkcs12.c:266
+#: smime/lib/e-pkcs12.c:263
msgid "PKCS12 File Password"
msgstr "PKCS12 文件密码"
-#: smime/lib/e-pkcs12.c:266
+#: smime/lib/e-pkcs12.c:263
msgid "Enter password for PKCS12 file:"
msgstr "输入 PKCS12 文件的密码:"
-#: smime/lib/e-pkcs12.c:365
+#: smime/lib/e-pkcs12.c:362
msgid "Imported Certificate"
msgstr "导入的证书"
@@ -17677,6 +17739,10 @@ msgstr "作为 iCalendar 转发(_C)"
msgid "Forward this item via email"
msgstr "通过电子邮件转发该项"
+#: ui/evolution-event-editor.xml.h:6
+msgid "Meeting"
+msgstr "会议"
+
#: ui/evolution-event-editor.xml.h:7
msgid "Obtain the latest meeting information"
msgstr "获取最新的会议信息"
@@ -18874,26 +18940,26 @@ msgstr "其它..."
msgid "..."
msgstr "..."
-#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
-#: widgets/misc/e-error.c:122
+#: widgets/misc/e-error.c:83 widgets/misc/e-error.c:84
+#: widgets/misc/e-error.c:126
msgid "Evolution Error"
msgstr "Evolution 错误"
-#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:85 widgets/misc/e-error.c:86
+#: widgets/misc/e-error.c:124
msgid "Evolution Warning"
msgstr "Evolution 警告"
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:123
msgid "Evolution Information"
msgstr "Evolution 信息"
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:125
msgid "Evolution Query"
msgstr "Evolution 查询"
#. setup a dummy error
-#: widgets/misc/e-error.c:417
+#: widgets/misc/e-error.c:421
#, c-format
msgid ""
"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18982,6 +19048,19 @@ msgstr "高级(_A)..."
msgid "Choose Image"
msgstr "选择图像"
+#: widgets/misc/e-pilot-settings.c:103
+#, fuzzy
+msgid "Sync with:"
+msgstr "结束于"
+
+#: widgets/misc/e-pilot-settings.c:111
+msgid "Sync Private Records:"
+msgstr "同步私有记录:"
+
+#: widgets/misc/e-pilot-settings.c:120
+msgid "Sync Categories:"
+msgstr "同步类别:"
+
#: widgets/misc/e-search-bar.c:540
msgid "_Search"
msgstr "搜索(_S)"
@@ -19039,3 +19118,69 @@ msgstr "%s (...)"
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
+
+#~ msgid "New Contacts Group"
+#~ msgstr "新建联系人组"
+
+#~ msgid "Contacts Grou_p"
+#~ msgstr "联系人组(_P)"
+
+#~ msgid "Create a new contacts group"
+#~ msgstr "创建新联系人组"
+
+#~ msgid "Add Contacts Group"
+#~ msgstr "添加联系人组"
+
+#~ msgid "Download limit:"
+#~ msgstr "下载上限:"
+
+#~ msgid "Only locations within starting point"
+#~ msgstr "只在起点的位置内"
+
+#~ msgid "Search base only"
+#~ msgstr "只搜索基础"
+
+#~ msgid "Search base:"
+#~ msgstr "搜索基础:"
+
+#~ msgid "Search scope:"
+#~ msgstr "搜索范围:"
+
+#~ msgid "Starting point and locations within it"
+#~ msgstr "起点及其中的位置"
+
+#~ msgid "Timeout:"
+#~ msgstr "超时:"
+
+#~ msgid "_Add Contacts Group"
+#~ msgstr "添加联系人组(_A)"
+
+#~ msgid "_Email address:"
+#~ msgstr "电子邮件地址(_E):"
+
+#~ msgid "_Log in:"
+#~ msgstr "登录(_L):"
+
+#~ msgid "Add Tasks Group"
+#~ msgstr "添加任务组"
+
+#~ msgid "L_ocation:"
+#~ msgstr "位置(_O):"
+
+#~ msgid "<b>Organizer</b>"
+#~ msgstr "<b>组织者</b>"
+
+#~ msgid "_Organizer:"
+#~ msgstr "组织者(_O):"
+
+#~ msgid "New tasks group"
+#~ msgstr "新建任务组"
+
+#~ msgid "Tasks Gro_up"
+#~ msgstr "任务组(_U)"
+
+#~ msgid "Create a new tasks group"
+#~ msgstr "创建新任务组"
+
+#~ msgid "Got BYE response"
+#~ msgstr "得到 BYE 响应"