aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorFunda Wang <fwang@src.gnome.org>2006-07-22 15:57:42 +0800
committerFunda Wang <fwang@src.gnome.org>2006-07-22 15:57:42 +0800
commitb01b92ad9c0fd771bb1b24daf619ea17d5e624cb (patch)
treed96538dda3765a10fcbadd1bd3813aad905a965b /po
parentb97fcbf01d9293d52d98c00e19bbc492cf3abc8d (diff)
downloadgsoc2013-evolution-b01b92ad9c0fd771bb1b24daf619ea17d5e624cb.tar.gz
gsoc2013-evolution-b01b92ad9c0fd771bb1b24daf619ea17d5e624cb.tar.zst
gsoc2013-evolution-b01b92ad9c0fd771bb1b24daf619ea17d5e624cb.zip
Updated evolution zh_CN translation.
svn path=/trunk/; revision=32372
Diffstat (limited to 'po')
-rw-r--r--po/ChangeLog4
-rw-r--r--po/zh_CN.po4484
2 files changed, 2402 insertions, 2086 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 06a38e7352..57f1b440f5 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-22 Funda Wang <fundawang@linux.net.cn>
+
+ * zh_CN.po: Updated Simplified Chinese translation.
+
2006-07-21 Changwoo Ryu <cwryu@debian.org>
* ko.po: Updated Korean translation.
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d131e1156a..f238ca3caf 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,12 +5,13 @@
# Partly comes from Sun_l10n group, 2003
# Funda Wang <fundawang@linux.net.cn>, 2003, 2004, 2005, 2006.
#
+#: ../mail/em-format-html-display.c:680
msgid ""
msgstr ""
"Project-Id-Version: Evolution 2.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-01 12:37+0200\n"
-"PO-Revision-Date: 2006-05-01 22:23+0800\n"
+"POT-Creation-Date: 2006-07-22 06:51+0200\n"
+"PO-Revision-Date: 2006-07-22 15:38+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"
@@ -20,7 +21,7 @@ msgstr ""
#: ../a11y/addressbook/ea-addressbook-view.c:94
#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:169
+#: ../a11y/addressbook/ea-minicard-view.c:180
msgid "evolution addressbook"
msgstr "evolution 地址簿"
@@ -34,11 +35,11 @@ msgstr "新建联系人"
msgid "New Contact List"
msgstr "新建联系人列表"
-#: ../a11y/addressbook/ea-minicard-view.c:152
+#: ../a11y/addressbook/ea-minicard-view.c:163
#, c-format
-msgid "current addressbook folder has %d card"
-msgid_plural "current addressbook folder has %d cards"
-msgstr[0] "当前地址簿文件夹有 %d 张名片"
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "当前地址簿文件夹 %s 有 %d 张名片"
#: ../a11y/addressbook/ea-minicard.c:31
#: ../ui/evolution-message-composer.xml.h:12
@@ -57,32 +58,32 @@ msgstr "联系人:"
msgid "evolution minicard"
msgstr "evolution 袖珍卡"
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:264
msgid "It has alarms."
msgstr "有提醒。"
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:267
msgid "It has recurrences."
msgstr "有再现。"
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:270
msgid "It is a meeting."
msgstr "为会议。"
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:276
#, c-format
msgid "Calendar Event: Summary is %s."
msgstr "日历事件:摘要为 %s。"
-#: ../a11y/calendar/ea-cal-view-event.c:280
+#: ../a11y/calendar/ea-cal-view-event.c:278
msgid "Calendar Event: It has no summary."
msgstr "日历事件:无摘要。"
-#: ../a11y/calendar/ea-cal-view-event.c:299
+#: ../a11y/calendar/ea-cal-view-event.c:297
msgid "calendar view event"
msgstr "日历视图事件"
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:526
msgid "Grab Focus"
msgstr "获得焦点"
@@ -111,36 +112,46 @@ msgstr "转到日期"
msgid "a table to view and select the current time range"
msgstr "可查看并选择当前时间范围的表"
-#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:150
#, c-format
msgid "It has %d event."
msgid_plural "It has %d events."
msgstr[0] "有 %d 个事件。"
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
msgid "It has no events."
msgstr "无事件。"
-#: ../a11y/calendar/ea-day-view.c:155
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or "It has no events."
+#: ../a11y/calendar/ea-day-view.c:162
#, c-format
msgid "Work Week View: %s. %s"
msgstr "周工作视图:%s。%s"
-#: ../a11y/calendar/ea-day-view.c:158
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or "It has no events."
+#: ../a11y/calendar/ea-day-view.c:168
#, c-format
msgid "Day View: %s. %s"
msgstr "日视图:%s。%s"
-#: ../a11y/calendar/ea-day-view.c:189
+#: ../a11y/calendar/ea-day-view.c:199
msgid "calendar view for a work week"
msgstr "工作周的日历视图"
-#: ../a11y/calendar/ea-day-view.c:191
+#: ../a11y/calendar/ea-day-view.c:201
msgid "calendar view for one or more days"
msgstr "一天或多天的日历视图"
#: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:661
+#: ../calendar/gui/calendar-component.c:679
msgid "%A %d %b %Y"
msgstr "%Y年%-m月%-d日%A"
@@ -151,18 +162,20 @@ 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:664
-#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
-#: ../calendar/gui/e-week-view-main-item.c:321
+#: ../calendar/gui/calendar-component.c:682
+#: ../calendar/gui/e-day-view-top-item.c:1315
+#: ../calendar/gui/e-day-view.c:1480
+#: ../calendar/gui/e-week-view-main-item.c:319
+#: ../calendar/gui/e-week-view-main-item.c:533
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:666
-#: ../calendar/gui/calendar-component.c:671
-#: ../calendar/gui/calendar-component.c:673
+#: ../calendar/gui/calendar-component.c:684
+#: ../calendar/gui/calendar-component.c:689
+#: ../calendar/gui/calendar-component.c:691
msgid "%a %d %b %Y"
msgstr "%Y年%-m月%-d日%A"
@@ -170,10 +183,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:685
-#: ../calendar/gui/calendar-component.c:692
-#: ../calendar/gui/calendar-component.c:698
-#: ../calendar/gui/calendar-component.c:700
+#: ../calendar/gui/calendar-component.c:703
+#: ../calendar/gui/calendar-component.c:710
+#: ../calendar/gui/calendar-component.c:716
+#: ../calendar/gui/calendar-component.c:718
msgid "%d %b %Y"
msgstr "%Y年%-m月%-d日"
@@ -183,9 +196,11 @@ 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:690
-#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../calendar/gui/calendar-component.c:708
+#: ../calendar/gui/e-day-view-top-item.c:1319
+#: ../calendar/gui/e-day-view.c:1496
+#: ../calendar/gui/e-week-view-main-item.c:333
+#: ../calendar/gui/e-week-view-main-item.c:547
msgid "%d %b"
msgstr "%B%-d日"
@@ -315,6 +330,14 @@ msgstr "激活默认"
msgid "Popup Menu"
msgstr "弹出菜单"
+#: ../a11y/widgets/ea-expander.c:40
+msgid "Toggle Attachment Bar"
+msgstr "切换附件栏"
+
+#: ../a11y/widgets/ea-expander.c:50
+msgid "activate"
+msgstr "激活"
+
#: ../addressbook/addressbook.error.xml.h:1
msgid ""
"A contact already exists with this address. Would you like to add a new card "
@@ -475,9 +498,9 @@ msgid ""
"Your contacts for {0} will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则 {0} 的联系人无法使用。"
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:511
#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../plugins/groupwise-features/properties.glade.h:9
#: ../widgets/table/e-table-config.glade.h:15
msgid "_Add"
msgstr "添加(_A)"
@@ -487,7 +510,7 @@ msgid "_Discard"
msgstr "丢弃(_D)"
#: ../addressbook/addressbook.error.xml.h:35
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
msgid "{0}"
msgstr "{0}"
@@ -527,9 +550,9 @@ msgstr "在此配置自动补全"
#. Create the contacts group
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1335
-#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../addressbook/gui/component/addressbook-view.c:1332
+#: ../calendar/gui/calendar-component.c:265 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:575
msgid "Contacts"
msgstr "联系人"
@@ -569,7 +592,7 @@ 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:483
-#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/calendar-component.c:227
#: ../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
@@ -585,12 +608,13 @@ msgstr "在此计算机中"
#. orange
#: ../addressbook/gui/component/addressbook-component.c:149
#: ../addressbook/gui/component/addressbook-migrate.c:491
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:217
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../calendar/gui/calendar-component.c:235
#: ../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.glade.h:105
+#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
msgid "Personal"
msgstr "个人"
@@ -617,7 +641,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:1205
msgid "New Address Book"
msgstr "新地址簿"
@@ -633,72 +657,73 @@ msgstr "创建新地址簿"
msgid "Failed upgrading Address Book settings or folders."
msgstr "升级地址簿设置或文件夹失败。"
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:332
msgid "Base"
msgstr "基础"
-#: ../addressbook/gui/component/addressbook-config.c:530
+#: ../addressbook/gui/component/addressbook-config.c:533
#: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
msgid "_Type:"
msgstr "类型(_T):"
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:635
msgid "Copy book content locally for offline operation"
msgstr "将地址簿内容复制到本地以进行脱机操作"
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:984
#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
-#: ../plugins/itip-formatter/itip-formatter.c:1978
+#: ../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:222 ../mail/mail-config.glade.h:85
+#: ../plugins/itip-formatter/itip-formatter.c:2021
#: ../smime/gui/smime-ui.glade.h:28
msgid "General"
msgstr "常规"
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:563
+#: ../addressbook/gui/component/addressbook-config.c:985
+#: ../addressbook/gui/widgets/e-addressbook-view.c:562
#: ../mail/importers/pine-importer.c:392
msgid "Address Book"
msgstr "地址簿"
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:989
msgid "Server Information"
msgstr "服务器信息"
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:991
msgid "Authentication"
msgstr "身份验证"
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:994
#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
+#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
msgid "Details"
msgstr "细节"
-#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../mail/em-folder-browser.c:792
msgid "Searching"
msgstr "搜索"
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:997
msgid "Downloading"
msgstr "下载"
-#: ../addressbook/gui/component/addressbook-config.c:1200
+#: ../addressbook/gui/component/addressbook-config.c:1203
#: ../addressbook/gui/component/ldap-config.glade.h:13
msgid "Address Book Properties"
msgstr "地址簿属性"
#: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
msgid "Migrating..."
msgstr "正在升迁..."
#: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
#, c-format
msgid "Migrating `%s':"
msgstr "升迁“%s”:"
@@ -772,34 +797,35 @@ msgstr "文件夹名不能含有字符“/”"
msgid "A Folder with this name already exists"
msgstr "已经存在此名称的文件夹"
-#: ../addressbook/gui/component/addressbook-view.c:953
+#: ../addressbook/gui/component/addressbook-view.c:956
msgid "_New Address Book"
msgstr "新建地址簿(_N)"
#. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:979
-#: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1194
-#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
-#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
-#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../calendar/gui/calendar-component.c:556
+#: ../calendar/gui/e-calendar-table.c:1302
+#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
+#: ../mail/em-folder-tree.c:2061 ../mail/em-folder-view.c:1126
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
+#: ../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:956
+#: ../addressbook/gui/component/addressbook-view.c:959
msgid "Save As Vcard..."
msgstr "另存为 Vcard..."
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../calendar/gui/calendar-component.c:539
-#: ../calendar/gui/tasks-component.c:444
+#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../calendar/gui/calendar-component.c:557
+#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
msgid "_Properties..."
msgstr "属性(_P)..."
-#: ../addressbook/gui/component/addressbook-view.c:1346
+#: ../addressbook/gui/component/addressbook-view.c:1343
msgid "Contact Source Selector"
msgstr "联系人源选择器"
@@ -808,7 +834,7 @@ msgid "Accessing LDAP Server anonymously"
msgstr "匿名访问 LDAP 服务器"
#: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
msgid "Failed to authenticate.\n"
msgstr "认证失败。\n"
@@ -855,7 +881,7 @@ msgid "URI for the folder last used in the select names dialog."
msgstr "选择名称对话框中上次使用的文件夹 URI。"
#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
msgid "Vertical pane position"
msgstr "垂直面板的位置"
@@ -884,7 +910,7 @@ msgid "636"
msgstr "636"
#: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
msgid "<b>Authentication</b>"
msgstr "<b>身份验证</b>"
@@ -1122,9 +1148,9 @@ msgstr "登录方式(_L):"
#: ../addressbook/gui/component/ldap-config.glade.h:53
#: ../calendar/gui/dialogs/calendar-setup.c:245
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../mail/mail-config.glade.h:164
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../mail/mail-config.glade.h:163
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
msgid "_Name:"
msgstr "名称(_N):"
@@ -1137,7 +1163,7 @@ msgid "_Search scope:"
msgstr "搜索范围(_S):"
#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:170
#: ../plugins/publish-calendar/publish-calendar.glade.h:26
msgid "_Server:"
msgstr "服务器(_S):"
@@ -1157,7 +1183,7 @@ msgstr "名片"
#: ../addressbook/gui/component/ldap-config.glade.h:60
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
#: ../mail/em-account-editor.c:2021
#: ../plugins/calendar-http/calendar-http.c:286
@@ -1166,242 +1192,222 @@ msgid "minutes"
msgstr "分钟"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
msgid "<b>Email</b>"
msgstr "<b>电子邮件</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
msgid "<b>Home</b>"
msgstr "<b>家庭</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
msgid "<b>Instant Messaging</b>"
msgstr "<b>即时通讯</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
msgid "<b>Job</b>"
msgstr "<b>职位</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
msgid "<b>Miscellaneous</b>"
msgstr "<b>杂项</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
msgid "<b>Other</b>"
msgstr "<b>其它</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
msgid "<b>Telephone</b>"
msgstr "<b>电话</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
msgid "<b>Web Addresses</b>"
msgstr "<b>Web 地址</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
msgid "<b>Work</b>"
msgstr "<b>工作</b>"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:348
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
msgid "AIM"
msgstr "AIM"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
#: ../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.c:174
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:182
+#: ../addressbook/gui/widgets/e-minicard.c:193
msgid "Contact"
msgstr "联系人"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
msgid "Contact Editor"
msgstr "联系人编辑器"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
msgid "Full _Name..."
msgstr "全名(_N)..."
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
msgid "Image"
msgstr "图像"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
msgid "MSN Messenger"
msgstr "MSN Messenger"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
msgid "Mailing Address"
msgstr "邮政地址"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
msgid "Ni_ckname:"
msgstr "昵称(_C):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
msgid "Novell Groupwise"
msgstr "Novell Groupwise"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
msgid "Personal Information"
msgstr "个人信息"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
msgid "Telephone"
msgstr "电话"
#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
-#: ../mail/mail-config.glade.h:154
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
+#: ../mail/mail-config.glade.h:153
msgid "Work"
msgstr "工作"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
msgid "_Address:"
msgstr "地址(_A):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
msgid "_Anniversary:"
msgstr "周年(_A):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
msgid "_Assistant:"
msgstr "助手(_A):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
msgid "_Birthday:"
msgstr "生日(_B):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1652
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../plugins/itip-formatter/itip-view.c:1654
msgid "_Calendar:"
msgstr "日历(_C):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "类别(_C)"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+msgid "_Categories..."
+msgstr "类别(_C)..."
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
msgid "_City:"
msgstr "城市(_C):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
msgid "_Company:"
msgstr "公司(_C):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
msgid "_Country:"
msgstr "国家/地区(_C):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
msgid "_Department:"
msgstr "部门(_D):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
msgid "_File under:"
msgstr "存档为(_F):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
msgid "_Free/Busy:"
msgstr "忙/闲(_F):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "_Home Page:"
msgstr "主页(_H):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
msgid "_Manager:"
msgstr "经理(_M):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
msgid "_Notes:"
msgstr "注释(_N):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
msgid "_Office:"
msgstr "办公室(_O):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
msgid "_PO Box:"
msgstr "邮政邮箱(_P):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
msgid "_Profession:"
msgstr "职业(_P):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
msgid "_Spouse:"
msgstr "配偶(_S):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
msgid "_State/Province:"
msgstr "州/省(_S):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
msgid "_Title:"
msgstr "头衔(_T):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
msgid "_Video Chat:"
msgstr "视频聊天(_V):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
msgid "_Wants to receive HTML mail"
msgstr "愿意接收 HTML 邮件(_W)"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
msgid "_Web Log:"
msgstr "_Web 日志:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
msgid "_Where:"
msgstr "何处(_W):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
msgid "_Zip/Postal Code:"
msgstr "邮政编码(_Z):"
#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:367
-#: ../addressbook/gui/widgets/eab-contact-display.c:382
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
+#: ../addressbook/gui/widgets/eab-contact-display.c:595
msgid "Address"
msgstr "地址"
@@ -1409,17 +1415,17 @@ msgstr "地址"
#: ../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:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
#: ../addressbook/gui/widgets/e-addressbook-model.c:310
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
#: ../addressbook/gui/widgets/e-minicard-label.c:164
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:520
-#: ../addressbook/gui/widgets/e-minicard.c:175
+#: ../addressbook/gui/widgets/e-minicard-view.c:522
+#: ../addressbook/gui/widgets/e-minicard.c:186
#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
-#: ../widgets/text/e-text.c:3608
+#: ../widgets/table/e-cell-text.c:1841 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3625
+#: ../widgets/text/e-text.c:3626
msgid "Editable"
msgstr "可编辑"
@@ -2395,7 +2401,7 @@ msgstr "津巴布韦"
#: ../plugins/exchange-operations/exchange-delegates.c:934
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
#: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:369
+#: ../plugins/save-attachments/save-attachments.c:370
#: ../widgets/menus/gal-view-new-dialog.c:73
msgid "Name"
msgstr "姓名"
@@ -2406,7 +2412,7 @@ msgstr "AOL 即时通讯程序"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:351
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
msgid "Jabber"
msgstr "Jabber"
@@ -2416,7 +2422,7 @@ msgstr "雅虎通"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:350
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
msgid "ICQ"
msgstr "ICQ"
@@ -2425,7 +2431,7 @@ msgid "Service"
msgstr "服务"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
#: ../plugins/publish-calendar/publish-calendar.c:497
#: ../plugins/save-calendar/csv-format.c:400
msgid "Location"
@@ -2437,26 +2443,28 @@ msgstr "用户名"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/widgets/eab-contact-display.c:58
msgid "Home"
msgstr "家庭"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+#: ../addressbook/gui/widgets/eab-contact-display.c:59
msgid "Other"
msgstr "其它"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
msgid "Yahoo"
msgstr "雅虎"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:352
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
msgid "MSN"
msgstr "MSN"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:349
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
msgid "GroupWise"
msgstr "GroupWise"
@@ -2485,20 +2493,20 @@ msgid "Changed"
msgstr "已更改"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2411
#, c-format
msgid "Contact Editor - %s"
msgstr "联系人编辑器 - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2791
msgid "Please select an image for this contact"
msgstr "请选择此联系人的图像"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
-msgid "No image"
-msgstr "无图像"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
+msgid "_No image"
+msgstr "无图像(_N)"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2506,15 +2514,31 @@ msgstr ""
"联系人数据无效:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr "“%s”的格式无效"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3105
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr "%s“%s”的格式无效"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3120
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3131
+#, c-format
+msgid "%s'%s' is empty"
+msgstr "%s“%s”为空"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3146
msgid "Invalid contact."
msgstr "无效的联系人。"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
msgid "Contact Quick-Add"
msgstr "快速添加联系人"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
msgid "_Edit Full"
msgstr "编辑全名(_E)"
@@ -2522,11 +2546,11 @@ msgstr "编辑全名(_E)"
msgid "_Full name"
msgstr "全名(_F)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
-msgid "E-_mail"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+msgid "E_mail"
msgstr "电子邮件(_M)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
msgid "_Select Address Book"
msgstr "选择地址簿(_S)"
@@ -2534,7 +2558,7 @@ msgstr "选择地址簿(_S)"
#, c-format
msgid ""
"Are you sure you want\n"
-"to delete contact list (%s) ?"
+"to delete contact list (%s)?"
msgstr "您确定要删除联系人列表(%s)吗?"
#: ../addressbook/gui/contact-editor/eab-editor.c:325
@@ -2547,7 +2571,7 @@ msgstr "您确定要删除这些联系人列表吗?"
#, c-format
msgid ""
"Are you sure you want\n"
-"to delete contact (%s) ?"
+"to delete contact (%s)?"
msgstr "您确定要删除联系人(%s)吗?"
#: ../addressbook/gui/contact-editor/eab-editor.c:333
@@ -2556,104 +2580,105 @@ msgid ""
"to delete these contacts?"
msgstr "您确定要删除这些联系人吗?"
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
msgid "Address _2:"
msgstr "地址 _2:"
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
msgid "Ci_ty:"
msgstr "城市(_T):"
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
msgid "Countr_y:"
msgstr "国家/地区(_Y):"
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
msgid "Full Address"
msgstr "完整地址"
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
msgid "_ZIP Code:"
msgstr "邮政编码(_Z):"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
msgid "Dr."
msgstr "博士"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
msgid "Esq."
msgstr "先生"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
msgid "Full Name"
msgstr "全名"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
msgid "I"
msgstr "I"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
msgid "II"
msgstr "II"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
msgid "III"
msgstr "III"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
msgid "Jr."
msgstr "晚辈"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
msgid "Miss"
msgstr "小姐"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
msgid "Mr."
msgstr "先生"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
msgid "Mrs."
msgstr "夫人"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
msgid "Ms."
msgstr "女士"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
msgid "Sr."
msgstr "长辈"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
msgid "_First:"
msgstr "姓(_F):"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
msgid "_Last:"
msgstr "名(_L):"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
msgid "_Middle:"
msgstr "中间名(_M):"
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
msgid "_Suffix:"
msgstr "后缀(_S):"
-#: ../addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:1
msgid "Add IM Account"
msgstr "添加即时通讯账户"
-#: ../addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:2
msgid "_Account name:"
msgstr "账户名(_A):"
-#: ../addressbook/gui/contact-editor/im.glade.h:4
+#: ../addressbook/gui/contact-editor/im.glade.h:3
msgid "_IM Service:"
msgstr "即时通讯服务(_I):"
-#: ../addressbook/gui/contact-editor/im.glade.h:5
+#: ../addressbook/gui/contact-editor/im.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:16
#: ../plugins/calendar-weather/calendar-weather.c:409
#: ../plugins/exchange-operations/exchange-calendar.c:242
#: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2664,61 +2689,61 @@ msgstr "位置(_L):"
msgid "\n"
msgstr "\n"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
msgid "Add an email to the List"
msgstr "将电子邮件添加到列表"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:938
msgid "Contact List Editor"
msgstr "联系人列表编辑器"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
msgid "Insert email addresses from Address Book"
msgstr "从地址簿中插入电子邮件地址"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
msgid "Members"
msgstr "成员"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
msgid "Remove an email address from the List"
msgstr "从列表中删除电子邮件地址"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
msgid "_Hide addresses when sending mail to this list"
msgstr "在往该列表发送邮件时隐藏地址(_H)"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
msgid "_List name:"
msgstr "列表名称(_L):"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
msgid "_Select"
msgstr "选择(_S)"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
msgid "_Type an email address or drag a contact into the list below:"
msgstr "输入电子邮件地址或者把联系人拖放到下面的列表(_T):"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
#: ../addressbook/gui/widgets/e-addressbook-model.c:296
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/widgets/e-addressbook-view.c:222
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:506
+#: ../addressbook/gui/widgets/e-minicard-view.c:508
msgid "Book"
msgstr "地址簿"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
msgid "Is New List"
msgstr "为新列表"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
msgid "_Members"
msgstr "成员(_M)"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
msgid "Contact List Members"
msgstr "联系人列表成员"
@@ -2759,25 +2784,18 @@ msgstr ""
"此联系人的姓名或地址已经在本文件夹中存在了。\n"
"您一定要添加吗?"
-#. We attach subitems below
#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:53
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:52
msgid "Any field contains"
msgstr "任何域含有"
#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:50
-msgid "Category is"
-msgstr "类别为"
-
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
#: ../addressbook/gui/widgets/e-addressbook-view.c:170
msgid "Email begins with"
msgstr "邮件以此开头"
-#: ../addressbook/gui/widgets/addresstypes.xml.h:4
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
#: ../addressbook/gui/widgets/e-addressbook-view.c:169
msgid "Name begins with"
msgstr "姓名以此开头"
@@ -2794,9 +2812,9 @@ msgstr[0] "%d 个联系人"
#: ../addressbook/gui/widgets/e-addressbook-model.c:303
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-addressbook-view.c:236
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:513
+#: ../addressbook/gui/widgets/e-minicard-view.c:515
msgid "Query"
msgstr "查询"
@@ -2810,7 +2828,7 @@ msgstr "获取名簿视图出错"
#: ../widgets/table/e-table.c:3329
#: ../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:3471 ../widgets/text/e-text.c:3472
+#: ../widgets/text/e-text.c:3489 ../widgets/text/e-text.c:3490
msgid "Model"
msgstr "模型"
@@ -2818,11 +2836,11 @@ msgstr "模型"
msgid "Error modifying card"
msgstr "修改名片错误"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:229
msgid "Source"
msgstr "来源"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:244
+#: ../addressbook/gui/widgets/e-addressbook-view.c:243
#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
#: ../calendar/gui/e-calendar-table.etspec.h:13
#: ../calendar/gui/e-meeting-list-view.c:486
@@ -2831,90 +2849,91 @@ msgstr "来源"
msgid "Type"
msgstr "类型"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:833
#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
#: ../ui/evolution-addressbook.xml.h:31
msgid "Save as VCard..."
msgstr "另存为 VCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/dialogs/comp-editor.c:1098
+#: ../calendar/gui/e-calendar-table.c:1280
+#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:844
#: ../ui/evolution-addressbook.xml.h:56
msgid "_Open"
msgstr "打开(_O)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:958
msgid "_New Contact..."
msgstr "新建联系人(_N)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:960
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
msgid "New Contact _List..."
msgstr "新建联系人列表(_L)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:962
msgid "_Save as VCard..."
msgstr "另存为 VCard(_S)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
msgid "_Forward Contact"
msgstr "转发联系人(_F)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
msgid "_Forward Contacts"
msgstr "转发联系人(_F)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
msgid "Send _Message to Contact"
msgstr "给联系人发信件(_M)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
msgid "Send _Message to List"
msgstr "给列表发信件(_M)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
msgid "Send _Message to Contacts"
msgstr "给联系人发信件(_M)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:969
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
msgid "_Print"
msgstr "打印(_P)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:971
msgid "Cop_y to Address Book..."
msgstr "复制到地址簿(_Y)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:973
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
msgid "Mo_ve to Address Book..."
msgstr "移至地址簿(_V)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../addressbook/gui/widgets/e-addressbook-view.c:975
#: ../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:977
-#: ../calendar/gui/calendar-component.c:537
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../calendar/gui/calendar-component.c:555
#: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1182
-#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
-#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
-#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:39 ../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
+#: ../calendar/gui/e-calendar-table.c:1288
+#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
+#: ../composer/e-msg-composer.c:3152 ../mail/em-folder-tree.c:986
+#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1899
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
msgid "_Copy"
msgstr "复制(_C)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
msgid "P_aste"
msgstr "粘贴(_A)"
#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
-#: ../calendar/gui/cal-search-bar.c:343
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1603
+#: ../calendar/gui/cal-search-bar.c:356
msgid "Any Category"
msgstr "任何类别"
@@ -2924,6 +2943,7 @@ msgid "Print cards"
msgstr "打印名片"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:574
msgid "Assistant"
msgstr "助手"
@@ -2952,7 +2972,7 @@ msgid "Car Phone"
msgstr "车载电话"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:7
#: ../calendar/gui/e-cal-list-view.etspec.h:1
#: ../calendar/gui/e-calendar-table.etspec.h:3
#: ../calendar/gui/e-memo-table.etspec.h:1
@@ -2964,7 +2984,7 @@ msgid "Company Phone"
msgstr "公司电话"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:783
#: ../smime/lib/e-cert.c:827
msgid "Email"
msgstr "电子邮件"
@@ -3010,20 +3030,22 @@ msgid "Journal"
msgstr "日记"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../addressbook/gui/widgets/eab-contact-display.c:573
msgid "Manager"
msgstr "经理"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
msgid "Mobile Phone"
msgstr "移动电话"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:549
msgid "Nickname"
msgstr "昵称"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:392
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
msgid "Note"
msgstr "注释"
@@ -3032,7 +3054,7 @@ msgid "Office"
msgstr "办公室"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
msgid "Organization"
msgstr "组织"
@@ -3065,6 +3087,7 @@ msgid "Role"
msgstr "角色"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-display.c:598
msgid "Spouse"
msgstr "配偶"
@@ -3095,7 +3118,7 @@ msgid "Web Site"
msgstr "网站"
#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:138
+#: ../addressbook/gui/widgets/e-minicard.c:149
#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
#: ../widgets/table/e-table-click-to-add.c:516
@@ -3106,12 +3129,12 @@ msgstr "网站"
#: ../widgets/table/e-table-group-leaf.c:629
#: ../widgets/table/e-table-group-leaf.c:630
#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
-#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
msgid "Width"
msgstr "宽度"
#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:145
+#: ../addressbook/gui/widgets/e-minicard.c:156
#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
#: ../widgets/table/e-table-click-to-add.c:523
@@ -3121,12 +3144,12 @@ msgstr "宽度"
#: ../widgets/table/e-table-group-leaf.c:622
#: ../widgets/table/e-table-group-leaf.c:623
#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
-#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
+#: ../widgets/text/e-text.c:3675 ../widgets/text/e-text.c:3676
msgid "Height"
msgstr "高度"
#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:153
+#: ../addressbook/gui/widgets/e-minicard.c:164
msgid "Has Focus"
msgstr "有焦点"
@@ -3150,7 +3173,7 @@ msgstr "最大域名长度"
msgid "Column Width"
msgstr "列宽"
-#: ../addressbook/gui/widgets/e-minicard-view.c:172
+#: ../addressbook/gui/widgets/e-minicard-view.c:174
msgid ""
"\n"
"\n"
@@ -3164,7 +3187,7 @@ msgstr ""
"\n"
"或在此双击以创建新联系人。"
-#: ../addressbook/gui/widgets/e-minicard-view.c:175
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
msgid ""
"\n"
"\n"
@@ -3178,7 +3201,7 @@ msgstr ""
"\n"
"请在此双击以创建新联系人。"
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
msgid ""
"\n"
"\n"
@@ -3188,7 +3211,7 @@ msgstr ""
"\n"
"搜索联系人。"
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
msgid ""
"\n"
"\n"
@@ -3198,80 +3221,143 @@ msgstr ""
"\n"
"本视图中没有可显示的项。"
-#: ../addressbook/gui/widgets/e-minicard-view.c:499
+#: ../addressbook/gui/widgets/e-minicard-view.c:501
msgid "Adapter"
msgstr "适配器"
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard.c:101
+msgid "Work Email"
+msgstr "工作电子邮件"
+
+#: ../addressbook/gui/widgets/e-minicard.c:102
+msgid "Home Email"
+msgstr "家庭电子邮件"
+
+#: ../addressbook/gui/widgets/e-minicard.c:103
+msgid "Other Email"
+msgstr "其它电子邮件"
+
+#: ../addressbook/gui/widgets/e-minicard.c:172
msgid "Selected"
msgstr "已选择"
-#: ../addressbook/gui/widgets/e-minicard.c:168
+#: ../addressbook/gui/widgets/e-minicard.c:179
msgid "Has Cursor"
msgstr "有光标"
-#: ../addressbook/gui/widgets/eab-contact-display.c:135
-#: ../addressbook/gui/widgets/eab-contact-display.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:173 ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "在浏览器中打开链接(_O)"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
+#: ../mail/em-folder-view.c:2497
+msgid "_Copy Link Location"
+msgstr "复制链接位置(_C)"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
+msgid "_Send New Message To ..."
+msgstr "把新信发送到(_S)..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "复制电子邮件地址(_E)"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:300
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
msgid "(map)"
msgstr "(地图)"
-#: ../addressbook/gui/widgets/eab-contact-display.c:145
-#: ../addressbook/gui/widgets/eab-contact-display.c:211
+#: ../addressbook/gui/widgets/eab-contact-display.c:310
+#: ../addressbook/gui/widgets/eab-contact-display.c:376
msgid "map"
msgstr "地图"
-#: ../addressbook/gui/widgets/eab-contact-display.c:276
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:461
+#: ../addressbook/gui/widgets/eab-contact-display.c:761
msgid "List Members"
msgstr "列出成员"
-#: ../addressbook/gui/widgets/eab-contact-display.c:339
-#: ../addressbook/gui/widgets/eab-contact-display.c:341
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
msgid "E-mail"
msgstr "电子邮件"
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:570
+msgid "Department"
+msgstr "部门"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:571
+msgid "Profession"
+msgstr "职业"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:572
msgid "Position"
msgstr "位置"
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
-msgid "Video Conferencing"
-msgstr "视频会议"
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
+msgid "Video Chat"
+msgstr "视频聊天"
-#: ../addressbook/gui/widgets/eab-contact-display.c:365
-#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-component.c:727
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:2099
+#: ../plugins/exchange-operations/exchange-folder.c:569
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "日历"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../ui/evolution-event-editor.xml.h:8
+msgid "Free/Busy"
+msgstr "忙/闲"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:578
+#: ../addressbook/gui/widgets/eab-contact-display.c:593
msgid "Phone"
msgstr "电话"
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
msgid "Fax"
msgstr "传真"
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-msgid "work"
-msgstr "工作"
+#: ../addressbook/gui/widgets/eab-contact-display.c:590
+msgid "Home Page"
+msgstr "主页"
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
-msgid "WWW"
-msgstr "WWW"
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+msgid "Web Log"
+msgstr "Web 日志"
-#: ../addressbook/gui/widgets/eab-contact-display.c:378
-#: ../addressbook/gui/widgets/eab-contact-display.c:602
-msgid "Blog"
-msgstr "Blog"
+#: ../addressbook/gui/widgets/eab-contact-display.c:596
+msgid "Birthday"
+msgstr "生日"
-#: ../addressbook/gui/widgets/eab-contact-display.c:385
-msgid "personal"
-msgstr "个人"
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
+msgid "Anniversary"
+msgstr "纪念日"
-#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../addressbook/gui/widgets/eab-contact-display.c:779
msgid "Job Title"
msgstr "职称"
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../addressbook/gui/widgets/eab-contact-display.c:810
msgid "Home page"
msgstr "主页"
+#: ../addressbook/gui/widgets/eab-contact-display.c:818
+msgid "Blog"
+msgstr "Blog"
+
#. E_BOOK_ERROR_OK
#: ../addressbook/gui/widgets/eab-gui-util.c:50
msgid "Success"
@@ -3302,7 +3388,7 @@ msgstr "未定义自身联系人"
#. E_BOOK_ERROR_URI_ALREADY_LOADED
#. E_BOOK_ERROR_PERMISSION_DENIED
#: ../addressbook/gui/widgets/eab-gui-util.c:58
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
msgid "Permission denied"
msgstr "没有权限"
@@ -3327,7 +3413,7 @@ msgstr "不支持的协议"
#: ../calendar/gui/e-cal-component-preview.c:234
#: ../calendar/gui/e-cal-model-tasks.c:349
#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
+#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
msgid "Canceled"
msgstr "已取消"
@@ -3454,7 +3540,7 @@ msgid "Error adding list"
msgstr "添加列表出错"
#: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:695
+#: ../addressbook/gui/widgets/eab-gui-util.c:704
msgid "Error adding contact"
msgstr "添加联系人出错"
@@ -3471,7 +3557,7 @@ msgid "Error removing list"
msgstr "删除列表出错"
#: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:650
+#: ../addressbook/gui/widgets/eab-gui-util.c:657
msgid "Error removing contact"
msgstr "删除联系人出错"
@@ -3487,7 +3573,7 @@ msgstr[0] ""
"打开 %d 个联系人将同时打开 %d 个新窗口。\n"
"您真的想要显示所有联系人吗?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:321
+#: ../addressbook/gui/widgets/eab-gui-util.c:323
#, c-format
msgid ""
"%s already exists\n"
@@ -3496,68 +3582,68 @@ msgstr ""
"%s 已经存在\n"
"您打算覆盖它吗?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
+#: ../addressbook/gui/widgets/eab-gui-util.c:327
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:370
-#: ../addressbook/gui/widgets/eab-gui-util.c:373
+#: ../addressbook/gui/widgets/eab-gui-util.c:374
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
msgid "contact"
msgid_plural "contacts"
msgstr[0] "联系人"
#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:420
+#: ../addressbook/gui/widgets/eab-gui-util.c:425
msgid "card.vcf"
msgstr "card.vcf"
-#: ../addressbook/gui/widgets/eab-gui-util.c:457
+#: ../addressbook/gui/widgets/eab-gui-util.c:462
msgid "Select Address Book"
msgstr "选择地址簿"
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:603
msgid "list"
msgstr "列表"
-#: ../addressbook/gui/widgets/eab-gui-util.c:756
+#: ../addressbook/gui/widgets/eab-gui-util.c:765
msgid "Move contact to"
msgstr "将联系人移至"
-#: ../addressbook/gui/widgets/eab-gui-util.c:758
+#: ../addressbook/gui/widgets/eab-gui-util.c:767
msgid "Copy contact to"
msgstr "将联系人复制到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:770
msgid "Move contacts to"
msgstr "将联系人移至"
-#: ../addressbook/gui/widgets/eab-gui-util.c:763
+#: ../addressbook/gui/widgets/eab-gui-util.c:772
msgid "Copy contacts to"
msgstr "将联系人复制到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:989
+#: ../addressbook/gui/widgets/eab-gui-util.c:998
msgid "Multiple VCards"
msgstr "多个 VCard"
-#: ../addressbook/gui/widgets/eab-gui-util.c:992
+#: ../addressbook/gui/widgets/eab-gui-util.c:1001
#, c-format
msgid "VCard for %s"
msgstr "%s 的 VCard"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1033
-#: ../addressbook/gui/widgets/eab-gui-util.c:1051
+#: ../addressbook/gui/widgets/eab-gui-util.c:1042
+#: ../addressbook/gui/widgets/eab-gui-util.c:1060
msgid "Contact information"
msgstr "联系人信息"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1053
+#: ../addressbook/gui/widgets/eab-gui-util.c:1062
#, c-format
msgid "Contact information for %s"
msgstr "%s 的联系人信息"
-#: ../addressbook/gui/widgets/eab-popup-control.c:287
+#: ../addressbook/gui/widgets/eab-popup-control.c:289
msgid "Querying Address Book..."
msgstr "正在查询地址簿..."
@@ -3646,12 +3732,12 @@ msgstr "Evolution VCard 导入器"
msgid "Print envelope"
msgstr "打印信封"
-#: ../addressbook/printing/e-contact-print.c:923
+#: ../addressbook/printing/e-contact-print.c:849
msgid "Print contacts"
msgstr "打印联系人"
-#: ../addressbook/printing/e-contact-print.c:1015
-#: ../addressbook/printing/e-contact-print.c:1043
+#: ../addressbook/printing/e-contact-print.c:939
+#: ../addressbook/printing/e-contact-print.c:967
msgid "Print contact"
msgstr "打印联系人"
@@ -3700,7 +3786,7 @@ msgstr "格式"
#: ../widgets/table/e-table-field-chooser-dialog.c:91
#: ../widgets/table/e-table-field-chooser-item.c:649
#: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1826
+#: ../widgets/table/e-table-header-item.c:1913
#: ../widgets/table/e-table-selection-model.c:318
msgid "Header"
msgstr "页眉"
@@ -3804,7 +3890,7 @@ msgstr "阴影"
#. FIXME: Take care of i18n
#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:955
+#: ../plugins/exchange-operations/exchange-account-setup.c:956
#: ../plugins/exchange-operations/exchange-calendar.c:231
#: ../plugins/exchange-operations/exchange-contacts.c:218
msgid "Size:"
@@ -4018,14 +4104,17 @@ msgid "Are you sure you want to delete this appointment?"
msgstr "您确信您要删除该约会吗?"
#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/gui/dialogs/delete-comp.c:189
msgid "Are you sure you want to delete this journal entry?"
msgstr "您确信您要删除该日记项吗?"
#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/gui/dialogs/delete-comp.c:183
msgid "Are you sure you want to delete this meeting?"
msgstr "您确信您要删除该会议吗?"
#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/gui/dialogs/delete-comp.c:186
msgid "Are you sure you want to delete this task?"
msgstr "您确定要删除此任务吗?"
@@ -4151,66 +4240,62 @@ msgid "The calendar is not marked for offline usage."
msgstr "日历未标为脱机使用。"
#: ../calendar/calendar.error.xml.h:47
-msgid "The calendar you have selected is read-only"
-msgstr "您所选的日历为只读"
-
-#: ../calendar/calendar.error.xml.h:48
msgid "The memo list is not marked for offline usage"
msgstr "备忘列表未标为脱机使用"
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:48
msgid "The task list is not marked for offline usage."
msgstr "任务列表未标为脱机使用。"
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:49
msgid "This calendar will be removed permanently."
msgstr "此日历将被永久删除。"
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:50
msgid "This memo list will be removed permanently."
msgstr "此备忘列表将被永久删除。"
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:51
msgid "This task list will be removed permanently."
msgstr "此任务列表将被永久删除。"
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:52
msgid "Would you like to save your changes to this appointment?"
msgstr "您想要保存对约会的更改吗?"
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:53
msgid "Would you like to save your changes to this memo?"
msgstr "您想要保存对此备忘的更改吗?"
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:54
msgid "Would you like to save your changes to this task?"
msgstr "您想要保存对此任务的更改吗?"
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:55
msgid "Would you like to send a cancelation notice for this journal entry?"
msgstr "您是否想要为此日记项发送取消通知?"
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:56
msgid "Would you like to send all the participants a cancelation notice?"
msgstr "您是否想要给全部出席者发送取消通知?"
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:57
msgid "Would you like to send meeting invitations to participants?"
msgstr "您是否想要给出席者发送会议邀请?"
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:58
msgid "Would you like to send this task to participants?"
msgstr "您是否想要将此任务发送给出席者?"
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:59
msgid "Would you like to send updated meeting information to participants?"
msgstr "您是否想要给出席者发送更新的会议信息?"
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:60
msgid "Would you like to send updated task information to participants?"
msgstr "您是否想要给出席者发送更新的任务信息?"
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:61
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results, the server should be upgraded to "
@@ -4219,6 +4304,12 @@ msgstr ""
"您正在连接到不支持的 GroupWise 服务器,此时使用 Evolution 可能遇到问题。为了"
"得到最佳效果,服务器应该升级到支持的版本。"
+#: ../calendar/calendar.error.xml.h:62
+msgid ""
+"You have a read-only calendar source selected. Change to Calendar View and "
+"highlight a calendar that can accept appointments."
+msgstr ""
+
#: ../calendar/calendar.error.xml.h:63
msgid "You have changed this appointment, but not yet saved it."
msgstr "您已经更改了此约会,但尚未保存。"
@@ -4279,8 +4370,8 @@ msgstr "分割多日事件:"
#: ../calendar/conduits/calendar/calendar-conduit.c:1433
#: ../calendar/conduits/memo/memo-conduit.c:854
#: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1032
-#: ../calendar/conduits/todo/todo-conduit.c:1033
+#: ../calendar/conduits/todo/todo-conduit.c:1038
+#: ../calendar/conduits/todo/todo-conduit.c:1039
msgid "Could not start evolution-data-server"
msgstr "无法启动 evolution-data-server"
@@ -4314,12 +4405,12 @@ msgid "Could not write pilot's ToDo application block"
msgstr "无法写入 Pilot ToDo 应用程序块"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:1969
+#: ../plugins/itip-formatter/itip-formatter.c:2012
msgid "Calendar and Tasks"
msgstr "日历和任务"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1291
+#: ../calendar/gui/calendar-component.c:1319
msgid "Calendars"
msgstr "日历"
@@ -4367,12 +4458,12 @@ msgid "Memos"
msgstr "备忘"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
-#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
+#: ../calendar/gui/e-calendar-table.c:526 ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/print.c:1840 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
#: ../calendar/importers/icalendar-importer.c:80
#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/exchange-operations/exchange-folder.c:581
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4392,15 +4483,15 @@ msgstr "任务(_T)"
msgid "Evolution Calendar alarm notification service"
msgstr "Evolution 日历提醒通知服务"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
msgid "minute"
msgid_plural "minutes"
msgstr[0] "分钟"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
#: ../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/calendar-setup.glade.h:12
#: ../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
@@ -4408,7 +4499,7 @@ msgid "hours"
msgid_plural "hours"
msgstr[0] "小时"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
msgid "Start time"
msgstr "开始时间"
@@ -4419,10 +4510,10 @@ msgstr "约会"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
#: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:880
+#: ../plugins/itip-formatter/itip-view.c:882
msgid "Location:"
msgstr "位置:"
@@ -4432,16 +4523,16 @@ msgstr "午睡时间(_T):"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
#: ../plugins/publish-calendar/publish-calendar.glade.h:21
#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
#: ../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:40
+#: ../ui/evolution.xml.h:41
msgid "_Edit"
msgstr "编辑(_E)"
@@ -4453,32 +4544,31 @@ msgstr "午睡(_S)"
msgid "location of appointment"
msgstr "约会位置"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
msgid "No summary available."
msgstr "没有可用的摘要。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
msgid "No description available."
msgstr "没有描述。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
msgid "No location information available."
msgstr "没有可用的位置信息。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1531
#, c-format
msgid "You have %d alarms"
msgstr "您有 %d 个提醒"
-#. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
msgid "Warning"
msgstr "警告"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1701
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -4490,7 +4580,7 @@ msgstr ""
"发送电子邮件。Evolution 将以\n"
"显示普通提示会话框代替。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4506,7 +4596,7 @@ msgstr ""
"\n"
"您确信您要运行该程序吗?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
msgid "Do not ask me about this program again."
msgstr "不要再次询问此问题。"
@@ -4602,178 +4692,197 @@ msgid "Default reminder value"
msgstr "默认提醒值"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Event Gradient"
+msgstr "事件渐变"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Event Transparency"
+msgstr "事件透明度"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
msgid "Free/busy server URLs"
msgstr "忙/闲服务器 URL"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
msgid "Free/busy template URL"
msgstr "忙/闲模板 URL"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Gradient of the events in calendar views."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
msgid "Hide completed tasks"
msgstr "隐藏已完成的任务"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
msgid "Hide task units"
msgstr "隐藏任务单位"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
msgid "Hide task value"
msgstr "隐藏任务值"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
msgid "Horizontal pane position"
msgstr "水平面板位置"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
msgstr "工作日结束的小时,以 24 小时格式表示,0 到 23。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
msgstr "工作日开始的小时,以 24 小时格式表示,0 到 23。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
msgid "Intervals shown in Day and Work Week views, in minutes."
msgstr "日视图和工作日视图中显示的间隔,以分钟计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
msgid "Last alarm time"
msgstr "上次提醒时间"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
msgid "List of server URLs for free/busy publishing."
msgstr "列出发表忙/闲的服务器 URL。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
msgid "Marcus Bains Line"
msgstr "Marcus Bains 线"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
msgid "Marcus Bains Line Color - Day View"
msgstr "Marcus Bains 线颜色 - 日视图"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
msgid "Marcus Bains Line Color - Time bar"
msgstr "Marcus Bains 线颜色 - 日期栏"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
msgid "Minute the workday ends on, 0 to 59."
msgstr "工作日结束的分钟,0 到 59。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
msgid "Minute the workday starts on, 0 to 59."
msgstr "工作日开始的分钟,0 到 59。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
msgid "Month view horizontal pane position"
msgstr "月视图水平面板的位置"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
msgid "Month view vertical pane position"
msgstr "月视图中垂直面板的位置"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
msgid "Number of units for determining a default reminder."
msgstr "确定默认提醒的单位数量。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
msgid "Number of units for determining when to hide tasks."
msgstr "决定何时隐藏任务的数字单位。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
msgid "Overdue tasks color"
msgstr "延期任务的颜色"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
msgid ""
"Position of the horizontal pane, between the date navigator calendar and the "
"task list when not in the month view, in pixels."
msgstr "非月视图中日期导航器日历和任务列表之间水平面板的位置,以像素计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
msgid ""
"Position of the horizontal pane, between the view and the date navigator "
"calendar and task list in the month view, in pixels."
msgstr "月视图中视图和日期导航器日历之间水平面板的位置,以像素计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#, fuzzy
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr "卡片和列表视图及预览面板之间垂直面板的位置,以像素计。"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
msgid ""
"Position of the vertical pane, between the task list and the task preview "
"pane, in pixels."
msgstr "任务列表和任务预览面板间垂直面板的位置,以像素计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
msgid ""
"Position of the vertical pane, between the view and the date navigator "
"calendar and task list in the month view, in pixels."
msgstr "月视图中视图和日期导航器日历及任务列表之间垂直面板的位置,以像素计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
msgid ""
"Position of the vertical pane, between the view and the date navigator "
"calendar and task list when not in the month view, in pixels."
msgstr "非月视图中视图和日期导航器日历及任务列表之间垂直面板的位置,以像素计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
msgid "Programs that are allowed to be run by alarms."
msgstr "允许提醒运行的程序。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
msgid "Show RSVP field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示请回复域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
msgid "Show Role field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示角色域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
msgid "Show appointment end times in week and month views"
msgstr "在周视图和月视图中显示约会结束时间"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
msgid "Show categories field in the event/meeting/task editor"
msgstr "在事件/会议/任务编辑器中显示分类域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
msgid "Show display alarms in notification tray"
msgstr "在通知托盘中显示提醒"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
msgid "Show status field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示状态域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:81
msgid "Show the \"Preview\" pane"
msgstr "显示“预览”面板"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:82
msgid "Show the \"Preview\" pane."
msgstr "显示“预览”面板。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
msgid "Show timezone field in the event/meeting editor"
msgstr "在事件/会议编辑器中显示时区域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
msgid "Show type field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示类型域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
msgid "Show week numbers in date navigator"
msgstr "在日期导航器中显示周数"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
msgid "Tasks due today color"
msgstr "今天到期的任务颜色"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
msgid "Tasks vertical pane position"
msgstr "任务垂直面板位置"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
#, no-c-format
msgid ""
"The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4782,7 +4891,7 @@ msgstr ""
"用作忙/闲数据发布的 URL 模板,%u 将替换为电子邮件的用户部分,而 %d 将替换为域"
"名。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
msgid ""
"The default timezone to use for dates and times in the calendar, as an "
"untranslated Olsen timezone database location like \"America/New York\"."
@@ -4790,127 +4899,141 @@ msgstr ""
"日历中日期和时间所使用的默认时区,以未翻译的时区数据库位置表示,如“Asia/"
"Shanghai”。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
msgid "Time divisions"
msgstr "时间分割"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
msgid "Time the last alarm ran, in time_t."
msgstr "提醒上次运行的时间,以 time_t 格式。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
msgid "Timezone"
msgstr "时区"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+msgid ""
+"Transparency of the events in calendar views (A value between 0 and 10, "
+"opaque by default)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
msgid "Twenty four hour time format"
msgstr "二十四小时时间格式"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
msgstr "默认提醒的单位,可为“minutes”,“hours”或“days”。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
msgid ""
"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
msgstr "决定是否隐藏任务的单位,可为“minutes”,“hours”或“days”。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
msgid "Week start"
msgstr "一周开始"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
msgstr "一周开始的日子,从星期日(0)到星期六(6)。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
msgid "Whether or not to use the notification tray for display alarms."
msgstr "是否使用通知托盘来显示提醒。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
msgid "Whether to ask for confirmation when deleting an appointment or task."
msgstr "删除约会或任务时是否要求确认。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
msgid "Whether to ask for confirmation when expunging appointments and tasks."
msgstr "销毁约会和任务时是否要求确认。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
msgid ""
"Whether to compress weekends in the month view, which puts Saturday and "
"Sunday in the space of one weekday."
msgstr "在月视图中是否压缩周末;压缩时将把周六和周日用一个单元格显示。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
msgid "Whether to display the end time of events in the week and month views."
msgstr "是否在周视图和月视图中显示事件的结束时间。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
msgid ""
"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
msgstr "是否在日历中绘制 Marcus Bains 线(当前时间线)。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
msgid "Whether to hide completed tasks in the tasks view."
msgstr "是否在任务视图中隐藏已完成的任务。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
msgid "Whether to set a default reminder for appointments."
msgstr "是否为约会设置默认提醒。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
msgid "Whether to show RSVP field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示请回复域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
msgid "Whether to show categories field in the event/meeting editor"
msgstr "是否在事件/会议编辑器中显示分类域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
msgid "Whether to show role field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议中显示角色域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
msgid "Whether to show status field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示状态域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
msgid ""
"Whether to show times in twenty four hour format instead of using am/pm."
msgstr "是以 24 小时格式还是以 12 小时格式显示时间。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
msgid "Whether to show timezone field in the event/meeting editor"
msgstr "是否在事件/会议编辑器中显示时区域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
msgid "Whether to show type field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示类型域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
msgid "Whether to show week numbers in the date navigator."
msgstr "是否在日期导航器中显示周数。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+msgid "Whether to use daylight savings time while displaying events."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
msgid "Work days"
msgstr "工作日"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
msgid "Workday end hour"
msgstr "工作日结束小时"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
msgid "Workday end minute"
msgstr "工作日结束分钟"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
msgid "Workday start hour"
msgstr "工作日开始小时"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
msgid "Workday start minute"
msgstr "工作日开始分钟"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
+msgid "daylight savings time"
+msgstr ""
+
#: ../calendar/gui/cal-search-bar.c:48
msgid "Summary contains"
msgstr "概要含有"
@@ -4919,39 +5042,25 @@ msgstr "概要含有"
msgid "Description contains"
msgstr "描述含有"
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:50
msgid "Comment contains"
msgstr "注释含有"
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../calendar/gui/cal-search-bar.c:51
msgid "Location contains"
msgstr "位置含有"
-#: ../calendar/gui/cal-search-bar.c:347
+#: ../calendar/gui/cal-search-bar.c:359
msgid "Unmatched"
msgstr "无匹配"
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
#: ../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:709
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:580
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
-#: ../plugins/hula-account-setup/camel-hula-listener.c:379
-#: ../plugins/hula-account-setup/camel-hula-listener.c:408
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
-msgid "Calendar"
-msgstr "日历"
-
#: ../calendar/gui/calendar-commands.c:348
msgid ""
"This operation will permanently erase all events older than the selected "
@@ -4966,10 +5075,10 @@ msgstr "销毁较早的事件"
#: ../calendar/gui/calendar-commands.c:359
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
#: ../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
+#: ../widgets/misc/e-send-options.glade.h:38
msgid "days"
msgstr "天"
@@ -4977,89 +5086,89 @@ msgstr "天"
#. Create the LDAP source group
#. Create the Webcal source group
#. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/calendar-component.c:253
#: ../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:253 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:271 ../calendar/gui/migration.c:403
msgid "Birthdays & Anniversaries"
msgstr "生日和纪念日"
#. Create the weather group
-#: ../calendar/gui/calendar-component.c:259
+#: ../calendar/gui/calendar-component.c:277
#: ../plugins/calendar-weather/calendar-weather.c:100
msgid "Weather"
msgstr "天气"
-#: ../calendar/gui/calendar-component.c:536
+#: ../calendar/gui/calendar-component.c:554
msgid "_New Calendar"
msgstr "新建日历(_N)"
-#: ../calendar/gui/calendar-component.c:840
+#: ../calendar/gui/calendar-component.c:858
msgid "Failed upgrading calendars."
msgstr "升级日历失败。"
-#: ../calendar/gui/calendar-component.c:1139
+#: ../calendar/gui/calendar-component.c:1157
#, c-format
msgid "Unable to open the calendar '%s' for creating events and meetings"
msgstr "无法打开日历“%s”来创建事件和会议"
-#: ../calendar/gui/calendar-component.c:1152
+#: ../calendar/gui/calendar-component.c:1173
msgid "There is no calendar available for creating events and meetings"
msgstr "没有可创建事件和会议的日历"
-#: ../calendar/gui/calendar-component.c:1266
+#: ../calendar/gui/calendar-component.c:1294
msgid "Calendar Source Selector"
msgstr "日历源选择器"
-#: ../calendar/gui/calendar-component.c:1457
+#: ../calendar/gui/calendar-component.c:1489
msgid "New appointment"
msgstr "新建约会"
-#: ../calendar/gui/calendar-component.c:1458
+#: ../calendar/gui/calendar-component.c:1490
msgid "_Appointment"
msgstr "约会(_A)"
-#: ../calendar/gui/calendar-component.c:1459
+#: ../calendar/gui/calendar-component.c:1491
msgid "Create a new appointment"
msgstr "创建新约会"
-#: ../calendar/gui/calendar-component.c:1465
+#: ../calendar/gui/calendar-component.c:1497
msgid "New meeting"
msgstr "新建会议"
-#: ../calendar/gui/calendar-component.c:1466
+#: ../calendar/gui/calendar-component.c:1498
msgid "M_eeting"
msgstr "会议(_E)"
-#: ../calendar/gui/calendar-component.c:1467
+#: ../calendar/gui/calendar-component.c:1499
msgid "Create a new meeting request"
msgstr "创建一条新会议请求"
-#: ../calendar/gui/calendar-component.c:1473
+#: ../calendar/gui/calendar-component.c:1505
msgid "New all day appointment"
msgstr "新建全天约会"
-#: ../calendar/gui/calendar-component.c:1474
+#: ../calendar/gui/calendar-component.c:1506
msgid "All Day A_ppointment"
msgstr "全天约会(_P)"
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1507
msgid "Create a new all-day appointment"
msgstr "创建新全天约会"
-#: ../calendar/gui/calendar-component.c:1481
+#: ../calendar/gui/calendar-component.c:1513
msgid "New calendar"
msgstr "新建日历"
-#: ../calendar/gui/calendar-component.c:1482
+#: ../calendar/gui/calendar-component.c:1514
msgid "Cale_ndar"
msgstr "日历(_N)"
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1515
msgid "Create a new calendar"
msgstr "创建新日历"
@@ -5091,11 +5200,11 @@ msgstr "打开日历的方法不支持"
msgid "Permission denied to open the calendar"
msgstr "没有权限打开日历"
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1272
msgid "Unknown error"
msgstr "未知的错误"
-#: ../calendar/gui/dialogs/alarm-dialog.c:567
+#: ../calendar/gui/dialogs/alarm-dialog.c:614
msgid "Edit Alarm"
msgstr "编辑提醒"
@@ -5211,54 +5320,25 @@ msgid "A_dd"
msgstr "添加(_D)"
#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
#: ../calendar/gui/dialogs/event-page.glade.h:4
#: ../ui/evolution-event-editor.xml.h:1
msgid "Alarms"
msgstr "提醒"
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:6
-#: ../composer/e-msg-composer-select-file.c:97
-#: ../composer/e-msg-composer-select-file.c:117
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "建议自动显示附件"
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
+#: ../composer/e-msg-composer-attachment.glade.h:5
+#: ../composer/e-msg-composer-select-file.c:98
+#: ../composer/e-msg-composer-select-file.c:118
+msgid "_Suggest automatic display of attachment"
+msgstr "建议自动显示附件(_S)"
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
msgid "Attach file(s)"
msgstr "添加附件"
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "附件属性"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:269
-#: ../calendar/gui/e-itip-control.c:1159
-#: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
-msgid "Description:"
-msgstr "描述:"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "File name:"
-msgstr "文件名:"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:5
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "MIME 类型:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
msgid "Selected Calendars for Alarms"
msgstr "已选择用于提醒的日历"
@@ -5283,7 +5363,7 @@ msgid ""
msgstr "<i>%u 和 %d 将被替换为电子邮件地址中的用户和域名。</i>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:8
msgid "<span weight=\"bold\">Alerts</span>"
msgstr "<span weight=\"bold\">警告</span>"
@@ -5292,7 +5372,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
msgstr "<span weight=\"bold\">默认忙/闲服务器</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:17
#: ../plugins/publish-calendar/publish-calendar.glade.h:1
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">常规</span>"
@@ -5309,27 +5389,25 @@ msgstr "<span weight=\"bold\">时间</span>"
msgid "<span weight=\"bold\">Work Week</span>"
msgstr "<span weight=\"bold\">工作周</span>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Adjust for daylight sa_ving time"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
msgid "Day _ends:"
msgstr "一天结束(_E):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
msgid "Display"
msgstr "显示"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:574
-#: ../ui/evolution-event-editor.xml.h:8
-msgid "Free/Busy"
-msgstr "忙/闲"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
#: ../calendar/gui/dialogs/recurrence-page.c:1084
#: ../calendar/gui/e-itip-control.c:730
msgid "Friday"
msgstr "星期五"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
msgid ""
"Minutes\n"
"Hours\n"
@@ -5339,13 +5417,13 @@ msgstr ""
"小时\n"
"天"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
#: ../calendar/gui/dialogs/recurrence-page.c:1080
#: ../calendar/gui/e-itip-control.c:726
msgid "Monday"
msgstr "星期一"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
msgid ""
"Monday\n"
"Tuesday\n"
@@ -5363,219 +5441,225 @@ msgstr ""
"周六\n"
"周日"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:106
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
+#: ../mail/mail-config.glade.h:105
msgid "Pick a color"
msgstr "选取一种颜色"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
msgid "S_un"
msgstr "周日(_U)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
#: ../calendar/gui/dialogs/recurrence-page.c:1085
#: ../calendar/gui/e-itip-control.c:731
msgid "Saturday"
msgstr "星期六"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
msgid "Select the calendars for alarm notification"
msgstr "选择用于提醒的日历"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
msgid "Sh_ow a reminder"
msgstr "显示一条提醒(_O)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
msgid "Show week _numbers in date navigator"
msgstr "在日期浏览器中显示周数(_N)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
#: ../calendar/gui/dialogs/recurrence-page.c:1086
#: ../calendar/gui/e-itip-control.c:725
msgid "Sunday"
msgstr "星期日"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
msgid "T_asks due today:"
msgstr "今天到期的任务(_A):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
msgid "T_hu"
msgstr "周四(_H)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
msgid "Template:"
msgstr "模板:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
#: ../calendar/gui/dialogs/recurrence-page.c:1083
#: ../calendar/gui/e-itip-control.c:729
msgid "Thursday"
msgstr "星期四"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/event-page.glade.h:13
msgid "Time _zone:"
msgstr "时区(_Z):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
msgid "Time format:"
msgstr "时间格式:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
#: ../calendar/gui/dialogs/recurrence-page.c:1081
#: ../calendar/gui/e-itip-control.c:727
msgid "Tuesday"
msgstr "星期二"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
#: ../calendar/gui/dialogs/recurrence-page.c:1082
#: ../calendar/gui/e-itip-control.c:728
msgid "Wednesday"
msgstr "星期三"
#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
msgid "Wee_k starts on:"
msgstr "一周开始于(_K):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
msgid "Work days:"
msgstr "工作日:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
msgid "_12 hour (AM/PM)"
msgstr "_12 小时(上/下午)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
msgid "_24 hour"
msgstr "_24 小时"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
msgid "_Ask for confirmation when deleting items"
msgstr "删除项时要求确认(_A)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
msgid "_Compress weekends in month view"
msgstr "不在月视图中显示周末(_C)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
msgid "_Day begins:"
msgstr "一天开始(_D):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
msgid "_Fri"
msgstr "周五(_F)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
msgid "_Hide completed tasks after"
msgstr "随后隐藏已完成的任务(_H)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
msgid "_Mon"
msgstr "周一(_M)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
msgid "_Overdue tasks:"
msgstr "延期任务(_O):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
msgid "_Sat"
msgstr "周六(_S)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
msgid "_Show appointment end times in week and month view"
msgstr "在周视图和月视图中显示约会结束时间(_S)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
msgid "_Time divisions:"
msgstr "时间分割(_T):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
msgid "_Tue"
msgstr "周二(_T)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
msgid "_Wed"
msgstr "周三(_W)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
msgid "before every appointment"
msgstr "在每次约会前"
#: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Copy calendar contents locally for offline operation"
-msgstr "将日历内容复制到本地以进行脱机操作"
+msgid "Cop_y calendar contents locally for offline operation"
+msgstr "将日历内容复制到本地以进行脱机操作(_Y)"
-#: ../calendar/gui/dialogs/calendar-setup.c:291
-msgid "Copy task list contents locally for offline operation"
-msgstr "将任务列表内容复制到本地以进行脱机操作"
+#: ../calendar/gui/dialogs/calendar-setup.c:290
+msgid "Cop_y task list contents locally for offline operation"
+msgstr "将任务列表内容复制到本地以进行脱机操作(_Y)"
-#: ../calendar/gui/dialogs/calendar-setup.c:293
-msgid "Copy memo list contents locally for offline operation"
-msgstr "将备忘列表内容复制到本地以进行脱机操作"
+#: ../calendar/gui/dialogs/calendar-setup.c:292
+msgid "Cop_y memo list contents locally for offline operation"
+msgstr "将备忘列表内容复制到本地以进行脱机操作(_Y)"
-#: ../calendar/gui/dialogs/calendar-setup.c:344
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
msgid "C_olor:"
msgstr "颜色(_O):"
-#: ../calendar/gui/dialogs/calendar-setup.c:381
-msgid "Tasks List"
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+msgid "Task List"
msgstr "任务列表"
-#: ../calendar/gui/dialogs/calendar-setup.c:392
-msgid "Memos List"
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+msgid "Memo List"
msgstr "备忘列表"
-#: ../calendar/gui/dialogs/calendar-setup.c:461
+#: ../calendar/gui/dialogs/calendar-setup.c:479
msgid "Calendar Properties"
msgstr "日历属性"
-#: ../calendar/gui/dialogs/calendar-setup.c:463
+#: ../calendar/gui/dialogs/calendar-setup.c:481
msgid "New Calendar"
msgstr "新建日历"
-#: ../calendar/gui/dialogs/calendar-setup.c:529
+#: ../calendar/gui/dialogs/calendar-setup.c:566
msgid "Task List Properties"
msgstr "任务列表属性"
-#: ../calendar/gui/dialogs/calendar-setup.c:595
-#: ../calendar/gui/memos-component.c:450
+#: ../calendar/gui/dialogs/calendar-setup.c:632
msgid "New Memo List"
msgstr "新建备忘列表"
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
msgid "Add Calendar"
msgstr "添加日历"
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
msgid "Add Task List"
msgstr "添加任务列表"
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
msgid "_Add Calendar"
msgstr "添加日历(_A)"
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
msgid "_Add Task List"
msgstr "添加任务列表(_A)"
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
#: ../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
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
#: ../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
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
#: ../plugins/calendar-weather/calendar-weather.c:566
msgid "weeks"
@@ -5630,48 +5714,48 @@ msgstr "%s 您还没有进行修改,更新编辑器吗?"
msgid "Validation error: %s"
msgstr "校验错误:%s"
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2280
msgid " to "
msgstr " 到 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
msgid " (Completed "
msgstr " (完成 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
msgid "Completed "
msgstr "已完成 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
msgid " (Due "
msgstr " (预定 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
msgid "Due "
msgstr "预定 "
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
#, c-format
msgid "Attached message - %s"
msgstr "附加的信件 - %s"
#. translators, this count will always be >1
#: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3056
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2893
+#: ../composer/e-msg-composer.c:3089
#, c-format
msgid "Attached message"
msgid_plural "%d attached messages"
msgstr[0] "%d 封附加的信件"
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
-#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
+#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1900
msgid "_Move"
msgstr "移动(_M)"
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
+#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1902
msgid "Cancel _Drag"
msgstr "取消拖曳(_D)"
@@ -5679,7 +5763,7 @@ msgstr "取消拖曳(_D)"
msgid "Could not update object"
msgstr "无法更新对象"
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2501
#, c-format
msgid "<b>%d</b> Attachment"
msgid_plural "<b>%d</b> Attachments"
@@ -5690,97 +5774,96 @@ msgid "Hide Attachment _Bar"
msgstr "隐藏附件栏(_B)"
#: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:1465
msgid "Show Attachment _Bar"
msgstr "显示附件栏(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1089
-#: ../calendar/gui/dialogs/event-page.c:1894
-#: ../calendar/gui/dialogs/meeting-page.c:899
+#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/event-page.c:1895
#: ../calendar/gui/dialogs/task-page.c:1198
#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3619
+#: ../composer/e-msg-composer.c:3651
#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.glade.h:13
#: ../widgets/table/e-table-config.glade.h:18
msgid "_Remove"
msgstr "删除(_R)"
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1100
#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3652 ../mail/em-folder-tree.c:2065
#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
msgid "_Properties"
msgstr "属性(_P)"
-#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../calendar/gui/dialogs/comp-editor.c:1102
#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3622
+#: ../composer/e-msg-composer.c:3654
msgid "_Add attachment..."
msgstr "添加附件(_A)..."
-#: ../calendar/gui/dialogs/comp-editor.c:1468
-#: ../mail/em-format-html-display.c:2065
+#: ../calendar/gui/dialogs/comp-editor.c:1489
+#: ../mail/em-format-html-display.c:2262
msgid "Show Attachments"
msgstr "显示附件"
-#: ../calendar/gui/dialogs/comp-editor.c:1469
+#: ../calendar/gui/dialogs/comp-editor.c:1490
msgid "Press space key to toggle attachment bar"
msgstr "按空格键可切换附件栏"
-#: ../calendar/gui/dialogs/comp-editor.c:2076
-#: ../calendar/gui/dialogs/comp-editor.c:2119
+#: ../calendar/gui/dialogs/comp-editor.c:2097
+#: ../calendar/gui/dialogs/comp-editor.c:2140
msgid "Edit Appointment"
msgstr "编辑约会"
-#: ../calendar/gui/dialogs/comp-editor.c:2082
-#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:2103
+#: ../calendar/gui/dialogs/comp-editor.c:2146
#, c-format
msgid "Meeting - %s"
msgstr "会议 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2084
-#: ../calendar/gui/dialogs/comp-editor.c:2127
+#: ../calendar/gui/dialogs/comp-editor.c:2105
+#: ../calendar/gui/dialogs/comp-editor.c:2148
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2088
-#: ../calendar/gui/dialogs/comp-editor.c:2131
+#: ../calendar/gui/dialogs/comp-editor.c:2109
+#: ../calendar/gui/dialogs/comp-editor.c:2152
#, c-format
msgid "Assigned Task - %s"
msgstr "指派的任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/dialogs/comp-editor.c:2133
+#: ../calendar/gui/dialogs/comp-editor.c:2111
+#: ../calendar/gui/dialogs/comp-editor.c:2154
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2093
-#: ../calendar/gui/dialogs/comp-editor.c:2136
+#: ../calendar/gui/dialogs/comp-editor.c:2114
+#: ../calendar/gui/dialogs/comp-editor.c:2157
#, c-format
msgid "Journal entry - %s"
msgstr "日记条目 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2104
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:2167
msgid "No summary"
msgstr "没有概要"
-#: ../calendar/gui/dialogs/comp-editor.c:2654
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
-#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
+#: ../calendar/gui/dialogs/comp-editor.c:2677
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:518
+#: ../mail/em-utils.c:555 ../widgets/misc/e-attachment-bar.c:365
msgid "attachment"
msgstr "附件"
-#: ../calendar/gui/dialogs/comp-editor.c:2743
-#: ../calendar/gui/dialogs/comp-editor.c:2797
-#: ../calendar/gui/dialogs/comp-editor.c:2821
+#: ../calendar/gui/dialogs/comp-editor.c:2766
+#: ../calendar/gui/dialogs/comp-editor.c:2820
+#: ../calendar/gui/dialogs/comp-editor.c:2844
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "如果更新到达的话,对此项目的更改将被丢弃"
-#: ../calendar/gui/dialogs/comp-editor.c:2845
+#: ../calendar/gui/dialogs/comp-editor.c:2868
msgid "Unable to use current version!"
msgstr "无法使用当前版本!"
@@ -5796,6 +5879,10 @@ msgstr "无法打开目的"
msgid "Destination is read only"
msgstr "目的只读"
+#: ../calendar/gui/dialogs/delete-comp.c:206
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr "从全部其它收件人的邮箱中删除此项吗?(_D)"
+
#: ../calendar/gui/dialogs/delete-error.c:54
msgid "The event could not be deleted due to a corba error"
msgstr "无法删除事件,原因是 corba 错误"
@@ -5857,136 +5944,121 @@ msgstr "授权给:"
msgid "Enter Delegate"
msgstr "输入代表"
-#: ../calendar/gui/dialogs/event-editor.c:547
+#: ../calendar/gui/dialogs/event-editor.c:564
msgid "Appoint_ment"
msgstr "约会(_M)"
-#: ../calendar/gui/dialogs/event-editor.c:551
+#: ../calendar/gui/dialogs/event-editor.c:568
#: ../ui/evolution-event-editor.xml.h:14
msgid "Recurrence"
msgstr "再现"
-#: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:810
+#: ../calendar/gui/dialogs/event-page.c:2716
msgid "This event has alarms"
msgstr "此事件有提醒"
-#: ../calendar/gui/dialogs/event-page.c:872
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-msgid "Cale_ndar:"
-msgstr "日历(_N):"
-
-#: ../calendar/gui/dialogs/event-page.c:878
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.glade.h:11
#: ../calendar/gui/dialogs/meeting-page.glade.h:5
#: ../calendar/gui/dialogs/task-page.c:441
msgid "Or_ganizer:"
msgstr "组织者(_G):"
-#: ../calendar/gui/dialogs/event-page.c:916
+#: ../calendar/gui/dialogs/event-page.c:920
msgid "_Delegatees"
msgstr "代理人(_D)"
-#: ../calendar/gui/dialogs/event-page.c:918
+#: ../calendar/gui/dialogs/event-page.c:922
msgid "Atte_ndees"
msgstr "出席者(_N)"
-#: ../calendar/gui/dialogs/event-page.c:1086
+#: ../calendar/gui/dialogs/event-page.c:1087
msgid "Event with no start date"
msgstr "没有开始日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1090
msgid "Event with no end date"
msgstr "没有结束日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/event-page.c:1258
#: ../calendar/gui/dialogs/task-page.c:848
msgid "Start date is wrong"
msgstr "开始日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1268
msgid "End date is wrong"
msgstr "结束日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1290
+#: ../calendar/gui/dialogs/event-page.c:1291
msgid "Start time is wrong"
msgstr "开始时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1297
+#: ../calendar/gui/dialogs/event-page.c:1298
msgid "End time is wrong"
msgstr "结束时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1452
-#: ../calendar/gui/dialogs/meeting-page.c:469
+#: ../calendar/gui/dialogs/event-page.c:1453
#: ../calendar/gui/dialogs/task-page.c:905
msgid "The organizer selected no longer has an account."
msgstr "选中的组织者没有帐户了。"
-#: ../calendar/gui/dialogs/event-page.c:1458
-#: ../calendar/gui/dialogs/meeting-page.c:475
+#: ../calendar/gui/dialogs/event-page.c:1459
#: ../calendar/gui/dialogs/task-page.c:911
msgid "An organizer is required."
msgstr "需要一名组织者。"
-#: ../calendar/gui/dialogs/event-page.c:1473
-#: ../calendar/gui/dialogs/meeting-page.c:490
+#: ../calendar/gui/dialogs/event-page.c:1474
#: ../calendar/gui/dialogs/task-page.c:926
msgid "At least one attendee is required."
msgstr "需要至少一个出席者。"
-#: ../calendar/gui/dialogs/event-page.c:1895
-#: ../calendar/gui/dialogs/meeting-page.c:900
+#: ../calendar/gui/dialogs/event-page.c:1896
#: ../calendar/gui/dialogs/task-page.c:1199
msgid "_Add "
msgstr "添加(_A)"
-#: ../calendar/gui/dialogs/event-page.c:2621
+#: ../calendar/gui/dialogs/event-page.c:2623
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "无法打开日历“%s”。"
-#: ../calendar/gui/dialogs/event-page.c:2924
+#: ../calendar/gui/dialogs/event-page.c:2926
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "约会的 %d 天前"
-#: ../calendar/gui/dialogs/event-page.c:2932
+#: ../calendar/gui/dialogs/event-page.c:2934
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "约会的 %d 小时前"
-#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/dialogs/event-page.c:2942
#, c-format
msgid "%d minute before appointement"
msgid_plural "%d minutes before appointment"
msgstr[0] "约会的 %d 分钟前"
-#: ../calendar/gui/dialogs/event-page.c:2956
+#: ../calendar/gui/dialogs/event-page.c:2958
msgid "Customize"
msgstr "自定义"
#. an empty string is the same as 'None'
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../calendar/gui/dialogs/event-page.c:2961
-#: ../calendar/gui/dialogs/meeting-page.c:321
+#: ../calendar/gui/dialogs/event-page.c:2963
#: ../calendar/gui/dialogs/meeting-page.glade.h:4
#: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2293
#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
#: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
#: ../mail/em-junk-hook.c:78
#: ../plugins/calendar-weather/calendar-weather.c:370
#: ../plugins/calendar-weather/calendar-weather.c:424
#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1626
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
-#: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
+#: ../plugins/itip-formatter/itip-formatter.c:1709
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:1507
+#: ../widgets/misc/e-dateedit.c:1721
msgid "None"
msgstr "无"
@@ -6003,38 +6075,33 @@ msgid "15 minutes before appointment"
msgstr "约会的 15 分钟前"
#: ../calendar/gui/dialogs/event-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "Atte_ndees..."
-msgstr "出席者(_N)..."
+msgid "Attendee_s..."
+msgstr "出席者(_S)..."
#: ../calendar/gui/dialogs/event-page.glade.h:6
#: ../calendar/gui/dialogs/memo-page.glade.h:1
msgid "Ca_tegories..."
msgstr "类别(_T)..."
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:8
msgid "Custom Alarm:"
msgstr "自定义提醒:"
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:9
#: ../calendar/gui/dialogs/task-page.glade.h:3
msgid "D_escription:"
msgstr "描述(_E):"
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:10
msgid "Event Description"
msgstr "事件描述"
#: ../calendar/gui/dialogs/event-page.glade.h:12
-msgid "Locat_ion:"
-msgstr "位置(_I):"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:14
#: ../calendar/gui/dialogs/task-page.glade.h:6
msgid "Su_mmary:"
msgstr "概要(_M):"
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:14
msgid "_Alarm"
msgstr "提醒(_A)"
@@ -6056,14 +6123,6 @@ msgstr "只"
msgid "until"
msgstr "直到"
-#: ../calendar/gui/dialogs/meeting-page.c:307
-msgid "Dele_gatees"
-msgstr "代理人(_G)"
-
-#: ../calendar/gui/dialogs/meeting-page.c:313
-msgid "From:"
-msgstr "发件人:"
-
#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
msgid "Attendee"
@@ -6110,7 +6169,7 @@ msgstr "请回复"
#: ../calendar/gui/e-calendar-table.etspec.h:10
#: ../calendar/gui/e-meeting-list-view.c:520
#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:12
+#: ../mail/message-list.etspec.h:16
msgid "Status"
msgstr "状态"
@@ -6131,11 +6190,11 @@ msgid "Organizer"
msgstr "组织者"
#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:7
msgid "Organizer:"
msgstr "组织者:"
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2321
msgid "Memo"
msgstr "备忘"
@@ -6154,39 +6213,39 @@ msgstr "组(_G):"
msgid "_Memo Content:"
msgstr "备忘内容(_M):"
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
msgid "<b>Calendar options</b>"
msgstr "<b>日历选项</b>"
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
msgid "Add New Calendar"
msgstr "添加新日历"
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
msgid "Calendar Group"
msgstr "日历组"
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
msgid "Calendar Location"
msgstr "日历位置"
-#: ../calendar/gui/dialogs/new-calendar.glade.h:6
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
msgid "Calendar Name"
msgstr "日历名称"
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
msgid "<b>Task List Options</b>"
msgstr "<b>日历列表选项</b>"
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
msgid "Add New Task List"
msgstr "添加新任务列表"
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
msgid "Task List Group"
msgstr "任务列表组"
-#: ../calendar/gui/dialogs/new-task-list.glade.h:5
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
msgid "Task List Name"
msgstr "任务列表名称"
@@ -6332,7 +6391,7 @@ msgid "<b>Exceptions</b>"
msgstr "<b>例外</b>"
#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
msgid "<b>Preview</b>"
msgstr "<b>预览</b>"
@@ -6397,15 +6456,15 @@ msgstr "<span weight=\"bold\">状态</span>"
#: ../calendar/gui/e-cal-component-preview.c:231
#: ../calendar/gui/e-cal-model-tasks.c:347
#: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
-#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/print.c:2382 ../plugins/save-calendar/csv-format.c:390
msgid "Completed"
msgstr "已完成"
#: ../calendar/gui/dialogs/task-details-page.glade.h:5
#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
+#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1029
msgid "High"
msgstr "高"
@@ -6414,20 +6473,20 @@ msgstr "高"
#: ../calendar/gui/e-cal-model-tasks.c:345
#: ../calendar/gui/e-cal-model-tasks.c:653
#: ../calendar/gui/e-cal-model-tasks.c:728
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
msgid "In Progress"
msgstr "进行中"
#: ../calendar/gui/dialogs/task-details-page.glade.h:7
#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
+#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1027
msgid "Low"
msgstr "低"
#: ../calendar/gui/dialogs/task-details-page.glade.h:8
#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
-#: ../mail/message-list.c:1011
+#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:388
+#: ../mail/message-list.c:1028
msgid "Normal"
msgstr "中"
@@ -6435,7 +6494,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:651
-#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
msgid "Not Started"
msgstr "尚未开始"
@@ -6448,7 +6507,7 @@ msgid "Stat_us:"
msgstr "状态(_U):"
#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:390
msgid "Undefined"
msgstr "未定义"
@@ -6457,7 +6516,7 @@ msgid "_Date completed:"
msgstr "完成日期(_D):"
#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:33
msgid "_Priority:"
msgstr "优先级(_P):"
@@ -6465,12 +6524,12 @@ msgstr "优先级(_P):"
msgid "_Web Page:"
msgstr "网页(_W):"
-#: ../calendar/gui/dialogs/task-editor.c:426
+#: ../calendar/gui/dialogs/task-editor.c:425
#: ../calendar/gui/tasks-component.c:1171
msgid "_Task"
msgstr "任务(_T)"
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:429
msgid "Task Details"
msgstr "任务细节"
@@ -6483,6 +6542,10 @@ msgstr "到期日期错误"
msgid "Unable to open tasks in '%s'."
msgstr "无法打开“%s”中的任务。"
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
+msgstr "出席者(_N)..."
+
#: ../calendar/gui/dialogs/task-page.glade.h:2
msgid "Categor_ies..."
msgstr "类别(_I)..."
@@ -6503,46 +6566,46 @@ msgstr "时区:"
msgid "_Due date:"
msgstr "到期日期(_D):"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
msgid "<b>Free/Busy C_alendars</b>"
msgstr "<b>忙/闲日历(_A)</b>"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
msgid "<b>Publishing Frequency</b>"
msgstr "<b>发布频率</b>"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
msgid "<b>Publishing _Location</b>"
msgstr "<b>发布位置(_L)</b>"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
msgid "Free/Busy Publishing Settings"
msgstr "忙闲发布设置"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
msgid "_Daily"
msgstr "每日(_D)"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
msgid "_Manual"
msgstr "手动(_M)"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
#: ../plugins/publish-calendar/publish-calendar.glade.h:23
msgid "_Password:"
msgstr "密码(_P):"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
#: ../plugins/publish-calendar/publish-calendar.glade.h:25
msgid "_Remember password"
msgstr "记住密码(_R)"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
#: ../plugins/publish-calendar/publish-calendar.glade.h:27
msgid "_Username:"
msgstr "用户名(_U):"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
msgid "_Weekly"
msgstr "每周(_W)"
@@ -6621,7 +6684,7 @@ 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:2822
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2862
#, c-format
msgid "Click to open %s"
msgstr "单击以打开 %s"
@@ -6641,7 +6704,7 @@ msgstr "无标题"
#: ../calendar/gui/e-cal-component-preview.c:188
#: ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.glade.h:11
+#: ../calendar/gui/e-itip-control.glade.h:9
msgid "Summary:"
msgstr "概要:"
@@ -6659,7 +6722,7 @@ msgstr "到期日期:"
#: ../calendar/gui/e-cal-component-preview.c:224
#: ../calendar/gui/e-itip-control.c:1127
#: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:905
+#: ../plugins/itip-formatter/itip-view.c:907
msgid "Status:"
msgstr "状态:"
@@ -6667,18 +6730,26 @@ msgstr "状态:"
msgid "Priority:"
msgstr "优先级:"
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../mail/mail-config.glade.h:68 ../widgets/misc/e-attachment.glade.h:2
+msgid "Description:"
+msgstr "描述:"
+
#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:365
msgid "Public"
msgstr "公开"
#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:365
+#: ../calendar/gui/e-calendar-table.c:366
msgid "Private"
msgstr "保密"
#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:367
msgid "Confidential"
msgstr "机密"
@@ -6692,19 +6763,19 @@ msgstr "开始日期"
#: ../calendar/gui/e-cal-list-view.etspec.h:5
#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
#: ../plugins/save-calendar/csv-format.c:386
msgid "Summary"
msgstr "概要"
#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:438
+#: ../calendar/gui/e-calendar-table.c:439
msgid "Free"
msgstr "空闲"
#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:439
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-calendar-table.c:440
+#: ../calendar/gui/e-meeting-time-sel.c:412
msgid "Busy"
msgstr "繁忙"
@@ -6718,17 +6789,17 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
+#: ../calendar/gui/e-meeting-store.c:764
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
msgid "Yes"
msgstr "是"
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/e-meeting-store.c:178
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
msgid "No"
msgstr "否"
@@ -6739,21 +6810,21 @@ msgstr "否"
#: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
#: ../calendar/gui/e-meeting-list-view.c:169
#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
-#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
+#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1651
+#: ../plugins/itip-formatter/itip-formatter.c:1734
#: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:686
+#: ../widgets/misc/e-attachment-bar.c:720
#: ../widgets/misc/e-charset-picker.c:63
msgid "Unknown"
msgstr "未知"
-#: ../calendar/gui/e-cal-model.c:920
+#: ../calendar/gui/e-cal-model.c:921
msgid "Recurring"
msgstr "重复"
-#: ../calendar/gui/e-cal-model.c:922
+#: ../calendar/gui/e-cal-model.c:923
msgid "Assigned"
msgstr "已指派"
@@ -6761,7 +6832,7 @@ msgstr "已指派"
msgid "Save As..."
msgstr "另存为..."
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2110
msgid "Select folder to save selected attachments..."
msgstr "选择保存选中附件的文件夹..."
@@ -6770,9 +6841,9 @@ msgstr "选择保存选中附件的文件夹..."
msgid "untitled_image.%s"
msgstr "无标题图像.%s"
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
-#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
+#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:846
+#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
msgid "_Save As..."
msgstr "另存为(_S)..."
@@ -6790,74 +6861,79 @@ msgstr "保存选中(_S)"
msgid "Open in %s..."
msgstr "在 %s 中打开..."
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:409
msgid "0%"
msgstr "0%"
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:410
msgid "10%"
msgstr "10%"
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:411
msgid "20%"
msgstr "20%"
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:412
msgid "30%"
msgstr "30%"
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:413
msgid "40%"
msgstr "40%"
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:414
msgid "50%"
msgstr "50%"
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:415
msgid "60%"
msgstr "60%"
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:416
msgid "70%"
msgstr "70%"
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:417
msgid "80%"
msgstr "80%"
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:418
msgid "90%"
msgstr "90%"
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:419
msgid "100%"
msgstr "100%"
-#: ../calendar/gui/e-calendar-table.c:703
+#: ../calendar/gui/e-calendar-table.c:704
#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
msgid "Deleting selected objects"
msgstr "删除选中的对象"
-#: ../calendar/gui/e-calendar-table.c:882
+#: ../calendar/gui/e-calendar-table.c:957
#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
msgid "Updating objects"
msgstr "更新对象"
-#: ../calendar/gui/e-calendar-table.c:1032
-#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
-#: ../composer/e-msg-composer.c:1349
+#: ../calendar/gui/e-calendar-table.c:1106
+#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:741
+#: ../composer/e-msg-composer.c:1348
msgid "Save as..."
msgstr "另存为..."
-#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1277
+#: ../calendar/gui/e-calendar-view.c:1681
+msgid "New _Task"
+msgstr "新建任务(_T)"
+
+#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:845
msgid "Open _Web Page"
msgstr "打开网页(_W)"
-#: ../calendar/gui/e-calendar-table.c:1177
-#: ../calendar/gui/e-calendar-view.c:1581
-#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
-#: ../mail/em-folder-view.c:1088
+#: ../calendar/gui/e-calendar-table.c:1283
+#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:847
+#: ../mail/em-folder-view.c:1123
#: ../plugins/print-message/org-gnome-print-message.xml.h:3
#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -6865,44 +6941,52 @@ msgstr "打开网页(_W)"
msgid "_Print..."
msgstr "打印(_P)..."
-#: ../calendar/gui/e-calendar-table.c:1181
-#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
+#: ../calendar/gui/e-calendar-table.c:1287
+#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:851
#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "剪切(_U)"
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:1584
-#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-table.c:1289
+#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:853
#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
#: ../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)"
-#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
msgid "_Assign Task"
msgstr "指派任务(_A)"
-#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
+#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:857
#: ../ui/evolution-tasks.xml.h:26
msgid "_Forward as iCalendar"
msgstr "作为 iCalendar 转发(_F)"
-#: ../calendar/gui/e-calendar-table.c:1189
+#: ../calendar/gui/e-calendar-table.c:1295
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1190
+#: ../calendar/gui/e-calendar-table.c:1296
msgid "_Mark Selected Tasks as Complete"
msgstr "把任务标记为完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1195
+#: ../calendar/gui/e-calendar-table.c:1297
+msgid "_Mark as Incomplete"
+msgstr "标记为未完成(_M)"
+
+#: ../calendar/gui/e-calendar-table.c:1298
+msgid "_Mark Selected Tasks as Incomplete"
+msgstr "把任务标记为未完成(_M)"
+
+#: ../calendar/gui/e-calendar-table.c:1303
msgid "_Delete Selected Tasks"
msgstr "删除选中任务(_D)"
-#: ../calendar/gui/e-calendar-table.c:1428
+#: ../calendar/gui/e-calendar-table.c:1536
#: ../calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
msgstr "单击以添加任务"
@@ -6912,7 +6996,7 @@ msgstr "单击以添加任务"
msgid "% Complete"
msgstr "% 完成"
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:636
msgid "Complete"
msgstr "完成"
@@ -6937,105 +7021,101 @@ msgstr "开始日期"
msgid "Task sort"
msgstr "任务排序"
-#: ../calendar/gui/e-calendar-view.c:1264
+#: ../calendar/gui/e-calendar-view.c:1367
msgid "Moving items"
msgstr "移动项目"
-#: ../calendar/gui/e-calendar-view.c:1266
+#: ../calendar/gui/e-calendar-view.c:1369
msgid "Copying items"
msgstr "复制项目"
-#: ../calendar/gui/e-calendar-view.c:1575
+#: ../calendar/gui/e-calendar-view.c:1678
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
-#: ../calendar/gui/e-calendar-view.c:1576
+#: ../calendar/gui/e-calendar-view.c:1679
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
-#: ../calendar/gui/e-calendar-view.c:1577
+#: ../calendar/gui/e-calendar-view.c:1680
msgid "New _Meeting"
msgstr "新建会议(_M)"
-#: ../calendar/gui/e-calendar-view.c:1578
-msgid "New _Task"
-msgstr "新建任务(_T)"
-
#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1588
+#: ../calendar/gui/e-calendar-view.c:1691
msgid "_Current View"
msgstr "当前视图(_C)"
-#: ../calendar/gui/e-calendar-view.c:1590
+#: ../calendar/gui/e-calendar-view.c:1693
msgid "Select T_oday"
msgstr "选择今天(_O)"
-#: ../calendar/gui/e-calendar-view.c:1591
+#: ../calendar/gui/e-calendar-view.c:1694
msgid "_Select Date..."
msgstr "选择日期(_S)..."
-#: ../calendar/gui/e-calendar-view.c:1607
+#: ../calendar/gui/e-calendar-view.c:1710
msgid "Cop_y to Calendar..."
msgstr "复制到日历(_Y)..."
-#: ../calendar/gui/e-calendar-view.c:1608
+#: ../calendar/gui/e-calendar-view.c:1711
msgid "Mo_ve to Calendar..."
msgstr "移至日历(_V)..."
-#: ../calendar/gui/e-calendar-view.c:1609
+#: ../calendar/gui/e-calendar-view.c:1712
msgid "_Delegate Meeting..."
msgstr "代理会议(_D)..."
-#: ../calendar/gui/e-calendar-view.c:1610
+#: ../calendar/gui/e-calendar-view.c:1713
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
-#: ../calendar/gui/e-calendar-view.c:1611
+#: ../calendar/gui/e-calendar-view.c:1714
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_F)..."
-#: ../calendar/gui/e-calendar-view.c:1612
+#: ../calendar/gui/e-calendar-view.c:1715
msgid "_Reply"
msgstr "回复(_R)"
-#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
+#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
#: ../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:1618
+#: ../calendar/gui/e-calendar-view.c:1721
msgid "Make this Occurrence _Movable"
msgstr "将此次发生变为可移动(_M)"
-#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
msgid "Delete this _Occurrence"
msgstr "删除此次出现(_O)"
-#: ../calendar/gui/e-calendar-view.c:1620
+#: ../calendar/gui/e-calendar-view.c:1723
msgid "Delete _All Occurrences"
msgstr "删除所有出现(_A)"
#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2030
+#: ../calendar/gui/e-calendar-view.c:2175
#, c-format
msgid "Organizer: %s <%s>"
msgstr "组织者:%s <%s>"
#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2034
+#: ../calendar/gui/e-calendar-view.c:2179
#, c-format
msgid "Organizer: %s"
msgstr "组织者:%s"
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
#, c-format
msgid "Location: %s"
msgstr "位置:%s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2081
+#: ../calendar/gui/e-calendar-view.c:2226
#, c-format
msgid "Time: %s %s"
msgstr "时间:%s %s"
@@ -7065,7 +7145,7 @@ msgstr ""
#. * to change the length of the time division in the calendar day view, e.g.
#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
#.
-#: ../calendar/gui/e-day-view-time-item.c:552
+#: ../calendar/gui/e-day-view-time-item.c:808
#, c-format
msgid "%02i minute divisions"
msgstr "%02i 分钟分割"
@@ -7076,20 +7156,22 @@ msgstr "%02i 分钟分割"
#. month, %B = full month name. You can change the
#. order but don't change the specifiers or add
#. anything.
-#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
+#: ../calendar/gui/e-day-view-top-item.c:1311
+#: ../calendar/gui/e-day-view.c:1463
+#: ../calendar/gui/e-week-view-main-item.c:310
+#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1538
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:744 ../calendar/gui/e-week-view.c:503
-#: ../calendar/gui/print.c:841
+#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:858
msgid "am"
msgstr "上午"
#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
-#: ../calendar/gui/print.c:843
+#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:860
msgid "pm"
msgstr "下午"
@@ -7191,22 +7273,22 @@ msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作
#: ../calendar/gui/e-itip-control.c:1132
#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
#: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1722
msgid "Accepted"
msgstr "接受"
#: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1642
+#: ../plugins/itip-formatter/itip-formatter.c:1725
msgid "Tentatively Accepted"
msgstr "暂时接受"
#: ../calendar/gui/e-itip-control.c:1140
#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
#: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1645
+#: ../plugins/itip-formatter/itip-formatter.c:1728
msgid "Declined"
msgstr "拒绝"
@@ -7423,7 +7505,7 @@ msgid "Attendee status updated\n"
msgstr "更新出席者状态\n"
#: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1092
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新出席者状态"
@@ -7470,48 +7552,35 @@ msgid "Send Latest Information"
msgstr "发送最新的信息"
#: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
+#: ../mail/mail-send-recv.c:432 ../mail/mail-send-recv.c:485
#: ../ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
-#: ../calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
-msgstr "%P %%"
-
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:1
msgid "--to--"
msgstr "--到--"
-#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../calendar/gui/e-itip-control.glade.h:2
msgid "Calendar Message"
msgstr "日历信件"
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:3
msgid "Date:"
msgstr "日期:"
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:5
msgid "Loading Calendar"
msgstr "装入日历"
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:6
msgid "Loading calendar..."
msgstr "正在装入日历..."
-#: ../calendar/gui/e-itip-control.glade.h:10
+#: ../calendar/gui/e-itip-control.glade.h:8
msgid "Server Message:"
msgstr "服务器消息:"
-#: ../calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr "日期-结束"
-
-#: ../calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr "日期-开始"
-
#: ../calendar/gui/e-meeting-list-view.c:70
msgid "Chair Persons"
msgstr "主席人员"
@@ -7530,65 +7599,65 @@ msgid "Resources"
msgstr "资源"
#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
-#: ../calendar/gui/e-meeting-store.c:755
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:758
msgid "Individual"
msgstr "个人"
#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
#: ../widgets/table/e-table-config-no-group.glade.h:7
#: ../widgets/table/e-table-config.glade.h:6
msgid "Group"
msgstr "组"
#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
msgid "Resource"
msgstr "资源"
#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
msgid "Room"
msgstr "房间"
#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
msgid "Chair"
msgstr "主席"
#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:761
msgid "Required Participant"
msgstr "必需的出席者"
#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
msgid "Optional Participant"
msgstr "可选的出席者"
#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
msgid "Non-Participant"
msgstr "不参加"
#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
-#: ../calendar/gui/e-meeting-store.c:768
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:771
msgid "Needs Action"
msgstr "需要动作"
#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../calendar/gui/e-meeting-time-sel.c:410
+#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/e-meeting-time-sel.c:411
msgid "Tentative"
msgstr "暂时的"
#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
#: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1648
+#: ../plugins/itip-formatter/itip-formatter.c:1731
msgid "Delegated"
msgstr "被委任的"
@@ -7597,14 +7666,14 @@ msgstr "被委任的"
msgid "Attendee "
msgstr "出席者 "
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
msgid "In Process"
msgstr "处理中"
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:442
-#: ../calendar/gui/e-meeting-time-sel.c:2100
+#: ../calendar/gui/e-meeting-time-sel-item.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:2113
msgid "%A, %B %d, %Y"
msgstr "%Y年%m月%d日%A"
@@ -7612,86 +7681,86 @@ msgstr "%Y年%m月%d日%A"
#. name, %m = month number, %d = month day, %Y = full year.
#. This is a strftime() format string %a = abbreviated weekday name,
#. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:446
-#: ../calendar/gui/e-meeting-time-sel.c:2133
+#: ../calendar/gui/e-meeting-time-sel-item.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:2146
msgid "%a %m/%d/%Y"
msgstr "%Y年%m月%d日%A"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:450
+#: ../calendar/gui/e-meeting-time-sel-item.c:472
msgid "%m/%d/%Y"
msgstr "%Y-%m-%d"
-#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
msgid "Out of Office"
msgstr "办公室以外"
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:414
msgid "No Information"
msgstr "没有信息"
-#: ../calendar/gui/e-meeting-time-sel.c:427
+#: ../calendar/gui/e-meeting-time-sel.c:428
msgid "A_ttendees..."
msgstr "出席者(_T)..."
-#: ../calendar/gui/e-meeting-time-sel.c:444
+#: ../calendar/gui/e-meeting-time-sel.c:445
msgid "O_ptions"
msgstr "选项(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:461
+#: ../calendar/gui/e-meeting-time-sel.c:462
msgid "Show _only working hours"
msgstr "只显示工作小时(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:472
msgid "Show _zoomed out"
msgstr "显示缩放的输出(_Z)"
-#: ../calendar/gui/e-meeting-time-sel.c:486
+#: ../calendar/gui/e-meeting-time-sel.c:487
msgid "_Update free/busy"
msgstr "更新忙闲(_U)"
-#: ../calendar/gui/e-meeting-time-sel.c:501
+#: ../calendar/gui/e-meeting-time-sel.c:502
msgid "_<<"
msgstr "_<<"
-#: ../calendar/gui/e-meeting-time-sel.c:519
+#: ../calendar/gui/e-meeting-time-sel.c:520
msgid "_Autopick"
msgstr "自动获取(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:534
+#: ../calendar/gui/e-meeting-time-sel.c:535
msgid ">_>"
msgstr ">_>"
-#: ../calendar/gui/e-meeting-time-sel.c:551
+#: ../calendar/gui/e-meeting-time-sel.c:552
msgid "_All people and resources"
msgstr "全部人和资源(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:561
msgid "All _people and one resource"
msgstr "全部人和一个资源(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:570
msgid "_Required people"
msgstr "必需的人(_R)"
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-time-sel.c:579
msgid "Required people and _one resource"
msgstr "必需的人和一个资源(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:614
+#: ../calendar/gui/e-meeting-time-sel.c:615
msgid "_Start time:"
msgstr "开始时间(_S):"
-#: ../calendar/gui/e-meeting-time-sel.c:641
+#: ../calendar/gui/e-meeting-time-sel.c:642
msgid "_End time:"
msgstr "结束时间(_E):"
-#: ../calendar/gui/e-memo-table.c:870
+#: ../calendar/gui/e-memo-table.c:862
msgid "_Delete Selected Memos"
msgstr "删除选中备忘(_D)"
-#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:985 ../calendar/gui/e-memo-table.etspec.h:2
msgid "Click to add a memo"
msgstr "单击以添加备忘"
@@ -7699,8 +7768,8 @@ msgstr "单击以添加备忘"
msgid "Memo sort"
msgstr "备忘排序"
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
-#: ../calendar/gui/gnome-cal.c:2557
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
+#: ../calendar/gui/gnome-cal.c:2543
#, c-format
msgid ""
"Error on %s:\n"
@@ -7718,7 +7787,7 @@ msgstr "装入备忘"
msgid "Opening memos at %s"
msgstr "在 %s 打开备忘"
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
msgid "Deleting selected objects..."
msgstr "正在删除选中的对象..."
@@ -7727,66 +7796,67 @@ msgstr "正在删除选中的对象..."
msgid "Enter the password for %s"
msgstr "为 %s 输入密码"
-#: ../calendar/gui/e-tasks.c:884
+#: ../calendar/gui/e-tasks.c:885
msgid "Loading tasks"
msgstr "装入任务"
-#: ../calendar/gui/e-tasks.c:971
+#: ../calendar/gui/e-tasks.c:972
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
-#: ../calendar/gui/e-tasks.c:1216
+#: ../calendar/gui/e-tasks.c:1217
msgid "Completing tasks..."
msgstr "正在完成任务..."
-#: ../calendar/gui/e-tasks.c:1266
+#: ../calendar/gui/e-tasks.c:1267
msgid "Expunging"
msgstr "销毁"
-#: ../calendar/gui/e-timezone-entry.c:133
+#: ../calendar/gui/e-timezone-entry.c:135
msgid "Select Timezone"
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:1509
+#: ../calendar/gui/e-week-view-main-item.c:327
+#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
msgid "%d %B"
msgstr "%-m月%-d日"
-#: ../calendar/gui/gnome-cal.c:786
+#: ../calendar/gui/gnome-cal.c:781
msgid "Updating query"
msgstr "更新查询"
-#: ../calendar/gui/gnome-cal.c:2234
+#: ../calendar/gui/gnome-cal.c:2222
msgid "_Custom View"
msgstr "自定义视图(_C)"
-#: ../calendar/gui/gnome-cal.c:2235
+#: ../calendar/gui/gnome-cal.c:2223
msgid "_Save Custom View"
msgstr "保存自定义视图(_S)"
-#: ../calendar/gui/gnome-cal.c:2240
+#: ../calendar/gui/gnome-cal.c:2228
msgid "_Define Views..."
msgstr "定义视图(_D)..."
-#: ../calendar/gui/gnome-cal.c:2402
+#: ../calendar/gui/gnome-cal.c:2388
#, c-format
msgid "Loading appointments at %s"
msgstr "装入位于 %s 的约会"
-#: ../calendar/gui/gnome-cal.c:2421
+#: ../calendar/gui/gnome-cal.c:2407
#, c-format
msgid "Loading tasks at %s"
msgstr "装入位于 %s 的任务"
-#: ../calendar/gui/gnome-cal.c:2525
+#: ../calendar/gui/gnome-cal.c:2511
#, c-format
msgid "Opening %s"
msgstr "打开 %s"
-#: ../calendar/gui/gnome-cal.c:3430
+#: ../calendar/gui/gnome-cal.c:3384
msgid "Purging"
msgstr "销毁"
@@ -7900,22 +7970,9 @@ msgstr "iCalendar 信息"
msgid "You must be an attendee of the event."
msgstr "您必须是事件的出席者。"
-#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
-#: ../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:452 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:15 ../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:453
-msgid "Properties..."
-msgstr "属性..."
+#: ../calendar/gui/memos-component.c:450
+msgid "_New Memo List"
+msgstr "新建备忘列表(_N)"
#: ../calendar/gui/memos-component.c:526
#, c-format
@@ -7952,8 +8009,8 @@ msgid "New memo"
msgstr "新建备忘"
#: ../calendar/gui/memos-component.c:1156
-msgid "_Memo"
-msgstr "备忘(_M)"
+msgid "Mem_o"
+msgstr "备忘(_O)"
#: ../calendar/gui/memos-component.c:1157
msgid "Create a new memo"
@@ -7964,8 +8021,8 @@ msgid "New memo list"
msgstr "新建备忘列表"
#: ../calendar/gui/memos-component.c:1164
-msgid "Memo l_ist"
-msgstr "备忘列表(_I)"
+msgid "Memo li_st"
+msgstr "备忘列表(_S)"
#: ../calendar/gui/memos-component.c:1165
msgid "Create a new memo list"
@@ -8014,240 +8071,240 @@ msgstr "无法升迁日历“%s”"
msgid "Unable to migrate tasks `%s'"
msgstr "无法升迁任务“%s”"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:574
msgid "1st"
msgstr "1日"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:574
msgid "2nd"
msgstr "2日"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:574
msgid "3rd"
msgstr "3日"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:574
msgid "4th"
msgstr "4日"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:574
msgid "5th"
msgstr "5日"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:575
msgid "6th"
msgstr "6日"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:575
msgid "7th"
msgstr "7日"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:575
msgid "8th"
msgstr "8日"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:575
msgid "9th"
msgstr "9日"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:575
msgid "10th"
msgstr "10日"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:576
msgid "11th"
msgstr "11日"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:576
msgid "12th"
msgstr "12日"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:576
msgid "13th"
msgstr "13日"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:576
msgid "14th"
msgstr "14日"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:576
msgid "15th"
msgstr "15日"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:577
msgid "16th"
msgstr "16日"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:577
msgid "17th"
msgstr "17日"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:577
msgid "18th"
msgstr "18日"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:577
msgid "19th"
msgstr "19日"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:577
msgid "20th"
msgstr "20日"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:578
msgid "21st"
msgstr "21日"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:578
msgid "22nd"
msgstr "22日"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:578
msgid "23rd"
msgstr "23日"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:578
msgid "24th"
msgstr "24日"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:578
msgid "25th"
msgstr "25日"
-#: ../calendar/gui/print.c:498
+#: ../calendar/gui/print.c:579
msgid "26th"
msgstr "26日"
-#: ../calendar/gui/print.c:498
+#: ../calendar/gui/print.c:579
msgid "27th"
msgstr "27日"
-#: ../calendar/gui/print.c:498
+#: ../calendar/gui/print.c:579
msgid "28th"
msgstr "28日"
-#: ../calendar/gui/print.c:498
+#: ../calendar/gui/print.c:579
msgid "29th"
msgstr "29日"
-#: ../calendar/gui/print.c:498
+#: ../calendar/gui/print.c:579
msgid "30th"
msgstr "30日"
-#: ../calendar/gui/print.c:499
+#: ../calendar/gui/print.c:580
msgid "31st"
msgstr "31日"
#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:655
msgid "Su"
msgstr "日"
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:655
msgid "Mo"
msgstr "一"
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:655
msgid "Tu"
msgstr "二"
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:655
msgid "We"
msgstr "三"
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:656
msgid "Th"
msgstr "四"
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:656
msgid "Fr"
msgstr "五"
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:656
msgid "Sa"
msgstr "六"
#. Day
-#: ../calendar/gui/print.c:1923
+#: ../calendar/gui/print.c:1936
msgid "Selected day (%a %b %d %Y)"
msgstr "选中的日期(%Y年%m月%d日%A)"
-#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
+#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
msgid "%a %b %d"
msgstr "%m月%d日%A"
-#: ../calendar/gui/print.c:1949
+#: ../calendar/gui/print.c:1962
msgid "%a %d %Y"
msgstr "%Y年%d日%A"
-#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
-#: ../calendar/gui/print.c:1956
+#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
+#: ../calendar/gui/print.c:1969
msgid "%a %b %d %Y"
msgstr "%Y年%m月%d日%A"
-#: ../calendar/gui/print.c:1960
+#: ../calendar/gui/print.c:1973
#, c-format
msgid "Selected week (%s - %s)"
msgstr "选中的周(%s - %s)"
#. Month
-#: ../calendar/gui/print.c:1968
+#: ../calendar/gui/print.c:1981
msgid "Selected month (%b %Y)"
msgstr "选中的月(%Y年%m月)"
#. Year
-#: ../calendar/gui/print.c:1975
+#: ../calendar/gui/print.c:1988
msgid "Selected year (%Y)"
msgstr "选中的年(%Y年)"
-#: ../calendar/gui/print.c:2304
+#: ../calendar/gui/print.c:2317
msgid "Appointment"
msgstr "约会"
-#: ../calendar/gui/print.c:2306
+#: ../calendar/gui/print.c:2319
msgid "Task"
msgstr "任务"
-#: ../calendar/gui/print.c:2328
+#: ../calendar/gui/print.c:2341
#, c-format
msgid "Summary: %s"
msgstr "概要:%s"
-#: ../calendar/gui/print.c:2379
+#: ../calendar/gui/print.c:2392
#, c-format
msgid "Status: %s"
msgstr "状态:%s"
-#: ../calendar/gui/print.c:2396
+#: ../calendar/gui/print.c:2409
#, c-format
msgid "Priority: %s"
msgstr "优先级:%s"
-#: ../calendar/gui/print.c:2408
+#: ../calendar/gui/print.c:2421
#, c-format
msgid "Percent Complete: %i"
msgstr "完成率:%i"
-#: ../calendar/gui/print.c:2420
+#: ../calendar/gui/print.c:2433
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
-#: ../calendar/gui/print.c:2434
+#: ../calendar/gui/print.c:2447
#, c-format
msgid "Categories: %s"
msgstr "类别:%s"
-#: ../calendar/gui/print.c:2445
+#: ../calendar/gui/print.c:2458
msgid "Contacts: "
msgstr "联系人:"
-#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
-#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2601 ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2820 ../mail/em-format-html-print.c:178
msgid "Print Preview"
msgstr "打印预览"
-#: ../calendar/gui/print.c:2620
+#: ../calendar/gui/print.c:2636
msgid "Print Item"
msgstr "打印项"
@@ -8303,14 +8360,14 @@ msgid "New task list"
msgstr "新建任务列表"
#: ../calendar/gui/tasks-component.c:1187
-msgid "Task l_ist"
-msgstr "任务列表(_I)"
+msgid "Tas_k list"
+msgstr "任务列表(_K)"
#: ../calendar/gui/tasks-component.c:1188
msgid "Create a new task list"
msgstr "创建新任务列表"
-#: ../calendar/gui/tasks-control.c:438
+#: ../calendar/gui/tasks-control.c:446
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -8321,11 +8378,11 @@ msgstr ""
"\n"
"确实删除这些任务吗?"
-#: ../calendar/gui/tasks-control.c:441
+#: ../calendar/gui/tasks-control.c:449
msgid "Do not ask me again."
msgstr "不要再次询问。"
-#: ../calendar/gui/tasks-control.c:475
+#: ../calendar/gui/tasks-control.c:483
msgid "Print Tasks"
msgstr "打印任务"
@@ -8901,7 +8958,7 @@ msgid "America/Nassau"
msgstr "美洲/拿骚"
#: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
msgid "America/New_York"
msgstr "美洲/纽约"
@@ -9920,7 +9977,7 @@ msgid "%.0fG"
msgstr "%.0fG"
#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:988
+#: ../widgets/misc/e-attachment-bar.c:1024
msgid "Attachment Bar"
msgstr "附件栏"
@@ -9928,28 +9985,43 @@ msgstr "附件栏"
#: ../composer/e-msg-composer-attachment.c:203
#: ../composer/e-msg-composer-attachment.c:297
#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
-#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
+#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
+#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
#, c-format
msgid "Cannot attach file %s: %s"
msgstr "无法附加文件 %s:%s"
#: ../composer/e-msg-composer-attachment.c:195
#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
+#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
#, c-format
msgid "Cannot attach file %s: not a regular file"
msgstr "无法附加文件 %s:不是普通文件"
-#: ../composer/e-msg-composer-hdrs.c:557
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "附件属性"
+
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr "文件名:"
+
+#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "MIME 类型:"
+
+#: ../composer/e-msg-composer-hdrs.c:570
msgid "Posting destination"
msgstr "投递目的"
-#: ../composer/e-msg-composer-hdrs.c:558
+#: ../composer/e-msg-composer-hdrs.c:571
msgid "Choose folders to post the message to."
msgstr "选择要将信件投递到哪个文件夹。"
-#: ../composer/e-msg-composer-hdrs.c:589
+#: ../composer/e-msg-composer-hdrs.c:603
msgid "Click here for the address book"
msgstr "单击此处以使用地址簿"
@@ -9960,45 +10032,45 @@ msgstr "单击此处以使用地址簿"
#. * because that causes from_changed to be called, which
#. * expects the reply_to fields to be initialized.
#.
-#: ../composer/e-msg-composer-hdrs.c:619
+#: ../composer/e-msg-composer-hdrs.c:635
msgid "_Reply-To:"
msgstr "回复到(_R):"
#.
#. * From
#.
-#: ../composer/e-msg-composer-hdrs.c:626
+#: ../composer/e-msg-composer-hdrs.c:642
msgid "Fr_om:"
msgstr "发件人(_O):"
#.
#. * Subject
#.
-#: ../composer/e-msg-composer-hdrs.c:633
+#: ../composer/e-msg-composer-hdrs.c:649
msgid "S_ubject:"
msgstr "主题(_U):"
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:658
msgid "_To:"
msgstr "收信人(_T):"
-#: ../composer/e-msg-composer-hdrs.c:643
+#: ../composer/e-msg-composer-hdrs.c:659
msgid "Enter the recipients of the message"
msgstr "输入信件的收件人"
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:662
msgid "_Cc:"
msgstr "抄送(_C):"
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:663
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "输入将接收该信件副本的收件人地址"
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:666
msgid "_Bcc:"
msgstr "暗送(_B):"
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:667
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -10007,15 +10079,15 @@ msgstr "输入将接收该信件副本,但不出现在收件人列表中的收
#.
#. * Post-To
#.
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:674
msgid "_Post To:"
msgstr "投递到(_P):"
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:679
msgid "Click here to select folders to post to"
msgstr "单击此处以选择要投递到的文件夹"
-#: ../composer/e-msg-composer-hdrs.c:669
+#: ../composer/e-msg-composer-hdrs.c:684
msgid "Post To:"
msgstr "投递到:"
@@ -10023,67 +10095,67 @@ msgstr "投递到:"
msgid "A_ttach"
msgstr "附件(_T)"
-#: ../composer/e-msg-composer-select-file.c:239
+#: ../composer/e-msg-composer-select-file.c:243
msgid "Insert Attachment"
msgstr "插入附件"
-#: ../composer/e-msg-composer.c:828
+#: ../composer/e-msg-composer.c:827
msgid ""
"Cannot sign outgoing message: No signing certificate set for this account"
msgstr "无法对寄出的信件签名:未对此账户设置签名证书"
-#: ../composer/e-msg-composer.c:835
+#: ../composer/e-msg-composer.c:834
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
msgstr "无法对寄出的信件加密:未对此账户设置加密证书"
-#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
+#: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
msgid "Hide _Attachment Bar"
msgstr "隐藏附件栏(_A)"
-#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
-#: ../composer/e-msg-composer.c:3865
+#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
+#: ../composer/e-msg-composer.c:3897
msgid "Show _Attachment Bar"
msgstr "显示附件栏(_A)"
-#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
+#: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
#: ../plugins/mail-remote/e-corba-utils.c:135
msgid "Unknown reason"
msgstr "未知原因"
-#: ../composer/e-msg-composer.c:1402
+#: ../composer/e-msg-composer.c:1401
msgid "Could not open file"
msgstr "无法打开文件"
-#: ../composer/e-msg-composer.c:1410
+#: ../composer/e-msg-composer.c:1409
msgid "Unable to retrieve message from editor"
msgstr "无法从编辑器获取信件"
-#: ../composer/e-msg-composer.c:1689
+#: ../composer/e-msg-composer.c:1688
msgid "Untitled Message"
msgstr "无标题信件"
#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1724
+#: ../composer/e-msg-composer.c:1723
msgid "Open File"
msgstr "打开文件"
-#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2173 ../mail/em-account-editor.c:606
#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
msgid "Autogenerated"
msgstr "自动生成的"
-#: ../composer/e-msg-composer.c:2254
+#: ../composer/e-msg-composer.c:2276
msgid "Si_gnature:"
msgstr "签名(_G):"
-#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
-#: ../composer/e-msg-composer.c:3750
+#: ../composer/e-msg-composer.c:2544 ../composer/e-msg-composer.c:3779
+#: ../composer/e-msg-composer.c:3782
msgid "Compose Message"
msgstr "撰写新邮件"
-#: ../composer/e-msg-composer.c:4974
+#: ../composer/e-msg-composer.c:5006
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -10221,7 +10293,7 @@ msgstr "保存信件(_S)"
#: ../data/evolution.desktop.in.in.h:1
#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:515
+#: ../shell/main.c:522
msgid "Evolution"
msgstr "Evolution"
@@ -10289,18 +10361,14 @@ msgid "Yes, Change Status"
msgstr "是,更改状态"
#: ../designs/read_receipts/read.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../designs/read_receipts/read.glade.h:2
msgid "<b>Receiving Email</b>"
msgstr "<b>接收电子邮件</b>"
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:2
msgid "<b>Sending Email:</b>"
msgstr "<b>发送电子邮件:</b>"
-#: ../designs/read_receipts/read.glade.h:4
+#: ../designs/read_receipts/read.glade.h:3
msgid ""
"<small>This page allows you to choose if you want to be notified via a read "
"receipt when a message you\n"
@@ -10310,37 +10378,37 @@ msgstr ""
"<small>此页面允许您选择是否要对您发出的信件是用阅读收条进行通知,\n"
"以及指定在别人请求您的阅读收条时 Evolution 应该怎么做。</small>"
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:5
msgid "Always send back a read receipt"
msgstr "总是发回阅读收条"
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:6
msgid "Ask me if I want to send back a read receipt"
msgstr "询问我是否想要发回阅读收条"
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:7
msgid "Never send back a read receipt"
msgstr "从不发回阅读收条"
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:8
msgid "Read Receipts"
msgstr "阅读收条"
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:9
msgid "Request a read receipt for all messages I send"
msgstr "我发出的所有信件都要求阅读收条"
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:10
msgid "Unless the message is sent to a mailing list, and not to me personally"
msgstr "除非信件发送给邮件列表,或者是给我自己发的"
-#: ../designs/read_receipts/read.glade.h:12
+#: ../designs/read_receipts/read.glade.h:11
msgid ""
"When you receive an email with a read receipt request, what should Evolution "
"do?"
msgstr "当您收到请求阅读收条的邮件,Evolution 应该做什么?"
-#: ../e-util/e-dialog-utils.c:281
+#: ../e-util/e-dialog-utils.c:283
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -10348,28 +10416,28 @@ msgstr ""
"指定名称的文件已经存在。\n"
"覆盖它?"
-#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
msgid "Overwrite file?"
msgstr "覆盖文件吗?"
-#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
msgid "Evolution Error"
msgstr "Evolution 错误"
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
+#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
msgid "Evolution Warning"
msgstr "Evolution 警告"
-#: ../e-util/e-error.c:124
+#: ../e-util/e-error.c:126
msgid "Evolution Information"
msgstr "Evolution 信息"
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:128
msgid "Evolution Query"
msgstr "Evolution 查询"
#. setup a dummy error
-#: ../e-util/e-error.c:443
+#: ../e-util/e-error.c:454
#, c-format
msgid "Internal error, unknown error '%s' requested"
msgstr "内部错误,请求了未知的错误“%s”"
@@ -10457,24 +10525,24 @@ msgstr "%Y-%m-%d"
msgid "Select a time to compare against"
msgstr "选择用于比较的时间"
-#: ../filter/filter-file.c:289
+#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
msgid "Choose a file"
msgstr "选择文件"
#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
+#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
msgid "Important"
msgstr "重要"
#. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
-#: ../mail/mail-config.glade.h:146
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:145
msgid "To Do"
msgstr "待办"
#. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:96
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
+#: ../mail/mail-config.glade.h:95
msgid "Later"
msgstr "稍候"
@@ -10523,11 +10591,11 @@ msgid "Include threads"
msgstr "包含线索"
#: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:311
+#: ../mail/em-utils.c:328
msgid "Incoming"
msgstr "接收"
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
msgid "Outgoing"
msgstr "寄出"
@@ -10617,7 +10685,7 @@ msgstr "过去"
msgid "months"
msgstr "月"
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
msgid "seconds"
msgstr "秒"
@@ -10686,22 +10754,22 @@ msgstr "Evolution 邮件撰写控件"
msgid "Evolution Mail preferences control"
msgstr "Evolution 邮件首选项控件"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
#: ../mail/importers/elm-importer.c:341
#: ../mail/importers/netscape-importer.c:1903
#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
msgid "Mail"
msgstr "邮件"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:531
+#: ../mail/em-account-prefs.c:532
msgid "Mail Accounts"
msgstr "邮件账户"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:98
msgid "Mail Preferences"
msgstr "邮件首选项"
@@ -10727,7 +10795,7 @@ msgstr ""
"并选中复选框表明您接受该协议\n"
#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:496
+#: ../mail/em-vfolder-rule.c:511
msgid "Select Folder"
msgstr "选择文件夹"
@@ -10735,11 +10803,11 @@ msgstr "选择文件夹"
msgid "Ask for each message"
msgstr "每封信都询问"
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
msgid "Identity"
msgstr "标识"
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
msgid "Receiving Email"
msgstr "接收电子邮件"
@@ -10747,11 +10815,11 @@ msgstr "接收电子邮件"
msgid "Automatically check for _new mail every"
msgstr "自动检查新邮件的间隔(_N)"
-#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:129
msgid "Sending Email"
msgstr "发送电子邮件"
-#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:67
msgid "Defaults"
msgstr "默认"
@@ -10770,11 +10838,11 @@ msgstr "接收选项"
msgid "Checking for New Mail"
msgstr "检查新邮件"
-#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:33
msgid "Account Editor"
msgstr "账户编辑器"
-#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2799 ../mail/mail-config.glade.h:79
msgid "Evolution Account Assistant"
msgstr "Evolution 账户助手"
@@ -10794,22 +10862,22 @@ msgid "[Default]"
msgstr "[默认]"
#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
#: ../plugins/plugin-manager/plugin-manager.c:205
#: ../plugins/publish-calendar/publish-calendar.c:493
msgid "Enabled"
msgstr "已启用"
-#: ../mail/em-account-prefs.c:524
+#: ../mail/em-account-prefs.c:525
msgid "Account name"
msgstr "账户名"
-#: ../mail/em-account-prefs.c:526
+#: ../mail/em-account-prefs.c:527
msgid "Protocol"
msgstr "协议"
#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:967
+#: ../mail/mail-config.c:999
msgid "Unnamed"
msgstr "未命名"
@@ -10885,6 +10953,12 @@ msgstr "接收日期"
msgid "Date sent"
msgstr "发送日期"
+#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
+#: ../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 "删除"
+
#: ../mail/em-filter-i18n.h:12
msgid "Deleted"
msgstr "已删除"
@@ -10973,7 +11047,7 @@ msgstr "不是"
msgid "is not Flagged"
msgstr "未标志"
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
#: ../ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "垃圾"
@@ -10982,7 +11056,7 @@ msgstr "垃圾"
msgid "Junk Test"
msgstr "垃圾测试"
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
msgid "Label"
msgstr "标签"
@@ -11026,7 +11100,7 @@ msgstr "播放声音"
msgid "Read"
msgstr "已读"
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
msgid "Recipients"
msgstr "收件人"
@@ -11054,11 +11128,11 @@ msgstr "返回小于"
msgid "Run Program"
msgstr "运行程序"
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
msgid "Score"
msgstr "分数"
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
msgid "Sender"
msgstr "发送者"
@@ -11090,11 +11164,11 @@ msgstr "开始于"
msgid "Stop Processing"
msgstr "停止处理"
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
#: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.glade.h:6
#: ../smime/lib/e-cert.c:1132
msgid "Subject"
msgstr "主题"
@@ -11108,10 +11182,42 @@ msgstr "取消状态"
msgid "<b>Then</b>"
msgstr "<b>则</b>"
-#: ../mail/em-folder-browser.c:144
+#: ../mail/em-folder-browser.c:162
msgid "C_reate Search Folder From Search..."
msgstr "从头创建搜索文件夹(_R)..."
+#: ../mail/em-folder-browser.c:183
+msgid "All Messages"
+msgstr "全部信件"
+
+#: ../mail/em-folder-browser.c:184
+msgid "Unread Messages"
+msgstr "未读信件"
+
+#: ../mail/em-folder-browser.c:186
+msgid "No Label"
+msgstr "无标签"
+
+#: ../mail/em-folder-browser.c:193
+msgid "Read Messages"
+msgstr "已读信件"
+
+#: ../mail/em-folder-browser.c:194
+msgid "Recent Messages"
+msgstr "最近信件"
+
+#: ../mail/em-folder-browser.c:195
+msgid "Last 5 Days Messages"
+msgstr "前五天的信件"
+
+#: ../mail/em-folder-browser.c:196
+msgid "Messages with Attachments"
+msgstr "有附件的信件"
+
+#: ../mail/em-folder-browser.c:197
+msgid "Messages Not Junk"
+msgstr "不是垃圾邮件"
+
#. TODO: can this be done in a loop?
#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
#: ../mail/em-folder-properties.c:150
@@ -11126,7 +11232,7 @@ msgid_plural "Unread messages:"
msgstr[0] "未读信件数:"
#: ../mail/em-folder-properties.c:316
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.glade.h:2
msgid "Folder Properties"
msgstr "文件夹属性"
@@ -11143,7 +11249,7 @@ msgid "Folder _name:"
msgstr "文件夹名称(_N):"
#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
-#: ../mail/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
+#: ../mail/mail-vfolder.c:911 ../mail/mail-vfolder.c:984
msgid "Search Folders"
msgstr "搜索文件夹"
@@ -11158,7 +11264,7 @@ msgstr "草稿"
#. translators: standard local mailbox names
#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:598
+#: ../plugins/exchange-operations/exchange-folder.c:587
msgid "Inbox"
msgstr "收件箱"
@@ -11174,77 +11280,77 @@ msgstr "已发箱"
msgid "Loading..."
msgstr "正在装入..."
-#: ../mail/em-folder-tree.c:694
+#: ../mail/em-folder-tree.c:701
msgid "Mail Folder Tree"
msgstr "邮件文件夹树"
-#: ../mail/em-folder-tree.c:854
+#: ../mail/em-folder-tree.c:861
#, c-format
msgid "Moving folder %s"
msgstr "移动文件夹“%s”"
-#: ../mail/em-folder-tree.c:856
+#: ../mail/em-folder-tree.c:863
#, c-format
msgid "Copying folder %s"
msgstr "复制文件夹 %s"
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
+#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1804
#, c-format
msgid "Moving messages into folder %s"
msgstr "把信件移至文件夹 %s"
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
+#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1806
#, c-format
msgid "Copying messages into folder %s"
msgstr "把信件复制到文件夹 %s"
-#: ../mail/em-folder-tree.c:881
+#: ../mail/em-folder-tree.c:888
msgid "Cannot drop message(s) into toplevel store"
msgstr "无法将信件放到顶级文件夹存储"
-#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
msgid "_Copy to Folder"
msgstr "复制到文件夹(_C)"
-#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
msgid "_Move to Folder"
msgstr "移至文件夹(_M)"
-#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "在“%s”中扫描文件夹"
-#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
+#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
#: ../ui/evolution-mail-messagedisplay.xml.h:8
#: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
msgid "_View"
msgstr "查看(_V)"
-#: ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-tree.c:2050
msgid "Open in _New Window"
msgstr "在新窗口中打开(_N)"
-#: ../mail/em-folder-tree.c:2047
+#: ../mail/em-folder-tree.c:2054
msgid "_Copy..."
msgstr "复制(_C)..."
-#: ../mail/em-folder-tree.c:2048
+#: ../mail/em-folder-tree.c:2055
msgid "_Move..."
msgstr "移动(_M)..."
#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2052
+#: ../mail/em-folder-tree.c:2059
msgid "_New Folder..."
msgstr "新建文件夹(_N)..."
-#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
msgid "_Rename..."
msgstr "重命名(_R)..."
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
msgid "_Empty Trash"
msgstr "清空回收站(_E)"
@@ -11253,13 +11359,14 @@ msgstr "清空回收站(_E)"
msgid "Copying `%s' to `%s'"
msgstr "把“%s”复制到 %s"
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
-#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
+#: ../mail/em-folder-view.c:1023
+#: ../mail/importers/evolution-mbox-importer.c:86
#: ../mail/importers/evolution-outlook-importer.c:139
msgid "Select folder"
msgstr "选择文件夹"
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
msgid "C_opy"
msgstr "复制(_O)"
@@ -11281,208 +11388,218 @@ msgstr "创建文件夹"
msgid "Specify where to create the folder:"
msgstr "指定在哪里创建文件夹:"
-#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
-#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1118 ../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:107
+#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
msgid "_Edit as New Message..."
msgstr "作为新信件进行编辑(_E)..."
-#: ../mail/em-folder-view.c:1092
+#: ../mail/em-folder-view.c:1127
msgid "U_ndelete"
msgstr "取消删除(_N)"
-#: ../mail/em-folder-view.c:1093
+#: ../mail/em-folder-view.c:1128
msgid "_Move to Folder..."
msgstr "移至文件夹(_M)..."
-#: ../mail/em-folder-view.c:1094
+#: ../mail/em-folder-view.c:1129
msgid "_Copy to Folder..."
msgstr "复制到文件夹(_C)..."
-#: ../mail/em-folder-view.c:1097
+#: ../mail/em-folder-view.c:1132
msgid "Mar_k as Read"
msgstr "标记为已读(_K)"
-#: ../mail/em-folder-view.c:1098
+#: ../mail/em-folder-view.c:1133
msgid "Mark as _Unread"
msgstr "标记为未读(_U)"
-#: ../mail/em-folder-view.c:1099
+#: ../mail/em-folder-view.c:1134
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
-#: ../mail/em-folder-view.c:1100
-msgid "_Mark as Unimportant"
-msgstr "标记为不重要(_M)"
+#: ../mail/em-folder-view.c:1135
+msgid "Mark as Un_important"
+msgstr "标记为不重要(_I)"
-#: ../mail/em-folder-view.c:1101
+#: ../mail/em-folder-view.c:1136
msgid "Mark as _Junk"
msgstr "标记为垃圾(_J)"
-#: ../mail/em-folder-view.c:1102
+#: ../mail/em-folder-view.c:1137
msgid "Mark as _Not Junk"
msgstr "标记为非垃圾(_N)"
-#: ../mail/em-folder-view.c:1103
+#: ../mail/em-folder-view.c:1138
msgid "Mark for Follo_w Up..."
msgstr "标记为跟随(_W)..."
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-folder-view.c:1140
msgid "_Label"
msgstr "标签(_L)"
-#: ../mail/em-folder-view.c:1106
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../mail/em-folder-view.c:1141 ../widgets/misc/e-dateedit.c:475
msgid "_None"
msgstr "无(_N)"
-#: ../mail/em-folder-view.c:1111
+#: ../mail/em-folder-view.c:1146
msgid "Fla_g Completed"
msgstr "已完成标志(_G)"
-#: ../mail/em-folder-view.c:1112
+#: ../mail/em-folder-view.c:1147
msgid "Cl_ear Flag"
msgstr "清除标志(_E)"
-#: ../mail/em-folder-view.c:1115
+#: ../mail/em-folder-view.c:1150
msgid "Crea_te Rule From Message"
msgstr "根据信件创建规则(_T)"
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1151
msgid "Search Folder from _Subject"
msgstr "基于主题的搜索文件夹(_S)"
-#: ../mail/em-folder-view.c:1117
+#: ../mail/em-folder-view.c:1152
msgid "Search Folder from Se_nder"
msgstr "基于发件人的搜索文件夹(_N)"
-#: ../mail/em-folder-view.c:1118
+#: ../mail/em-folder-view.c:1153
msgid "Search Folder from _Recipients"
msgstr "基于收件人的搜索文件夹(_R)"
-#: ../mail/em-folder-view.c:1119
+#: ../mail/em-folder-view.c:1154
msgid "Search Folder from Mailing _List"
msgstr "基于邮件列表的搜索文件夹(_L)"
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1158
msgid "Filter on Sub_ject"
msgstr "基于主题过滤(_J)"
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1159
msgid "Filter on Sen_der"
msgstr "基于发件人过滤(_D)"
-#: ../mail/em-folder-view.c:1125
+#: ../mail/em-folder-view.c:1160
msgid "Filter on Re_cipients"
msgstr "基于收件人过滤(_C)"
-#: ../mail/em-folder-view.c:1126
+#: ../mail/em-folder-view.c:1161
msgid "Filter on _Mailing List"
msgstr "基于邮件列表过滤(_M)"
#. default charset used in mail view
-#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
+#: ../mail/em-folder-view.c:2002 ../mail/em-folder-view.c:2046
msgid "Default"
msgstr "默认"
-#: ../mail/em-folder-view.c:2110
+#: ../mail/em-folder-view.c:2145
#: ../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:2266
+#: ../mail/em-folder-view.c:2301
msgid "Unable to retrieve message"
msgstr "无法获取信件"
-#: ../mail/em-folder-view.c:2459
-msgid "_Copy Link Location"
-msgstr "复制链接位置(_C)"
-
-#: ../mail/em-folder-view.c:2461
+#: ../mail/em-folder-view.c:2499
msgid "Create _Search Folder"
msgstr "创建搜索文件夹(_S)"
-#: ../mail/em-folder-view.c:2462
+#: ../mail/em-folder-view.c:2500
msgid "_From this Address"
msgstr "自此地址(_F)"
-#: ../mail/em-folder-view.c:2463
+#: ../mail/em-folder-view.c:2501
msgid "_To this Address"
msgstr "到此地址(_T)"
-#: ../mail/em-folder-view.c:2817
+#: ../mail/em-folder-view.c:2855
#, c-format
msgid "Click to mail %s"
msgstr "单击以给 %s 发送邮件"
+#: ../mail/em-folder-view.c:2860
+msgid "Click to hide/unhide addresses"
+msgstr "单击可隐藏/显示地址"
+
#. message-search popup match count string
-#: ../mail/em-format-html-display.c:496
+#: ../mail/em-format-html-display.c:502
#, c-format
msgid "Matches: %d"
msgstr "匹配:%d"
-#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:645
+msgid "Find:"
+msgstr "查找:"
+
+#: ../mail/em-format-html-display.c:676
+msgid "M_atch case"
+msgstr "匹配大小写(_A)"
+
+#: ../mail/em-format-html-display.c:924 ../mail/em-format-html.c:617
msgid "Unsigned"
msgstr "未签名"
-#: ../mail/em-format-html-display.c:756
+#: ../mail/em-format-html-display.c:924
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
msgstr "此信件未签名。无法保证这封信是可信的。"
-#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:618
msgid "Valid signature"
msgstr "有效签名"
-#: ../mail/em-format-html-display.c:757
+#: ../mail/em-format-html-display.c:925
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:758 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:619
msgid "Invalid signature"
msgstr "无效签名"
-#: ../mail/em-format-html-display.c:758
+#: ../mail/em-format-html-display.c:926
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
msgstr "无法校验这封信的签名,可能在传送的过程中邮件被篡改了。"
-#: ../mail/em-format-html-display.c:759
+#: ../mail/em-format-html-display.c:927
msgid "Valid signature, cannot verify sender"
msgstr "签名有效,无法校验发送者"
-#: ../mail/em-format-html-display.c:759
+#: ../mail/em-format-html-display.c:927
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:765 ../mail/em-format-html.c:616
+#: ../mail/em-format-html-display.c:933 ../mail/em-format-html.c:626
msgid "Unencrypted"
msgstr "未加密"
-#: ../mail/em-format-html-display.c:765
+#: ../mail/em-format-html-display.c:933
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
-#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:627
msgid "Encrypted, weak"
msgstr "弱加密"
-#: ../mail/em-format-html-display.c:766
+#: ../mail/em-format-html-display.c:934
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 "
@@ -11491,21 +11608,21 @@ msgstr ""
"这封信已加密,但使用的是弱加密算法。如果外人想要查看这封信的内容,可能要花一"
"定时间进行暴力破解,这很困难但并不是不可能。"
-#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:628
msgid "Encrypted"
msgstr "加密"
-#: ../mail/em-format-html-display.c:767
+#: ../mail/em-format-html-display.c:935
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:768 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:629
msgid "Encrypted, strong"
msgstr "强加密"
-#: ../mail/em-format-html-display.c:768
+#: ../mail/em-format-html-display.c:936
msgid ""
"This message is encrypted, with a strong encryption algorithm. It would be "
"very difficult for an outsider to view the content of this message in a "
@@ -11514,71 +11631,71 @@ msgstr ""
"这封信已加密,且使用的是强加密算法。如果外人想要查看这封信的内容,可能要花大"
"量时间进行暴力破解,这十分困难。"
-#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1037 ../smime/gui/smime-ui.glade.h:48
msgid "_View Certificate"
msgstr "查看证书(_V)"
-#: ../mail/em-format-html-display.c:884
+#: ../mail/em-format-html-display.c:1052
msgid "This certificate is not viewable"
msgstr "此证书不可查看"
-#: ../mail/em-format-html-display.c:1174
+#: ../mail/em-format-html-display.c:1371
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "%Y年%m月%d日%A,%H:%M完成"
-#: ../mail/em-format-html-display.c:1182
+#: ../mail/em-format-html-display.c:1379
msgid "Overdue:"
msgstr "延期:"
-#: ../mail/em-format-html-display.c:1185
+#: ../mail/em-format-html-display.c:1382
msgid "by %B %d, %Y, %l:%M %p"
msgstr "到 %m月%d日%A,%H:%M"
-#: ../mail/em-format-html-display.c:1245
+#: ../mail/em-format-html-display.c:1442
msgid "_View Inline"
msgstr "嵌入视图(_V)"
-#: ../mail/em-format-html-display.c:1246
+#: ../mail/em-format-html-display.c:1443
msgid "_Hide"
msgstr "隐藏(_H)"
-#: ../mail/em-format-html-display.c:1247
+#: ../mail/em-format-html-display.c:1444
msgid "_Fit to Width"
msgstr "适合宽度(_F)"
-#: ../mail/em-format-html-display.c:1248
+#: ../mail/em-format-html-display.c:1445
msgid "Show _Original Size"
msgstr "显示原始大小(_O)"
-#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1864 ../mail/mail-config.glade.h:44
#: ../mail/message-list.etspec.h:1
msgid "Attachment"
msgstr "附件"
-#: ../mail/em-format-html-display.c:1874
+#: ../mail/em-format-html-display.c:2071
msgid "Select folder to save all attachments..."
msgstr "选择保存全部附件的文件夹..."
-#: ../mail/em-format-html-display.c:1921
+#: ../mail/em-format-html-display.c:2118
msgid "_Save Selected..."
msgstr "保存所选(_S)..."
#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1988
+#: ../mail/em-format-html-display.c:2185
#, c-format
-msgid "%d attachme_nt"
-msgid_plural "%d attachme_nts"
-msgstr[0] "%d 个附件(_N)"
+msgid "%d at_tachment"
+msgid_plural "%d at_tachments"
+msgstr[0] "%d 个附件(_T)"
-#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
+#: ../mail/em-format-html-display.c:2192 ../mail/em-format-html-display.c:2268
msgid "S_ave"
msgstr "保存(_A)"
-#: ../mail/em-format-html-display.c:2006
+#: ../mail/em-format-html-display.c:2203
msgid "S_ave All"
msgstr "全部保存(_A)"
-#: ../mail/em-format-html-display.c:2067
+#: ../mail/em-format-html-display.c:2264
msgid "No Attachment"
msgstr "无附件"
@@ -11592,94 +11709,94 @@ msgstr "第 %d 页,共 %d 页"
msgid "Retrieving `%s'"
msgstr "收取“%s”"
-#: ../mail/em-format-html.c:610
+#: ../mail/em-format-html.c:620
msgid "Valid signature but cannot verify sender"
msgstr "签名有效但是无法校验发送者"
-#: ../mail/em-format-html.c:881
+#: ../mail/em-format-html.c:891
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
-#: ../mail/em-format-html.c:911
+#: ../mail/em-format-html.c:921
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:932
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:934
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
-#: ../mail/em-format-html.c:945
+#: ../mail/em-format-html.c:955
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
-#: ../mail/em-format-html.c:956
+#: ../mail/em-format-html.c:966
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
-#: ../mail/em-format-html.c:1183
+#: ../mail/em-format-html.c:1193
msgid "Formatting message"
msgstr "格式化信件"
-#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
msgid "From"
msgstr "发件人"
-#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
msgid "Reply-To"
msgstr "回复至"
-#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:14
+#: ../mail/message-list.etspec.h:18
msgid "To"
msgstr "收件人"
-#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
msgid "Cc"
msgstr "抄送"
-#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
msgid "Bcc"
msgstr "密件抄送"
#. pseudo-header
-#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1001
+#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1024
msgid "Mailer"
msgstr "邮件程序"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1615
+#: ../mail/em-format-html.c:1690
msgid "<I> (%a, %R %Z)</I>"
msgstr "<I> (%A,%R %Z)</I>"
#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1618
+#: ../mail/em-format-html.c:1693
msgid "<I> (%R %Z)</I>"
msgstr "<I> (%R %Z)</I>"
-#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
#: ../widgets/misc/e-dateedit.c:363
msgid "Date"
msgstr "日期"
-#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
#: ../mail/em-mailer-prefs.c:92
msgid "Newsgroups"
msgstr "新闻组"
@@ -11729,7 +11846,7 @@ msgstr "每周一次"
msgid "Once per month"
msgstr "每月一次"
-#: ../mail/em-migrate.c:1209
+#: ../mail/em-migrate.c:1210
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
"since Evolution 1.x.\n"
@@ -11740,47 +11857,47 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../mail/em-migrate.c:1648
+#: ../mail/em-migrate.c:1649
#, c-format
msgid "Unable to create new folder `%s': %s"
msgstr "无法创建新文件夹“%s”:%s"
-#: ../mail/em-migrate.c:1674
+#: ../mail/em-migrate.c:1675
#, c-format
msgid "Unable to copy folder `%s' to `%s': %s"
msgstr "无法将文件夹“%s”复制为“%s”:%s"
-#: ../mail/em-migrate.c:1859
+#: ../mail/em-migrate.c:1860
#, c-format
msgid "Unable to scan for existing mailboxes at `%s': %s"
msgstr "无法扫描位于“%s”的已有邮箱:%s"
-#: ../mail/em-migrate.c:2063
+#: ../mail/em-migrate.c:2064
#, c-format
msgid "Unable to open old POP keep-on-server data `%s': %s"
msgstr "无法打开旧的 POP 保留在服务器上的数据“%s”:%s"
-#: ../mail/em-migrate.c:2077
+#: ../mail/em-migrate.c:2078
#, c-format
msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
msgstr "无法创建 POP3 保留在服务器上的数据目录“%s”:%s"
-#: ../mail/em-migrate.c:2106
+#: ../mail/em-migrate.c:2107
#, c-format
msgid "Unable to copy POP3 keep-on-server data `%s': %s"
msgstr "无法复制 POP3 在服务器上保留的数据“%s”:%s"
-#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
+#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
#, c-format
msgid "Failed to create local mail storage `%s': %s"
msgstr "创建本地邮件存储“%s”失败:%s"
-#: ../mail/em-migrate.c:2712
+#: ../mail/em-migrate.c:2713
#, c-format
msgid "Unable to create local mail folders at `%s': %s"
msgstr "无法在“%s”创建本地邮件文件夹:%s"
-#: ../mail/em-migrate.c:2731
+#: ../mail/em-migrate.c:2732
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
@@ -11797,10 +11914,6 @@ msgstr "回复发件人(_R)"
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
-#: ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "在浏览器中打开链接(_O)"
-
#: ../mail/em-popup.c:621
msgid "_Send New Message To..."
msgstr "把新信发送到(_S)..."
@@ -11813,45 +11926,45 @@ msgstr "添加到地址簿(_A)"
msgid "This store does not support subscriptions, or they are not enabled."
msgstr "此存储不支持订阅,或订阅未启用。"
-#: ../mail/em-subscribe-editor.c:644
+#: ../mail/em-subscribe-editor.c:645
msgid "Subscribed"
msgstr "已订阅"
-#: ../mail/em-subscribe-editor.c:648
+#: ../mail/em-subscribe-editor.c:649
msgid "Folder"
msgstr "文件夹"
#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:869
+#: ../mail/em-subscribe-editor.c:870
msgid "Please select a server."
msgstr "请选择服务器。"
-#: ../mail/em-subscribe-editor.c:890
+#: ../mail/em-subscribe-editor.c:891
msgid "No server has been selected"
msgstr "没有选中服务器"
-#: ../mail/em-utils.c:124
+#: ../mail/em-utils.c:141
msgid "Do not show this message again."
msgstr "不再显示此信息。"
-#: ../mail/em-utils.c:319
+#: ../mail/em-utils.c:336
msgid "Message Filters"
msgstr "邮件过滤器"
-#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
+#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
msgid "message"
msgstr "信件"
-#: ../mail/em-utils.c:668
+#: ../mail/em-utils.c:688
msgid "Save Message..."
msgstr "保存信件..."
-#: ../mail/em-utils.c:717
+#: ../mail/em-utils.c:737
msgid "Add address"
msgstr "添加地址"
#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1201
+#: ../mail/em-utils.c:1221
#, c-format
msgid "Messages from %s"
msgstr "来自 %s 的信件"
@@ -11860,7 +11973,7 @@ msgstr "来自 %s 的信件"
msgid "Search _Folders"
msgstr "搜索文件夹(_F)"
-#: ../mail/em-vfolder-rule.c:576
+#: ../mail/em-vfolder-rule.c:591
msgid "Search Folder source"
msgstr "搜索文件夹来源"
@@ -11893,88 +12006,116 @@ msgid "Composer Window default width"
msgstr "编写窗口的默认宽度"
#: ../mail/evolution-mail.schemas.in.in.h:8
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:9
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:10
msgid "Default charset in which to compose messages"
msgstr "编写信件的默认字符集"
-#: ../mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.in.h:11
msgid "Default charset in which to compose messages."
msgstr "编写信件的默认字符集。"
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.in.h:12
msgid "Default charset in which to display messages"
msgstr "显示信件的默认字符集"
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:13
msgid "Default charset in which to display messages."
msgstr "显示信件的默认字符集。"
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:14
msgid "Default forward style"
msgstr "默认转发方式"
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:15
msgid "Default height of the Composer Window"
msgstr "撰写窗口的默认高度"
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:16
msgid "Default height of the Message Window"
msgstr "信件窗口的默认高度"
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:17
msgid "Default height of the Subscribe dialog"
msgstr "订阅对话框的默认高度"
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:18
msgid "Default reply style"
msgstr "默认回复样式"
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:19
msgid "Default width of the Composer Window"
msgstr "撰写窗口的默认宽度"
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:20
msgid "Default width of the Message Window"
msgstr "信件窗口的默认宽度"
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:21
msgid "Default width of the Subscribe dialog"
msgstr "订阅对话框的默认宽度"
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:22
msgid "Draw spelling error indicators on words as you type."
msgstr "在您打字的时候就显示拼写错误标识。"
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:23
msgid "Empty Trash folders on exit"
msgstr "退出时清空回收站"
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:24
msgid "Empty all Trash folders when exiting Evolution."
msgstr "退出 Evolution 时清空回收站"
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:25
msgid "Enable caret mode, so that you can see a cursor when reading mail."
msgstr "启用光标模式,这样您在读取邮件时就能看到光标了。"
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:26
+msgid "Enable or disable type ahead search feature"
+msgstr "启用或禁用自动前进功能"
+
+#: ../mail/evolution-mail.schemas.in.in.h:27
+msgid ""
+"Enable side bar search feature so that you can start interactive searching "
+"by typing in the text. Use is that you can easily find a folder in that side "
+"bar by just typing the folder name and the selection jumps automatically to "
+"that folder."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:28
msgid "Enable/disable caret mode"
msgstr "启用/禁用光标模式"
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:29
msgid "Height of the message-list pane"
msgstr "信件列表面板的高度"
-#: ../mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.in.h:30
msgid "Height of the message-list pane."
msgstr "信件列表面板的高度。"
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.in.h:31
msgid ""
"If a user tries to open 10 or more messages at one time, ask the user if "
"they really want to do it."
msgstr "如果用户试图一次打开的信件大于等于十封,将会询问用户是否真的要这么做。"
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:32
+msgid ""
+"If the \"Preview\" pane is on, then show it side-by-side rather than "
+"vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:33
msgid ""
"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
"any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -11984,23 +12125,27 @@ msgstr ""
"MIME 类型在 GNOME 的 MIME 类型数据库中映射的 bonobo 组件查看器将被用来显示其"
"内容。"
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:34
+msgid "It disables/enables the prompt while marking multiple messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:35
msgid "Last time empty trash was run"
msgstr "上次清空回收站的时间"
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:36
msgid "List of Labels and their associated colors"
msgstr "标签及其对应颜色的列表"
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:37
msgid "List of accepted licenses"
msgstr "列出接受的许可"
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:38
msgid "List of accounts"
msgstr "账户列表"
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:39
msgid ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12008,11 +12153,11 @@ msgstr ""
"列出了 Evolution 邮件组件已知的账户。此列表包含了相对于 /apps/evolution/mail/"
"accounts 的子目录命名字符串。"
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:40
msgid "List of custom headers and whether they are enabled."
msgstr "自定义头及该头是否启用。"
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:41
msgid ""
"List of labels known to the mail component of Evolution. The list contains "
"strings containing name:color where color uses the HTML hex encoding."
@@ -12020,19 +12165,19 @@ msgstr ""
"列出了 Evolution 邮件组件已知的标签。列表中的字符串格式形如“名称:颜色”,其中"
"颜色使用了 HTML 十六进制编码方式。"
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:42
msgid "List of mime types to check for bonobo component viewers"
msgstr "列出要使用 bonobo 组件查看器查看的 MIME 类型"
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:43
msgid "List of protocol names whose license has been accepted."
msgstr "列出接受协议的协议名称。"
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:44
msgid "Load images for HTML messages over http"
msgstr "在 HTML 信件中装入 HTTP 图像"
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:45
msgid ""
"Load images for HTML messages over http(s). Possible values are: 0 - Never "
"load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12041,178 +12186,198 @@ msgstr ""
"在 HTML 信件中装入 http(s) 图像。可供选择的值有:0 - 决不从网上装入图像,1 - "
"如果发送者在地址簿中则装入图像,2 - 总是从网上装入图像"
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:46
msgid "Log filter actions"
msgstr "记录过滤动作"
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:47
msgid "Log filter actions to the specified log file."
msgstr "将过滤动作记录到指定日志文件。"
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:48
msgid "Logfile to log filter actions"
msgstr "记录过滤动作的日志文件"
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:49
msgid "Logfile to log filter actions."
msgstr "记录过滤动作的日志文件。"
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:50
msgid "Mark as Seen after specified timeout"
msgstr "在指定超时过后标为已看"
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:51
msgid "Mark as Seen after specified timeout."
msgstr "在指定超时过后标为已看。"
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:52
msgid "Mark citations in the message \"Preview\""
msgstr "在信件“预览”中标出引用"
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:53
msgid "Mark citations in the message \"Preview\"."
msgstr "在信件“预览”中标出引用。"
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:54
msgid "Message Window default height"
msgstr "信件窗口默认高度"
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:55
msgid "Message Window default width"
msgstr "信件窗口默认宽度"
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:56
msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
msgstr "信件显示风格(普通、全部邮件头、源代码)"
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:57
msgid "Minimum days between emptying the trash on exit"
msgstr "退出时清空回收站的最少天数"
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:58
msgid "Minimum time between emptying the trash on exit, in days."
msgstr "退出时清空回收站的最少天数。"
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:59
msgid "New Mail Notify sound file"
msgstr "新建邮件通知声音文件"
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:60
msgid "New Mail Notify type"
msgstr "新建邮件通知类型"
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:61
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:62
msgid "Prompt on empty subject"
msgstr "空主题时提示"
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:63
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr "用户视图销毁文件夹时提示。"
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:64
msgid ""
"Prompt the user when he or she tries to send a message without a Subject."
msgstr "用户视图发送没有主题的邮件时提示。"
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:65
msgid "Prompt when user expunges"
msgstr "用户销毁时提示"
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:66
msgid "Prompt when user only fills Bcc"
msgstr "用户只填入 Bcc 时提示"
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:67
msgid "Prompt when user tries to open 10 or more messages at once"
msgstr "当用户试图一次打开超过十封信时提示"
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:68
msgid ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
msgstr "当用户试图给不想接收 HTML 的联系人发送 HTML 邮件时提示。"
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:69
msgid "Prompt when user tries to send a message with no To or Cc recipients."
msgstr "当用户试图发送没有 To 或 Cc 收件人的邮件时提示。"
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:70
msgid "Prompt when user tries to send unwanted HTML"
msgstr "当用户是否发送意外的 HTML 时提示"
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:71
+msgid "Prompt while marking multiple messages"
+msgstr "标记多封信件时提示"
+
+#: ../mail/evolution-mail.schemas.in.in.h:72
msgid "Recognize links in text and replace them."
msgstr "识别文本中的链接并进行替换。"
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:73
msgid "Recognize smileys in text and replace them with images."
msgstr "识别文本中的表情,并将其替换为图像。"
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:74
msgid "Run junk test on incoming mail"
msgstr "对收到的邮件运行垃圾邮件测试"
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:75
msgid "Send HTML mail by default"
msgstr "默认以 HTML 发送邮件"
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:76
msgid "Send HTML mail by default."
msgstr "默认以 HTML 发送邮件。"
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:77
msgid "Show Animations"
msgstr "显示动画"
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:78
msgid "Show animated images as animations."
msgstr "将动画图像显示为动画。"
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:79
msgid "Show deleted messages (with a strike-through) in the message-list."
msgstr "在信件列表中显示删除了的信件(带有删除线)。"
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:80
msgid "Show deleted messages in the message-list"
msgstr "在信件列表中显示删除了的信件"
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:83
+#, fuzzy
+msgid ""
+"Show the email of the sender in the messages composite column in the message "
+"list"
+msgstr "在信件列表中显示删除了的信件"
+
+#: ../mail/evolution-mail.schemas.in.in.h:84
+#, fuzzy
+msgid "Show the sender email in the messages column in the message list"
+msgstr "在信件列表中显示删除了的信件"
+
+#: ../mail/evolution-mail.schemas.in.in.h:85
msgid "Sound file to play when new mail arrives."
msgstr "新邮件到达时要播放的声音文件。"
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:86
msgid "Specifies the type of New Mail Notification the user wishes to use."
msgstr "指定用户想要使用的新邮件通知类型。"
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:87
msgid "Spell check inline"
msgstr "内嵌拼写检查"
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:88
msgid "Subscribe dialog default height"
msgstr "订阅对话框默认高度"
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:89
msgid "Subscribe dialog default width"
msgstr "订阅对话框默认宽度"
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:90
msgid "Terminal font"
msgstr "终端字体"
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:91
msgid "The last time empty trash was run, in days since the epoch."
msgstr "上次清空回收站的时间,以 epoch 天数显示。"
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:92
msgid "The terminal font for mail display"
msgstr "邮件显示用的终端字体"
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:93
msgid "The variable width font for mail display"
msgstr "用于显示邮件的变宽字体"
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:94
msgid ""
"This key should contain a list of XML structures specifying custom headers, "
"and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12222,104 +12387,122 @@ msgstr ""
"此键应包含指定自定义邮件头的 XML 结构列表,以及是否显示这些邮件头。XML 结构的"
"格式为:&lt;启用的邮件头&gt; - 设为 enabled 则在邮件视图中显示该邮件头。"
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:95
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:96
msgid "Thread the message list."
msgstr "按线索编排信件列表。"
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:97
msgid "Thread the message-list"
msgstr "按线索编排信件列表"
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:98
msgid "Thread the message-list based on Subject"
msgstr "基于主题按线索编排信件列表"
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:99
msgid "Timeout for marking message as Seen"
msgstr "将信件标为已看的超时"
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:100
msgid "Timeout for marking message as Seen."
msgstr "将信件标为已看的超时。"
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:101
msgid "UID string of the default account."
msgstr "默认账户的 UID 字符串。"
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:102
msgid "Use Spamassassin daemon and client"
msgstr "使用垃圾克星守护程序和客户"
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:103
msgid "Use Spamassassin daemon and client (spamc/spamd)"
msgstr "使用垃圾克星守护程序和客户(spamc/spamd)"
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:104
msgid "Use custom fonts"
msgstr "使用自定义字体"
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:105
msgid "Use custom fonts for displaying mail"
msgstr "使用自定义字体显示邮件"
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:106
msgid "Use only local spam tests."
msgstr "只使用本地垃圾邮件测试。"
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:107
msgid "Use only the local spam tests (no DNS)."
msgstr "之使用本地垃圾邮件测试(无 DNS)。"
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:108
+msgid "Use side-by-side or wide layout"
+msgstr "使用并排还是宽屏布局"
+
+#: ../mail/evolution-mail.schemas.in.in.h:109
msgid "Variable width font"
msgstr "变宽字体"
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:110
msgid "View/Bcc menu item is checked"
msgstr "选中了查看/Bcc 菜单项"
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:111
msgid "View/Bcc menu item is checked."
msgstr "选中了查看/Bcc 菜单项。"
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:112
msgid "View/Cc menu item is checked"
msgstr "选中了查看/Cc 菜单项"
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:113
msgid "View/Cc menu item is checked."
msgstr "选中了查看/Cc 菜单项。"
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:114
msgid "View/From menu item is checked"
msgstr "选中了查看/From 菜单项"
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:115
msgid "View/From menu item is checked."
msgstr "选中了查看/From 菜单项。"
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:116
msgid "View/PostTo menu item is checked"
msgstr "选中了查看/PostTo 菜单项"
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:117
msgid "View/PostTo menu item is checked."
msgstr "选中了查看/PostTo 菜单项。"
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:118
msgid "View/ReplyTo menu item is checked"
msgstr "选中了查看/ReplyTo 菜单项"
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:119
msgid "View/ReplyTo menu item is checked."
msgstr "选中了查看/ReplyTo 菜单项。"
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:120
msgid ""
"Whether or not to fall back on threading by subjects when the messages do "
"not contain In-Reply-To or References headers."
msgstr "是否在信件不包含 In-Reply-To 或 References 头时强制按主题编排线索。"
+#: ../mail/evolution-mail.schemas.in.in.h:121
+msgid "Width of the message-list pane"
+msgstr "信件列表面板的高度"
+
+#: ../mail/evolution-mail.schemas.in.in.h:122
+msgid "Width of the message-list pane."
+msgstr "信件列表面板的高度。"
+
#: ../mail/importers/elm-importer.c:192
msgid "Importing Elm data"
msgstr "导入 Elm 数据"
@@ -12351,15 +12534,15 @@ msgid "Importer Berkeley Mailbox format folders"
msgstr "导入器 Berkeley 邮箱格式文件夹"
#: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
#, c-format
msgid "Importing `%s'"
msgstr "导入“%s”"
#: ../mail/importers/evolution-outlook-importer.c:266
#: ../mail/importers/netscape-importer.c:1254
-#: ../plugins/startup-wizard/startup-wizard.c:237
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:536
msgid "Please wait"
msgstr "请稍候"
@@ -12526,31 +12709,31 @@ msgid ", %d unread"
msgid_plural ", %d unread"
msgstr[0] ",%d 封未读"
-#: ../mail/mail-component.c:779
+#: ../mail/mail-component.c:819
msgid "New Mail Message"
msgstr "新建信件"
-#: ../mail/mail-component.c:780
+#: ../mail/mail-component.c:820
msgid "_Mail Message"
msgstr "信件(_M)"
-#: ../mail/mail-component.c:781
+#: ../mail/mail-component.c:821
msgid "Compose a new mail message"
msgstr "撰写一封新信"
-#: ../mail/mail-component.c:787
+#: ../mail/mail-component.c:827
msgid "New Mail Folder"
msgstr "新建邮件文件夹"
-#: ../mail/mail-component.c:788
+#: ../mail/mail-component.c:828
msgid "Mail _Folder"
msgstr "邮件文件夹(_F)"
-#: ../mail/mail-component.c:789
+#: ../mail/mail-component.c:829
msgid "Create a new mail folder"
msgstr "创建新邮件文件夹"
-#: ../mail/mail-component.c:933
+#: ../mail/mail-component.c:973
msgid "Failed upgrading Mail settings or folders."
msgstr "升级邮件设置或文件夹失败。"
@@ -12578,226 +12761,220 @@ msgstr "待办(_T)"
msgid "_Later"
msgstr "稍候(_L)"
-#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:1
msgid " Ch_eck for Supported Types "
msgstr "检查支持的类型(_E)"
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:3
msgid "<b>SSL is not supported in this build of Evolution</b>"
msgstr "<b>(在此版本的 Evolution 中不支持 SSL)</b>"
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:4
msgid "<b>Sig_natures</b>"
msgstr "<b>签名(_N)</b>"
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:5
msgid "<b>_Languages</b>"
msgstr "<b>语言(_L)</b>"
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:6
msgid "<small>This will make the the filter more reliable, but slower</small>"
msgstr "<small>这将让过滤器更可靠,但稍慢</small>"
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:7
msgid "<span weight=\"bold\">Account Information</span>"
msgstr "<span weight=\"bold\">账户信息</span>"
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:9
msgid "<span weight=\"bold\">Authentication Type</span>"
msgstr "<span weight=\"bold\">认证类型</span>"
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:10
msgid "<span weight=\"bold\">Authentication</span>"
msgstr "<span weight=\"bold\">身份验证</span>"
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:11
msgid "<span weight=\"bold\">Composing Messages</span>"
msgstr "<span weight=\"bold\">撰写信件</span>"
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:12
msgid "<span weight=\"bold\">Configuration</span>"
msgstr "<span weight=\"bold\">配置</span>"
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:13
msgid "<span weight=\"bold\">Default Behavior</span>"
msgstr "<span weight=\"bold\">默认行为</span>"
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:14
msgid "<span weight=\"bold\">Delete Mail</span>"
msgstr "<span weight=\"bold\">删除邮件</span>"
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:15
msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
msgstr "<span weight=\"bold\">显示的邮件头(_H)</span>"
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:16
msgid "<span weight=\"bold\">Filter Options</span>"
msgstr "<span weight=\"bold\">过滤器选项</span>"
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:18
msgid "<span weight=\"bold\">Labels and Colors</span>"
msgstr "<span weight=\"bold\">标签和颜色</span>"
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:19
msgid "<span weight=\"bold\">Loading Images</span>"
msgstr "<span weight=\"bold\">装入图像</span>"
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:20
msgid "<span weight=\"bold\">Message Display</span>"
msgstr "<span weight=\"bold\">信件显示</span>"
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:21
msgid "<span weight=\"bold\">Message Fonts</span>"
msgstr "<span weight=\"bold\">信件字体</span>"
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:22
msgid "<span weight=\"bold\">Message Receipts</span>"
msgstr "<span weight=\"bold\">信件收条</span>"
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:23
msgid "<span weight=\"bold\">New Mail Notification</span>"
msgstr "<span weight=\"bold\">新邮件提醒</span>"
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:24
#: ../plugins/publish-calendar/publish-calendar.glade.h:3
msgid "<span weight=\"bold\">Optional Information</span>"
msgstr "<span weight=\"bold\">可选信息</span>"
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:25
msgid "<span weight=\"bold\">Options</span>"
msgstr "<span weight=\"bold\">选项</span>"
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:26
msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:27
msgid "<span weight=\"bold\">Printed Fonts</span>"
msgstr "<span weight=\"bold\">打印字体</span>"
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:28
msgid "<span weight=\"bold\">Required Information</span>"
msgstr "<span weight=\"bold\">请求的信息</span>"
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:29
msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
msgstr "<span weight=\"bold\">安全 MIME(S/MIME)</span>"
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:30
msgid "<span weight=\"bold\">Security</span>"
msgstr "<span weight=\"bold\">安全</span>"
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:31
msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
msgstr "<span weight=\"bold\">已发送和草稿信件</span>"
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:32
msgid "<span weight=\"bold\">Server Configuration</span>"
msgstr "<span weight=\"bold\">服务器配置</span>"
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:34
msgid "Account Management"
msgstr "账户管理"
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:35
msgid "Add Ne_w Signature..."
msgstr "添加新签名(_W)..."
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:36
msgid "Add _Script"
msgstr "添加脚本(_S)"
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:37
msgid "Al_ways sign outgoing messages when using this account"
msgstr "当使用该账户时总是发送签名信件(_W)"
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:38
msgid "Also encrypt to sel_f when sending encrypted mail"
msgstr "当发送加密邮件时总是对自身加密(_F)"
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:39
msgid "Alway_s carbon-copy (cc) to:"
msgstr "总是抄送到(_S):"
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:40
msgid "Always _blind carbon-copy (bcc) to:"
msgstr "总是暗送到(_B):"
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:41
msgid "Always _trust keys in my keyring when encrypting"
msgstr "加密时总是信任我的密钥环中的密钥(_T)"
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:42
msgid "Always encrypt to _myself when sending encrypted mail"
msgstr "当发送加密邮件时总是对自身加密(_M)"
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:43
msgid "Attach original message"
msgstr "附加原始信件"
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:45
msgid "Automatically insert _smiley images"
msgstr "自动插入表情图像(_S)"
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:46
msgid "Baltic (ISO-8859-13)"
msgstr "波罗的语(ISO-8859-13)"
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:47
msgid "Baltic (ISO-8859-4)"
msgstr "波罗的语(ISO-8859-4)"
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:48
msgid "Beep w_hen new mail arrives"
msgstr "新邮件到达时响铃(_H)"
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:49
msgid "C_haracter set:"
msgstr "字符集(_H):"
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:50
msgid "Ch_eck for Supported Types "
msgstr "检查支持的类型(_E)"
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:51
msgid "Check in_coming mail for junk"
msgstr "检查收到的邮件是否是垃圾邮件(_C)"
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:52
msgid "Check spelling while I _type"
msgstr "在我输入时进行拼写检查(_T)"
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:53
msgid "Checks incoming mail messages to be Junk"
msgstr "检查收到的信件是否是垃圾邮件"
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:54
msgid "Cle_ar"
msgstr "清除(_A)"
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:55
msgid "Clea_r"
msgstr "清除(_R)"
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:56
msgid "Color for _misspelled words:"
msgstr "给错误拼写的单词着色(_M):"
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:57
msgid "Colors"
msgstr "颜色"
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:58
msgid "Confirm _when expunging a folder"
msgstr "销毁文件夹时确认(_W)"
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.glade.h:59
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -12812,134 +12989,134 @@ msgstr ""
"\n"
"单击“应用”可保存您的设置。"
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:65
msgid "De_fault"
msgstr "默认(_F)"
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:66
msgid "Default character e_ncoding:"
msgstr "默认字符编码(_N):"
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:69
msgid "Digitally _sign outgoing messages (by default)"
msgstr "对寄出的信件进行数字签名(默认)(_S)"
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:70
msgid "Do not quote original message"
msgstr "无法引用原始信件"
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:71
msgid "Done"
msgstr "完成"
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:72
msgid "Drafts _Folder:"
msgstr "草稿文件夹(_F):"
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:73
#: ../plugins/publish-calendar/publish-calendar.glade.h:9
msgid "E_nable"
msgstr "启用(_N)"
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:74
msgid "Email Accounts"
msgstr "电子邮件"
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:75
msgid "Email _Address:"
msgstr "电子邮件地址(_A):"
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:76
msgid "Empty trash folders on e_xit"
msgstr "退出时清空已删除邮件(_X)"
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:77
msgid "Encry_ption certificate:"
msgstr "加密证书(_P):"
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:78
msgid "Encrypt out_going messages (by default)"
msgstr "加密寄出的信件(默认)(_G)"
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:80
msgid "Fi_xed width Font:"
msgstr "等宽字体(_X):"
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:81
msgid "Fi_xed-width:"
msgstr "等宽(_X):"
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:82
msgid "Font Properties"
msgstr "字体属性"
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:83
msgid "Format messages in _HTML"
msgstr "用 HTML 格式化信件(_H)"
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:84
msgid "Full Nam_e:"
msgstr "全名(_E):"
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:86
msgid "HTML Mail"
msgstr "HTML 邮件"
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:87
msgid "Headers"
msgstr "信头"
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:88
msgid "Highlight _quotations with"
msgstr "突出显示引用(_Q)"
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:89
msgid "I_nclude remote tests"
msgstr "包含远程测试(_N)"
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:92
msgid "Inline"
msgstr "嵌入"
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:94
msgid "Languages Table"
msgstr "语言表"
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:96
msgid "Mail Configuration"
msgstr "邮件配置"
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:97
msgid "Mail Headers Table"
msgstr "邮件头表"
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:99
msgid "Mailbox location"
msgstr "邮件箱位置"
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:100
msgid "Message Composer"
msgstr "信件撰写器"
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:101
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
msgstr "注意:直到您第一次连接的时候,才会询问密码。"
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:102
msgid "Or_ganization:"
msgstr "组织(_G):"
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:103
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG 键标识(_K):"
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:106
msgid "Play sound file when new mail arri_ves"
msgstr "新邮件到达时播放声音文件(_V)"
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:107
msgid ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
@@ -12947,7 +13124,7 @@ msgstr ""
"请在下面的空白处输入此账户的描述性名称。\n"
"此名称将只在显示时使用。"
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:109
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -12955,7 +13132,7 @@ msgstr ""
"请在下面输入您的发件服务器信息。如果您不太确定的话,请询问您的系统管理员或者"
"互联网服务提供商ISP。"
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:110
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
"below do not need to be filled in, unless you wish to include this "
@@ -12964,38 +13141,42 @@ msgstr ""
"请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入,除非您想要在您发"
"出的邮件中包含此信息。"
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:111
msgid "Please select among the following options"
msgstr "请从以下选项中选择"
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:112
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr "发送只有暗送收件人的信件时提示(_O)"
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:113
msgid "Quote original message"
msgstr "引用原始信件"
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:114
msgid "Quoted"
msgstr "引用"
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:115
msgid "Re_member password"
msgstr "记住密码(_M)"
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:116
msgid "Re_ply-To:"
msgstr "回复到(_P):"
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:118
msgid "Remember _password"
msgstr "记住密码(_P)"
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:119
msgid "S_elect..."
msgstr "选择(_E)..."
+#: ../mail/mail-config.glade.h:120
+msgid "S_end message receipts:"
+msgstr "发送信件收条(_E):"
+
#: ../mail/mail-config.glade.h:121
msgid "S_tandard Font:"
msgstr "标准字体(_T):"
@@ -13024,61 +13205,57 @@ msgstr "选择用于打印的 HTML 变宽度字体"
msgid "Select sound file"
msgstr "选择声音文件"
-#: ../mail/mail-config.glade.h:129
-msgid "Send message receipts:"
-msgstr "发送信件收条:"
-
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:130
msgid "Sending Mail"
msgstr "发送邮件"
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:131
msgid "Sent _Messages Folder:"
msgstr "已发送信件文件夹(_M):"
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:132
msgid "Ser_ver requires authentication"
msgstr "服务器需要认证(_V)"
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:133
msgid "Server _Type: "
msgstr "服务器类型(_T):"
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:134
msgid "Sig_ning certificate:"
msgstr "签名证书(_N):"
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:135
msgid "Signat_ure:"
msgstr "签名(_U):"
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:136
msgid "Signatures"
msgstr "签名"
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:137
msgid "Signatures Table"
msgstr "签名表"
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:138
msgid "Specify _filename:"
msgstr "指定文件名(_F):"
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:139
msgid "Spell Checking"
msgstr "拼写检查"
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:140
msgid "T_ype: "
msgstr "类型(_Y):"
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:141
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
msgstr "在此列出的语言反映了您所安装的字典。"
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:142
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -13087,7 +13264,7 @@ msgstr ""
"此脚本的输出将用于您的签名。您指定的名称将只会\n"
"用于显示。"
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:146
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -13095,15 +13272,15 @@ msgstr ""
"输入您想要给此帐户起的名字。\n"
"如:“工作”或“私人”"
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
msgid "User_name:"
msgstr "用户名(_N):"
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:149
msgid "V_ariable-width:"
msgstr "变宽(_A):"
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:150
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -13113,67 +13290,71 @@ msgstr ""
"\n"
"单击“前进”开始。"
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:154
msgid "_Add Signature"
msgstr "添加签名(_A)"
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:155
msgid "_Always load images from the Internet"
msgstr "总是从 Internet 上装入图像(_A)"
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:156
msgid "_Do not notify me when new mail arrives"
msgstr "新邮件到达时不要提醒我(_D)"
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:157
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:159
msgid "_Forward style:"
msgstr "转发方式(_F):"
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:160
msgid "_Load images in mail from contacts"
msgstr "装入联系人发来的邮件中的图像(_L)"
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:161
msgid "_Make this my default account"
msgstr "使它成为我的默认账户(_M)"
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:162
msgid "_Mark messages as read after"
msgstr "把信件标记为已读前等(_M)"
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:164
msgid "_Never load images from the Internet"
msgstr "绝不从 Internet 装入图像(_N)"
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:165
msgid "_Path:"
msgstr "路径(_P):"
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:166
msgid "_Prompt when sending HTML messages to contacts that do not want them"
msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:167
msgid "_Prompt when sending messages with an empty subject line"
msgstr "发送空主题行的信件时提示(_P)"
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:168
msgid "_Reply style:"
msgstr "回复风格(_R):"
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:169
msgid "_Script:"
msgstr "脚本(_S):"
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:172
msgid "_Show image animations"
msgstr "显示图像动画(_S)"
+#: ../mail/mail-config.glade.h:173
+msgid "_Shrink To / Cc / Bcc headers to "
+msgstr ""
+
#: ../mail/mail-config.glade.h:174
msgid "_Use Secure Connection:"
msgstr "使用安全连接(_U):"
@@ -13183,13 +13364,21 @@ msgid "_Use the same fonts as other applications"
msgstr "使用与其它应用程序相同的字体(_U)"
#: ../mail/mail-config.glade.h:176
+msgid "addresses"
+msgstr "地址"
+
+#: ../mail/mail-config.glade.h:177
msgid "color"
msgstr "颜色"
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:178
msgid "description"
msgstr "描述"
+#: ../mail/mail-dialogs.glade.h:1
+msgid " "
+msgstr " "
+
#: ../mail/mail-dialogs.glade.h:2
msgid "<b>Search Folder Sources</b>"
msgstr "<b>搜索文件夹来源</b>"
@@ -13203,47 +13392,63 @@ msgid "<span weight=\"bold\">Encryption</span>"
msgstr "<span weight=\"bold\">加密</span>"
#: ../mail/mail-dialogs.glade.h:5
+msgid "All active remote folders"
+msgstr "全部活跃远程文件夹"
+
+#: ../mail/mail-dialogs.glade.h:6
+msgid "All local and active remote folders"
+msgstr "全部本地和活跃远程文件夹"
+
+#: ../mail/mail-dialogs.glade.h:7
+msgid "All local folders"
+msgstr "全部本地文件夹"
+
+#: ../mail/mail-dialogs.glade.h:8
msgid "Case _sensitive"
msgstr "区分大小写(_S)"
-#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
msgid "Co_mpleted"
msgstr "已完成(_M)"
-#: ../mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.glade.h:11
msgid "F_ind:"
msgstr "查找(_I):"
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:12
msgid "Find in Message"
msgstr "在信件中寻找"
-#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
+#: ../mail/message-tags.glade.h:2
msgid "Flag to Follow Up"
msgstr "跟随的标志"
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:14
msgid "Folder Subscriptions"
msgstr "文件夹订阅"
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:15
msgid "License Agreement"
msgstr "许可协议"
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:16
msgid "None Selected"
msgstr "没有选中"
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:17
msgid "S_erver:"
msgstr "服务器(_E):"
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:18
msgid "Security Information"
msgstr "安全信息"
-#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:19
+msgid "Specific folders"
+msgstr "指定文件夹"
+
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
msgid ""
"The messages you have selected for follow up are listed below.\n"
"Please select a follow up action from the \"Flag\" menu."
@@ -13251,67 +13456,51 @@ msgstr ""
"您选中进行跟随的信件已经在下面列出。\n"
"请从“标志”菜单中选择跟随操作。"
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:23
msgid "_Accept License"
msgstr "接受协议(_A)"
-#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
msgid "_Due By:"
msgstr "延期人(_D):"
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
msgid "_Flag:"
msgstr "标志(_F):"
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.glade.h:26
msgid "_Subscribe"
msgstr "订阅(_S)"
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:27
msgid "_Tick this to accept the license agreement"
msgstr "选中此处以表明您接受许可协议(_T)"
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:28
#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
msgid "_Unsubscribe"
msgstr "退订(_U)"
-#: ../mail/mail-dialogs.glade.h:25
-msgid "specific folders only"
-msgstr "仅指定文件夹"
-
-#: ../mail/mail-dialogs.glade.h:26
-msgid "with all active remote folders"
-msgstr "以全部活跃远程文件夹"
-
-#: ../mail/mail-dialogs.glade.h:27
-msgid "with all local and active remote folders"
-msgstr "以全部本地和活跃远程文件夹"
-
-#: ../mail/mail-dialogs.glade.h:28
-msgid "with all local folders"
-msgstr "以所有本地文件夹"
-
#: ../mail/mail-folder-cache.c:858
#, c-format
msgid "Pinging %s"
msgstr "查验 %s"
-#: ../mail/mail-ops.c:104
+#: ../mail/mail-ops.c:105
msgid "Filtering Folder"
msgstr "过滤文件夹"
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:266
msgid "Fetching Mail"
msgstr "收取邮件"
#. sending mail, filtering failed
-#: ../mail/mail-ops.c:565
+#: ../mail/mail-ops.c:566
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "应用寄出过滤器失败:%s"
-#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
+#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -13320,121 +13509,112 @@ msgstr ""
"追加到 %s:%s 失败\n"
"转而追加到本地“已发”文件夹。"
-#: ../mail/mail-ops.c:623
+#: ../mail/mail-ops.c:624
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "追加到本地“已发”文件夹失败:%s"
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:736
#, c-format
msgid "Sending message %d of %d"
msgstr "发送第%d封信,共%d封"
-#: ../mail/mail-ops.c:760
+#: ../mail/mail-ops.c:761
#, c-format
msgid "Failed to send %d of %d messages"
msgstr "在第%d封信失败,共%d封"
-#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:632
msgid "Canceled."
msgstr "已取消。"
-#: ../mail/mail-ops.c:764
+#: ../mail/mail-ops.c:765
msgid "Complete."
msgstr "完成。"
-#: ../mail/mail-ops.c:861
+#: ../mail/mail-ops.c:862
msgid "Saving message to folder"
msgstr "把信件保存到文件夹中"
-#: ../mail/mail-ops.c:946
+#: ../mail/mail-ops.c:947
#, c-format
msgid "Moving messages to %s"
msgstr "把信件移至 %s"
-#: ../mail/mail-ops.c:946
+#: ../mail/mail-ops.c:947
#, c-format
msgid "Copying messages to %s"
msgstr "把信件复制到 %s"
-#: ../mail/mail-ops.c:1169
+#: ../mail/mail-ops.c:1170
msgid "Forwarded messages"
msgstr "转发的信件"
-#: ../mail/mail-ops.c:1212
+#: ../mail/mail-ops.c:1213
#, c-format
msgid "Opening folder %s"
msgstr "打开文件夹 %s"
-#: ../mail/mail-ops.c:1284
+#: ../mail/mail-ops.c:1285
#, c-format
msgid "Opening store %s"
msgstr "打开存储 %s"
-#: ../mail/mail-ops.c:1362
+#: ../mail/mail-ops.c:1363
#, c-format
msgid "Removing folder %s"
msgstr "删除文件夹 %s"
-#: ../mail/mail-ops.c:1456
+#: ../mail/mail-ops.c:1457
#, c-format
msgid "Storing folder '%s'"
msgstr "存储文件夹“%s”"
-#: ../mail/mail-ops.c:1521
+#: ../mail/mail-ops.c:1522
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "销毁并存储账户“%s”"
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1523
#, c-format
msgid "Storing account '%s'"
msgstr "存储账户“%s”"
-#: ../mail/mail-ops.c:1577
+#: ../mail/mail-ops.c:1578
msgid "Refreshing folder"
msgstr "刷新文件夹"
-#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
+#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
msgid "Expunging folder"
msgstr "销毁文件夹"
-#: ../mail/mail-ops.c:1661
+#: ../mail/mail-ops.c:1662
#, c-format
msgid "Emptying trash in '%s'"
msgstr "清空“%s”中的回收站"
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1663
msgid "Local Folders"
msgstr "本地文件夹"
-#: ../mail/mail-ops.c:1745
+#: ../mail/mail-ops.c:1746
#, c-format
msgid "Retrieving message %s"
msgstr "收取信件 %s"
-#: ../mail/mail-ops.c:1855
+#: ../mail/mail-ops.c:1856
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "收取 %d 封信"
-#: ../mail/mail-ops.c:1941
+#: ../mail/mail-ops.c:1942
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messsages"
msgstr[0] "保存 %d 封信"
-#: ../mail/mail-ops.c:1991
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"无法创建输出文件:%s\n"
-" %s"
-
-#: ../mail/mail-ops.c:2019
+#: ../mail/mail-ops.c:2013
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -13443,11 +13623,11 @@ msgstr ""
"在将信件保存到 %s 时发生错误:\n"
" %s"
-#: ../mail/mail-ops.c:2091
+#: ../mail/mail-ops.c:2085
msgid "Saving attachment"
msgstr "保存附件"
-#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
+#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -13456,60 +13636,69 @@ msgstr ""
"无法创建输出文件:%s:\n"
" %s"
-#: ../mail/mail-ops.c:2120
+#: ../mail/mail-ops.c:2114
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据:%s"
-#: ../mail/mail-ops.c:2269
+#: ../mail/mail-ops.c:2263
#, c-format
msgid "Disconnecting from %s"
msgstr "断开与 %s 的连接"
-#: ../mail/mail-ops.c:2269
+#: ../mail/mail-ops.c:2263
#, c-format
msgid "Reconnecting to %s"
msgstr "重新连接到 %s"
-#: ../mail/mail-ops.c:2385
+#: ../mail/mail-ops.c:2379
msgid "Checking Service"
msgstr "检查服务"
-#: ../mail/mail-send-recv.c:158
+#: ../mail/mail-send-recv.c:159
msgid "Canceling..."
msgstr "正在取消..."
-#: ../mail/mail-send-recv.c:329
+#: ../mail/mail-send-recv.c:330
msgid "Send & Receive Mail"
msgstr "发送和接收邮件"
-#: ../mail/mail-send-recv.c:336
+#: ../mail/mail-send-recv.c:337
msgid "Cancel _All"
msgstr "全部取消(_A)"
-#: ../mail/mail-send-recv.c:425
+#: ../mail/mail-send-recv.c:434
msgid "Updating..."
msgstr "正在更新..."
-#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
+#: ../mail/mail-send-recv.c:434 ../mail/mail-send-recv.c:487
msgid "Waiting..."
msgstr "正在等待..."
-#: ../mail/mail-send-recv.c:709
+#: ../mail/mail-send-recv.c:718
msgid "Checking for new mail"
msgstr "检查新邮件"
-#: ../mail/mail-session.c:204
-#: ../plugins/exchange-operations/exchange-config-listener.c:710
+#: ../mail/mail-session.c:205
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "输入 %s 的密码"
+
+#: ../mail/mail-session.c:207
+msgid "Enter Passphrase"
+msgstr "输入密码"
+
+#: ../mail/mail-session.c:210
+#: ../plugins/exchange-operations/exchange-config-listener.c:711
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
-#: ../mail/mail-session.c:206
+#: ../mail/mail-session.c:212
msgid "Enter Password"
msgstr "输入密码"
-#: ../mail/mail-session.c:241
+#: ../mail/mail-session.c:250
msgid "User canceled operation."
msgstr "用户己取消操作。"
@@ -13522,7 +13711,7 @@ msgid "Enter a name for this signature."
msgstr "输入该签名的名字。"
#: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:4
msgid "Name:"
msgstr "名称:"
@@ -13565,11 +13754,11 @@ msgstr "更新“%s:%s”的搜索文件夹"
msgid "Updating Search Folders for '%s'"
msgstr "更新“%s”的搜索文件夹"
-#: ../mail/mail-vfolder.c:1050
+#: ../mail/mail-vfolder.c:1023
msgid "Edit Search Folder"
msgstr "编辑搜索文件夹"
-#: ../mail/mail-vfolder.c:1134
+#: ../mail/mail-vfolder.c:1107
msgid "New Search Folder"
msgstr "新建搜索文件夹"
@@ -13951,9 +14140,9 @@ msgstr "签名已经存在"
#: ../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 正常运作所需的系统文件夹无法重命名、移动或删除。"
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr "您无法重命名、移动或删除要让 Evolution 正常运作所需的系统文件夹。"
#: ../mail/mail.error.xml.h:90
msgid ""
@@ -14107,74 +14296,74 @@ msgstr "销毁(_E)"
msgid "_Open Messages"
msgstr "打开信件(_O)"
-#: ../mail/message-list.c:1000
+#: ../mail/message-list.c:1017
msgid "Unseen"
msgstr "未看"
-#: ../mail/message-list.c:1001
+#: ../mail/message-list.c:1018
msgid "Seen"
msgstr "已看"
-#: ../mail/message-list.c:1002
+#: ../mail/message-list.c:1019
msgid "Answered"
msgstr "已答复"
-#: ../mail/message-list.c:1003
+#: ../mail/message-list.c:1020
msgid "Multiple Unseen Messages"
msgstr "多封未看信件"
-#: ../mail/message-list.c:1004
+#: ../mail/message-list.c:1021
msgid "Multiple Messages"
msgstr "多封信"
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1025
msgid "Lowest"
msgstr "最低"
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1026
msgid "Lower"
msgstr "较低"
-#: ../mail/message-list.c:1013
+#: ../mail/message-list.c:1030
msgid "Higher"
msgstr "较高"
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1031
msgid "Highest"
msgstr "最高"
-#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1449 ../widgets/table/e-cell-date.c:57
msgid "?"
msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1456 ../plugins/itip-formatter/itip-view.c:198
#: ../widgets/table/e-cell-date.c:72
msgid "Today %l:%M %p"
msgstr "今天 %H:%M"
-#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1465 ../widgets/table/e-cell-date.c:82
msgid "Yesterday %l:%M %p"
msgstr "昨天 %H:%M"
-#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1477 ../widgets/table/e-cell-date.c:94
msgid "%a %l:%M %p"
msgstr "%A %H:%M"
-#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1485 ../widgets/table/e-cell-date.c:102
msgid "%b %d %l:%M %p"
msgstr "%m月%d日 %H:%M"
-#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:104
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
-#: ../mail/message-list.c:2063
+#: ../mail/message-list.c:2239 ../mail/message-list.etspec.h:9
msgid "Messages"
msgstr "信件"
-#: ../mail/message-list.c:3442
+#: ../mail/message-list.c:3627
msgid "Generating message list"
msgstr "生成信件列表"
@@ -14194,15 +14383,15 @@ msgstr "已标志"
msgid "Follow Up Flag"
msgstr "跟随标志"
-#: ../mail/message-list.etspec.h:8
-msgid "Original Location"
-msgstr "原始位置"
-
-#: ../mail/message-list.etspec.h:9
+#: ../mail/message-list.etspec.h:10
msgid "Received"
msgstr "已接收"
-#: ../mail/message-list.etspec.h:11
+#: ../mail/message-list.etspec.h:14
+msgid "Sent Messages"
+msgstr "已发信件"
+
+#: ../mail/message-list.etspec.h:15
#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
msgid "Size"
msgstr "大小"
@@ -14350,6 +14539,10 @@ msgid ""
"_Automatically create entries in the addressbook when responding to mail"
msgstr "回复邮件时自动在地址簿中创建联系人项(_A)"
+#: ../plugins/bbdb/bbdb.c:460
+msgid "Select Address book for Automatic Contacts"
+msgstr "选择自动联系人的地址簿"
+
#: ../plugins/bbdb/bbdb.c:475
msgid "Instant Messaging Contacts"
msgstr "即时通讯联系人"
@@ -14360,6 +14553,10 @@ msgid ""
"Periodically synchronize contact information and images from gaim buddy list"
msgstr "定时从 Gaim 好友列表中同步联系人信息和图像"
+#: ../plugins/bbdb/bbdb.c:496
+msgid "Select Address book for Gaim buddy list"
+msgstr "选择 Gaim 好友列表的地址簿"
+
#. Synchronize now button.
#: ../plugins/bbdb/bbdb.c:507
msgid "Synchronize with _buddy list now"
@@ -14465,10 +14662,6 @@ msgid ""
"things to the clipboard."
msgstr "一个测试插件,它将显示允许您将文字复制到剪贴板的弹出菜单插件。"
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "复制电子邮件地址(_E)"
-
#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
msgid "Copy tool"
msgstr "复制工具"
@@ -14575,7 +14768,7 @@ msgid "Change the password for Exchange account"
msgstr "更改 Exchange 账户的密码"
#: ../plugins/exchange-operations/exchange-account-setup.c:330
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
msgid "Change Password"
msgstr "更改密码"
@@ -14607,19 +14800,19 @@ msgstr "文件夹大小"
msgid "Exchange Settings"
msgstr "Exchange 设置"
-#: ../plugins/exchange-operations/exchange-account-setup.c:609
+#: ../plugins/exchange-operations/exchange-account-setup.c:610
msgid "_OWA URL:"
msgstr "_OWA URL:"
-#: ../plugins/exchange-operations/exchange-account-setup.c:635
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
msgid "A_uthenticate"
msgstr "身份验证(_U)"
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:829
msgid "Authentication Type"
msgstr "身份验证类型"
-#: ../plugins/exchange-operations/exchange-account-setup.c:842
+#: ../plugins/exchange-operations/exchange-account-setup.c:843
msgid "Ch_eck for Supported Types"
msgstr "检查支持的类型(_E)"
@@ -14645,29 +14838,31 @@ msgstr "当前密码与您账户的已有密码不匹配。请输入正确的密
msgid "The two passwords do not match. Please re-enter the passwords."
msgstr "两个密码不匹配。请重新输入密码。"
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
msgid "Confirm Password:"
msgstr "确认密码:"
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
msgid "Current Password:"
msgstr "当前密码:"
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
msgid "New Password:"
-msgstr "新建密码码:"
+msgstr "新建密码:"
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
msgid "Your current password has expired. Please change your password now."
msgstr "您目前的密码已经过期。请立即更改您的密码。"
-#: ../plugins/exchange-operations/exchange-config-listener.c:662
+#: ../plugins/exchange-operations/exchange-config-listener.c:663
#, c-format
msgid "Your password will expire in the next %d days"
msgstr "您的密码即将于 %d 后过期"
+#. Custom
#: ../plugins/exchange-operations/exchange-delegates-user.c:144
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../widgets/table/e-table-header-item.c:1572
msgid "Custom"
msgstr "自定义"
@@ -14785,7 +14980,7 @@ msgstr "文件夹名称"
msgid "Folder Size"
msgstr "文件夹大小"
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:291
#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
msgid "Subscribe to Other User's Folder"
msgstr "订阅其他用户的文件夹"
@@ -14800,14 +14995,14 @@ msgstr "Exchange 文件夹树"
msgid "Unsubscribe Folder..."
msgstr "退订文件夹..."
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:524
+#: ../plugins/exchange-operations/exchange-folder.c:459
+#: ../plugins/exchange-operations/exchange-folder.c:514
#, 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:471
+#: ../plugins/exchange-operations/exchange-folder.c:526
#, c-format
msgid "Unsubscribe from \"%s\""
msgstr "退订“%s”"
@@ -14840,59 +15035,59 @@ msgstr "添加用户:"
msgid "Add User"
msgstr "添加用户"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
msgid "<b>Permissions</b>"
msgstr "<b>权限</b>"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
msgid "Cannot Delete"
msgstr "无法删除"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
msgid "Cannot Edit"
msgstr "无法编辑"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
msgid "Create items"
msgstr "创建项目"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
msgid "Create subfolders"
msgstr "创建子文件夹"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
msgid "Delete Any Items"
msgstr "删除任何项目"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
msgid "Delete Own Items"
msgstr "删除自有项目"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
msgid "Edit Any Items"
msgstr "编辑任何项目"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
msgid "Edit Own Items"
msgstr "编辑自有项目"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
msgid "Folder contact"
msgstr "文件夹联系人"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
msgid "Folder owner"
msgstr "文件夹所有者"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
msgid "Folder visible"
msgstr "文件夹可见"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
msgid "Read items"
msgstr "读取项目"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
msgid "Role: "
msgstr "角色:"
@@ -14931,20 +15126,24 @@ msgid "Cannot display folders."
msgstr "无法显示文件夹。"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid ""
-"Changes to Exchange account configuration will take place after you quit and "
-"restart Evolution."
-msgstr "对 Exchange 账户配置的更改将在您退出并重新启动 Evolution 后生效。"
+msgid "Cannot perform the operation."
+msgstr "无法执行操作。"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+msgid ""
+"Changes to options for Exchange account \"{0}\" will only take effect after "
+"restarting Evolution."
+msgstr "对 Exchange 账户“{0}”配置的更改将在您退出并重新启动 Evolution 后生效。"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
msgid "Could not authenticate to server."
msgstr "无法认证到服务器。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
msgid "Could not change password."
msgstr "无法更改密码。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
msgid ""
"Could not configure Exchange account because \n"
"an unknown error occurred. Check the URL, \n"
@@ -14953,55 +15152,55 @@ msgstr ""
"无法配置 Exchange 账户,原因是发生了未知错误。请检查 URL、用户名、密码,然后"
"再试一次。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
msgid "Could not connect to Exchange server."
msgstr "无法连接到 Exchange 服务器。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
msgid "Could not connect to server {0}."
msgstr "无法连接到服务器 {0}。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
msgid "Could not determine folder permissions for delegates."
msgstr "无法确定代理人的文件夹权限。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
msgid "Could not find Exchange Web Storage System."
msgstr "找不到 Exchange Web 存储系统。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
msgid "Could not locate server {0}."
msgstr "无法定位服务器 {0}。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
msgid "Could not make {0} a delegate"
msgstr "无法将授权给 {0}"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
msgid "Could not read folder permissions"
msgstr "无法读取文件夹权限"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
msgid "Could not read folder permissions."
msgstr "无法读取文件夹权限。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
msgid "Could not read out-of-office state"
msgstr "无法读取不在办公室状态"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
msgid "Could not update folder permissions."
msgstr "无法更新文件夹权限。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
msgid "Could not update out-of-office state"
msgstr "无法更新不在办公室状态"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
msgid "Exchange Account is offline."
msgstr "Exchange 账户脱机。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
msgid ""
"Exchange Connector requires access to certain\n"
"functionality on the Exchange Server that appears\n"
@@ -15025,90 +15224,90 @@ msgstr ""
"{0}\n"
" "
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
msgid "Failed to update delegates:"
msgstr "更新代理人失败:"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
msgid "Folder already exists"
msgstr "文件夹已经存在"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
msgid "Folder does not exist"
msgstr "文件夹不存在"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
msgid "Folder offline"
msgstr "文件夹脱机"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1269
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../shell/e-shell.c:1270
msgid "Generic error"
msgstr "常规错误"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
msgid ""
"If OWA is running on a different path, you must specify that in the account "
"configuration dialog."
msgstr "如果 OWA 运行于不同的路径上,您必须在账户配置对话到中指定该路径。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
msgid "Mailbox for {0} is not on this server."
msgstr "{0} 的邮箱不在此服务器上。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
msgid "Make sure the URL is correct and try again."
msgstr "请确定 URL 正确,然后再试一次。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
msgid "Make sure the server name is spelled correctly and try again."
msgstr "请确定服务器名称拼写正确,然后再试一次。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
msgid "Make sure the username and password are correct and try again."
msgstr "请确定用户名和密码正确,然后再试一次。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
msgid "No Global Catalog server configured for this account."
msgstr "没有为此账户配置全局编目服务器。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
msgid "No mailbox for user {0} on {1}."
msgstr "用户 {0} 在 {1} 上没有邮箱。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
msgid "No such user {0}"
msgstr "没有用户 {0}"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
msgid "Password successfully changed."
msgstr "密码已经成功更改。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "Please restart Evolution"
-msgstr "请重新启动 Evolution"
-
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+msgid "Please restart Evolution for changes to take effect"
+msgstr "请重新启动 Evolution 以便使得更改生效"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
msgid "Please select a user."
msgstr "请选择用户。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
msgid "Server rejected password because it is too weak."
msgstr "服务器拒绝了密码,因为该密码的安全级别太低。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
msgid "The Exchange account will be disabled when you quit Evolution"
msgstr "当您退出 Evolution 时,Exchange 账户将被禁用"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
msgid "The Exchange account will be removed when you quit Evolution"
msgstr "当您退出 Evolution 时 Exchange 账户将被删除"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
msgid "The Exchange server is not compatible with Exchange Connector."
msgstr "Exchange 服务器与 Exchange Connector 不兼容。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
msgid ""
"The server is running Exchange 5.5. Exchange Connector \n"
"supports Microsoft Exchange 2000 and 2003 only."
@@ -15116,7 +15315,7 @@ msgstr ""
"服务器正在运行 Exchange 5.5。Exchange Connector 只支持 Microsoft Exchange "
"2000 和 2003。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
msgid ""
"This probably means that your server requires \n"
"you to specify the Windows domain name \n"
@@ -15129,81 +15328,81 @@ msgstr ""
"\n"
"或者,您可能拼错了密码。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
msgid "Try again with a different password."
msgstr "请用不同的密码再试一次。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
msgid "Unable to add user to access control list:"
msgstr "无法将用户添加到访问控制列表中:"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
msgid "Unable to edit delegates."
msgstr "无法编辑代理人。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
msgid "Unknown error looking up {0}"
msgstr "查阅 {0} 时发生未知错误"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
msgid "Unknown error."
msgstr "未知错误。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
msgid "Unknown type"
msgstr "未知类型"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
msgid "Unsupported operation"
msgstr "不支持的操作"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
msgid "You are nearing your quota available for storing mail on this server."
msgstr "您即将用完您在此服务器上的存储邮件的配额。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
msgid "You cannot make yourself your own delegate"
msgstr "您不能授权给您自己"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
msgid "You have exceeded your quota for storing mail on this server."
msgstr "您已经超过了在此服务器上存储邮件的配额。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
msgid "You may only configure a single Exchange account."
msgstr "您只能配置单个 Exchange 账户。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
msgid ""
"Your current usage is: {0} KB. Try to clear up some space by deleting some "
"mail."
msgstr "您目前使用了 {0} KB。试着通过删除邮件来清理一些空间。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
msgid ""
"Your current usage is: {0} KB. You will not be able to either send or "
"receive mail now."
msgstr "您目前使用了 {0} KB。您现在既不能发送也不能接收邮件。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
msgid ""
"Your current usage is: {0} KB. You will not be able to send mail until you "
"clear up some space by deleting some mail."
msgstr "您目前使用了 {0} KB。您将无法发送邮件,除非您通过删除邮件来清理空间。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
msgid "Your password has expired."
msgstr "您的密码已经过期。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
msgid "{0} cannot be added to an access control list"
msgstr "{0} 无法添加到访问控制列表中"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
msgid "{0} is already a delegate"
msgstr "{0} 已被授权"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
msgid "{0} is already in the list"
msgstr "{0} 已经在列表中"
@@ -15279,7 +15478,7 @@ msgstr "将发送选项添加到 GroupWise 信件"
#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:17
+#: ../widgets/misc/e-send-options.glade.h:19
msgid "Send Options"
msgstr "发送选项"
@@ -15295,40 +15494,40 @@ msgstr "Groupwise 特性"
msgid "Accept Tentatively"
msgstr "暂时接受"
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:1
msgid "<b>Users:</b>"
msgstr "<b>用户数:</b>"
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:3
#: ../widgets/table/e-table-click-to-add.c:509
msgid "Message"
msgstr "消息"
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:5
msgid "Shared Folder Notification"
msgstr "共享文件夹通知"
-#: ../plugins/groupwise-features/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:7
msgid "The participants will receive the following notification.\n"
msgstr "收件人将接收到下列通知。\n"
-#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:10
msgid "_Contacts..."
msgstr "联系人(_C)..."
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.glade.h:11
msgid "_Customize notification message"
msgstr "自定义通知消息(_C)"
-#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:12
msgid "_Not Shared"
msgstr "未共享(_N)"
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:14
msgid "_Shared With ..."
msgstr "共享对象(_S)..."
-#: ../plugins/groupwise-features/properties.glade.h:16
+#: ../plugins/groupwise-features/properties.glade.h:15
msgid "_Sharing"
msgstr "共享(_S)"
@@ -15397,7 +15596,10 @@ msgstr "代理服务器登录"
msgid "%sEnter password for %s (user %s)"
msgstr "%s输入 %s 的密码(用户 %s)"
-#: ../plugins/groupwise-features/proxy-login.c:505
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
+#. * feature by which one person can send/read mails/appointments using another person's identity
+#. * without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login.c:517
msgid "_Proxy Login..."
msgstr "代理服务器登录(_P)..."
@@ -15458,12 +15660,12 @@ msgid "Select Calendar"
msgstr "选择日历"
#: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:703
+#: ../shell/e-shell-importer.c:714
msgid "_Import"
msgstr "导入(_I)"
#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:137
+#: ../plugins/save-calendar/ical-format.c:149
msgid "iCalendar format (.ics)"
msgstr "iCalendar 格式(.ics)"
@@ -15513,126 +15715,126 @@ 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
+#: ../plugins/itip-formatter/itip-formatter.c:274
+#: ../plugins/itip-formatter/itip-formatter.c:398
#, c-format
msgid "Failed to load the calendar '%s'"
msgstr "装入日历“%s”失败"
-#: ../plugins/itip-formatter/itip-formatter.c:407
+#: ../plugins/itip-formatter/itip-formatter.c:418
#, c-format
msgid "An appointment in the calendar '%s' conflicts with this meeting"
msgstr "日历“%s”中的一个约会与此会议冲突"
-#: ../plugins/itip-formatter/itip-formatter.c:433
+#: ../plugins/itip-formatter/itip-formatter.c:444
#, c-format
msgid "Found the appointment in the calendar '%s'"
msgstr "在日历“%s”中找到了约会"
-#: ../plugins/itip-formatter/itip-formatter.c:488
+#: ../plugins/itip-formatter/itip-formatter.c:505
msgid "Unable to find any calendars"
msgstr "无法找到任何日历"
-#: ../plugins/itip-formatter/itip-formatter.c:495
+#: ../plugins/itip-formatter/itip-formatter.c:512
msgid "Unable to find this meeting in any calendar"
msgstr "无法在任何日历中找到此会议"
-#: ../plugins/itip-formatter/itip-formatter.c:499
+#: ../plugins/itip-formatter/itip-formatter.c:516
msgid "Unable to find this task in any task list"
msgstr "无法在任何任务列表中找到此任务"
-#: ../plugins/itip-formatter/itip-formatter.c:503
+#: ../plugins/itip-formatter/itip-formatter.c:520
msgid "Unable to find this journal entry in any journal"
msgstr "无法在任何日记中找到此日记项"
-#: ../plugins/itip-formatter/itip-formatter.c:529
+#: ../plugins/itip-formatter/itip-formatter.c:593
msgid "Searching for an existing version of this appointment"
msgstr "搜索此约会的已有版本"
-#: ../plugins/itip-formatter/itip-formatter.c:726
+#: ../plugins/itip-formatter/itip-formatter.c:788
msgid "Unable to parse item"
msgstr "无法分析项目"
-#: ../plugins/itip-formatter/itip-formatter.c:782
+#: ../plugins/itip-formatter/itip-formatter.c:845
#, c-format
msgid "Unable to send item to calendar '%s'. %s"
msgstr "无法将项目发送到日历“%s”。%s"
-#: ../plugins/itip-formatter/itip-formatter.c:793
+#: ../plugins/itip-formatter/itip-formatter.c:856
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "将日历“%s”发送为已接受"
-#: ../plugins/itip-formatter/itip-formatter.c:797
+#: ../plugins/itip-formatter/itip-formatter.c:860
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "将日历“%s”发送为待定"
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:865
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "将日历“%s”发送为已拒绝"
-#: ../plugins/itip-formatter/itip-formatter.c:807
+#: ../plugins/itip-formatter/itip-formatter.c:870
#, c-format
msgid "Sent to calendar '%s' as canceled"
msgstr "将日历“%s”发送为已取消"
-#: ../plugins/itip-formatter/itip-formatter.c:900
+#: ../plugins/itip-formatter/itip-formatter.c:963
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "组织者已经删除了代理人 %s"
-#: ../plugins/itip-formatter/itip-formatter.c:907
+#: ../plugins/itip-formatter/itip-formatter.c:970
msgid "Sent a cancelation notice to the delegate"
msgstr "已给代理人发送了取消通知"
-#: ../plugins/itip-formatter/itip-formatter.c:909
+#: ../plugins/itip-formatter/itip-formatter.c:972
msgid "Could not send the cancelation notice to the delegate"
msgstr "无法给代理人发送取消通知"
-#: ../plugins/itip-formatter/itip-formatter.c:994
+#: ../plugins/itip-formatter/itip-formatter.c:1057
msgid "Attendee status could not be updated because the status is invalid"
msgstr "出席者状态无法更新,原因是状态无效"
-#: ../plugins/itip-formatter/itip-formatter.c:1021
+#: ../plugins/itip-formatter/itip-formatter.c:1084
#, c-format
msgid "Unable to update attendee. %s"
msgstr "无法更新出席者。%s"
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1088
msgid "Attendee status updated"
msgstr "出席者状态已更新"
-#: ../plugins/itip-formatter/itip-formatter.c:1152
+#: ../plugins/itip-formatter/itip-formatter.c:1215
msgid "The calendar attached is not valid"
msgstr "附加的日历无效"
-#: ../plugins/itip-formatter/itip-formatter.c:1153
+#: ../plugins/itip-formatter/itip-formatter.c:1216
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
msgstr "信件声明其包含日历,但日历不是有效的 iCalendar。"
-#: ../plugins/itip-formatter/itip-formatter.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:1202
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1265
+#: ../plugins/itip-formatter/itip-formatter.c:1341
msgid "The item in the calendar is not valid"
msgstr "日历项无效"
-#: ../plugins/itip-formatter/itip-formatter.c:1188
-#: ../plugins/itip-formatter/itip-formatter.c:1203
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../plugins/itip-formatter/itip-formatter.c:1266
+#: ../plugins/itip-formatter/itip-formatter.c:1342
msgid ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
msgstr "信件的确包含日历,但是日历不包含事件、任务或忙/闲信息"
-#: ../plugins/itip-formatter/itip-formatter.c:1213
+#: ../plugins/itip-formatter/itip-formatter.c:1276
msgid "The calendar attached contains multiple items"
msgstr "附加的日历包含多个项目"
-#: ../plugins/itip-formatter/itip-formatter.c:1214
+#: ../plugins/itip-formatter/itip-formatter.c:1277
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
@@ -15640,23 +15842,23 @@ msgstr "要处理这些全部项目,应该保存文件并导入日历"
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1994
+#: ../plugins/itip-formatter/itip-formatter.c:2037
msgid "_Delete message after acting"
msgstr "操作后删除消息(_D)"
-#: ../plugins/itip-formatter/itip-formatter.c:2004
-#: ../plugins/itip-formatter/itip-formatter.c:2036
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/itip-formatter/itip-formatter.c:2079
msgid "Conflict Search"
msgstr "冲突搜索"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2019
+#: ../plugins/itip-formatter/itip-formatter.c:2062
msgid "Select the calendars to search for meeting conflicts"
msgstr "选择要搜索冲突会议的日历"
#. strftime format of a weekday and a date.
#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
+#: ../widgets/misc/e-cell-date-edit.c:241
msgid "Today"
msgstr "今天"
@@ -15995,26 +16197,26 @@ msgid "_Update"
msgstr "更新(_U)"
#. Start time
-#: ../plugins/itip-formatter/itip-view.c:888
+#: ../plugins/itip-formatter/itip-view.c:890
msgid "Start time:"
msgstr "开始时间:"
#. End time
-#: ../plugins/itip-formatter/itip-view.c:897
+#: ../plugins/itip-formatter/itip-view.c:899
msgid "End time:"
msgstr "结束时间:"
#. Comment
-#: ../plugins/itip-formatter/itip-view.c:913
-#: ../plugins/itip-formatter/itip-view.c:963
+#: ../plugins/itip-formatter/itip-view.c:915
+#: ../plugins/itip-formatter/itip-view.c:965
msgid "Comment:"
msgstr "注释:"
-#: ../plugins/itip-formatter/itip-view.c:977
+#: ../plugins/itip-formatter/itip-view.c:979
msgid "Send u_pdates to attendees"
msgstr "给出席者发送更新(_P)"
-#: ../plugins/itip-formatter/itip-view.c:986
+#: ../plugins/itip-formatter/itip-view.c:988
msgid "A_pply to all instances"
msgstr "应用到全部实例(_P)"
@@ -16029,7 +16231,7 @@ msgstr "Itip 格式化"
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
msgid ""
"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot; ?"
+"&quot;{1}&quot;?"
msgstr "“{0}”代理了该会议。您是否想要添加代理人“{1}”?"
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -16114,17 +16316,14 @@ 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"
msgstr "联系列表所有者(_O)"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
msgid "Get list _archive"
msgstr "获得列表存档(_A)"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
msgid "Get list _usage information"
msgstr "获得列表用法信息(_U)"
@@ -16144,17 +16343,14 @@ msgid ""
msgstr "提供邮件列表公共命令的动作(订阅、退订等等)。"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
msgid "_Post message to list"
msgstr "投递到列表(_P)"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
msgid "_Subscribe to list"
msgstr "订阅列表(_S)"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
msgid "_Un-subscribe to list"
msgstr "退订列表(_U)"
@@ -16232,15 +16428,27 @@ msgstr "编辑信件(_E)"
msgid "_Send message"
msgstr "发送信件(_S)"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+msgid "Contact List _Owner"
+msgstr "联系列表所有者(_O)"
+
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
msgid "Contact the owner of the mailing list this message belongs to"
msgstr "联系这封信所属邮件列表的所有者"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+msgid "Get List _Archive"
+msgstr "获得列表存档(_A)"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+msgid "Get List _Usage Information"
+msgstr "获得列表用法信息(_U)"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
msgid "Get an archive of the list this message belongs to"
msgstr "获取这封信所属邮件列表的存档"
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
msgid "Get information about the usage of the list this message belongs to"
msgstr "获取这封信所属邮件列表的用法信息"
@@ -16256,12 +16464,24 @@ msgstr "订阅这封信所属的邮件列表"
msgid "Unsubscribe to the mailing list this message belongs to"
msgstr "退订这封信所属的邮件列表"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+msgid "_Post Message to List"
+msgstr "投递到列表(_P)"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+msgid "_Subscribe to List"
+msgstr "订阅列表(_S)"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+msgid "_Unsubscribe from List"
+msgstr "退订列表(_U)"
+
#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
msgid "Mark All Read"
msgstr "全部标为已读"
#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark me_ssages as read"
+msgid "Mark Me_ssages as Read"
msgstr "把信件标记为已读(_S)"
#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
@@ -16519,16 +16739,16 @@ msgstr "保存附件..."
msgid "Save all attachments"
msgstr "保存全部附件"
-#: ../plugins/save-attachments/save-attachments.c:338
+#: ../plugins/save-attachments/save-attachments.c:340
msgid "Select save base name"
msgstr "选择保存基础名称"
-#: ../plugins/save-attachments/save-attachments.c:358
+#: ../plugins/save-attachments/save-attachments.c:359
msgid "MIME Type"
msgstr "MIME 类型"
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
+#: ../plugins/save-attachments/save-attachments.c:367
+#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
msgid "Save"
msgstr "保存"
@@ -16638,7 +16858,7 @@ msgid "RDF format (.rdf)"
msgstr "RDF 格式(.rdf)"
#: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:179
+#: ../plugins/save-calendar/save-calendar.c:180
msgid "Select destination file"
msgstr "选择目的文件"
@@ -16686,19 +16906,19 @@ msgstr ""
"\n"
"请单击“下一步”按钮继续。"
-#: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:138
+#: ../shell/e-shell-importer.c:149
msgid "Please select the information that you would like to import:"
msgstr "请选择您希望导入的信息:"
-#: ../plugins/startup-wizard/startup-wizard.c:155
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:153
+#: ../shell/e-shell-importer.c:411
#, c-format
msgid "From %s:"
msgstr "从 %s:"
-#: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:522
msgid "Importing data."
msgstr "正在导入数据。"
@@ -16784,35 +17004,39 @@ msgstr "侧边栏可见"
msgid "Skip development warning dialog"
msgstr "跳过开发警告对话框"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
msgid "Start in offline mode"
msgstr "以脱机模式启动"
#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+msgid "Statusbar is visible"
+msgstr "状态栏可见"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
msgid ""
"The configuration version of Evolution, with major/minor/configuration level "
"(for example \"2.6.0\")."
msgstr "Evolution 的配置版本,带主/次/配置级别(如“2.6.0”)。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
msgid "The default height for the main window, in pixels."
msgstr "主窗口的默认高度,以像素计。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
msgid "The default width for the main window, in pixels."
msgstr "主窗口的默认宽度,以像素计。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
msgid "The default width for the sidebar, in pixels."
msgstr "侧边栏的默认宽度,以像素计。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
msgid ""
"The last upgraded configuration version of Evolution, with major/minor/"
"configuration level (for example \"2.6.0\")."
msgstr "上次升级的 Evolution 配置版本,带主/次/配置级别(如“2.6.0”)。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
msgid ""
"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -16821,40 +17045,44 @@ msgstr ""
"窗口按钮的样式。可以是文字、图标、二者、工具栏。如果设置为工具栏,则工具栏的"
"样式由 GNOME 设置决定。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
msgid "Toolbar is visible"
msgstr "工具栏可见"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
msgid "Whether Evolution will start up in offline mode instead of online mode."
msgstr "是否以脱机模式而非联机模式启动 Evolution。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
msgid "Whether or not the window should be maximized."
msgstr "窗口是否应为最大化。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
msgid "Whether the sidebar should be visible."
msgstr "侧边栏是否可见。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+msgid "Whether the status bar should be visible."
+msgstr "状态栏是否可见。"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
msgid "Whether the toolbar should be visible."
msgstr "工具栏是否可见。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
msgid ""
"Whether the warning dialog in development versions of Evolution is skipped."
msgstr "是否跳过 Evoltuion 开发版本的警告。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
msgid "Whether the window buttons should be visible."
msgstr "窗口按钮是否可见。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:29
msgid "Window button style"
msgstr "窗口按钮样式"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:30
msgid "Window buttons are visible"
msgstr "窗口按钮可见"
@@ -16875,11 +17103,11 @@ msgstr "单击确定关闭这些连接,并转入脱机操作"
msgid "(Untitled)"
msgstr "(无标题)"
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:137
msgid "Choose the type of importer to run:"
msgstr "选择要运行的导入器类型:"
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:140
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list.\n"
@@ -16891,11 +17119,11 @@ msgstr ""
"\n"
"如果您不清楚,可以选择“自动”,Evolution 将尝试为您确定类型。"
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:146
msgid "Choose the destination for this import"
msgstr "选择此导入的目的位置"
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:152
msgid ""
"Evolution checked for settings to import from the following\n"
"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -16906,23 +17134,23 @@ msgstr ""
"iCalendar。并未发现可导入的设置。如果您想要再试一次,请单击\n"
"“上一步”按钮。\n"
-#: ../shell/e-shell-importer.c:285
+#: ../shell/e-shell-importer.c:291
msgid "F_ilename:"
msgstr "文件名(_I):"
-#: ../shell/e-shell-importer.c:290
+#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
msgid "Select a file"
msgstr "选择一个文件"
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:313
msgid "File _type:"
msgstr "文件类型(_T):"
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:349
msgid "Import data and settings from _older programs"
msgstr "从旧版程序中导入数据和设置(_O)"
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:352
msgid "Import a _single file"
msgstr "导入单个文件(_S)"
@@ -16980,7 +17208,7 @@ msgstr ""
msgid "_Work Online"
msgstr "联机工作(_W)"
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
msgid "_Work Offline"
msgstr "脱机工作(_W)"
@@ -17005,35 +17233,40 @@ msgstr "Evolution 目前脱机。单击该按钮可联机工作。"
msgid "Switch to %s"
msgstr "切换到 %s"
-#: ../shell/e-shell.c:633
+#: ../shell/e-shell.c:634
msgid "Uknown system error."
msgstr "未知的系统错误。"
-#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
+#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
#, c-format
msgid "%ld KB"
msgstr "%ld KB"
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:257
msgid "OK"
msgstr "确定"
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1264
msgid "Invalid arguments"
msgstr "无效参数"
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1266
msgid "Cannot register on OAF"
msgstr "无法注册到 OAF"
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1268
msgid "Configuration Database not found"
msgstr "找不到配置数据库"
-#: ../shell/e-user-creatable-items-handler.c:685
+#: ../shell/e-user-creatable-items-handler.c:678
+#: ../shell/e-user-creatable-items-handler.c:688
msgid "New"
msgstr "新建"
+#: ../shell/e-user-creatable-items-handler.c:693
+msgid " New "
+msgstr " 新建 "
+
#: ../shell/evolution-test-component.c:140
msgid "New Test"
msgstr "新建测试"
@@ -17084,7 +17317,7 @@ msgstr ""
"本助手将全程指导您将外部文件导入 Evolution。"
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:231
+#: ../shell/main.c:233
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -17116,7 +17349,7 @@ msgstr ""
"\n"
"我们希望您尽情享受我们努力工作的成果,我们也热切盼望着您的意见!\n"
-#: ../shell/main.c:255
+#: ../shell/main.c:257
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -17124,35 +17357,39 @@ msgstr ""
"感谢\n"
"Evolution 团队\n"
-#: ../shell/main.c:262
+#: ../shell/main.c:264
msgid "Do not tell me again"
msgstr "不要再通知我"
-#: ../shell/main.c:472
+#: ../shell/main.c:468
msgid "Start Evolution activating the specified component"
msgstr "启动 Evolution 并激活指定组件"
-#: ../shell/main.c:476
+#: ../shell/main.c:472
msgid "Start in online mode"
msgstr "以联机模式启动"
-#: ../shell/main.c:479
+#: ../shell/main.c:475
msgid "Forcibly shut down all Evolution components"
msgstr "强制关闭所有 Evolution 组件"
-#: ../shell/main.c:483
+#: ../shell/main.c:479
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "强制从 Evolution 1.4 重新升迁"
-#: ../shell/main.c:486
+#: ../shell/main.c:482
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
-#: ../shell/main.c:488
+#: ../shell/main.c:484
msgid "Disable loading of any plugins."
msgstr "禁止装入任何插件。"
-#: ../shell/main.c:519
+#: ../shell/main.c:515
+msgid "- The Evolution PIM and Email Client"
+msgstr "- Evolution 个人信息管理和邮件客户"
+
+#: ../shell/main.c:526
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -17567,7 +17804,7 @@ msgid "_Edit CA Trust"
msgstr "编辑 CA 信任(_E)"
#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:664
+#: ../smime/lib/e-cert-db.c:676
msgid "Certificate already exists"
msgstr "证书已经存在"
@@ -17799,6 +18036,12 @@ msgstr "将全部联系人复制到(_P)..."
msgid "Contact _Preview"
msgstr "联系人预览(_P)"
+#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "复制"
+
#: ../ui/evolution-addressbook.xml.h:7
msgid "Copy Selected Contacts to Another Folder..."
msgstr "把选中的联系人复制到其它文件夹..."
@@ -17895,12 +18138,12 @@ msgstr "把选中的联系人保存为 VCard。"
msgid "Save the contacts of the selected folder as VCard"
msgstr "把选中文件夹中的的联系人保存为 VCard"
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
msgid "Select All"
msgstr "全选"
#: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
#: ../ui/evolution-subscribe.xml.h:6
msgid "Select _All"
msgstr "全选(_A)"
@@ -17970,7 +18213,7 @@ msgstr "将联系人移至(_M)..."
msgid "_Move Folder Contacts To"
msgstr "将文件夹联系人移至(_M)"
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
msgid "_New"
msgstr "新建(_N)"
@@ -18031,6 +18274,7 @@ msgid "Month"
msgstr "月"
#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+#: ../widgets/misc/e-calendar.c:201
msgid "Next"
msgstr "下一项"
@@ -18039,7 +18283,7 @@ msgid "Previews the calendar to be printed"
msgstr "预览将要打印的日历"
#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:177
msgid "Previous"
msgstr "上一项"
@@ -18127,11 +18371,11 @@ msgstr "将选中文字剪切到剪贴板"
msgid "Paste from clipboard"
msgstr "从剪贴板粘贴"
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
msgid "Paste text from the clipboard"
msgstr "从剪贴板中粘贴文字"
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
msgid "Select all text"
msgstr "选中所有文字"
@@ -18166,30 +18410,31 @@ msgstr "单击此处可查看可用的帮助"
msgid "Close"
msgstr "关闭"
-#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "插入(_N)"
+
+#: ../ui/evolution-editor.xml.h:15 ../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-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
#: ../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-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
#: ../ui/evolution-message-composer.xml.h:47
#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
msgid "_File"
msgstr "文件(_F)"
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
+#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
msgid "_Help"
msgstr "帮助(_H)"
-#: ../ui/evolution-editor.xml.h:20
-msgid "_Insert"
-msgstr "插入(_I)"
-
#: ../ui/evolution-editor.xml.h:21
msgid "_Options"
msgstr "选项(_O)"
@@ -18287,6 +18532,11 @@ msgstr "切换是否将时间显示为忙"
msgid "_Alarms"
msgstr "提醒(_A)"
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "类别(_C)"
+
#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
#: ../ui/evolution-task-editor.xml.h:19
msgid "_Classification"
@@ -18352,53 +18602,73 @@ msgid "F_older"
msgstr "文件夹(_O)"
#: ../ui/evolution-mail-global.xml.h:9
-msgid "Message _Preview"
-msgstr "信件预览(_P)"
-
-#: ../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:12
+#: ../ui/evolution-mail-global.xml.h:11
msgid "Permanently remove all deleted messages from all folders"
msgstr "永久删除所有文件夹中的所有已删除的信件"
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:12
msgid "Search F_olders"
msgstr "搜索文件夹(_O)"
+#: ../ui/evolution-mail-global.xml.h:13
+msgid "Show Message _Preview"
+msgstr "显示信件预览(_P)"
+
#: ../ui/evolution-mail-global.xml.h:14
+msgid "Show message preview below the message list"
+msgstr "在信件列表下方显示信件预览"
+
+#: ../ui/evolution-mail-global.xml.h:15
+msgid "Show message preview side-by-side with the message list"
+msgstr "在信件列表旁显示信件预览"
+
+#: ../ui/evolution-mail-global.xml.h:16
msgid "Show message preview window"
msgstr "显示信件预览窗口"
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:17
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "订阅或取消订阅远程服务器上的文件夹"
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:18
+msgid "_Classic View"
+msgstr "分类视图(_C)"
+
+#: ../ui/evolution-mail-global.xml.h:19
msgid "_Copy Folder To..."
msgstr "文件夹复制到(_C)..."
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:20
msgid "_Message Filters"
msgstr "邮件过滤(_M)"
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:21
msgid "_Move Folder To..."
msgstr "文件夹移至(_M)..."
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:22
msgid "_New..."
msgstr "新建(_N)..."
+#: ../ui/evolution-mail-global.xml.h:23
+msgid "_Preview"
+msgstr "预览(_P)"
+
#.
#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
#.
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:27
msgid "_Subscriptions"
msgstr "订阅(_S)"
+#: ../ui/evolution-mail-global.xml.h:28
+msgid "_Vertical View"
+msgstr "垂直视图(_V)"
+
#: ../ui/evolution-mail-list.xml.h:1
msgid "Change the name of this folder"
msgstr "更改此文件夹的名称"
@@ -18956,6 +19226,10 @@ msgid "_Unread"
msgstr "未读(_U)"
#: ../ui/evolution-mail-message.xml.h:131
+msgid "_Zoom"
+msgstr "缩放(_Z)"
+
+#: ../ui/evolution-mail-message.xml.h:132
msgid "_Zoom In"
msgstr "放大(_Z)"
@@ -18963,7 +19237,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 "主工具栏"
@@ -19038,11 +19312,6 @@ msgstr "当您的信件被阅读时得到投递通知"
msgid "HT_ML"
msgstr "HT_ML"
-#: ../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 "打开文件"
@@ -19371,43 +19640,51 @@ msgstr "图标和文字(_A)"
msgid "Import data from other programs"
msgstr "从其它程序导入数据"
-#: ../ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:16
+msgid "La_yout"
+msgstr "布局(_Y)"
+
+#: ../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
-msgid "Show information about Evolution"
-msgstr "显示关于 Evolution 的信息"
-
#: ../ui/evolution.xml.h:24
-msgid "Side _Bar"
-msgstr "侧边栏(_B)"
+msgid "Show Side _Bar"
+msgstr "显示侧边栏(_B)"
#: ../ui/evolution.xml.h:25
-msgid "Status _Bar"
-msgstr "状态栏(_B)"
+msgid "Show _Status Bar"
+msgstr "显示状态栏(_S)"
#: ../ui/evolution.xml.h:26
+msgid "Show _Toolbar"
+msgstr "显示工具栏(_T)"
+
+#: ../ui/evolution.xml.h:27
+msgid "Show information about Evolution"
+msgstr "显示关于 Evolution 的信息"
+
+#: ../ui/evolution.xml.h:28
msgid "Submit Bug Report"
msgstr "提交错误报告"
@@ -19415,75 +19692,71 @@ msgstr "提交错误报告"
#. _label="Evolution _FAQ"/>
#.
#. <separator/>
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:33
msgid "Submit _Bug Report"
msgstr "提交错误报告(_B)"
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:34
msgid "Submit a bug report using Bug Buddy"
msgstr "用 Bug Buddy 提交错误报告"
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:35
msgid "Toggle whether we are working offline."
msgstr "切换是否脱机工作。"
-#: ../ui/evolution.xml.h:34
-msgid "Tool_bar"
-msgstr "工具栏(_B)"
-
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:36
msgid "Tool_bar style"
msgstr "工具栏样式(_B)"
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:37
msgid "View/Hide the Side Bar"
msgstr "查看/隐藏侧边栏"
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:38
msgid "View/Hide the Status Bar"
msgstr "查看/隐藏状态栏"
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:39
msgid "_About"
msgstr "关于(_A)"
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:40
msgid "_Close Window"
msgstr "关闭窗口(_C)"
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:43
msgid "_Forget Passwords"
msgstr "丢弃密码(_F)"
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
msgid "_Hide buttons"
msgstr "隐藏按钮(_H)"
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:46
msgid "_Icons only"
msgstr "只有图标(_I)"
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
msgid "_Quick Reference"
msgstr "快速首选项(_Q)"
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:49
msgid "_Quit"
msgstr "退出(_Q)"
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
msgid "_Switcher Appearance"
msgstr "切换器外观(_S)"
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
msgid "_Synchronization Options..."
msgstr "同步选项(_S)..."
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
msgid "_Text only"
msgstr "只有文字(_T)"
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
msgid "_Window"
msgstr "窗口(_W)"
@@ -19520,26 +19793,34 @@ msgid "_Work Week View"
msgstr "周工作视图(_W)"
#: ../views/mail/galview.xml.h:1
+msgid "As Sent Folder for Wi_de View"
+msgstr "对宽屏视图显示已发文件夹(_D)"
+
+#: ../views/mail/galview.xml.h:2
msgid "As _Sent Folder"
msgstr "作为已发文件夹(_S)"
-#: ../views/mail/galview.xml.h:2
+#: ../views/mail/galview.xml.h:3
msgid "By S_tatus"
msgstr "按状态(_T)"
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:4
msgid "By Se_nder"
msgstr "按发件人(_N)"
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:5
msgid "By Su_bject"
msgstr "按主题(_B)"
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:6
msgid "By _Follow Up Flag"
msgstr "按跟随标志(_F)"
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:7
+msgid "For _Wide View"
+msgstr "对宽屏视图(_W)"
+
+#: ../views/mail/galview.xml.h:8
msgid "_Messages"
msgstr "信件(_M)"
@@ -19555,28 +19836,32 @@ msgstr "到期日期(_D)"
msgid "With _Status"
msgstr "状态(_S)"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
+#. Put the ""UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
msgid "UTC"
msgstr "UTC"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
msgid "<b>Time Zones</b>"
msgstr "<b>时区</b>"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
msgid "<b>_Selection</b>"
msgstr "<b>选择(_S)</b>"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
msgid "Select a Time Zone"
msgstr "选择一个时区"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
msgid "TimeZone Combobox"
msgstr "时区组合框"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
msgid ""
"Use the left mouse button to zoom in on an area of the map and select a time "
"zone.\n"
@@ -19611,7 +19896,7 @@ msgid "_Edit..."
msgstr "编辑(_E)..."
#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1840
+#: ../widgets/table/e-table-header-item.c:1927
#: ../widgets/table/e-table-scrolled.c:222
#: ../widgets/table/e-table-scrolled.c:223
msgid "Table"
@@ -19625,11 +19910,11 @@ msgstr "实例"
msgid "Save Current View"
msgstr "保存当前视图"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
msgid "_Create new view"
msgstr "创建新视图(_C)"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
msgid "_Replace existing view"
msgstr "替换现有视图(_R)"
@@ -19664,26 +19949,31 @@ msgstr "工厂"
msgid "Define New View"
msgstr "定义新视图"
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
msgid "Name of new view:"
msgstr "新视图的名称:"
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
msgid "Type of View"
msgstr "视图类型"
-#: ../widgets/menus/gal-view-new-dialog.glade.h:4
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
msgid "Type of view:"
msgstr "视图类型:"
+#: ../widgets/misc/e-attachment.glade.h:5
+msgid "Suggest automatic display of attachment"
+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:416
+#: ../widgets/misc/e-calendar-item.c:418
msgid "MTWTFSS"
msgstr "一二三四五六日"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1093
+#: ../widgets/misc/e-calendar-item.c:1095
+#: ../widgets/misc/e-calendar-item.c:1748
msgid "%B %Y"
msgstr "%Y年%B"
@@ -19693,8 +19983,8 @@ msgstr "月历"
#: ../widgets/misc/e-canvas-background.c:457
#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
-#: ../widgets/text/e-text.c:3564
+#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3581
+#: ../widgets/text/e-text.c:3582
msgid "Fill color"
msgstr "填充颜色"
@@ -19703,16 +19993,16 @@ msgstr "填充颜色"
#: ../widgets/misc/e-canvas-background.c:471
#: ../widgets/misc/e-canvas-background.c:472 ../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:3570
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
-#: ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3588
+#: ../widgets/text/e-text.c:3589 ../widgets/text/e-text.c:3596
+#: ../widgets/text/e-text.c:3597
msgid "GDK fill color"
msgstr "GDK 填充颜色"
#: ../widgets/misc/e-canvas-background.c:478
#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
-#: ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3603
+#: ../widgets/text/e-text.c:3604
msgid "Fill stipple"
msgstr "点绘填充"
@@ -19751,11 +20041,11 @@ msgid "Minimum Width"
msgstr "最小宽度"
#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:206
msgid "Spacing"
msgstr "间距"
-#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-cell-date-edit.c:233
msgid "Now"
msgstr "现在"
@@ -19883,105 +20173,129 @@ msgstr "选择时间的组合框"
msgid "Time"
msgstr "时间"
+#: ../widgets/misc/e-dateedit.c:461
+msgid "No_w"
+msgstr "现在(_W)"
+
+#: ../widgets/misc/e-dateedit.c:467
+msgid "_Today"
+msgstr "今天(_T)"
+
#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
+#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
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:1439 ../widgets/misc/e-dateedit.c:1766
+#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
msgid "%I:%M %p"
msgstr "%p%I:%M"
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:182
msgid "Expanded"
msgstr "已展开"
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:183
msgid "Whether or not the expander is expanded"
msgstr "是否展开扩展器"
-#: ../widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:191
msgid "Text of the expander's label"
msgstr "扩展器标签的文本"
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:198
msgid "Use underline"
msgstr "使用下划线"
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:199
msgid ""
"If set, an underline in the text indicates the next character should be used "
"for the mnemonic accelerator key"
msgstr "如果设置了此选项,将会在表明加速键的字符下面加下划线"
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:207
msgid "Space to put between the label and the child"
msgstr "标签及其子空间中间的间距"
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:216
msgid "Label widget"
msgstr "标签部件"
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:217
msgid "A widget to display in place of the usual expander label"
msgstr "在通常扩展器标签的位置显示的部件"
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
msgid "Expander Size"
msgstr "扩展器大小"
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
msgid "Size of the expander arrow"
msgstr "扩展器箭头的大小"
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:232
msgid "Indicator Spacing"
msgstr "标识器间距"
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:233
msgid "Spacing around expander arrow"
msgstr "扩展器箭头旁边的间距"
#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:163
+#: ../widgets/misc/e-filter-bar.c:164
msgid "Advanced Search"
msgstr "高级搜索"
-#: ../widgets/misc/e-filter-bar.c:202
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:213
+msgid "Save Search"
+msgstr "保存搜索"
+
+#: ../widgets/misc/e-filter-bar.c:247
msgid "_Searches"
msgstr "搜索(_S)"
-#: ../widgets/misc/e-filter-bar.c:204
+#: ../widgets/misc/e-filter-bar.c:249
msgid "Searches"
msgstr "搜索"
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:227
-msgid "Save Search"
-msgstr "保存搜索"
-
-#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
msgid "_Save Search..."
msgstr "保存搜索(_S)..."
-#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
msgid "_Edit Saved Searches..."
msgstr "编辑保存的搜索(_E)..."
-#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
msgid "_Advanced Search..."
msgstr "高级搜索(_A)..."
+#: ../widgets/misc/e-filter-bar.h:103
+msgid "All Accounts"
+msgstr "全部账户"
+
+#: ../widgets/misc/e-filter-bar.h:104
+msgid "Current Account"
+msgstr "当前账户"
+
+#: ../widgets/misc/e-filter-bar.h:105
+msgid "Current Folder"
+msgstr "当前文件夹"
+
+#: ../widgets/misc/e-filter-bar.h:106
+msgid "Current Message"
+msgstr "当前信件"
+
#: ../widgets/misc/e-image-chooser.c:172
msgid "Choose Image"
msgstr "选择图像"
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:629
msgid "World Map"
msgstr "世界地图"
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:631
msgid ""
"Mouse-based interactive map widget for selecting timezone. Keyboard users "
"should select the timezone from the below combo box instead."
@@ -20013,45 +20327,45 @@ msgstr "回流模型"
msgid "Column width"
msgstr "列宽"
-#. To translators: This is the accessibility name of
-#. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:371
-msgid "Search"
-msgstr "搜索"
-
-#: ../widgets/misc/e-search-bar.c:588
+#: ../widgets/misc/e-search-bar.c:527
msgid "_Search"
msgstr "搜索(_S)"
-#: ../widgets/misc/e-search-bar.c:594
+#: ../widgets/misc/e-search-bar.c:533
msgid "_Find Now"
msgstr "立即查找(_F)"
-#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
+#: ../widgets/misc/e-search-bar.c:534
msgid "_Clear"
msgstr "清除(_C)"
-#: ../widgets/misc/e-search-bar.c:686
-msgid "Search Type"
-msgstr "搜索类型"
-
-#: ../widgets/misc/e-search-bar.c:890
+#: ../widgets/misc/e-search-bar.c:785
msgid "Item ID"
msgstr "项目 ID"
-#: ../widgets/misc/e-search-bar.c:897
-msgid "Subitem ID"
-msgstr "子项目 ID"
-
-#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
-#: ../widgets/text/e-text.c:3486
+#: ../widgets/misc/e-search-bar.c:792 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3503
+#: ../widgets/text/e-text.c:3504
msgid "Text"
msgstr "文字"
-#: ../widgets/misc/e-search-bar.c:984
-msgid "Find _Now"
-msgstr "立即查找(_N)"
+#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
+#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
+#: ../widgets/misc/e-search-bar.c:911
+msgid "Show: "
+msgstr "显示:"
+
+#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
+#. the term to search for
+#: ../widgets/misc/e-search-bar.c:927
+msgid "Sear_ch: "
+msgstr "搜索(_C):"
+
+#. To Translators: The " in " label is part of the Quick Search Bar, example:
+#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
+#: ../widgets/misc/e-search-bar.c:939
+msgid " i_n "
+msgstr " 于(_N) "
#: ../widgets/misc/e-selection-model-array.c:547
#: ../widgets/table/e-tree-selection-model.c:811
@@ -20100,8 +20414,8 @@ msgid "A_uto-delete sent item"
msgstr "自动删除已发项目(_U)"
#: ../widgets/misc/e-send-options.glade.h:6
-msgid "C_lassification"
-msgstr "分类(_L)"
+msgid "Classification"
+msgstr "分类"
#: ../widgets/misc/e-send-options.glade.h:7
msgid "Creat_e a sent item to track information"
@@ -20125,23 +20439,23 @@ msgstr ""
#: ../widgets/misc/e-send-options.glade.h:12
msgid ""
-"Public\n"
-"Private\n"
+"Normal\n"
+"Proprietary\n"
"Confidential\n"
+"Secret\n"
+"Top Secret\n"
+"For Your Eyes Only"
msgstr ""
-"公开\n"
-"私人\n"
-"机密\n"
-#: ../widgets/misc/e-send-options.glade.h:16
+#: ../widgets/misc/e-send-options.glade.h:18
msgid "R_eply requested"
msgstr "请求回复(_E)"
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:20
msgid "Sta_tus Tracking"
msgstr "状态跟踪(_T)"
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:21
msgid ""
"Undefined\n"
"High\n"
@@ -20153,51 +20467,51 @@ msgstr ""
"标准\n"
"低"
-#: ../widgets/misc/e-send-options.glade.h:23
+#: ../widgets/misc/e-send-options.glade.h:25
msgid "When acce_pted:"
msgstr "接受时(_P):"
-#: ../widgets/misc/e-send-options.glade.h:24
+#: ../widgets/misc/e-send-options.glade.h:26
msgid "When co_mpleted:"
msgstr "完成时(_M):"
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:27
msgid "When decli_ned:"
msgstr "拒绝时(_N):"
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:28
msgid "Wi_thin"
msgstr "少于(_T)"
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:29
msgid "_After:"
msgstr "之后(_A):"
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:30
msgid "_All information"
msgstr "全部信息(_A)"
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:31
msgid "_Delay message delivery"
msgstr "推迟信件投递(_D)"
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:32
msgid "_Delivered"
msgstr "已投递(_D)"
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:34
msgid "_Set expiration date"
msgstr "设置过期时间(_S)"
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:35
msgid "_Until:"
msgstr "直到(_U):"
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:36
msgid "_When convenient"
msgstr "方便时(_W)"
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:37
msgid "_When opened:"
msgstr "打开时(_W):"
@@ -20215,19 +20529,19 @@ msgstr "%s (%d%% 完成)"
msgid "Click here to go to URL"
msgstr "单击此处转到 URL"
-#: ../widgets/misc/gal-categories.glade.h:2
+#: ../widgets/misc/gal-categories.glade.h:1
msgid "Edit Master Category List..."
msgstr "编辑主类别列表..."
-#: ../widgets/misc/gal-categories.glade.h:3
+#: ../widgets/misc/gal-categories.glade.h:2
msgid "Item(s) belong to these _categories:"
msgstr "属于这些类别的项目(_C):"
-#: ../widgets/misc/gal-categories.glade.h:4
+#: ../widgets/misc/gal-categories.glade.h:3
msgid "_Available Categories:"
msgstr "可用类别(_A):"
-#: ../widgets/misc/gal-categories.glade.h:5
+#: ../widgets/misc/gal-categories.glade.h:4
msgid "categories"
msgstr "类别"
@@ -20251,23 +20565,23 @@ msgstr "聚焦列"
msgid "Unselected Column"
msgstr "未选列"
-#: ../widgets/table/e-cell-text.c:1749
+#: ../widgets/table/e-cell-text.c:1813
msgid "Strikeout Column"
msgstr "给列加删除线"
-#: ../widgets/table/e-cell-text.c:1756
+#: ../widgets/table/e-cell-text.c:1820
msgid "Underline Column"
msgstr "给列加下划线"
-#: ../widgets/table/e-cell-text.c:1763
+#: ../widgets/table/e-cell-text.c:1827
msgid "Bold Column"
msgstr "给列加粗"
-#: ../widgets/table/e-cell-text.c:1770
+#: ../widgets/table/e-cell-text.c:1834
msgid "Color Column"
msgstr "给列着色"
-#: ../widgets/table/e-cell-text.c:1784
+#: ../widgets/table/e-cell-text.c:1848
msgid "BG Color Column"
msgstr "给列着背景色"
@@ -20282,6 +20596,7 @@ msgstr "可用域(_V):"
#: ../widgets/table/e-table-config-no-group.glade.h:3
#: ../widgets/table/e-table-config.glade.h:2
+#: ../widgets/table/e-table-header-item.c:1593
msgid "Ascending"
msgstr "升序"
@@ -20292,6 +20607,7 @@ msgstr "全部清除"
#: ../widgets/table/e-table-config-no-group.glade.h:5
#: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-header-item.c:1593
msgid "Descending"
msgstr "降序"
@@ -20389,14 +20705,14 @@ msgstr "按顺序显示这些域(_S):"
#: ../widgets/table/e-table-field-chooser-dialog.c:77
#: ../widgets/table/e-table-field-chooser-item.c:635
#: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1805
+#: ../widgets/table/e-table-header-item.c:1892
msgid "DnD code"
msgstr "拖放代码"
#: ../widgets/table/e-table-field-chooser-dialog.c:84
#: ../widgets/table/e-table-field-chooser-item.c:642
#: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1819
+#: ../widgets/table/e-table-header-item.c:1906
msgid "Full Header"
msgstr "完整标题"
@@ -20414,25 +20730,17 @@ msgid ""
"the location in which you want it to appear."
msgstr "要在您的表格中添加列,请将其拖曳到您想要其出现的位置。"
-#: ../widgets/table/e-table-group-container.c:346
+#: ../widgets/table/e-table-group-container.c:345
#, c-format
msgid "%s : %s (%d item)"
-msgstr "%s:%s (%d 项)"
-
-#: ../widgets/table/e-table-group-container.c:347
-#, c-format
-msgid "%s : %s (%d items)"
-msgstr "%s:%s (%d 项)"
+msgid_plural "%s : %s (%d items)"
+msgstr[0] "%s:%s (%d 项)"
-#: ../widgets/table/e-table-group-container.c:352
+#: ../widgets/table/e-table-group-container.c:351
#, c-format
msgid "%s (%d item)"
-msgstr "%s (%d 项)"
-
-#: ../widgets/table/e-table-group-container.c:353
-#, c-format
-msgid "%s (%d items)"
-msgstr "%s (%d 项)"
+msgid_plural "%s (%d items)"
+msgstr[0] "%s (%d 项)"
#: ../widgets/table/e-table-group-container.c:897
#: ../widgets/table/e-table-group-container.c:898
@@ -20512,65 +20820,69 @@ msgstr "统一行高"
msgid "Frozen"
msgstr "冻结"
-#: ../widgets/table/e-table-header-item.c:1466
+#: ../widgets/table/e-table-header-item.c:1471
msgid "Customize Current View"
msgstr "自定义当前视图"
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1491
msgid "Sort Ascending"
msgstr "升序排序"
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1492
msgid "Sort Descending"
msgstr "降序排序"
-#: ../widgets/table/e-table-header-item.c:1488
+#: ../widgets/table/e-table-header-item.c:1493
msgid "Unsort"
msgstr "未排序"
-#: ../widgets/table/e-table-header-item.c:1490
+#: ../widgets/table/e-table-header-item.c:1495
msgid "Group By This Field"
msgstr "按该域分组"
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1496
msgid "Group By Box"
msgstr "按方框分组"
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1498
msgid "Remove This Column"
msgstr "删除该列"
-#: ../widgets/table/e-table-header-item.c:1494
+#: ../widgets/table/e-table-header-item.c:1499
msgid "Add a Column..."
msgstr "添加一列..."
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1501
msgid "Alignment"
msgstr "对齐"
-#: ../widgets/table/e-table-header-item.c:1497
+#: ../widgets/table/e-table-header-item.c:1502
msgid "Best Fit"
msgstr "最佳匹配"
-#: ../widgets/table/e-table-header-item.c:1498
+#: ../widgets/table/e-table-header-item.c:1503
msgid "Format Columns..."
msgstr "格式化列..."
-#: ../widgets/table/e-table-header-item.c:1500
+#: ../widgets/table/e-table-header-item.c:1505
msgid "Customize Current View..."
msgstr "自定义当前视图..."
-#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1554
+msgid "Sort By"
+msgstr "排序方式"
+
+#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
#: ../widgets/text/e-entry.c:1264
msgid "Fontset"
msgstr "字体集"
-#: ../widgets/table/e-table-header-item.c:1833
+#: ../widgets/table/e-table-header-item.c:1920
#: ../widgets/table/e-table-sorter.c:175
msgid "Sort Info"
msgstr "排序信息"
-#: ../widgets/table/e-table-header-item.c:1847
+#: ../widgets/table/e-table-header-item.c:1934
#: ../widgets/table/e-tree-scrolled.c:221
#: ../widgets/table/e-tree-scrolled.c:222
msgid "Tree"
@@ -20622,7 +20934,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:3478 ../widgets/text/e-text.c:3479
+#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
msgid "Event Processor"
msgstr "事件处理器"
@@ -20635,57 +20947,57 @@ msgid "GDKFont"
msgstr "GDKFont"
#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
+#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
msgid "Justification"
msgstr "两端对齐"
#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
msgid "Use ellipsis"
msgstr "使用椭圆"
#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
msgid "Ellipsis"
msgstr "椭圆"
#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
msgid "Line wrap"
msgstr "换行"
#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
msgid "Break characters"
msgstr "换行字符"
#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
msgid "Max lines"
msgstr "最多行数"
#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
msgid "Allow newlines"
msgstr "允许新行"
#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
msgid "Draw borders"
msgstr "绘制边框"
#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
msgid "Draw background"
msgstr "绘制背景"
#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
+#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
msgid "Draw button"
msgstr "绘制按钮"
#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
+#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
msgid "Cursor position"
msgstr "光标位置"
@@ -20693,58 +21005,58 @@ msgstr "光标位置"
msgid "Emulate label resize"
msgstr "模拟标签缩放"
-#: ../widgets/text/e-text.c:2721
+#: ../widgets/text/e-text.c:2739
msgid "Input Methods"
msgstr "输入法"
-#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
+#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
msgid "Bold"
msgstr "粗体"
-#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
+#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
msgid "Strikeout"
msgstr "删除线"
-#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
+#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
msgid "Anchor"
msgstr "锚点"
-#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
+#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
msgid "Clip Width"
msgstr "裁剪宽度"
-#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
+#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
msgid "Clip Height"
msgstr "裁剪高度"
-#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
+#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
msgid "Clip"
msgstr "裁剪"
-#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
+#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
msgid "Fill clip rectangle"
msgstr "填充裁剪矩形"
-#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
+#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
msgid "X Offset"
msgstr "水平偏移"
-#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
+#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
msgid "Y Offset"
msgstr "垂直偏移"
-#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
+#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
msgid "Text width"
msgstr "文字宽度"
-#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
+#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
msgid "Text height"
msgstr "文字高度"
-#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
+#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
msgid "IM Context"
msgstr "输入法环境"
-#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
+#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
msgid "Handle Popup"
msgstr "处理弹出"