aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFunda Wang <fwang@src.gnome.org>2005-12-25 11:42:09 +0800
committerFunda Wang <fwang@src.gnome.org>2005-12-25 11:42:09 +0800
commit3cbf65dd022038c7f825e6de0114246868dcf9a3 (patch)
tree5f772e1311b746230da95fb4b08045d1a90c20e0
parent1e320c7fad8f551755a2c7875172b8dbd6a9d510 (diff)
downloadgsoc2013-evolution-3cbf65dd022038c7f825e6de0114246868dcf9a3.tar
gsoc2013-evolution-3cbf65dd022038c7f825e6de0114246868dcf9a3.tar.gz
gsoc2013-evolution-3cbf65dd022038c7f825e6de0114246868dcf9a3.tar.bz2
gsoc2013-evolution-3cbf65dd022038c7f825e6de0114246868dcf9a3.tar.lz
gsoc2013-evolution-3cbf65dd022038c7f825e6de0114246868dcf9a3.tar.xz
gsoc2013-evolution-3cbf65dd022038c7f825e6de0114246868dcf9a3.tar.zst
gsoc2013-evolution-3cbf65dd022038c7f825e6de0114246868dcf9a3.zip
Updated evo translation.
svn path=/trunk/; revision=30949
-rw-r--r--po/ChangeLog4
-rw-r--r--po/zh_CN.po3450
2 files changed, 1706 insertions, 1748 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index b8ef39807b..434e908344 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-25 Funda Wang <fundawang@linux.net.cn>
+
+ * zh_CN.po: Updated Simplified Chinese translation.
+
2005-12-23 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
* es.po: Updated Spanish translation.
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0c324e957f..cb2cf0b38b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Evolution 2.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-10 15:02+0800\n"
-"PO-Revision-Date: 2005-12-10 15:06+0800\n"
+"POT-Creation-Date: 2005-12-24 21:38+0100\n"
+"PO-Revision-Date: 2005-12-25 11:40+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgid "evolution addressbook"
msgstr "evolution 地址簿"
#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:226
msgid "New Contact"
msgstr "新建联系人"
#: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:234
msgid "New Contact List"
msgstr "新建联系人列表"
@@ -191,7 +191,7 @@ msgstr "%B%-d日"
#: ../a11y/calendar/ea-gnome-calendar.c:247
#: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:738
+#: ../calendar/importers/icalendar-importer.c:772
msgid "Gnome Calendar"
msgstr "Gnome 日历"
@@ -388,7 +388,6 @@ msgid "Server Version"
msgstr "服务器版本"
#: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:44
msgid "Some features may not work properly with your current server"
msgstr "某些特性可能无法在您目前的服务器下工作"
@@ -457,7 +456,6 @@ msgstr ""
"人。您想要换作复制联系人吗?"
#: ../addressbook/addressbook.error.xml.h:30
-#: ../calendar/calendar.error.xml.h:61
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results the server should be upgraded to "
@@ -477,7 +475,7 @@ msgid ""
"Your contacts for {0} will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则 {0} 的联系人无法使用。"
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:495
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
#: ../plugins/groupwise-features/junk-settings.glade.h:4
#: ../plugins/groupwise-features/properties.glade.h:10
#: ../widgets/table/e-table-config.glade.h:15
@@ -530,7 +528,7 @@ msgstr "在此配置自动补全"
#. Create the contacts group
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
#: ../addressbook/gui/component/addressbook-view.c:1186
-#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
+#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:393
msgid "Contacts"
msgstr "联系人"
@@ -568,13 +566,13 @@ msgstr "在此管理您的 S/MIME 证书"
#. create the local source group
#. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:137
-#: ../addressbook/gui/component/addressbook-migrate.c:502
+#: ../addressbook/gui/component/addressbook-component.c:141
+#: ../addressbook/gui/component/addressbook-migrate.c:507
#: ../calendar/gui/calendar-component.c:208
-#: ../calendar/gui/memos-component.c:192 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/migration.c:1057
-#: ../calendar/gui/tasks-component.c:188 ../mail/em-folder-tree-model.c:197
-#: ../mail/em-folder-tree-model.c:199 ../mail/mail-component.c:292
+#: ../calendar/gui/memos-component.c:193 ../calendar/gui/migration.c:467
+#: ../calendar/gui/migration.c:560 ../calendar/gui/migration.c:1061
+#: ../calendar/gui/tasks-component.c:189 ../mail/em-folder-tree-model.c:198
+#: ../mail/em-folder-tree-model.c:200 ../mail/mail-component.c:298
#: ../mail/mail-vfolder.c:223
msgid "On This Computer"
msgstr "在此计算机中"
@@ -584,54 +582,54 @@ msgstr "在此计算机中"
#. Create the default Person task list
#. Create the default Person addressbook
#. orange
-#: ../addressbook/gui/component/addressbook-component.c:145
-#: ../addressbook/gui/component/addressbook-migrate.c:510
+#: ../addressbook/gui/component/addressbook-component.c:149
+#: ../addressbook/gui/component/addressbook-migrate.c:515
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
#: ../calendar/gui/calendar-component.c:216
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/migration.c:1065
-#: ../calendar/gui/tasks-component.c:196 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1043 ../mail/mail-config.c:78
+#: ../calendar/gui/memos-component.c:201 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:568 ../calendar/gui/migration.c:1069
+#: ../calendar/gui/tasks-component.c:197 ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1053 ../mail/mail-config.c:86
#: ../mail/mail-config.glade.h:104
msgid "Personal"
msgstr "个人"
#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:155
-#: ../addressbook/gui/component/addressbook-migrate.c:520
+#: ../addressbook/gui/component/addressbook-component.c:159
+#: ../addressbook/gui/component/addressbook-migrate.c:525
msgid "On LDAP Servers"
msgstr "在 LDAP 服务器上"
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:227
msgid "_Contact"
msgstr "联系人(_C)"
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:228
msgid "Create a new contact"
msgstr "创建一个新联系人"
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:235
msgid "Contact _List"
msgstr "联系人列表(_L)"
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:236
msgid "Create a new contact list"
msgstr "创建一个新的联系人列表"
-#: ../addressbook/gui/component/addressbook-component.c:241
+#: ../addressbook/gui/component/addressbook-component.c:242
#: ../addressbook/gui/component/addressbook-config.c:1202
msgid "New Address Book"
msgstr "新地址簿"
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:243
msgid "Address _Book"
msgstr "地址簿(_B)"
-#: ../addressbook/gui/component/addressbook-component.c:243
+#: ../addressbook/gui/component/addressbook-component.c:244
msgid "Create a new address book"
msgstr "创建新地址簿"
-#: ../addressbook/gui/component/addressbook-component.c:385
+#: ../addressbook/gui/component/addressbook-component.c:386
msgid "Failed upgrading Addressbook settings or folders."
msgstr "升级地址簿设置或文件夹失败。"
@@ -651,7 +649,7 @@ msgstr "将地址簿内容复制到本地以进行脱机操作"
#: ../addressbook/gui/component/addressbook-config.c:981
#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
#: ../calendar/gui/dialogs/calendar-setup.c:368
#: ../calendar/gui/dialogs/calendar-setup.c:379
#: ../calendar/gui/dialogs/calendar-setup.c:390
@@ -661,7 +659,7 @@ msgid "General"
msgstr "常规"
#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../mail/importers/pine-importer.c:393
+#: ../mail/importers/pine-importer.c:392
msgid "Addressbook"
msgstr "地址簿"
@@ -692,26 +690,26 @@ msgstr "下载"
msgid "Address Book Properties"
msgstr "地址簿属性"
-#: ../addressbook/gui/component/addressbook-migrate.c:72
-#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
+#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../calendar/gui/migration.c:147 ../mail/em-migrate.c:1200
msgid "Migrating..."
msgstr "正在升迁..."
-#: ../addressbook/gui/component/addressbook-migrate.c:124
-#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
+#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../calendar/gui/migration.c:194 ../mail/em-migrate.c:1241
#, c-format
msgid "Migrating `%s':"
msgstr "升迁“%s”:"
-#: ../addressbook/gui/component/addressbook-migrate.c:648
+#: ../addressbook/gui/component/addressbook-migrate.c:653
msgid "LDAP Servers"
msgstr "LDAP 服务器"
-#: ../addressbook/gui/component/addressbook-migrate.c:763
+#: ../addressbook/gui/component/addressbook-migrate.c:768
msgid "Autocompletion Settings"
msgstr "自动补全设置"
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1143
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -722,7 +720,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1157
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -732,7 +730,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1166
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -742,7 +740,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1176
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -760,18 +758,18 @@ msgstr "新建地址簿(_N)"
#: ../addressbook/gui/component/addressbook-view.c:770
#: ../addressbook/gui/widgets/e-addressbook-view.c:966
#: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/e-calendar-table.c:1194
-#: ../calendar/gui/e-calendar-view.c:1583 ../calendar/gui/e-memo-table.c:869
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1050 ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
+#: ../calendar/gui/e-calendar-table.c:1196
+#: ../calendar/gui/e-calendar-view.c:1573 ../calendar/gui/e-memo-table.c:871
+#: ../calendar/gui/tasks-component.c:442 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:34
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-mail-list.xml.h:27
#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
msgid "_Delete"
msgstr "删除(_D)"
#: ../addressbook/gui/component/addressbook-view.c:772
#: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
+#: ../calendar/gui/tasks-component.c:443
msgid "_Properties..."
msgstr "属性(_P)..."
@@ -889,7 +887,7 @@ msgid "Add Address Book"
msgstr "添加地址簿"
#: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
+#: ../mail/em-account-editor.c:304 ../mail/em-account-editor.c:767
msgid "Always"
msgstr "总是"
@@ -923,7 +921,7 @@ msgid "Lo_gin:"
msgstr "登录(_G):"
#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:766
msgid "Never"
msgstr "从不"
@@ -1057,7 +1055,7 @@ msgid "Using email address"
msgstr "使用电子邮件地址"
#: ../addressbook/gui/component/ldap-config.glade.h:45
-#: ../mail/em-account-editor.c:301
+#: ../mail/em-account-editor.c:303
msgid "Whenever Possible"
msgstr "可能时"
@@ -1086,6 +1084,7 @@ msgid "_Name:"
msgstr "名称(_N):"
#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
msgid "_Port:"
msgstr "端口(_P):"
@@ -1095,6 +1094,7 @@ msgstr "搜索范围(_S):"
#: ../addressbook/gui/component/ldap-config.glade.h:53
#: ../mail/mail-config.glade.h:171
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
msgid "_Server:"
msgstr "服务器(_S):"
@@ -1116,8 +1116,9 @@ msgstr "名片"
#: ../calendar/gui/alarm-notify/util.c:66
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/misc.c:111 ../calendar/gui/misc.c:113
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:111
+#: ../calendar/gui/misc.c:113 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:1987
#: ../plugins/calendar-http/calendar-http.c:263
#: ../plugins/calendar-weather/calendar-weather.c:563
msgid "minutes"
@@ -1129,7 +1130,6 @@ msgstr "分钟"
#: ../addressbook/gui/contact-editor/im.glade.h:1
#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
#: ../calendar/gui/dialogs/memo-page.glade.h:1
#: ../calendar/gui/dialogs/new-calendar.glade.h:1
@@ -1200,7 +1200,7 @@ msgstr "联系人"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
#: ../addressbook/gui/contact-editor/e-contact-editor.c:526
#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2373
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2379
msgid "Contact Editor"
msgstr "联系人编辑器"
@@ -1242,8 +1242,8 @@ msgstr "电话"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
-#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1052
+#: ../mail/mail-config.c:85 ../mail/mail-config.glade.h:154
msgid "Work"
msgstr "工作"
@@ -1270,7 +1270,7 @@ msgid "_Calendar:"
msgstr "日历(_C):"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../ui/evolution-event-editor.xml.h:26 ../ui/evolution-task-editor.xml.h:18
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:18
msgid "_Categories"
msgstr "类别(_C)"
@@ -1376,7 +1376,7 @@ msgstr "地址"
#: ../addressbook/gui/widgets/e-minicard-view.c:520
#: ../addressbook/gui/widgets/e-minicard.c:175
#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1770 ../widgets/text/e-entry.c:1312
#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
#: ../widgets/text/e-text.c:3585
msgid "Editable"
@@ -2354,7 +2354,7 @@ msgstr "津巴布韦"
#: ../plugins/exchange-operations/exchange-delegates.c:936
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
#: ../plugins/plugin-manager/plugin-manager.c:44
-#: ../plugins/save-attachments/save-attachments.c:362
+#: ../plugins/save-attachments/save-attachments.c:369
#: ../widgets/menus/gal-view-new-dialog.c:73
msgid "Name"
msgstr "姓名"
@@ -2384,8 +2384,8 @@ msgid "Service"
msgstr "服务"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:594
#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../plugins/publish-calendar/publish-calendar.c:455
#: ../plugins/save-calendar/csv-format.c:400
msgid "Location"
msgstr "位置"
@@ -2444,20 +2444,20 @@ msgid "Changed"
msgstr "已更改"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:536
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2368
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2374
#, c-format
msgid "Contact Editor - %s"
msgstr "联系人编辑器 - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2681
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2687
msgid "Please select an image for this contact"
msgstr "请选择此联系人的图像"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2682
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2688
msgid "No image"
msgstr "无图像"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2961
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2967
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2465,7 +2465,7 @@ msgstr ""
"联系人数据无效:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3013
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3019
msgid "Invalid contact."
msgstr "无效的联系人。"
@@ -2715,8 +2715,8 @@ msgstr ""
"您一定要添加吗?"
#. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: ../widgets/misc/e-filter-bar.c:156
+#: ../addressbook/gui/search/e-addressbook-search-dialog.c:165
+#: ../widgets/misc/e-filter-bar.c:162
msgid "Advanced Search"
msgstr "高级搜索"
@@ -2765,13 +2765,13 @@ msgid "Email begins with"
msgstr "邮件以此开头"
#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:53
+#: ../calendar/gui/cal-search-bar.c:50
msgid "Category is"
msgstr "类别为"
#. We attach subitems below
#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../calendar/gui/cal-search-bar.c:48
+#: ../calendar/gui/cal-search-bar.c:53
msgid "Any field contains"
msgstr "任何域含有"
@@ -2787,7 +2787,7 @@ msgstr "来源"
#: ../addressbook/gui/widgets/e-addressbook-view.c:245
#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:377
+#: ../calendar/gui/e-meeting-list-view.c:479
#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
#: ../calendar/gui/e-memo-table.etspec.h:5
msgid "Type"
@@ -2804,9 +2804,9 @@ msgid "Save as VCard..."
msgstr "另存为 VCard..."
#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-#: ../calendar/gui/dialogs/comp-editor.c:1055
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1563 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/dialogs/comp-editor.c:1069
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1553 ../calendar/gui/e-memo-table.c:854
#: ../ui/evolution-addressbook.xml.h:38
msgid "_Open"
msgstr "打开(_O)"
@@ -2863,13 +2863,13 @@ msgstr "剪切(_T)"
#: ../addressbook/gui/widgets/e-addressbook-view.c:964
#: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/dialogs/comp-editor.c:432
-#: ../calendar/gui/e-calendar-table.c:1182
-#: ../calendar/gui/e-calendar-view.c:1570 ../calendar/gui/e-memo-table.c:860
-#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:3049
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1036
-#: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
+#: ../calendar/gui/dialogs/comp-editor.c:433
+#: ../calendar/gui/e-calendar-table.c:1184
+#: ../calendar/gui/e-calendar-view.c:1560 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/tasks-component.c:441 ../composer/e-msg-composer.c:3074
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1716 ../ui/evolution-addressbook.xml.h:32
+#: ../ui/evolution-calendar.xml.h:38 ../ui/evolution-composer-entries.xml.h:7
#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:105
#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
msgid "_Copy"
@@ -3027,7 +3027,7 @@ msgstr "收音机"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:388
+#: ../calendar/gui/e-meeting-list-view.c:490
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
msgid "Role"
@@ -3293,10 +3293,10 @@ msgstr "不支持的协议"
#. E_BOOK_ERROR_CANCELLED
#: ../addressbook/gui/widgets/eab-gui-util.c:61
#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:232
-#: ../calendar/gui/e-cal-model-tasks.c:348
-#: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2375
+#: ../calendar/gui/e-cal-component-preview.c:234
+#: ../calendar/gui/e-cal-model-tasks.c:349
+#: ../calendar/gui/e-cal-model-tasks.c:662
+#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2375
msgid "Cancelled"
msgstr "已经取消"
@@ -3589,25 +3589,25 @@ msgid "GTK Tree View"
msgstr "GTK 树视图"
#: ../addressbook/importers/evolution-ldif-importer.c:583
-#: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:311
-#: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
msgid "Importing ..."
msgstr "正在导入..."
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:761
msgid "LDAP Data Interchange Format (.ldif)"
msgstr "LDAP 数据交换格式(.ldif)"
-#: ../addressbook/importers/evolution-ldif-importer.c:755
+#: ../addressbook/importers/evolution-ldif-importer.c:762
msgid "Evolution LDIF importer"
msgstr "Evolution LDIF 导入器"
-#: ../addressbook/importers/evolution-vcard-importer.c:529
+#: ../addressbook/importers/evolution-vcard-importer.c:554
msgid "VCard (.vcf, .gcrd)"
msgstr "VCard (.vfg, .gcrd)"
-#: ../addressbook/importers/evolution-vcard-importer.c:530
+#: ../addressbook/importers/evolution-vcard-importer.c:555
msgid "Evolution VCard Importer"
msgstr "Evolution VCard 导入器"
@@ -3616,12 +3616,12 @@ msgstr "Evolution VCard 导入器"
msgid "Print envelope"
msgstr "打印信封"
-#: ../addressbook/printing/e-contact-print.c:1027
+#: ../addressbook/printing/e-contact-print.c:1033
msgid "Print contacts"
msgstr "打印联系人"
-#: ../addressbook/printing/e-contact-print.c:1118
-#: ../addressbook/printing/e-contact-print.c:1146
+#: ../addressbook/printing/e-contact-print.c:1124
+#: ../addressbook/printing/e-contact-print.c:1152
msgid "Print contact"
msgstr "打印联系人"
@@ -3724,7 +3724,7 @@ msgid "Options"
msgstr "选项"
#: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:118
+#: ../e-util/eggtrayicon.c:120
msgid "Orientation"
msgstr "方向"
@@ -3774,7 +3774,7 @@ msgstr "阴影"
#. FIXME: Take care of i18n
#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:939
+#: ../plugins/exchange-operations/exchange-account-setup.c:949
#: ../plugins/exchange-operations/exchange-calendar.c:224
#: ../plugins/exchange-operations/exchange-contacts.c:197
msgid "Size:"
@@ -3826,17 +3826,17 @@ msgstr "联系人打印测试"
msgid "This should test the contact print code"
msgstr "这应该测试联系人打印代码"
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:664
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:700
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
msgid "Can not open file"
msgstr "无法打开文件"
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
msgid "Couldn't get list of addressbooks"
msgstr "无法获得地址簿列表"
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
msgid "failed to open book"
msgstr "打开地址簿失败"
@@ -3908,207 +3908,211 @@ msgstr "没有提供文件名。"
#: ../calendar/calendar.error.xml.h:1
msgid ""
-" There are few attachments getting downloaded. Saving the appointment will "
-"cause the appointment to be saved without those pending attachments "
-msgstr "附件正在下载中。保存约会将使得约会保存时无法包含后续的附件"
-
-#: ../calendar/calendar.error.xml.h:2
-msgid ""
-" There are few attachments getting downloaded. Saving the task will cause "
-"the task to be saved without those pending attachments "
-msgstr "附件正在下载中。保存任务将使得任务保存时无法包含后续的附件"
-
-#: ../calendar/calendar.error.xml.h:3
-msgid ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
+"Adding a meaningful summary to your appointment will give your recipients an "
"idea of what your appointment is about."
msgstr "在您的约会中添加有意义的概览可以让您的收件人更容易明白您约会的内容。"
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:2
msgid ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
+"Adding a meaningful summary to your task will give your recipients an idea "
"of what your task is about."
msgstr "在您的任务中添加有意义的概览可以让您的收件人更容易明白您任务的内容。"
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:3
msgid ""
"All information in these journal entries will be deleted and can not be "
"restored."
msgstr "这些日记项的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:4
msgid ""
"All information in this journal will be deleted and can not be restored."
msgstr "此日记的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:5
msgid ""
"All information on these appointments will be deleted and can not be "
"restored."
msgstr "这些约会的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:6
msgid "All information on these tasks will be deleted and can not be restored."
msgstr "这些任务的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:7
msgid ""
"All information on this appointment will be deleted and can not be restored."
msgstr "此约会的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:8
msgid ""
"All information on this journal entry will be deleted and can not be "
"restored."
msgstr "此日记项的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:9
msgid ""
"All information on this meeting will be deleted and can not be restored."
msgstr "此会议的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:10
msgid "All information on this task will be deleted and can not be restored."
msgstr "此任务的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:11
msgid "Are you sure you want to delete the '{0}' task?"
msgstr "您确定要删除“{0}”任务吗?"
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:12
msgid "Are you sure you want to delete the appointment titled '{0}'?"
msgstr "您确信您要删除标题为“{0}”的约会吗?"
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:13
msgid "Are you sure you want to delete the journal entry '{0}'?"
msgstr "您确信您要删除日记项“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:14
msgid "Are you sure you want to delete these {0} appointments?"
msgstr "您确定要删除这 {0} 个约会吗?"
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:15
msgid "Are you sure you want to delete these {0} journal entries?"
msgstr "您确定要删除这 {0} 个日记项吗?"
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:16
msgid "Are you sure you want to delete these {0} tasks?"
msgstr "您确定要删除这 {0} 个任务吗?"
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:17
msgid "Are you sure you want to delete this appointment?"
msgstr "您确信您要删除该约会吗?"
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:18
msgid "Are you sure you want to delete this journal entry?"
msgstr "您确信您要删除该日记项吗?"
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:19
msgid "Are you sure you want to delete this meeting?"
msgstr "您确信您要删除该会议吗?"
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:20
msgid "Are you sure you want to delete this task?"
msgstr "您确定要删除此任务吗?"
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:21
msgid "Are you sure you want to send the appointment without a summary?"
msgstr "您确定想要发送没有概览的约会吗?"
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:22
msgid "Are you sure you want to send the task without a summary?"
msgstr "您确定想要发送没有概览的任务吗?"
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:23
msgid "Delete calendar '{0}'?"
msgstr "删除日历“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:24
msgid "Delete memo list '{0}'?"
msgstr "删除备忘列表“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:25
msgid "Delete task list '{0}'?"
msgstr "删除任务列表“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:26
msgid "Don't Send"
msgstr "不发送"
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:27
msgid "Download in progress. Do you want to save the appointment?"
msgstr "下载进行中。您想要保存约会吗?"
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:28
msgid "Download in progress. Do you want to save the task?"
msgstr "下载进行中。您想要保存任务吗?"
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:29
msgid "Editor could not be loaded."
msgstr "无法装入编辑器。"
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:30
msgid ""
"Email invitations will be sent to all participants and allow them to RSVP."
msgstr "将会向全部出席者发送电子邮件邀请,并要求他们答复。"
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:31
msgid ""
"Email invitations will be sent to all participants and allow them to accept "
"this task."
msgstr "将会向全部出席者发送电子邮件邀请,并允许他们接受此任务。"
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:32
msgid "Error loading calendar"
msgstr "装入日历时出错"
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:33
msgid "Error loading memo list"
msgstr "装入备忘列表出错"
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:34
msgid "Error loading task list"
msgstr "装入任务列表出错"
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:35
msgid ""
"If you don't send a cancellation notice, the other participants may not know "
"the journal has been deleted."
msgstr "如果您不发送取消通知,其他出席者人可能不知道日记项已经删除。"
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:36
msgid ""
"If you don't send a cancellation notice, the other participants may not know "
"the meeting is canceled."
msgstr "如果您不发送取消通知,其他出席者也许不知道会议已经取消。"
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:37
msgid ""
"If you don't send a cancellation notice, the other participants may not know "
"the task has been deleted."
msgstr "如果您不发送取消通知,其他出席者可能不知道任务已经删除。"
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:38
#: ../ui/evolution-message-composer.xml.h:28
msgid "Send"
msgstr "发送"
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:39
msgid "Send Notice"
msgstr "发送通知"
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:40
msgid ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
msgstr "发送更新的信息将允许其他出席者使他们的日历保持最新。"
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:41
msgid ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
msgstr "发送更新的信息允许其他出席者使他们的任务列表保持最新。"
+#: ../calendar/calendar.error.xml.h:42
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr "附件正在下载中。保存约会将使得约会保存时无法包含后续的附件。"
+
+#: ../calendar/calendar.error.xml.h:43
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr "附件正在下载中。保存任务将使得任务保存时无法包含后续的附件。"
+
+#: ../calendar/calendar.error.xml.h:44
+msgid "Some features may not work properly with your current server."
+msgstr "某些特性可能无法在您目前的服务器下工作。"
+
#: ../calendar/calendar.error.xml.h:45
msgid "The Evolution calendar has quit unexpectedly."
msgstr "Evolution 日历异常退出。"
@@ -4118,16 +4122,16 @@ msgid "The Evolution tasks have quit unexpectedly."
msgstr "Evolution 任务异常退出。"
#: ../calendar/calendar.error.xml.h:47
-msgid "The calendar is not marked for offline usage"
-msgstr "日历未标为脱机使用"
+msgid "The calendar is not marked for offline usage."
+msgstr "日历未标为脱机使用。"
#: ../calendar/calendar.error.xml.h:48
msgid "The memo list is not marked for offline usage"
msgstr "备忘列表未标为脱机使用"
#: ../calendar/calendar.error.xml.h:49
-msgid "The task list is not marked for offline usage"
-msgstr "任务列表未标为脱机使用"
+msgid "The task list is not marked for offline usage."
+msgstr "任务列表未标为脱机使用。"
#: ../calendar/calendar.error.xml.h:50
msgid "This calendar will be removed permanently."
@@ -4173,6 +4177,15 @@ msgstr "您是否想要给出席者发送更新的会议信息?"
msgid "Would you like to send updated task information to participants?"
msgstr "您是否想要给出席者发送更新的任务信息?"
+#: ../calendar/calendar.error.xml.h:61
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+"您正在连接到不支持的 GroupWise 服务器,此时使用 Evolution 可能遇到问题。为了"
+"得到最佳效果,服务器应该升级到支持的版本。"
+
#: ../calendar/calendar.error.xml.h:62
msgid "You have changed this appointment, but not yet saved them."
msgstr "您已经更改了此约会,但尚未保存。"
@@ -4195,7 +4208,7 @@ msgid "_Discard Changes"
msgstr "丢弃更改(_D)"
#: ../calendar/calendar.error.xml.h:67 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:53
msgid "_Save"
msgstr "保存(_S)"
@@ -4217,12 +4230,12 @@ msgstr "{0}。"
msgid "Enter password"
msgstr "输入密码"
-#: ../calendar/conduits/calendar/calendar-conduit.c:248
+#: ../calendar/conduits/calendar/calendar-conduit.c:255
msgid "Split Multi-Day Events:"
msgstr "分割多日事件:"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1425
-#: ../calendar/conduits/calendar/calendar-conduit.c:1426
+#: ../calendar/conduits/calendar/calendar-conduit.c:1432
+#: ../calendar/conduits/calendar/calendar-conduit.c:1433
#: ../calendar/conduits/memo/memo-conduit.c:854
#: ../calendar/conduits/memo/memo-conduit.c:855
#: ../calendar/conduits/todo/todo-conduit.c:1032
@@ -4230,8 +4243,8 @@ msgstr "分割多日事件:"
msgid "Could not start evolution-data-server"
msgstr "无法启动 evolution-data-server"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1522
-#: ../calendar/conduits/calendar/calendar-conduit.c:1525
+#: ../calendar/conduits/calendar/calendar-conduit.c:1529
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
msgid "Could not read pilot's Calendar application block"
msgstr "无法读入 Pilot 日历应用程序块"
@@ -4265,7 +4278,7 @@ msgid "Calendar and Tasks"
msgstr "日历和任务"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1309
+#: ../calendar/gui/calendar-component.c:1290
msgid "Calendars"
msgstr "日历"
@@ -4306,17 +4319,17 @@ msgid "Memo_s"
msgstr "备忘(_S)"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1092 ../calendar/gui/memos-component.c:528
-#: ../calendar/gui/memos-component.c:998 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memos.c:1092 ../calendar/gui/memos-component.c:529
+#: ../calendar/gui/memos-component.c:999 ../calendar/gui/memos-control.c:340
msgid "Memos"
msgstr "备忘"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
#: ../calendar/gui/e-tasks.c:1334 ../calendar/gui/print.c:1831
-#: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:472
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:707
+#: ../calendar/gui/tasks-component.c:520
+#: ../calendar/gui/tasks-component.c:1014 ../calendar/gui/tasks-control.c:472
+#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:741
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4364,9 +4377,9 @@ msgstr "约会"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1419
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1425
-#: ../calendar/gui/e-itip-control.c:1117
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1503
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1509
+#: ../calendar/gui/e-itip-control.c:1119
#: ../plugins/itip-formatter/itip-view.c:883
msgid "Location:"
msgstr "位置:"
@@ -4376,17 +4389,18 @@ msgid "Snooze _time:"
msgstr "午睡时间(_T):"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:41
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:40
#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-editor.xml.h:17
#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-message-composer.xml.h:45
#: ../ui/evolution-signature-editor.xml.h:23
#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:37
msgid "_Edit"
msgstr "编辑(_E)"
@@ -4398,48 +4412,48 @@ msgstr "午睡(_S)"
msgid "location of appointment"
msgstr "约会位置"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1097
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1127
msgid "<b>Calendars</b>"
msgstr "<b>日历</b>"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1163
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1193
msgid "Preferences"
msgstr "首选项"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1176
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1206
msgid "_Configure Alarms"
msgstr "配置提醒(_C)"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1178 ../ui/evolution.xml.h:44
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1208 ../ui/evolution.xml.h:45
msgid "_Quit"
msgstr "退出(_Q)"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1284
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1401
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1356
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
msgid "No summary available."
msgstr "没有可用的概览。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1293
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1295
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1365
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1367
msgid "No description available."
msgstr "没有描述。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1303
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1375
msgid "No location information available."
msgstr "没有可用的位置信息。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1339
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1414
#, c-format
msgid "You have %d alarms"
msgstr "您有 %d 个提醒"
#. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1502
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
msgid "Warning"
msgstr "警告"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1506
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1590
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -4451,7 +4465,7 @@ msgstr ""
"发送电子邮件。Evolution 将以\n"
"显示普通提示会话框代替。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4467,15 +4481,15 @@ msgstr ""
"\n"
"您确信您要运行该程序吗?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1546
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1630
msgid "Do not ask me about this program again."
msgstr "不要再次询问此问题。"
-#: ../calendar/gui/alarm-notify/notify-main.c:155
+#: ../calendar/gui/alarm-notify/notify-main.c:140
msgid "Could not initialize Bonobo"
msgstr "无法初始化 Bonobo"
-#: ../calendar/gui/alarm-notify/notify-main.c:166
+#: ../calendar/gui/alarm-notify/notify-main.c:153
msgid "Could not create the alarm notify service factory"
msgstr "无法创建提醒服务车间"
@@ -4665,8 +4679,8 @@ msgid "Month view vertical pane position"
msgstr "月视图中垂直面板的位置"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
-msgid "Number of units for determining for a default reminder."
-msgstr "默认提醒的单位数量。"
+msgid "Number of units for determining a default reminder."
+msgstr "确定默认提醒的单位数量。"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
msgid "Number of units for determining when to hide tasks."
@@ -4902,11 +4916,11 @@ msgstr "工作日开始小时"
msgid "Workday start minute"
msgstr "工作日开始分钟"
-#: ../calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-search-bar.c:48
msgid "Summary contains"
msgstr "概要含有"
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:49
msgid "Description contains"
msgstr "描述含有"
@@ -4922,14 +4936,14 @@ msgstr "位置含有"
msgid "Unmatched"
msgstr "无匹配"
-#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2512
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2512
#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-memos.xml.h:11
+#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:11
#: ../ui/evolution-tasks.xml.h:14
msgid "Print"
msgstr "打印"
-#: ../calendar/gui/calendar-commands.c:120
+#: ../calendar/gui/calendar-commands.c:119
#: ../calendar/gui/calendar-component.c:708
#: ../calendar/gui/dialogs/calendar-setup.c:369
#: ../calendar/gui/gnome-cal.c:2117
@@ -4938,10 +4952,11 @@ msgstr "打印"
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
#: ../plugins/hula-account-setup/camel-hula-listener.c:374
#: ../plugins/hula-account-setup/camel-hula-listener.c:403
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
msgid "Calendar"
msgstr "日历"
-#: ../calendar/gui/calendar-commands.c:355
+#: ../calendar/gui/calendar-commands.c:348
msgid ""
"This operation will permanently erase all events older than the selected "
"amount of time. If you continue, you will not be able to recover these "
@@ -4949,11 +4964,11 @@ msgid ""
msgstr ""
"该操作将永久删除所有比选中时间量早的事件。如果您继续,您将无法恢复这些事件。"
-#: ../calendar/gui/calendar-commands.c:361
+#: ../calendar/gui/calendar-commands.c:354
msgid "Purge events older than"
msgstr "销毁较早的事件"
-#: ../calendar/gui/calendar-commands.c:366
+#: ../calendar/gui/calendar-commands.c:359
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
@@ -4967,13 +4982,13 @@ msgstr "天"
#. Create the Webcal source group
#. Create the LDAP source group
#: ../calendar/gui/calendar-component.c:234
-#: ../calendar/gui/memos-component.c:219 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1084
-#: ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/memos-component.c:220 ../calendar/gui/migration.c:494
+#: ../calendar/gui/migration.c:587 ../calendar/gui/migration.c:1088
+#: ../calendar/gui/tasks-component.c:216
msgid "On The Web"
msgstr "网上"
-#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
+#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:396
msgid "Birthdays & Anniversaries"
msgstr "生日和纪念日"
@@ -4987,69 +5002,69 @@ msgstr "天气"
msgid "_New Calendar"
msgstr "新建日历(_N)"
-#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:839
msgid "Failed upgrading calendars."
msgstr "升级日历失败。"
-#: ../calendar/gui/calendar-component.c:1157
+#: ../calendar/gui/calendar-component.c:1138
#, c-format
msgid "Unable to open the calendar '%s' for creating events and meetings"
msgstr "无法打开日历“%s”来创建事件和会议"
-#: ../calendar/gui/calendar-component.c:1170
+#: ../calendar/gui/calendar-component.c:1151
msgid "There is no calendar available for creating events and meetings"
msgstr "没有可创建事件和会议的日历"
-#: ../calendar/gui/calendar-component.c:1284
+#: ../calendar/gui/calendar-component.c:1265
msgid "Calendar Source Selector"
msgstr "日历源选择器"
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1456
msgid "New appointment"
msgstr "新建约会"
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1457
msgid "_Appointment"
msgstr "约会(_A)"
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1458
msgid "Create a new appointment"
msgstr "创建新约会"
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1464
msgid "New meeting"
msgstr "新建会议"
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1465
msgid "M_eeting"
msgstr "会议(_E)"
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1466
msgid "Create a new meeting request"
msgstr "创建一条新会议请求"
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1472
msgid "New all day appointment"
msgstr "新建全天约会"
-#: ../calendar/gui/calendar-component.c:1492
+#: ../calendar/gui/calendar-component.c:1473
msgid "All Day A_ppointment"
msgstr "全天约会(_P)"
-#: ../calendar/gui/calendar-component.c:1493
+#: ../calendar/gui/calendar-component.c:1474
msgid "Create a new all-day appointment"
msgstr "创建新全天约会"
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1480
msgid "New calendar"
msgstr "新建日历"
-#: ../calendar/gui/calendar-component.c:1500
-#: ../calendar/gui/dialogs/event-page.c:829
+#: ../calendar/gui/calendar-component.c:1481
+#: ../calendar/gui/dialogs/event-page.c:870
msgid "Cale_ndar"
msgstr "日历(_N)"
-#: ../calendar/gui/calendar-component.c:1501
+#: ../calendar/gui/calendar-component.c:1482
msgid "Create a new calendar"
msgstr "创建新日历"
@@ -5081,7 +5096,7 @@ msgstr "打开日历的方法不支持"
msgid "Permission denied to open the calendar"
msgstr "没有权限打开日历"
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1267
+#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1279
msgid "Unknown error"
msgstr "未知的错误"
@@ -5208,70 +5223,6 @@ msgstr "添加(_D)"
msgid "Alarms"
msgstr "提醒"
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:110
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:106
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:113
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:109
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:116
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:311
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2582
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:138
-#: ../mail/em-utils.c:483 ../mail/em-utils.c:520
-#: ../widgets/misc/e-attachment-bar.c:341
-msgid "attachment"
-msgstr "附件"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1056
-#: ../calendar/gui/dialogs/event-page.c:1734
-#: ../calendar/gui/dialogs/meeting-page.c:909
-#: ../calendar/gui/dialogs/task-page.c:1183
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3545
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:18
-msgid "_Remove"
-msgstr "删除(_R)"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1057
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3546 ../mail/em-folder-tree.c:2058
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "_Properties"
-msgstr "属性(_P)"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1059
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3548
-msgid "_Add attachment..."
-msgstr "添加附件(_A)..."
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:736
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:994
-msgid "Attachment Bar"
-msgstr "附件栏"
-
#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
@@ -5283,33 +5234,9 @@ msgid "Suggest automatic display of attachment"
msgstr "建议自动显示附件"
#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:239
msgid "Attach file(s)"
msgstr "添加附件"
-#: ../calendar/gui/dialogs/cal-attachment.c:211
-#: ../calendar/gui/dialogs/cal-attachment.c:227
-#: ../calendar/gui/dialogs/cal-attachment.c:320
-#: ../calendar/gui/dialogs/cal-attachment.c:336
-#: ../composer/e-msg-composer-attachment.c:188
-#: ../composer/e-msg-composer-attachment.c:204
-#: ../composer/e-msg-composer-attachment.c:298
-#: ../composer/e-msg-composer-attachment.c:314
-#: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
-#: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "无法附加文件 %s:%s"
-
-#: ../calendar/gui/dialogs/cal-attachment.c:219
-#: ../calendar/gui/dialogs/cal-attachment.c:328
-#: ../composer/e-msg-composer-attachment.c:196
-#: ../composer/e-msg-composer-attachment.c:306
-#: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "无法附加文件 %s:不是普通文件"
-
#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
#: ../composer/e-msg-composer-attachment.glade.h:2
#: ../widgets/misc/e-attachment.glade.h:2
@@ -5317,8 +5244,8 @@ msgid "Attachment Properties"
msgstr "附件属性"
#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1163
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1165
#: ../calendar/gui/e-itip-control.glade.h:6
#: ../composer/e-msg-composer-attachment.glade.h:3
#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
@@ -5337,297 +5264,246 @@ msgstr "文件名:"
msgid "MIME type:"
msgstr "MIME 类型:"
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:583
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:930
-#: ../plugins/plugin-manager/plugin-manager.c:213
-msgid "Enabled"
-msgstr "已启用"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:740
-msgid "Are you sure you want to remove this URL?"
-msgstr "您确定您想要删除此 URL 吗?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:743
-msgid "Remove"
-msgstr "删除"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:748
-msgid "Don't Remove"
-msgstr "不删除"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:797
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:830
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:863
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:406
-msgid "Disable"
-msgstr "禁用"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:797
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:830
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:408
-msgid "Enable"
-msgstr "启用"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "05 minutes"
-msgstr "05 分钟"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "10 minutes"
-msgstr "10 分钟"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 分钟"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "30 minutes"
-msgstr "30 分钟"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
+msgstr "60 分钟\n30 分钟\n15 分钟\n10 分钟\n5 分钟"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "60 minutes"
-msgstr "60 分钟"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "<b>Alerts</b>"
-msgstr "<b>提醒</b>"
+msgid "<b>Publishing</b>"
+msgstr "<b>发布</b>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "<b>Default Free/Busy Server</b>"
-msgstr "<b>默认忙/闲服务器</b>"
+#, no-c-format
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr "<i>%u 和 %d 将被替换为电子邮件地址中的用户和域名。</i>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<b>General</b>"
-msgstr "<b>常规</b>"
+#: ../mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">警告</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "<b>Publishing</b>"
-msgstr "<b>公布</b>"
+msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgstr "<span weight=\"bold\">默认忙/闲服务器</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "<b>Task List</b>"
-msgstr "<b>任务列表</b>"
+#: ../mail/mail-config.glade.h:18
+#: ../plugins/itip-formatter/itip-formatter.c:1977
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">常规</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<b>Time</b>"
-msgstr "<b>时间</b>"
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span weight=\"bold\">任务列表</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "<b>Work Week</b>"
-msgstr "<b>工作周</b>"
+msgid "<span weight=\"bold\">Time</span>"
+msgstr "<span weight=\"bold\">时间</span>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i>%u 和 %d 将被替换为电子邮件地址中的用户和域名。</i>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar and Tasks Settings"
-msgstr "日历和任务设置"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Color for overdue tasks"
-msgstr "被延期任务的颜色"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr "<span weight=\"bold\">工作周</span>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Color for tasks due today"
-msgstr "今天到期任务的颜色"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
msgid "Day _ends:"
msgstr "一天结束(_E):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Days"
-msgstr "天数"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
msgid "Display"
msgstr "显示"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
#: ../mail/mail-config.glade.h:74
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
msgid "E_nable"
msgstr "启用(_N)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
#: ../calendar/gui/dialogs/event-editor.c:555
-#: ../ui/evolution-event-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:7
msgid "Free/Busy"
msgstr "忙/闲"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/e-itip-control.c:733
msgid "Friday"
msgstr "星期五"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Hours"
-msgstr "小时"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Minutes"
-msgstr "分钟"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
+"分钟\n"
+"小时\n"
+"天"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
#: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/e-itip-control.c:729
msgid "Monday"
msgstr "星期一"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
+"周一\n周二\n周三\n周四\n周五\n周六\n周日"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
msgid "Publishing Table"
-msgstr "公布表"
+msgstr "发布表"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
msgid "S_un"
msgstr "周日(_U)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
#: ../calendar/gui/dialogs/recurrence-page.c:1051
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/e-itip-control.c:734
msgid "Saturday"
msgstr "星期六"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
msgid "Sh_ow a reminder"
msgstr "显示一条提醒(_O)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
msgid "Show week _numbers in date navigator"
msgstr "在日期浏览器中显示周数(_N)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
#: ../calendar/gui/dialogs/recurrence-page.c:1052
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/e-itip-control.c:728
msgid "Sunday"
msgstr "星期日"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
msgid "T_asks due today:"
msgstr "今天到期的任务(_A):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
msgid "T_hu"
msgstr "周四(_H)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
msgid "Template:"
msgstr "模板:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
#: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/e-itip-control.c:732
msgid "Thursday"
msgstr "星期四"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
#: ../calendar/gui/dialogs/event-page.glade.h:14
msgid "Time _zone:"
msgstr "时区(_Z):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
msgid "Time format:"
msgstr "时间格式:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/e-itip-control.c:730
msgid "Tuesday"
msgstr "星期二"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
msgid "W_eek starts:"
msgstr "一周开始(_E):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/e-itip-control.c:731
msgid "Wednesday"
msgstr "星期三"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
msgid "Work days:"
msgstr "工作日:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
msgid "_12 hour (AM/PM)"
msgstr "_12 小时(上/下午)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
msgid "_24 hour"
msgstr "_24 小时"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
msgid "_Add URL"
msgstr "添加 URL(_A)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
msgid "_Ask for confirmation when deleting items"
msgstr "删除项时要求确认(_A)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
msgid "_Compress weekends in month view"
msgstr "不在月视图中显示周末(_C)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
msgid "_Day begins:"
msgstr "一天开始(_D):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
msgid "_Fri"
msgstr "周五(_F)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
msgid "_Hide completed tasks after"
msgstr "随后隐藏已完成的任务(_H)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
msgid "_Mon"
msgstr "周一(_M)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
msgid "_Overdue tasks:"
msgstr "延期任务(_O):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
msgid "_Sat"
msgstr "周六(_S)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "_Show appointment end times in week and month views"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+msgid "_Show appointment end times in week and month view"
msgstr "在周视图和月视图中显示约会结束时间(_S)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
msgid "_Time divisions:"
msgstr "时间分割(_T):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
msgid "_Tue"
msgstr "周二(_T)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
msgid "_Wed"
msgstr "周三(_W)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
msgid "before every appointment"
msgstr "在每次约会前"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "option menu to choose reminder units"
-msgstr "选择提醒单位的选项菜单"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "option menu to choose time units"
-msgstr "选择时间单位的选项菜单"
-
#: ../calendar/gui/dialogs/calendar-setup.c:287
msgid "Copy calendar contents locally for offline operation"
msgstr "将日历内容复制到本地以进行脱机操作"
@@ -5666,7 +5542,7 @@ msgid "Task List Properties"
msgstr "任务列表属性"
#: ../calendar/gui/dialogs/calendar-setup.c:594
-#: ../calendar/gui/memos-component.c:448
+#: ../calendar/gui/memos-component.c:449
msgid "New Memo List"
msgstr "新建备忘列表"
@@ -5777,101 +5653,133 @@ msgstr " (预定 "
msgid "Due "
msgstr "预定 "
-#: ../calendar/gui/dialogs/comp-editor.c:194 ../composer/e-msg-composer.c:2800
+#: ../calendar/gui/dialogs/comp-editor.c:195 ../composer/e-msg-composer.c:2825
#, c-format
msgid "Attached message - %s"
msgstr "附加的信件 - %s"
#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:199
-#: ../calendar/gui/dialogs/comp-editor.c:369 ../composer/e-msg-composer.c:2805
-#: ../composer/e-msg-composer.c:2984
+#: ../calendar/gui/dialogs/comp-editor.c:200
+#: ../calendar/gui/dialogs/comp-editor.c:370 ../composer/e-msg-composer.c:2830
+#: ../composer/e-msg-composer.c:3009
#, c-format
msgid "Attached message"
msgid_plural "%d attached messages"
msgstr[0] "%d 封附加的信件"
-#: ../calendar/gui/dialogs/comp-editor.c:433 ../composer/e-msg-composer.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:434 ../composer/e-msg-composer.c:3075
#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:932 ../mail/message-list.c:1719
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1717
msgid "_Move"
msgstr "移动(_M)"
-#: ../calendar/gui/dialogs/comp-editor.c:435 ../composer/e-msg-composer.c:3052
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
+#: ../calendar/gui/dialogs/comp-editor.c:436 ../composer/e-msg-composer.c:3077
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1719
msgid "Cancel _Drag"
msgstr "取消拖曳(_D)"
-#: ../calendar/gui/dialogs/comp-editor.c:778
+#: ../calendar/gui/dialogs/comp-editor.c:782
msgid "Could not update object"
msgstr "无法更新对象"
-#: ../calendar/gui/dialogs/comp-editor.c:914 ../composer/e-msg-composer.c:2443
+#: ../calendar/gui/dialogs/comp-editor.c:928 ../composer/e-msg-composer.c:2468
#, c-format
msgid "<b>%d</b> Attachment"
msgid_plural "<b>%d</b> Attachments"
msgstr[0] "<b>%d</b> 个附件"
-#: ../calendar/gui/dialogs/comp-editor.c:944
+#: ../calendar/gui/dialogs/comp-editor.c:958
msgid "Hide Attachment _Bar"
msgstr "隐藏附件栏(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:947
-#: ../calendar/gui/dialogs/comp-editor.c:1364
+#: ../calendar/gui/dialogs/comp-editor.c:961
+#: ../calendar/gui/dialogs/comp-editor.c:1401
msgid "Show Attachment _Bar"
msgstr "显示附件栏(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1388
+#: ../calendar/gui/dialogs/comp-editor.c:1070
+#: ../calendar/gui/dialogs/event-page.c:1861
+#: ../calendar/gui/dialogs/meeting-page.c:909
+#: ../calendar/gui/dialogs/task-page.c:1183
+#: ../composer/e-msg-composer-attachment-bar.c:470
+#: ../composer/e-msg-composer.c:3573
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:18
+msgid "_Remove"
+msgstr "删除(_R)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../composer/e-msg-composer-attachment-bar.c:471
+#: ../composer/e-msg-composer.c:3574 ../mail/em-folder-tree.c:2058
+#: ../ui/evolution-mail-list.xml.h:29
+msgid "_Properties"
+msgstr "属性(_P)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../composer/e-msg-composer-attachment-bar.c:473
+#: ../composer/e-msg-composer.c:3576
+msgid "_Add attachment..."
+msgstr "添加附件(_A)..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1425
msgid "Attachment Button: Press space key to toggle attachment bar"
msgstr "附件按钮:按空格键可切换附件栏"
-#: ../calendar/gui/dialogs/comp-editor.c:1991
-#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/dialogs/comp-editor.c:2028
+#: ../calendar/gui/dialogs/comp-editor.c:2071
msgid "Edit Appointment"
msgstr "编辑约会"
-#: ../calendar/gui/dialogs/comp-editor.c:1997
-#: ../calendar/gui/dialogs/comp-editor.c:2040
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/dialogs/comp-editor.c:2077
#, c-format
msgid "Meeting - %s"
msgstr "会议 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:1999
-#: ../calendar/gui/dialogs/comp-editor.c:2042
+#: ../calendar/gui/dialogs/comp-editor.c:2036
+#: ../calendar/gui/dialogs/comp-editor.c:2079
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2003
-#: ../calendar/gui/dialogs/comp-editor.c:2046
+#: ../calendar/gui/dialogs/comp-editor.c:2040
+#: ../calendar/gui/dialogs/comp-editor.c:2083
#, c-format
msgid "Assigned Task - %s"
msgstr "指派的任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2005
-#: ../calendar/gui/dialogs/comp-editor.c:2048
+#: ../calendar/gui/dialogs/comp-editor.c:2042
+#: ../calendar/gui/dialogs/comp-editor.c:2085
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2008
-#: ../calendar/gui/dialogs/comp-editor.c:2051
+#: ../calendar/gui/dialogs/comp-editor.c:2045
+#: ../calendar/gui/dialogs/comp-editor.c:2088
#, c-format
msgid "Journal entry - %s"
msgstr "日志条目 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2019
-#: ../calendar/gui/dialogs/comp-editor.c:2061
+#: ../calendar/gui/dialogs/comp-editor.c:2056
+#: ../calendar/gui/dialogs/comp-editor.c:2098
msgid "No summary"
msgstr "没有概要"
-#: ../calendar/gui/dialogs/comp-editor.c:2675
-#: ../calendar/gui/dialogs/comp-editor.c:2708
-#: ../calendar/gui/dialogs/comp-editor.c:2732
+#: ../calendar/gui/dialogs/comp-editor.c:2608
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:155
+#: ../mail/em-utils.c:501 ../mail/em-utils.c:538
+#: ../widgets/misc/e-attachment-bar.c:341
+msgid "attachment"
+msgstr "附件"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2701
+#: ../calendar/gui/dialogs/comp-editor.c:2734
+#: ../calendar/gui/dialogs/comp-editor.c:2758
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "如果更新到达的话,对此项目的更改将被丢弃"
-#: ../calendar/gui/dialogs/comp-editor.c:2756
+#: ../calendar/gui/dialogs/comp-editor.c:2782
msgid "Unable to use current version!"
msgstr "无法使用当前版本!"
@@ -5953,90 +5861,90 @@ msgid "Appoint_ment"
msgstr "约会(_M)"
#: ../calendar/gui/dialogs/event-editor.c:535
-#: ../ui/evolution-event-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:13
msgid "Recurrence"
msgstr "再现("
-#: ../calendar/gui/dialogs/event-page.c:835
+#: ../calendar/gui/dialogs/event-page.c:876
#: ../calendar/gui/dialogs/task-page.c:444
msgid "Or_ganizer"
msgstr "组织者(_G)"
-#: ../calendar/gui/dialogs/event-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:914
msgid "_Delegatees"
msgstr "代理人(_D)"
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.c:916
msgid "Atte_ndees"
msgstr "出席者(_N)"
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:1073
msgid "Event with no start date"
msgstr "没有开始日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1037
+#: ../calendar/gui/dialogs/event-page.c:1076
msgid "Event with no end date"
msgstr "没有结束日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1202
+#: ../calendar/gui/dialogs/event-page.c:1242
#: ../calendar/gui/dialogs/task-page.c:848
msgid "Start date is wrong"
msgstr "开始日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1212
+#: ../calendar/gui/dialogs/event-page.c:1252
msgid "End date is wrong"
msgstr "结束日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1235
+#: ../calendar/gui/dialogs/event-page.c:1275
msgid "Start time is wrong"
msgstr "开始时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1242
+#: ../calendar/gui/dialogs/event-page.c:1282
msgid "End time is wrong"
msgstr "结束时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1397
+#: ../calendar/gui/dialogs/event-page.c:1437
#: ../calendar/gui/dialogs/meeting-page.c:464
#: ../calendar/gui/dialogs/task-page.c:905
msgid "The organizer selected no longer has an account."
msgstr "选中的组织者没有帐户了。"
-#: ../calendar/gui/dialogs/event-page.c:1403
+#: ../calendar/gui/dialogs/event-page.c:1443
#: ../calendar/gui/dialogs/meeting-page.c:470
#: ../calendar/gui/dialogs/task-page.c:911
msgid "An organizer is required."
msgstr "需要一名组织者。"
-#: ../calendar/gui/dialogs/event-page.c:1418
+#: ../calendar/gui/dialogs/event-page.c:1458
#: ../calendar/gui/dialogs/meeting-page.c:485
#: ../calendar/gui/dialogs/task-page.c:926
msgid "At least one attendee is required."
msgstr "需要至少一个出席者。"
-#: ../calendar/gui/dialogs/event-page.c:1735
+#: ../calendar/gui/dialogs/event-page.c:1862
#: ../calendar/gui/dialogs/meeting-page.c:910
#: ../calendar/gui/dialogs/task-page.c:1184
msgid "_Add "
msgstr "添加(_A)"
-#: ../calendar/gui/dialogs/event-page.c:2422
+#: ../calendar/gui/dialogs/event-page.c:2553
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "无法打开日历“%s”。"
-#: ../calendar/gui/dialogs/event-page.c:2662
+#: ../calendar/gui/dialogs/event-page.c:2808
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "约会的 %d 天前"
-#: ../calendar/gui/dialogs/event-page.c:2670
+#: ../calendar/gui/dialogs/event-page.c:2816
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "约会的 %d 小时前"
-#: ../calendar/gui/dialogs/event-page.c:2678
+#: ../calendar/gui/dialogs/event-page.c:2824
#, c-format
msgid "%d minute before appointement"
msgid_plural "%d minutes before appointment"
@@ -6107,7 +6015,7 @@ msgstr "时间(_T):"
msgid "for"
msgstr "只"
-#: ../calendar/gui/dialogs/event-page.glade.h:20
+#: ../calendar/gui/dialogs/event-page.glade.h:21
#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
msgid "until"
msgstr "直到"
@@ -6127,16 +6035,16 @@ msgstr "<b>来自:</b>"
#. is not permitted.
#: ../calendar/gui/dialogs/meeting-page.c:316
#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1103 ../composer/e-msg-composer.c:2246
-#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
-#: ../mail/em-folder-view.c:1065 ../mail/em-junk-hook.c:78
+#: ../calendar/gui/e-cal-model-tasks.c:654
+#: ../calendar/gui/e-itip-control.c:1105 ../composer/e-msg-composer.c:2260
+#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:691
+#: ../mail/em-account-editor.c:1356 ../mail/em-account-prefs.c:465
+#: ../mail/em-folder-view.c:1106 ../mail/em-junk-hook.c:78
#: ../plugins/calendar-weather/calendar-weather.c:370
#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
#: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:474
#: ../widgets/misc/e-dateedit.c:1513 ../widgets/misc/e-dateedit.c:1727
msgid "None"
@@ -6177,15 +6085,16 @@ msgstr "语言"
msgid "Member"
msgstr "成员"
+#. To translators: RSVP means "please reply"
#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:399
+#: ../calendar/gui/e-meeting-list-view.c:502
#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "请回复"
#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:410
+#: ../calendar/gui/e-meeting-list-view.c:513
#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
#: ../mail/message-list.etspec.h:12
msgid "Status"
@@ -6230,20 +6139,20 @@ msgid "Classi_fication:"
msgstr "分类(_F):"
#: ../calendar/gui/dialogs/memo-page.glade.h:5
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:368
msgid "Confidential"
msgstr "机密"
#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:365
+#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:367
msgid "Private"
msgstr "保密"
#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:366
msgid "Public"
msgstr "公开"
@@ -6293,21 +6202,21 @@ msgid "Task List Name"
msgstr "任务列表名称"
#: ../calendar/gui/dialogs/recur-comp.c:52
-msgid "You are modifying a recurring event, what would you like to modify?"
-msgstr "您即将修改再现事件,请指定您想要修改的具体内容。"
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr "您即将修改再现事件。您想要修改何内容?"
#: ../calendar/gui/dialogs/recur-comp.c:54
-msgid "You are delegating a recurring event, what would like to delegate?"
-msgstr "您即将代理再现事件,请指定您想要代理的具体内容。"
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr "您即将代理再现事件。您想要代理何内容?"
#: ../calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring task, what would you like to modify?"
-msgstr "您即将修改再现任务,请指定您想要修改的具体内容。"
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr "您即将修改再现任务。您想要修改何内容?"
#: ../calendar/gui/dialogs/recur-comp.c:62
msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "您即将修改再现日记项,请指定您想要修改的具体内容。"
+"You are modifying a recurring journal entry. What would you like to modify?"
+msgstr "您即将修改再现日记项。您想要修改何内容?"
#: ../calendar/gui/dialogs/recur-comp.c:90
msgid "This Instance Only"
@@ -6430,48 +6339,48 @@ msgstr "<span weight=\"bold\">状态</span>"
#. Pass TRUE as is_utc, so it gets converted to the current
#. timezone.
#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-cal-model-tasks.c:346
-#: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:895
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:660
+#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/e-itip-control.c:897
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
#: ../calendar/gui/print.c:2372 ../plugins/save-calendar/csv-format.c:390
msgid "Completed"
msgstr "已完成"
#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1018
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1016
msgid "High"
msgstr "高"
#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:226
-#: ../calendar/gui/e-cal-model-tasks.c:344
-#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2369
+#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-model-tasks.c:345
+#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-cal-model-tasks.c:733
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2369
msgid "In Progress"
msgstr "进行中"
#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1016
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-calendar-table.c:390 ../mail/message-list.c:1014
msgid "Low"
msgstr "低"
#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:387
-#: ../mail/message-list.c:1017
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:389
+#: ../mail/message-list.c:1015
msgid "Normal"
msgstr "中"
#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:342
-#: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2366
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:656
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2366
msgid "Not Started"
msgstr "尚未开始"
@@ -6484,7 +6393,7 @@ msgid "Stat_us:"
msgstr "状态(_U):"
#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:391
msgid "Undefined"
msgstr "未定义"
@@ -6502,7 +6411,7 @@ msgid "_Web Page:"
msgstr "网页(_W):"
#: ../calendar/gui/dialogs/task-editor.c:419
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1173
msgid "_Task"
msgstr "任务(_T)"
@@ -6553,15 +6462,15 @@ msgstr "<b>忙/闲日历(_A)</b>"
#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
msgid "<b>Publishing Frequency</b>"
-msgstr "<b>公布频率</b>"
+msgstr "<b>发布频率</b>"
#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
msgid "<b>Publishing _Location</b>"
-msgstr "<b>公布位置(_L)</b>"
+msgstr "<b>发布位置(_L)</b>"
#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
msgid "Free/Busy Publishing Settings"
-msgstr "忙闲公布设置"
+msgstr "忙闲发布设置"
#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
msgid "_Daily"
@@ -6572,14 +6481,17 @@ msgid "_Manual"
msgstr "手动(_M)"
#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
msgid "_Password:"
msgstr "密码(_P):"
#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
msgid "_Remember password"
msgstr "记住密码(_R)"
#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
msgid "_Username:"
msgstr "用户名(_U):"
@@ -6668,17 +6580,17 @@ msgid "%s for an unknown trigger type"
msgstr "%s 为未知触发类型"
#: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2728
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2826
#, c-format
msgid "Click to open %s"
msgstr "单击以打开 %s"
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
+#: ../calendar/gui/e-cal-component-memo-preview.c:201
msgid "Memo:"
msgstr "备忘:"
-#: ../calendar/gui/e-cal-component-memo-preview.c:232
-#: ../calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-component-memo-preview.c:234
+#: ../calendar/gui/e-cal-component-preview.c:301
msgid "Web Page:"
msgstr "网页:"
@@ -6686,31 +6598,31 @@ msgstr "网页:"
msgid "Untitled"
msgstr "无标题"
-#: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1107
+#: ../calendar/gui/e-cal-component-preview.c:188
+#: ../calendar/gui/e-itip-control.c:1109
#: ../calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "概要:"
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
msgid "Start Date:"
msgstr "开始日期:"
-#: ../calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:217
msgid "Due Date:"
msgstr "到期日期:"
#. write status
#. Status
-#: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1131
-#: ../plugins/exchange-operations/exchange-account-setup.c:265
+#: ../calendar/gui/e-cal-component-preview.c:224
+#: ../calendar/gui/e-itip-control.c:1133
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
#: ../plugins/itip-formatter/itip-view.c:908
msgid "Status:"
msgstr "状态:"
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:248
msgid "Priority:"
msgstr "优先级:"
@@ -6730,17 +6642,17 @@ msgid "Summary"
msgstr "概要"
#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:438
+#: ../calendar/gui/e-calendar-table.c:440
msgid "Free"
msgstr "空闲"
#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:441
#: ../calendar/gui/e-meeting-time-sel.c:415
msgid "Busy"
msgstr "繁忙"
-#: ../calendar/gui/e-cal-model-tasks.c:607
+#: ../calendar/gui/e-cal-model-tasks.c:608
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -6750,17 +6662,17 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
-#: ../calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:809
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
msgid "Yes"
msgstr "是"
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-meeting-store.c:181
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
msgid "No"
msgstr "否"
@@ -6768,12 +6680,12 @@ msgstr "否"
#. This is the default filename used for temporary file creation
#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
#: ../calendar/gui/e-cal-popup.c:106 ../calendar/gui/e-cal-popup.c:121
-#: ../calendar/gui/e-cal-popup.c:165 ../calendar/gui/e-itip-control.c:1148
-#: ../calendar/gui/e-itip-control.c:1289
+#: ../calendar/gui/e-cal-popup.c:165 ../calendar/gui/e-itip-control.c:1150
+#: ../calendar/gui/e-itip-control.c:1291
#: ../calendar/gui/e-meeting-list-view.c:168
#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1283
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/e-meeting-store.c:225 ../mail/em-utils.c:1311
#: ../plugins/itip-formatter/itip-formatter.c:240
#: ../plugins/itip-formatter/itip-formatter.c:1652
#: ../plugins/plugin-manager/plugin-manager.c:72
@@ -6794,7 +6706,7 @@ msgstr "已指派"
msgid "Save As..."
msgstr "另存为..."
-#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1812
+#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1842
msgid "Select folder to save selected attachments..."
msgstr "选择保存选中附件的文件夹..."
@@ -6803,9 +6715,9 @@ msgstr "选择保存选中附件的文件夹..."
msgid "untitled_image.%s"
msgstr "无标题图像.%s"
-#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1564 ../calendar/gui/e-memo-table.c:854
-#: ../mail/em-folder-view.c:1046 ../mail/em-popup.c:553 ../mail/em-popup.c:564
+#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1178
+#: ../calendar/gui/e-calendar-view.c:1554 ../calendar/gui/e-memo-table.c:856
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:553 ../mail/em-popup.c:564
msgid "_Save As..."
msgstr "另存为(_S)..."
@@ -6823,123 +6735,123 @@ msgstr "保存选中(_S)"
msgid "Open in %s..."
msgstr "在 %s 中打开..."
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:410
msgid "0%"
msgstr "0%"
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:411
msgid "10%"
msgstr "10%"
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:412
msgid "20%"
msgstr "20%"
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:413
msgid "30%"
msgstr "30%"
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:414
msgid "40%"
msgstr "40%"
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:415
msgid "50%"
msgstr "50%"
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:416
msgid "60%"
msgstr "60%"
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:417
msgid "70%"
msgstr "70%"
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:418
msgid "80%"
msgstr "80%"
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:419
msgid "90%"
msgstr "90%"
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:420
msgid "100%"
msgstr "100%"
-#: ../calendar/gui/e-calendar-table.c:525
+#: ../calendar/gui/e-calendar-table.c:527
msgid "Task Table"
msgstr "任务表"
-#: ../calendar/gui/e-calendar-table.c:703
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:433
+#: ../calendar/gui/e-calendar-table.c:705
+#: ../calendar/gui/e-calendar-view.c:678 ../calendar/gui/e-memo-table.c:435
msgid "Deleting selected objects"
msgstr "删除选中的对象"
-#: ../calendar/gui/e-calendar-table.c:882
-#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:610
+#: ../calendar/gui/e-calendar-table.c:884
+#: ../calendar/gui/e-calendar-view.c:806 ../calendar/gui/e-memo-table.c:612
msgid "Updating objects"
msgstr "更新对象"
-#: ../calendar/gui/e-calendar-table.c:1032
-#: ../calendar/gui/e-calendar-view.c:1140 ../calendar/gui/e-memo-table.c:742
-#: ../composer/e-msg-composer.c:1341
+#: ../calendar/gui/e-calendar-table.c:1034
+#: ../calendar/gui/e-calendar-view.c:1141 ../calendar/gui/e-memo-table.c:744
+#: ../composer/e-msg-composer.c:1339
msgid "Save as..."
msgstr "另存为..."
-#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1177 ../calendar/gui/e-memo-table.c:855
msgid "Open _Web Page"
msgstr "打开网页(_W)"
-#: ../calendar/gui/e-calendar-table.c:1177
-#: ../calendar/gui/e-calendar-view.c:1544
-#: ../calendar/gui/e-calendar-view.c:1565 ../calendar/gui/e-memo-table.c:855
-#: ../mail/em-folder-view.c:1047
+#: ../calendar/gui/e-calendar-table.c:1179
+#: ../calendar/gui/e-calendar-view.c:1539
+#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:857
+#: ../mail/em-folder-view.c:1088
#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
#: ../ui/evolution-tasks.xml.h:29
msgid "_Print..."
msgstr "打印(_P)..."
-#: ../calendar/gui/e-calendar-table.c:1181
-#: ../calendar/gui/e-calendar-view.c:1569 ../calendar/gui/e-memo-table.c:859
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1559 ../calendar/gui/e-memo-table.c:861
#: ../ui/evolution-addressbook.xml.h:1 ../ui/evolution-calendar.xml.h:1
#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "剪切(_U)"
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:1547
-#: ../calendar/gui/e-calendar-view.c:1571 ../calendar/gui/e-memo-table.c:861
-#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:43
+#: ../calendar/gui/e-calendar-table.c:1185
+#: ../calendar/gui/e-calendar-view.c:1542
+#: ../calendar/gui/e-calendar-view.c:1561 ../calendar/gui/e-memo-table.c:863
+#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:42
#: ../ui/evolution-composer-entries.xml.h:9 ../ui/evolution-editor.xml.h:22
#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
msgid "_Paste"
msgstr "粘贴(_P)"
-#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1189 ../ui/evolution-tasks.xml.h:22
msgid "_Assign Task"
msgstr "指派任务(_A)"
-#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
+#: ../calendar/gui/e-calendar-table.c:1190 ../calendar/gui/e-memo-table.c:867
#: ../ui/evolution-tasks.xml.h:26
msgid "_Forward as iCalendar"
msgstr "作为 iCalendar 转发(_F)"
-#: ../calendar/gui/e-calendar-table.c:1189
+#: ../calendar/gui/e-calendar-table.c:1191
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1190
+#: ../calendar/gui/e-calendar-table.c:1192
msgid "_Mark Selected Tasks as Complete"
msgstr "把任务标记为完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1195
+#: ../calendar/gui/e-calendar-table.c:1197
msgid "_Delete Selected Tasks"
msgstr "删除选中任务(_D)"
-#: ../calendar/gui/e-calendar-table.c:1428
+#: ../calendar/gui/e-calendar-table.c:1430
#: ../calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
msgstr "单击以添加任务"
@@ -6974,98 +6886,101 @@ msgstr "开始日期"
msgid "Task sort"
msgstr "任务排序"
-#: ../calendar/gui/e-calendar-view.c:1266
+#: ../calendar/gui/e-calendar-view.c:1267
msgid "Moving items"
msgstr "移动项目"
-#: ../calendar/gui/e-calendar-view.c:1268
+#: ../calendar/gui/e-calendar-view.c:1269
msgid "Copying items"
msgstr "复制项目"
-#: ../calendar/gui/e-calendar-view.c:1538
+#: ../calendar/gui/e-calendar-view.c:1533
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
-#: ../calendar/gui/e-calendar-view.c:1539
+#: ../calendar/gui/e-calendar-view.c:1534
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1535
msgid "New _Meeting"
msgstr "新建会议(_M)"
-#: ../calendar/gui/e-calendar-view.c:1541
+#: ../calendar/gui/e-calendar-view.c:1536
msgid "New _Task"
msgstr "新建任务(_T)"
#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1551
+#: ../calendar/gui/e-calendar-view.c:1546
#: ../widgets/menus/gal-view-menus.c:291
msgid "_Current View"
msgstr "当前视图(_C)"
-#: ../calendar/gui/e-calendar-view.c:1553
+#: ../calendar/gui/e-calendar-view.c:1548
msgid "Select T_oday"
msgstr "选择今天(_O)"
-#: ../calendar/gui/e-calendar-view.c:1554
+#: ../calendar/gui/e-calendar-view.c:1549
msgid "_Select Date..."
msgstr "选择日期(_S)..."
-#. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1559 ../ui/evolution-calendar.xml.h:45
-msgid "_Publish Free/Busy Information"
-msgstr "发布忙闲信息(_P)"
-
-#: ../calendar/gui/e-calendar-view.c:1575
+#: ../calendar/gui/e-calendar-view.c:1565
msgid "Cop_y to Calendar..."
msgstr "复制到日历(_Y)..."
-#: ../calendar/gui/e-calendar-view.c:1576
+#: ../calendar/gui/e-calendar-view.c:1566
msgid "Mo_ve to Calendar..."
msgstr "移动到日历(_V)..."
-#: ../calendar/gui/e-calendar-view.c:1577
+#: ../calendar/gui/e-calendar-view.c:1567
msgid "_Delegate Meeting..."
msgstr "代理会议(_D)..."
-#: ../calendar/gui/e-calendar-view.c:1578
+#: ../calendar/gui/e-calendar-view.c:1568
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
-#: ../calendar/gui/e-calendar-view.c:1579
+#: ../calendar/gui/e-calendar-view.c:1569
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_F)..."
-#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1574
msgid "Make this Occurrence _Movable"
msgstr "将此次发生变为可移动(_M)"
-#: ../calendar/gui/e-calendar-view.c:1585
+#: ../calendar/gui/e-calendar-view.c:1575
msgid "Delete this _Occurrence"
msgstr "删除此次出现(_O)"
-#: ../calendar/gui/e-calendar-view.c:1586
+#: ../calendar/gui/e-calendar-view.c:1576
msgid "Delete _All Occurrences"
msgstr "删除所有出现(_A)"
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-view.c:1951
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "组织者:%s <%s>"
+
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:1965 ../calendar/gui/print.c:2339
+#, c-format
+msgid "Location: %s"
+msgstr "位置:%s"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:1996
+#, c-format
+msgid "Time: %s %s"
+msgstr "时间:%s %s"
+
#. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:115 ../e-util/e-time-utils.c:180
-#: ../e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:115
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%Y年%m月%d日%A%H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
-#: ../e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:118
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%Y-%m-%d %A %p%I:%M:%S"
@@ -7108,88 +7023,88 @@ msgstr "上午"
msgid "pm"
msgstr "下午"
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:762
msgid "Yes. (Complex Recurrence)"
msgstr "是(复杂重现)"
-#: ../calendar/gui/e-itip-control.c:771
+#: ../calendar/gui/e-itip-control.c:773
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
msgstr[0] "每 %d 天"
-#: ../calendar/gui/e-itip-control.c:776
+#: ../calendar/gui/e-itip-control.c:778
#, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
msgstr[0] "每 %d 周"
-#: ../calendar/gui/e-itip-control.c:778
+#: ../calendar/gui/e-itip-control.c:780
#, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
msgstr[0] "每 %d 周的"
-#: ../calendar/gui/e-itip-control.c:786
+#: ../calendar/gui/e-itip-control.c:788
msgid " and "
msgstr " 和 "
-#: ../calendar/gui/e-itip-control.c:793
+#: ../calendar/gui/e-itip-control.c:795
#, c-format
msgid "The %s day of "
msgstr "第 %s 天属于"
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:808
#, c-format
msgid "The %s %s of "
msgstr "%s %s 属于"
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:815
#, c-format
msgid "every month"
msgid_plural "every %d months"
msgstr[0] "每 %d 月"
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:819
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
msgstr[0] "每 %d 年"
-#: ../calendar/gui/e-itip-control.c:828
+#: ../calendar/gui/e-itip-control.c:830
#, c-format
msgid "a total of %d time"
msgid_plural " a total of %d times"
msgstr[0] " 总计 %d 次"
-#: ../calendar/gui/e-itip-control.c:837
+#: ../calendar/gui/e-itip-control.c:839
msgid ", ending on "
msgstr ",结束于 "
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:863
msgid "Starts"
msgstr "开始"
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:876
msgid "Ends"
msgstr "结束"
-#: ../calendar/gui/e-itip-control.c:908
+#: ../calendar/gui/e-itip-control.c:910
#: ../plugins/save-calendar/csv-format.c:395
msgid "Due"
msgstr "到期"
-#: ../calendar/gui/e-itip-control.c:948 ../calendar/gui/e-itip-control.c:1005
+#: ../calendar/gui/e-itip-control.c:950 ../calendar/gui/e-itip-control.c:1007
msgid "iCalendar Information"
msgstr "iCalendar 信息"
#. Title
-#: ../calendar/gui/e-itip-control.c:965
+#: ../calendar/gui/e-itip-control.c:967
msgid "iCalendar Error"
msgstr "iCalendar 错误"
-#: ../calendar/gui/e-itip-control.c:1037 ../calendar/gui/e-itip-control.c:1053
-#: ../calendar/gui/e-itip-control.c:1064 ../calendar/gui/e-itip-control.c:1081
+#: ../calendar/gui/e-itip-control.c:1039 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:1066 ../calendar/gui/e-itip-control.c:1083
#: ../plugins/itip-formatter/itip-view.c:337
#: ../plugins/itip-formatter/itip-view.c:338
#: ../plugins/itip-formatter/itip-view.c:405
@@ -7198,297 +7113,297 @@ msgid "An unknown person"
msgstr "未知的人"
#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1088
+#: ../calendar/gui/e-itip-control.c:1090
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作。"
-#: ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1138
#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
#: ../calendar/gui/itip-utils.c:546
#: ../plugins/itip-formatter/itip-formatter.c:1640
msgid "Accepted"
msgstr "接受"
-#: ../calendar/gui/e-itip-control.c:1140 ../calendar/gui/itip-utils.c:549
+#: ../calendar/gui/e-itip-control.c:1142 ../calendar/gui/itip-utils.c:549
#: ../plugins/itip-formatter/itip-formatter.c:1643
msgid "Tentatively Accepted"
msgstr "暂时接受"
-#: ../calendar/gui/e-itip-control.c:1144
+#: ../calendar/gui/e-itip-control.c:1146
#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
#: ../calendar/gui/itip-utils.c:552 ../calendar/gui/itip-utils.c:581
#: ../plugins/itip-formatter/itip-formatter.c:1646
msgid "Declined"
msgstr "拒绝"
-#: ../calendar/gui/e-itip-control.c:1228
+#: ../calendar/gui/e-itip-control.c:1230
msgid ""
"The meeting has been cancelled, however it could not be found in your "
"calendars"
msgstr "会议已经被取消,但无法在您的日历中找到该会议"
-#: ../calendar/gui/e-itip-control.c:1230
+#: ../calendar/gui/e-itip-control.c:1232
msgid ""
"The task has been cancelled, however it could not be found in your task lists"
msgstr "任务已经被取消,但无法在您的任务列表中找到该任务"
-#: ../calendar/gui/e-itip-control.c:1309
+#: ../calendar/gui/e-itip-control.c:1311
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> 发布了会议信息。"
-#: ../calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1312
msgid "Meeting Information"
msgstr "会议信息"
-#: ../calendar/gui/e-itip-control.c:1316
+#: ../calendar/gui/e-itip-control.c:1318
#, 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:1318
+#: ../calendar/gui/e-itip-control.c:1320
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请求您参加一个会议。"
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1321
msgid "Meeting Proposal"
msgstr "会议建议"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1325
+#: ../calendar/gui/e-itip-control.c:1327
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> 希望加入到已有的会议。"
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1328
msgid "Meeting Update"
msgstr "会议更新"
-#: ../calendar/gui/e-itip-control.c:1330
+#: ../calendar/gui/e-itip-control.c:1332
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> 想收到最新的会议信息。"
-#: ../calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1333
msgid "Meeting Update Request"
msgstr "会议更新请求"
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1340
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> 已回复一个会议请求。"
-#: ../calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1341
msgid "Meeting Reply"
msgstr "会议答复"
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1348
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1349
msgid "Meeting Cancellation"
msgstr "会议取消"
-#: ../calendar/gui/e-itip-control.c:1357 ../calendar/gui/e-itip-control.c:1434
-#: ../calendar/gui/e-itip-control.c:1474
+#: ../calendar/gui/e-itip-control.c:1359 ../calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1476
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> 发送了一个无法理解的信件。"
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1360
msgid "Bad Meeting Message"
msgstr "错误的会议信件"
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1387
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> 发布了任务信息。"
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1388
msgid "Task Information"
msgstr "任务信息"
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1395
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> 请求 %s 完成一个任务。"
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1397
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请求您完成一个任务。"
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1398
msgid "Task Proposal"
msgstr "任务建议"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1402
+#: ../calendar/gui/e-itip-control.c:1404
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s<b> 希望加入到已存在的任务。"
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1405
msgid "Task Update"
msgstr "任务更新"
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1409
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> 希望获取最新的任务信息。"
-#: ../calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1410
msgid "Task Update Request"
msgstr "任务更新请求"
-#: ../calendar/gui/e-itip-control.c:1415
+#: ../calendar/gui/e-itip-control.c:1417
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> 已经回复了任务指派。"
-#: ../calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1418
msgid "Task Reply"
msgstr "任务回复"
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1425
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> 取消了任务。"
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1426
msgid "Task Cancellation"
msgstr "任务取消"
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1437
msgid "Bad Task Message"
msgstr "错误的任务信件"
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1461
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> 发布了忙闲信息。"
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1462
msgid "Free/Busy Information"
msgstr "忙闲信息"
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1466
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请求您的忙闲信息。"
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1467
msgid "Free/Busy Request"
msgstr "忙/闲请求"
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1471
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> 应答了忙闲请求。"
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1472
msgid "Free/Busy Reply"
msgstr "忙闲应答"
-#: ../calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1477
msgid "Bad Free/Busy Message"
msgstr "错误的忙闲信件"
-#: ../calendar/gui/e-itip-control.c:1550
+#: ../calendar/gui/e-itip-control.c:1552
msgid "The message does not appear to be properly formed"
msgstr "信件的格式可能不正确"
-#: ../calendar/gui/e-itip-control.c:1609
+#: ../calendar/gui/e-itip-control.c:1611
msgid "The message contains only unsupported requests."
msgstr "信件只含有不支持的请求。"
-#: ../calendar/gui/e-itip-control.c:1642
+#: ../calendar/gui/e-itip-control.c:1644
msgid "The attachment does not contain a valid calendar message"
msgstr "附件中没有有效的日历信件"
-#: ../calendar/gui/e-itip-control.c:1674
+#: ../calendar/gui/e-itip-control.c:1676
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日历项目"
-#: ../calendar/gui/e-itip-control.c:1908
+#: ../calendar/gui/e-itip-control.c:1910
msgid "Update complete\n"
msgstr "更新完成\n"
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1938
msgid "Object is invalid and cannot be updated\n"
msgstr "对象无效,无法更新\n"
-#: ../calendar/gui/e-itip-control.c:1946
+#: ../calendar/gui/e-itip-control.c:1948
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "此响应并非来自当前出席者。将响应者加为出席者吗?"
-#: ../calendar/gui/e-itip-control.c:1958
+#: ../calendar/gui/e-itip-control.c:1960
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新出席者状态!\n"
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1977
msgid "Attendee status updated\n"
msgstr "更新出席者状态\n"
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:1980
#: ../plugins/itip-formatter/itip-formatter.c:1025
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新出席者状态"
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2010
msgid "Removal Complete"
msgstr "删除完成"
-#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2079
+#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2081
msgid "Item sent!\n"
msgstr "项目已发送!\n"
-#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2083
+#: ../calendar/gui/e-itip-control.c:2035 ../calendar/gui/e-itip-control.c:2085
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
-#: ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2165
msgid "Choose an action:"
msgstr "选择一项活动:"
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2237
msgid "Update"
msgstr "更新"
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2265
#: ../plugins/groupwise-features/process-meeting.c:48
msgid "Accept"
msgstr "接受"
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2266
msgid "Tentatively accept"
msgstr "暂时接受"
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2267
#: ../plugins/groupwise-features/process-meeting.c:50
msgid "Decline"
msgstr "拒绝"
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2296
msgid "Send Free/Busy Information"
msgstr "发送忙闲信息"
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2324
msgid "Update respondent status"
msgstr "更新应答者状态"
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2352
msgid "Send Latest Information"
msgstr "发送最新的信息"
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:569
+#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:569
#: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
#: ../ui/evolution-mail-global.xml.h:1
msgid "Cancel"
@@ -7549,74 +7464,74 @@ msgid "Resources"
msgstr "资源"
#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
+#: ../calendar/gui/e-meeting-store.c:803
msgid "Individual"
msgstr "个人"
#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
#: ../widgets/table/e-table-config-no-group.glade.h:7
#: ../widgets/table/e-table-config.glade.h:6
msgid "Group"
msgstr "组"
#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
msgid "Resource"
msgstr "资源"
#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
msgid "Room"
msgstr "房间"
#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
msgid "Chair"
msgstr "主席"
#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:805
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/e-meeting-store.c:806
msgid "Required Participant"
msgstr "必需的出席者"
#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
msgid "Optional Participant"
msgstr "可选的出席者"
#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
msgid "Non-Participant"
msgstr "不参加"
#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:816
msgid "Needs Action"
msgstr "需要动作"
#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
#: ../calendar/gui/e-meeting-time-sel.c:414
msgid "Tentative"
msgstr "暂时的"
#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
#: ../calendar/gui/itip-utils.c:555
#: ../plugins/itip-formatter/itip-formatter.c:1649
msgid "Delegated"
msgstr "被委任的"
#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:361
+#: ../calendar/gui/e-meeting-list-view.c:463
msgid "Attendee "
msgstr "出席者 "
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
msgid "In Process"
msgstr "处理中"
@@ -7631,22 +7546,17 @@ msgstr "%Y年%m月%d日%A"
#. name, %m = month number, %d = month day, %Y = full year.
#. This is a strftime() format string %a = abbreviated weekday name,
#. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
#: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2138 ../e-util/e-time-utils.c:203
-#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel.c:2138
msgid "%a %m/%d/%Y"
msgstr "%Y年%m月%d日%A"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
#. This is a strftime() format for a short date. %m = month,
#. %d = day of month, %Y = year (all digits).
-#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1736
+#: ../calendar/gui/e-meeting-time-sel-item.c:452
+#: ../widgets/misc/e-dateedit.c:1736
msgid "%m/%d/%Y"
msgstr "%Y-%m-%d"
@@ -7714,15 +7624,15 @@ msgstr "开始时间(_S):"
msgid "_End time:"
msgstr "结束时间(_E):"
-#: ../calendar/gui/e-memo-table.c:274
+#: ../calendar/gui/e-memo-table.c:276
msgid "Memo Table"
msgstr "备忘表"
-#: ../calendar/gui/e-memo-table.c:870
+#: ../calendar/gui/e-memo-table.c:872
msgid "_Delete Selected Memos"
msgstr "删除选中备忘(_D)"
-#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:995 ../calendar/gui/e-memo-table.etspec.h:2
msgid "Click to add a memo"
msgstr "单击以添加备忘"
@@ -7931,74 +7841,73 @@ msgstr "iCalendar 信息"
msgid "You must be an attendee of the event."
msgstr "您必须是事件的出席者。"
-#: ../calendar/gui/memos-component.c:449 ../ui/evolution-addressbook.xml.h:3
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
+#: ../calendar/gui/memos-component.c:450 ../ui/evolution-addressbook.xml.h:3
+#: ../ui/evolution-memos.xml.h:2 ../ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr "复制"
-#: ../calendar/gui/memos-component.c:450 ../mail/em-filter-i18n.h:11
+#: ../calendar/gui/memos-component.c:451 ../mail/em-filter-i18n.h:11
#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
#: ../ui/evolution-tasks.xml.h:6
msgid "Delete"
msgstr "删除"
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/memos-component.c:452
msgid "Properties..."
msgstr "属性..."
-#: ../calendar/gui/memos-component.c:524
+#: ../calendar/gui/memos-component.c:525
#, c-format
msgid "%d memo"
msgid_plural "%d memos"
msgstr[0] "%d 个备忘"
-#: ../calendar/gui/memos-component.c:526 ../calendar/gui/tasks-component.c:517
-#: ../mail/mail-component.c:548
+#: ../calendar/gui/memos-component.c:527 ../calendar/gui/tasks-component.c:518
+#: ../mail/mail-component.c:559
#, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
msgstr[0] ",已选中 %d 个"
-#: ../calendar/gui/memos-component.c:573
+#: ../calendar/gui/memos-component.c:574
msgid "Failed upgrading memos."
msgstr "升级备忘失败。"
-#: ../calendar/gui/memos-component.c:869
+#: ../calendar/gui/memos-component.c:870
#, c-format
msgid "Unable to open the memo list '%s' for creating events and meetings"
msgstr "无法打开备忘列表“%s”来创建事件和会议"
-#: ../calendar/gui/memos-component.c:882
+#: ../calendar/gui/memos-component.c:883
msgid "There is no calendar available for creating memos"
msgstr "没有可创建备忘的日历"
-#: ../calendar/gui/memos-component.c:973
+#: ../calendar/gui/memos-component.c:974
msgid "Memo Source Selector"
msgstr "备忘来源选择器"
-#: ../calendar/gui/memos-component.c:1156
+#: ../calendar/gui/memos-component.c:1157
msgid "New memo"
msgstr "新建备忘"
-#: ../calendar/gui/memos-component.c:1157
+#: ../calendar/gui/memos-component.c:1158
msgid "_Memo"
msgstr "备忘(_M)"
-#: ../calendar/gui/memos-component.c:1158
+#: ../calendar/gui/memos-component.c:1159
msgid "Create a new memo"
msgstr "创建新备忘"
-#: ../calendar/gui/memos-component.c:1164
+#: ../calendar/gui/memos-component.c:1165
msgid "New memo list"
msgstr "新建备忘列表"
-#: ../calendar/gui/memos-component.c:1165
+#: ../calendar/gui/memos-component.c:1166
msgid "Memo l_ist"
msgstr "备忘列表(_I)"
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1167
msgid "Create a new memo list"
msgstr "创建新备忘列表"
@@ -8006,7 +7915,7 @@ msgstr "创建新备忘列表"
msgid "Print Memos"
msgstr "打印备忘"
-#: ../calendar/gui/migration.c:151
+#: ../calendar/gui/migration.c:156
msgid ""
"The location and hierarchy of the Evolution task folders has changed since "
"Evolution 1.x.\n"
@@ -8017,7 +7926,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:160
msgid ""
"The location and hierarchy of the Evolution calendar folders has changed "
"since Evolution 1.x.\n"
@@ -8029,18 +7938,18 @@ msgstr ""
"请稍候,Evolution 正在升迁您的文件夹..."
#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
+#: ../calendar/gui/migration.c:753 ../calendar/gui/migration.c:919
msgid "Unable to migrate old settings from evolution/config.xmldb"
msgstr "无法从 evolution/config.xmldb 中升迁旧设置"
#. FIXME: domain/code
-#: ../calendar/gui/migration.c:777
+#: ../calendar/gui/migration.c:782
#, c-format
msgid "Unable to migrate calendar `%s'"
msgstr "无法升迁日历“%s”"
#. FIXME: domain/code
-#: ../calendar/gui/migration.c:944
+#: ../calendar/gui/migration.c:948
#, c-format
msgid "Unable to migrate tasks `%s'"
msgstr "无法升迁任务“%s”"
@@ -8243,11 +8152,6 @@ msgstr "任务"
msgid "Summary: %s"
msgstr "概要:%s"
-#: ../calendar/gui/print.c:2339
-#, c-format
-msgid "Location: %s"
-msgstr "位置:%s"
-
#: ../calendar/gui/print.c:2382
#, c-format
msgid "Status: %s"
@@ -8286,62 +8190,62 @@ msgstr "打印预览"
msgid "Print Item"
msgstr "打印项"
-#: ../calendar/gui/tasks-component.c:439
+#: ../calendar/gui/tasks-component.c:440
msgid "_New Task List"
msgstr "新建任务列表(_N)"
-#: ../calendar/gui/tasks-component.c:515
+#: ../calendar/gui/tasks-component.c:516
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d 个任务"
-#: ../calendar/gui/tasks-component.c:564
+#: ../calendar/gui/tasks-component.c:565
msgid "Failed upgrading tasks."
msgstr "升级任务失败。"
-#: ../calendar/gui/tasks-component.c:875
+#: ../calendar/gui/tasks-component.c:876
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr "无法打开任务列表“%s”来创建事件和会议"
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:889
msgid "There is no calendar available for creating tasks"
msgstr "没有可创建任务的日历"
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:989
msgid "Task Source Selector"
msgstr "任务来源选择器"
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/tasks-component.c:1172
msgid "New task"
msgstr "新建任务"
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1174
msgid "Create a new task"
msgstr "创建新任务"
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1180
msgid "New assigned task"
msgstr "新建指派的任务"
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1181
msgid "Assigne_d Task"
msgstr "指派的任务(_D)"
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1182
msgid "Create a new assigned task"
msgstr "创建新指派的任务"
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1188
msgid "New task list"
msgstr "新建任务列表"
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1189
msgid "Task l_ist"
msgstr "任务列表(_I)"
-#: ../calendar/gui/tasks-component.c:1189
+#: ../calendar/gui/tasks-component.c:1190
msgid "Create a new task list"
msgstr "创建新任务列表"
@@ -8369,40 +8273,40 @@ msgstr "打印任务"
msgid "SMTWTFS"
msgstr "日一二三四五六"
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:79
msgid "Appointments and Meetings"
msgstr "约会和会议"
-#: ../calendar/importers/icalendar-importer.c:336
-#: ../calendar/importers/icalendar-importer.c:586
+#: ../calendar/importers/icalendar-importer.c:337
+#: ../calendar/importers/icalendar-importer.c:620
msgid "Opening calendar"
msgstr "打开日历"
-#: ../calendar/importers/icalendar-importer.c:429
+#: ../calendar/importers/icalendar-importer.c:444
msgid "iCalendar files (.ics)"
msgstr "iCalendar 文件(.ics)"
-#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:445
msgid "Evolution iCalendar importer"
msgstr "Evolution iCalendar 导入器"
-#: ../calendar/importers/icalendar-importer.c:494
+#: ../calendar/importers/icalendar-importer.c:521
msgid "Reminder!!"
msgstr "提醒!!"
-#: ../calendar/importers/icalendar-importer.c:539
+#: ../calendar/importers/icalendar-importer.c:573
msgid "vCalendar files (.vcf)"
msgstr "vCalendar 文件(.vcf)"
-#: ../calendar/importers/icalendar-importer.c:540
+#: ../calendar/importers/icalendar-importer.c:574
msgid "Evolution vCalendar importer"
msgstr "Evolution vCalendar 导入器"
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:736
msgid "Calendar Events"
msgstr "日历事件"
-#: ../calendar/importers/icalendar-importer.c:739
+#: ../calendar/importers/icalendar-importer.c:773
msgid "Evolution Calendar intelligent importer"
msgstr "Evolution 日历智能导入器"
@@ -9936,6 +9840,46 @@ msgstr "太平洋/沃利斯"
msgid "Pacific/Yap"
msgstr "太平洋/雅浦"
+#: ../composer/e-msg-composer-attachment-bar.c:105
+#: ../widgets/misc/e-attachment-bar.c:106
+#, c-format
+msgid "%.0fK"
+msgstr "%.0fK"
+
+#: ../composer/e-msg-composer-attachment-bar.c:108
+#: ../widgets/misc/e-attachment-bar.c:109
+#, c-format
+msgid "%.0fM"
+msgstr "%.0fM"
+
+#: ../composer/e-msg-composer-attachment-bar.c:111
+#: ../widgets/misc/e-attachment-bar.c:112
+#, c-format
+msgid "%.0fG"
+msgstr "%.0fG"
+
+#: ../composer/e-msg-composer-attachment-bar.c:740
+#: ../widgets/misc/e-attachment-bar.c:994
+msgid "Attachment Bar"
+msgstr "附件栏"
+
+#: ../composer/e-msg-composer-attachment.c:187
+#: ../composer/e-msg-composer-attachment.c:203
+#: ../composer/e-msg-composer-attachment.c:297
+#: ../composer/e-msg-composer-attachment.c:313
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:442 ../widgets/misc/e-attachment.c:458
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "无法附加文件 %s:%s"
+
+#: ../composer/e-msg-composer-attachment.c:195
+#: ../composer/e-msg-composer-attachment.c:305
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:450
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "无法附加文件 %s:不是普通文件"
+
#: ../composer/e-msg-composer-hdrs.c:558
msgid "Posting destination"
msgstr "投递目的"
@@ -10018,58 +9962,62 @@ msgstr "投递到:"
msgid "A_ttach"
msgstr "附件(_T)"
-#: ../composer/e-msg-composer.c:832
+#: ../composer/e-msg-composer-select-file.c:239
+msgid "Insert Attachment"
+msgstr "插入附件"
+
+#: ../composer/e-msg-composer.c:830
msgid ""
"Cannot sign outgoing message: No signing certificate set for this account"
msgstr "无法对寄出的信件签名:未对此账户设置签名证书"
-#: ../composer/e-msg-composer.c:839
+#: ../composer/e-msg-composer.c:837
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
msgstr "无法对寄出的信件加密:未对此账户设置加密证书"
-#: ../composer/e-msg-composer.c:1322 ../composer/e-msg-composer.c:1356
+#: ../composer/e-msg-composer.c:1320 ../composer/e-msg-composer.c:1354
#: ../plugins/mail-remote/e-corba-utils.c:135
msgid "Unknown reason"
msgstr "未知原因"
-#: ../composer/e-msg-composer.c:1394
+#: ../composer/e-msg-composer.c:1392
msgid "Could not open file"
msgstr "无法打开文件"
-#: ../composer/e-msg-composer.c:1402
+#: ../composer/e-msg-composer.c:1400
msgid "Unable to retrieve message from editor"
msgstr "无法从编辑器获取信件"
-#: ../composer/e-msg-composer.c:1677
+#: ../composer/e-msg-composer.c:1678
msgid "Untitled Message"
msgstr "无标题信件"
#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1712
+#: ../composer/e-msg-composer.c:1713
msgid "Open File"
msgstr "打开文件"
-#: ../composer/e-msg-composer.c:2126 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
+#: ../composer/e-msg-composer.c:2140 ../mail/em-account-editor.c:596
+#: ../mail/em-account-editor.c:641 ../mail/em-account-editor.c:708
msgid "Autogenerated"
msgstr "自动生成的"
-#: ../composer/e-msg-composer.c:2229
+#: ../composer/e-msg-composer.c:2243
msgid "Si_gnature:"
msgstr "签名(_G):"
-#: ../composer/e-msg-composer.c:2472 ../composer/e-msg-composer.c:3673
-#: ../composer/e-msg-composer.c:3676
+#: ../composer/e-msg-composer.c:2497 ../composer/e-msg-composer.c:3701
+#: ../composer/e-msg-composer.c:3704
msgid "Compose a message"
msgstr "撰写新件"
-#: ../composer/e-msg-composer.c:3791
+#: ../composer/e-msg-composer.c:3819
msgid "_Attachment Bar"
msgstr "附件栏(_A)"
-#: ../composer/e-msg-composer.c:4883
+#: ../composer/e-msg-composer.c:4911
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -10207,7 +10155,7 @@ msgstr "保存信件(_S)"
#: ../data/evolution.desktop.in.in.h:1
#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:509
+#: ../shell/main.c:514
msgid "Evolution"
msgstr "Evolution"
@@ -10351,7 +10299,7 @@ msgid "Evolution Query"
msgstr "Evolution 查询"
#. setup a dummy error
-#: ../e-util/e-error.c:438
+#: ../e-util/e-error.c:442
#, c-format
msgid ""
"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -10377,105 +10325,7 @@ msgstr "文件已存在“{0}”。"
msgid "_Overwrite"
msgstr "覆盖(_O)"
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%Y-%m-%d %A %p%I:%M"
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%Y-%m-%d %A %H:%M"
-
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:195
-msgid "%a %m/%d/%Y %I %p"
-msgstr "%Y-%m-%d %A %p%I点"
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:200
-msgid "%a %m/%d/%Y %H"
-msgstr "%Y-%m-%d %A %H点"
-
-#. strptime format of a date and a time, in 12-hour format.
-#: ../e-util/e-time-utils.c:211
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%Y-%m-%d %p%I:%M:%S"
-
-#. strptime format of a date and a time, in 24-hour format.
-#: ../e-util/e-time-utils.c:215
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%Y-%m-%d %H:%M:%S"
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:220
-msgid "%m/%d/%Y %I:%M %p"
-msgstr "%Y-%m-%d %p%I:%M"
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:225
-msgid "%m/%d/%Y %H:%M"
-msgstr "%Y-%m-%d %H:%M"
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:230
-msgid "%m/%d/%Y %I %p"
-msgstr "%Y-%m-%d %p%I点"
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:235
-msgid "%m/%d/%Y %H"
-msgstr "%Y-%m-%d %H点"
-
-#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
-#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
-msgid "%I:%M:%S %p"
-msgstr "%p%I:%M:%S"
-
-#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
-#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strptime format for time of day, without seconds,
-#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1447 ../widgets/misc/e-dateedit.c:1774
-msgid "%I:%M %p"
-msgstr "%p%I:%M"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1444 ../widgets/misc/e-dateedit.c:1771
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../e-util/e-time-utils.c:356
-msgid "%I %p"
-msgstr "%p%I点"
-
-#: ../e-util/eggtrayicon.c:119
+#: ../e-util/eggtrayicon.c:121
msgid "The orientation of the tray."
msgstr "托盘方向。"
@@ -10538,25 +10388,25 @@ msgstr "%Y-%m-%d"
msgid "Select a time to compare against"
msgstr "选择用于比较的时间"
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:289
msgid "Choose a file"
msgstr "选择文件"
#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
+#: ../mail/em-migrate.c:1051 ../mail/mail-config.c:84
#: ../mail/mail-config.glade.h:91
msgid "Important"
msgstr "重要"
#. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
-#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1054
+#: ../mail/mail-config.c:87 ../mail/mail-config.glade.h:146
msgid "To Do"
msgstr "待办"
#. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
-#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.c:88 ../mail/mail-config.glade.h:95
msgid "Later"
msgstr "稍候"
@@ -10565,24 +10415,24 @@ msgid "Test"
msgstr "测试"
#: ../filter/filter-rule.c:791
-msgid "_Rule name:"
-msgstr "规则名(_R):"
+msgid "_Search name:"
+msgstr "搜索名称(_B):"
#: ../filter/filter-rule.c:819
-msgid "If"
-msgstr "若"
+msgid "Find items that meet the following criteria"
+msgstr "查找符合下列条件的项目"
#: ../filter/filter-rule.c:858
-msgid "if all criteria are met"
+msgid "If all criteria are met"
msgstr "如果满足所有条件"
#: ../filter/filter-rule.c:858
-msgid "if any criteria are met"
+msgid "If any criteria are met"
msgstr "如果满足任一条件"
#: ../filter/filter-rule.c:860
-msgid "Execute actions"
-msgstr "执行动作"
+msgid "Find items:"
+msgstr "查找项目:"
#: ../filter/filter-rule.c:881
msgid "All related"
@@ -10601,11 +10451,11 @@ msgid "Include threads"
msgstr "包含线索"
#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:330
+#: ../mail/em-utils.c:348
msgid "Incoming"
msgstr "接收"
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:331
+#: ../filter/filter-rule.c:978 ../mail/em-utils.c:349
msgid "Outgoing"
msgstr "寄出"
@@ -10707,15 +10557,15 @@ msgstr "您指定的时间"
msgid "years"
msgstr "年"
-#: ../filter/rule-editor.c:290
+#: ../filter/rule-editor.c:292
msgid "Add Rule"
msgstr "添加规则"
-#: ../filter/rule-editor.c:366
+#: ../filter/rule-editor.c:368
msgid "Edit Rule"
msgstr "编辑规则"
-#: ../filter/rule-editor.c:698
+#: ../filter/rule-editor.c:735
msgid "Rule name"
msgstr "规则名"
@@ -10760,11 +10610,11 @@ msgstr "Evolution 邮件撰写控件"
msgid "Evolution Mail preferences control"
msgstr "Evolution 邮件首选项控件"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:495
-#: ../mail/importers/elm-importer.c:342
-#: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:388 ../mail/mail-component.c:561
-#: ../mail/mail-component.c:648
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
+#: ../mail/importers/elm-importer.c:341
+#: ../mail/importers/netscape-importer.c:1903
+#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:577
+#: ../mail/mail-component.c:578 ../mail/mail-component.c:663
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
msgid "Mail"
msgstr "邮件"
@@ -10782,12 +10632,12 @@ msgstr "邮件首选项"
msgid "_Mail"
msgstr "邮件(_M)"
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:395
#, c-format
msgid "%s License Agreement"
msgstr "%s 许可协议"
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:402
#, c-format
msgid ""
"\n"
@@ -10799,77 +10649,94 @@ msgstr ""
"请仔细阅读下方显示的 %s 许可协议\n"
"并选中复选框表明您接受该协议\n"
-#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:495
+#: ../mail/em-account-editor.c:472 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:496
msgid "Select Folder"
msgstr "选择文件夹"
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:768
msgid "Ask for each message"
msgstr "每封信都询问"
-#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1747 ../mail/mail-config.glade.h:90
msgid "Identity"
msgstr "标识"
-#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1796 ../mail/mail-config.glade.h:117
msgid "Receiving Email"
msgstr "接收电子邮件"
-#: ../mail/em-account-editor.c:1943
+#: ../mail/em-account-editor.c:1979
msgid "Automatically check for _new mail every"
msgstr "自动检查新邮件的间隔(_N)"
-#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:129
msgid "Sending Email"
msgstr "发送电子邮件"
-#: ../mail/em-account-editor.c:2165 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2219 ../mail/mail-config.glade.h:68
msgid "Defaults"
msgstr "默认"
#. Security settings
-#: ../mail/em-account-editor.c:2226 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:313
+#: ../mail/em-account-editor.c:2285 ../mail/mail-config.glade.h:122
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
msgid "Security"
msgstr "安全"
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2263 ../mail/em-account-editor.c:2337
+#: ../mail/em-account-editor.c:2322 ../mail/em-account-editor.c:2412
msgid "Receiving Options"
msgstr "接收选项"
-#: ../mail/em-account-editor.c:2264 ../mail/em-account-editor.c:2338
+#: ../mail/em-account-editor.c:2323 ../mail/em-account-editor.c:2413
msgid "Checking for New Mail"
msgstr "检查新邮件"
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2737 ../mail/mail-config.glade.h:34
msgid "Account Editor"
msgstr "账户编辑器"
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2737 ../mail/mail-config.glade.h:80
msgid "Evolution Account Assistant"
msgstr "Evolution 账户助手"
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:407
+msgid "Disable"
+msgstr "禁用"
+
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:409
+msgid "Enable"
+msgstr "启用"
+
#. translators: default account indicator
-#: ../mail/em-account-prefs.c:455
+#: ../mail/em-account-prefs.c:456
msgid "[Default]"
msgstr "[默认]"
-#: ../mail/em-account-prefs.c:510
+#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
+#: ../mail/em-account-prefs.c:505 ../mail/em-composer-prefs.c:930
+#: ../plugins/plugin-manager/plugin-manager.c:213
+#: ../plugins/publish-calendar/publish-calendar.c:451
+msgid "Enabled"
+msgstr "已启用"
+
+#: ../mail/em-account-prefs.c:511
msgid "Account name"
msgstr "账户名"
-#: ../mail/em-account-prefs.c:512
+#: ../mail/em-account-prefs.c:513
msgid "Protocol"
msgstr "协议"
-#: ../mail/em-account-prefs.c:517
+#: ../mail/em-account-prefs.c:518
msgid "Mail Accounts Table"
msgstr "邮件账户表"
#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:958
+#: ../mail/mail-config.c:966
msgid "Unnamed"
msgstr "未命名"
@@ -10904,7 +10771,7 @@ msgstr ""
"在 ${Year}-${Month}-${Day}${AbbrevWeekdayName}的 ${24Hour}:${Minute} "
"${TimeZone},${Sender}写道:"
-#: ../mail/em-filter-editor.c:147
+#: ../mail/em-filter-editor.c:155
msgid "_Filter Rules"
msgstr "过滤规则(_F)"
@@ -10921,7 +10788,7 @@ msgstr "指派颜色"
msgid "Assign Score"
msgstr "指派计分"
-#: ../mail/em-filter-i18n.h:5 ../ui/evolution-editor.xml.h:1
+#: ../mail/em-filter-i18n.h:5
msgid "Attachments"
msgstr "附件"
@@ -11034,7 +10901,7 @@ msgid "is not Flagged"
msgstr "未标志"
#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
-#: ../ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "垃圾"
@@ -11042,7 +10909,7 @@ msgstr "垃圾"
msgid "Junk Test"
msgstr "垃圾测试"
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1064
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1105
#: ../widgets/misc/e-expander.c:189
msgid "Label"
msgstr "标签"
@@ -11083,7 +10950,7 @@ msgstr "管道到程序"
msgid "Play Sound"
msgstr "播放声音"
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
msgid "Read"
msgstr "已读"
@@ -11151,10 +11018,10 @@ msgstr "开始于"
msgid "Stop Processing"
msgstr "停止处理"
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1582
#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
-#: ../mail/message-tag-followup.c:330
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
+#: ../mail/message-tag-followup.c:336
#: ../plugins/groupwise-features/properties.glade.h:7
#: ../smime/lib/e-cert.c:1131
msgid "Subject"
@@ -11169,7 +11036,7 @@ msgstr "取消状态"
msgid "<b>Then</b>"
msgstr "<b>则</b>"
-#: ../mail/em-folder-browser.c:134
+#: ../mail/em-folder-browser.c:143
msgid "C_reate Search Folder From Search..."
msgstr "从头创建搜索文件夹(_R)..."
@@ -11201,34 +11068,34 @@ msgstr "创建"
msgid "Folder _name:"
msgstr "文件夹名称(_N):"
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-folder-tree-model.c:204
+#: ../mail/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
msgid "Search Folders"
msgstr "搜索文件夹"
#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:208 ../mail/em-folder-tree-model.c:210
msgid "UNMATCHED"
msgstr "不匹配"
-#: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:483 ../mail/mail-component.c:150
msgid "Drafts"
msgstr "草稿"
#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:486 ../mail/mail-component.c:149
msgid "Inbox"
msgstr "收件箱"
-#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
+#: ../mail/em-folder-tree-model.c:489 ../mail/mail-component.c:151
msgid "Outbox"
msgstr "发件箱"
-#: ../mail/em-folder-tree-model.c:477 ../mail/mail-component.c:146
+#: ../mail/em-folder-tree-model.c:491 ../mail/mail-component.c:152
msgid "Sent"
msgstr "已发箱"
-#: ../mail/em-folder-tree-model.c:499 ../mail/em-folder-tree-model.c:803
+#: ../mail/em-folder-tree-model.c:513 ../mail/em-folder-tree-model.c:817
msgid "Loading..."
msgstr "正在装入..."
@@ -11246,12 +11113,12 @@ msgstr "移动文件夹“%s”"
msgid "Copying folder %s"
msgstr "复制文件夹 %s"
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1621
#, c-format
msgid "Moving messages into folder %s"
msgstr "把信件移动到文件夹 %s"
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1625
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1623
#, c-format
msgid "Copying messages into folder %s"
msgstr "把信件复制到文件夹 %s"
@@ -11264,11 +11131,11 @@ msgstr "无法将信件放到顶级文件夹存储"
msgid "_Copy to Folder"
msgstr "复制到文件夹(_C)"
-#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
msgid "_Move to Folder"
msgstr "移动到文件夹(_M)"
-#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1058
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "在“%s”中扫描文件夹"
@@ -11276,7 +11143,7 @@ msgstr "在“%s”中扫描文件夹"
#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
#: ../ui/evolution.xml.h:49
msgid "_View"
msgstr "查看(_V)"
@@ -11311,13 +11178,13 @@ msgstr "清空回收站(_E)"
msgid "Copying `%s' to `%s'"
msgstr "把“%s”复制到 %s"
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:932
-#: ../mail/em-folder-view.c:947 ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
msgid "Select folder"
msgstr "选择文件夹"
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:947
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
msgid "C_opy"
msgstr "复制(_O)"
@@ -11352,204 +11219,205 @@ msgstr "创建文件夹"
msgid "Specify where to create the folder:"
msgstr "指定在哪里创建文件夹:"
-#: ../mail/em-folder-view.c:1040 ../mail/em-popup.c:558 ../mail/em-popup.c:569
-msgid "Reply to _All"
-msgstr "回复所有人(_A)"
-
-#: ../mail/em-folder-view.c:1041 ../ui/evolution-mail-message.xml.h:126
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
-#: ../mail/em-folder-view.c:1042 ../mail/em-popup.c:560 ../mail/em-popup.c:571
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:1082 ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../ui/evolution-mail-message.xml.h:83
+msgid "Reply to _All"
+msgstr "回复所有人(_A)"
+
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:560 ../mail/em-popup.c:571
+#: ../ui/evolution-mail-message.xml.h:111
msgid "_Forward"
msgstr "转发(_F)"
-#: ../mail/em-folder-view.c:1045 ../ui/evolution-mail-message.xml.h:108
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:108
msgid "_Edit as New Message..."
msgstr "作为新信件进行编辑(_E)..."
-#: ../mail/em-folder-view.c:1051
+#: ../mail/em-folder-view.c:1092
msgid "U_ndelete"
msgstr "取消删除(_N)"
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:37
+#: ../mail/em-folder-view.c:1093 ../ui/evolution-addressbook.xml.h:37
msgid "_Move to Folder..."
msgstr "移动到文件夹(_M)..."
-#: ../mail/em-folder-view.c:1053 ../ui/evolution-addressbook.xml.h:33
+#: ../mail/em-folder-view.c:1094 ../ui/evolution-addressbook.xml.h:33
msgid "_Copy to Folder..."
msgstr "复制到文件夹(_C)..."
-#: ../mail/em-folder-view.c:1056
+#: ../mail/em-folder-view.c:1097
msgid "Mar_k as Read"
msgstr "标记为已读(_K)"
-#: ../mail/em-folder-view.c:1057
+#: ../mail/em-folder-view.c:1098
msgid "Mark as _Unread"
msgstr "标记为未读(_U)"
-#: ../mail/em-folder-view.c:1058
+#: ../mail/em-folder-view.c:1099
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
-#: ../mail/em-folder-view.c:1059
+#: ../mail/em-folder-view.c:1100
msgid "_Mark as Unimportant"
msgstr "标记为不重要(_M)"
-#: ../mail/em-folder-view.c:1060
+#: ../mail/em-folder-view.c:1101
msgid "Mark as _Junk"
msgstr "标记为垃圾(_J)"
-#: ../mail/em-folder-view.c:1061
+#: ../mail/em-folder-view.c:1102
msgid "Mark as _Not Junk"
msgstr "标记为非垃圾(_N)"
-#: ../mail/em-folder-view.c:1062
+#: ../mail/em-folder-view.c:1103
msgid "Mark for Follo_w Up..."
msgstr "标记为跟随(_W)..."
-#: ../mail/em-folder-view.c:1070
+#: ../mail/em-folder-view.c:1111
msgid "Fla_g Completed"
msgstr "已完成标志(_G)"
-#: ../mail/em-folder-view.c:1071
+#: ../mail/em-folder-view.c:1112
msgid "Cl_ear Flag"
msgstr "清除标志(_E)"
-#: ../mail/em-folder-view.c:1074
+#: ../mail/em-folder-view.c:1115
msgid "Crea_te Rule From Message"
msgstr "根据信件创建规则(_T)"
-#: ../mail/em-folder-view.c:1075
+#: ../mail/em-folder-view.c:1116
msgid "Search Folder from _Subject"
msgstr "基于主题的搜索文件夹(_S)"
-#: ../mail/em-folder-view.c:1076
+#: ../mail/em-folder-view.c:1117
msgid "Search Folder from Se_nder"
msgstr "基于发件人的搜索文件夹(_N)"
-#: ../mail/em-folder-view.c:1077
+#: ../mail/em-folder-view.c:1118
msgid "Search Folder from _Recipients"
msgstr "基于收件人的搜索文件夹(_R)"
-#: ../mail/em-folder-view.c:1078
+#: ../mail/em-folder-view.c:1119
msgid "Search Folder from Mailing _List"
msgstr "基于邮件列表的搜索文件夹(_L)"
-#: ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-view.c:1123
msgid "Filter on Sub_ject"
msgstr "基于主题过滤(_J)"
-#: ../mail/em-folder-view.c:1083
+#: ../mail/em-folder-view.c:1124
msgid "Filter on Sen_der"
msgstr "基于发件人过滤(_D)"
-#: ../mail/em-folder-view.c:1084
+#: ../mail/em-folder-view.c:1125
msgid "Filter on Re_cipients"
msgstr "基于收件人过滤(_C)"
-#: ../mail/em-folder-view.c:1085
+#: ../mail/em-folder-view.c:1126
msgid "Filter on _Mailing List"
msgstr "基于邮件列表过滤(_M)"
#. default charset used in mail view
-#: ../mail/em-folder-view.c:1923 ../mail/em-folder-view.c:1967
+#: ../mail/em-folder-view.c:1974 ../mail/em-folder-view.c:2018
msgid "Default"
msgstr "默认"
-#: ../mail/em-folder-view.c:2066
+#: ../mail/em-folder-view.c:2117
#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
#: ../plugins/print-message/print-message.c:87
msgid "Print Message"
msgstr "打印信件"
-#: ../mail/em-folder-view.c:2222
+#: ../mail/em-folder-view.c:2273
msgid "Unable to retrieve message"
msgstr "无法获取信件"
-#: ../mail/em-folder-view.c:2415
+#: ../mail/em-folder-view.c:2466
msgid "_Copy Link Location"
msgstr "复制链接位置(_C)"
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2468
msgid "Create _Search Folder"
msgstr "创建搜索文件夹(_S)"
-#: ../mail/em-folder-view.c:2418
+#: ../mail/em-folder-view.c:2469
msgid "_From this Address"
msgstr "自此地址(_F)"
-#: ../mail/em-folder-view.c:2419
+#: ../mail/em-folder-view.c:2470
msgid "_To this Address"
msgstr "到此地址(_T)"
-#: ../mail/em-folder-view.c:2723
+#: ../mail/em-folder-view.c:2821
#, c-format
msgid "Click to mail %s"
msgstr "单击以给 %s 发送邮件"
#. message-search popup match count string
-#: ../mail/em-format-html-display.c:461
+#: ../mail/em-format-html-display.c:472
#, c-format
msgid "Matches: %d"
msgstr "匹配:%d"
-#: ../mail/em-format-html-display.c:712 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:729 ../mail/em-format-html.c:607
msgid "Unsigned"
msgstr "未签名"
-#: ../mail/em-format-html-display.c:712
+#: ../mail/em-format-html-display.c:729
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
msgstr "此信件未签名。无法保证这封信是可信的。"
-#: ../mail/em-format-html-display.c:713 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:730 ../mail/em-format-html.c:608
msgid "Valid signature"
msgstr "有效签名"
-#: ../mail/em-format-html-display.c:713
+#: ../mail/em-format-html-display.c:730
msgid ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
msgstr "此信件已签名,而且签名是有效的。这意味着这封信应该是可信的。"
-#: ../mail/em-format-html-display.c:714 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:731 ../mail/em-format-html.c:609
msgid "Invalid signature"
msgstr "无效签名"
-#: ../mail/em-format-html-display.c:714
+#: ../mail/em-format-html-display.c:731
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
msgstr "无法校验这封信的签名,可能在传送的过程中邮件被篡改了。"
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:732
msgid "Valid signature, cannot verify sender"
msgstr "签名有效,无法校验发送者"
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:732
msgid ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
msgstr "这封信的签名有效,但是无法校验邮件的发送者。"
-#: ../mail/em-format-html-display.c:721 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:738 ../mail/em-format-html.c:616
msgid "Unencrypted"
msgstr "未加密"
-#: ../mail/em-format-html-display.c:721
+#: ../mail/em-format-html-display.c:738
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
-#: ../mail/em-format-html-display.c:722 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:739 ../mail/em-format-html.c:617
msgid "Encrypted, weak"
msgstr "弱加密"
-#: ../mail/em-format-html-display.c:722
+#: ../mail/em-format-html-display.c:739
msgid ""
"This message is encrypted, but with a weak encryption algorithm. It would "
"be difficult, but not impossible for an outsider to view the content of this "
@@ -11558,21 +11426,21 @@ msgstr ""
"这封信已加密,但使用的是弱加密算法。如果外人想要查看这封信的内容,可能要花大"
"量时间进行暴力破解,这很困难但并不是不可能。"
-#: ../mail/em-format-html-display.c:723 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:740 ../mail/em-format-html.c:618
msgid "Encrypted"
msgstr "加密"
-#: ../mail/em-format-html-display.c:723
+#: ../mail/em-format-html-display.c:740
msgid ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
msgstr "这封信已加密。外人要想查看这封信的内容十分困难。"
-#: ../mail/em-format-html-display.c:724 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:741 ../mail/em-format-html.c:619
msgid "Encrypted, strong"
msgstr "强加密"
-#: ../mail/em-format-html-display.c:724
+#: ../mail/em-format-html-display.c:741
msgid ""
"This message is encrypted, with a strong encryption algorithm. It would be "
"very difficult for an outsider to view the content of this message in a "
@@ -11581,66 +11449,70 @@ msgstr ""
"这封信已加密,且使用的是强加密算法。如果外人想要查看这封信的内容,可能要花大"
"量时间进行暴力破解,这十分困难。"
-#: ../mail/em-format-html-display.c:825 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:842 ../smime/gui/smime-ui.glade.h:48
msgid "_View Certificate"
msgstr "查看证书(_V)"
-#: ../mail/em-format-html-display.c:840
+#: ../mail/em-format-html-display.c:857
msgid "This certificate is not viewable"
msgstr "此证书不可查看"
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1145
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "%Y年%m月%d日%A,%H:%M完成"
-#: ../mail/em-format-html-display.c:1130
+#: ../mail/em-format-html-display.c:1153
msgid "Overdue:"
msgstr "延期:"
-#: ../mail/em-format-html-display.c:1133
+#: ../mail/em-format-html-display.c:1156
msgid "by %B %d, %Y, %l:%M %p"
msgstr "到 %m月%d日%A,%H:%M"
-#: ../mail/em-format-html-display.c:1193
+#: ../mail/em-format-html-display.c:1216
msgid "_View Inline"
msgstr "嵌入视图(_V)"
-#: ../mail/em-format-html-display.c:1194
+#: ../mail/em-format-html-display.c:1217
msgid "_Hide"
msgstr "隐藏(_H)"
-#: ../mail/em-format-html-display.c:1195
+#: ../mail/em-format-html-display.c:1218
msgid "_Fit to Width"
msgstr "适合宽度(_F)"
-#: ../mail/em-format-html-display.c:1196
+#: ../mail/em-format-html-display.c:1219
msgid "Show _Original Size"
msgstr "显示原始大小(_O)"
-#: ../mail/em-format-html-display.c:1566
+#: ../mail/em-format-html-display.c:1596
msgid "Attachment Button"
msgstr "附件按钮"
-#: ../mail/em-format-html-display.c:1773
+#: ../mail/em-format-html-display.c:1803
msgid "Select folder to save all attachments..."
msgstr "选择保存全部附件的文件夹..."
-#: ../mail/em-format-html-display.c:1820
+#: ../mail/em-format-html-display.c:1850
msgid "Save Selected..."
msgstr "保存所选附件..."
#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1887
+#: ../mail/em-format-html-display.c:1917
#, c-format
msgid "%d attachment"
msgid_plural "%d attachments"
msgstr[0] "%d 个附件"
-#: ../mail/em-format-html-display.c:1951
+#: ../mail/em-format-html-display.c:1980
+msgid "Toggle Attachment Bar"
+msgstr "切换附件栏"
+
+#: ../mail/em-format-html-display.c:1982
msgid "No Attachment"
msgstr "无附件"
-#: ../mail/em-format-html-display.c:1954
+#: ../mail/em-format-html-display.c:1985
msgid "Save All"
msgstr "全部保存"
@@ -11649,99 +11521,99 @@ msgstr "全部保存"
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
-#: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
+#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
#, c-format
msgid "Retrieving `%s'"
msgstr "收取“%s”"
-#: ../mail/em-format-html.c:600
+#: ../mail/em-format-html.c:610
msgid "Valid signature but cannot verify sender"
msgstr "签名有效但是无法校验发送者"
-#: ../mail/em-format-html.c:870
+#: ../mail/em-format-html.c:880
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
-#: ../mail/em-format-html.c:900
+#: ../mail/em-format-html.c:910
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
-#: ../mail/em-format-html.c:911
+#: ../mail/em-format-html.c:921
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
-#: ../mail/em-format-html.c:913
+#: ../mail/em-format-html.c:923
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:944
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
-#: ../mail/em-format-html.c:945
+#: ../mail/em-format-html.c:955
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
-#: ../mail/em-format-html.c:1171
+#: ../mail/em-format-html.c:1181
msgid "Formatting message"
msgstr "格式化信件"
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
msgid "From"
msgstr "发件人"
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
msgid "Reply-To"
msgstr "回复至"
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
#: ../mail/message-list.etspec.h:14
msgid "To"
msgstr "收件人"
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
msgid "Cc"
msgstr "抄送"
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
msgid "Bcc"
msgstr "密件抄送"
#. pseudo-header
-#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:992
+#: ../mail/em-format-html.c:1586 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1000
msgid "Mailer"
msgstr "邮件程序"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1603
+#: ../mail/em-format-html.c:1613
msgid "<I> (%a, %R %Z)</I>"
msgstr "<I> (%A,%R %Z)</I>"
#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1606
+#: ../mail/em-format-html.c:1616
msgid "<I> (%R %Z)</I>"
msgstr "<I> (%R %Z)</I>"
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1626 ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
#: ../mail/message-list.etspec.h:2
msgid "Date"
msgstr "日期"
-#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1649 ../mail/em-format.c:851
+#: ../mail/em-mailer-prefs.c:92
msgid "Newsgroups"
msgstr "新闻组"
@@ -11774,23 +11646,23 @@ msgstr "校验签名错误"
msgid "Unknown error verifying signature"
msgstr "校验签名发生了未知错误"
-#: ../mail/em-mailer-prefs.c:101
+#: ../mail/em-mailer-prefs.c:103
msgid "Every time"
msgstr "每次"
-#: ../mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:104
msgid "Once per day"
msgstr "每天一次"
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:105
msgid "Once per week"
msgstr "每周一次"
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:106
msgid "Once per month"
msgstr "每月一次"
-#: ../mail/em-migrate.c:1198
+#: ../mail/em-migrate.c:1208
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
"since Evolution 1.x.\n"
@@ -11801,47 +11673,47 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../mail/em-migrate.c:1632
+#: ../mail/em-migrate.c:1647
#, c-format
msgid "Unable to create new folder `%s': %s"
msgstr "无法创建新文件夹“%s”:%s"
-#: ../mail/em-migrate.c:1658
+#: ../mail/em-migrate.c:1673
#, c-format
msgid "Unable to copy folder `%s' to `%s': %s"
msgstr "无法将文件夹“%s”复制为“%s”:%s"
-#: ../mail/em-migrate.c:1843
+#: ../mail/em-migrate.c:1858
#, c-format
msgid "Unable to scan for existing mailboxes at `%s': %s"
msgstr "无法扫描位于“%s”的已有邮箱:%s"
-#: ../mail/em-migrate.c:2047
+#: ../mail/em-migrate.c:2062
#, c-format
msgid "Unable to open old POP keep-on-server data `%s': %s"
msgstr "无法打开旧的 POP 保留在服务器上的数据“%s”:%s"
-#: ../mail/em-migrate.c:2061
+#: ../mail/em-migrate.c:2076
#, c-format
msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
msgstr "无法创建 POP3 保留在服务器上的数据目录“%s”:%s"
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:2105
#, c-format
msgid "Unable to copy POP3 keep-on-server data `%s': %s"
msgstr "无法复制 POP3 在服务器上保留的数据“%s”:%s"
-#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2576 ../mail/em-migrate.c:2588
#, c-format
msgid "Failed to create local mail storage `%s': %s"
msgstr "创建本地邮件存储“%s”失败:%s"
-#: ../mail/em-migrate.c:2693
+#: ../mail/em-migrate.c:2711
#, c-format
msgid "Unable to create local mail folders at `%s': %s"
msgstr "无法在“%s”创建本地邮件文件夹:%s"
-#: ../mail/em-migrate.c:2711
+#: ../mail/em-migrate.c:2730
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
@@ -11854,7 +11726,7 @@ msgid "_Reply to sender"
msgstr "回复发件人(_R)"
#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:84
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
@@ -11870,58 +11742,58 @@ msgstr "把新信发送到(_S)..."
msgid "_Add to Addressbook"
msgstr "添加到地址簿(_A)"
-#: ../mail/em-subscribe-editor.c:614
+#: ../mail/em-subscribe-editor.c:615
msgid "This store does not support subscriptions, or they are not enabled."
msgstr "此存储不支持订阅,或订阅未启用。"
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:644
msgid "Subscribed"
msgstr "已订阅"
-#: ../mail/em-subscribe-editor.c:647
+#: ../mail/em-subscribe-editor.c:648
msgid "Folder"
msgstr "文件夹"
#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:862
+#: ../mail/em-subscribe-editor.c:869
msgid "Please select a server."
msgstr "请选择服务器。"
-#: ../mail/em-subscribe-editor.c:883
+#: ../mail/em-subscribe-editor.c:890
msgid "No server has been selected"
msgstr "没有选中服务器"
-#: ../mail/em-utils.c:106
+#: ../mail/em-utils.c:123
msgid "Don't show this message again."
msgstr "不再显示此信息。"
-#: ../mail/em-utils.c:338
+#: ../mail/em-utils.c:356
msgid "Filters"
msgstr "过滤器"
-#: ../mail/em-utils.c:481 ../mail/em-utils.c:518
+#: ../mail/em-utils.c:499 ../mail/em-utils.c:536
msgid "message"
msgstr "信件"
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:671
msgid "Save Message..."
msgstr "保存信件..."
-#: ../mail/em-utils.c:702
+#: ../mail/em-utils.c:720
msgid "Add address"
msgstr "添加地址"
#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1181
+#: ../mail/em-utils.c:1204
#, c-format
msgid "Messages from %s"
msgstr "来自 %s 的信件"
-#: ../mail/em-vfolder-editor.c:104
+#: ../mail/em-vfolder-editor.c:112
msgid "Search _Folders"
msgstr "搜索文件夹(_F)"
-#: ../mail/em-vfolder-rule.c:575
+#: ../mail/em-vfolder-rule.c:576
msgid "Search Folder source"
msgstr "搜索文件夹来源"
@@ -11931,7 +11803,7 @@ msgstr "自动识别链接"
#: ../mail/evolution-mail.schemas.in.in.h:2
msgid "Automatic smiley recognition"
-msgstr "自动识别笑脸"
+msgstr "自动识别表情"
#: ../mail/evolution-mail.schemas.in.in.h:3
msgid "Check incoming mail being junk"
@@ -12207,7 +12079,7 @@ msgstr "识别文本中的链接并进行替换。"
#: ../mail/evolution-mail.schemas.in.in.h:65
msgid "Recognize smileys in text and replace them with images."
-msgstr "识别文本中的笑脸,并将其替换为图像。"
+msgstr "识别文本中的表情,并将其替换为图像。"
#: ../mail/evolution-mail.schemas.in.in.h:66
msgid "Run junk test on incoming mail"
@@ -12381,70 +12253,70 @@ msgid ""
"not contain In-Reply-To or References headers."
msgstr "是否在信件不包含 In-Reply-To 或 References 头时强制按主题编排线索。"
-#: ../mail/importers/elm-importer.c:193
+#: ../mail/importers/elm-importer.c:192
msgid "Importing Elm data"
msgstr "导入 Elm 数据"
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:381
msgid "Evolution Elm importer"
msgstr "Evolution Elm 导入器"
-#: ../mail/importers/elm-importer.c:383
+#: ../mail/importers/elm-importer.c:382
msgid "Import mail from Elm."
msgstr "从 Elm 导入邮件。"
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../mail/importers/evolution-outlook-importer.c:131
+#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-outlook-importer.c:136
msgid "Destination folder:"
msgstr "目的文件夹:"
-#: ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
msgid "Select folder to import into"
msgstr "选择要导入到哪个文件夹"
-#: ../mail/importers/evolution-mbox-importer.c:216
+#: ../mail/importers/evolution-mbox-importer.c:223
msgid "Berkeley Mailbox (mbox)"
msgstr "Berkeley 邮箱(mbox)"
-#: ../mail/importers/evolution-mbox-importer.c:217
+#: ../mail/importers/evolution-mbox-importer.c:224
msgid "Importer Berkeley Mailbox format folders"
msgstr "导入器 Berkeley 邮箱格式文件夹"
-#: ../mail/importers/evolution-outlook-importer.c:257
-#: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
+#: ../mail/importers/evolution-outlook-importer.c:262
+#: ../mail/importers/mail-importer.c:234 ../shell/e-shell-importer.c:518
#, c-format
msgid "Importing `%s'"
msgstr "导入“%s”"
-#: ../mail/importers/evolution-outlook-importer.c:259
-#: ../mail/importers/netscape-importer.c:1251
+#: ../mail/importers/evolution-outlook-importer.c:264
+#: ../mail/importers/netscape-importer.c:1252
msgid "Importing..."
msgstr "正在导入..."
-#: ../mail/importers/evolution-outlook-importer.c:261
-#: ../mail/importers/netscape-importer.c:1253
+#: ../mail/importers/evolution-outlook-importer.c:266
+#: ../mail/importers/netscape-importer.c:1254
#: ../plugins/startup-wizard/startup-wizard.c:236
-#: ../shell/e-shell-importer.c:523
+#: ../shell/e-shell-importer.c:525
msgid "Please wait"
msgstr "请稍候"
-#: ../mail/importers/evolution-outlook-importer.c:305
-#: ../mail/importers/mail-importer.c:144
+#: ../mail/importers/evolution-outlook-importer.c:310
+#: ../mail/importers/mail-importer.c:148
msgid "Importing mailbox"
msgstr "导入邮箱"
-#: ../mail/importers/mail-importer.c:373
+#: ../mail/importers/mail-importer.c:377
#, c-format
msgid "Scanning %s"
msgstr "扫描 %s"
-#: ../mail/importers/netscape-importer.c:73
+#: ../mail/importers/netscape-importer.c:74
#, c-format
msgid "Priority Filter \"%s\""
msgstr "优先级过滤器“%s”"
-#: ../mail/importers/netscape-importer.c:662
+#: ../mail/importers/netscape-importer.c:663
msgid ""
"Some of your Netscape email filters are based on\n"
"email priorities, which are not used in Evolution.\n"
@@ -12467,7 +12339,7 @@ msgstr ""
"的过滤器也会用评分来替代优先级。请仔细检查导入的优先级,以确\n"
"保过滤能够正常进行。"
-#: ../mail/importers/netscape-importer.c:686
+#: ../mail/importers/netscape-importer.c:687
msgid ""
"Some of your Netscape email filters use\n"
"the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -12478,7 +12350,7 @@ msgstr ""
"或“监视线索”特性,而 Evolution 并不支持该\n"
"特性。这些过滤器将被丢弃。"
-#: ../mail/importers/netscape-importer.c:703
+#: ../mail/importers/netscape-importer.c:704
msgid ""
"Some of your Netscape email filters test the\n"
"body of emails for (in)equality to a given string,\n"
@@ -12490,23 +12362,23 @@ msgstr ""
"给定字符串,而 Evolution 并不支持该特性。这些过滤器\n"
"将被修改为给定字符串是否包含于信体中。"
-#: ../mail/importers/netscape-importer.c:1250
+#: ../mail/importers/netscape-importer.c:1251
msgid "Evolution is importing your old Netscape data"
msgstr "Evolution 正在导入您原来的 Netscape 数据"
-#: ../mail/importers/netscape-importer.c:1707
+#: ../mail/importers/netscape-importer.c:1708
msgid "Importing Netscape data"
msgstr "导入 Netscape 数据"
-#: ../mail/importers/netscape-importer.c:1907
+#: ../mail/importers/netscape-importer.c:1908
msgid "Settings"
msgstr "设置"
-#: ../mail/importers/netscape-importer.c:1912
+#: ../mail/importers/netscape-importer.c:1913
msgid "Mail Filters"
msgstr "邮件过滤规则"
-#: ../mail/importers/netscape-importer.c:1933
+#: ../mail/importers/netscape-importer.c:1934
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
@@ -12514,109 +12386,109 @@ msgstr ""
"Evolution 找到了 Netscape 邮件文件。\n"
"您是否希望把它们导入 Evolution?"
-#: ../mail/importers/pine-importer.c:230
+#: ../mail/importers/pine-importer.c:229
msgid "Importing Pine data"
msgstr "导入 Pine 数据"
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:433
msgid "Evolution Pine importer"
msgstr "Evolution Pine 导入器"
-#: ../mail/importers/pine-importer.c:435
+#: ../mail/importers/pine-importer.c:434
msgid "Import mail from Pine."
msgstr "从 Pine 导入邮件。"
-#: ../mail/mail-autofilter.c:78
+#: ../mail/mail-autofilter.c:79
#, c-format
msgid "Mail to %s"
msgstr "邮寄给 %s"
-#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
#, c-format
msgid "Mail from %s"
msgstr "来自 %s 的邮件"
-#: ../mail/mail-autofilter.c:265
+#: ../mail/mail-autofilter.c:266
#, c-format
msgid "Subject is %s"
msgstr "主题是 %s"
-#: ../mail/mail-autofilter.c:300
+#: ../mail/mail-autofilter.c:301
#, c-format
msgid "%s mailing list"
msgstr "%s 邮件列表"
-#: ../mail/mail-autofilter.c:369
+#: ../mail/mail-autofilter.c:372
msgid "Add Filter Rule"
msgstr "添加过滤规则"
-#: ../mail/mail-component.c:509
+#: ../mail/mail-component.c:520
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d 封已删除"
-#: ../mail/mail-component.c:511
+#: ../mail/mail-component.c:522
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d 封垃圾"
-#: ../mail/mail-component.c:534
+#: ../mail/mail-component.c:545
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d 封草稿"
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:547
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d 已发"
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:549
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d 封未发"
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:553
#, c-format
msgid "%d total"
msgid_plural "%d total"
msgstr[0] "总共 %d 封"
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:555
#, c-format
msgid ", %d unread"
msgid_plural ", %d unread"
msgstr[0] ",%d 封未读"
-#: ../mail/mail-component.c:765
+#: ../mail/mail-component.c:778
msgid "New Mail Message"
msgstr "新建信件"
-#: ../mail/mail-component.c:766
+#: ../mail/mail-component.c:779
msgid "_Mail Message"
msgstr "信件(_M)"
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:780
msgid "Compose a new mail message"
msgstr "撰写一封新信"
-#: ../mail/mail-component.c:773
+#: ../mail/mail-component.c:786
msgid "New Mail Folder"
msgstr "新建邮件文件夹"
-#: ../mail/mail-component.c:774
+#: ../mail/mail-component.c:787
msgid "Mail _Folder"
msgstr "邮件文件夹(_F)"
-#: ../mail/mail-component.c:775
+#: ../mail/mail-component.c:788
msgid "Create a new mail folder"
msgstr "创建新邮件文件夹"
-#: ../mail/mail-component.c:919
+#: ../mail/mail-component.c:932
msgid "Failed upgrading Mail settings or folders."
msgstr "升级邮件设置或文件夹失败。"
@@ -12635,8 +12507,8 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
msgstr "<b>(在此版本的 Evolution 中不支持 SSL)</b>"
#: ../mail/mail-config.glade.h:5
-msgid "<b>S_ignatures</b>"
-msgstr "<b>签名(_I)</b>"
+msgid "<b>Sig_natures</b>"
+msgstr "<b>签名(_N)</b>"
#: ../mail/mail-config.glade.h:6
msgid "<b>_Languages</b>"
@@ -12650,10 +12522,6 @@ msgstr "<small>这将让过滤器更可靠,但稍慢</small>"
msgid "<span weight=\"bold\">Account Information</span>"
msgstr "<span weight=\"bold\">账户信息</span>"
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">警告</span>"
-
#: ../mail/mail-config.glade.h:10
msgid "<span weight=\"bold\">Authentication Type</span>"
msgstr "<span weight=\"bold\">认证类型</span>"
@@ -12686,11 +12554,6 @@ msgstr "<span weight=\"bold\">显示的邮件头(_H)</span>"
msgid "<span weight=\"bold\">Filter Options</span>"
msgstr "<span weight=\"bold\">过滤器选项</span>"
-#: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">常规</span>"
-
#: ../mail/mail-config.glade.h:19
msgid "<span weight=\"bold\">Labels and Colors</span>"
msgstr "<span weight=\"bold\">标签和颜色</span>"
@@ -12716,6 +12579,7 @@ msgid "<span weight=\"bold\">New Mail Notification</span>"
msgstr "<span weight=\"bold\">新邮件提醒</span>"
#: ../mail/mail-config.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
msgid "<span weight=\"bold\">Optional Information</span>"
msgstr "<span weight=\"bold\">可选信息</span>"
@@ -12796,8 +12660,8 @@ msgid "Attachment"
msgstr "附件"
#: ../mail/mail-config.glade.h:46
-msgid "Automatically _insert smiley images"
-msgstr "自动插入笑脸图像(_I)"
+msgid "Automatically insert _smiley images"
+msgstr "自动插入表情图像(_S)"
#: ../mail/mail-config.glade.h:47
msgid "Baltic (ISO-8859-13)"
@@ -12820,8 +12684,8 @@ msgid "Ch_eck for Supported Types "
msgstr "检查支持的类型(_E)"
#: ../mail/mail-config.glade.h:52
-msgid "Check _incoming mail for junk"
-msgstr "检查收到的邮件是否是垃圾邮件(_I)"
+msgid "Check in_coming mail for junk"
+msgstr "检查收到的邮件是否是垃圾邮件(_C)"
#: ../mail/mail-config.glade.h:53
msgid "Check spelling while I _type"
@@ -12911,21 +12775,21 @@ msgid "Encrypt out_going messages (by default)"
msgstr "加密寄出的信件(默认)(_G)"
#: ../mail/mail-config.glade.h:81
-msgid "Execute Command..."
-msgstr "执行命令..."
-
-#: ../mail/mail-config.glade.h:82
msgid "Fi_xed-width:"
msgstr "等宽(_X):"
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:82
msgid "Font Properties"
msgstr "字体属性"
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:83
msgid "Format messages in _HTML"
msgstr "用 HTML 格式化信件(_H)"
+#: ../mail/mail-config.glade.h:84
+msgid "Full Nam_e:"
+msgstr "全名(_E):"
+
#: ../mail/mail-config.glade.h:86
msgid "HTML Mail"
msgstr "HTML 邮件"
@@ -13066,64 +12930,68 @@ msgid "Select HTML variable width font for printing"
msgstr "选择用于打印的 HTML 变宽度字体"
#: ../mail/mail-config.glade.h:127
+msgid "Select sound file"
+msgstr "选择声音文件"
+
+#: ../mail/mail-config.glade.h:128
msgid "Send message receipts:"
msgstr "发送信件收条:"
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
msgid "Sending Mail"
msgstr "发送邮件"
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
msgid "Sent _Messages Folder:"
msgstr "已发送信件文件夹(_M):"
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
msgid "Ser_ver requires authentication"
msgstr "服务器需要认证(_V)"
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
msgid "Server _Type: "
msgstr "服务器类型(_T):"
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
msgid "Sig_ning certificate:"
msgstr "签名证书(_N):"
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
msgid "Signat_ure:"
msgstr "签名(_U):"
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
msgid "Signatures"
msgstr "签名"
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
msgid "Signatures Table"
msgstr "签名表"
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
msgid "Specify _filename:"
msgstr "指定文件名(_F):"
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
msgid "Spell Checking"
msgstr "拼写检查"
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
msgid "T_erminal Font:"
msgstr "终端字体(_E):"
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
msgid "T_ype: "
msgstr "类型(_Y):"
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
msgstr "在此列出的语言反映了您所安装的字典。"
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -13132,7 +13000,7 @@ msgstr ""
"此脚本的输出将用于您的签名。您指定的名称将只会\n"
"用于显示。"
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -13140,15 +13008,15 @@ msgstr ""
"输入您想要给此帐户起的名字。\n"
"如:“工作”或“私人”"
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
msgid "User_name:"
msgstr "用户名(_N):"
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
msgid "V_ariable-width:"
msgstr "变宽(_A):"
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -13158,30 +13026,26 @@ msgstr ""
"\n"
"单击“前进”开始。"
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
msgid "_Add Signature"
msgstr "添加签名(_A)"
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
msgid "_Always load images from the Internet"
msgstr "总是从 Internet 上装入图像(_A)"
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
msgid "_Do not notify me when new mail arrives"
msgstr "新邮件到达时不要提醒我(_D)"
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
msgid "_Don't sign meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
msgid "_Forward style:"
msgstr "转发方式(_F):"
-#: ../mail/mail-config.glade.h:160
-msgid "_Full Name:"
-msgstr "全名(_F):"
-
#: ../mail/mail-config.glade.h:161
msgid "_Load images in mail from contacts"
msgstr "装入联系人发来的邮件中的图像(_L)"
@@ -13251,7 +13115,7 @@ msgid "<span weight=\"bold\">Encryption</span>"
msgstr "<span weight=\"bold\">加密</span>"
#: ../mail/mail-dialogs.glade.h:5
-msgid "Case _Sensitive"
+msgid "Case _sensitive"
msgstr "区分大小写(_S)"
#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
@@ -13266,7 +13130,7 @@ msgstr "查找(_I):"
msgid "Find in Message"
msgstr "在信件中寻找"
-#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
#: ../mail/message-tags.glade.h:3
msgid "Flag to Follow Up"
msgstr "跟随的标志"
@@ -13340,26 +13204,26 @@ msgstr "以全部本地和活跃远程文件夹"
msgid "with all local folders"
msgstr "以所有本地文件夹"
-#: ../mail/mail-folder-cache.c:855
+#: ../mail/mail-folder-cache.c:860
#, c-format
msgid "Pinging %s"
msgstr "查验 %s"
-#: ../mail/mail-ops.c:102
+#: ../mail/mail-ops.c:103
msgid "Filtering Folder"
msgstr "过滤文件夹"
-#: ../mail/mail-ops.c:263
+#: ../mail/mail-ops.c:264
msgid "Fetching Mail"
msgstr "收取邮件"
#. sending mail, filtering failed
-#: ../mail/mail-ops.c:563
+#: ../mail/mail-ops.c:564
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "应用寄出过滤器失败:%s"
-#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
+#: ../mail/mail-ops.c:576 ../mail/mail-ops.c:605
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -13368,112 +13232,112 @@ msgstr ""
"追加到 %s:%s 失败\n"
"转而追加到本地“已发”文件夹。"
-#: ../mail/mail-ops.c:621
+#: ../mail/mail-ops.c:622
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "追加到本地“已发”文件夹失败:%s"
-#: ../mail/mail-ops.c:733
+#: ../mail/mail-ops.c:734
#, c-format
msgid "Sending message %d of %d"
msgstr "发送第%d封信,共%d封"
-#: ../mail/mail-ops.c:758
+#: ../mail/mail-ops.c:759
#, c-format
msgid "Failed to send %d of %d messages"
msgstr "在第%d封信失败,共%d封"
-#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
+#: ../mail/mail-ops.c:761 ../mail/mail-send-recv.c:613
msgid "Cancelled."
msgstr "已取消。"
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:763
msgid "Complete."
msgstr "完成。"
-#: ../mail/mail-ops.c:859
+#: ../mail/mail-ops.c:860
msgid "Saving message to folder"
msgstr "把信件保存到文件夹中"
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:945
#, c-format
msgid "Moving messages to %s"
msgstr "把信件移动到 %s"
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:945
#, c-format
msgid "Copying messages to %s"
msgstr "把信件复制到 %s"
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1168
msgid "Forwarded messages"
msgstr "转发的信件"
-#: ../mail/mail-ops.c:1210
+#: ../mail/mail-ops.c:1211
#, c-format
msgid "Opening folder %s"
msgstr "打开文件夹 %s"
-#: ../mail/mail-ops.c:1282
+#: ../mail/mail-ops.c:1283
#, c-format
msgid "Opening store %s"
msgstr "打开存储 %s"
-#: ../mail/mail-ops.c:1360
+#: ../mail/mail-ops.c:1361
#, c-format
msgid "Removing folder %s"
msgstr "删除文件夹“%s”"
-#: ../mail/mail-ops.c:1454
+#: ../mail/mail-ops.c:1455
#, c-format
msgid "Storing folder '%s'"
msgstr "存储文件夹“%s”"
-#: ../mail/mail-ops.c:1519
+#: ../mail/mail-ops.c:1520
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "销毁并存储账户“%s”"
-#: ../mail/mail-ops.c:1520
+#: ../mail/mail-ops.c:1521
#, c-format
msgid "Storing account '%s'"
msgstr "存储账户“%s”"
-#: ../mail/mail-ops.c:1575
+#: ../mail/mail-ops.c:1576
msgid "Refreshing folder"
msgstr "刷新文件夹"
-#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1612 ../mail/mail-ops.c:1663
msgid "Expunging folder"
msgstr "销毁文件夹"
-#: ../mail/mail-ops.c:1659
+#: ../mail/mail-ops.c:1660
#, c-format
msgid "Emptying trash in '%s'"
msgstr "清空“%s”中的回收站"
-#: ../mail/mail-ops.c:1660
+#: ../mail/mail-ops.c:1661
msgid "Local Folders"
msgstr "本地文件夹"
-#: ../mail/mail-ops.c:1743
+#: ../mail/mail-ops.c:1744
#, c-format
msgid "Retrieving message %s"
msgstr "收取信件 %s"
-#: ../mail/mail-ops.c:1853
+#: ../mail/mail-ops.c:1854
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "收取 %d 封信"
-#: ../mail/mail-ops.c:1939
+#: ../mail/mail-ops.c:1940
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messsages"
msgstr[0] "保存 %d 封信"
-#: ../mail/mail-ops.c:1989
+#: ../mail/mail-ops.c:1990
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -13482,7 +13346,7 @@ msgstr ""
"无法创建输出文件:%s\n"
" %s"
-#: ../mail/mail-ops.c:2017
+#: ../mail/mail-ops.c:2018
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -13491,11 +13355,11 @@ msgstr ""
"在将信件保存到 %s 时发生错误:\n"
" %s"
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2089
msgid "Saving attachment"
msgstr "保存附件"
-#: ../mail/mail-ops.c:2100
+#: ../mail/mail-ops.c:2101
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -13504,22 +13368,22 @@ msgstr ""
"无法创建输出文件:%s:\n"
" %s"
-#: ../mail/mail-ops.c:2110
+#: ../mail/mail-ops.c:2111
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据:%s"
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2261
#, c-format
msgid "Disconnecting from %s"
msgstr "断开与 %s 的连接"
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2261
#, c-format
msgid "Reconnecting to %s"
msgstr "重新连接到 %s"
-#: ../mail/mail-ops.c:2376
+#: ../mail/mail-ops.c:2377
msgid "Checking Service"
msgstr "检查服务"
@@ -13562,53 +13426,53 @@ msgstr "正在等待..."
msgid "Checking for new mail"
msgstr "检查新邮件"
-#: ../mail/mail-session.c:207
-#: ../plugins/exchange-operations/exchange-config-listener.c:601
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:604
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:206
msgid "Enter Password"
msgstr "输入密码"
-#: ../mail/mail-session.c:244
+#: ../mail/mail-session.c:241
msgid "User canceled operation."
msgstr "用户己取消操作。"
-#: ../mail/mail-signature-editor.c:381
+#: ../mail/mail-signature-editor.c:384
msgid "Edit signature"
msgstr "编辑签名"
-#: ../mail/mail-signature-editor.c:423
+#: ../mail/mail-signature-editor.c:431
msgid "Enter a name for this signature."
msgstr "输入该签名的名字。"
-#: ../mail/mail-signature-editor.c:426
+#: ../mail/mail-signature-editor.c:434
#: ../plugins/groupwise-features/properties.glade.h:5
msgid "Name:"
msgstr "名称:"
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:120
#, c-format
msgid "Could not create spool directory `%s': %s"
msgstr "无法创建脱机目录“%s”:%s"
-#: ../mail/mail-tools.c:143
+#: ../mail/mail-tools.c:150
#, c-format
msgid "Trying to movemail a non-mbox source `%s'"
msgstr "试图将邮件移动到非 mbox 源“%s”"
-#: ../mail/mail-tools.c:249
+#: ../mail/mail-tools.c:256
#, c-format
msgid "Forwarded message - %s"
msgstr "转发的信件 - %s"
-#: ../mail/mail-tools.c:251
+#: ../mail/mail-tools.c:258
msgid "Forwarded message"
msgstr "转发的信件"
-#: ../mail/mail-tools.c:291
+#: ../mail/mail-tools.c:298
#, c-format
msgid "Invalid folder: `%s'"
msgstr "无效的文件夹:“%s”"
@@ -13628,11 +13492,11 @@ msgstr "更新“%s:%s”的搜索文件夹"
msgid "Updating Search Folders for '%s'"
msgstr "更新“%s”的搜索文件夹"
-#: ../mail/mail-vfolder.c:1046
+#: ../mail/mail-vfolder.c:1050
msgid "Edit Search Folder"
msgstr "编辑搜索文件夹"
-#: ../mail/mail-vfolder.c:1130
+#: ../mail/mail-vfolder.c:1134
msgid "New Search Folder"
msgstr "新建搜索文件夹"
@@ -13820,7 +13684,7 @@ msgid "Delete account?"
msgstr "删除账户吗?"
#: ../mail/mail.error.xml.h:44
-msgid "Discard changed?"
+msgid "Discard changes?"
msgstr "丢弃更改吗?"
#: ../mail/mail.error.xml.h:45
@@ -14162,74 +14026,74 @@ msgstr "销毁(_E)"
msgid "_Open Messages"
msgstr "打开信件(_O)"
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:1004
msgid "Unseen"
msgstr "未看"
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1005
msgid "Seen"
msgstr "已看"
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1006
msgid "Answered"
msgstr "已答复"
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1007
msgid "Multiple Unseen Messages"
msgstr "多封未看信件"
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1008
msgid "Multiple Messages"
msgstr "多封信"
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1012
msgid "Lowest"
msgstr "最低"
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1013
msgid "Lower"
msgstr "较低"
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1017
msgid "Higher"
msgstr "较高"
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1018
msgid "Highest"
msgstr "最高"
-#: ../mail/message-list.c:1348 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1346 ../widgets/table/e-cell-date.c:57
msgid "?"
msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:197
+#: ../mail/message-list.c:1353 ../plugins/itip-formatter/itip-view.c:197
#: ../widgets/table/e-cell-date.c:72
msgid "Today %l:%M %p"
msgstr "今天 %H:%M"
-#: ../mail/message-list.c:1364 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1362 ../widgets/table/e-cell-date.c:82
msgid "Yesterday %l:%M %p"
msgstr "昨天 %H:%M"
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:94
msgid "%a %l:%M %p"
msgstr "%A %H:%M"
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1382 ../widgets/table/e-cell-date.c:102
msgid "%b %d %l:%M %p"
msgstr "%m月%d日 %H:%M"
-#: ../mail/message-list.c:1386 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:104
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
-#: ../mail/message-list.c:2052
+#: ../mail/message-list.c:2055
msgid "Message List"
msgstr "信件列表"
-#: ../mail/message-list.c:3397
+#: ../mail/message-list.c:3400
msgid "Generating message list"
msgstr "生成信件列表"
@@ -14258,43 +14122,42 @@ msgid "Received"
msgstr "已接收"
#: ../mail/message-list.etspec.h:11
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
msgid "Size"
msgstr "大小"
-#: ../mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:75
msgid "Call"
msgstr "呼叫"
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:76
msgid "Do Not Forward"
msgstr "不要转发"
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:77
msgid "Follow-Up"
msgstr "跟随"
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:78
msgid "For Your Information"
msgstr "给您的信息"
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:43
+#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
msgid "Forward"
msgstr "转发"
-#: ../mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:80
msgid "No Response Necessary"
msgstr "不必回复"
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:81
msgid "Reply"
msgstr "回复"
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:84
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:82
msgid "Reply to All"
msgstr "全部回复"
-#: ../mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:84
msgid "Review"
msgstr "回顾"
@@ -14322,14 +14185,6 @@ msgstr "主题含有"
msgid "Subject or Sender contains"
msgstr "主题或发送者含有"
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "本地地址簿"
-
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionallity for local address books."
-msgstr "提供本地地址簿的核心功能。"
-
#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
msgid ""
"A formatter plugin which displays audio attachments inline and allows you to "
@@ -14549,16 +14404,6 @@ msgstr "您是否想要将 Evolution 设置为您的默认电子邮件客户端
msgid "Mark as default folder"
msgstr "标为默认文件夹"
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
-msgid "Default Sources"
-msgstr "默认源"
-
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid ""
-"Provides functionallity for marking a calendar or addressbook as the default "
-"one."
-msgstr "提供了将日历或地址簿标为默认日历或地址簿的功能。"
-
#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
msgid "Open Other User's Folder"
msgstr "打开其他用户的文件夹"
@@ -14597,11 +14442,11 @@ msgid ""
"password authentication."
msgstr "此选项将使用标准的纯文本密码身份验证连接到 Exchange 服务器。"
-#: ../plugins/exchange-operations/exchange-account-setup.c:253
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
msgid "Out Of Office"
msgstr "办公室以外"
-#: ../plugins/exchange-operations/exchange-account-setup.c:260
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
msgid ""
"The message specified below will be automatically sent to \n"
"each person who sends mail to you while you are out of the office."
@@ -14609,67 +14454,66 @@ msgstr ""
"在您位于办公室外时,如果有人给您发送邮件,则会自动将下面指定的信件\n"
"送回。"
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
msgid "I am out of the office"
msgstr "我正在办公室外"
-#: ../plugins/exchange-operations/exchange-account-setup.c:273
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
msgid "I am in the office"
msgstr "我正在办公室内"
#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:324
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
msgid "Change the password for Exchange account"
msgstr "更改 Exchange 账户的密码"
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
msgid "Change Password"
msgstr "更改密码"
#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:331
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
msgid "Manage the delegate settings for Exchange account"
msgstr "管理 Exchange 账户的代理设置"
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
msgid "Delegation Assitant"
msgstr "代理助手"
#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
msgid "Miscelleneous"
msgstr "杂项"
#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:355
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
msgid "View the size of all Exchange folders"
msgstr "查看所有 Exchange 文件夹的大小"
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
msgid "Folders Size"
msgstr "文件夹大小"
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
msgid "Exchange Settings"
msgstr "Exchange 设置"
-#: ../plugins/exchange-operations/exchange-account-setup.c:611
+#: ../plugins/exchange-operations/exchange-account-setup.c:619
msgid "_OWA Url:"
msgstr "_OWA URL:"
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:645
msgid "A_uthenticate"
msgstr "身份验证(_U)"
-#: ../plugins/exchange-operations/exchange-account-setup.c:823
+#: ../plugins/exchange-operations/exchange-account-setup.c:833
msgid "Authentication Type"
msgstr "身份验证类型"
-#: ../plugins/exchange-operations/exchange-account-setup.c:837
+#: ../plugins/exchange-operations/exchange-account-setup.c:847
msgid "Ch_eck for Supported Types"
msgstr "检查支持的类型(_E)"
@@ -14717,6 +14561,11 @@ msgid "Custom"
msgstr "自定义"
#: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Delegate Permissions"
+msgstr "代理权限"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:202
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
#, c-format
msgid "Permissions for %s"
@@ -14766,49 +14615,49 @@ msgstr "读取代理人列表出错。"
msgid "Author (read, create)"
msgstr "作者(读取、创建)"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
msgid "C_alendar:"
msgstr "日历(_A):"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
msgid "Co_ntacts:"
msgstr "联系人(_N):"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Delegate Permissions"
-msgstr "代理权限"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
msgid "Delegates"
msgstr "代理"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
msgid "Editor (read, create, edit)"
msgstr "编辑(读取、创建、编辑)"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
msgid "Permissions for"
msgstr "权限"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
msgid "Reviewer (read-only)"
msgstr "复查者(只读)"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
msgid ""
"These users will be able to send mail on your behalf\n"
"and access your folders with the permissions you give them."
msgstr "这些用户将可以按照您指定的权限以您的身份发送邮件并访问您的文件夹。"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
msgid "_Delegate can see private items"
msgstr "代理可查看私有项目(_D)"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
msgid "_Inbox:"
msgstr "收件箱(_I):"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
msgid "_Tasks:"
msgstr "任务(_T):"
@@ -14825,9 +14674,10 @@ msgstr "文件夹名称"
msgid "Folder Size"
msgstr "文件夹大小"
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:180
-msgid "Subscribe to Other User's"
-msgstr "订阅其他用户的"
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:181
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+msgid "Subscribe to Other User's Folder"
+msgstr "订阅其他用户的文件夹"
#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
msgid "Exchange Folder Tree"
@@ -14935,17 +14785,6 @@ msgstr "订阅其他用户的联系人"
msgid "Subscribe to Other User's Calendar"
msgstr "订阅其他用户的日历"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
-"and features."
-msgstr ""
-"包含若干 Exchange 帐户特定操作和特性的插件。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
-msgid "Exchange Operations"
-msgstr "Exchange 操作"
-
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
msgid "Cannot change password due to configuration problems."
msgstr "因为配置文件问题无法更改密码。"
@@ -14978,53 +14817,53 @@ msgstr ""
"再试一次。"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
+msgid "Could not connect to Exchange server."
+msgstr "无法连接到 Exchange 服务器。"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
msgid "Could not connect to server {0}."
msgstr "无法连接到服务器 {0}。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
msgid "Could not determine folder permissions for delegates."
msgstr "无法确定代理人的文件夹权限。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
msgid "Could not find Exchange Web Storage System."
msgstr "找不到 Exchange Web 存储系统。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
msgid "Could not locate server {0}."
msgstr "无法定位服务器 {0}。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
msgid "Could not make {0} a delegate"
msgstr "无法将授权给 {0}"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
msgid "Could not read folder permissions"
msgstr "无法读取文件夹权限"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
msgid "Could not read folder permissions."
msgstr "无法读取文件夹权限。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
msgid "Could not read out-of-office state"
msgstr "无法读取不在办公室状态"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
msgid "Could not update folder permissions."
msgstr "无法更新文件夹权限。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
msgid "Could not update out-of-office state"
msgstr "无法更新不在办公室状态"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
msgid "Exchange Account is offline."
msgstr "Exchange 账户脱机。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Exchange Connector access error."
-msgstr "Exchange Connector 访问错误。"
-
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
msgid ""
"Exchange Connector requires access to certain\n"
@@ -15037,8 +14876,7 @@ msgid ""
"For information to provide to your Exchange \n"
"administrator, please follow the link below:\n"
"\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"{0}\n"
" "
msgstr ""
"Exchange Connector 需要访问 Exchange 服务器上的特定功能,但功能已经被无意间禁"
@@ -15047,8 +14885,7 @@ msgstr ""
"\n"
"要获得提供给您 Exchange 管理员的信息,请浏览下列链接:\n"
"\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"{0}\n"
" "
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
@@ -15068,7 +14905,7 @@ msgid "Folder offline"
msgstr "文件夹脱机"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1277
msgid "Generic error"
msgstr "常规错误"
@@ -15241,10 +15078,6 @@ msgstr "订阅其他用户的任务"
msgid "Check folder permissions"
msgstr "更改文件夹权限"
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "订阅其他用户的文件夹"
-
#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
#, c-format
msgid "Unsubscribing from folder \"%s\""
@@ -15308,7 +15141,7 @@ msgid "Add Send Options to groupwise messages"
msgstr "将发送选项添加到 GroupWise 信件"
#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:8
#: ../widgets/misc/e-send-options.glade.h:17
msgid "Send Options"
msgstr "发送选项"
@@ -15399,7 +15232,7 @@ msgid "Subscribe to my _notifications"
msgstr "订阅我的通知(_N)"
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:126
msgid "_Read"
msgstr "读取(_R)"
@@ -15412,6 +15245,7 @@ msgid "Proxy"
msgstr "代理服务器"
#: ../plugins/groupwise-features/proxy-listing.glade.h:2
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
#: ../smime/gui/smime-ui.glade.h:49
#: ../widgets/table/e-table-config-no-group.glade.h:20
#: ../widgets/table/e-table-config.glade.h:21
@@ -15426,23 +15260,23 @@ msgstr "<b>账户名</b>"
msgid "Proxy Login"
msgstr "代理服务器登录"
-#: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:501
+#: ../plugins/groupwise-features/proxy-login.c:220
+#: ../plugins/groupwise-features/proxy-login.c:263
+#: ../plugins/groupwise-features/proxy.c:502
#: ../plugins/groupwise-features/send-options.c:83
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%s输入 %s 的密码(用户 %s)"
-#: ../plugins/groupwise-features/proxy-login.c:497
+#: ../plugins/groupwise-features/proxy-login.c:505
msgid "_Proxy Login..."
msgstr "代理服务器登录(_P)..."
-#: ../plugins/groupwise-features/proxy.c:691
+#: ../plugins/groupwise-features/proxy.c:698
msgid "The Proxy tab will be available only when the account is online."
msgstr "代理服务器标签仅当账户联机时才可用。"
-#: ../plugins/groupwise-features/proxy.c:696
+#: ../plugins/groupwise-features/proxy.c:703
msgid "The Proxy tab will be available only when the account is enabled."
msgstr "代理服务器标签仅当账户启用时才可用。"
@@ -15634,7 +15468,7 @@ msgid "Conflict Search Table"
msgstr "冲突搜索表"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:183 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:183 ../ui/evolution-calendar.xml.h:33
#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:466
msgid "Today"
msgstr "今天"
@@ -16176,18 +16010,6 @@ msgstr "订阅这封信所属的邮件列表"
msgid "Unsubscribe to the mailing list this message belongs to"
msgstr "退订这封信所属的邮件列表"
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
-msgid "Mark All Read"
-msgstr "全部标为已读"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark me_ssages as read"
-msgstr "把信件标记为已读(_S)"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-msgid "Used for marking all the messages under a folder as read"
-msgstr "用于将文件夹内的全部信件全部标为已读"
-
#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
msgid "Mark calendar offline"
msgstr "将日历标为脱机"
@@ -16314,7 +16136,7 @@ msgstr "在撰写器中添加打印邮件的选项"
#: ../plugins/print-message/org-gnome-print-message.xml.h:1
#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:79 ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-memos.xml.h:12
#: ../ui/evolution-tasks.xml.h:15
msgid "Print Pre_view"
msgstr "打印预览(_V)"
@@ -16323,6 +16145,76 @@ msgstr "打印预览(_V)"
msgid "Prints the message"
msgstr "打印该信件"
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+msgid "_Publish Calendar Information"
+msgstr "发布日历信息(_P)"
+
+#: ../plugins/publish-calendar/publish-calendar.c:371
+msgid "Are you sure you want to remove this URL?"
+msgstr "您确定您想要删除此 URL 吗?"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+msgid "<span weight=\"bold\">Location</span>"
+msgstr "<span weight=\"bold\">位置</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr "<span weight=\"bold\">源</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+msgstr ""
+"每天\n"
+"每周\n"
+"手动(通过动作菜单)"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "Publishing Location"
+msgstr "发布位置"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+msgid "Publishing _Frequency:"
+msgstr "发布频率(_F):"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+msgid ""
+"SSH\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
+msgstr ""
+"SSH\n"
+"公开 FTP\n"
+"FTP (需登录)\n"
+"Windows 共享\n"
+"WebDAV (HTTP)\n"
+"安全 WebDAV (HTTPS)\n"
+"自定义位置"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:19
+msgid "Service _type:"
+msgstr "服务类型(_T):"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+msgid "_File:"
+msgstr "文件(_F):"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+msgid "_Publish as:"
+msgstr "发布为(_P):"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr "iCal\n忙/闲"
+
#: ../plugins/sa-junk-plugin/em-junk-filter.c:99
msgid "Spamassassin (built-in)"
msgstr "垃圾克星(内置)"
@@ -16352,15 +16244,15 @@ msgstr "保存附件..."
msgid "Save all attachments"
msgstr "保存全部附件"
-#: ../plugins/save-attachments/save-attachments.c:331
+#: ../plugins/save-attachments/save-attachments.c:338
msgid "Select save base name"
msgstr "选择保存基础名称"
-#: ../plugins/save-attachments/save-attachments.c:351
+#: ../plugins/save-attachments/save-attachments.c:358
msgid "MIME Type"
msgstr "MIME 类型"
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:366
#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:18
msgid "Save"
msgstr "保存"
@@ -16516,18 +16408,18 @@ msgstr ""
"请单击“下一步”按钮继续。"
#: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:145
+#: ../shell/e-shell-importer.c:147
msgid "Please select the information that you would like to import:"
msgstr "请选择您希望导入的信息:"
#: ../plugins/startup-wizard/startup-wizard.c:154
-#: ../shell/e-shell-importer.c:398
+#: ../shell/e-shell-importer.c:400
#, c-format
msgid "From %s:"
msgstr "从 %s:"
#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:509
+#: ../shell/e-shell-importer.c:511
msgid "Importing data."
msgstr "正在导入数据。"
@@ -16605,7 +16497,7 @@ msgstr "打印机设置"
msgid "Skip development warning dialog"
msgstr "跳过开发警告对话框"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:473
msgid "Start in offline mode"
msgstr "以脱机模式启动"
@@ -16687,11 +16579,11 @@ msgstr "单击确定关闭这些连接,并转入脱机操作"
msgid "(Untitled)"
msgstr "(无标题)"
-#: ../shell/e-shell-importer.c:133
+#: ../shell/e-shell-importer.c:135
msgid "Choose the type of importer to run:"
msgstr "选择要运行的导入器类型:"
-#: ../shell/e-shell-importer.c:136
+#: ../shell/e-shell-importer.c:138
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list.\n"
@@ -16703,11 +16595,11 @@ msgstr ""
"\n"
"如果您不清楚,可以选择“自动”,Evolution 将尝试为您确定类型。"
-#: ../shell/e-shell-importer.c:142
+#: ../shell/e-shell-importer.c:144
msgid "Choose the destination for this import"
msgstr "选择此导入的目的位置"
-#: ../shell/e-shell-importer.c:148
+#: ../shell/e-shell-importer.c:150
msgid ""
"Evolution checked for settings to import from the following\n"
"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -16718,27 +16610,27 @@ msgstr ""
"iCalendar。并未发现可导入的设置。如果您想要再试一次,请单击\n"
"“上一步”按钮。\n"
-#: ../shell/e-shell-importer.c:283
+#: ../shell/e-shell-importer.c:285
msgid "F_ilename:"
msgstr "文件名(_I):"
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:290
msgid "Select a file"
msgstr "选择一个文件"
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:302
msgid "File _type:"
msgstr "文件类型(_T):"
-#: ../shell/e-shell-importer.c:336
+#: ../shell/e-shell-importer.c:338
msgid "Import data and settings from _older programs"
msgstr "从旧版程序中导入数据和设置(_O)"
-#: ../shell/e-shell-importer.c:339
+#: ../shell/e-shell-importer.c:341
msgid "Import a _single file"
msgstr "导入单个文件(_S)"
-#: ../shell/e-shell-importer.c:698
+#: ../shell/e-shell-importer.c:703
msgid "_Import"
msgstr "导入(_I)"
@@ -16796,57 +16688,57 @@ msgstr ""
msgid "Groupware Suite"
msgstr "Groupwise 套件"
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:778
msgid "_Work Online"
msgstr "联机工作(_W)"
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:791 ../ui/evolution.xml.h:52
msgid "_Work Offline"
msgstr "脱机工作(_W)"
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:804
msgid "Work Offline"
msgstr "脱机工作"
-#: ../shell/e-shell-window.c:343
+#: ../shell/e-shell-window.c:370
msgid "Evolution is currently online. Click on this button to work offline."
msgstr "Evolution 目前联机。单击该按钮可脱机工作。"
-#: ../shell/e-shell-window.c:351
+#: ../shell/e-shell-window.c:378
msgid "Evolution is in the process of going offline."
msgstr "Evolution 正在脱机过程中。"
-#: ../shell/e-shell-window.c:358
+#: ../shell/e-shell-window.c:385
msgid "Evolution is currently offline. Click on this button to work online."
msgstr "Evolution 目前脱机。单击该按钮可联机工作。"
-#: ../shell/e-shell-window.c:735
+#: ../shell/e-shell-window.c:775
#, c-format
msgid "Switch to %s"
msgstr "切换到 %s"
-#: ../shell/e-shell.c:623
+#: ../shell/e-shell.c:633
msgid "Uknown system error."
msgstr "未知的系统错误。"
-#: ../shell/e-shell.c:825 ../shell/e-shell.c:826
+#: ../shell/e-shell.c:831 ../shell/e-shell.c:832
#, c-format
msgid "%ld KB"
msgstr "%ld KB"
-#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1269 ../widgets/misc/e-cell-date-edit.c:257
msgid "OK"
msgstr "确定"
-#: ../shell/e-shell.c:1259
+#: ../shell/e-shell.c:1271
msgid "Invalid arguments"
msgstr "无效参数"
-#: ../shell/e-shell.c:1261
+#: ../shell/e-shell.c:1273
msgid "Cannot register on OAF"
msgstr "无法注册到 OAF"
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1275
msgid "Configuration Database not found"
msgstr "找不到配置数据库"
@@ -16948,31 +16840,31 @@ msgstr ""
msgid "Don't tell me again"
msgstr "不要再问我"
-#: ../shell/main.c:466
+#: ../shell/main.c:471
msgid "Start Evolution activating the specified component"
msgstr "启动 Evolution 并激活指定组件"
-#: ../shell/main.c:470
+#: ../shell/main.c:475
msgid "Start in online mode"
msgstr "以联机模式启动"
-#: ../shell/main.c:473
+#: ../shell/main.c:478
msgid "Forcibly shut down all Evolution components"
msgstr "强制关闭所有 Evolution 组件"
-#: ../shell/main.c:477
+#: ../shell/main.c:482
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "强制从 Evolution 1.4 重新升迁"
-#: ../shell/main.c:480
+#: ../shell/main.c:485
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
-#: ../shell/main.c:482
+#: ../shell/main.c:487
msgid "Disable loading of any plugins."
msgstr "禁止装入任何插件。"
-#: ../shell/main.c:513
+#: ../shell/main.c:518
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -17000,7 +16892,7 @@ msgstr "Evolution 无法启动。"
#: ../shell/shell.error.xml.h:5
msgid ""
"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed. "
+"reprompted next time they are needed."
msgstr "忘记您的密码将清除记住的全部密码。下次需要密码的时候,您必须重新输入。"
#: ../shell/shell.error.xml.h:7
@@ -17107,7 +16999,7 @@ msgstr ""
"\n"
"如果您选择继续,您可能无法访问您的某些旧数据。\n"
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
#, c-format
msgid ""
"Certificate '%s' is a CA certificate.\n"
@@ -17118,54 +17010,54 @@ msgstr ""
"\n"
"编辑信任设置:"
-#: ../smime/gui/cert-trust-dialog.c:145
+#: ../smime/gui/cert-trust-dialog.c:153
msgid ""
"Because you trust the certificate authority that issued this certificate, "
"then you trust the authenticity of this certificate unless otherwise "
"indicated here"
msgstr "由于您信任颁发此证书的机构,您就将信任此证书的权威性,除非在此声明"
-#: ../smime/gui/cert-trust-dialog.c:149
+#: ../smime/gui/cert-trust-dialog.c:157
msgid ""
"Because you do not trust the certificate authority that issued this "
"certificate, then you do not trust the authenticity of this certificate "
"unless otherwise indicated here"
msgstr "由于您不信任颁发此证书的机构,您就将不信任此证书的权威性,除非在此声明"
-#: ../smime/gui/certificate-manager.c:134
-#: ../smime/gui/certificate-manager.c:142
-#: ../smime/gui/certificate-manager.c:377
-#: ../smime/gui/certificate-manager.c:385
-#: ../smime/gui/certificate-manager.c:597
-#: ../smime/gui/certificate-manager.c:605
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:379
+#: ../smime/gui/certificate-manager.c:387
+#: ../smime/gui/certificate-manager.c:599
+#: ../smime/gui/certificate-manager.c:607
msgid "Select a certificate to import..."
msgstr "选择要导入的证书..."
-#: ../smime/gui/certificate-manager.c:265
-#: ../smime/gui/certificate-manager.c:474
-#: ../smime/gui/certificate-manager.c:692
+#: ../smime/gui/certificate-manager.c:267
+#: ../smime/gui/certificate-manager.c:476
+#: ../smime/gui/certificate-manager.c:694
msgid "Certificate Name"
msgstr "证书名称"
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:492
+#: ../smime/gui/certificate-manager.c:276
+#: ../smime/gui/certificate-manager.c:494
msgid "Purposes"
msgstr "用途"
-#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
#: ../smime/lib/e-cert.c:569
msgid "Serial Number"
msgstr "序列号"
-#: ../smime/gui/certificate-manager.c:291
+#: ../smime/gui/certificate-manager.c:293
msgid "Expires"
msgstr "到期"
-#: ../smime/gui/certificate-manager.c:483
+#: ../smime/gui/certificate-manager.c:485
msgid "E-Mail Address"
msgstr "电子邮件地址"
-#: ../smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-viewer.c:342
#, c-format
msgid "Certificate Viewer: %s"
msgstr "证书查看器:%s"
@@ -17185,7 +17077,7 @@ msgid "Enter new password"
msgstr "输入新密码"
#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:121
#, c-format
msgid ""
"Issued to:\n"
@@ -17194,7 +17086,7 @@ msgstr ""
"发行给:\n"
" 主题:%s\n"
-#: ../smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:122
#, c-format
msgid ""
"Issued by:\n"
@@ -17203,7 +17095,7 @@ msgstr ""
"发行者:\n"
" 主题:%s\n"
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:174
msgid "Select certificate"
msgstr "选择证书"
@@ -17387,7 +17279,7 @@ msgid "_Edit CA Trust"
msgstr "编辑 CA 信任(_E)"
#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:651
+#: ../smime/lib/e-cert-db.c:654
msgid "Certificate already exists"
msgstr "证书已经存在"
@@ -17594,15 +17486,15 @@ msgstr "主题唯一 ID"
msgid "Certificate Signature Value"
msgstr "证书签名值"
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
msgid "PKCS12 File Password"
msgstr "PKCS12 文件密码"
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
msgid "Enter password for PKCS12 file:"
msgstr "输入 PKCS12 文件的密码:"
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:365
msgid "Imported Certificate"
msgstr "导入的证书"
@@ -17741,7 +17633,7 @@ msgstr "停止载入"
msgid "View the current contact"
msgstr "查看当前联系人"
-#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:37
#: ../ui/evolution-tasks.xml.h:21
msgid "_Actions"
msgstr "操作(_A)"
@@ -17798,7 +17690,7 @@ msgstr "列表"
msgid "Month"
msgstr "月"
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:59
msgid "Next"
msgstr "下一项"
@@ -17806,7 +17698,7 @@ msgstr "下一项"
msgid "Previews the calendar to be printed"
msgstr "预览将要打印的日历"
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:75
msgid "Previous"
msgstr "上一项"
@@ -17814,67 +17706,63 @@ msgstr "上一项"
msgid "Print this calendar"
msgstr "打印此日历"
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy information for this calendar"
-msgstr "为此日历发布忙闲信息"
-
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:22 ../ui/evolution-tasks.xml.h:17
msgid "Purg_e"
msgstr "销毁(_E)"
-#: ../ui/evolution-calendar.xml.h:24
+#: ../ui/evolution-calendar.xml.h:23
msgid "Purge old appointments and meetings"
msgstr "销毁旧约会和会议"
-#: ../ui/evolution-calendar.xml.h:25
+#: ../ui/evolution-calendar.xml.h:24
msgid "Select _Date"
msgstr "选择日期(_D)"
-#: ../ui/evolution-calendar.xml.h:26
+#: ../ui/evolution-calendar.xml.h:25
msgid "Select _Today"
msgstr "选择今天(_T)"
-#: ../ui/evolution-calendar.xml.h:27
+#: ../ui/evolution-calendar.xml.h:26
msgid "Select a specific date"
msgstr "选择特定日期"
-#: ../ui/evolution-calendar.xml.h:28
+#: ../ui/evolution-calendar.xml.h:27
msgid "Select today"
msgstr "选择今天"
-#: ../ui/evolution-calendar.xml.h:29
+#: ../ui/evolution-calendar.xml.h:28
msgid "Show as list"
msgstr "显示为列表"
-#: ../ui/evolution-calendar.xml.h:30
+#: ../ui/evolution-calendar.xml.h:29
msgid "Show one day"
msgstr "显示一天"
-#: ../ui/evolution-calendar.xml.h:31
+#: ../ui/evolution-calendar.xml.h:30
msgid "Show one month"
msgstr "显示一个月"
-#: ../ui/evolution-calendar.xml.h:32
+#: ../ui/evolution-calendar.xml.h:31
msgid "Show one week"
msgstr "显示一周"
-#: ../ui/evolution-calendar.xml.h:33
+#: ../ui/evolution-calendar.xml.h:32
msgid "Show the working week"
msgstr "显示工作周"
-#: ../ui/evolution-calendar.xml.h:35
+#: ../ui/evolution-calendar.xml.h:34
msgid "View the current appointment"
msgstr "查看当前约会"
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:35
msgid "Week"
msgstr "周"
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:36
msgid "Work Week"
msgstr "一周工作日"
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:41
msgid "_Open Appointment"
msgstr "打开约会(_O)"
@@ -17899,6 +17787,10 @@ msgstr "全选(_A)"
msgid "Select all text"
msgstr "选中所有文字"
+#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "附件"
+
#: ../ui/evolution-editor.xml.h:2
msgid "Click here to attach a file"
msgstr "单击此处可便附加文件"
@@ -17921,32 +17813,32 @@ msgstr "单击此处可查看可用的帮助"
#. accel="*Ctrl*s"/>
#.
#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:3
#: ../ui/evolution-signature-editor.xml.h:7
msgid "Close"
msgstr "关闭"
-#: ../ui/evolution-editor.xml.h:14
-msgid "_Attachments"
-msgstr "附件(_A)"
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:40
+msgid "_Attachment..."
+msgstr "附件(_A)..."
#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:43 ../ui/evolution-subscribe.xml.h:9
msgid "_Close"
msgstr "关闭(_C)"
#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-message-composer.xml.h:46
#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:37
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:38
msgid "_File"
msgstr "文件(_F)"
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:38
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:39
msgid "_Help"
msgstr "帮助(_H)"
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-message-composer.xml.h:48
#: ../ui/evolution-signature-editor.xml.h:25
msgid "_Insert"
msgstr "插入(_I)"
@@ -17971,95 +17863,99 @@ msgstr "分类为私人"
msgid "Classify as public"
msgstr "分类为公开"
-#: ../ui/evolution-event-editor.xml.h:7 ../ui/evolution-task-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:6
+msgid "Click here to set or unset alarms for this event"
+msgstr "单击此处以设定或取消此事件的提醒"
+
+#: ../ui/evolution-event-editor.xml.h:8 ../ui/evolution-task-editor.xml.h:5
msgid "Insert advanced send options"
msgstr "插入高级发送选项"
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:9
msgid "Make this a recurring event"
msgstr "将此事件标为重复发生"
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:10 ../ui/evolution-task-editor.xml.h:6
msgid "Pu_blic"
msgstr "公开(_B)"
-#: ../ui/evolution-event-editor.xml.h:10
+#: ../ui/evolution-event-editor.xml.h:11
msgid "Query free / busy information for the attendees"
msgstr "查询出席者的忙闲信息"
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-task-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:12 ../ui/evolution-task-editor.xml.h:7
msgid "R_ole Field"
msgstr "角色域(_O)"
-#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:9
+#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:9
msgid "Show Time _Zone"
msgstr "显示时区(_Z)"
-#: ../ui/evolution-event-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:16
msgid "Show time as b_usy"
msgstr "将时间设定为忙(_U)"
-#: ../ui/evolution-event-editor.xml.h:16 ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:12
msgid "Toggles whether the Attendee Type field is displayed"
msgstr "切换是否显示出席者类型域"
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:13
msgid "Toggles whether the RSVP field is displayed"
msgstr "切换是否显示请回复域"
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:14
msgid "Toggles whether the Role field is displayed"
msgstr "切换是否显示角色域"
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:15
msgid "Toggles whether the Status field is displayed"
msgstr "切换是否显示状态域"
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:16
msgid "Toggles whether the time zone is displayed"
msgstr "切换是否显示时区"
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:17
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:17
msgid "Toggles whether to display categories"
msgstr "切换是否显示类别"
-#: ../ui/evolution-event-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:23
msgid "Toggles whether to have All day Event"
msgstr "切换是否有全天事件"
-#: ../ui/evolution-event-editor.xml.h:23
+#: ../ui/evolution-event-editor.xml.h:24
msgid "Toggles whether to show time as busy"
msgstr "切换是否将时间显示为忙"
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:25
msgid "_Alarms"
msgstr "提醒(_A)"
-#: ../ui/evolution-event-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:26
msgid "_All day Event"
msgstr "全天事件(_A)"
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:19
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:19
msgid "_Classification"
msgstr "分类(_C)"
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:20
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:20
msgid "_Confidential"
msgstr "机密(_C)"
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:21
+#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:21
msgid "_Private"
msgstr "私人(_P)"
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:22
msgid "_RSVP"
msgstr "请回复(_R)"
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:24
msgid "_Status Field"
msgstr "状态域(_S)"
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:25
msgid "_Type Field"
msgstr "类型域(_T)"
@@ -18152,12 +18048,12 @@ msgstr "更改此文件夹的名称"
msgid "Change the properties of this folder"
msgstr "更改此文件夹的属性"
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:12
msgid "Copy selected message(s) to the clipboard"
msgstr "将选中信件复制到剪贴板"
#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:23
msgid "Cut selected message(s) to the clipboard"
msgstr "将选中信件剪切到剪贴板"
@@ -18190,7 +18086,7 @@ msgstr "隐藏已删除的信件而不是在上面显示一条线"
msgid "Mar_k Messages as Read"
msgstr "把信件标记为已读(_K)"
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:68
msgid "Paste message(s) from the clipboard"
msgstr "从剪贴板粘贴信件"
@@ -18242,7 +18138,7 @@ msgstr "暂时隐藏选中信件"
msgid "Threaded Message list"
msgstr "按线索编排的信件列表"
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:117
#: ../ui/evolution-mail-messagedisplay.xml.h:7
msgid "_Message"
msgstr "信件(_M)"
@@ -18288,322 +18184,322 @@ msgstr "为选中邮件的邮件列表撰写回复"
msgid "Compose a reply to the sender of the selected message"
msgstr "为选中信件的发件人撰写回复"
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:13
msgid "Copy selected messages to another folder"
msgstr "把选中的信件复制到其它文件夹"
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:14
msgid "Create R_ule"
msgstr "创建规则(_U)"
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:15
msgid "Create a Search Folder for these recipients"
msgstr "为这些收件人创建搜索文件夹"
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:16
msgid "Create a Search Folder for this mailing list"
msgstr "为该邮件列表创建搜索文件夹"
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:17
msgid "Create a Search Folder for this sender"
msgstr "为该发件人创建搜索文件夹"
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:18
msgid "Create a Search Folder for this subject"
msgstr "为该主题创建搜索文件夹"
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:19
msgid "Create a rule to filter messages from this sender"
msgstr "根据此发件人创建信件过滤规则"
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:20
msgid "Create a rule to filter messages to these recipients"
msgstr "根据这些收件人创建信件过滤规则"
-#: ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-message.xml.h:21
msgid "Create a rule to filter messages to this mailing list"
msgstr "根据这封信列表创建信件过滤规则"
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:22
msgid "Create a rule to filter messages with this subject"
msgstr "根据此主题创建信件过滤规则"
-#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:24
msgid "Decrease the text size"
msgstr "减少文本大小"
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:26
msgid "Display the next important message"
msgstr "显示下一封重要信件"
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:27
msgid "Display the next message"
msgstr "显示下一封信件"
-#: ../ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:28
msgid "Display the next unread message"
msgstr "显示下一封未读信件"
-#: ../ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:29
msgid "Display the next unread thread"
msgstr "显示下一封未阅读的线索"
-#: ../ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:30
msgid "Display the previous important message"
msgstr "显示上一封重要信件"
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:31
msgid "Display the previous message"
msgstr "显示上一封信件"
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:32
msgid "Display the previous unread message"
msgstr "显示上一封未读信件"
-#: ../ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:33
msgid "F_orward As..."
msgstr "转发为(_O)..."
-#: ../ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:34
msgid "Filter on Mailing _List..."
msgstr "过滤邮件列表(_L)..."
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:35
msgid "Filter on Se_nder..."
msgstr "过滤发件人(_N)..."
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:36
msgid "Filter on _Recipients..."
msgstr "过滤收件人(_R)..."
-#: ../ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:37
msgid "Filter on _Subject..."
msgstr "过滤标题(_S)..."
-#: ../ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:38
msgid "Filter the selected messages for junk status"
msgstr "把选中的信件标记为垃圾邮件"
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:39
msgid "Flag selected message(s) for follow-up"
msgstr "为选中邮件做跟随标志"
-#: ../ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:40
msgid "Follow _Up..."
msgstr "跟随(_U)..."
-#: ../ui/evolution-mail-message.xml.h:42
+#: ../ui/evolution-mail-message.xml.h:41
msgid "Force images in HTML mail to be loaded"
msgstr "强制装入 HTML 邮件中的图像"
-#: ../ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:43
msgid "Forward the selected message in the body of a new message"
msgstr "在新信体中转发选中邮件"
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:44
msgid "Forward the selected message quoted like a reply"
msgstr "以类似于回复的引用方式转发选中的信件"
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:45
msgid "Forward the selected message to someone"
msgstr "把选中信件转发给某人"
-#: ../ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:46
msgid "Forward the selected message to someone as an attachment"
msgstr "把选中信件作为附件转发给某人"
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:47
msgid "Increase the text size"
msgstr "增加文本大小"
-#: ../ui/evolution-mail-message.xml.h:50
+#: ../ui/evolution-mail-message.xml.h:49
msgid "Mar_k as"
msgstr "标记为(_K)"
-#: ../ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:50
msgid "Mark the selected message(s) as having been read"
msgstr "把选中信件标记为已读"
-#: ../ui/evolution-mail-message.xml.h:52
+#: ../ui/evolution-mail-message.xml.h:51
msgid "Mark the selected message(s) as important"
msgstr "把选中信件标记为重要邮件"
-#: ../ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:52
msgid "Mark the selected message(s) as junk"
msgstr "把选中信件标记为垃圾邮件"
-#: ../ui/evolution-mail-message.xml.h:54
+#: ../ui/evolution-mail-message.xml.h:53
msgid "Mark the selected message(s) as not being junk"
msgstr "把选中信件标记为非垃圾邮件"
-#: ../ui/evolution-mail-message.xml.h:55
+#: ../ui/evolution-mail-message.xml.h:54
msgid "Mark the selected message(s) as not having been read"
msgstr "把选中信件标记为未读"
-#: ../ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:55
msgid "Mark the selected message(s) as unimportant"
msgstr "把选中信件标记为不重要邮件"
-#: ../ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:56
msgid "Mark the selected messages for deletion"
msgstr "为选中信件做删除标记"
-#: ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:57
msgid "Message Source"
msgstr "信件来源"
-#: ../ui/evolution-mail-message.xml.h:59
-msgid "Move"
-msgstr "移动"
-
-#: ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:58
msgid "Move selected message(s) to another folder"
msgstr "把选中的信件移动到其它文件夹"
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:60
msgid "Next _Important Message"
msgstr "下一封重要信件(_I)"
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:61
msgid "Next _Thread"
msgstr "下一条线索(_T)"
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:62
msgid "Next _Unread Message"
msgstr "下一封未读信件(_U)"
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:63
msgid "Not Junk"
msgstr "非垃圾"
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:64
msgid "Open a window for composing a mail message"
msgstr "打开窗口以撰写信件"
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:65
msgid "Open the selected message in a new window"
msgstr "在新窗口中打开选中的信件"
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:66
msgid "Open the selected message in the composer for editing"
msgstr "在撰写器中打开选中的信件以便编辑"
-#: ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:67
msgid "P_revious Unread Message"
msgstr "上一封未读信件(_R)"
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:69
msgid "Pos_t New Message to Folder"
msgstr "把新信件投递到文件夹(_T)"
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:70
msgid "Post a Repl_y"
msgstr "投递回复(_Y)"
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:71
msgid "Post a message to a Public folder"
msgstr "把信件保存到公共文件夹中"
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:72
msgid "Post a reply to a message in a Public folder"
msgstr "在公共文件夹中回复信件"
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:73
msgid "Pr_evious Important Message"
msgstr "上一封重要信件(_E)"
-#: ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-mail-message.xml.h:74
msgid "Preview the message to be printed"
msgstr "预览要打印的信件"
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:78
msgid "Print this message"
msgstr "打印该信件"
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:79
msgid "Re_direct"
msgstr "重发(_D)"
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../ui/evolution-mail-message.xml.h:80
msgid "Redirect (bounce) the selected message to someone"
msgstr "将选中信件重发(退回)给某人"
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:85
msgid "Reset the text to its original size"
msgstr "把文件重新设置为原来的大小"
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:86
msgid "Save the message as a text file"
msgstr "把信件存为文本文件"
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:87
msgid "Search Folder from Mailing _List..."
msgstr "基于邮件列表的搜索文件夹(_L)..."
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:88
msgid "Search Folder from Recipients..."
msgstr "基于收件人的搜索文件夹..."
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:89
msgid "Search Folder from S_ubject..."
msgstr "基于主题的搜索文件夹(_U)..."
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:90
msgid "Search Folder from Sen_der..."
msgstr "基于发件人的搜索文件夹(_D)..."
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:91
msgid "Search for text in the body of the displayed message"
msgstr "在显示邮件的邮件体中搜索文本"
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:92
msgid "Select _All Text"
msgstr "选中所有文字(_A)"
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93
msgid "Select all the text in a message"
msgstr "选中信件中的全部文本"
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:94
msgid "Set up the page settings for your current printer"
msgstr "设定您当前打印机的页面设置"
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:95
msgid "Show a blinking cursor in the body of displayed messages"
msgstr "在显示信件的信体中显示闪烁光标"
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
msgid "Show message in the normal style"
msgstr "以普通样式显示信件"
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
msgid "Show message with all email headers"
msgstr "显示邮件时显示所有信头"
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
msgid "Show the raw email source of the message"
msgstr "显示信件的原始邮件源代码"
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
msgid "Un-delete the selected messages"
msgstr "取消选中信件的删除"
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
msgid "Uni_mportant"
msgstr "不重要(_M)"
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
msgid "Zoom _Out"
msgstr "缩小(_O)"
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
msgid "_Attached"
msgstr "附件(_A)"
-#: ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-mail-message.xml.h:103
msgid "_Caret Mode"
msgstr "光标模式(_C)"
+#: ../ui/evolution-mail-message.xml.h:104
+msgid "_Clear Flag"
+msgstr "清除标志(_C)"
+
#: ../ui/evolution-mail-message.xml.h:107
msgid "_Delete Message"
msgstr "删除信件(_D)"
@@ -18612,63 +18508,67 @@ msgstr "删除信件(_D)"
msgid "_Find in Message..."
msgstr "在信件中寻找(_F)..."
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
+msgid "_Flag Completed"
+msgstr "标志为已完成(_F)"
+
+#: ../ui/evolution-mail-message.xml.h:112
msgid "_Go To"
msgstr "转到(_G)"
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:113
msgid "_Important"
msgstr "重要(_I)"
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:114
msgid "_Inline"
msgstr "嵌入(_I)"
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:115
msgid "_Junk"
msgstr "垃圾(_J)"
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:116
msgid "_Load Images"
msgstr "装入图像(_L)"
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:119
msgid "_Next Message"
msgstr "下一封信(_N)"
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:120
msgid "_Normal Size"
msgstr "普通大小(_N)"
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:121
msgid "_Not Junk"
msgstr "非垃圾(_N)"
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:122
msgid "_Open in New Window"
msgstr "在新窗口中打开(_O)"
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:123
msgid "_Previous Message"
msgstr "上一封信(_P)"
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:125
msgid "_Quoted"
msgstr "引用(_Q)"
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:128
msgid "_Save Message..."
msgstr "保存信件(_S)..."
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:129
msgid "_Undelete Message"
msgstr "取消删除信件(_U)"
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:130
msgid "_Unread"
msgstr "未读(_U)"
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:131
msgid "_Zoom In"
msgstr "放大(_Z)"
@@ -18712,45 +18612,41 @@ msgstr "查看选中的备忘"
msgid "_Open Memo"
msgstr "打开备忘(_O)"
-#: ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "附件"
-
#: ../ui/evolution-message-composer.xml.h:2
msgid "Attach a file"
msgstr "添加附件"
-#: ../ui/evolution-message-composer.xml.h:3
-msgid "Check to get delivery notification when your message is read"
-msgstr "选中可当您的信件被阅读时得到投递通知"
-
#.
#. <cmd name="FileSave" _label="Save"
#. _tip="Save the current file" pixtype="stock" pixname="Save"
#. accel="*Ctrl*s"/>
#.
-#: ../ui/evolution-message-composer.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:4
#: ../ui/evolution-signature-editor.xml.h:13
msgid "Close the current file"
msgstr "关闭当前文件"
-#: ../ui/evolution-message-composer.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:5
msgid "Delete all but signature"
msgstr "删除签名以外的所有内容"
-#: ../ui/evolution-message-composer.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:6
msgid "Encrypt this message with PGP"
msgstr "用 PGP 加密该邮件"
-#: ../ui/evolution-message-composer.xml.h:8
+#: ../ui/evolution-message-composer.xml.h:7
msgid "Encrypt this message with your S/MIME Encryption Certificate"
msgstr "用您的 S/MIME 加密证书加密该信件"
-#: ../ui/evolution-message-composer.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:8
#: ../ui/evolution-signature-editor.xml.h:14
msgid "For_mat"
msgstr "格式(_M)"
+#: ../ui/evolution-message-composer.xml.h:9
+msgid "Get delivery notification when your message is read"
+msgstr "当您的信件被阅读时得到投递通知"
+
#: ../ui/evolution-message-composer.xml.h:10
msgid "HT_ML"
msgstr "HT_ML"
@@ -18768,8 +18664,8 @@ msgid "PGP Sign"
msgstr "PGP 签名"
#: ../ui/evolution-message-composer.xml.h:15
-msgid "Request read receipt"
-msgstr "请求阅读收条"
+msgid "R_equest Read Receipt"
+msgstr "请求阅读收条(_E)"
#: ../ui/evolution-message-composer.xml.h:16
msgid "S/MIME Encrypt"
@@ -18825,74 +18721,78 @@ msgid "Send this message"
msgstr "发送这封信"
#: ../ui/evolution-message-composer.xml.h:31
+msgid "Set the message priority to high"
+msgstr "将信件设定为高优先级"
+
+#: ../ui/evolution-message-composer.xml.h:32
msgid "Sign this message with your PGP key"
msgstr "用您的 PGP 密钥签名该信件"
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:33
msgid "Sign this message with your S/MIME Signature Certificate"
msgstr "用您的 S/MIME 签名认证签名该信件"
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:34
msgid "Toggles whether the BCC field is displayed"
msgstr "是否显示暗中转发域"
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:35
msgid "Toggles whether the CC field is displayed"
msgstr "是否显示转发域"
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:36
msgid "Toggles whether the From chooser is displayed"
msgstr "是否显示发件人选择器"
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:37
msgid "Toggles whether the Post-To field is displayed"
msgstr "是否显示投递到域"
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:38
msgid "Toggles whether the Reply-To field is displayed"
msgstr "是否显示回复域"
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:39
msgid "Toggles whether the To field is displayed"
msgstr "是否显示寄给域"
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "_Attachment..."
-msgstr "附件(_A)..."
-
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:41
msgid "_Bcc Field"
msgstr "暗送域(_B)"
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:42
msgid "_Cc Field"
msgstr "抄送域(_C)"
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-message-composer.xml.h:44
msgid "_Delete all"
msgstr "全部删除(_D)"
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:47
msgid "_From Field"
msgstr "发件人域(_F)"
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:49
msgid "_Open..."
msgstr "打开(_O)..."
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:50
msgid "_Post-To Field"
msgstr "投递到域(_P)"
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:51
+msgid "_Prioritise Message"
+msgstr "标为优先(_P)"
+
+#: ../ui/evolution-message-composer.xml.h:52
msgid "_Reply-To Field"
msgstr "回复域(_R)"
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:54
msgid "_Security"
msgstr "安全(_S)"
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:55
msgid "_To Field"
msgstr "收件人域(_T)"
@@ -19084,18 +18984,22 @@ msgid "Send / Receive"
msgstr "发送/接收"
#: ../ui/evolution.xml.h:20
+msgid "Send / _Receive"
+msgstr "发送/接收(_R)"
+
+#: ../ui/evolution.xml.h:21
msgid "Send queued items and retrieve new items"
msgstr "发送队列中的的邮件并收取新邮件"
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:22
msgid "Set up Pilot configuration"
msgstr "配置 Pilot"
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:23
msgid "Show information about Evolution"
msgstr "显示关于 Evolution 的信息"
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:24
msgid "Submit Bug Report"
msgstr "提交错误报告"
@@ -19103,62 +19007,58 @@ msgstr "提交错误报告"
#. _label="Evolution _FAQ"/>
#.
#. <separator/>
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:29
msgid "Submit _Bug Report"
msgstr "提交错误报告(_B)"
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:30
msgid "Submit a bug report using Bug Buddy"
msgstr "用 Bug Buddy 提交错误报告"
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:31
msgid "Toggle whether we are working offline."
msgstr "切换是否脱机工作。"
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:32
msgid "Tool_bar"
msgstr "工具栏(_B)"
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:33
msgid "Tool_bar style"
msgstr "工具栏样式(_B)"
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:34
msgid "View/Hide the Status Bar"
msgstr "查看/隐藏状态栏"
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:35
msgid "_About Evolution..."
msgstr "关于 Evolution(_A)..."
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:36
msgid "_Close Window"
msgstr "关闭窗口(_C)"
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:40
msgid "_Hide buttons"
msgstr "隐藏按钮(_H)"
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
msgid "_Icons only"
msgstr "只有图标(_I)"
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:42
msgid "_Import..."
msgstr "导入(_I)..."
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:43
msgid "_New"
msgstr "新建(_N)"
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
msgid "_Quick Reference"
msgstr "快速首选项(_Q)"
-#: ../ui/evolution.xml.h:45
-msgid "_Send / Receive"
-msgstr "发送/接收(_S)"
-
#: ../ui/evolution.xml.h:46
msgid "_Switcher Appearance"
msgstr "切换器外观(_S)"
@@ -19247,8 +19147,8 @@ msgstr "到期日期(_D)"
msgid "With _Status"
msgstr "状态(_S)"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:645
msgid "UTC"
msgstr "UTC"
@@ -19326,16 +19226,16 @@ msgid "_Replace existing view"
msgstr "替换现有视图(_R)"
#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-instance.c:586
#: ../widgets/menus/gal-view-menus.c:350
msgid "Custom View"
msgstr "当前视图"
-#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-instance.c:587
msgid "Save Custom View"
msgstr "保存自定义视图"
-#: ../widgets/menus/gal-view-instance.c:590
+#: ../widgets/menus/gal-view-instance.c:591
#: ../widgets/menus/gal-view-menus.c:372
msgid "Define Views..."
msgstr "定义视图..."
@@ -19576,6 +19476,16 @@ msgstr "选择时间的组合框"
msgid "Time Combo Box"
msgstr "时间组合框"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: ../widgets/misc/e-dateedit.c:1444 ../widgets/misc/e-dateedit.c:1771
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: ../widgets/misc/e-dateedit.c:1447 ../widgets/misc/e-dateedit.c:1774
+msgid "%I:%M %p"
+msgstr "%p%I:%M"
+
#: ../widgets/misc/e-expander.c:181
msgid "Expanded"
msgstr "已展开"
@@ -19626,16 +19536,16 @@ msgstr "标识器间距"
msgid "Spacing around expander arrow"
msgstr "扩展器箭头旁边的间距"
-#: ../widgets/misc/e-filter-bar.c:195
+#: ../widgets/misc/e-filter-bar.c:201
msgid "_Searches"
msgstr "搜索(_S)"
-#: ../widgets/misc/e-filter-bar.c:197
-msgid "Search Editor"
-msgstr "搜索编辑器"
+#: ../widgets/misc/e-filter-bar.c:203
+msgid "Searches"
+msgstr "搜索"
#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:220
+#: ../widgets/misc/e-filter-bar.c:226
msgid "Save Search"
msgstr "保存搜索"
@@ -19655,11 +19565,11 @@ msgstr "高级搜索(_A)..."
msgid "Choose Image"
msgstr "选择图像"
-#: ../widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:651
msgid "World Map"
msgstr "世界地图"
-#: ../widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:653
msgid ""
"Mouse-based interactive map widget for selecting timezone. Keyboard users "
"should select the timezone from the below combo box instead."
@@ -19693,41 +19603,41 @@ msgstr "列宽"
#. To translators: This is the accessibility name of
#. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:346
+#: ../widgets/misc/e-search-bar.c:372
msgid "Search Text Entry"
msgstr "搜索文本项"
-#: ../widgets/misc/e-search-bar.c:550
+#: ../widgets/misc/e-search-bar.c:591
msgid "_Search"
msgstr "搜索(_S)"
-#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:597
msgid "_Find Now"
msgstr "立即查找(_F)"
-#: ../widgets/misc/e-search-bar.c:557 ../widgets/misc/e-search-bar.c:944
+#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:985
msgid "_Clear"
msgstr "清除(_C)"
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:689
msgid "Search Type"
msgstr "搜索类型"
-#: ../widgets/misc/e-search-bar.c:852
+#: ../widgets/misc/e-search-bar.c:893
msgid "Item ID"
msgstr "项目 ID"
-#: ../widgets/misc/e-search-bar.c:859
+#: ../widgets/misc/e-search-bar.c:900
msgid "Subitem ID"
msgstr "子项目 ID"
-#: ../widgets/misc/e-search-bar.c:866 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:907 ../widgets/text/e-entry.c:1249
#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
#: ../widgets/text/e-text.c:3463
msgid "Text"
msgstr "文字"
-#: ../widgets/misc/e-search-bar.c:946
+#: ../widgets/misc/e-search-bar.c:987
msgid "Find _Now"
msgstr "立即查找(_N)"
@@ -19753,7 +19663,7 @@ msgstr "选择模式"
msgid "Cursor Mode"
msgstr "光标模式"
-#: ../widgets/misc/e-send-options.c:521
+#: ../widgets/misc/e-send-options.c:524
msgid "When de_leted:"
msgstr "删除时(_L):"
@@ -19929,23 +19839,23 @@ msgstr "聚焦列"
msgid "Unselected Column"
msgstr "未选列"
-#: ../widgets/table/e-cell-text.c:1740
+#: ../widgets/table/e-cell-text.c:1742
msgid "Strikeout Column"
msgstr "给列加删除线"
-#: ../widgets/table/e-cell-text.c:1747
+#: ../widgets/table/e-cell-text.c:1749
msgid "Underline Column"
msgstr "给列加下划线"
-#: ../widgets/table/e-cell-text.c:1754
+#: ../widgets/table/e-cell-text.c:1756
msgid "Bold Column"
msgstr "给列加粗"
-#: ../widgets/table/e-cell-text.c:1761
+#: ../widgets/table/e-cell-text.c:1763
msgid "Color Column"
msgstr "给列着色"
-#: ../widgets/table/e-cell-text.c:1775
+#: ../widgets/table/e-cell-text.c:1777
msgid "BG Color Column"
msgstr "给列着背景色"
@@ -20266,8 +20176,9 @@ msgstr "表格模型"
msgid "Cursor row"
msgstr "光标行"
-#: ../widgets/table/e-table.c:3330
-msgid "Always Search"
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-tree.c:3305
+msgid "Always search"
msgstr "总是搜索"
#: ../widgets/table/e-table.c:3337
@@ -20278,10 +20189,6 @@ msgstr "单击可添加"
msgid "ETree table adapter"
msgstr "ETree 表格适配器"
-#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
-msgid "Always search"
-msgstr "总是搜索"
-
#: ../widgets/table/e-tree.c:3311
msgid "Retro Look"
msgstr "火箭外观"
@@ -20429,3 +20336,50 @@ msgstr "输入法环境"
#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
msgid "Handle Popup"
msgstr "处理弹出"
+
+msgid "Execute actions"
+msgstr "执行动作"
+
+msgid "Execute Command..."
+msgstr "执行命令..."
+
+msgid "Local Address Books"
+msgstr "本地地址簿"
+
+msgid "Provides core functionallity for local address books."
+msgstr "提供本地地址簿的核心功能。"
+
+msgid "Default Sources"
+msgstr "默认源"
+
+msgid ""
+"Provides functionallity for marking a calendar or addressbook as the "
+"default one."
+msgstr "提供了将日历或地址簿标为默认日历或地址簿的功能。"
+
+msgid "Subscribe to Other User's"
+msgstr "订阅其他用户的"
+
+msgid ""
+"A plugin that handles a collection of Exchange account specific "
+"operations and features."
+msgstr "包含若干 Exchange 帐户特定操作和特性的插件。"
+
+msgid "Exchange Operations"
+msgstr "Exchange 操作"
+
+msgid "Exchange Connector access error."
+msgstr "Exchange Connector 访问错误。"
+
+msgid "Mark All Read"
+msgstr "全部标为已读"
+
+msgid "Mark me_ssages as read"
+msgstr "把信件标记为已读(_S)"
+
+msgid "Used for marking all the messages under a folder as read"
+msgstr "用于将文件夹内的全部信件全部标为已读"
+
+msgid "Publish Free/Busy information for this calendar"
+msgstr "为此日历发布忙闲信息"
+