aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/ChangeLog4
-rw-r--r--po/zh_CN.po3089
2 files changed, 1656 insertions, 1437 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index fcb1c9c11b..8f65193e9c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-18 Funda Wang <fundawang@linux.net.cn>
+
+ * zh_CN.po: Updated Simplified Chinese translation.
+
2006-01-18 Ignacio Casal Quinteiro <nacho.resa@gmail.com>
* gl.po: Updated Galician Translation.
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b71245bfd3..1f2c78ed36 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the evolution package.
# Wang Li <charles@linux.net.cn>, 2002, 2003.
# Partly comes from Sun_l10n group, 2003
-# Funda Wang <fundawang@linux.net.cn>, 2003, 2004, 2005.
+# Funda Wang <fundawang@linux.net.cn>, 2003, 2004, 2005, 2006.
#
msgid ""
msgstr ""
"Project-Id-Version: Evolution 2.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-25 12:28+0800\n"
-"PO-Revision-Date: 2005-12-25 11:40+0800\n"
+"POT-Creation-Date: 2006-01-18 05:51+0100\n"
+"PO-Revision-Date: 2006-01-18 21:25+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"
@@ -41,7 +41,7 @@ msgid_plural "current addressbook folder has %d cards"
msgstr[0] "当前地址簿文件夹有 %d 张名片"
#: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:12
msgid "Open"
msgstr "打开"
@@ -140,7 +140,7 @@ msgid "calendar view for one or more days"
msgstr "一天或多天的日历视图"
#: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:660
+#: ../calendar/gui/calendar-component.c:661
msgid "%A %d %b %Y"
msgstr "%Y年%-m月%-d日%A"
@@ -151,18 +151,18 @@ msgstr "%Y年%-m月%-d日%A"
#. You can change the order but don't change the
#. specifiers or add anything.
#: ../a11y/calendar/ea-gnome-calendar.c:190
-#: ../calendar/gui/calendar-component.c:663
+#: ../calendar/gui/calendar-component.c:664
#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
-#: ../calendar/gui/e-week-view-main-item.c:321
+#: ../calendar/gui/e-week-view-main-item.c:322
msgid "%a %d %b"
msgstr "%-m月%-d日%A"
#: ../a11y/calendar/ea-gnome-calendar.c:192
#: ../a11y/calendar/ea-gnome-calendar.c:197
#: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:665
-#: ../calendar/gui/calendar-component.c:670
-#: ../calendar/gui/calendar-component.c:672
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
msgid "%a %d %b %Y"
msgstr "%Y年%-m月%-d日%A"
@@ -170,10 +170,10 @@ msgstr "%Y年%-m月%-d日%A"
#: ../a11y/calendar/ea-gnome-calendar.c:222
#: ../a11y/calendar/ea-gnome-calendar.c:228
#: ../a11y/calendar/ea-gnome-calendar.c:230
-#: ../calendar/gui/calendar-component.c:684
-#: ../calendar/gui/calendar-component.c:691
-#: ../calendar/gui/calendar-component.c:697
-#: ../calendar/gui/calendar-component.c:699
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
msgid "%d %b %Y"
msgstr "%Y年%-m月%-d日"
@@ -183,9 +183,9 @@ msgstr "%Y年%-m月%-d日"
#. month name. You can change the order but don't
#. change the specifiers or add anything.
#: ../a11y/calendar/ea-gnome-calendar.c:220
-#: ../calendar/gui/calendar-component.c:689
+#: ../calendar/gui/calendar-component.c:690
#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../calendar/gui/e-week-view-main-item.c:336
msgid "%d %b"
msgstr "%B%-d日"
@@ -528,7 +528,8 @@ 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:393
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:629
msgid "Contacts"
msgstr "联系人"
@@ -568,11 +569,11 @@ msgstr "在此管理您的 S/MIME 证书"
#. On This Computer is always first and Search Folders is always last
#: ../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: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
+#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
+#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
#: ../mail/mail-vfolder.c:223
msgid "On This Computer"
msgstr "在此计算机中"
@@ -585,11 +586,11 @@ msgstr "在此计算机中"
#: ../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: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
+#: ../calendar/gui/calendar-component.c:217
+#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
+#: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
+#: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.c:87
#: ../mail/mail-config.glade.h:104
msgid "Personal"
msgstr "个人"
@@ -617,7 +618,7 @@ msgid "Create a new contact list"
msgstr "创建一个新的联系人列表"
#: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1202
+#: ../addressbook/gui/component/addressbook-config.c:1204
msgid "New Address Book"
msgstr "新地址簿"
@@ -647,56 +648,56 @@ msgstr "类型(_T):"
msgid "Copy book content locally for offline operation"
msgstr "将地址簿内容复制到本地以进行脱机操作"
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:983
#: ../addressbook/gui/component/ldap-config.glade.h:22
#: ../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
-#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:85
#: ../smime/gui/smime-ui.glade.h:28
msgid "General"
msgstr "常规"
-#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/component/addressbook-config.c:984
#: ../mail/importers/pine-importer.c:392
msgid "Addressbook"
msgstr "地址簿"
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:988
msgid "Server Information"
msgstr "服务器信息"
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:990
msgid "Authentication"
msgstr "身份验证"
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:993
#: ../addressbook/gui/component/ldap-config.glade.h:17
#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
msgid "Details"
msgstr "细节"
-#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/addressbook-config.c:994
msgid "Searching"
msgstr "搜索"
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:996
msgid "Downloading"
msgstr "下载"
-#: ../addressbook/gui/component/addressbook-config.c:1200
+#: ../addressbook/gui/component/addressbook-config.c:1202
#: ../addressbook/gui/component/ldap-config.glade.h:13
msgid "Address Book Properties"
msgstr "地址簿属性"
#: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:147 ../mail/em-migrate.c:1200
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
msgid "Migrating..."
msgstr "正在升迁..."
#: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:194 ../mail/em-migrate.c:1241
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
#, c-format
msgid "Migrating `%s':"
msgstr "升迁“%s”:"
@@ -757,19 +758,19 @@ msgstr "新建地址簿(_N)"
#. FIXME: need to disable for undeletable folders
#: ../addressbook/gui/component/addressbook-view.c:770
#: ../addressbook/gui/widgets/e-addressbook-view.c:966
-#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/calendar-component.c:538
#: ../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
+#: ../calendar/gui/e-calendar-view.c:1628 ../calendar/gui/e-memo-table.c:871
+#: ../calendar/gui/tasks-component.c:443 ../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-calendar.xml.h:38 ../ui/evolution-mail-list.xml.h:30
#: ../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:443
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/tasks-component.c:444
msgid "_Properties..."
msgstr "属性(_P)..."
@@ -1111,7 +1112,7 @@ msgid "cards"
msgstr "名片"
#: ../addressbook/gui/component/ldap-config.glade.h:57
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
#: ../calendar/gui/alarm-notify/util.c:64
#: ../calendar/gui/alarm-notify/util.c:66
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
@@ -1119,7 +1120,7 @@ msgstr "名片"
#: ../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-http/calendar-http.c:286
#: ../plugins/calendar-weather/calendar-weather.c:563
msgid "minutes"
msgstr "分钟"
@@ -1184,13 +1185,13 @@ msgid "<b>Work</b>"
msgstr "<b>工作</b>"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
#: ../addressbook/gui/widgets/eab-contact-display.c:348
msgid "AIM"
msgstr "AIM"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: ../addressbook/gui/widgets/e-minicard.c:182
@@ -1198,9 +1199,9 @@ msgid "Contact"
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:2379
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:527
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2380
msgid "Contact Editor"
msgstr "联系人编辑器"
@@ -1241,9 +1242,9 @@ msgstr "电话"
#. red
#: ../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:1052
-#: ../mail/mail-config.c:85 ../mail/mail-config.glade.h:154
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.c:86 ../mail/mail-config.glade.h:154
msgid "Work"
msgstr "工作"
@@ -1265,7 +1266,7 @@ msgid "_Birthday:"
msgstr "生日(_B):"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1661
+#: ../plugins/itip-formatter/itip-view.c:1662
msgid "_Calendar:"
msgstr "日历(_C):"
@@ -1367,7 +1368,7 @@ msgstr "地址"
#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
#: ../addressbook/gui/widgets/e-addressbook-model.c:310
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
@@ -1377,8 +1378,8 @@ msgstr "地址"
#: ../addressbook/gui/widgets/e-minicard.c:175
#: ../widgets/menus/gal-define-views-model.c:181
#: ../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
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3612
+#: ../widgets/text/e-text.c:3613
msgid "Editable"
msgstr "可编辑"
@@ -2364,7 +2365,7 @@ msgid "AOL Instant Messenger"
msgstr "AOL 即时通讯程序"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
#: ../addressbook/gui/widgets/eab-contact-display.c:351
msgid "Jabber"
msgstr "Jabber"
@@ -2374,7 +2375,7 @@ msgid "Yahoo Messenger"
msgstr "雅虎通"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
#: ../addressbook/gui/widgets/eab-contact-display.c:350
msgid "ICQ"
msgstr "ICQ"
@@ -2385,7 +2386,7 @@ msgstr "服务"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
#: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:455
+#: ../plugins/publish-calendar/publish-calendar.c:461
#: ../plugins/save-calendar/csv-format.c:400
msgid "Location"
msgstr "位置"
@@ -2395,69 +2396,69 @@ msgid "Username"
msgstr "用户名"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
msgid "Home"
msgstr "家庭"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
msgid "Other"
msgstr "其它"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
#: ../addressbook/gui/widgets/eab-contact-display.c:353
msgid "Yahoo"
msgstr "雅虎"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
#: ../addressbook/gui/widgets/eab-contact-display.c:352
msgid "MSN"
msgstr "MSN"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
#: ../addressbook/gui/widgets/eab-contact-display.c:349
msgid "GroupWise"
msgstr "GroupWise"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
msgid "Source Book"
msgstr "来源地址簿"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
msgid "Target Book"
msgstr "目标地址簿"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
msgid "Is New Contact"
msgstr "为新联系人"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
msgid "Writable Fields"
msgstr "可写域"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
msgid "Required Fields"
msgstr "必需域"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
msgid "Changed"
msgstr "已更改"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:536
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2374
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:537
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2375
#, c-format
msgid "Contact Editor - %s"
msgstr "联系人编辑器 - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2687
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2713
msgid "Please select an image for this contact"
msgstr "请选择此联系人的图像"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2688
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2714
msgid "No image"
msgstr "无图像"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2967
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2465,7 +2466,7 @@ msgstr ""
"联系人数据无效:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3019
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3045
msgid "Invalid contact."
msgstr "无效的联系人。"
@@ -2748,7 +2749,7 @@ msgstr "获取名簿视图出错"
#: ../widgets/table/e-table.c:3344
#: ../widgets/table/e-tree-selection-model.c:825
#: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
+#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
msgid "Model"
msgstr "模型"
@@ -2776,10 +2777,13 @@ msgid "Any field contains"
msgstr "任何域含有"
#: ../addressbook/gui/widgets/e-addressbook-view.c:174
-#: ../addressbook/gui/widgets/e-addressbook-view.c:179
msgid "Advanced..."
msgstr "高级..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:179
+msgid "_Advanced..."
+msgstr "高级(_A)..."
+
#: ../addressbook/gui/widgets/e-addressbook-view.c:231
msgid "Source"
msgstr "来源"
@@ -2804,9 +2808,9 @@ msgid "Save as VCard..."
msgstr "另存为 VCard..."
#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-#: ../calendar/gui/dialogs/comp-editor.c:1069
+#: ../calendar/gui/dialogs/comp-editor.c:1093
#: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1553 ../calendar/gui/e-memo-table.c:854
+#: ../calendar/gui/e-calendar-view.c:1606 ../calendar/gui/e-memo-table.c:854
#: ../ui/evolution-addressbook.xml.h:38
msgid "_Open"
msgstr "打开(_O)"
@@ -2857,20 +2861,20 @@ msgid "Mo_ve to Address Book..."
msgstr "移动到地址簿(_V)..."
#: ../addressbook/gui/widgets/e-addressbook-view.c:963
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:8
+#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
msgid "Cu_t"
msgstr "剪切(_T)"
#: ../addressbook/gui/widgets/e-addressbook-view.c:964
-#: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/dialogs/comp-editor.c:433
+#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/dialogs/comp-editor.c:445
#: ../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
+#: ../calendar/gui/e-calendar-view.c:1613 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3102
#: ../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
+#: ../mail/message-list.c:1729 ../ui/evolution-addressbook.xml.h:32
+#: ../ui/evolution-calendar.xml.h:37 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
msgid "_Copy"
msgstr "复制(_C)"
@@ -2932,7 +2936,7 @@ msgstr "公司电话"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
#: ../addressbook/gui/widgets/eab-contact-display.c:567
-#: ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:827
msgid "Email"
msgstr "电子邮件"
@@ -3074,8 +3078,8 @@ msgstr "网站"
#: ../widgets/table/e-table-group-container.c:972
#: ../widgets/table/e-table-group-leaf.c:629
#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3012 ../widgets/table/e-table-item.c:3013
-#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
+#: ../widgets/table/e-table-item.c:3024 ../widgets/table/e-table-item.c:3025
+#: ../widgets/text/e-text.c:3654 ../widgets/text/e-text.c:3655
msgid "Width"
msgstr "宽度"
@@ -3089,8 +3093,8 @@ msgstr "宽度"
#: ../widgets/table/e-table-group-container.c:965
#: ../widgets/table/e-table-group-leaf.c:622
#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../widgets/table/e-table-item.c:3030 ../widgets/table/e-table-item.c:3031
+#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
msgid "Height"
msgstr "高度"
@@ -3242,107 +3246,107 @@ msgid "Home page"
msgstr "主页"
#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:50
msgid "Success"
msgstr "成功"
#. E_BOOK_ERROR_INVALID_ARG
#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
msgid "Backend busy"
msgstr "后台忙"
#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
msgid "Repository offline"
msgstr "仓库脱机"
#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
msgid "Address Book does not exist"
msgstr "地址簿不存在"
#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
msgid "No Self Contact defined"
msgstr "未定义自身联系人"
#. E_BOOK_ERROR_URI_NOT_LOADED
#. E_BOOK_ERROR_URI_ALREADY_LOADED
#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
msgid "Permission denied"
msgstr "没有权限"
#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
msgid "Contact not found"
msgstr "找不到联系人"
#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
msgid "Contact ID already exists"
msgstr "联系人 ID 已经存在"
#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
msgid "Protocol not supported"
msgstr "不支持的协议"
#. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
#: ../calendar/gui/dialogs/task-details-page.glade.h:3
#: ../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 "已经取消"
+#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2376
+msgid "Canceled"
+msgstr "已取消"
#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
msgid "Could not cancel"
msgstr "无法取消"
#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
#: ../calendar/gui/comp-editor-factory.c:438
msgid "Authentication Failed"
msgstr "认证失败"
#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
msgid "Authentication Required"
msgstr "必须认证"
#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
msgid "TLS not Available"
msgstr "TLS 不可用"
#. E_BOOK_ERROR_CORBA_EXCEPTION
#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
msgid "No such source"
msgstr "没有来源"
#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
msgid "Not available in offline mode"
msgstr "脱机模式下不可用"
#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
msgid "Other error"
msgstr "其它错误"
#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
msgid "Invalid server version"
msgstr "无效的服务器版本"
-#: ../addressbook/gui/widgets/eab-gui-util.c:93
+#: ../addressbook/gui/widgets/eab-gui-util.c:94
msgid ""
"We were unable to open this addressbook. This either means this book is not "
"marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3351,7 +3355,7 @@ msgstr ""
"我们无法打开此地址簿。这可能意味着这本地址簿没有标为脱机使用,或者尚未下载完"
"成以供脱机使用。请在联机模式中装入此地址簿以便下载其内容"
-#: ../addressbook/gui/widgets/eab-gui-util.c:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:103
#, c-format
msgid ""
"We were unable to open this addressbook. Please check that the path %s "
@@ -3359,7 +3363,7 @@ msgid ""
msgstr ""
"我们无法打开此地址簿。请检查路径 %s 是否存在以及您是否有足够的权限访问它。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:111
+#: ../addressbook/gui/widgets/eab-gui-util.c:112
msgid ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the LDAP server is unreachable."
@@ -3367,7 +3371,7 @@ msgstr ""
"我们无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为LDAP 服务器"
"已经关闭。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
msgid ""
"This version of Evolution does not have LDAP support compiled in to it. If "
"you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3376,7 +3380,7 @@ msgstr ""
"本版本的 Evolution 并没有把 LDAP 支持编译进去。如果您希望在 Evolution 中使用 "
"LDAP,就必须安装启用了 LDAP 的 Evolution 包。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:123
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
msgid ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the server is unreachable."
@@ -3384,7 +3388,7 @@ msgstr ""
"我们无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为服务器已经"
"关闭。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:146
+#: ../addressbook/gui/widgets/eab-gui-util.c:147
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -3395,7 +3399,7 @@ msgstr ""
"Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
"搜索条件,或者在此地址簿的目录服务器参数中将结果限制调高。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
"you have configured for this addressbook. Please make your search\n"
@@ -3406,45 +3410,45 @@ msgstr ""
"请在搜索的时候指定更加严格的搜索条件,或者在此地址簿的目录服务器参数\n"
"中将时间限制调高。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
msgid "The backend for this addressbook was unable to parse this query."
msgstr "此地址簿的后端无法解析此查询。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:161
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
msgid "The backend for this addressbook refused to perform this query."
msgstr "此地址簿的后端拒绝执行此查询。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:165
msgid "This query did not complete successfully."
msgstr "此查询未成功完成。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
msgid "Error adding list"
msgstr "添加列表出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
-#: ../addressbook/gui/widgets/eab-gui-util.c:694
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
msgid "Error adding contact"
msgstr "添加联系人出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:197
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
msgid "Error modifying list"
msgstr "修改列表出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:197
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
msgid "Error modifying contact"
msgstr "修改联系人出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
msgid "Error removing list"
msgstr "删除列表出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:649
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
msgid "Error removing contact"
msgstr "删除联系人出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:291
+#: ../addressbook/gui/widgets/eab-gui-util.c:292
#, c-format
msgid ""
"Opening %d contact will open %d new window as well.\n"
@@ -3456,7 +3460,7 @@ msgstr[0] ""
"打开 %d 个联系人将同时打开 %d 个新窗口。\n"
"您真的想要显示所有联系人吗?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:320
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
#, c-format
msgid ""
"%s already exists\n"
@@ -3465,63 +3469,63 @@ msgstr ""
"%s 已经存在\n"
"您打算覆盖它吗?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
msgid "Overwrite"
msgstr "覆盖"
#. more than one, finding the total number of contacts might
#. * hit performance while saving large number of contacts
#.
-#: ../addressbook/gui/widgets/eab-gui-util.c:369
-#: ../addressbook/gui/widgets/eab-gui-util.c:372
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
msgid "contact"
msgid_plural "contacts"
msgstr[0] "联系人"
#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:419
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
msgid "card.vcf"
msgstr "card.vcf"
-#: ../addressbook/gui/widgets/eab-gui-util.c:595
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
msgid "list"
msgstr "列表"
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
msgid "Move contact to"
msgstr "将联系人移动到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:757
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
msgid "Copy contact to"
msgstr "将联系人复制到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:760
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
msgid "Move contacts to"
msgstr "将联系人移动到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:762
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
msgid "Copy contacts to"
msgstr "将联系人复制到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
+#: ../addressbook/gui/widgets/eab-gui-util.c:766
msgid "Select target addressbook."
msgstr "从地址簿中选择目标联系人。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:988
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
msgid "Multiple VCards"
msgstr "多个 VCard"
-#: ../addressbook/gui/widgets/eab-gui-util.c:991
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
#, c-format
msgid "VCard for %s"
msgstr "%s 的 VCard"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1032
-#: ../addressbook/gui/widgets/eab-gui-util.c:1050
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
msgid "Contact information"
msgstr "联系人信息"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
#, c-format
msgid "Contact information for %s"
msgstr "%s 的联系人信息"
@@ -3588,6 +3592,36 @@ msgstr "名片视图"
msgid "GTK Tree View"
msgstr "GTK 树视图"
+#: ../addressbook/importers/evolution-csv-importer.c:521
+#: ../mail/importers/evolution-outlook-importer.c:264
+#: ../mail/importers/netscape-importer.c:1252
+msgid "Importing..."
+msgstr "正在导入..."
+
+#: ../addressbook/importers/evolution-csv-importer.c:723
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr "Outlook CSV 或 Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:724
+msgid "Outlook CSV and Tab Importer"
+msgstr "Outlook CSV 和 Tab 导入器"
+
+#: ../addressbook/importers/evolution-csv-importer.c:732
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr "Mozilla CSV 或 Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:733
+msgid "Mozilla CSV and Tab Importer"
+msgstr "Mozilla CSV 和 Tab 导入器"
+
+#: ../addressbook/importers/evolution-csv-importer.c:741
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr "Evolution CSV 或 Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:742
+msgid "Evolution CSV and Tab Importer"
+msgstr "Evolution CSV 和 Tab 导入器"
+
#: ../addressbook/importers/evolution-ldif-importer.c:583
#: ../addressbook/importers/evolution-vcard-importer.c:250
#: ../calendar/importers/icalendar-importer.c:312
@@ -4008,38 +4042,37 @@ msgid "Are you sure you want to send the task without a summary?"
msgstr "您确定想要发送没有概览的任务吗?"
#: ../calendar/calendar.error.xml.h:23
+msgid "Cannot create a new event"
+msgstr "无法创建新事件"
+
+#: ../calendar/calendar.error.xml.h:24
msgid "Delete calendar '{0}'?"
msgstr "删除日历“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:25
msgid "Delete memo list '{0}'?"
msgstr "删除备忘列表“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:26
msgid "Delete task list '{0}'?"
msgstr "删除任务列表“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:26
-msgid "Don't Send"
+#: ../calendar/calendar.error.xml.h:27
+msgid "Do not Send"
msgstr "不发送"
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
msgid "Download in progress. Do you want to save the appointment?"
msgstr "下载进行中。您想要保存约会吗?"
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
msgid "Download in progress. Do you want to save the task?"
msgstr "下载进行中。您想要保存任务吗?"
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
msgid "Editor could not be loaded."
msgstr "无法装入编辑器。"
-#: ../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:31
msgid ""
"Email invitations will be sent to all participants and allow them to accept "
@@ -4047,137 +4080,146 @@ msgid ""
msgstr "将会向全部出席者发送电子邮件邀请,并允许他们接受此任务。"
#: ../calendar/calendar.error.xml.h:32
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr "将会向全部出席者发送电子邮件邀请,并允许他们答复。"
+
+#: ../calendar/calendar.error.xml.h:33
msgid "Error loading calendar"
msgstr "装入日历时出错"
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
msgid "Error loading memo list"
msgstr "装入备忘列表出错"
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
msgid "Error loading task list"
msgstr "装入任务列表出错"
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
"the journal has been deleted."
-msgstr "如果您不发送取消通知,其他出席者人可能不知道日记项已经删除。"
+msgstr "如果您不发送取消通知,其他出席者人可能不知道日记已经删除。"
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
"the meeting is canceled."
msgstr "如果您不发送取消通知,其他出席者也许不知道会议已经取消。"
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
"the task has been deleted."
msgstr "如果您不发送取消通知,其他出席者可能不知道任务已经删除。"
-#: ../calendar/calendar.error.xml.h:38
-#: ../ui/evolution-message-composer.xml.h:28
+#: ../calendar/calendar.error.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:29
msgid "Send"
msgstr "发送"
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
msgid "Send Notice"
msgstr "发送通知"
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
msgid ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
msgstr "发送更新的信息将允许其他出席者使他们的日历保持最新。"
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
msgid ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
msgstr "发送更新的信息允许其他出席者使他们的任务列表保持最新。"
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
msgid ""
"Some attachments are being downloaded. Saving the appointment would result "
"in the loss of these attachments."
msgstr "附件正在下载中。保存约会将使得约会保存时无法包含后续的附件。"
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:44
msgid ""
"Some attachments are being downloaded. Saving the task would result in the "
"loss of these attachments."
msgstr "附件正在下载中。保存任务将使得任务保存时无法包含后续的附件。"
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
msgid "Some features may not work properly with your current server."
msgstr "某些特性可能无法在您目前的服务器下工作。"
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
msgid "The Evolution calendar has quit unexpectedly."
msgstr "Evolution 日历异常退出。"
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:47
msgid "The Evolution tasks have quit unexpectedly."
msgstr "Evolution 任务异常退出。"
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:48
msgid "The calendar is not marked for offline usage."
msgstr "日历未标为脱机使用。"
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
+msgid "The calendar you have selected is read-only"
+msgstr "您所选的日历为只读"
+
+#: ../calendar/calendar.error.xml.h:50
msgid "The memo list is not marked for offline usage"
msgstr "备忘列表未标为脱机使用"
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:51
msgid "The task list is not marked for offline usage."
msgstr "任务列表未标为脱机使用。"
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:52
msgid "This calendar will be removed permanently."
msgstr "此日历将被永久删除。"
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:53
msgid "This memo list will be removed permanently."
msgstr "此备忘列表将被永久删除。"
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:54
msgid "This task list will be removed permanently."
msgstr "此任务列表将被永久删除。"
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:55
msgid "Would you like to save your changes to this appointment?"
msgstr "您想要保存对约会的更改吗?"
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:56
msgid "Would you like to save your changes to this task?"
msgstr "您想要保存对此任务的更改吗?"
-#: ../calendar/calendar.error.xml.h:55
-msgid "Would you like to send a cancellation notice for this journal entry?"
+#: ../calendar/calendar.error.xml.h:57
+msgid "Would you like to send a cancelation notice for this journal entry?"
msgstr "您是否想要为此日记项发送取消通知?"
-#: ../calendar/calendar.error.xml.h:56
-msgid "Would you like to send all the participants a cancellation notice?"
+#: ../calendar/calendar.error.xml.h:58
+msgid "Would you like to send all the participants a cancelation notice?"
msgstr "您是否想要给全部出席者发送取消通知?"
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:59
msgid "Would you like to send meeting invitations to participants?"
msgstr "您是否想要给出席者发送会议邀请?"
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:60
msgid "Would you like to send this task to participants?"
msgstr "您是否想要将此任务发送给出席者?"
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:61
msgid "Would you like to send updated meeting information to participants?"
msgstr "您是否想要给出席者发送更新的会议信息?"
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:62
msgid "Would you like to send updated task information to participants?"
msgstr "您是否想要给出席者发送更新的任务信息?"
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:63
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results, the server should be upgraded to "
@@ -4186,42 +4228,42 @@ msgstr ""
"您正在连接到不支持的 GroupWise 服务器,此时使用 Evolution 可能遇到问题。为了"
"得到最佳效果,服务器应该升级到支持的版本。"
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:64
msgid "You have changed this appointment, but not yet saved them."
msgstr "您已经更改了此约会,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:65
msgid "You have made changes to this task, but not yet saved them."
msgstr "您已经对此任务做出了更改,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:66
msgid "Your calendars will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的日历无法使用。"
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:67
msgid "Your tasks will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的任务将无法使用。"
-#: ../calendar/calendar.error.xml.h:66
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:68
+#: ../composer/mail-composer.error.xml.h:27
msgid "_Discard Changes"
msgstr "丢弃更改(_D)"
-#: ../calendar/calendar.error.xml.h:67 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
#: ../ui/evolution-message-composer.xml.h:53
msgid "_Save"
msgstr "保存(_S)"
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:70
msgid "_Save Changes"
msgstr "保存更改(_S)"
-#: ../calendar/calendar.error.xml.h:69
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:129
+#: ../calendar/calendar.error.xml.h:71
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
msgid "_Send"
msgstr "发送(_S)"
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:72
msgid "{0}."
msgstr "{0}。"
@@ -4278,7 +4320,7 @@ msgid "Calendar and Tasks"
msgstr "日历和任务"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1290
+#: ../calendar/gui/calendar-component.c:1291
msgid "Calendars"
msgstr "日历"
@@ -4319,17 +4361,18 @@ 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:529
-#: ../calendar/gui/memos-component.c:999 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memos.c:1092 ../calendar/gui/memos-component.c:530
+#: ../calendar/gui/memos-component.c:1000 ../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:520
-#: ../calendar/gui/tasks-component.c:1014 ../calendar/gui/tasks-control.c:472
+#: ../calendar/gui/e-tasks.c:1334 ../calendar/gui/print.c:1832
+#: ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1015 ../calendar/gui/tasks-control.c:472
#: ../calendar/importers/icalendar-importer.c:80
#: ../calendar/importers/icalendar-importer.c:741
+#: ../plugins/exchange-operations/exchange-folder.c:635
#: ../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
@@ -4349,7 +4392,7 @@ msgstr "任务(_T)"
msgid "Evolution Calendar alarm notification service"
msgstr "Evolution 日历提醒通知服务"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
#: ../calendar/gui/alarm-notify/util.c:64
#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:111
#: ../calendar/gui/misc.c:113
@@ -4357,18 +4400,29 @@ msgid "minute"
msgid_plural "minutes"
msgstr[0] "分钟"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/calendar-http/calendar-http.c:287
+#: ../plugins/calendar-weather/calendar-weather.c:564
+msgid "hours"
+msgid_plural "hours"
+msgstr[0] "小时"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
msgid "Start time"
msgstr "开始时间"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:356
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:374
#, c-format
msgid ""
"<big><b>%s</b></big>\n"
-"%s until %s"
+"%s %s"
msgstr ""
"<big><b>%s</b></big>\n"
-"%s 直道 %s"
+"%s %s"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
@@ -4380,7 +4434,7 @@ msgstr "约会"
#: ../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
+#: ../plugins/itip-formatter/itip-view.c:884
msgid "Location:"
msgstr "位置:"
@@ -4394,13 +4448,13 @@ msgstr "午睡时间(_T):"
#: ../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-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-composer-entries.xml.h:14 ../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:45
-#: ../ui/evolution-signature-editor.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-signature-editor.xml.h:24
#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:38
msgid "_Edit"
msgstr "编辑(_E)"
@@ -4408,52 +4462,52 @@ msgstr "编辑(_E)"
msgid "_Snooze"
msgstr "午睡(_S)"
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
msgid "location of appointment"
msgstr "约会位置"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1127
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1129
msgid "<b>Calendars</b>"
msgstr "<b>日历</b>"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1193
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1195
msgid "Preferences"
msgstr "首选项"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1206
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1208
msgid "_Configure Alarms"
msgstr "配置提醒(_C)"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1208 ../ui/evolution.xml.h:45
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1210 ../ui/evolution.xml.h:45
msgid "_Quit"
msgstr "退出(_Q)"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1356
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1358
#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
msgid "No summary available."
msgstr "没有可用的概览。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1365
#: ../calendar/gui/alarm-notify/alarm-queue.c:1367
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1369
msgid "No description available."
msgstr "没有描述。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1375
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1377
msgid "No location information available."
msgstr "没有可用的位置信息。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1414
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1416
#, c-format
msgid "You have %d alarms"
msgstr "您有 %d 个提醒"
#. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1580
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
msgid "Warning"
msgstr "警告"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1590
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1584
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -4465,7 +4519,7 @@ msgstr ""
"发送电子邮件。Evolution 将以\n"
"显示普通提示会话框代替。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4481,7 +4535,7 @@ msgstr ""
"\n"
"您确信您要运行该程序吗?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1630
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1624
msgid "Do not ask me about this program again."
msgstr "不要再次询问此问题。"
@@ -4607,11 +4661,11 @@ msgid "Default reminder value"
msgstr "默认提醒值"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Free/busy server urls"
+msgid "Free/busy server URLs"
msgstr "忙/闲服务器 URL"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Free/busy template url"
+msgid "Free/busy template URL"
msgstr "忙/闲模板 URL"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
@@ -4647,7 +4701,7 @@ msgid "Last alarm time"
msgstr "上次提醒时间"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-msgid "List of server urls for free/busy publishing."
+msgid "List of server URLs for free/busy publishing."
msgstr "列出发表忙/闲的服务器 URL。"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
@@ -4778,22 +4832,22 @@ msgstr "今天到期的任务颜色"
msgid "Tasks vertical pane position"
msgstr "任务垂直面板位置"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#, no-c-format
msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
msgstr ""
-"日历中日期和时间所使用的默认时区,以未翻译的时区数据库位置表示,如“Asia/"
-"Shanghai”。"
+"用作忙/闲数据发布的 URL 模板,%u 将替换为电子邮件的用户部分,而 %d 将替换为域"
+"名。"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
-#, no-c-format
msgid ""
-"The url template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
msgstr ""
-"用作忙/闲数据发布的 URL 模板,%u 将替换为电子邮件的拥护不分,而 %d 将替换为域"
-"名。"
+"日历中日期和时间所使用的默认时区,以未翻译的时区数据库位置表示,如“Asia/"
+"Shanghai”。"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
msgid "Time divisions"
@@ -4936,17 +4990,18 @@ msgstr "位置含有"
msgid "Unmatched"
msgstr "无匹配"
-#: ../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:76 ../ui/evolution-memos.xml.h:11
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2513
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
#: ../ui/evolution-tasks.xml.h:14
msgid "Print"
msgstr "打印"
#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:708
+#: ../calendar/gui/calendar-component.c:709
#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2117
+#: ../calendar/gui/gnome-cal.c:2123
+#: ../plugins/exchange-operations/exchange-folder.c:623
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
@@ -4971,7 +5026,7 @@ msgstr "销毁较早的事件"
#: ../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
+#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
#: ../plugins/calendar-weather/calendar-weather.c:565
#: ../widgets/misc/e-send-options.glade.h:36
msgid "days"
@@ -4981,90 +5036,90 @@ msgstr "天"
#. Create the LDAP source group
#. Create the Webcal source group
#. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:234
-#: ../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
+#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
+#: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
+#: ../calendar/gui/tasks-component.c:217
msgid "On The Web"
msgstr "网上"
-#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:396
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
msgid "Birthdays & Anniversaries"
msgstr "生日和纪念日"
#. Create the weather group
-#: ../calendar/gui/calendar-component.c:258
+#: ../calendar/gui/calendar-component.c:259
#: ../plugins/calendar-weather/calendar-weather.c:100
msgid "Weather"
msgstr "天气"
-#: ../calendar/gui/calendar-component.c:535
+#: ../calendar/gui/calendar-component.c:536
msgid "_New Calendar"
msgstr "新建日历(_N)"
-#: ../calendar/gui/calendar-component.c:839
+#: ../calendar/gui/calendar-component.c:840
msgid "Failed upgrading calendars."
msgstr "升级日历失败。"
-#: ../calendar/gui/calendar-component.c:1138
+#: ../calendar/gui/calendar-component.c:1139
#, c-format
msgid "Unable to open the calendar '%s' for creating events and meetings"
msgstr "无法打开日历“%s”来创建事件和会议"
-#: ../calendar/gui/calendar-component.c:1151
+#: ../calendar/gui/calendar-component.c:1152
msgid "There is no calendar available for creating events and meetings"
msgstr "没有可创建事件和会议的日历"
-#: ../calendar/gui/calendar-component.c:1265
+#: ../calendar/gui/calendar-component.c:1266
msgid "Calendar Source Selector"
msgstr "日历源选择器"
-#: ../calendar/gui/calendar-component.c:1456
+#: ../calendar/gui/calendar-component.c:1457
msgid "New appointment"
msgstr "新建约会"
-#: ../calendar/gui/calendar-component.c:1457
+#: ../calendar/gui/calendar-component.c:1458
msgid "_Appointment"
msgstr "约会(_A)"
-#: ../calendar/gui/calendar-component.c:1458
+#: ../calendar/gui/calendar-component.c:1459
msgid "Create a new appointment"
msgstr "创建新约会"
-#: ../calendar/gui/calendar-component.c:1464
+#: ../calendar/gui/calendar-component.c:1465
msgid "New meeting"
msgstr "新建会议"
-#: ../calendar/gui/calendar-component.c:1465
+#: ../calendar/gui/calendar-component.c:1466
msgid "M_eeting"
msgstr "会议(_E)"
-#: ../calendar/gui/calendar-component.c:1466
+#: ../calendar/gui/calendar-component.c:1467
msgid "Create a new meeting request"
msgstr "创建一条新会议请求"
-#: ../calendar/gui/calendar-component.c:1472
+#: ../calendar/gui/calendar-component.c:1473
msgid "New all day appointment"
msgstr "新建全天约会"
-#: ../calendar/gui/calendar-component.c:1473
+#: ../calendar/gui/calendar-component.c:1474
msgid "All Day A_ppointment"
msgstr "全天约会(_P)"
-#: ../calendar/gui/calendar-component.c:1474
+#: ../calendar/gui/calendar-component.c:1475
msgid "Create a new all-day appointment"
msgstr "创建新全天约会"
-#: ../calendar/gui/calendar-component.c:1480
+#: ../calendar/gui/calendar-component.c:1481
msgid "New calendar"
msgstr "新建日历"
-#: ../calendar/gui/calendar-component.c:1481
-#: ../calendar/gui/dialogs/event-page.c:870
+#: ../calendar/gui/calendar-component.c:1482
+#: ../calendar/gui/dialogs/event-page.c:872
msgid "Cale_ndar"
msgstr "日历(_N)"
-#: ../calendar/gui/calendar-component.c:1482
+#: ../calendar/gui/calendar-component.c:1483
msgid "Create a new calendar"
msgstr "创建新日历"
@@ -5129,17 +5184,17 @@ msgid "Mes_sage:"
msgstr "消息(_S):"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/e-alarm-list.c:449
msgid "Play a sound"
msgstr "播放声音"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/e-alarm-list.c:453
msgid "Pop up an alert"
msgstr "弹出警告"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/e-alarm-list.c:461
msgid "Run a program"
msgstr "运行程序"
@@ -5148,7 +5203,7 @@ msgid "Send To:"
msgstr "发送给:"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:457
msgid "Send an email"
msgstr "发送电子邮件"
@@ -5193,14 +5248,6 @@ msgstr "每个额外时间"
msgid "hour(s)"
msgstr "小时"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:564
-msgid "hours"
-msgstr "小时"
-
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
msgid "minute(s)"
msgstr "分钟"
@@ -5553,7 +5600,7 @@ msgid "Task List Properties"
msgstr "任务列表属性"
#: ../calendar/gui/dialogs/calendar-setup.c:594
-#: ../calendar/gui/memos-component.c:449
+#: ../calendar/gui/memos-component.c:450
msgid "New Memo List"
msgstr "新建备忘列表"
@@ -5579,18 +5626,19 @@ msgid "_Add Task List"
msgstr "添加任务列表(_A)"
#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
-#: ../plugins/calendar-http/calendar-http.c:248
+#: ../plugins/calendar-http/calendar-http.c:271
#: ../plugins/calendar-weather/calendar-weather.c:548
msgid "_Refresh:"
msgstr "刷新(_R):"
#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../plugins/calendar-http/calendar-http.c:120
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:133
msgid "_URL:"
msgstr "_URL:"
#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
+#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
#: ../plugins/calendar-weather/calendar-weather.c:566
msgid "weeks"
msgstr "周"
@@ -5639,158 +5687,158 @@ msgstr "%s 您已经做出了修改。放弃这些修改并更新编辑器吗
msgid "%s You have made no changes, update the editor?"
msgstr "%s 您还没有进行修改,更新编辑器吗?"
-#: ../calendar/gui/dialogs/comp-editor-page.c:464
+#: ../calendar/gui/dialogs/comp-editor-page.c:515
#, c-format
msgid "Validation error: %s"
msgstr "校验错误:%s"
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2270
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2271
msgid " to "
msgstr " 到 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2275
msgid " (Completed "
msgstr " (完成 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2276
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2277
msgid "Completed "
msgstr "已完成 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2281
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2282
msgid " (Due "
msgstr " (预定 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2283
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2284
msgid "Due "
msgstr "预定 "
-#: ../calendar/gui/dialogs/comp-editor.c:195 ../composer/e-msg-composer.c:2825
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2854
#, c-format
msgid "Attached message - %s"
msgstr "附加的信件 - %s"
#. translators, this count will always be >1
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:212
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2859
+#: ../composer/e-msg-composer.c:3038
#, c-format
msgid "Attached message"
msgid_plural "%d attached messages"
msgstr[0] "%d 封附加的信件"
-#: ../calendar/gui/dialogs/comp-editor.c:434 ../composer/e-msg-composer.c:3075
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3103
#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1717
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1730
msgid "_Move"
msgstr "移动(_M)"
-#: ../calendar/gui/dialogs/comp-editor.c:436 ../composer/e-msg-composer.c:3077
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1719
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3105
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1732
msgid "Cancel _Drag"
msgstr "取消拖曳(_D)"
-#: ../calendar/gui/dialogs/comp-editor.c:782
+#: ../calendar/gui/dialogs/comp-editor.c:806
msgid "Could not update object"
msgstr "无法更新对象"
-#: ../calendar/gui/dialogs/comp-editor.c:928 ../composer/e-msg-composer.c:2468
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../composer/e-msg-composer.c:2483
#, c-format
msgid "<b>%d</b> Attachment"
msgid_plural "<b>%d</b> Attachments"
msgstr[0] "<b>%d</b> 个附件"
-#: ../calendar/gui/dialogs/comp-editor.c:958
+#: ../calendar/gui/dialogs/comp-editor.c:982
msgid "Hide Attachment _Bar"
msgstr "隐藏附件栏(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:961
-#: ../calendar/gui/dialogs/comp-editor.c:1401
+#: ../calendar/gui/dialogs/comp-editor.c:985
+#: ../calendar/gui/dialogs/comp-editor.c:1457
msgid "Show Attachment _Bar"
msgstr "显示附件栏(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1070
-#: ../calendar/gui/dialogs/event-page.c:1861
+#: ../calendar/gui/dialogs/comp-editor.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1895
#: ../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
+#: ../composer/e-msg-composer.c:3601
#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1095
#: ../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
+#: ../composer/e-msg-composer.c:3602 ../mail/em-folder-tree.c:2058
+#: ../ui/evolution-mail-list.xml.h:33
msgid "_Properties"
msgstr "属性(_P)"
-#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../calendar/gui/dialogs/comp-editor.c:1097
#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3576
+#: ../composer/e-msg-composer.c:3604
msgid "_Add attachment..."
msgstr "添加附件(_A)..."
-#: ../calendar/gui/dialogs/comp-editor.c:1425
+#: ../calendar/gui/dialogs/comp-editor.c:1481
msgid "Attachment Button: Press space key to toggle attachment bar"
msgstr "附件按钮:按空格键可切换附件栏"
-#: ../calendar/gui/dialogs/comp-editor.c:2028
-#: ../calendar/gui/dialogs/comp-editor.c:2071
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
msgid "Edit Appointment"
msgstr "编辑约会"
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/comp-editor.c:2077
+#: ../calendar/gui/dialogs/comp-editor.c:2094
+#: ../calendar/gui/dialogs/comp-editor.c:2137
#, c-format
msgid "Meeting - %s"
msgstr "会议 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2036
-#: ../calendar/gui/dialogs/comp-editor.c:2079
+#: ../calendar/gui/dialogs/comp-editor.c:2096
+#: ../calendar/gui/dialogs/comp-editor.c:2139
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2040
-#: ../calendar/gui/dialogs/comp-editor.c:2083
+#: ../calendar/gui/dialogs/comp-editor.c:2100
+#: ../calendar/gui/dialogs/comp-editor.c:2143
#, c-format
msgid "Assigned Task - %s"
msgstr "指派的任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2042
-#: ../calendar/gui/dialogs/comp-editor.c:2085
+#: ../calendar/gui/dialogs/comp-editor.c:2102
+#: ../calendar/gui/dialogs/comp-editor.c:2145
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2045
-#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2105
+#: ../calendar/gui/dialogs/comp-editor.c:2148
#, c-format
msgid "Journal entry - %s"
msgstr "日志条目 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2056
-#: ../calendar/gui/dialogs/comp-editor.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:2116
+#: ../calendar/gui/dialogs/comp-editor.c:2158
msgid "No summary"
msgstr "没有概要"
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2668
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:156
+#: ../mail/em-utils.c:502 ../mail/em-utils.c:539
+#: ../widgets/misc/e-attachment-bar.c:342
msgid "attachment"
msgstr "附件"
-#: ../calendar/gui/dialogs/comp-editor.c:2701
-#: ../calendar/gui/dialogs/comp-editor.c:2734
-#: ../calendar/gui/dialogs/comp-editor.c:2758
+#: ../calendar/gui/dialogs/comp-editor.c:2761
+#: ../calendar/gui/dialogs/comp-editor.c:2818
+#: ../calendar/gui/dialogs/comp-editor.c:2842
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "如果更新到达的话,对此项目的更改将被丢弃"
-#: ../calendar/gui/dialogs/comp-editor.c:2782
+#: ../calendar/gui/dialogs/comp-editor.c:2866
msgid "Unable to use current version!"
msgstr "无法使用当前版本!"
@@ -5876,86 +5924,86 @@ msgstr "约会(_M)"
msgid "Recurrence"
msgstr "再现("
-#: ../calendar/gui/dialogs/event-page.c:876
+#: ../calendar/gui/dialogs/event-page.c:878
#: ../calendar/gui/dialogs/task-page.c:444
msgid "Or_ganizer"
msgstr "组织者(_G)"
-#: ../calendar/gui/dialogs/event-page.c:914
+#: ../calendar/gui/dialogs/event-page.c:916
msgid "_Delegatees"
msgstr "代理人(_D)"
-#: ../calendar/gui/dialogs/event-page.c:916
+#: ../calendar/gui/dialogs/event-page.c:918
msgid "Atte_ndees"
msgstr "出席者(_N)"
-#: ../calendar/gui/dialogs/event-page.c:1073
+#: ../calendar/gui/dialogs/event-page.c:1085
msgid "Event with no start date"
msgstr "没有开始日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1076
+#: ../calendar/gui/dialogs/event-page.c:1088
msgid "Event with no end date"
msgstr "没有结束日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1242
+#: ../calendar/gui/dialogs/event-page.c:1254
#: ../calendar/gui/dialogs/task-page.c:848
msgid "Start date is wrong"
msgstr "开始日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1252
+#: ../calendar/gui/dialogs/event-page.c:1264
msgid "End date is wrong"
msgstr "结束日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1275
+#: ../calendar/gui/dialogs/event-page.c:1287
msgid "Start time is wrong"
msgstr "开始时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1282
+#: ../calendar/gui/dialogs/event-page.c:1294
msgid "End time is wrong"
msgstr "结束时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1437
+#: ../calendar/gui/dialogs/event-page.c:1449
#: ../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:1443
+#: ../calendar/gui/dialogs/event-page.c:1455
#: ../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:1458
+#: ../calendar/gui/dialogs/event-page.c:1470
#: ../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:1862
+#: ../calendar/gui/dialogs/event-page.c:1896
#: ../calendar/gui/dialogs/meeting-page.c:910
#: ../calendar/gui/dialogs/task-page.c:1184
msgid "_Add "
msgstr "添加(_A)"
-#: ../calendar/gui/dialogs/event-page.c:2553
+#: ../calendar/gui/dialogs/event-page.c:2625
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "无法打开日历“%s”。"
-#: ../calendar/gui/dialogs/event-page.c:2808
+#: ../calendar/gui/dialogs/event-page.c:2893
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "约会的 %d 天前"
-#: ../calendar/gui/dialogs/event-page.c:2816
+#: ../calendar/gui/dialogs/event-page.c:2901
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "约会的 %d 小时前"
-#: ../calendar/gui/dialogs/event-page.c:2824
+#: ../calendar/gui/dialogs/event-page.c:2909
#, c-format
msgid "%d minute before appointement"
msgid_plural "%d minutes before appointment"
@@ -6047,7 +6095,7 @@ msgstr "<b>来自:</b>"
#: ../calendar/gui/dialogs/meeting-page.c:316
#: ../calendar/gui/dialogs/meeting-page.glade.h:4
#: ../calendar/gui/e-cal-model-tasks.c:654
-#: ../calendar/gui/e-itip-control.c:1105 ../composer/e-msg-composer.c:2260
+#: ../calendar/gui/e-itip-control.c:1105 ../composer/e-msg-composer.c:2275
#: ../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
@@ -6056,8 +6104,8 @@ msgstr "<b>来自:</b>"
#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
#: ../plugins/itip-formatter/itip-formatter.c:1627
#: ../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
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1514 ../widgets/misc/e-dateedit.c:1728
msgid "None"
msgstr "无"
@@ -6132,7 +6180,7 @@ msgstr "组织者"
msgid "Organizer:"
msgstr "组织者:"
-#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2311
+#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2312
msgid "Memo"
msgstr "备忘"
@@ -6289,7 +6337,7 @@ msgstr "在"
msgid "occurrences"
msgstr "循环"
-#: ../calendar/gui/dialogs/recurrence-page.c:2326
+#: ../calendar/gui/dialogs/recurrence-page.c:2342
msgid "Date/Time"
msgstr "日期/时间"
@@ -6355,7 +6403,7 @@ msgstr "<span weight=\"bold\">状态</span>"
#: ../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
+#: ../calendar/gui/print.c:2373 ../plugins/save-calendar/csv-format.c:390
msgid "Completed"
msgstr "已完成"
@@ -6370,7 +6418,7 @@ msgstr "高"
#: ../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
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2370
msgid "In Progress"
msgstr "进行中"
@@ -6391,7 +6439,7 @@ msgstr "中"
#: ../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
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2367
msgid "Not Started"
msgstr "尚未开始"
@@ -6422,7 +6470,7 @@ msgid "_Web Page:"
msgstr "网页(_W):"
#: ../calendar/gui/dialogs/task-editor.c:419
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1174
msgid "_Task"
msgstr "任务(_T)"
@@ -6438,7 +6486,7 @@ msgstr "组(_G)"
msgid "Due date is wrong"
msgstr "到期日期错误"
-#: ../calendar/gui/dialogs/task-page.c:1614
+#: ../calendar/gui/dialogs/task-page.c:1635
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "无法打开“%s”中的任务。"
@@ -6510,88 +6558,103 @@ msgstr "用户名(_U):"
msgid "_Weekly"
msgstr "每周(_W)"
-#: ../calendar/gui/e-alarm-list.c:395
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:396
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d 天"
-#: ../calendar/gui/e-alarm-list.c:400
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:402
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d 周"
-#: ../calendar/gui/e-alarm-list.c:405
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:408
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d 小时"
-#: ../calendar/gui/e-alarm-list.c:410
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:414
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d 分钟"
-#: ../calendar/gui/e-alarm-list.c:415
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:420
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d 秒"
-#: ../calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:467
msgid "Unknown action to be performed"
msgstr "执行未知的动作"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:476
+#: ../calendar/gui/e-alarm-list.c:481
#, c-format
msgid "%s %s before the start of the appointment"
msgstr "在约会开始之前 %s %s"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:481
+#: ../calendar/gui/e-alarm-list.c:486
#, c-format
msgid "%s %s after the start of the appointment"
msgstr "在约会开始之后 %s %s"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:488
+#: ../calendar/gui/e-alarm-list.c:493
#, c-format
msgid "%s at the start of the appointment"
msgstr "在约会开始时 %s"
-#: ../calendar/gui/e-alarm-list.c:497
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:504
#, c-format
msgid "%s %s before the end of the appointment"
msgstr "在约会结束之前 %s %s"
-#: ../calendar/gui/e-alarm-list.c:500
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:509
#, c-format
msgid "%s %s after the end of the appointment"
msgstr "在约会结束之后 %s %s"
-#: ../calendar/gui/e-alarm-list.c:505
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:516
#, c-format
msgid "%s at the end of the appointment"
msgstr "在约会结束时 %s"
-#: ../calendar/gui/e-alarm-list.c:527
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
+#: ../calendar/gui/e-alarm-list.c:540
#, c-format
msgid "%s at %s"
msgstr "在 %2$s 时 %1$s"
-#: ../calendar/gui/e-alarm-list.c:533
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound". "Trigger types" are absolute or relative dates
+#: ../calendar/gui/e-alarm-list.c:548
#, c-format
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:2826
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
#, c-format
msgid "Click to open %s"
msgstr "单击以打开 %s"
@@ -6629,7 +6692,7 @@ msgstr "到期日期:"
#: ../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
+#: ../plugins/itip-formatter/itip-view.c:909
msgid "Status:"
msgstr "状态:"
@@ -6690,17 +6753,17 @@ 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:1150
+#: ../calendar/gui/e-cal-popup.c:107 ../calendar/gui/e-cal-popup.c:122
+#: ../calendar/gui/e-cal-popup.c:166 ../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:125 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:225 ../mail/em-utils.c:1311
+#: ../calendar/gui/e-meeting-store.c:225 ../mail/em-utils.c:1312
#: ../plugins/itip-formatter/itip-formatter.c:240
#: ../plugins/itip-formatter/itip-formatter.c:1652
#: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:690
+#: ../widgets/misc/e-attachment-bar.c:691
#: ../widgets/misc/e-charset-picker.c:62
msgid "Unknown"
msgstr "未知"
@@ -6713,35 +6776,35 @@ msgstr "重复"
msgid "Assigned"
msgstr "已指派"
-#: ../calendar/gui/e-cal-popup.c:171 ../mail/em-popup.c:411
+#: ../calendar/gui/e-cal-popup.c:172 ../mail/em-popup.c:412
msgid "Save As..."
msgstr "另存为..."
-#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1842
+#: ../calendar/gui/e-cal-popup.c:188 ../mail/em-format-html-display.c:1865
msgid "Select folder to save selected attachments..."
msgstr "选择保存选中附件的文件夹..."
-#: ../calendar/gui/e-cal-popup.c:216 ../mail/em-popup.c:436
+#: ../calendar/gui/e-cal-popup.c:217 ../mail/em-popup.c:437
#, c-format
msgid "untitled_image.%s"
msgstr "无标题图像.%s"
-#: ../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
+#: ../calendar/gui/e-cal-popup.c:271 ../calendar/gui/e-calendar-table.c:1178
+#: ../calendar/gui/e-calendar-view.c:1607 ../calendar/gui/e-memo-table.c:856
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
msgid "_Save As..."
msgstr "另存为(_S)..."
-#: ../calendar/gui/e-cal-popup.c:271 ../mail/em-popup.c:554
-#: ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:272 ../mail/em-popup.c:555
+#: ../mail/em-popup.c:566
msgid "Set as _Background"
msgstr "设为背景(_B)"
-#: ../calendar/gui/e-cal-popup.c:272
+#: ../calendar/gui/e-cal-popup.c:273
msgid "_Save Selected"
msgstr "保存选中(_S)"
-#: ../calendar/gui/e-cal-popup.c:394 ../mail/em-popup.c:774
+#: ../calendar/gui/e-cal-popup.c:395 ../mail/em-popup.c:775
#, c-format
msgid "Open in %s..."
msgstr "在 %s 中打开..."
@@ -6806,7 +6869,7 @@ msgstr "更新对象"
#: ../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
+#: ../composer/e-msg-composer.c:1354
msgid "Save as..."
msgstr "另存为..."
@@ -6815,28 +6878,28 @@ msgid "Open _Web Page"
msgstr "打开网页(_W)"
#: ../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
+#: ../calendar/gui/e-calendar-view.c:1592
+#: ../calendar/gui/e-calendar-view.c:1608 ../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:43
+#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:42
#: ../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:1183
-#: ../calendar/gui/e-calendar-view.c:1559 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-view.c:1612 ../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: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
+#: ../calendar/gui/e-calendar-view.c:1595
+#: ../calendar/gui/e-calendar-view.c:1614 ../calendar/gui/e-memo-table.c:863
+#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
msgid "_Paste"
msgstr "粘贴(_P)"
@@ -6872,7 +6935,7 @@ msgstr "单击以添加任务"
msgid "% Complete"
msgstr "% 完成"
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:617
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
msgid "Complete"
msgstr "完成"
@@ -6905,97 +6968,106 @@ msgstr "移动项目"
msgid "Copying items"
msgstr "复制项目"
-#: ../calendar/gui/e-calendar-view.c:1533
+#: ../calendar/gui/e-calendar-view.c:1586
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
-#: ../calendar/gui/e-calendar-view.c:1534
+#: ../calendar/gui/e-calendar-view.c:1587
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
-#: ../calendar/gui/e-calendar-view.c:1535
+#: ../calendar/gui/e-calendar-view.c:1588
msgid "New _Meeting"
msgstr "新建会议(_M)"
-#: ../calendar/gui/e-calendar-view.c:1536
+#: ../calendar/gui/e-calendar-view.c:1589
msgid "New _Task"
msgstr "新建任务(_T)"
#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1546
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../calendar/gui/e-calendar-view.c:1599
msgid "_Current View"
msgstr "当前视图(_C)"
-#: ../calendar/gui/e-calendar-view.c:1548
+#: ../calendar/gui/e-calendar-view.c:1601
msgid "Select T_oday"
msgstr "选择今天(_O)"
-#: ../calendar/gui/e-calendar-view.c:1549
+#: ../calendar/gui/e-calendar-view.c:1602
msgid "_Select Date..."
msgstr "选择日期(_S)..."
-#: ../calendar/gui/e-calendar-view.c:1565
+#: ../calendar/gui/e-calendar-view.c:1618
msgid "Cop_y to Calendar..."
msgstr "复制到日历(_Y)..."
-#: ../calendar/gui/e-calendar-view.c:1566
+#: ../calendar/gui/e-calendar-view.c:1619
msgid "Mo_ve to Calendar..."
msgstr "移动到日历(_V)..."
-#: ../calendar/gui/e-calendar-view.c:1567
+#: ../calendar/gui/e-calendar-view.c:1620
msgid "_Delegate Meeting..."
msgstr "代理会议(_D)..."
-#: ../calendar/gui/e-calendar-view.c:1568
+#: ../calendar/gui/e-calendar-view.c:1621
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
-#: ../calendar/gui/e-calendar-view.c:1569
+#: ../calendar/gui/e-calendar-view.c:1622
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_F)..."
-#: ../calendar/gui/e-calendar-view.c:1574
+#: ../calendar/gui/e-calendar-view.c:1623
+msgid "_Reply"
+msgstr "回复(_R)"
+
+#: ../calendar/gui/e-calendar-view.c:1624 ../mail/em-folder-view.c:1082
+#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../ui/evolution-mail-message.xml.h:82
+msgid "Reply to _All"
+msgstr "回复所有人(_A)"
+
+#: ../calendar/gui/e-calendar-view.c:1629
msgid "Make this Occurrence _Movable"
msgstr "将此次发生变为可移动(_M)"
-#: ../calendar/gui/e-calendar-view.c:1575
+#: ../calendar/gui/e-calendar-view.c:1630
msgid "Delete this _Occurrence"
msgstr "删除此次出现(_O)"
-#: ../calendar/gui/e-calendar-view.c:1576
+#: ../calendar/gui/e-calendar-view.c:1631
msgid "Delete _All Occurrences"
msgstr "删除所有出现(_A)"
#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1951
+#: ../calendar/gui/e-calendar-view.c:2043
#, 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
+#: ../calendar/gui/e-calendar-view.c:2057 ../calendar/gui/print.c:2340
#, c-format
msgid "Location: %s"
msgstr "位置:%s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1996
+#: ../calendar/gui/e-calendar-view.c:2088
#, c-format
msgid "Time: %s %s"
msgstr "时间:%s %s"
#. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:115
+#: ../calendar/gui/e-cell-date-edit-text.c:116
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.
-#: ../calendar/gui/e-cell-date-edit-text.c:118
+#: ../calendar/gui/e-cell-date-edit-text.c:119
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%Y-%m-%d %A %p%I:%M:%S"
-#: ../calendar/gui/e-cell-date-edit-text.c:123
+#: ../calendar/gui/e-cell-date-edit-text.c:124
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -7018,19 +7090,19 @@ msgstr "%02i 分钟分割"
#. order but don't change the specifiers or add
#. anything.
#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1526
+#: ../calendar/gui/e-week-view-main-item.c:313 ../calendar/gui/print.c:1527
msgid "%A %d %B"
msgstr "%B%d日%A"
#. String to use in 12-hour time format for times in the morning.
#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
-#: ../calendar/gui/print.c:841
+#: ../calendar/gui/print.c:842
msgid "am"
msgstr "上午"
#. String to use in 12-hour time format for times in the afternoon.
#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
-#: ../calendar/gui/print.c:843
+#: ../calendar/gui/print.c:844
msgid "pm"
msgstr "下午"
@@ -7116,10 +7188,10 @@ msgstr "iCalendar 错误"
#: ../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
+#: ../plugins/itip-formatter/itip-view.c:339
#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
msgid "An unknown person"
msgstr "未知的人"
@@ -7133,12 +7205,12 @@ msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作
#: ../calendar/gui/e-itip-control.c:1138
#: ../calendar/gui/e-meeting-list-view.c:204
#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../calendar/gui/itip-utils.c:546
+#: ../calendar/gui/itip-utils.c:669
#: ../plugins/itip-formatter/itip-formatter.c:1640
msgid "Accepted"
msgstr "接受"
-#: ../calendar/gui/e-itip-control.c:1142 ../calendar/gui/itip-utils.c:549
+#: ../calendar/gui/e-itip-control.c:1142 ../calendar/gui/itip-utils.c:672
#: ../plugins/itip-formatter/itip-formatter.c:1643
msgid "Tentatively Accepted"
msgstr "暂时接受"
@@ -7146,20 +7218,20 @@ msgstr "暂时接受"
#: ../calendar/gui/e-itip-control.c:1146
#: ../calendar/gui/e-meeting-list-view.c:205
#: ../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
+#: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
#: ../plugins/itip-formatter/itip-formatter.c:1646
msgid "Declined"
msgstr "拒绝"
#: ../calendar/gui/e-itip-control.c:1230
msgid ""
-"The meeting has been cancelled, however it could not be found in your "
+"The meeting has been canceled, however it could not be found in your "
"calendars"
msgstr "会议已经被取消,但无法在您的日历中找到该会议"
#: ../calendar/gui/e-itip-control.c:1232
msgid ""
-"The task has been cancelled, however it could not be found in your task lists"
+"The task has been canceled, however it could not be found in your task lists"
msgstr "任务已经被取消,但无法在您的任务列表中找到该任务"
#: ../calendar/gui/e-itip-control.c:1311
@@ -7215,11 +7287,11 @@ msgstr "会议答复"
#: ../calendar/gui/e-itip-control.c:1348
#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
+msgid "<b>%s</b> has canceled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
#: ../calendar/gui/e-itip-control.c:1349
-msgid "Meeting Cancellation"
+msgid "Meeting Cancelation"
msgstr "会议取消"
#: ../calendar/gui/e-itip-control.c:1359 ../calendar/gui/e-itip-control.c:1436
@@ -7285,11 +7357,11 @@ msgstr "任务回复"
#: ../calendar/gui/e-itip-control.c:1425
#, c-format
-msgid "<b>%s</b> has cancelled a task."
+msgid "<b>%s</b> has canceled a task."
msgstr "<b>%s</b> 取消了任务。"
#: ../calendar/gui/e-itip-control.c:1426
-msgid "Task Cancellation"
+msgid "Task Cancelation"
msgstr "任务取消"
#: ../calendar/gui/e-itip-control.c:1437
@@ -7414,8 +7486,8 @@ msgstr "更新应答者状态"
msgid "Send Latest Information"
msgstr "发送最新的信息"
-#: ../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
+#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:692
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
#: ../ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
@@ -7532,7 +7604,7 @@ msgstr "暂时的"
#: ../calendar/gui/e-meeting-list-view.c:207
#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/itip-utils.c:555
+#: ../calendar/gui/itip-utils.c:678
#: ../plugins/itip-formatter/itip-formatter.c:1649
msgid "Delegated"
msgstr "被委任的"
@@ -7567,7 +7639,7 @@ msgstr "%Y年%m月%d日%A"
#. 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
-#: ../widgets/misc/e-dateedit.c:1736
+#: ../widgets/misc/e-dateedit.c:1737
msgid "%m/%d/%Y"
msgstr "%Y-%m-%d"
@@ -7652,7 +7724,7 @@ msgid "Memo sort"
msgstr "备忘排序"
#: ../calendar/gui/e-memos.c:728 ../calendar/gui/e-tasks.c:823
-#: ../calendar/gui/gnome-cal.c:2565
+#: ../calendar/gui/gnome-cal.c:2571
#, c-format
msgid ""
"Error on %s:\n"
@@ -7703,7 +7775,7 @@ msgstr "时区按钮"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1510
+#: ../calendar/gui/e-week-view-main-item.c:330 ../calendar/gui/print.c:1511
msgid "%d %B"
msgstr "%-m月%-d日"
@@ -7711,34 +7783,34 @@ msgstr "%-m月%-d日"
msgid "Updating query"
msgstr "更新查询"
-#: ../calendar/gui/gnome-cal.c:2240
+#: ../calendar/gui/gnome-cal.c:2246
msgid "_Custom View"
msgstr "自定义视图(_C)"
-#: ../calendar/gui/gnome-cal.c:2241
+#: ../calendar/gui/gnome-cal.c:2247
msgid "_Save Custom View"
msgstr "保存自定义视图(_S)"
-#: ../calendar/gui/gnome-cal.c:2246
+#: ../calendar/gui/gnome-cal.c:2252
msgid "_Define Views..."
msgstr "定义视图(_D)..."
-#: ../calendar/gui/gnome-cal.c:2408
+#: ../calendar/gui/gnome-cal.c:2414
#, c-format
msgid "Loading appointments at %s"
msgstr "装入位于 %s 的约会"
-#: ../calendar/gui/gnome-cal.c:2427
+#: ../calendar/gui/gnome-cal.c:2433
#, c-format
msgid "Loading tasks at %s"
msgstr "装入位于 %s 的任务"
-#: ../calendar/gui/gnome-cal.c:2531
+#: ../calendar/gui/gnome-cal.c:2537
#, c-format
msgid "Opening %s"
msgstr "打开 %s"
-#: ../calendar/gui/gnome-cal.c:3449
+#: ../calendar/gui/gnome-cal.c:3458
msgid "Purging"
msgstr "销毁"
@@ -7798,127 +7870,128 @@ msgstr "九月"
msgid "_Select Today"
msgstr "选择今天(_S)"
-#: ../calendar/gui/itip-utils.c:351 ../calendar/gui/itip-utils.c:400
-#: ../calendar/gui/itip-utils.c:440
+#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:563
msgid "An organizer must be set."
msgstr "必须设定组织者。"
-#: ../calendar/gui/itip-utils.c:387
+#: ../calendar/gui/itip-utils.c:448
msgid "At least one attendee is necessary"
msgstr "至少需要一个参加者"
-#: ../calendar/gui/itip-utils.c:508 ../calendar/gui/itip-utils.c:630
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:757
msgid "Event information"
msgstr "事件信息"
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:759
msgid "Task information"
msgstr "任务信息"
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:761
msgid "Journal information"
msgstr "日志信息"
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:652
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:779
msgid "Free/Busy information"
msgstr "忙闲信息"
-#: ../calendar/gui/itip-utils.c:516
+#: ../calendar/gui/itip-utils.c:639
msgid "Calendar information"
msgstr "日历信息"
-#: ../calendar/gui/itip-utils.c:565
+#: ../calendar/gui/itip-utils.c:688
msgid "Updated"
msgstr "更新"
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:696
msgid "Refresh"
msgstr "刷新"
-#: ../calendar/gui/itip-utils.c:577
+#: ../calendar/gui/itip-utils.c:700
msgid "Counter-proposal"
msgstr "投票表决"
-#: ../calendar/gui/itip-utils.c:648
+#: ../calendar/gui/itip-utils.c:775
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "忙闲信息 (%s 到 %s)"
-#: ../calendar/gui/itip-utils.c:658
+#: ../calendar/gui/itip-utils.c:785
msgid "iCalendar information"
msgstr "iCalendar 信息"
-#: ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:940
msgid "You must be an attendee of the event."
msgstr "您必须是事件的出席者。"
-#: ../calendar/gui/memos-component.c:450 ../ui/evolution-addressbook.xml.h:3
-#: ../ui/evolution-memos.xml.h:2 ../ui/evolution-tasks.xml.h:2
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:3
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr "复制"
-#: ../calendar/gui/memos-component.c:451 ../mail/em-filter-i18n.h:11
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:5
#: ../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:452
+#: ../calendar/gui/memos-component.c:453
msgid "Properties..."
msgstr "属性..."
-#: ../calendar/gui/memos-component.c:525
+#: ../calendar/gui/memos-component.c:526
#, c-format
msgid "%d memo"
msgid_plural "%d memos"
msgstr[0] "%d 个备忘"
-#: ../calendar/gui/memos-component.c:527 ../calendar/gui/tasks-component.c:518
-#: ../mail/mail-component.c:559
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
+#: ../mail/mail-component.c:560
#, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
msgstr[0] ",已选中 %d 个"
-#: ../calendar/gui/memos-component.c:574
+#: ../calendar/gui/memos-component.c:575
msgid "Failed upgrading memos."
msgstr "升级备忘失败。"
-#: ../calendar/gui/memos-component.c:870
+#: ../calendar/gui/memos-component.c:871
#, c-format
msgid "Unable to open the memo list '%s' for creating events and meetings"
msgstr "无法打开备忘列表“%s”来创建事件和会议"
-#: ../calendar/gui/memos-component.c:883
+#: ../calendar/gui/memos-component.c:884
msgid "There is no calendar available for creating memos"
msgstr "没有可创建备忘的日历"
-#: ../calendar/gui/memos-component.c:974
+#: ../calendar/gui/memos-component.c:975
msgid "Memo Source Selector"
msgstr "备忘来源选择器"
-#: ../calendar/gui/memos-component.c:1157
+#: ../calendar/gui/memos-component.c:1158
msgid "New memo"
msgstr "新建备忘"
-#: ../calendar/gui/memos-component.c:1158
+#: ../calendar/gui/memos-component.c:1159
msgid "_Memo"
msgstr "备忘(_M)"
-#: ../calendar/gui/memos-component.c:1159
+#: ../calendar/gui/memos-component.c:1160
msgid "Create a new memo"
msgstr "创建新备忘"
-#: ../calendar/gui/memos-component.c:1165
+#: ../calendar/gui/memos-component.c:1166
msgid "New memo list"
msgstr "新建备忘列表"
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1167
msgid "Memo l_ist"
msgstr "备忘列表(_I)"
-#: ../calendar/gui/memos-component.c:1167
+#: ../calendar/gui/memos-component.c:1168
msgid "Create a new memo list"
msgstr "创建新备忘列表"
@@ -7926,7 +7999,7 @@ msgstr "创建新备忘列表"
msgid "Print Memos"
msgstr "打印备忘"
-#: ../calendar/gui/migration.c:156
+#: ../calendar/gui/migration.c:162
msgid ""
"The location and hierarchy of the Evolution task folders has changed since "
"Evolution 1.x.\n"
@@ -7937,7 +8010,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../calendar/gui/migration.c:160
+#: ../calendar/gui/migration.c:166
msgid ""
"The location and hierarchy of the Evolution calendar folders has changed "
"since Evolution 1.x.\n"
@@ -7949,314 +8022,314 @@ msgstr ""
"请稍候,Evolution 正在升迁您的文件夹..."
#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:753 ../calendar/gui/migration.c:919
+#: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
msgid "Unable to migrate old settings from evolution/config.xmldb"
msgstr "无法从 evolution/config.xmldb 中升迁旧设置"
#. FIXME: domain/code
-#: ../calendar/gui/migration.c:782
+#: ../calendar/gui/migration.c:794
#, c-format
msgid "Unable to migrate calendar `%s'"
msgstr "无法升迁日历“%s”"
#. FIXME: domain/code
-#: ../calendar/gui/migration.c:948
+#: ../calendar/gui/migration.c:962
#, c-format
msgid "Unable to migrate tasks `%s'"
msgstr "无法升迁任务“%s”"
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
msgid "1st"
msgstr "1日"
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
msgid "2nd"
msgstr "2日"
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
msgid "3rd"
msgstr "3日"
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
msgid "4th"
msgstr "4日"
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
msgid "5th"
msgstr "5日"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
msgid "6th"
msgstr "6日"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
msgid "7th"
msgstr "7日"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
msgid "8th"
msgstr "8日"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
msgid "9th"
msgstr "9日"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
msgid "10th"
msgstr "10日"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
msgid "11th"
msgstr "11日"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
msgid "12th"
msgstr "12日"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
msgid "13th"
msgstr "13日"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
msgid "14th"
msgstr "14日"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
msgid "15th"
msgstr "15日"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
msgid "16th"
msgstr "16日"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
msgid "17th"
msgstr "17日"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
msgid "18th"
msgstr "18日"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
msgid "19th"
msgstr "19日"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
msgid "20th"
msgstr "20日"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
msgid "21st"
msgstr "21日"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
msgid "22nd"
msgstr "22日"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
msgid "23rd"
msgstr "23日"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
msgid "24th"
msgstr "24日"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
msgid "25th"
msgstr "25日"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
msgid "26th"
msgstr "26日"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
msgid "27th"
msgstr "27日"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
msgid "28th"
msgstr "28日"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
msgid "29th"
msgstr "29日"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
msgid "30th"
msgstr "30日"
-#: ../calendar/gui/print.c:498
+#: ../calendar/gui/print.c:499
msgid "31st"
msgstr "31日"
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:574
msgid "Su"
msgstr "日"
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:574
msgid "Mo"
msgstr "一"
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:574
msgid "Tu"
msgstr "二"
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:574
msgid "We"
msgstr "三"
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
msgid "Th"
msgstr "四"
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
msgid "Fr"
msgstr "五"
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
msgid "Sa"
msgstr "六"
#. Day
-#: ../calendar/gui/print.c:1926
+#: ../calendar/gui/print.c:1927
msgid "Selected day (%a %b %d %Y)"
msgstr "选中的日期(%Y年%m月%d日%A)"
-#: ../calendar/gui/print.c:1951 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1952 ../calendar/gui/print.c:1956
msgid "%a %b %d"
msgstr "%m月%d日%A"
-#: ../calendar/gui/print.c:1952
+#: ../calendar/gui/print.c:1953
msgid "%a %d %Y"
msgstr "%Y年%d日%A"
-#: ../calendar/gui/print.c:1956 ../calendar/gui/print.c:1958
-#: ../calendar/gui/print.c:1959
+#: ../calendar/gui/print.c:1957 ../calendar/gui/print.c:1959
+#: ../calendar/gui/print.c:1960
msgid "%a %b %d %Y"
msgstr "%Y年%m月%d日%A"
-#: ../calendar/gui/print.c:1963
+#: ../calendar/gui/print.c:1964
#, c-format
msgid "Selected week (%s - %s)"
msgstr "选中的周(%s - %s)"
#. Month
-#: ../calendar/gui/print.c:1971
+#: ../calendar/gui/print.c:1972
msgid "Selected month (%b %Y)"
msgstr "选中的月(%Y年%m月)"
#. Year
-#: ../calendar/gui/print.c:1978
+#: ../calendar/gui/print.c:1979
msgid "Selected year (%Y)"
msgstr "选中的年(%Y年)"
-#: ../calendar/gui/print.c:2307
+#: ../calendar/gui/print.c:2308
msgid "Appointment"
msgstr "约会"
-#: ../calendar/gui/print.c:2309
+#: ../calendar/gui/print.c:2310
msgid "Task"
msgstr "任务"
-#: ../calendar/gui/print.c:2331
+#: ../calendar/gui/print.c:2332
#, c-format
msgid "Summary: %s"
msgstr "概要:%s"
-#: ../calendar/gui/print.c:2382
+#: ../calendar/gui/print.c:2383
#, c-format
msgid "Status: %s"
msgstr "状态:%s"
-#: ../calendar/gui/print.c:2399
+#: ../calendar/gui/print.c:2400
#, c-format
msgid "Priority: %s"
msgstr "优先级:%s"
-#: ../calendar/gui/print.c:2411
+#: ../calendar/gui/print.c:2412
#, c-format
msgid "Percent Complete: %i"
msgstr "完成率:%i"
-#: ../calendar/gui/print.c:2423
+#: ../calendar/gui/print.c:2424
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2438
#, c-format
msgid "Categories: %s"
msgstr "类别:%s"
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/print.c:2449
msgid "Contacts: "
msgstr "联系人:"
-#: ../calendar/gui/print.c:2588 ../calendar/gui/print.c:2676
-#: ../calendar/gui/print.c:2802 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2589 ../calendar/gui/print.c:2677
+#: ../calendar/gui/print.c:2803 ../mail/em-format-html-print.c:178
msgid "Print Preview"
msgstr "打印预览"
-#: ../calendar/gui/print.c:2623
+#: ../calendar/gui/print.c:2624
msgid "Print Item"
msgstr "打印项"
-#: ../calendar/gui/tasks-component.c:440
+#: ../calendar/gui/tasks-component.c:441
msgid "_New Task List"
msgstr "新建任务列表(_N)"
-#: ../calendar/gui/tasks-component.c:516
+#: ../calendar/gui/tasks-component.c:517
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d 个任务"
-#: ../calendar/gui/tasks-component.c:565
+#: ../calendar/gui/tasks-component.c:566
msgid "Failed upgrading tasks."
msgstr "升级任务失败。"
-#: ../calendar/gui/tasks-component.c:876
+#: ../calendar/gui/tasks-component.c:877
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr "无法打开任务列表“%s”来创建事件和会议"
-#: ../calendar/gui/tasks-component.c:889
+#: ../calendar/gui/tasks-component.c:890
msgid "There is no calendar available for creating tasks"
msgstr "没有可创建任务的日历"
-#: ../calendar/gui/tasks-component.c:989
+#: ../calendar/gui/tasks-component.c:990
msgid "Task Source Selector"
msgstr "任务来源选择器"
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1173
msgid "New task"
msgstr "新建任务"
-#: ../calendar/gui/tasks-component.c:1174
+#: ../calendar/gui/tasks-component.c:1175
msgid "Create a new task"
msgstr "创建新任务"
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1181
msgid "New assigned task"
msgstr "新建指派的任务"
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1182
msgid "Assigne_d Task"
msgstr "指派的任务(_D)"
-#: ../calendar/gui/tasks-component.c:1182
+#: ../calendar/gui/tasks-component.c:1183
msgid "Create a new assigned task"
msgstr "创建新指派的任务"
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1189
msgid "New task list"
msgstr "新建任务列表"
-#: ../calendar/gui/tasks-component.c:1189
+#: ../calendar/gui/tasks-component.c:1190
msgid "Task l_ist"
msgstr "任务列表(_I)"
-#: ../calendar/gui/tasks-component.c:1190
+#: ../calendar/gui/tasks-component.c:1191
msgid "Create a new task list"
msgstr "创建新任务列表"
@@ -8302,7 +8375,7 @@ msgid "Evolution iCalendar importer"
msgstr "Evolution iCalendar 导入器"
#: ../calendar/importers/icalendar-importer.c:521
-msgid "Reminder!!"
+msgid "Reminder!"
msgstr "提醒!!"
#: ../calendar/importers/icalendar-importer.c:573
@@ -9852,25 +9925,25 @@ msgid "Pacific/Yap"
msgstr "太平洋/雅浦"
#: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:106
+#: ../widgets/misc/e-attachment-bar.c:107
#, c-format
msgid "%.0fK"
msgstr "%.0fK"
#: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:109
+#: ../widgets/misc/e-attachment-bar.c:110
#, c-format
msgid "%.0fM"
msgstr "%.0fM"
#: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:112
+#: ../widgets/misc/e-attachment-bar.c:113
#, c-format
msgid "%.0fG"
msgstr "%.0fG"
#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:994
+#: ../widgets/misc/e-attachment-bar.c:995
msgid "Attachment Bar"
msgstr "附件栏"
@@ -9988,47 +10061,52 @@ msgid ""
"account"
msgstr "无法对寄出的信件加密:未对此账户设置加密证书"
-#: ../composer/e-msg-composer.c:1320 ../composer/e-msg-composer.c:1354
+#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2512
+msgid "Hide _Attachment Bar"
+msgstr "隐藏附件栏(_A)"
+
+#: ../composer/e-msg-composer.c:1303 ../composer/e-msg-composer.c:2515
+#: ../composer/e-msg-composer.c:3847
+msgid "Show _Attachment Bar"
+msgstr "显示附件栏(_A)"
+
+#: ../composer/e-msg-composer.c:1335 ../composer/e-msg-composer.c:1369
#: ../plugins/mail-remote/e-corba-utils.c:135
msgid "Unknown reason"
msgstr "未知原因"
-#: ../composer/e-msg-composer.c:1392
+#: ../composer/e-msg-composer.c:1407
msgid "Could not open file"
msgstr "无法打开文件"
-#: ../composer/e-msg-composer.c:1400
+#: ../composer/e-msg-composer.c:1415
msgid "Unable to retrieve message from editor"
msgstr "无法从编辑器获取信件"
-#: ../composer/e-msg-composer.c:1678
+#: ../composer/e-msg-composer.c:1693
msgid "Untitled Message"
msgstr "无标题信件"
#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1713
+#: ../composer/e-msg-composer.c:1728
msgid "Open File"
msgstr "打开文件"
-#: ../composer/e-msg-composer.c:2140 ../mail/em-account-editor.c:596
+#: ../composer/e-msg-composer.c:2155 ../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:2243
+#: ../composer/e-msg-composer.c:2258
msgid "Si_gnature:"
msgstr "签名(_G):"
-#: ../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:2526 ../composer/e-msg-composer.c:3729
+#: ../composer/e-msg-composer.c:3732
+msgid "Compose Message"
+msgstr "撰写新邮件"
-#: ../composer/e-msg-composer.c:3819
-msgid "_Attachment Bar"
-msgstr "附件栏(_A)"
-
-#: ../composer/e-msg-composer.c:4911
+#: ../composer/e-msg-composer.c:4956
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -10055,7 +10133,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
msgstr "由于“{0}”,您可能要选择不同的邮件选项。"
#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:19
msgid "Because &quot;{1}&quot;."
msgstr "原因是“{1}”。"
@@ -10097,32 +10175,24 @@ msgid "Do you want to recover unfinished messages?"
msgstr "您是否想要恢复未完成的信件?"
#: ../composer/mail-composer.error.xml.h:14
-msgid "Don't Recover"
-msgstr "不恢复"
-
-#: ../composer/mail-composer.error.xml.h:15
msgid "Download in progress. Do you want to send the mail?"
msgstr "下载进行中。您想要发送邮件吗?"
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:15
msgid "Error saving to autosave because &quot;{1}&quot;."
msgstr "保存到自动保存出错,原因是“{1}”。"
-#: ../composer/mail-composer.error.xml.h:17
+#: ../composer/mail-composer.error.xml.h:16
msgid ""
"Evolution quit unexpectedly while you were composing a new message. "
"Recovering the message will allow you to continue where you left off."
msgstr "在您上次编写新信件时 Evolution 意外退出。恢复邮件将允许您继续完成。"
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Recover"
-msgstr "恢复"
-
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:17
msgid "The file `{0}' is not a regular file and cannot be sent in a message."
msgstr "文件“{0}”不是普通文件,无法在邮件中发送。"
-#: ../composer/mail-composer.error.xml.h:20
+#: ../composer/mail-composer.error.xml.h:18
msgid ""
"To attach the contents of this directory, either attach the files in this "
"directory individually, or create an archive of the directory and attach it."
@@ -10130,7 +10200,7 @@ msgstr ""
"要将此目录的内容作为附件,您需要逐一添加此目录中的文件,或者创建一个此目录的"
"归档文件,然后将此归档作为附件。"
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:19
msgid ""
"Unable to activate the HTML editor control.\n"
"\n"
@@ -10140,26 +10210,34 @@ msgstr ""
"无法激活 HTML 编辑器组件。\n"
"请确定您的 gtkhtml 和 libgtkhtml 所安装的版本正确。"
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:22
msgid "Unable to activate the address selector control."
msgstr "无法激活地址选择控制。"
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:23
msgid "Unfinished messages found"
msgstr "找到了未完成的信件"
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:24
msgid "Warning: Modified Message"
msgstr "警告:已修改的信件"
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:25
msgid "You cannot attach the file `{0}' to this message."
msgstr "您无法将文件“{0}”作为这封信的附件。"
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:26
msgid "You need to configure an account before you can compose mail."
msgstr "在您可以撰写邮件之前您需要配置一个帐户。"
+#: ../composer/mail-composer.error.xml.h:28
+msgid "_Don't Recover"
+msgstr "不恢复(_D)"
+
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Recover"
+msgstr "恢复(_R)"
+
#: ../composer/mail-composer.error.xml.h:30
msgid "_Save Message"
msgstr "保存信件(_S)"
@@ -10218,7 +10296,7 @@ msgid "I am currently out of the office"
msgstr "我正在办公室外"
#: ../designs/OOA/ooa.glade.h:10
-msgid "No, Don't Change Status"
+msgid "No, Do not Change Status"
msgstr "不,请不要更改状态"
#: ../designs/OOA/ooa.glade.h:12
@@ -10332,7 +10410,7 @@ msgstr "您打算覆盖它吗?"
msgid "File exists &quot;{0}&quot;."
msgstr "文件已存在“{0}”。"
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:128
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
msgid "_Overwrite"
msgstr "覆盖(_O)"
@@ -10404,20 +10482,20 @@ msgid "Choose a file"
msgstr "选择文件"
#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1051 ../mail/mail-config.c:84
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.c:85
#: ../mail/mail-config.glade.h:91
msgid "Important"
msgstr "重要"
#. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.c:87 ../mail/mail-config.glade.h:146
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.c:88 ../mail/mail-config.glade.h:146
msgid "To Do"
msgstr "待办"
#. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1055
-#: ../mail/mail-config.c:88 ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.c:89 ../mail/mail-config.glade.h:95
msgid "Later"
msgstr "稍候"
@@ -10462,11 +10540,11 @@ msgid "Include threads"
msgstr "包含线索"
#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:348
+#: ../mail/em-utils.c:349
msgid "Incoming"
msgstr "接收"
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:349
+#: ../filter/filter-rule.c:978 ../mail/em-utils.c:350
msgid "Outgoing"
msgstr "寄出"
@@ -10490,7 +10568,7 @@ msgstr "缺少日期。"
msgid "Missing file name."
msgstr "缺少文件名。"
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:67
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
msgid "Missing name."
msgstr "缺少名称。"
@@ -10624,8 +10702,8 @@ msgstr "Evolution 邮件首选项控件"
#: ../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
+#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
msgid "Mail"
msgstr "邮件"
@@ -10696,19 +10774,19 @@ msgid "Security"
msgstr "安全"
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2322 ../mail/em-account-editor.c:2412
+#: ../mail/em-account-editor.c:2322 ../mail/em-account-editor.c:2413
msgid "Receiving Options"
msgstr "接收选项"
-#: ../mail/em-account-editor.c:2323 ../mail/em-account-editor.c:2413
+#: ../mail/em-account-editor.c:2323 ../mail/em-account-editor.c:2414
msgid "Checking for New Mail"
msgstr "检查新邮件"
-#: ../mail/em-account-editor.c:2737 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:34
msgid "Account Editor"
msgstr "账户编辑器"
-#: ../mail/em-account-editor.c:2737 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:80
msgid "Evolution Account Assistant"
msgstr "Evolution 账户助手"
@@ -10730,7 +10808,7 @@ msgstr "[默认]"
#. 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
+#: ../plugins/publish-calendar/publish-calendar.c:457
msgid "Enabled"
msgstr "已启用"
@@ -10747,7 +10825,7 @@ msgid "Mail Accounts Table"
msgstr "邮件账户表"
#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:966
+#: ../mail/mail-config.c:967
msgid "Unnamed"
msgstr "未命名"
@@ -10763,18 +10841,18 @@ msgstr "添加签名脚本"
msgid "Signature(s)"
msgstr "签名"
-#: ../mail/em-composer-utils.c:862 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:863 ../mail/em-format-quote.c:389
msgid "-------- Forwarded Message --------"
msgstr "-------- 转发的信件 --------"
-#: ../mail/em-composer-utils.c:1657
+#: ../mail/em-composer-utils.c:1658
msgid "an unknown sender"
msgstr "未知发件人"
#. Note to translators: this is the attribution string used when quoting messages.
#. * each ${Variable} gets replaced with a value. To see a full list of available
#. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1704
+#: ../mail/em-composer-utils.c:1705
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@ -11034,7 +11112,7 @@ msgstr "停止处理"
#: ../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
+#: ../smime/lib/e-cert.c:1132
msgid "Subject"
msgstr "主题"
@@ -11052,17 +11130,19 @@ msgid "C_reate Search Folder From Search..."
msgstr "从头创建搜索文件夹(_R)..."
#. TODO: can this be done in a loop?
-#: ../mail/em-folder-properties.c:144
-msgid "Total message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:145
+msgid "Total messages:"
msgid_plural "Total messages:"
msgstr[0] "总信件数:"
-#: ../mail/em-folder-properties.c:156
-msgid "Unread message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:158
+msgid "Unread messages:"
msgid_plural "Unread messages:"
msgstr[0] "未读信件数:"
-#: ../mail/em-folder-properties.c:278
+#: ../mail/em-folder-properties.c:289
#: ../plugins/groupwise-features/properties.glade.h:3
msgid "Folder Properties"
msgstr "文件夹属性"
@@ -11079,34 +11159,35 @@ msgstr "创建"
msgid "Folder _name:"
msgstr "文件夹名称(_N):"
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-folder-tree-model.c:204
+#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
#: ../mail/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
msgid "Search Folders"
msgstr "搜索文件夹"
#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:208 ../mail/em-folder-tree-model.c:210
+#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
msgid "UNMATCHED"
msgstr "不匹配"
-#: ../mail/em-folder-tree-model.c:483 ../mail/mail-component.c:150
+#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:151
msgid "Drafts"
msgstr "草稿"
#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:486 ../mail/mail-component.c:149
+#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
+#: ../plugins/exchange-operations/exchange-folder.c:641
msgid "Inbox"
msgstr "收件箱"
-#: ../mail/em-folder-tree-model.c:489 ../mail/mail-component.c:151
+#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:152
msgid "Outbox"
msgstr "发件箱"
-#: ../mail/em-folder-tree-model.c:491 ../mail/mail-component.c:152
+#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:153
msgid "Sent"
msgstr "已发箱"
-#: ../mail/em-folder-tree-model.c:513 ../mail/em-folder-tree-model.c:817
+#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
msgid "Loading..."
msgstr "正在装入..."
@@ -11124,12 +11205,12 @@ msgstr "移动文件夹“%s”"
msgid "Copying folder %s"
msgstr "复制文件夹 %s"
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1621
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1634
#, c-format
msgid "Moving messages into folder %s"
msgstr "把信件移动到文件夹 %s"
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1636
#, c-format
msgid "Copying messages into folder %s"
msgstr "把信件复制到文件夹 %s"
@@ -11138,7 +11219,7 @@ msgstr "把信件复制到文件夹 %s"
msgid "Cannot drop message(s) into toplevel store"
msgstr "无法将信件放到顶级文件夹存储"
-#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
msgid "_Copy to Folder"
msgstr "复制到文件夹(_C)"
@@ -11146,7 +11227,7 @@ msgstr "复制到文件夹(_C)"
msgid "_Move to Folder"
msgstr "移动到文件夹(_M)"
-#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1058
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "在“%s”中扫描文件夹"
@@ -11176,11 +11257,11 @@ msgstr "移动(_M)..."
msgid "_New Folder..."
msgstr "新建文件夹(_N)..."
-#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
msgid "_Rename..."
msgstr "重命名(_R)..."
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:125
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:128
msgid "_Empty Trash"
msgstr "清空回收站(_E)"
@@ -11234,17 +11315,12 @@ msgstr "指定在哪里创建文件夹:"
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
-#: ../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
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../ui/evolution-mail-message.xml.h:110
msgid "_Forward"
msgstr "转发(_F)"
-#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:108
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
msgid "_Edit as New Message..."
msgstr "作为新信件进行编辑(_E)..."
@@ -11333,197 +11409,197 @@ msgid "Filter on _Mailing List"
msgstr "基于邮件列表过滤(_M)"
#. default charset used in mail view
-#: ../mail/em-folder-view.c:1974 ../mail/em-folder-view.c:2018
+#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
msgid "Default"
msgstr "默认"
-#: ../mail/em-folder-view.c:2117
+#: ../mail/em-folder-view.c:2111
#: ../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:2273
+#: ../mail/em-folder-view.c:2267
msgid "Unable to retrieve message"
msgstr "无法获取信件"
-#: ../mail/em-folder-view.c:2466
+#: ../mail/em-folder-view.c:2460
msgid "_Copy Link Location"
msgstr "复制链接位置(_C)"
-#: ../mail/em-folder-view.c:2468
+#: ../mail/em-folder-view.c:2462
msgid "Create _Search Folder"
msgstr "创建搜索文件夹(_S)"
-#: ../mail/em-folder-view.c:2469
+#: ../mail/em-folder-view.c:2463
msgid "_From this Address"
msgstr "自此地址(_F)"
-#: ../mail/em-folder-view.c:2470
+#: ../mail/em-folder-view.c:2464
msgid "_To this Address"
msgstr "到此地址(_T)"
-#: ../mail/em-folder-view.c:2821
+#: ../mail/em-folder-view.c:2818
#, c-format
msgid "Click to mail %s"
msgstr "单击以给 %s 发送邮件"
#. message-search popup match count string
-#: ../mail/em-format-html-display.c:472
+#: ../mail/em-format-html-display.c:492
#, c-format
msgid "Matches: %d"
msgstr "匹配:%d"
-#: ../mail/em-format-html-display.c:729 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:752 ../mail/em-format-html.c:607
msgid "Unsigned"
msgstr "未签名"
-#: ../mail/em-format-html-display.c:729
+#: ../mail/em-format-html-display.c:752
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
msgstr "此信件未签名。无法保证这封信是可信的。"
-#: ../mail/em-format-html-display.c:730 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:753 ../mail/em-format-html.c:608
msgid "Valid signature"
msgstr "有效签名"
-#: ../mail/em-format-html-display.c:730
+#: ../mail/em-format-html-display.c:753
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:731 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:754 ../mail/em-format-html.c:609
msgid "Invalid signature"
msgstr "无效签名"
-#: ../mail/em-format-html-display.c:731
+#: ../mail/em-format-html-display.c:754
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
msgstr "无法校验这封信的签名,可能在传送的过程中邮件被篡改了。"
-#: ../mail/em-format-html-display.c:732
+#: ../mail/em-format-html-display.c:755
msgid "Valid signature, cannot verify sender"
msgstr "签名有效,无法校验发送者"
-#: ../mail/em-format-html-display.c:732
+#: ../mail/em-format-html-display.c:755
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:738 ../mail/em-format-html.c:616
+#: ../mail/em-format-html-display.c:761 ../mail/em-format-html.c:616
msgid "Unencrypted"
msgstr "未加密"
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:761
msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
+"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
-#: ../mail/em-format-html-display.c:739 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:762 ../mail/em-format-html.c:617
msgid "Encrypted, weak"
msgstr "弱加密"
-#: ../mail/em-format-html-display.c:739
+#: ../mail/em-format-html-display.c:762
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 "
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
"message in a practical amount of time."
msgstr ""
-"这封信已加密,但使用的是弱加密算法。如果外人想要查看这封信的内容,可能要花大"
-"量时间进行暴力破解,这很困难但并不是不可能。"
+"这封信已加密,但使用的是弱加密算法。如果外人想要查看这封信的内容,可能要花一定"
+"时间进行暴力破解,这很困难但并不是不可能。"
-#: ../mail/em-format-html-display.c:740 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:763 ../mail/em-format-html.c:618
msgid "Encrypted"
msgstr "加密"
-#: ../mail/em-format-html-display.c:740
+#: ../mail/em-format-html-display.c:763
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:741 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:764 ../mail/em-format-html.c:619
msgid "Encrypted, strong"
msgstr "强加密"
-#: ../mail/em-format-html-display.c:741
+#: ../mail/em-format-html-display.c:764
msgid ""
-"This message is encrypted, with a strong encryption algorithm. It would be "
+"This message is encrypted, with a strong encryption algorithm. It would be "
"very difficult for an outsider to view the content of this message in a "
"practical amount of time."
msgstr ""
"这封信已加密,且使用的是强加密算法。如果外人想要查看这封信的内容,可能要花大"
"量时间进行暴力破解,这十分困难。"
-#: ../mail/em-format-html-display.c:842 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:865 ../smime/gui/smime-ui.glade.h:48
msgid "_View Certificate"
msgstr "查看证书(_V)"
-#: ../mail/em-format-html-display.c:857
+#: ../mail/em-format-html-display.c:880
msgid "This certificate is not viewable"
msgstr "此证书不可查看"
-#: ../mail/em-format-html-display.c:1145
+#: ../mail/em-format-html-display.c:1168
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "%Y年%m月%d日%A,%H:%M完成"
-#: ../mail/em-format-html-display.c:1153
+#: ../mail/em-format-html-display.c:1176
msgid "Overdue:"
msgstr "延期:"
-#: ../mail/em-format-html-display.c:1156
+#: ../mail/em-format-html-display.c:1179
msgid "by %B %d, %Y, %l:%M %p"
msgstr "到 %m月%d日%A,%H:%M"
-#: ../mail/em-format-html-display.c:1216
+#: ../mail/em-format-html-display.c:1239
msgid "_View Inline"
msgstr "嵌入视图(_V)"
-#: ../mail/em-format-html-display.c:1217
+#: ../mail/em-format-html-display.c:1240
msgid "_Hide"
msgstr "隐藏(_H)"
-#: ../mail/em-format-html-display.c:1218
+#: ../mail/em-format-html-display.c:1241
msgid "_Fit to Width"
msgstr "适合宽度(_F)"
-#: ../mail/em-format-html-display.c:1219
+#: ../mail/em-format-html-display.c:1242
msgid "Show _Original Size"
msgstr "显示原始大小(_O)"
-#: ../mail/em-format-html-display.c:1596
+#: ../mail/em-format-html-display.c:1619
msgid "Attachment Button"
msgstr "附件按钮"
-#: ../mail/em-format-html-display.c:1803
+#: ../mail/em-format-html-display.c:1826
msgid "Select folder to save all attachments..."
msgstr "选择保存全部附件的文件夹..."
-#: ../mail/em-format-html-display.c:1850
+#: ../mail/em-format-html-display.c:1873
msgid "Save Selected..."
msgstr "保存所选附件..."
#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1917
+#: ../mail/em-format-html-display.c:1940
#, c-format
msgid "%d attachment"
msgid_plural "%d attachments"
msgstr[0] "%d 个附件"
-#: ../mail/em-format-html-display.c:1980
+#: ../mail/em-format-html-display.c:2003
msgid "Toggle Attachment Bar"
msgstr "切换附件栏"
-#: ../mail/em-format-html-display.c:1982
+#: ../mail/em-format-html-display.c:2005
msgid "No Attachment"
msgstr "无附件"
-#: ../mail/em-format-html-display.c:1985
+#: ../mail/em-format-html-display.c:2008
msgid "Save All"
msgstr "全部保存"
@@ -11673,7 +11749,7 @@ msgstr "每周一次"
msgid "Once per month"
msgstr "每月一次"
-#: ../mail/em-migrate.c:1208
+#: ../mail/em-migrate.c:1209
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
"since Evolution 1.x.\n"
@@ -11684,47 +11760,47 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../mail/em-migrate.c:1647
+#: ../mail/em-migrate.c:1648
#, c-format
msgid "Unable to create new folder `%s': %s"
msgstr "无法创建新文件夹“%s”:%s"
-#: ../mail/em-migrate.c:1673
+#: ../mail/em-migrate.c:1674
#, c-format
msgid "Unable to copy folder `%s' to `%s': %s"
msgstr "无法将文件夹“%s”复制为“%s”:%s"
-#: ../mail/em-migrate.c:1858
+#: ../mail/em-migrate.c:1859
#, c-format
msgid "Unable to scan for existing mailboxes at `%s': %s"
msgstr "无法扫描位于“%s”的已有邮箱:%s"
-#: ../mail/em-migrate.c:2062
+#: ../mail/em-migrate.c:2063
#, c-format
msgid "Unable to open old POP keep-on-server data `%s': %s"
msgstr "无法打开旧的 POP 保留在服务器上的数据“%s”:%s"
-#: ../mail/em-migrate.c:2076
+#: ../mail/em-migrate.c:2077
#, c-format
msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
msgstr "无法创建 POP3 保留在服务器上的数据目录“%s”:%s"
-#: ../mail/em-migrate.c:2105
+#: ../mail/em-migrate.c:2106
#, c-format
msgid "Unable to copy POP3 keep-on-server data `%s': %s"
msgstr "无法复制 POP3 在服务器上保留的数据“%s”:%s"
-#: ../mail/em-migrate.c:2576 ../mail/em-migrate.c:2588
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
#, c-format
msgid "Failed to create local mail storage `%s': %s"
msgstr "创建本地邮件存储“%s”失败:%s"
-#: ../mail/em-migrate.c:2711
+#: ../mail/em-migrate.c:2712
#, c-format
msgid "Unable to create local mail folders at `%s': %s"
msgstr "无法在“%s”创建本地邮件文件夹:%s"
-#: ../mail/em-migrate.c:2730
+#: ../mail/em-migrate.c:2731
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
@@ -11732,24 +11808,24 @@ msgstr ""
"无法从先前的 Evolution 安装中读取设置,“evolution/config.xmldb”不存在或者已损"
"坏。"
-#: ../mail/em-popup.c:556 ../mail/em-popup.c:567
+#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
msgid "_Reply to sender"
msgstr "回复发件人(_R)"
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../ui/evolution-mail-message.xml.h:83
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
-#: ../mail/em-popup.c:619
+#: ../mail/em-popup.c:620
msgid "_Open Link in Browser"
msgstr "在浏览器中打开链接(_O)"
-#: ../mail/em-popup.c:620
+#: ../mail/em-popup.c:621
msgid "_Send New Message To..."
msgstr "把新信发送到(_S)..."
-#: ../mail/em-popup.c:621
+#: ../mail/em-popup.c:622
msgid "_Add to Addressbook"
msgstr "添加到地址簿(_A)"
@@ -11774,28 +11850,28 @@ msgstr "请选择服务器。"
msgid "No server has been selected"
msgstr "没有选中服务器"
-#: ../mail/em-utils.c:123
-msgid "Don't show this message again."
+#: ../mail/em-utils.c:124
+msgid "Do not show this message again."
msgstr "不再显示此信息。"
-#: ../mail/em-utils.c:356
+#: ../mail/em-utils.c:357
msgid "Filters"
msgstr "过滤器"
-#: ../mail/em-utils.c:499 ../mail/em-utils.c:536
+#: ../mail/em-utils.c:500 ../mail/em-utils.c:537
msgid "message"
msgstr "信件"
-#: ../mail/em-utils.c:671
+#: ../mail/em-utils.c:672
msgid "Save Message..."
msgstr "保存信件..."
-#: ../mail/em-utils.c:720
+#: ../mail/em-utils.c:721
msgid "Add address"
msgstr "添加地址"
#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1204
+#: ../mail/em-utils.c:1205
#, c-format
msgid "Messages from %s"
msgstr "来自 %s 的信件"
@@ -12026,7 +12102,7 @@ msgid "Message Window default width"
msgstr "信件窗口默认宽度"
#: ../mail/evolution-mail.schemas.in.in.h:50
-msgid "Message-display style (normal, full headers, source)"
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
msgstr "信件显示风格(普通、全部邮件头、源代码)"
#: ../mail/evolution-mail.schemas.in.in.h:51
@@ -12300,11 +12376,6 @@ msgstr "导入器 Berkeley 邮箱格式文件夹"
msgid "Importing `%s'"
msgstr "导入“%s”"
-#: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252
-msgid "Importing..."
-msgstr "正在导入..."
-
#: ../mail/importers/evolution-outlook-importer.c:266
#: ../mail/importers/netscape-importer.c:1254
#: ../plugins/startup-wizard/startup-wizard.c:236
@@ -12433,73 +12504,73 @@ msgstr "%s 邮件列表"
msgid "Add Filter Rule"
msgstr "添加过滤规则"
-#: ../mail/mail-component.c:520
+#: ../mail/mail-component.c:521
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d 封已删除"
-#: ../mail/mail-component.c:522
+#: ../mail/mail-component.c:523
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d 封垃圾"
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:546
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d 封草稿"
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:548
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d 已发"
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:550
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d 封未发"
-#: ../mail/mail-component.c:553
+#: ../mail/mail-component.c:554
#, c-format
msgid "%d total"
msgid_plural "%d total"
msgstr[0] "总共 %d 封"
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:556
#, c-format
msgid ", %d unread"
msgid_plural ", %d unread"
msgstr[0] ",%d 封未读"
-#: ../mail/mail-component.c:778
+#: ../mail/mail-component.c:779
msgid "New Mail Message"
msgstr "新建信件"
-#: ../mail/mail-component.c:779
+#: ../mail/mail-component.c:780
msgid "_Mail Message"
msgstr "信件(_M)"
-#: ../mail/mail-component.c:780
+#: ../mail/mail-component.c:781
msgid "Compose a new mail message"
msgstr "撰写一封新信"
-#: ../mail/mail-component.c:786
+#: ../mail/mail-component.c:787
msgid "New Mail Folder"
msgstr "新建邮件文件夹"
-#: ../mail/mail-component.c:787
+#: ../mail/mail-component.c:788
msgid "Mail _Folder"
msgstr "邮件文件夹(_F)"
-#: ../mail/mail-component.c:788
+#: ../mail/mail-component.c:789
msgid "Create a new mail folder"
msgstr "创建新邮件文件夹"
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:933
msgid "Failed upgrading Mail settings or folders."
msgstr "升级邮件设置或文件夹失败。"
@@ -13019,7 +13090,7 @@ msgstr ""
"输入您想要给此帐户起的名字。\n"
"如:“工作”或“私人”"
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
msgid "User_name:"
msgstr "用户名(_N):"
@@ -13050,7 +13121,7 @@ msgid "_Do not notify me when new mail arrives"
msgstr "新邮件到达时不要提醒我(_D)"
#: ../mail/mail-config.glade.h:158
-msgid "_Don't sign meeting requests (for Outlook compatibility)"
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
#: ../mail/mail-config.glade.h:160
@@ -13078,7 +13149,7 @@ msgid "_Path:"
msgstr "路径(_P):"
#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgid "_Prompt when sending HTML messages to contacts that do not want them"
msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
#: ../mail/mail-config.glade.h:168
@@ -13215,26 +13286,26 @@ msgstr "以全部本地和活跃远程文件夹"
msgid "with all local folders"
msgstr "以所有本地文件夹"
-#: ../mail/mail-folder-cache.c:860
+#: ../mail/mail-folder-cache.c:861
#, c-format
msgid "Pinging %s"
msgstr "查验 %s"
-#: ../mail/mail-ops.c:103
+#: ../mail/mail-ops.c:104
msgid "Filtering Folder"
msgstr "过滤文件夹"
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
msgid "Fetching Mail"
msgstr "收取邮件"
#. sending mail, filtering failed
-#: ../mail/mail-ops.c:564
+#: ../mail/mail-ops.c:565
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "应用寄出过滤器失败:%s"
-#: ../mail/mail-ops.c:576 ../mail/mail-ops.c:605
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -13243,112 +13314,112 @@ msgstr ""
"追加到 %s:%s 失败\n"
"转而追加到本地“已发”文件夹。"
-#: ../mail/mail-ops.c:622
+#: ../mail/mail-ops.c:623
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "追加到本地“已发”文件夹失败:%s"
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
#, c-format
msgid "Sending message %d of %d"
msgstr "发送第%d封信,共%d封"
-#: ../mail/mail-ops.c:759
+#: ../mail/mail-ops.c:760
#, c-format
msgid "Failed to send %d of %d messages"
msgstr "在第%d封信失败,共%d封"
-#: ../mail/mail-ops.c:761 ../mail/mail-send-recv.c:613
-msgid "Cancelled."
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
+msgid "Canceled."
msgstr "已取消。"
-#: ../mail/mail-ops.c:763
+#: ../mail/mail-ops.c:764
msgid "Complete."
msgstr "完成。"
-#: ../mail/mail-ops.c:860
+#: ../mail/mail-ops.c:861
msgid "Saving message to folder"
msgstr "把信件保存到文件夹中"
-#: ../mail/mail-ops.c:945
+#: ../mail/mail-ops.c:946
#, c-format
msgid "Moving messages to %s"
msgstr "把信件移动到 %s"
-#: ../mail/mail-ops.c:945
+#: ../mail/mail-ops.c:946
#, c-format
msgid "Copying messages to %s"
msgstr "把信件复制到 %s"
-#: ../mail/mail-ops.c:1168
+#: ../mail/mail-ops.c:1169
msgid "Forwarded messages"
msgstr "转发的信件"
-#: ../mail/mail-ops.c:1211
+#: ../mail/mail-ops.c:1212
#, c-format
msgid "Opening folder %s"
msgstr "打开文件夹 %s"
-#: ../mail/mail-ops.c:1283
+#: ../mail/mail-ops.c:1284
#, c-format
msgid "Opening store %s"
msgstr "打开存储 %s"
-#: ../mail/mail-ops.c:1361
+#: ../mail/mail-ops.c:1362
#, c-format
msgid "Removing folder %s"
msgstr "删除文件夹“%s”"
-#: ../mail/mail-ops.c:1455
+#: ../mail/mail-ops.c:1456
#, c-format
msgid "Storing folder '%s'"
msgstr "存储文件夹“%s”"
-#: ../mail/mail-ops.c:1520
+#: ../mail/mail-ops.c:1521
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "销毁并存储账户“%s”"
-#: ../mail/mail-ops.c:1521
+#: ../mail/mail-ops.c:1522
#, c-format
msgid "Storing account '%s'"
msgstr "存储账户“%s”"
-#: ../mail/mail-ops.c:1576
+#: ../mail/mail-ops.c:1577
msgid "Refreshing folder"
msgstr "刷新文件夹"
-#: ../mail/mail-ops.c:1612 ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
msgid "Expunging folder"
msgstr "销毁文件夹"
-#: ../mail/mail-ops.c:1660
+#: ../mail/mail-ops.c:1661
#, c-format
msgid "Emptying trash in '%s'"
msgstr "清空“%s”中的回收站"
-#: ../mail/mail-ops.c:1661
+#: ../mail/mail-ops.c:1662
msgid "Local Folders"
msgstr "本地文件夹"
-#: ../mail/mail-ops.c:1744
+#: ../mail/mail-ops.c:1745
#, c-format
msgid "Retrieving message %s"
msgstr "收取信件 %s"
-#: ../mail/mail-ops.c:1854
+#: ../mail/mail-ops.c:1855
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "收取 %d 封信"
-#: ../mail/mail-ops.c:1940
+#: ../mail/mail-ops.c:1941
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messsages"
msgstr[0] "保存 %d 封信"
-#: ../mail/mail-ops.c:1990
+#: ../mail/mail-ops.c:1991
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -13357,7 +13428,7 @@ msgstr ""
"无法创建输出文件:%s\n"
" %s"
-#: ../mail/mail-ops.c:2018
+#: ../mail/mail-ops.c:2019
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -13366,11 +13437,11 @@ msgstr ""
"在将信件保存到 %s 时发生错误:\n"
" %s"
-#: ../mail/mail-ops.c:2089
+#: ../mail/mail-ops.c:2090
msgid "Saving attachment"
msgstr "保存附件"
-#: ../mail/mail-ops.c:2101
+#: ../mail/mail-ops.c:2102
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -13379,66 +13450,71 @@ msgstr ""
"无法创建输出文件:%s:\n"
" %s"
-#: ../mail/mail-ops.c:2111
+#: ../mail/mail-ops.c:2112
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据:%s"
-#: ../mail/mail-ops.c:2261
+#: ../mail/mail-ops.c:2262
#, c-format
msgid "Disconnecting from %s"
msgstr "断开与 %s 的连接"
-#: ../mail/mail-ops.c:2261
+#: ../mail/mail-ops.c:2262
#, c-format
msgid "Reconnecting to %s"
msgstr "重新连接到 %s"
-#: ../mail/mail-ops.c:2377
+#: ../mail/mail-ops.c:2378
msgid "Checking Service"
msgstr "检查服务"
#: ../mail/mail-send-recv.c:158
-msgid "Cancelling..."
+msgid "Canceling..."
msgstr "正在取消..."
-#: ../mail/mail-send-recv.c:265
+#: ../mail/mail-send-recv.c:266 ../mail/mail-send-recv.c:268
+#, c-format
+msgid "<b>%s (%s)</b> : %s"
+msgstr "<b>%s (%s)</b>:%s"
+
+#: ../mail/mail-send-recv.c:270
#, c-format
-msgid "Server: %s, Type: %s"
-msgstr "服务器:%s,类型:%s"
+msgid "<b>%s (%s)</b>"
+msgstr "<b>%s (%s)</b>"
-#: ../mail/mail-send-recv.c:267
+#: ../mail/mail-send-recv.c:274 ../mail/mail-send-recv.c:276
#, c-format
-msgid "Path: %s, Type: %s"
-msgstr "路径:%s,类型:%s"
+msgid "<b>%s</b> : %s"
+msgstr "<b>%s</b>:%s"
-#: ../mail/mail-send-recv.c:269
+#: ../mail/mail-send-recv.c:278
#, c-format
-msgid "Type: %s"
-msgstr "类型:%s"
+msgid "<b>%s</b>"
+msgstr "<b>%s</b>"
-#: ../mail/mail-send-recv.c:320
+#: ../mail/mail-send-recv.c:329
msgid "Send & Receive Mail"
msgstr "发送和接收邮件"
-#: ../mail/mail-send-recv.c:327
+#: ../mail/mail-send-recv.c:336
msgid "Cancel _All"
msgstr "全部取消(_A)"
-#: ../mail/mail-send-recv.c:416
+#: ../mail/mail-send-recv.c:425
msgid "Updating..."
msgstr "正在更新..."
-#: ../mail/mail-send-recv.c:416 ../mail/mail-send-recv.c:468
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
msgid "Waiting..."
msgstr "正在等待..."
-#: ../mail/mail-send-recv.c:699
+#: ../mail/mail-send-recv.c:709
msgid "Checking for new mail"
msgstr "检查新邮件"
#: ../mail/mail-session.c:204
-#: ../plugins/exchange-operations/exchange-config-listener.c:604
+#: ../plugins/exchange-operations/exchange-config-listener.c:678
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
@@ -13529,8 +13605,8 @@ msgstr ""
#: ../mail/mail.error.xml.h:6
msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send "
-"the reciept notification to {0}?"
+"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
+"receipt notification to {0}?"
msgstr "“{1}”请求了阅读收条。将阅读收条发送给{0}吗?"
#: ../mail/mail.error.xml.h:7
@@ -13554,225 +13630,238 @@ msgid "Are you sure you want to delete this account?"
msgstr "您确定要删除此账户吗?"
#: ../mail/mail.error.xml.h:11
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr "您确定要禁用此账户及其全部代理服务器吗?"
+
+#: ../mail/mail.error.xml.h:12
msgid "Are you sure you want to open {0} messages at once?"
msgstr "您确定要一次打开{0}封信吗?"
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:13
msgid ""
"Are you sure you want to permanently remove all the deleted messages in all "
"folders?"
msgstr "您确定想要永久删除全部文件夹中已删除的全部信件吗?"
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:14
msgid ""
"Are you sure you want to permanently remove all the deleted messages in "
"folder &quot;{0}&quot;?"
msgstr "您确定想要永久删除文件夹“%s”中已删除的全部信件吗?"
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
msgid "Are you sure you want to send a message in HTML format?"
msgstr "您确定想要以 HTML 格式发送信件吗?"
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:16
msgid "Are you sure you want to send a message with only BCC recipients?"
msgstr "您确信您要发送只有密件抄送收件人的信件吗?"
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:17
msgid "Are you sure you want to send a message without a subject?"
msgstr "您确定想要发送没有主题的信件吗?"
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:18
msgid "Because &quot;{0}&quot;."
msgstr "原因是“{0}”。"
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
msgid "Because &quot;{2}&quot;."
msgstr "原因是“{2}”。"
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:21
msgid "Blank Signature"
msgstr "空签名"
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:22
msgid "Cannot add Search Folder &quot;{0}&quot;."
msgstr "无法添加搜索文件夹“{0}”。"
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
msgstr "无法将文件夹“{0}”复制到“{1}”。"
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:24
msgid "Cannot create folder &quot;{0}&quot;."
msgstr "无法创建文件夹“{0}”。"
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:25
msgid "Cannot create temporary save directory."
msgstr "无法创建临时保存目录。"
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:26
msgid "Cannot create the save directory, because &quot;{1}&quot;"
msgstr "无法创建保存目录,原因是“{1}”"
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:27
msgid "Cannot delete folder &quot;{0}&quot;."
msgstr "无法删除文件夹“{0}”。"
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:28
msgid "Cannot delete system folder &quot;{0}&quot;."
msgstr "无法删除系统文件夹“{0}”。"
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
msgstr "无法编辑搜索文件夹“{0}”,原因是该文件夹不存在。"
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:30
msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
msgstr "无法将文件夹“{0}”移至“{1}”。"
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:31
msgid "Cannot open source &quot;{1}&quot;"
msgstr "无法打开源“{0}”"
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:32
msgid "Cannot open source &quot;{2}&quot;."
msgstr "无法打开源“{2}”。"
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:33
msgid "Cannot open target &quot;{2}&quot;."
msgstr "无法打开目标“{2}”。"
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
msgid ""
"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
+"problem. You will not be able to use this provider until you can accept its "
"license."
msgstr ""
"无法读取许可文件“{0}”,原因是安装有问题。您将无法使用此提供者,除非您接受其许"
"可协议。"
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:35
msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
msgstr "无法将“{0}”重命名为“{1}”。"
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:36
msgid "Cannot rename or move system folder &quot;{0}&quot;."
msgstr "无法重命名或移动系统文件夹“{0}”。"
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:37
msgid "Cannot save changes to account."
msgstr "无法将更改保存到账户。"
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:38
msgid "Cannot save to directory &quot;{0}&quot;."
msgstr "无法保存到目录“{0}”。"
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:39
msgid "Cannot save to file &quot;{0}&quot;."
msgstr "无法保存到文件“{0}”。"
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:40
msgid "Cannot set signature script &quot;{0}&quot;."
msgstr "无法设定签名脚本“{0}”。"
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:41
msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
+"Check to make sure your password is spelled correctly. Remember that many "
"passwords are case sensitive; your caps lock might be on."
msgstr ""
"选中此处以确保您的密码拼写正确。请记住,很多密码都是区分大小写的;您的 Caps "
"Lock 灯可能为开。"
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:42
msgid "Could not save signature file."
msgstr "无法保存签名文件。"
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
msgid "Delete &quot;{0}&quot;?"
msgstr "删除“{0}吗?”"
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:44
msgid "Delete account?"
msgstr "删除账户吗?"
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
msgid "Discard changes?"
msgstr "丢弃更改吗?"
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:46
+msgid "Do not delete"
+msgstr "不删除"
+
+#: ../mail/mail.error.xml.h:47
+msgid "Do not disable"
+msgstr "不禁用"
+
+#: ../mail/mail.error.xml.h:48
msgid "Do you want the operation to be performed in the subfolders?"
msgstr "您是否想要操作也在子文件夹中执行?"
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:49
msgid "Do you wish to save your changes?"
msgstr "您希望保存更改吗?"
-#: ../mail/mail.error.xml.h:47
-msgid "Don't delete"
-msgstr "不删除"
-
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:50
msgid "Enter password."
msgstr "输入密码。"
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:51
msgid "Error loading filter definitions."
msgstr "装入过滤器定义错误。"
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:52
msgid "Error while performing operation."
msgstr "执行操作时出错。"
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:53
msgid "Error while {0}."
msgstr "{0} 时出错。"
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:54
msgid "File exists but cannot overwrite it."
msgstr "文件存在但无法覆盖。"
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:55
msgid "File exists but is not a regular file."
msgstr "文件存在但不是普通文件。"
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
msgid "If you continue, you will not be able to recover these messages."
msgstr "如果您继续的话,您将无法恢复这些信件。"
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:57
msgid ""
"If you delete the folder, all of its contents and its subfolders contents "
"will be deleted permanently."
msgstr "如果您删除文件夹,其中的全部内容及其子文件夹内容将被永久删除。"
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:58
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr "如果您继续的话,全部代理账户都将被永久删除。"
+
+#: ../mail/mail.error.xml.h:59
msgid ""
"If you proceed, the account information and\n"
"all proxy information will be deleted permanently."
msgstr "如果您继续的话,账户信息及其全部代理服务器信息将被永久删除。"
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:61
msgid "If you proceed, the account information will be deleted permanently."
msgstr "如果您继续的话,账户信息将被永久删除。"
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:62
msgid ""
"If you quit, these messages will not be sent until Evolution is started "
"again."
msgstr "如果您退出,这些信件将会等到 Evolution 下次启动才会发出。"
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:63
msgid "Ignore"
msgstr "忽略"
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:64
msgid "Invalid authentication"
msgstr "无效的身份验证"
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
msgid "Mail filters automatically updated."
msgstr "邮件过滤器已自动更新。"
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:66
msgid ""
"Many email systems add an Apparently-To header to messages that only have "
"BCC recipients. This header, if added, will list all of your recipients to "
@@ -13783,35 +13872,35 @@ msgstr ""
"个邮件头,将在您的信件中列出您的全部收件人。为了避免这种情况,您应该至少填入"
"一个 To: 或 CC: 收件人。"
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
msgid "Mark all messages as read"
msgstr "把所有信件标记为已读"
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
msgid "Mark all messages as read in the selected folder"
msgstr "把选中文件夹中的全部信件标记为已读"
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:69
msgid "Missing folder."
msgstr "缺少文件夹。"
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
msgid "No sources selected."
msgstr "没有选中源。"
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
msgid "Opening too many messages at once may take a long time."
msgstr "一次打开太多封信可能要花一点时间。"
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
msgid "Please check your account settings and try again."
msgstr "请检查您的账户设置,然后再试一次。"
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
msgid "Please enable the account or send using another account."
msgstr "请启用账户或者使用其它账户发送。"
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
msgid ""
"Please enter a valid email address in the To: field. You can search for "
"email addresses by clicking on the To: button next to the entry box."
@@ -13819,7 +13908,7 @@ msgstr ""
"请在 To: 中输入有效的电子邮件地址。您可以单击输入框旁边的 To: 按钮来搜索电子"
"邮件地址。"
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
msgid ""
"Please make sure the following recipients are willing and able to receive "
"HTML email:\n"
@@ -13830,53 +13919,53 @@ msgstr ""
"{0}\n"
"仍然发送吗?"
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
msgid "Please provide an unique name to identify this signature."
msgstr "请提供此签名的唯一标识名称。"
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
msgid "Please wait."
msgstr "请稍候。"
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
msgid "Problem migrating old mail folder &quot;{0}&quot;."
msgstr "升迁旧的邮件文件夹“{0}”出现问题。"
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:82
msgid "Querying server"
msgstr "查询服务器"
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
msgid "Querying server for a list of supported authentication mechanisms."
msgstr "查询服务器所支持的身份验证算法列表。"
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:84
msgid "Read receipt requested."
msgstr "阅读收条已请求。"
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
msgstr "真的要删除文件夹“{0}”及其全部子文件夹吗?"
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:86
msgid "Search Folders automatically updated."
msgstr "搜索文件夹已自动更新。"
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
msgid "Send Receipt"
msgstr "发送收条"
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
msgid "Signature Already Exists"
msgstr "签名已经存在"
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
msgid ""
"System folders are required for Ximian Evolution to function correctly and "
"cannot be renamed, moved, or deleted."
msgstr "要让 Ximian Evolution 正常运作所需的系统文件夹无法重命名、移动或删除。"
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:90
msgid ""
"The contact list you are sending to is configured to hide list recipients.\n"
"\n"
@@ -13891,7 +13980,7 @@ msgstr ""
"个邮件头,将在您的信件中列出您的全部收件人。为了避免这种情况,您应该至少填入"
"一个 To: 或 CC: 收件人。"
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:93
msgid ""
"The following Search Folder(s):\n"
"{0}\n"
@@ -13905,7 +13994,7 @@ msgstr ""
"“{1}”\n"
"已经更新。"
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
msgid ""
"The following filter rule(s):\n"
"{0}\n"
@@ -13919,92 +14008,92 @@ msgstr ""
"“{1}”\n"
"已经更新。"
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:103
msgid ""
-"The message was sent via the &quot;sendmail&quot; external application. "
+"The message was sent via the &quot;sendmail&quot; external application. "
"Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder. Check the message for errors "
-"and resend."
+"The message is stored in the Outbox folder. Check the message for errors and "
+"resend."
msgstr ""
"此信件是通过“sendmail”外部应用程序发送的。而 Sendmail 报告了下列错误:状态 "
"67:邮件未发出。\n"
"此信件仍然保存在发件夹中。请检查信件的错误,然后重新发送。"
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:105
msgid "The script file must exist and be executable."
msgstr "脚本文件必须存在且可执行。"
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:106
msgid ""
"This folder may have been added implicitly,\n"
"go to the Search Folder editor to add it explicitly, if required."
msgstr ""
"此文件夹可能已经隐式添加了。如果需要的话,请转到搜索文件夹编辑器显式添加。"
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:108
msgid ""
"This message cannot be sent because the account you chose to send with is "
"not enabled"
msgstr "无法发送此信件,因为您所选择用来发送的账户未启用"
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:109
msgid ""
"This message cannot be sent because you have not specified any Recipients"
msgstr "无法发送此信件,因为您没有指定任何收件人"
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:110
msgid ""
"This server does not support this type of authentication and may not support "
"authentication at all."
msgstr "此服务器不支持此类型的身份验证,也可能根本不支持身份验证。"
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:111
msgid "This signature has been changed, but has not been saved."
msgstr "签名已经更改,但尚未保存。"
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:112
msgid "Unable to connect to the GroupWise server."
msgstr "无法连接到 GroupWise 服务器。"
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:113
msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
+"Unable to open the drafts folder for this account. Use the system drafts "
"folder instead?"
msgstr "无法打开此账户的草稿文件夹。使用系统的草稿文件夹吗?"
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:114
msgid "Unable to read license file."
msgstr "无法读取许可文件。"
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:115
msgid "Use _Default"
msgstr "使用默认值(_D)"
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:116
msgid "Use default drafts folder?"
msgstr "使用默认的草稿文件夹吗?"
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:117
msgid "You have not filled in all of the required information."
msgstr "您没有填入所需的全部信息。"
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:118
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr "您有未发信件,您仍然想要退出吗?"
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:119
msgid "You may not create two accounts with the same name."
msgstr "您不能创建两个同名账户。"
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:120
msgid "You must name this Search Folder."
msgstr "您必须为此搜索文件夹命名。"
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:121
msgid "You must specify a folder."
msgstr "您必须指定文件夹。"
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:122
msgid ""
"You must specify at least one folder as a source.\n"
"Either by selecting the folders individually, and/or by selecting all local "
@@ -14013,27 +14102,27 @@ msgstr ""
"您必须一次至少指定一个文件夹作为源。\n"
"或者逐一选择文件夹,或者选中全部本地文件夹和/或全部远程文件夹。"
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:124
msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
msgstr "您以“{1}”的身份登录到服务器“{0}”失败。"
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:125
msgid "Your message with the subject &quot;{0}&quot; was not delivered."
msgstr "您主题为“{0}”的信没有递送成功。"
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:126
msgid "_Append"
msgstr "追加(_A)"
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:127
msgid "_Discard changes"
msgstr "丢弃更改(_D)"
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:129
msgid "_Expunge"
msgstr "销毁(_E)"
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:130
msgid "_Open Messages"
msgstr "打开信件(_O)"
@@ -14079,7 +14168,7 @@ msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1353 ../plugins/itip-formatter/itip-view.c:197
+#: ../mail/message-list.c:1353 ../plugins/itip-formatter/itip-view.c:198
#: ../widgets/table/e-cell-date.c:72
msgid "Today %l:%M %p"
msgstr "今天 %H:%M"
@@ -14100,11 +14189,11 @@ msgstr "%m月%d日 %H:%M"
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
-#: ../mail/message-list.c:2055
+#: ../mail/message-list.c:2068
msgid "Message List"
msgstr "信件列表"
-#: ../mail/message-list.c:3400
+#: ../mail/message-list.c:3446
msgid "Generating message list"
msgstr "生成信件列表"
@@ -14161,11 +14250,11 @@ msgstr "转发"
msgid "No Response Necessary"
msgstr "不必回复"
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
msgid "Reply"
msgstr "回复"
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
msgid "Reply to All"
msgstr "全部回复"
@@ -14202,7 +14291,7 @@ msgid "Local Address Books"
msgstr "本地地址簿"
#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionallity for local address books."
+msgid "Provides core functionality for local address books."
msgstr "提供本地地址簿的核心功能。"
#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
@@ -14270,6 +14359,7 @@ msgid "Restore Settings..."
msgstr "恢复设置..."
#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr "自动联系人"
@@ -14299,10 +14389,6 @@ msgstr "定时从我的即时通讯服务器上同步联系人信息和图像(_I
msgid "Synchronize with _buddy list now"
msgstr "立即同步好友列表(_B)"
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-msgid "Automatic contacts"
-msgstr "自动联系人"
-
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
msgid ""
"Automatically fills your addressbook with names and email addresses as you "
@@ -14315,6 +14401,14 @@ msgstr ""
msgid "BBDB"
msgstr "BBDB"
+#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../plugins/caldav/caldav-source.c:269
+msgid "Use _SSL"
+msgstr "使用 _SSL"
+
#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
msgid "Local Calendars"
msgstr "装入日历"
@@ -14323,6 +14417,10 @@ msgstr "装入日历"
msgid "Provides core functionality for local calendars."
msgstr "提供本地日历的核心功能。"
+#: ../plugins/calendar-http/calendar-http.c:339
+msgid "_Secure connection"
+msgstr "安全连接(_S)"
+
#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
msgid "HTTP Calendars"
msgstr "HTTP 日历"
@@ -14533,7 +14631,7 @@ msgid "Exchange Settings"
msgstr "Exchange 设置"
#: ../plugins/exchange-operations/exchange-account-setup.c:619
-msgid "_OWA Url:"
+msgid "_OWA URL:"
msgstr "_OWA URL:"
#: ../plugins/exchange-operations/exchange-account-setup.c:645
@@ -14586,6 +14684,11 @@ msgstr "新建密码码:"
msgid "Your current password has expired. Please change your password now."
msgstr "您目前的密码已经过期。请立即更改您的密码。"
+#: ../plugins/exchange-operations/exchange-config-listener.c:633
+#, c-format
+msgid "Your password will expire in the next %d days"
+msgstr "您的密码即将于 %d 后过期"
+
#: ../plugins/exchange-operations/exchange-delegates-user.c:144
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
msgid "Custom"
@@ -14705,7 +14808,7 @@ msgstr "文件夹名称"
msgid "Folder Size"
msgstr "文件夹大小"
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:181
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:192
#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
msgid "Subscribe to Other User's Folder"
msgstr "订阅其他用户的文件夹"
@@ -14715,23 +14818,39 @@ msgid "Exchange Folder Tree"
msgstr "Exchange 文件夹树"
#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:227
-#: ../plugins/exchange-operations/exchange-folder.c:237
+#: ../plugins/exchange-operations/exchange-folder.c:229
+#: ../plugins/exchange-operations/exchange-folder.c:239
msgid "Unsubscribe Folder..."
msgstr "退订文件夹..."
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:524
+#: ../plugins/exchange-operations/exchange-folder.c:466
+#: ../plugins/exchange-operations/exchange-folder.c:526
#, c-format
msgid "Really unsubscribe from folder \"%s\"?"
msgstr "真的要退订文件夹“%s”吗?"
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:536
+#: ../plugins/exchange-operations/exchange-folder.c:478
+#: ../plugins/exchange-operations/exchange-folder.c:538
#, c-format
msgid "Unsubscribe from \"%s\""
msgstr "退订“%s”"
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
+msgid "Password Expiry Warning..."
+msgstr "密码过期警告..."
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
+msgid "Your password will expire in 7 days..."
+msgstr "您的密码即将于 7 天后过期..."
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
+msgid "_Change Password"
+msgstr "更改密码(_C)"
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
+msgid "ok_button"
+msgstr "确定(_B)"
+
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
msgid "(Permission denied.)"
msgstr "(权限被禁止。)"
@@ -14909,10 +15028,10 @@ msgstr "Exchange 账户脱机。"
msgid ""
"Exchange Connector requires access to certain\n"
"functionality on the Exchange Server that appears\n"
-"to be disabled or blocked. (This is usually \n"
-"unintentional.) Your Exchange Administrator will \n"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
"need to enable this functionality in order for \n"
-"you to be able to use Ximian Connector.\n"
+"you to be able to use Evolution Exchange Connector.\n"
"\n"
"For information to provide to your Exchange \n"
"administrator, please follow the link below:\n"
@@ -15014,7 +15133,7 @@ msgstr "Exchange 服务器与 Exchange Connector 不兼容。"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
msgid ""
-"The server is runinng Exchange 5.5. Exchange Connector \n"
+"The server is running Exchange 5.5. Exchange Connector \n"
"supports Microsoft Exchange 2000 and 2003 only."
msgstr ""
"服务器正在运行 Exchange 5.5。Exchange Connector 只支持 Microsoft Exchange "
@@ -15079,19 +15198,19 @@ msgstr "您只能配置单个 Exchange 账户。"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
msgid ""
-"Your current usage is : {0}KB. Try to clear up some space by deleting some "
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
"mails."
msgstr "您目前使用了 {0} KB。试着通过删除邮件来清理一些空间。"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
msgid ""
-"Your current usage is : {0}KB. You will not be able to either send or "
-"recieve mails now."
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mails now."
msgstr "您目前使用了 {0} KB。您现在既不能发送也不能接收邮件。"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
msgid ""
-"Your current usage is : {0}KB. You will not be able to send mails till you "
+"Your current usage is: {0} KB. You will not be able to send mails till you "
"clear up some space by deleting some mails."
msgstr "您目前使用了 {0} KB。您将无法发送邮件,除非您通过删除邮件来清理空间。"
@@ -15153,7 +15272,7 @@ msgid "Junk Mail Settings..."
msgstr "垃圾邮件设置..."
#: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List :</b>"
+msgid "<b>Junk List:</b>"
msgstr "<b>垃圾邮件列表:</b>"
#: ../plugins/groupwise-features/junk-settings.glade.h:2
@@ -15200,8 +15319,8 @@ msgid "Accept Tentatively"
msgstr "暂时接受"
#: ../plugins/groupwise-features/properties.glade.h:2
-msgid "<b>Users :</b>"
-msgstr "<b>用户:</b>"
+msgid "<b>Users:</b>"
+msgstr "<b>用户数:</b>"
#: ../plugins/groupwise-features/properties.glade.h:4
#: ../widgets/table/e-table-click-to-add.c:510
@@ -15221,7 +15340,7 @@ msgid "_Contacts..."
msgstr "联系人(_C)..."
#: ../plugins/groupwise-features/properties.glade.h:12
-msgid "_Cutomize notification message"
+msgid "_Customize notification message"
msgstr "自定义通知消息(_C)"
#: ../plugins/groupwise-features/properties.glade.h:13
@@ -15400,6 +15519,42 @@ msgstr "无法打开日历/待办!"
msgid "Could not open the Evolution calendar/todo list to export data."
msgstr "无法打开 Evolution 日历/待办列表导出数据。"
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
+#, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr "装入日历“%s”失败"
+
+#: ../plugins/itip-formatter/itip-formatter.c:407
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr "日历“%s”中的一个约会与此会议冲突"
+
+#: ../plugins/itip-formatter/itip-formatter.c:433
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "在日历“%s”中找到了约会"
+
+#: ../plugins/itip-formatter/itip-formatter.c:487
+msgid "Unable to find any calendars"
+msgstr "无法找到任何日历"
+
+#: ../plugins/itip-formatter/itip-formatter.c:494
+msgid "Unable to find this meeting in any calendar"
+msgstr "无法在任何日历中找到此会议"
+
+#: ../plugins/itip-formatter/itip-formatter.c:498
+msgid "Unable to find this task in any task list"
+msgstr "无法在任何任务列表中找到此任务"
+
+#: ../plugins/itip-formatter/itip-formatter.c:502
+msgid "Unable to find this journal entry in any journal"
+msgstr "无法在任何日记中找到此日记项"
+
+#: ../plugins/itip-formatter/itip-formatter.c:528
+msgid "Searching for an existing version of this appointment"
+msgstr "搜索此约会的已有版本"
+
#: ../plugins/itip-formatter/itip-formatter.c:724
msgid "Unable to parse item"
msgstr "无法分析项目"
@@ -15426,7 +15581,7 @@ msgstr "将日历“%s”发送为已拒绝"
#: ../plugins/itip-formatter/itip-formatter.c:805
#, c-format
-msgid "Sent to calendar '%s' as cancelled"
+msgid "Sent to calendar '%s' as canceled"
msgstr "将日历“%s”发送为已取消"
#: ../plugins/itip-formatter/itip-formatter.c:898
@@ -15435,11 +15590,11 @@ msgid "Organizer has removed the delegate %s "
msgstr "组织者已经删除了代理人 %s"
#: ../plugins/itip-formatter/itip-formatter.c:905
-msgid "Sent a cancellation notice to the delegate"
+msgid "Sent a cancelation notice to the delegate"
msgstr "已给代理人发送了取消通知"
#: ../plugins/itip-formatter/itip-formatter.c:907
-msgid "Could not send the cancellation notice to the delegate"
+msgid "Could not send the cancelation notice to the delegate"
msgstr "无法给代理人发送取消通知"
#: ../plugins/itip-formatter/itip-formatter.c:991
@@ -15461,7 +15616,7 @@ msgstr "附加的日历无效"
#: ../plugins/itip-formatter/itip-formatter.c:1149
msgid ""
-"The message claims to contain a calendar, but the calendar is not valid "
+"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
msgstr "信件声明其包含日历,但日历不是有效的 iCalendar。"
@@ -15509,312 +15664,366 @@ 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:33
-#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:466
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:32
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
msgid "Today"
msgstr "今天"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:188
+#: ../plugins/itip-formatter/itip-view.c:189
msgid "Today %H:%M"
msgstr "今天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:192
+#: ../plugins/itip-formatter/itip-view.c:193
msgid "Today %H:%M:%S"
msgstr "今天 %H:%M:%S"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:202
msgid "Today %l:%M:%S %p"
msgstr "今天 %H:%M:%S"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:211
+#: ../plugins/itip-formatter/itip-view.c:212
msgid "Tomorrow"
msgstr "明天"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:216
+#: ../plugins/itip-formatter/itip-view.c:217
msgid "Tomorrow %H:%M"
msgstr "明天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:221
msgid "Tomorrow %H:%M:%S"
msgstr "明天 %H:%M:%S"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:226
msgid "Tomorrow %l:%M %p"
msgstr "明天 %H:%M"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:230
msgid "Tomorrow %l:%M:%S %p"
msgstr "明天 %H:%M:%S"
#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:248
+#: ../plugins/itip-formatter/itip-view.c:249
#, c-format
msgid "%A"
msgstr "%A"
#. strftime format of a weekday and a
#. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:253
+#: ../plugins/itip-formatter/itip-view.c:254
msgid "%A %H:%M"
msgstr "%A %H:%M"
#. strftime format of a weekday and a
#. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../plugins/itip-formatter/itip-view.c:258
msgid "%A %H:%M:%S"
msgstr "%A %H:%M:%S"
#. strftime format of a weekday and a
#. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:263
msgid "%A %l:%M %p"
msgstr "%A %H:%M"
#. strftime format of a weekday and a
#. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:266
+#: ../plugins/itip-formatter/itip-view.c:267
msgid "%A %l:%M:%S %p"
msgstr "%A %H:%M:%S"
#. strftime format of a weekday and a date
#. without a year.
-#: ../plugins/itip-formatter/itip-view.c:275
+#: ../plugins/itip-formatter/itip-view.c:276
msgid "%A, %B %e"
msgstr "%-m月%-d日%A"
#. strftime format of a weekday, a date
#. without a year and a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:282
msgid "%A, %B %e %H:%M"
msgstr "%-m月%-d日%A %H:%M"
#. strftime format of a weekday, a date without a year
#. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:285
+#: ../plugins/itip-formatter/itip-view.c:286
msgid "%A, %B %e %H:%M:%S"
msgstr "%-m月%-d日%A %H:%M:%S"
#. strftime format of a weekday, a date without a year
#. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:291
msgid "%A, %B %e %l:%M %p"
msgstr "%-m月%-d日%A %H:%M"
#. strftime format of a weekday, a date without a year
#. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:295
msgid "%A, %B %e %l:%M:%S %p"
msgstr "%-m月%-d日%A %H:%M:%S"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:301
msgid "%A, %B %e, %Y"
msgstr "%Y年%-m月%-d日%A"
#. strftime format of a weekday, a date and a
#. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:305
+#: ../plugins/itip-formatter/itip-view.c:306
msgid "%A, %B %e, %Y %H:%M"
msgstr "%Y年%-m月%-d日%A %H:%M"
#. strftime format of a weekday, a date and a
#. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:310
msgid "%A, %B %e, %Y %H:%M:%S"
msgstr "%Y年%-m月%-d日%A %H:%M:%S"
#. strftime format of a weekday, a date and a
#. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:315
msgid "%A, %B %e, %Y %l:%M %p"
msgstr "%Y年%-m月%-d日%A %H:%M"
#. strftime format of a weekday, a date and a
#. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:319
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%Y年%-m月%-d日%A %H:%M:%S"
-#: ../plugins/itip-formatter/itip-view.c:343
+#: ../plugins/itip-formatter/itip-view.c:344
#, c-format
msgid "<b>%s</b> through %s has published the following meeting information:"
msgstr "<b>%s</b> 通过 %s 发布了会议信息:"
-#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:346
#, c-format
msgid "<b>%s</b> has published the following meeting information:"
msgstr "<b>%s</b> 发布了会议信息:"
-#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:351
#, c-format
msgid "<b>%s</b> has delegated the following meeting to you:"
msgstr "<b>%s</b> 为您代理了下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:354
#, c-format
msgid "<b>%s</b> through %s requests your presence at the following meeting:"
msgstr "<b>%s</b> 通过 %s 请求您参加下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:356
#, c-format
msgid "<b>%s</b> requests your presence at the following meeting:"
msgstr "<b>%s</b> 请求您参加下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:362
#, c-format
msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
msgstr "<b>%s</b> 通过 %s 希望加入到已有的会议:"
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:364
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting:"
msgstr "<b>%s</b> 希望加入到已有的会议:"
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:367
#, c-format
msgid ""
"<b>%s</b> wishes to receive the latest information for the following meeting:"
msgstr "<b>%s</b> 希望接收到下列会议的最新信息:"
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:370
#, c-format
msgid "<b>%s</b> has sent back the following meeting response:"
msgstr "<b>%s</b> 发回了下列会议请求的响应:"
-#: ../plugins/itip-formatter/itip-view.c:373
+#: ../plugins/itip-formatter/itip-view.c:374
#, c-format
-msgid "<b>%s</b> through %s has cancelled the following meeting:"
+msgid "<b>%s</b> through %s has canceled the following meeting:"
msgstr "<b>%s</b> 通过 %s 取消了下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:375
+#: ../plugins/itip-formatter/itip-view.c:376
#, c-format
-msgid "<b>%s</b> has cancelled the following meeting."
-msgstr "<b>%s</b> 取消了下列会议:"
+msgid "<b>%s</b> has canceled the following meeting."
+msgstr "<b>%s</b> 取消了下列会议。"
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:379
#, c-format
msgid "<b>%s</b> has proposed the following meeting changes."
msgstr "<b>%s</b> 提议了下列会议变更。"
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:383
#, c-format
msgid "<b>%s</b> through %s has declined the following meeting changes:"
msgstr "<b>%s</b> 通过 %s 拒绝了下列会议变更:"
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:385
#, c-format
msgid "<b>%s</b> has declined the following meeting changes."
msgstr "<b>%s</b> 拒绝了下列会议变更。"
-#: ../plugins/itip-formatter/itip-view.c:411
+#: ../plugins/itip-formatter/itip-view.c:412
#, c-format
msgid "<b>%s</b> through %s has published the following task:"
msgstr "<b>%s</b> 通过 %s 发布了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:413
+#: ../plugins/itip-formatter/itip-view.c:414
#, c-format
msgid "<b>%s</b> has published the following task:"
msgstr "<b>%s</b> 发布了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:419
#, c-format
msgid "<b>%s</b> requests the assignment of %s to the following task:"
msgstr "<b>%s</b> 请求给 %s 指派下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:422
#, c-format
msgid "<b>%s</b> through %s has assigned you a task:"
msgstr "<b>%s</b> 通过 %s 为您指派了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:424
#, c-format
msgid "<b>%s</b> has assigned you a task:"
msgstr "<b>%s</b> 为您指派了一个任务:"
-#: ../plugins/itip-formatter/itip-view.c:429
+#: ../plugins/itip-formatter/itip-view.c:430
#, c-format
msgid "<b>%s</b> through %s wishes to add to an existing task:"
msgstr "<b>%s</b> 通过 %s 希望加入到已有的任务:"
-#: ../plugins/itip-formatter/itip-view.c:431
+#: ../plugins/itip-formatter/itip-view.c:432
#, c-format
msgid "<b>%s</b> wishes to add to an existing task:"
msgstr "<b>%s<b> 希望加入到已存在的任务:"
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
#, c-format
msgid ""
"<b>%s</b> wishes to receive the latest information for the following "
"assigned task:"
msgstr "<b>%s</b> 想要收到所指派的下列任务的最新信息:"
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:438
#, c-format
msgid "<b>%s</b> has sent back the following assigned task response:"
msgstr "<b>%s</b> 发回了下列指派任务的回应:"
-#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:442
#, c-format
-msgid "<b>%s</b> through %s has cancelled the following assigned task:"
+msgid "<b>%s</b> through %s has canceled the following assigned task:"
msgstr "<b>%s</b> 通过 %s 取消了下列任务指派:"
-#: ../plugins/itip-formatter/itip-view.c:443
+#: ../plugins/itip-formatter/itip-view.c:444
#, c-format
-msgid "<b>%s</b> has cancelled the following assigned task:"
+msgid "<b>%s</b> has canceled the following assigned task:"
msgstr "<b>%s</b> 取消指派的下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:447
#, c-format
msgid "<b>%s</b> has proposed the following task assignment changes:"
msgstr "<b>%s</b> 提议了下列任务指派变更:"
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
#, c-format
msgid "<b>%s</b> through %s has declined the following assigned task:"
msgstr "<b>%s</b> 通过 %s 拒绝了下列任务指派:"
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:453
#, c-format
msgid "<b>%s</b> has declined the following assigned task:"
msgstr "<b>%s</b> 拒绝了指派的下列任务:"
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:705
+msgid "_Open Calendar"
+msgstr "打开日历(_O)"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:720
+#: ../plugins/itip-formatter/itip-view.c:736
+#: ../plugins/itip-formatter/itip-view.c:741
+msgid "_Accept"
+msgstr "接受(_A)"
+
+#: ../plugins/itip-formatter/itip-view.c:713
+msgid "_Decline all"
+msgstr "全部拒绝(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Decline"
+msgstr "拒绝(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:714
+msgid "_Tentative all"
+msgstr "全部待定(_T)"
+
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
+msgid "_Tentative"
+msgstr "待定(_T)"
+
+#: ../plugins/itip-formatter/itip-view.c:715
+msgid "_Accept all"
+msgstr "全部接受(_A)"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:724
+msgid "_Send Information"
+msgstr "发送信息(_S)"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:728
+msgid "_Update Attendee Status"
+msgstr "更新与会者状态(_U)"
+
+#: ../plugins/itip-formatter/itip-view.c:731
+msgid "_Update"
+msgstr "更新(_U)"
+
#. Start time
-#: ../plugins/itip-formatter/itip-view.c:891
+#: ../plugins/itip-formatter/itip-view.c:892
msgid "Start time:"
msgstr "开始时间:"
#. End time
-#: ../plugins/itip-formatter/itip-view.c:900
+#: ../plugins/itip-formatter/itip-view.c:901
msgid "End time:"
msgstr "结束时间:"
#. Comment
-#: ../plugins/itip-formatter/itip-view.c:916
-#: ../plugins/itip-formatter/itip-view.c:966
+#: ../plugins/itip-formatter/itip-view.c:917
+#: ../plugins/itip-formatter/itip-view.c:967
msgid "Comment:"
msgstr "注释:"
-#: ../plugins/itip-formatter/itip-view.c:980
+#: ../plugins/itip-formatter/itip-view.c:981
msgid "Send u_pdates to attendees"
msgstr "给出席者发送更新(_P)"
-#: ../plugins/itip-formatter/itip-view.c:989
+#: ../plugins/itip-formatter/itip-view.c:990
msgid "A_pply to all instances"
msgstr "应用到全部实例(_P)"
@@ -15901,6 +16110,7 @@ msgid ""
msgstr "允许根据邮件内容创建任务的插件。"
#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
msgid "Con_vert to Task"
msgstr "转换为任务(_V)"
@@ -15908,6 +16118,10 @@ msgstr "转换为任务(_V)"
msgid "Mail to task"
msgstr "邮寄到任务"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Convert the selected message to a new task"
+msgstr "将选中邮件转换为新任务"
+
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
msgid "Contact list _owner"
@@ -16103,8 +16317,10 @@ msgstr "新邮件通知"
msgid "A plugin for managing which plugins are enabled or disabled."
msgstr "管理插件是启用还是禁用的插件。"
+#. Setup the ui
#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-msgid "Plugin manager"
+#: ../plugins/plugin-manager/plugin-manager.c:188
+msgid "Plugin Manager"
msgstr "插件管理器"
#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
@@ -16112,8 +16328,8 @@ msgid "Enable and disable plugins"
msgstr "启用和禁用插件"
#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "Plugins"
-msgstr "插件"
+msgid "_Plugins"
+msgstr "插件(_P)"
#: ../plugins/plugin-manager/plugin-manager.c:45
msgid "Author(s)"
@@ -16133,11 +16349,6 @@ msgstr "路径"
msgid "Description"
msgstr "描述"
-#. Setup the ui
-#: ../plugins/plugin-manager/plugin-manager.c:188
-msgid "Plugin Manager"
-msgstr "插件管理器"
-
#: ../plugins/plugin-manager/plugin-manager.c:201
msgid "Note: Some changes will not take effect until restart"
msgstr "注意:某些更改直到重新启动后才生效"
@@ -16188,8 +16399,8 @@ msgid "Gives an option to print mail from composer"
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:77 ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
#: ../ui/evolution-tasks.xml.h:15
msgid "Print Pre_view"
msgstr "打印预览(_V)"
@@ -16222,7 +16433,7 @@ msgstr "位置"
msgid "_Publish Calendar Information"
msgstr "发布日历信息(_P)"
-#: ../plugins/publish-calendar/publish-calendar.c:371
+#: ../plugins/publish-calendar/publish-calendar.c:372
msgid "Are you sure you want to remove this URL?"
msgstr "您确定您想要删除此 URL 吗?"
@@ -16290,17 +16501,20 @@ msgstr ""
"iCal\n"
"忙/闲"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:99
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:101
msgid "Spamassassin (built-in)"
msgstr "垃圾克星(内置)"
#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Sa junk-plugin"
-msgstr "垃圾邮件学习插件"
+msgid ""
+"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
+"to be installed."
+msgstr ""
+"使用垃圾克星过滤垃圾邮件。此插件需要安装 Spamassassin。"
#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "learns junk messages using spamd."
-msgstr "使用 spamd 学习垃圾邮件。"
+msgid "Spamassassin junk plugin"
+msgstr "垃圾克星插件"
#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
msgid "A plugin for saving all attachments or parts of a message at once."
@@ -16328,7 +16542,7 @@ msgid "MIME Type"
msgstr "MIME 类型"
#: ../plugins/save-attachments/save-attachments.c:366
-#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
msgid "Save"
msgstr "保存"
@@ -16341,8 +16555,8 @@ msgid "%F %T"
msgstr "%F %T"
#: ../plugins/save-calendar/csv-format.c:385
-msgid "Uid"
-msgstr "Uid"
+msgid "UID"
+msgstr "UID"
#: ../plugins/save-calendar/csv-format.c:387
msgid "Description List"
@@ -16377,8 +16591,8 @@ msgid "percent Done"
msgstr "完成百分比"
#: ../plugins/save-calendar/csv-format.c:398
-msgid "Url"
-msgstr "Url"
+msgid "URL"
+msgstr "URL"
#: ../plugins/save-calendar/csv-format.c:399
msgid "Attendees List"
@@ -16459,6 +16673,10 @@ msgid "_Show only this Task List"
msgstr "只显示此任务列表(_S)"
#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "A plugin that handles the Startup wizard."
+msgstr "处理启动向导的插件。"
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
msgid "Startup wizard"
msgstr "启动向导"
@@ -16753,30 +16971,30 @@ msgstr "无法运行 Bug buddy。"
#. The translator-credits string is for translators to list
#. * per language credits for translation, displayed in the
#. * about box
-#: ../shell/e-shell-window-commands.c:533
+#: ../shell/e-shell-window-commands.c:530
msgid "translator-credits"
msgstr ""
"开源软件国际化之简体中文组\n"
"http://i18n.linux.net.cn"
-#: ../shell/e-shell-window-commands.c:547
+#: ../shell/e-shell-window-commands.c:544
msgid "Groupware Suite"
msgstr "Groupwise 套件"
-#: ../shell/e-shell-window-commands.c:778
+#: ../shell/e-shell-window-commands.c:775
msgid "_Work Online"
msgstr "联机工作(_W)"
-#: ../shell/e-shell-window-commands.c:791 ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:52
msgid "_Work Offline"
msgstr "脱机工作(_W)"
-#: ../shell/e-shell-window-commands.c:804
+#: ../shell/e-shell-window-commands.c:801
msgid "Work Offline"
msgstr "脱机工作"
#: ../shell/e-shell-window.c:370
-msgid "Evolution is currently online. Click on this button to work offline."
+msgid "Evolution is currently online. Click on this button to work offline."
msgstr "Evolution 目前联机。单击该按钮可脱机工作。"
#: ../shell/e-shell-window.c:378
@@ -16784,7 +17002,7 @@ msgid "Evolution is in the process of going offline."
msgstr "Evolution 正在脱机过程中。"
#: ../shell/e-shell-window.c:385
-msgid "Evolution is currently offline. Click on this button to work online."
+msgid "Evolution is currently offline. Click on this button to work online."
msgstr "Evolution 目前脱机。单击该按钮可联机工作。"
#: ../shell/e-shell-window.c:775
@@ -16980,7 +17198,7 @@ msgstr "真的要删除旧数据吗?"
#: ../shell/shell.error.xml.h:9
msgid ""
-"The entire contents of the &quot;evolution&quot; directory is about to be be "
+"The entire contents of the &quot;evolution&quot; directory are about to be "
"permanently removed.\n"
"\n"
"It is suggested you manually verify that all of your mail, contact, and "
@@ -17002,8 +17220,8 @@ msgid ""
"The previous version of evolution stored its data in a different location.\n"
"\n"
"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to "
-"keep this data, then you may manually remove the contents of &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
"evolution&quot; at your convenience.\n"
msgstr ""
"先前版本的 Evolution 将其数据存储在不同的位置。\n"
@@ -17101,26 +17319,26 @@ msgstr "由于您不信任颁发此证书的机构,您就将不信任此证书
#: ../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
+#: ../smime/gui/certificate-manager.c:375
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:595
+#: ../smime/gui/certificate-manager.c:603
msgid "Select a certificate to import..."
msgstr "选择要导入的证书..."
#: ../smime/gui/certificate-manager.c:267
-#: ../smime/gui/certificate-manager.c:476
-#: ../smime/gui/certificate-manager.c:694
+#: ../smime/gui/certificate-manager.c:472
+#: ../smime/gui/certificate-manager.c:690
msgid "Certificate Name"
msgstr "证书名称"
#: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:494
+#: ../smime/gui/certificate-manager.c:490
msgid "Purposes"
msgstr "用途"
#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:569
+#: ../smime/lib/e-cert.c:570
msgid "Serial Number"
msgstr "序列号"
@@ -17128,7 +17346,7 @@ msgstr "序列号"
msgid "Expires"
msgstr "到期"
-#: ../smime/gui/certificate-manager.c:485
+#: ../smime/gui/certificate-manager.c:481
msgid "E-Mail Address"
msgstr "电子邮件地址"
@@ -17228,7 +17446,7 @@ msgid ""
"and its policy and procedures (if available)."
msgstr "在信任此 CA 的任何用途之前,您应该先检查该证书及其策略和过程(若可用)。"
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
msgid "Certificate"
msgstr "证书"
@@ -17304,11 +17522,11 @@ msgstr "组织单元(OU)"
msgid "SHA1 Fingerprint"
msgstr "SHA1 指纹"
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
msgid "SSL Client Certificate"
msgstr "SSL 客户证书"
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
msgid "SSL Server Certificate"
msgstr "SSL 服务器证书"
@@ -17354,210 +17572,170 @@ msgid "_Edit CA Trust"
msgstr "编辑 CA 信任(_E)"
#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:654
+#: ../smime/lib/e-cert-db.c:657
msgid "Certificate already exists"
msgstr "证书已经存在"
-#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
msgid "%d/%m/%Y"
msgstr "%Y-%m-%d"
#. x509 certificate usage types
-#: ../smime/lib/e-cert.c:424
+#: ../smime/lib/e-cert.c:425
msgid "Sign"
msgstr "签名"
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:426
msgid "Encrypt"
msgstr "加密"
-#: ../smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:531
msgid "Version"
msgstr "版本"
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:546
msgid "Version 1"
msgstr "版本 1"
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:549
msgid "Version 2"
msgstr "版本 2"
-#: ../smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:552
msgid "Version 3"
msgstr "版本 3"
-#: ../smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:634
msgid "PKCS #1 MD2 With RSA Encryption"
msgstr "带 RSA 加密的 PKCS #1 MD2"
-#: ../smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:637
msgid "PKCS #1 MD5 With RSA Encryption"
msgstr "带 RSA 加密的 PKCS #1 MD5"
-#: ../smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:640
msgid "PKCS #1 SHA-1 With RSA Encryption"
msgstr "带 RSA 加密的 PKCS #1 SHA-1"
-#: ../smime/lib/e-cert.c:642
-msgid "C"
-msgstr "C"
-
-#: ../smime/lib/e-cert.c:645
-msgid "CN"
-msgstr "CN"
-
-#: ../smime/lib/e-cert.c:648
-msgid "OU"
-msgstr "OU"
-
-#: ../smime/lib/e-cert.c:651
-msgid "O"
-msgstr "O"
-
-#: ../smime/lib/e-cert.c:654
-msgid "L"
-msgstr "L"
-
-#: ../smime/lib/e-cert.c:657
-msgid "DN"
-msgstr "DN"
-
-#: ../smime/lib/e-cert.c:660
-msgid "DC"
-msgstr "DC"
-
-#: ../smime/lib/e-cert.c:663
-msgid "ST"
-msgstr "ST"
-
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:667
msgid "PKCS #1 RSA Encryption"
msgstr "PKCS #1 RSA 加密"
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:670
msgid "Certificate Key Usage"
msgstr "证书密钥用途"
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:673
msgid "Netscape Certificate Type"
msgstr "Netscape 证书类型"
-#: ../smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:676
msgid "Certificate Authority Key Identifier"
msgstr "证书颁发密钥身份"
-#: ../smime/lib/e-cert.c:678
-msgid "UID"
-msgstr "UID"
-
-#: ../smime/lib/e-cert.c:681
-msgid "E"
-msgstr "东"
-
-#: ../smime/lib/e-cert.c:687
+#: ../smime/lib/e-cert.c:688
#, c-format
msgid "Object Identifier (%s)"
msgstr "对象标识符(%s)"
-#: ../smime/lib/e-cert.c:738
+#: ../smime/lib/e-cert.c:739
msgid "Algorithm Identifier"
msgstr "算法标识符"
-#: ../smime/lib/e-cert.c:746
+#: ../smime/lib/e-cert.c:747
msgid "Algorithm Parameters"
msgstr "算法参数"
-#: ../smime/lib/e-cert.c:768
+#: ../smime/lib/e-cert.c:769
msgid "Subject Public Key Info"
msgstr "主题公钥信息"
-#: ../smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:774
msgid "Subject Public Key Algorithm"
msgstr "主题公钥算法"
-#: ../smime/lib/e-cert.c:788
+#: ../smime/lib/e-cert.c:789
msgid "Subject's Public Key"
msgstr "主题公钥"
-#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
msgid "Error: Unable to process extension"
msgstr "错误:无法处理扩展"
-#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
msgid "Object Signer"
msgstr "对象签名者"
-#: ../smime/lib/e-cert.c:834
+#: ../smime/lib/e-cert.c:835
msgid "SSL Certificate Authority"
msgstr "SSL 证书颁发机构"
-#: ../smime/lib/e-cert.c:838
+#: ../smime/lib/e-cert.c:839
msgid "Email Certificate Authority"
msgstr "电子邮件证书颁发机构"
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:867
msgid "Signing"
msgstr "签名"
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:871
msgid "Non-repudiation"
msgstr "不可抵赖"
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:875
msgid "Key Encipherment"
msgstr "密钥编码器"
-#: ../smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:879
msgid "Data Encipherment"
msgstr "数据编码器"
-#: ../smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:883
msgid "Key Agreement"
msgstr "密钥协议"
-#: ../smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:887
msgid "Certificate Signer"
msgstr "证书签名者"
-#: ../smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:891
msgid "CRL Signer"
msgstr "CRL 签名者"
-#: ../smime/lib/e-cert.c:938
+#: ../smime/lib/e-cert.c:939
msgid "Critical"
msgstr "关键"
-#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
msgid "Not Critical"
msgstr "非关键"
-#: ../smime/lib/e-cert.c:964
+#: ../smime/lib/e-cert.c:965
msgid "Extensions"
msgstr "扩展"
-#: ../smime/lib/e-cert.c:1035
+#: ../smime/lib/e-cert.c:1036
#, c-format
msgid "%s = %s"
msgstr "%s = %s"
-#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
msgid "Certificate Signature Algorithm"
msgstr "证书签名算法"
-#: ../smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1101
msgid "Issuer"
msgstr "发行者"
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1155
msgid "Issuer Unique ID"
msgstr "发行者唯一 ID"
-#: ../smime/lib/e-cert.c:1173
+#: ../smime/lib/e-cert.c:1174
msgid "Subject Unique ID"
msgstr "主题唯一 ID"
-#: ../smime/lib/e-cert.c:1216
+#: ../smime/lib/e-cert.c:1217
msgid "Certificate Signature Value"
msgstr "证书签名值"
@@ -17626,7 +17804,8 @@ msgstr "复制选中内容"
msgid "Copy to Folder..."
msgstr "复制到文件夹..."
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:7
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
#: ../ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "剪切"
@@ -17651,12 +17830,13 @@ msgstr "把选中的联系人移动到其它文件夹..."
msgid "Move to Folder..."
msgstr "移动到文件夹..."
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
#: ../ui/evolution-tasks.xml.h:11
msgid "Paste"
msgstr "粘贴"
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:15
msgid "Paste the clipboard"
msgstr "粘贴剪贴板"
@@ -17672,7 +17852,7 @@ msgstr "打印选中的联系人"
msgid "Save selected contacts as a VCard."
msgstr "把选中的联系人保存为 VCard。"
-#: ../ui/evolution-addressbook.xml.h:22 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:22 ../widgets/text/e-text.c:2712
msgid "Select All"
msgstr "全选"
@@ -17708,7 +17888,7 @@ msgstr "停止载入"
msgid "View the current contact"
msgstr "查看当前联系人"
-#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:36
#: ../ui/evolution-tasks.xml.h:21
msgid "_Actions"
msgstr "操作(_A)"
@@ -17742,123 +17922,131 @@ msgid "Delete this Occurrence"
msgstr "删除此次发生"
#: ../ui/evolution-calendar.xml.h:9
-msgid "Delete this occurrence"
-msgstr "删除此次发生"
-
-#: ../ui/evolution-calendar.xml.h:10
msgid "Go To"
msgstr "转到"
-#: ../ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:10
msgid "Go back"
msgstr "后退"
-#: ../ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:11
msgid "Go forward"
msgstr "前进"
-#: ../ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:12
msgid "List"
msgstr "列表"
-#: ../ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:13
msgid "Month"
msgstr "月"
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-calendar.xml.h:14 ../ui/evolution-mail-message.xml.h:58
msgid "Next"
msgstr "下一项"
-#: ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:16
msgid "Previews the calendar to be printed"
msgstr "预览将要打印的日历"
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-calendar.xml.h:17 ../ui/evolution-mail-message.xml.h:74
msgid "Previous"
msgstr "上一项"
-#: ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-calendar.xml.h:20
msgid "Print this calendar"
msgstr "打印此日历"
-#: ../ui/evolution-calendar.xml.h:22 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-tasks.xml.h:17
msgid "Purg_e"
msgstr "销毁(_E)"
-#: ../ui/evolution-calendar.xml.h:23
+#: ../ui/evolution-calendar.xml.h:22
msgid "Purge old appointments and meetings"
msgstr "销毁旧约会和会议"
-#: ../ui/evolution-calendar.xml.h:24
+#: ../ui/evolution-calendar.xml.h:23
msgid "Select _Date"
msgstr "选择日期(_D)"
-#: ../ui/evolution-calendar.xml.h:25
+#: ../ui/evolution-calendar.xml.h:24
msgid "Select _Today"
msgstr "选择今天(_T)"
-#: ../ui/evolution-calendar.xml.h:26
+#: ../ui/evolution-calendar.xml.h:25
msgid "Select a specific date"
msgstr "选择特定日期"
-#: ../ui/evolution-calendar.xml.h:27
+#: ../ui/evolution-calendar.xml.h:26
msgid "Select today"
msgstr "选择今天"
-#: ../ui/evolution-calendar.xml.h:28
+#: ../ui/evolution-calendar.xml.h:27
msgid "Show as list"
msgstr "显示为列表"
-#: ../ui/evolution-calendar.xml.h:29
+#: ../ui/evolution-calendar.xml.h:28
msgid "Show one day"
msgstr "显示一天"
-#: ../ui/evolution-calendar.xml.h:30
+#: ../ui/evolution-calendar.xml.h:29
msgid "Show one month"
msgstr "显示一个月"
-#: ../ui/evolution-calendar.xml.h:31
+#: ../ui/evolution-calendar.xml.h:30
msgid "Show one week"
msgstr "显示一周"
-#: ../ui/evolution-calendar.xml.h:32
+#: ../ui/evolution-calendar.xml.h:31
msgid "Show the working week"
msgstr "显示工作周"
-#: ../ui/evolution-calendar.xml.h:34
+#: ../ui/evolution-calendar.xml.h:33
msgid "View the current appointment"
msgstr "查看当前约会"
-#: ../ui/evolution-calendar.xml.h:35
+#: ../ui/evolution-calendar.xml.h:34
msgid "Week"
msgstr "周"
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:35
msgid "Work Week"
msgstr "一周工作日"
-#: ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-calendar.xml.h:40
msgid "_Open Appointment"
msgstr "打开约会(_O)"
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-editor.xml.h:7
+#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
msgid "Copy selected text to the clipboard"
msgstr "将选中文字复制到剪贴板"
-#: ../ui/evolution-composer-entries.xml.h:3 ../ui/evolution-editor.xml.h:9
+#: ../ui/evolution-composer-entries.xml.h:3
+msgid "Copy selection to clipboard"
+msgstr "将选中文字复制到剪贴板"
+
+#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
msgid "Cut selected text to the clipboard"
msgstr "将选中文字剪切到剪贴板"
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:10
+#: ../ui/evolution-composer-entries.xml.h:7
+msgid "Cut selection to clipboard"
+msgstr "将选中文字剪切到剪贴板"
+
+#: ../ui/evolution-composer-entries.xml.h:9
+msgid "Paste from clipboard"
+msgstr "从剪贴板粘贴"
+
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
msgid "Paste text from the clipboard"
msgstr "从剪贴板中粘贴文字"
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-editor.xml.h:12
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
#: ../ui/evolution-subscribe.xml.h:6
msgid "Select _All"
msgstr "全选(_A)"
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
msgid "Select all text"
msgstr "选中所有文字"
@@ -17879,7 +18067,7 @@ msgid "Click here to save the current window"
msgstr "单击此处可保存当前窗口"
#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help availabe"
+msgid "Click here to view help available"
msgstr "单击此处可查看可用的帮助"
#.
@@ -17893,28 +18081,27 @@ msgstr "单击此处可查看可用的帮助"
msgid "Close"
msgstr "关闭"
-#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
msgid "_Attachment..."
msgstr "附件(_A)..."
#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:43 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:44 ../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:46
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-signature-editor.xml.h:25
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:39
msgid "_File"
msgstr "文件(_F)"
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:39
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:40
msgid "_Help"
msgstr "帮助(_H)"
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-message-composer.xml.h:48
-#: ../ui/evolution-signature-editor.xml.h:25
+#: ../ui/evolution-editor.xml.h:20
msgid "_Insert"
msgstr "插入(_I)"
@@ -17962,14 +18149,14 @@ msgstr "查询出席者的忙闲信息"
msgid "R_ole Field"
msgstr "角色域(_O)"
-#: ../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:16
+#: ../ui/evolution-event-editor.xml.h:15
msgid "Show time as b_usy"
msgstr "将时间设定为忙(_U)"
+#: ../ui/evolution-event-editor.xml.h:16
+msgid "Time _Zone"
+msgstr "时区(_Z)"
+
#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:12
msgid "Toggles whether the Attendee Type field is displayed"
msgstr "切换是否显示出席者类型域"
@@ -18034,10 +18221,6 @@ msgstr "状态域(_S)"
msgid "_Type Field"
msgstr "类型域(_T)"
-#: ../ui/evolution-executive-summary.xml.h:1
-msgid "Customize My Evolution"
-msgstr "自定义我的 Evolution"
-
#: ../ui/evolution-mail-global.xml.h:2
msgid "Cancel the current mail operation"
msgstr "取消当前邮件操作"
@@ -18062,44 +18245,44 @@ msgstr "创建或编辑过滤新邮件的规则"
msgid "Empty _Trash"
msgstr "清空回收站(_T)"
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
#: ../ui/evolution-subscribe.xml.h:2
msgid "F_older"
msgstr "文件夹(_O)"
#: ../ui/evolution-mail-global.xml.h:9
-msgid "Message F_ilters"
-msgstr "邮件过滤(_I)"
-
-#: ../ui/evolution-mail-global.xml.h:10
msgid "Message _Preview"
msgstr "信件预览(_P)"
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:10
msgid "Move the selected folder into another folder"
msgstr "把选中的文件夹移动到其它文件夹"
#. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:12
msgid "Permanently remove all deleted messages from all folders"
msgstr "永久删除所有文件夹中的所有已删除的信件"
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:13
msgid "Search F_olders"
msgstr "搜索文件夹(_O)"
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:14
msgid "Show message preview window"
msgstr "显示信件预览窗口"
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:15
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "订阅或取消订阅远程服务器上的文件夹"
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:16
msgid "_Copy Folder To..."
msgstr "文件夹复制到(_C)..."
+#: ../ui/evolution-mail-global.xml.h:17
+msgid "_Message Filters"
+msgstr "邮件过滤(_M)"
+
#: ../ui/evolution-mail-global.xml.h:18
msgid "_Move Folder To..."
msgstr "文件夹移至(_M)..."
@@ -18123,97 +18306,113 @@ msgstr "更改此文件夹的名称"
msgid "Change the properties of this folder"
msgstr "更改此文件夹的属性"
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:3
+msgid "Collapse All _Threads"
+msgstr "折叠全部线索(_T)"
+
+#: ../ui/evolution-mail-list.xml.h:4
+msgid "Collapse all message threads"
+msgstr "折叠全部邮件线索"
+
+#: ../ui/evolution-mail-list.xml.h:5 ../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:23
+#: ../ui/evolution-mail-list.xml.h:7 ../ui/evolution-mail-message.xml.h:23
msgid "Cut selected message(s) to the clipboard"
msgstr "将选中信件剪切到剪贴板"
-#: ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:8
+msgid "E_xpand All Threads"
+msgstr "展开全部线索(_X)"
+
+#: ../ui/evolution-mail-list.xml.h:9
msgid "E_xpunge"
msgstr "销毁(_X)"
-#: ../ui/evolution-mail-list.xml.h:8
-msgid "Group By _Threads"
-msgstr "按线索分组(_T)"
+#: ../ui/evolution-mail-list.xml.h:10
+msgid "Expand all message threads"
+msgstr "展开全部邮件线索"
-#: ../ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:12
msgid "Hide S_elected Messages"
msgstr "隐藏选中的信件(_E)"
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:13
msgid "Hide _Deleted Messages"
msgstr "隐藏已删除的信件(_D)"
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:14
msgid "Hide _Read Messages"
msgstr "隐藏已读的信件(_R)"
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:15
msgid ""
"Hide deleted messages rather than displaying them with a line through them"
msgstr "隐藏已删除的信件而不是在上面显示一条线"
-#: ../ui/evolution-mail-list.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:16
msgid "Mar_k Messages as Read"
msgstr "把信件标记为已读(_K)"
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-list.xml.h:17 ../ui/evolution-mail-message.xml.h:67
msgid "Paste message(s) from the clipboard"
msgstr "从剪贴板粘贴信件"
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:18
msgid "Permanently remove all deleted messages from this folder"
msgstr "从该文件夹永久删除所有已删除的信件"
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:19
msgid "Permanently remove this folder"
msgstr "永久删除此文件夹"
-#: ../ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:20
msgid "Select Message _Thread"
msgstr "选择信件线索(_T)"
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:21
msgid "Select _All Messages"
msgstr "选中全部信件(_A)"
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:22
msgid "Select all and only the messages that are not currently selected"
msgstr "选中所有当前没有选中的信件"
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:23
msgid "Select all messages in the same thread as the selected message"
msgstr "把同一线索中的所有信件选择为选中信件"
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:24
msgid "Select all visible messages"
msgstr "选中所有可见的信件"
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:25
msgid "Sh_ow Hidden Messages"
msgstr "显示隐藏的信件(_O)"
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:26
msgid "Show messages that have been temporarily hidden"
msgstr "显示暂时被隐藏的信件"
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:27
msgid "Temporarily hide all messages that have already been read"
msgstr "暂时隐藏所有已读信件"
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:28
msgid "Temporarily hide the selected messages"
msgstr "暂时隐藏选中信件"
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:29
msgid "Threaded Message list"
msgstr "按线索编排的信件列表"
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-list.xml.h:31
+msgid "_Group By Threads"
+msgstr "按线索分组(_G)"
+
+#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
#: ../ui/evolution-mail-messagedisplay.xml.h:7
msgid "_Message"
msgstr "信件(_M)"
@@ -18420,193 +18619,193 @@ msgid "Mark the selected messages for deletion"
msgstr "为选中信件做删除标记"
#: ../ui/evolution-mail-message.xml.h:57
-msgid "Message Source"
-msgstr "信件来源"
-
-#: ../ui/evolution-mail-message.xml.h:58
msgid "Move selected message(s) to another folder"
msgstr "把选中的信件移动到其它文件夹"
-#: ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:59
msgid "Next _Important Message"
msgstr "下一封重要信件(_I)"
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:60
msgid "Next _Thread"
msgstr "下一条线索(_T)"
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:61
msgid "Next _Unread Message"
msgstr "下一封未读信件(_U)"
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:62
msgid "Not Junk"
msgstr "非垃圾"
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:63
msgid "Open a window for composing a mail message"
msgstr "打开窗口以撰写信件"
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:64
msgid "Open the selected message in a new window"
msgstr "在新窗口中打开选中的信件"
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:65
msgid "Open the selected message in the composer for editing"
msgstr "在撰写器中打开选中的信件以便编辑"
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:66
msgid "P_revious Unread Message"
msgstr "上一封未读信件(_R)"
-#: ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:68
msgid "Pos_t New Message to Folder"
msgstr "把新信件投递到文件夹(_T)"
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:69
msgid "Post a Repl_y"
msgstr "投递回复(_Y)"
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:70
msgid "Post a message to a Public folder"
msgstr "把信件保存到公共文件夹中"
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:71
msgid "Post a reply to a message in a Public folder"
msgstr "在公共文件夹中回复信件"
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:72
msgid "Pr_evious Important Message"
msgstr "上一封重要信件(_E)"
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:73
msgid "Preview the message to be printed"
msgstr "预览要打印的信件"
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:77
msgid "Print this message"
msgstr "打印该信件"
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:78
msgid "Re_direct"
msgstr "重发(_D)"
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:79
msgid "Redirect (bounce) the selected message to someone"
msgstr "将选中信件重发(退回)给某人"
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:84
msgid "Reset the text to its original size"
msgstr "把文件重新设置为原来的大小"
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:85
msgid "Save the message as a text file"
msgstr "把信件存为文本文件"
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:86
msgid "Search Folder from Mailing _List..."
msgstr "基于邮件列表的搜索文件夹(_L)..."
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:87
msgid "Search Folder from Recipients..."
msgstr "基于收件人的搜索文件夹..."
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:88
msgid "Search Folder from S_ubject..."
msgstr "基于主题的搜索文件夹(_U)..."
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:89
msgid "Search Folder from Sen_der..."
msgstr "基于发件人的搜索文件夹(_D)..."
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:90
msgid "Search for text in the body of the displayed message"
msgstr "在显示邮件的邮件体中搜索文本"
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:91
msgid "Select _All Text"
msgstr "选中所有文字(_A)"
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:92
msgid "Select all the text in a message"
msgstr "选中信件中的全部文本"
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93
msgid "Set up the page settings for your current printer"
msgstr "设定您当前打印机的页面设置"
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:94
msgid "Show a blinking cursor in the body of displayed messages"
msgstr "在显示信件的信体中显示闪烁光标"
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:95
msgid "Show message in the normal style"
msgstr "以普通样式显示信件"
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
msgid "Show message with all email headers"
msgstr "显示邮件时显示所有信头"
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
msgid "Show the raw email source of the message"
msgstr "显示信件的原始邮件源代码"
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
msgid "Un-delete the selected messages"
msgstr "取消选中信件的删除"
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
msgid "Uni_mportant"
msgstr "不重要(_M)"
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
msgid "Zoom _Out"
msgstr "缩小(_O)"
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
msgid "_Attached"
msgstr "附件(_A)"
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
msgid "_Caret Mode"
msgstr "光标模式(_C)"
-#: ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-mail-message.xml.h:103
msgid "_Clear Flag"
msgstr "清除标志(_C)"
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:106
msgid "_Delete Message"
msgstr "删除信件(_D)"
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
msgid "_Find in Message..."
msgstr "在信件中寻找(_F)..."
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:109
msgid "_Flag Completed"
msgstr "标志为已完成(_F)"
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
msgid "_Go To"
msgstr "转到(_G)"
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
msgid "_Important"
msgstr "重要(_I)"
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
msgid "_Inline"
msgstr "嵌入(_I)"
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
msgid "_Junk"
msgstr "垃圾(_J)"
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:115
msgid "_Load Images"
msgstr "装入图像(_L)"
+#: ../ui/evolution-mail-message.xml.h:117
+msgid "_Message Source"
+msgstr "信件源代码(_M)"
+
#: ../ui/evolution-mail-message.xml.h:119
msgid "_Next Message"
msgstr "下一封信(_N)"
@@ -18651,7 +18850,7 @@ msgstr "放大(_Z)"
msgid "Close this window"
msgstr "关闭此窗口"
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
msgid "Main toolbar"
msgstr "主工具栏"
@@ -18726,124 +18925,129 @@ msgstr "当您的信件被阅读时得到投递通知"
msgid "HT_ML"
msgstr "HT_ML"
-#: ../ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "插入(_N)"
+
+#: ../ui/evolution-message-composer.xml.h:13
msgid "Open a file"
msgstr "打开文件"
-#: ../ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:14
msgid "PGP Encrypt"
msgstr "PGP 加密"
-#: ../ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:15
msgid "PGP Sign"
msgstr "PGP 签名"
-#: ../ui/evolution-message-composer.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:16
msgid "R_equest Read Receipt"
msgstr "请求阅读收条(_E)"
-#: ../ui/evolution-message-composer.xml.h:16
+#: ../ui/evolution-message-composer.xml.h:17
msgid "S/MIME Encrypt"
msgstr "S/MIME 加密"
-#: ../ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:18
msgid "S/MIME Sign"
msgstr "S/MIME 签名"
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:20
msgid "Save As"
msgstr "另存为"
-#: ../ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:21
msgid "Save Draft"
msgstr "保存草稿"
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:22
msgid "Save _As..."
msgstr "另存为(_A)..."
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:23
msgid "Save _Draft"
msgstr "保存草稿(_D)"
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:24
msgid "Save as draft"
msgstr "另存为草稿"
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:25
msgid "Save in folder..."
msgstr "保存到文件夹..."
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:26
msgid "Save the current file"
msgstr "保存当前文件"
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:27
msgid "Save the current file with a different name"
msgstr "用不同的文件名保存当前文件"
-#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:28
msgid "Save the message in a specified folder"
msgstr "在指定的文件夹中保存信件"
-#: ../ui/evolution-message-composer.xml.h:29
-#: ../ui/evolution-signature-editor.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-signature-editor.xml.h:23
msgid "Send the mail in HTML format"
msgstr "以 HTML 格式发送邮件"
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:31
msgid "Send this message"
msgstr "发送这封信"
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:32
msgid "Set the message priority to high"
msgstr "将信件设定为高优先级"
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:33
msgid "Sign this message with your PGP key"
msgstr "用您的 PGP 密钥签名该信件"
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:34
msgid "Sign this message with your S/MIME Signature Certificate"
msgstr "用您的 S/MIME 签名认证签名该信件"
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:35
msgid "Toggles whether the BCC field is displayed"
msgstr "是否显示暗中转发域"
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:36
msgid "Toggles whether the CC field is displayed"
msgstr "是否显示转发域"
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:37
msgid "Toggles whether the From chooser is displayed"
msgstr "是否显示发件人选择器"
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:38
msgid "Toggles whether the Post-To field is displayed"
msgstr "是否显示投递到域"
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:39
msgid "Toggles whether the Reply-To field is displayed"
msgstr "是否显示回复域"
-#: ../ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:40
msgid "Toggles whether the To field is displayed"
msgstr "是否显示寄给域"
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:42
msgid "_Bcc Field"
msgstr "暗送域(_B)"
-#: ../ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-message-composer.xml.h:43
msgid "_Cc Field"
msgstr "抄送域(_C)"
-#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-message-composer.xml.h:45
msgid "_Delete all"
msgstr "全部删除(_D)"
-#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:48
msgid "_From Field"
msgstr "发件人域(_F)"
@@ -18879,18 +19083,18 @@ msgstr "关闭(_L)"
msgid "H_TML"
msgstr "H_TML"
-#: ../ui/evolution-signature-editor.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:17
msgid "Save and Close"
msgstr "保存并关闭"
#.
#. <menuitem name="FileSave" verb="" _label="_Save"/>
#.
-#: ../ui/evolution-signature-editor.xml.h:20
+#: ../ui/evolution-signature-editor.xml.h:21
msgid "Save and _Close"
msgstr "保存并关闭(_C)"
-#: ../ui/evolution-signature-editor.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:22
msgid "Save the current file and close the window"
msgstr "保存当前文件并关闭窗口"
@@ -18926,6 +19130,10 @@ msgstr "反转选择(_I)"
msgid "Click change / view the status details of the task"
msgstr "单击可更改/查看任务的状态细节"
+#: ../ui/evolution-task-editor.xml.h:9
+msgid "Show Time _Zone"
+msgstr "显示时区(_Z)"
+
#: ../ui/evolution-task-editor.xml.h:10
msgid "Status Details"
msgstr "状态细节"
@@ -19039,42 +19247,46 @@ msgid "Hide window buttons"
msgstr "隐藏窗口按钮"
#: ../ui/evolution.xml.h:14
+msgid "I_mport..."
+msgstr "导入(_M)..."
+
+#: ../ui/evolution.xml.h:15
msgid "Icons _and text"
msgstr "图标和文字(_A)"
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:16
msgid "Import data from other programs"
msgstr "从其它程序导入数据"
-#: ../ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:18
msgid "New _Window"
msgstr "新建窗口(_W)"
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:19
msgid "Prefere_nces"
msgstr "首选项(_N)"
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:20
msgid "Send / Receive"
msgstr "发送/接收"
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:21
msgid "Send / _Receive"
msgstr "发送/接收(_R)"
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:22
msgid "Send queued items and retrieve new items"
msgstr "发送队列中的的邮件并收取新邮件"
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:23
msgid "Set up Pilot configuration"
msgstr "配置 Pilot"
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:24
msgid "Show information about Evolution"
msgstr "显示关于 Evolution 的信息"
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:25
msgid "Submit Bug Report"
msgstr "提交错误报告"
@@ -19082,50 +19294,46 @@ msgstr "提交错误报告"
#. _label="Evolution _FAQ"/>
#.
#. <separator/>
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:30
msgid "Submit _Bug Report"
msgstr "提交错误报告(_B)"
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:31
msgid "Submit a bug report using Bug Buddy"
msgstr "用 Bug Buddy 提交错误报告"
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:32
msgid "Toggle whether we are working offline."
msgstr "切换是否脱机工作。"
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:33
msgid "Tool_bar"
msgstr "工具栏(_B)"
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:34
msgid "Tool_bar style"
msgstr "工具栏样式(_B)"
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:35
msgid "View/Hide the Status Bar"
msgstr "查看/隐藏状态栏"
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:36
msgid "_About Evolution..."
msgstr "关于 Evolution(_A)..."
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:37
msgid "_Close Window"
msgstr "关闭窗口(_C)"
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
msgid "_Hide buttons"
msgstr "隐藏按钮(_H)"
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:42
msgid "_Icons only"
msgstr "只有图标(_I)"
-#: ../ui/evolution.xml.h:42
-msgid "_Import..."
-msgstr "导入(_I)..."
-
#: ../ui/evolution.xml.h:43
msgid "_New"
msgstr "新建(_N)"
@@ -19301,20 +19509,24 @@ msgid "_Replace existing view"
msgstr "替换现有视图(_R)"
#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-instance.c:587
#: ../widgets/menus/gal-view-menus.c:350
msgid "Custom View"
msgstr "当前视图"
-#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-instance.c:588
msgid "Save Custom View"
msgstr "保存自定义视图"
-#: ../widgets/menus/gal-view-instance.c:591
+#: ../widgets/menus/gal-view-instance.c:592
#: ../widgets/menus/gal-view-menus.c:372
msgid "Define Views..."
msgstr "定义视图..."
+#: ../widgets/menus/gal-view-menus.c:291
+msgid "C_urrent View"
+msgstr "当前视图(_U)"
+
#: ../widgets/menus/gal-view-menus.c:359
msgid "Save Custom View..."
msgstr "保存当前视图..."
@@ -19341,12 +19553,12 @@ msgstr "视图类型:"
#. Translators: These are the first characters of each day of the
#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:415
+#: ../widgets/misc/e-calendar-item.c:416
msgid "MTWTFSS"
msgstr "一二三四五六日"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1097
+#: ../widgets/misc/e-calendar-item.c:1098
msgid "%B %Y"
msgstr "%Y年%B"
@@ -19358,62 +19570,62 @@ msgstr "上一按钮"
msgid "Month Calendar"
msgstr "月历"
-#: ../widgets/misc/e-canvas-background.c:456
-#: ../widgets/misc/e-canvas-background.c:457 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3540
-#: ../widgets/text/e-text.c:3541
+#: ../widgets/misc/e-canvas-background.c:459
+#: ../widgets/misc/e-canvas-background.c:460 ../widgets/text/e-entry.c:1284
+#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3569
msgid "Fill color"
msgstr "填充颜色"
-#: ../widgets/misc/e-canvas-background.c:463
-#: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:470
-#: ../widgets/misc/e-canvas-background.c:471 ../widgets/text/e-entry.c:1291
+#: ../widgets/misc/e-canvas-background.c:466
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:473
+#: ../widgets/misc/e-canvas-background.c:474 ../widgets/text/e-entry.c:1291
#: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3547
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3555
-#: ../widgets/text/e-text.c:3556
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3583
+#: ../widgets/text/e-text.c:3584
msgid "GDK fill color"
msgstr "GDK 填充颜色"
-#: ../widgets/misc/e-canvas-background.c:477
-#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3562
-#: ../widgets/text/e-text.c:3563
+#: ../widgets/misc/e-canvas-background.c:480
+#: ../widgets/misc/e-canvas-background.c:481 ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3590
+#: ../widgets/text/e-text.c:3591
msgid "Fill stipple"
msgstr "点绘填充"
-#: ../widgets/misc/e-canvas-background.c:484
-#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:487
+#: ../widgets/misc/e-canvas-background.c:488
msgid "X1"
msgstr "X1"
-#: ../widgets/misc/e-canvas-background.c:491
-#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:494
+#: ../widgets/misc/e-canvas-background.c:495
msgid "X2"
msgstr "X2"
-#: ../widgets/misc/e-canvas-background.c:498
-#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:501
+#: ../widgets/misc/e-canvas-background.c:502
msgid "Y1"
msgstr "Y1"
-#: ../widgets/misc/e-canvas-background.c:505
-#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:508
+#: ../widgets/misc/e-canvas-background.c:509
msgid "Y2"
msgstr "Y2"
#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
#: ../widgets/table/e-table-group-container.c:978
#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3005
+#: ../widgets/table/e-table-item.c:3017
msgid "Minimum width"
msgstr "最小宽度"
#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
#: ../widgets/table/e-table-group-container.c:979
#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3006
+#: ../widgets/table/e-table-item.c:3018
msgid "Minimum Width"
msgstr "最小宽度"
@@ -19422,7 +19634,7 @@ msgstr "最小宽度"
msgid "Spacing"
msgstr "间距"
-#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:460
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
msgid "Now"
msgstr "现在"
@@ -19507,7 +19719,6 @@ msgid "Unknown character set: %s"
msgstr "未知的字符集:%s"
#: ../widgets/misc/e-charset-picker.c:216
-#: ../widgets/misc/e-charset-picker.c:479
msgid "Character Encoding"
msgstr "字符编码"
@@ -19519,45 +19730,49 @@ msgstr "输入要使用的字符集"
msgid "Other..."
msgstr "其它..."
+#: ../widgets/misc/e-charset-picker.c:479
+msgid "Ch_aracter Encoding"
+msgstr "字符编码(_A)"
+
#: ../widgets/misc/e-clipped-label.c:111
msgid "..."
msgstr "..."
-#: ../widgets/misc/e-dateedit.c:320
+#: ../widgets/misc/e-dateedit.c:321
msgid "Date and Time Entry"
msgstr "日期和时间输入"
-#: ../widgets/misc/e-dateedit.c:339
+#: ../widgets/misc/e-dateedit.c:340
msgid "Text entry to input date"
msgstr "输入日期的文本框"
-#: ../widgets/misc/e-dateedit.c:340
+#: ../widgets/misc/e-dateedit.c:341
msgid "Text Date Entry"
msgstr "日期文本框"
-#: ../widgets/misc/e-dateedit.c:361
+#: ../widgets/misc/e-dateedit.c:362
msgid "Click this button to show a calendar"
msgstr "单击此按钮可显示日历"
-#: ../widgets/misc/e-dateedit.c:362
+#: ../widgets/misc/e-dateedit.c:363
msgid "Date Button"
msgstr "日期按钮"
-#: ../widgets/misc/e-dateedit.c:383
+#: ../widgets/misc/e-dateedit.c:384
msgid "Combo box to select time"
msgstr "选择时间的组合框"
-#: ../widgets/misc/e-dateedit.c:384
+#: ../widgets/misc/e-dateedit.c:385
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
+#: ../widgets/misc/e-dateedit.c:1445 ../widgets/misc/e-dateedit.c:1772
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
+#: ../widgets/misc/e-dateedit.c:1448 ../widgets/misc/e-dateedit.c:1775
msgid "%I:%M %p"
msgstr "%p%I:%M"
@@ -19595,11 +19810,11 @@ msgstr "标签部件"
msgid "A widget to display in place of the usual expander label"
msgstr "在通常扩展器标签的位置显示的部件"
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3318
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3324
msgid "Expander Size"
msgstr "扩展器大小"
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3319
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3325
msgid "Size of the expander arrow"
msgstr "扩展器箭头的大小"
@@ -19707,8 +19922,8 @@ msgid "Subitem ID"
msgstr "子项目 ID"
#: ../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
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3490
+#: ../widgets/text/e-text.c:3491
msgid "Text"
msgstr "文字"
@@ -19817,21 +20032,21 @@ msgstr ""
"低"
#: ../widgets/misc/e-send-options.glade.h:23
-msgid "W_ithin"
-msgstr "少于(_I)"
-
-#: ../widgets/misc/e-send-options.glade.h:24
msgid "When acce_pted:"
msgstr "接受时(_P):"
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
msgid "When co_mpleted:"
msgstr "完成时(_M):"
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
msgid "When decli_ned:"
msgstr "拒绝时(_N):"
+#: ../widgets/misc/e-send-options.glade.h:26
+msgid "Wi_thin"
+msgstr "少于(_T)"
+
#: ../widgets/misc/e-send-options.glade.h:27
msgid "_After:"
msgstr "之后(_A):"
@@ -19875,7 +20090,7 @@ msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
#: ../widgets/misc/e-url-entry.c:107
-msgid "click here to go to url"
+msgid "Click here to go to URL"
msgstr "单击此处转到 URL"
#: ../widgets/misc/gal-categories.glade.h:2
@@ -20101,7 +20316,7 @@ msgstr "%s (%d 项)"
#: ../widgets/table/e-table-group-container.c:902
#: ../widgets/table/e-table-group-leaf.c:573
#: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2963 ../widgets/table/e-table-item.c:2964
+#: ../widgets/table/e-table-item.c:2975 ../widgets/table/e-table-item.c:2976
msgid "Alternating Row Colors"
msgstr "交替行色"
@@ -20109,8 +20324,8 @@ msgstr "交替行色"
#: ../widgets/table/e-table-group-container.c:909
#: ../widgets/table/e-table-group-leaf.c:580
#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
-#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:2982 ../widgets/table/e-table-item.c:2983
+#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
msgid "Horizontal Draw Grid"
msgstr "水平绘制网格"
@@ -20118,8 +20333,8 @@ msgstr "水平绘制网格"
#: ../widgets/table/e-table-group-container.c:916
#: ../widgets/table/e-table-group-leaf.c:587
#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:2989 ../widgets/table/e-table-item.c:2990
+#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
msgid "Vertical Draw Grid"
msgstr "垂直绘制网格"
@@ -20127,8 +20342,8 @@ msgstr "垂直绘制网格"
#: ../widgets/table/e-table-group-container.c:923
#: ../widgets/table/e-table-group-leaf.c:594
#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2984 ../widgets/table/e-table-item.c:2985
-#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-table-item.c:2996 ../widgets/table/e-table-item.c:2997
+#: ../widgets/table/e-tree.c:3289 ../widgets/table/e-tree.c:3290
msgid "Draw focus"
msgstr "绘制焦点"
@@ -20136,7 +20351,7 @@ msgstr "绘制焦点"
#: ../widgets/table/e-table-group-container.c:930
#: ../widgets/table/e-table-group-leaf.c:601
#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:2991 ../widgets/table/e-table-item.c:2992
+#: ../widgets/table/e-table-item.c:3003 ../widgets/table/e-table-item.c:3004
msgid "Cursor mode"
msgstr "光标模式"
@@ -20144,7 +20359,7 @@ msgstr "光标模式"
#: ../widgets/table/e-table-group-container.c:937
#: ../widgets/table/e-table-group-leaf.c:615
#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
+#: ../widgets/table/e-table-item.c:2968 ../widgets/table/e-table-item.c:2969
msgid "Selection model"
msgstr "选择模型"
@@ -20152,9 +20367,9 @@ msgstr "选择模型"
#: ../widgets/table/e-table-group-container.c:944
#: ../widgets/table/e-table-group-leaf.c:608
#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:2998 ../widgets/table/e-table-item.c:2999
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3265
-#: ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-table-item.c:3010 ../widgets/table/e-table-item.c:3011
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3271
+#: ../widgets/table/e-tree.c:3272
msgid "Length Threshold"
msgstr "长度阀值"
@@ -20162,9 +20377,9 @@ msgstr "长度阀值"
#: ../widgets/table/e-table-group-container.c:951
#: ../widgets/table/e-table-group-leaf.c:650
#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3297
-#: ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-table-item.c:3044 ../widgets/table/e-table-item.c:3045
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3303
+#: ../widgets/table/e-tree.c:3304
msgid "Uniform row height"
msgstr "统一行高"
@@ -20239,20 +20454,20 @@ msgstr "排序信息"
msgid "Tree"
msgstr "树"
-#: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
+#: ../widgets/table/e-table-item.c:2954 ../widgets/table/e-table-item.c:2955
msgid "Table header"
msgstr "表头"
-#: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
+#: ../widgets/table/e-table-item.c:2961 ../widgets/table/e-table-item.c:2962
msgid "Table model"
msgstr "表格模型"
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3037 ../widgets/table/e-table-item.c:3038
msgid "Cursor row"
msgstr "光标行"
-#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3304
-#: ../widgets/table/e-tree.c:3305
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3310
+#: ../widgets/table/e-tree.c:3311
msgid "Always search"
msgstr "总是搜索"
@@ -20260,15 +20475,15 @@ msgstr "总是搜索"
msgid "Use click to add"
msgstr "单击可添加"
-#: ../widgets/table/e-tree.c:3290 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3296 ../widgets/table/e-tree.c:3297
msgid "ETree table adapter"
msgstr "ETree 表格适配器"
-#: ../widgets/table/e-tree.c:3311
+#: ../widgets/table/e-tree.c:3317
msgid "Retro Look"
msgstr "火箭外观"
-#: ../widgets/table/e-tree.c:3312
+#: ../widgets/table/e-tree.c:3318
msgid "Draw lines and +/- expanders."
msgstr "绘制行和 +/- 扩展柄。"
@@ -20285,7 +20500,7 @@ msgid "This should test the minicard canvas item"
msgstr "这应该测试迷你卡画布项"
#: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
+#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
msgid "Event Processor"
msgstr "事件处理器"
@@ -20298,57 +20513,57 @@ msgid "GDKFont"
msgstr "GDKFont"
#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3491 ../widgets/text/e-text.c:3492
+#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
msgid "Justification"
msgstr "两端对齐"
#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3591 ../widgets/text/e-text.c:3592
+#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
msgid "Use ellipsis"
msgstr "使用椭圆"
#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3598 ../widgets/text/e-text.c:3599
+#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
msgid "Ellipsis"
msgstr "椭圆"
#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3605 ../widgets/text/e-text.c:3606
+#: ../widgets/text/e-text.c:3633 ../widgets/text/e-text.c:3634
msgid "Line wrap"
msgstr "换行"
#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3612 ../widgets/text/e-text.c:3613
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3641
msgid "Break characters"
msgstr "换行字符"
#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-text.c:3647 ../widgets/text/e-text.c:3648
msgid "Max lines"
msgstr "最多行数"
#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3648 ../widgets/text/e-text.c:3649
+#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
msgid "Allow newlines"
msgstr "允许新行"
#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3641 ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
msgid "Draw borders"
msgstr "绘制边框"
#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3655 ../widgets/text/e-text.c:3656
+#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
msgid "Draw background"
msgstr "绘制背景"
#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
+#: ../widgets/text/e-text.c:3690 ../widgets/text/e-text.c:3691
msgid "Draw button"
msgstr "绘制按钮"
#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
+#: ../widgets/text/e-text.c:3697 ../widgets/text/e-text.c:3698
msgid "Cursor position"
msgstr "光标位置"
@@ -20356,59 +20571,59 @@ msgstr "光标位置"
msgid "Emulate label resize"
msgstr "模拟标签缩放"
-#: ../widgets/text/e-text.c:2696
+#: ../widgets/text/e-text.c:2724
msgid "Input Methods"
msgstr "输入法"
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
+#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
msgid "Bold"
msgstr "粗体"
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
+#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
msgid "Strikeout"
msgstr "删除线"
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
+#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
msgid "Anchor"
msgstr "锚点"
-#: ../widgets/text/e-text.c:3498 ../widgets/text/e-text.c:3499
+#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
msgid "Clip Width"
msgstr "裁剪宽度"
-#: ../widgets/text/e-text.c:3505 ../widgets/text/e-text.c:3506
+#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
msgid "Clip Height"
msgstr "裁剪高度"
-#: ../widgets/text/e-text.c:3512 ../widgets/text/e-text.c:3513
+#: ../widgets/text/e-text.c:3540 ../widgets/text/e-text.c:3541
msgid "Clip"
msgstr "裁剪"
-#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
+#: ../widgets/text/e-text.c:3547 ../widgets/text/e-text.c:3548
msgid "Fill clip rectangle"
msgstr "填充裁剪矩形"
-#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
+#: ../widgets/text/e-text.c:3554 ../widgets/text/e-text.c:3555
msgid "X Offset"
msgstr "水平偏移"
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
+#: ../widgets/text/e-text.c:3561 ../widgets/text/e-text.c:3562
msgid "Y Offset"
msgstr "垂直偏移"
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
msgid "Text width"
msgstr "文字宽度"
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
msgid "Text height"
msgstr "文字高度"
-#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
+#: ../widgets/text/e-text.c:3704 ../widgets/text/e-text.c:3705
msgid "IM Context"
msgstr "输入法环境"
-#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
+#: ../widgets/text/e-text.c:3711 ../widgets/text/e-text.c:3712
msgid "Handle Popup"
msgstr "处理弹出"