aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFunda Wang <fwang@src.gnome.org>2008-09-07 18:37:12 +0800
committerFunda Wang <fwang@src.gnome.org>2008-09-07 18:37:12 +0800
commit1b4ecda6fd5b6b5ff29088e61ebe8215402d0fe2 (patch)
tree99ac6afb1eff03b09e2841a192766ba34031ac05
parentb12a1d29da54dde04d3193f781428cc6a40b93f2 (diff)
downloadgsoc2013-evolution-1b4ecda6fd5b6b5ff29088e61ebe8215402d0fe2.tar
gsoc2013-evolution-1b4ecda6fd5b6b5ff29088e61ebe8215402d0fe2.tar.gz
gsoc2013-evolution-1b4ecda6fd5b6b5ff29088e61ebe8215402d0fe2.tar.bz2
gsoc2013-evolution-1b4ecda6fd5b6b5ff29088e61ebe8215402d0fe2.tar.lz
gsoc2013-evolution-1b4ecda6fd5b6b5ff29088e61ebe8215402d0fe2.tar.xz
gsoc2013-evolution-1b4ecda6fd5b6b5ff29088e61ebe8215402d0fe2.tar.zst
gsoc2013-evolution-1b4ecda6fd5b6b5ff29088e61ebe8215402d0fe2.zip
Updated zh_CN translation.
svn path=/trunk/; revision=36269
-rw-r--r--po/ChangeLog4
-rw-r--r--po/zh_CN.po10142
2 files changed, 5363 insertions, 4783 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 9186eff3b9..175871e882 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-07 Funda Wang <fundawang@gmail.com>
+
+ * zh_CN.po: Updated zh_CN translation.
+
2008-09-07 Philip Withnall <philip@tecnocode.co.uk>
* en_GB.po: Updated British English translation.
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0ced3a8df5..8eb52008f5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,11 +5,12 @@
# Partly comes from Sun_l10n group, 2003
# Funda Wang <fundawang@linux.net.cn>, 2003, 2004, 2005, 2006.
#
+#: ../shell/main.c:589
msgid ""
msgstr ""
"Project-Id-Version: Evolution 2.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-23 20:44+0000\n"
+"POT-Creation-Date: 2008-09-06 16:13+0000\n"
"PO-Revision-Date: 2008-03-04 16:29+0800\n"
"Last-Translator: YangZhang <zyangmath@gmail.com>\n"
"Language-Team: Chinese i18n <i18n-zh@googlegroup.com>\n"
@@ -20,28 +21,27 @@ msgstr ""
#: ../a11y/addressbook/ea-addressbook-view.c:94
#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
-msgid "evolution addressbook"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution address book"
msgstr "evolution 地址簿"
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
msgid "New Contact"
msgstr "新建联系人"
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
msgid "New Contact List"
msgstr "新建联系人列表"
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
#, c-format
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:13
msgid "Open"
msgstr "打开"
@@ -57,63 +57,63 @@ msgstr "联系人:"
msgid "evolution minicard"
msgstr "evolution 袖珍卡"
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
msgid "It has alarms."
msgstr "有提醒。"
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
msgid "It has recurrences."
msgstr "有再现。"
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
msgid "It is a meeting."
msgstr "为会议。"
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:277
#, 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:279
msgid "Calendar Event: It has no summary."
msgstr "日历事件:无摘要。"
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
msgid "calendar view event"
msgstr "日历视图事件"
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
msgid "Grab Focus"
msgstr "获得焦点"
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
msgid "New Appointment"
msgstr "新建约会"
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
msgid "New All Day Event"
msgstr "新建全天事件"
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
msgid "New Meeting"
msgstr "新会议"
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
msgid "Go to Today"
msgstr "转到今天"
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
msgid "Go to Date"
msgstr "转到日期"
-#: ../a11y/calendar/ea-day-view-main-item.c:303
-#: ../a11y/calendar/ea-week-view-main-item.c:301
+#: ../a11y/calendar/ea-day-view-main-item.c:301
+#: ../a11y/calendar/ea-week-view-main-item.c:298
msgid "a table to view and select the current time range"
msgstr "可查看并选择当前时间范围的表"
#. 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
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
#, c-format
msgid "It has %d event."
msgid_plural "It has %d events."
@@ -121,14 +121,14 @@ msgstr[0] "有 %d 个事件。"
#. 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
+#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
msgid "It has no events."
msgstr "无事件。"
#. 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
+#: ../a11y/calendar/ea-day-view.c:159
#, c-format
msgid "Work Week View: %s. %s"
msgstr "周工作视图:%s。%s"
@@ -136,21 +136,21 @@ msgstr "周工作视图:%s。%s"
#. 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
+#: ../a11y/calendar/ea-day-view.c:165
#, c-format
msgid "Day View: %s. %s"
msgstr "日视图:%s。%s"
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
msgid "calendar view for a work week"
msgstr "工作周的日历视图"
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
msgid "calendar view for one or more days"
msgstr "一天或多天的日历视图"
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
msgid "%A %d %b %Y"
msgstr "%Y年%-m月%-d日%A"
@@ -160,32 +160,30 @@ msgstr "%Y年%-m月%-d日%A"
#. %d = day of month, %b = abbreviated month name.
#. You can change the order but don't change the
#. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:1363
-#: ../calendar/gui/e-day-view.c:2158
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../a11y/calendar/ea-gnome-calendar.c:189
+#: ../calendar/gui/calendar-component.c:760
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1568
+#: ../calendar/gui/e-week-view-main-item.c:335
msgid "%a %d %b"
msgstr "%-m月%-d日%A"
-#: ../a11y/calendar/ea-gnome-calendar.c:193
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../a11y/calendar/ea-gnome-calendar.c:196
#: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
msgid "%a %d %b %Y"
msgstr "%Y年%-m月%-d日%A"
-#: ../a11y/calendar/ea-gnome-calendar.c:217
-#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../a11y/calendar/ea-gnome-calendar.c:215
+#: ../a11y/calendar/ea-gnome-calendar.c:221
+#: ../a11y/calendar/ea-gnome-calendar.c:227
#: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
msgid "%d %b %Y"
msgstr "%Y年%-m月%-d日"
@@ -194,61 +192,59 @@ msgstr "%Y年%-m月%-d日"
#. strftime format %d = day of month, %b = abbreviated
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:1367
-#: ../calendar/gui/e-day-view.c:2174
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../a11y/calendar/ea-gnome-calendar.c:219
+#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/e-week-view-main-item.c:349
msgid "%d %b"
msgstr "%B%-d日"
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:772
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
+#: ../calendar/importers/icalendar-importer.c:766
msgid "Gnome Calendar"
msgstr "Gnome 日历"
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
msgid "search bar"
msgstr "搜索栏"
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
msgid "evolution calendar search bar"
msgstr "Evolution 日历和搜索栏"
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
msgid "Jump button"
msgstr "跳转按钮"
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
msgid "Click here, you can find more events."
msgstr "单击此处可查找更多事件。"
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
#, c-format
msgid "Month View: %s. %s"
msgstr "月视图:%s。%s"
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
#, c-format
msgid "Week View: %s. %s"
msgstr "周视图:%s。%s"
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
msgid "calendar view for a month"
msgstr "月日历视图"
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
msgid "calendar view for one or more weeks"
msgstr "一周或多周的日历视图"
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
msgid "popup"
msgstr "弹出"
#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
msgid "popup a child"
msgstr "弹出子对象"
@@ -260,12 +256,12 @@ msgstr "编辑"
msgid "begin editing this cell"
msgstr "开始编辑此单元格"
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
msgid "toggle"
msgstr "切换"
#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
msgid "toggle the cell"
msgstr "切换单元格"
@@ -285,47 +281,47 @@ msgstr "折叠"
msgid "collapses the row in the ETree containing this cell"
msgstr "在包含此单元格的 ETree 中折叠行"
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
msgid "Table Cell"
msgstr "表格单元格"
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:581
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
+#: ../widgets/table/e-table-click-to-add.c:580
msgid "click to add"
msgstr "单击可添加"
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
msgid "click"
msgstr "单击"
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
msgid "sort"
msgstr "排序"
-#: ../a11y/widgets/ea-calendar-item.c:298
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:295
+#: ../a11y/widgets/ea-calendar-item.c:301
msgid "%d %B %Y"
msgstr "%Y年%-m月%-d日"
-#: ../a11y/widgets/ea-calendar-item.c:306
+#: ../a11y/widgets/ea-calendar-item.c:303
#, c-format
msgid "Calendar: from %s to %s"
msgstr "日历:从 %s 到 %s"
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
msgid "evolution calendar item"
msgstr "Evolution 日历项目"
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:56
msgid "Combo Button"
msgstr "组合按钮"
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:66
msgid "Activate Default"
msgstr "激活默认"
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
msgid "Popup Menu"
msgstr "弹出菜单"
@@ -340,10 +336,10 @@ msgstr "激活"
#. For Translators: {0} is the name of the address book source
#: ../addressbook/addressbook.error.xml.h:2
msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
-msgstr "“{0}”是只读的地址簿源。切换到联系人视图,然后选中一个可"
-"接受联系人的地址簿。"
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr ""
+"“{0}”是只读的地址簿,无法修改。请从联系人视图的侧边栏中选择另外一个地址簿。"
#: ../addressbook/addressbook.error.xml.h:3
msgid ""
@@ -381,14 +377,14 @@ msgid "Could not get schema information for LDAP server."
msgstr "无法从 LDAP 服务器获取大纲信息。"
#: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
msgstr "无法删除地址簿。"
#: ../addressbook/addressbook.error.xml.h:11
msgid ""
"Currently you can access only GroupWise System Address Book from Evolution. "
"Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
msgstr ""
"目前您只能从 Evolution 中访问 GroupWise 系统地址簿。请使用其它 GroupWise 邮件"
"客户程序获得 GroupWise 中您最常联系的联系人以及 GroupWise 个人联系人文件夹。"
@@ -398,8 +394,8 @@ msgid "Delete address book '{0}'?"
msgstr "删除地址簿“{0}”吗?"
#: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
-msgstr "装入默认地址簿错误。"
+msgid "Error loading address book."
+msgstr "装入地址簿错误。"
#: ../addressbook/addressbook.error.xml.h:14
msgid "Error saving {0} to {1}: {2}"
@@ -411,7 +407,7 @@ msgstr "认证到 IMAP 服务器失败。"
#. Unknown error
#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
msgid "Failed to delete contact"
msgstr "删除联系人失败"
@@ -424,27 +420,23 @@ msgid "LDAP server did not respond with valid schema information."
msgstr "LDAP 服务器无法响应有效的大纲信息。"
#: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "权限被禁止。"
-
-#: ../addressbook/addressbook.error.xml.h:20
msgid "Server Version"
msgstr "服务器版本"
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
msgid "Some features may not work properly with your current server"
msgstr "某些特性可能无法在您目前的服务器下工作"
-#: ../addressbook/addressbook.error.xml.h:22
-msgid "The Evolution addressbook has quit unexpectedly."
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "The Evolution address book has quit unexpectedly."
msgstr "Evolution 地址簿异常退出。"
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:22
msgid ""
"The image you have selected is large. Do you want to resize and store it?"
msgstr "您所选择的图像太大。您是否想要缩放并存储?"
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:23
msgid ""
"This LDAP server may use an older version of LDAP, which does not support "
"this functionality or it may be misconfigured. Ask your administrator for "
@@ -453,53 +445,53 @@ msgstr ""
"此 LDAP 服务器可能使用较早版本的 LDAP,所以无法支持此功能,或者是配置错误。请"
"询问您的管理员有关支持的搜索基础一事。"
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This address book will be removed permanently."
-msgstr "此地址簿即将被永久删除。"
-
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook could not be opened."
+#: ../addressbook/addressbook.error.xml.h:24
+msgid "This address book could not be opened."
msgstr "无法打开此地址簿。"
-#: ../addressbook/addressbook.error.xml.h:27
-msgid "This addressbook server does not have any suggested search bases."
+#: ../addressbook/addressbook.error.xml.h:25
+msgid "This address book server does not have any suggested search bases."
msgstr "此地址簿服务器不支持任何建议的搜索基础。"
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
msgid ""
-"This addressbook server might be unreachable or the server name may be "
+"This address book server might be unreachable or the server name may be "
"misspelled or your network connection could be down."
msgstr "此地址簿服务器不可达,或者服务器名称拼错,又或者您的网络连接已断。"
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "此地址簿即将被永久删除。"
+
+#: ../addressbook/addressbook.error.xml.h:28
msgid "This server does not support LDAPv3 schema information."
msgstr "此服务器不支持 LDAPv3 大纲信息。"
-#: ../addressbook/addressbook.error.xml.h:30
-msgid "Unable to open addressbook"
+#: ../addressbook/addressbook.error.xml.h:29
+msgid "Unable to open address book"
msgstr "无法打开地址簿"
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
msgid "Unable to perform search."
msgstr "无法执行搜索。"
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
msgid "Unable to save {0}."
msgstr "无法保存 {0}。"
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
msgid "Would you like to save your changes?"
msgstr "您希望保存更改吗?"
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
msgid ""
-"You are attempting to move a contact from one addressbook to another but it "
+"You are attempting to move a contact from one address book to another but it "
"cannot be removed from the source. Do you want to save a copy instead?"
msgstr ""
"您即将把联系人从一个地址簿移至另外一个地址簿,但是无法从源地址簿删除该联系"
"人。您想要换作复制联系人吗?"
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:34
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results the server should be upgraded to "
@@ -508,6 +500,10 @@ msgstr ""
"您正在连接到不支持的 GroupWise 服务器,此时使用 Evolution 可能遇到问题。为了"
"得到最佳效果,服务器应该升级到 Evolution 支持的版本"
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "您没有足够的权限从地址簿中删除联系人。"
+
#: ../addressbook/addressbook.error.xml.h:36
msgid ""
"You have made modifications to this contact. Do you want to save these "
@@ -519,7 +515,7 @@ msgid ""
"Your contacts for {0} will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则 {0} 的联系人无法使用。"
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
#: ../plugins/groupwise-features/junk-settings.glade.h:4
#: ../plugins/groupwise-features/properties.glade.h:10
#: ../widgets/table/e-table-config.glade.h:18
@@ -542,9 +538,9 @@ msgstr "缩放(_R)"
msgid "_Use as it is"
msgstr "原样使用(_U)"
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
msgid "{0}"
msgstr "{0}"
@@ -553,17 +549,17 @@ msgstr "{0}"
msgid "{1}"
msgstr "{1}"
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
msgid "Default Sync Address:"
msgstr "默认同步地址:"
-#: ../addressbook/conduit/address-conduit.c:1319
#: ../addressbook/conduit/address-conduit.c:1320
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1321
+msgid "Could not load address book"
msgstr "无法装入地址簿"
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
msgid "Could not read pilot's Address application block"
msgstr "无法读入 Pilot 的地址应用程序块"
@@ -585,10 +581,10 @@ msgstr "在此配置自动补全"
#. Create the contacts group
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:582
msgid "Contacts"
msgstr "联系人"
@@ -597,7 +593,7 @@ msgid "Evolution Address Book"
msgstr "Evolution 地址簿"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
+msgid "Evolution Address Book address popup"
msgstr "Evolution 地址簿地址弹出框"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
@@ -613,8 +609,8 @@ msgid "Evolution Address Book component"
msgstr "Evolution 地址簿组件"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime 证书管理控件"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Evolution S/MIME 证书管理控件"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
msgid "Evolution folder settings configuration control"
@@ -628,12 +624,13 @@ msgstr "在此管理您的 S/MIME 证书"
#. On This Computer is always first and Search Folders is always last
#: ../addressbook/gui/component/addressbook-component.c:144
#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:583 ../calendar/gui/migration.c:1096
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:307
-#: ../mail/mail-vfolder.c:216
+#: ../calendar/gui/calendar-component.c:236
+#: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
+#: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1457
msgid "On This Computer"
msgstr "在此计算机中"
@@ -646,120 +643,124 @@ msgstr "在此计算机中"
#: ../addressbook/gui/component/addressbook-migrate.c:507
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
#: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:591 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:204
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
msgid "Personal"
msgstr "个人"
#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
#: ../addressbook/gui/component/addressbook-migrate.c:517
msgid "On LDAP Servers"
msgstr "在 LDAP 服务器上"
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:230
+msgctxt "New"
msgid "_Contact"
msgstr "联系人(_C)"
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
msgid "Create a new contact"
msgstr "创建一个新联系人"
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:238
+msgctxt "New"
msgid "Contact _List"
msgstr "联系人列表(_L)"
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
msgid "Create a new contact list"
msgstr "创建一个新的联系人列表"
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
msgid "New Address Book"
msgstr "新地址簿"
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:246
+msgctxt "New"
msgid "Address _Book"
msgstr "地址簿(_B)"
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
msgid "Create a new address book"
msgstr "创建新地址簿"
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
msgid "Failed upgrading Address Book settings or folders."
msgstr "升级地址簿设置或文件夹失败。"
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
msgid "Base"
msgstr "基础"
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
msgid "_Type:"
msgstr "类型(_T):"
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
msgid "Copy _book content locally for offline operation"
msgstr "将地址簿内容复制到本地以进行脱机操作(_B)"
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:982
#: ../addressbook/gui/component/ldap-config.glade.h:22
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../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:89
-#: ../plugins/itip-formatter/itip-formatter.c:2343
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2367
#: ../smime/gui/smime-ui.glade.h:28
msgid "General"
msgstr "常规"
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
msgid "Address Book"
msgstr "地址簿"
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:987
msgid "Server Information"
msgstr "服务器信息"
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:989
msgid "Authentication"
msgstr "身份验证"
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:992
#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:20
msgid "Details"
msgstr "细节"
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
msgid "Searching"
msgstr "搜索"
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:995
msgid "Downloading"
msgstr "下载"
-#: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/ldap-config.glade.h:11
msgid "Address Book Properties"
msgstr "地址簿属性"
#: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
msgid "Migrating..."
msgstr "正在升迁..."
#: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
#, c-format
-msgid "Migrating `%s':"
+msgid "Migrating '%s':"
msgstr "升迁“%s”:"
#: ../addressbook/gui/component/addressbook-migrate.c:645
@@ -811,70 +812,76 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的 Pilot 同步数据..."
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "将“%s”文件夹重命名为:"
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
msgid "Rename Folder"
msgstr "重命名文件夹"
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
msgid "Folder names cannot contain '/'"
msgstr "文件夹名不能含有字符“/”"
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
msgid "_New Address Book"
msgstr "新建地址簿(_N)"
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
msgid "Save As vCard..."
msgstr "另存为 vCard..."
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1385
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:939
+#: ../addressbook/gui/component/addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../calendar/gui/calendar-component.c:619
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:941
#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
#: ../ui/evolution-tasks.xml.h:24
msgid "_Delete"
msgstr "删除(_D)"
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-msgstr "属性(_P)..."
+#: ../addressbook/gui/component/addressbook-view.c:949
+#: ../calendar/gui/calendar-component.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:2035
+#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
+#: ../composer/e-msg-composer.c:1046 ../mail/em-folder-tree.c:2120
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "属性(_P)"
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
msgid "Contact Source Selector"
msgstr "联系人源选择器"
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
msgid "Accessing LDAP Server anonymously"
msgstr "匿名访问 LDAP 服务器"
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
msgid "Failed to authenticate.\n"
msgstr "认证失败。\n"
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../addressbook/gui/component/addressbook.c:214
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "输入 %s 的密码(用户 %s)"
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../addressbook/gui/component/addressbook.c:222
#: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
-#: ../smime/gui/component.c:50
+#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../smime/gui/component.c:49
msgid "Enter password"
msgstr "输入密码"
@@ -948,38 +955,35 @@ msgid "<b>Authentication</b>"
msgstr "<b>身份验证</b>"
#: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>显示</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
msgid "<b>Downloading</b>"
msgstr "<b>下载</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
msgid "<b>Searching</b>"
msgstr "<b>搜索</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>服务器信息</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
msgid "<b>Type:</b>"
msgstr "<b>类型:</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
msgid "Add Address Book"
msgstr "添加地址簿"
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:777
+#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../mail/em-account-editor.c:761
msgid "Always"
msgstr "总是"
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
msgid "Anonymously"
msgstr "匿名"
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+msgid "B_rowse this book until limit reached"
+msgstr "浏览此地址簿直到达到极限(_R)"
+
#: ../addressbook/gui/component/ldap-config.glade.h:16
msgid "Basic"
msgstr "基本"
@@ -1006,14 +1010,14 @@ msgid "Lo_gin:"
msgstr "登录(_G):"
#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../mail/em-account-editor.c:760
msgid "Never"
msgstr "从不"
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. It will not use an encrypted connection.
#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
+#: ../mail/em-account-editor.c:288
msgid "No encryption"
msgstr "不加密"
@@ -1025,7 +1029,7 @@ msgstr "一次"
#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
#. abbreviation.
#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:312
+#: ../mail/em-account-editor.c:296
msgid "SSL encryption"
msgstr "SSL 加密"
@@ -1091,7 +1095,7 @@ msgstr "支持的搜索起点"
#. the Mailer. TLS (Transport Layer Security) is commonly known by
#. this abbreviation.
#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:308
+#: ../mail/em-account-editor.c:292
msgid "TLS encryption"
msgstr "TLS 加密"
@@ -1180,8 +1184,8 @@ msgid "_Login method:"
msgstr "登录方式(_L):"
#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:175
#: ../plugins/groupwise-features/properties.glade.h:11
#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
msgid "_Name:"
@@ -1196,7 +1200,7 @@ msgid "_Search scope:"
msgstr "搜索范围(_S):"
#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:184
#: ../plugins/publish-calendar/publish-calendar.glade.h:26
msgid "_Server:"
msgstr "服务器(_S):"
@@ -1217,9 +1221,10 @@ msgstr "名片"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-http/calendar-http.c:279
#: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
msgid "minutes"
msgstr "分钟"
@@ -1260,7 +1265,7 @@ msgid "<b>Work</b>"
msgstr "<b>工作</b>"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
#: ../addressbook/gui/widgets/eab-contact-display.c:614
msgid "AIM"
msgstr "AIM"
@@ -1272,16 +1277,16 @@ msgid "Ca_tegories..."
msgstr "类别(_T)..."
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
msgid "Contact"
msgstr "联系人"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
msgid "Contact Editor"
msgstr "联系人编辑器"
@@ -1294,7 +1299,7 @@ msgid "Image"
msgstr "图像"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
msgid "MSN Messenger"
msgstr "MSN Messenger"
@@ -1307,7 +1312,7 @@ msgid "Nic_kname:"
msgstr "昵称(_K):"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
msgid "Novell Groupwise"
msgstr "Novell Groupwise"
@@ -1321,11 +1326,11 @@ msgstr "电话"
#. red
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
#: ../addressbook/gui/widgets/eab-contact-display.c:57
#: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
msgid "Work"
msgstr "工作"
@@ -1347,8 +1352,8 @@ msgid "_Birthday:"
msgstr "生日(_B):"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
#: ../plugins/itip-formatter/itip-view.c:1850
msgid "_Calendar:"
msgstr "日历(_C):"
@@ -1437,1119 +1442,1121 @@ msgstr "何处(_W):"
msgid "_Zip/Postal Code:"
msgstr "邮政编码(_Z):"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
#: ../addressbook/gui/widgets/eab-contact-display.c:640
#: ../addressbook/gui/widgets/eab-contact-display.c:655
msgid "Address"
msgstr "地址"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
#: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
-#: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../widgets/menus/gal-define-views-model.c:178
+#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
msgid "Editable"
msgstr "可编辑"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
msgid "United States"
msgstr "美国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
msgid "Afghanistan"
msgstr "阿富汗"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
msgid "Albania"
msgstr "阿尔巴尼亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
msgid "Algeria"
msgstr "阿尔及利亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
msgid "American Samoa"
msgstr "美洲萨摩亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
msgid "Andorra"
msgstr "安道尔"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
msgid "Angola"
msgstr "安哥拉"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
msgid "Anguilla"
msgstr "安圭拉"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
msgid "Antarctica"
msgstr "南极洲"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
msgid "Antigua And Barbuda"
msgstr "安提瓜和巴布达"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
msgid "Argentina"
msgstr "阿根廷"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
msgid "Armenia"
msgstr "亚美尼亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
msgid "Aruba"
msgstr "阿鲁巴岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
msgid "Australia"
msgstr "澳大利亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
msgid "Austria"
msgstr "奥地利"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
msgid "Azerbaijan"
msgstr "阿塞拜疆"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
msgid "Bahamas"
msgstr "巴哈马群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
msgid "Bahrain"
msgstr "巴林岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
msgid "Bangladesh"
msgstr "孟加拉国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
msgid "Barbados"
msgstr "巴巴多斯岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
msgid "Belarus"
msgstr "白俄罗斯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
msgid "Belgium"
msgstr "比利时"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
msgid "Belize"
msgstr "伯利兹"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
msgid "Benin"
msgstr "贝宁"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
msgid "Bermuda"
msgstr "百慕大群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
msgid "Bhutan"
msgstr "不丹"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
msgid "Bolivia"
msgstr "玻利维亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
msgid "Bosnia And Herzegowina"
msgstr "波斯尼亚和黑赛哥维纳"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
msgid "Botswana"
msgstr "博茨瓦纳"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
msgid "Bouvet Island"
msgstr "布维岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
msgid "Brazil"
msgstr "巴西"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
msgid "British Indian Ocean Territory"
msgstr "英属印度洋地区"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
msgid "Brunei Darussalam"
msgstr "文莱德鲁萨兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
msgid "Bulgaria"
msgstr "保加利亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
msgid "Burkina Faso"
msgstr "布基纳法索"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
msgid "Burundi"
msgstr "布隆迪"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
msgid "Cambodia"
msgstr "柬埔寨"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
msgid "Cameroon"
msgstr "喀麦隆"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
msgid "Canada"
msgstr "加拿大"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
msgid "Cape Verde"
msgstr "佛得角"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
msgid "Cayman Islands"
msgstr "开曼群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
msgid "Central African Republic"
msgstr "中非共和国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
msgid "Chad"
msgstr "乍得"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
msgid "Chile"
msgstr "智利"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
msgid "China"
msgstr "中国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
msgid "Christmas Island"
msgstr "圣诞岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
msgid "Cocos (Keeling) Islands"
msgstr "科科斯群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
msgid "Colombia"
msgstr "哥伦比亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
msgid "Comoros"
msgstr "科摩罗群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
msgid "Congo"
msgstr "刚果"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
msgid "Congo, The Democratic Republic Of The"
msgstr "刚果人民民主共和国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
msgid "Cook Islands"
msgstr "库克群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
msgid "Costa Rica"
msgstr "哥斯达黎加"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
msgid "Cote d'Ivoire"
msgstr "科特迪瓦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
msgid "Croatia"
msgstr "克罗地亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
msgid "Cuba"
msgstr "古巴"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
msgid "Cyprus"
msgstr "塞浦路斯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
msgid "Czech Republic"
msgstr "捷克共和国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
msgid "Denmark"
msgstr "丹麦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
msgid "Djibouti"
msgstr "吉布提群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
msgid "Dominica"
msgstr "多米尼加"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
msgid "Dominican Republic"
msgstr "多米尼加共和国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
msgid "Ecuador"
msgstr "厄瓜多尔"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
msgid "Egypt"
msgstr "埃及"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
msgid "El Salvador"
msgstr "萨尔瓦多"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
msgid "Equatorial Guinea"
msgstr "赤道几内亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
msgid "Eritrea"
msgstr "厄立特里亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
msgid "Estonia"
msgstr "爱沙尼亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
msgid "Ethiopia"
msgstr "埃塞俄比亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
msgid "Falkland Islands"
msgstr "福克兰群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
msgid "Faroe Islands"
msgstr "法罗群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
msgid "Fiji"
msgstr "斐济"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
msgid "Finland"
msgstr "芬兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
msgid "France"
msgstr "法国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
msgid "French Guiana"
msgstr "法属圭亚那"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
msgid "French Polynesia"
msgstr "法属波利尼西亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
msgid "French Southern Territories"
msgstr "法属南部地区"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
msgid "Gabon"
msgstr "加蓬"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
msgid "Gambia"
msgstr "冈比亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
msgid "Georgia"
msgstr "格鲁吉亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
msgid "Germany"
msgstr "德国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
msgid "Ghana"
msgstr "加纳"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
msgid "Gibraltar"
msgstr "直布罗陀"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
msgid "Greece"
msgstr "希腊"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
msgid "Greenland"
msgstr "格陵兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
msgid "Grenada"
msgstr "格林纳达"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
msgid "Guadeloupe"
msgstr "瓜德罗普岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
msgid "Guam"
msgstr "关岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
msgid "Guatemala"
msgstr "危地马拉"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
msgid "Guernsey"
msgstr "格恩西岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
msgid "Guinea"
msgstr "几内亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
msgstr "几内亚比绍"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
msgid "Guyana"
msgstr "圭亚那"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
msgid "Haiti"
msgstr "海地"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
msgid "Heard And McDonald Islands"
msgstr "赫德和麦克唐纳群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
msgid "Holy See"
msgstr "圣座"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
msgid "Honduras"
msgstr "洪都拉斯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
msgid "Hong Kong"
msgstr "中国香港特别行政区"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
msgid "Hungary"
msgstr "匈牙利"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
msgid "Iceland"
msgstr "冰岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
msgid "India"
msgstr "印度"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
msgid "Indonesia"
msgstr "印度尼西亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
msgid "Iran"
msgstr "伊朗"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
msgid "Iraq"
msgstr "伊拉克"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
msgid "Ireland"
msgstr "爱尔兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
msgid "Isle of Man"
msgstr "Isle of Man"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
msgid "Israel"
msgstr "以色列"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
msgid "Italy"
msgstr "意大利"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
msgid "Jamaica"
msgstr "牙买加"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
msgid "Japan"
msgstr "日本"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
msgid "Jersey"
msgstr "杰尔西"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
msgid "Jordan"
msgstr "约旦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
msgid "Kazakhstan"
msgstr "哈萨克斯坦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
msgid "Kenya"
msgstr "肯尼亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
msgid "Kiribati"
msgstr "基里巴斯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
msgid "Korea, Democratic People's Republic Of"
msgstr "韩国人民民主共和国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
msgid "Korea, Republic Of"
msgstr "韩国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
msgid "Kuwait"
msgstr "科威特"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
msgid "Kyrgyzstan"
msgstr "吉尔吉斯斯坦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
msgid "Laos"
msgstr "老挝"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
msgid "Latvia"
msgstr "拉脱维亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
msgid "Lebanon"
msgstr "黎巴嫩"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
msgid "Lesotho"
msgstr "莱索托"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
msgid "Liberia"
msgstr "利比里亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
msgid "Libya"
msgstr "利比亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
msgid "Liechtenstein"
msgstr "列支敦士登"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
msgid "Lithuania"
msgstr "立陶宛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
msgid "Luxembourg"
msgstr "卢森堡"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
msgid "Macao"
msgstr "中国澳门特别行政区"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
msgid "Macedonia"
msgstr "马其顿"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
msgid "Madagascar"
msgstr "马达加斯加"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
msgid "Malawi"
msgstr "马拉维"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
msgid "Malaysia"
msgstr "马来西亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
msgid "Maldives"
msgstr "马尔代夫"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
msgid "Mali"
msgstr "马里"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
msgid "Malta"
msgstr "马耳他"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
msgid "Marshall Islands"
msgstr "马绍尔群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
msgid "Martinique"
msgstr "马提尼可岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
msgid "Mauritania"
msgstr "毛里塔尼亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
msgid "Mauritius"
msgstr "毛里求斯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
msgid "Mayotte"
msgstr "马约特岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
msgid "Mexico"
msgstr "墨西哥"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
msgid "Micronesia"
msgstr "密克罗尼西亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
msgid "Moldova, Republic Of"
msgstr "摩尔多瓦共和国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
msgid "Monaco"
msgstr "摩纳哥"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
msgid "Mongolia"
msgstr "蒙古"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
msgid "Montserrat"
msgstr "蒙特塞拉特群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
msgid "Morocco"
msgstr "摩洛哥"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
msgid "Mozambique"
msgstr "莫桑比克"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
msgid "Myanmar"
msgstr "缅甸"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
msgid "Namibia"
msgstr "纳米比亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
msgid "Nauru"
msgstr "瑙鲁"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
msgid "Nepal"
msgstr "尼泊尔"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
msgid "Netherlands"
msgstr "荷兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
msgid "Netherlands Antilles"
msgstr "荷属安的列斯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
msgid "New Caledonia"
msgstr "新喀里多尼亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
msgid "New Zealand"
msgstr "新西兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
msgid "Nicaragua"
msgstr "尼加拉瓜"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
msgid "Niger"
msgstr "尼日尔"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
msgid "Nigeria"
msgstr "尼日利亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
msgid "Niue"
msgstr "纽埃岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
msgid "Norfolk Island"
msgstr "诺福克岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
msgid "Northern Mariana Islands"
msgstr "北马里亚那群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
msgid "Norway"
msgstr "挪威"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
msgid "Oman"
msgstr "阿曼"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
msgid "Pakistan"
msgstr "巴基斯坦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
msgid "Palau"
msgstr "帕劳群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
msgid "Palestinian Territory"
msgstr "巴勒斯坦地区"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
msgid "Panama"
msgstr "巴拿马"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
msgid "Papua New Guinea"
msgstr "巴布亚新几内亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
msgid "Paraguay"
msgstr "巴拉圭"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
msgid "Peru"
msgstr "秘鲁"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
msgid "Philippines"
msgstr "菲利宾"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
msgid "Pitcairn"
msgstr "皮特克恩岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
msgid "Poland"
msgstr "波兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
msgid "Portugal"
msgstr "葡萄牙"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
msgid "Puerto Rico"
msgstr "波多黎各"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
msgid "Qatar"
msgstr "卡塔尔"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
msgid "Reunion"
msgstr "留尼汪"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
msgid "Romania"
msgstr "罗马尼亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
msgid "Russian Federation"
msgstr "俄罗斯联邦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
msgid "Rwanda"
msgstr "卢旺达"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
msgid "Saint Kitts And Nevis"
msgstr "圣基德和吉维斯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
msgid "Saint Lucia"
msgstr "圣卢西亚岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
msgid "Saint Vincent And The Grenadines"
msgstr "圣文森特和格林纳达"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
msgid "Samoa"
msgstr "萨摩亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
msgid "San Marino"
msgstr "圣马力诺"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
msgid "Sao Tome And Principe"
msgstr "圣多美和普林西比"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
msgid "Saudi Arabia"
msgstr "沙特阿拉伯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
msgid "Senegal"
msgstr "塞内加尔"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
msgid "Serbia And Montenegro"
msgstr "塞尔维亚和黑山"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
msgid "Seychelles"
msgstr "塞舌尔"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
msgid "Sierra Leone"
msgstr "塞拉利昂"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
msgid "Singapore"
msgstr "新加坡"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
msgid "Slovakia"
msgstr "斯洛伐克"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
msgid "Slovenia"
msgstr "斯洛文尼亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
msgid "Solomon Islands"
msgstr "所罗门群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
msgid "Somalia"
msgstr "索马里"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
msgid "South Africa"
msgstr "南非"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
msgid "South Georgia And The South Sandwich Islands"
msgstr "南乔治亚和南三文治群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
msgid "Spain"
msgstr "西班牙"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
msgid "Sri Lanka"
msgstr "斯里兰卡"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
msgid "St. Helena"
msgstr "圣赫勒拿岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
msgid "St. Pierre And Miquelon"
msgstr "圣皮埃尔和麦克伦群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
msgid "Sudan"
msgstr "苏丹"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
msgid "Suriname"
msgstr "苏里南"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
msgid "Svalbard And Jan Mayen Islands"
msgstr "斯瓦巴和尖棉群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
msgid "Swaziland"
msgstr "斯威士兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
msgid "Sweden"
msgstr "瑞典"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
msgid "Switzerland"
msgstr "瑞士"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
msgid "Syria"
msgstr "叙利亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
msgid "Taiwan"
msgstr "中国台湾"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
msgid "Tajikistan"
msgstr "塔吉克斯坦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
msgid "Tanzania, United Republic Of"
msgstr "坦桑尼亚联邦共和国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
msgid "Thailand"
msgstr "泰国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
msgid "Timor-Leste"
msgstr "东帝汶"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
msgid "Togo"
msgstr "多哥"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
msgid "Tokelau"
msgstr "托克劳群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
msgid "Tonga"
msgstr "汤加"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
msgid "Trinidad And Tobago"
msgstr "特里尼达和多巴哥"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
msgid "Tunisia"
msgstr "突尼斯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
msgid "Turkey"
msgstr "土耳其"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
msgid "Turkmenistan"
msgstr "土库曼斯坦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
msgid "Turks And Caicos Islands"
msgstr "特克斯和凯科斯群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
msgid "Tuvalu"
msgstr "图瓦卢"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
msgid "Uganda"
msgstr "乌干达"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
msgid "Ukraine"
msgstr "乌克兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
msgid "United Arab Emirates"
msgstr "阿拉伯联合酋长国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
msgid "United Kingdom"
msgstr "英国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
msgid "United States Minor Outlying Islands"
msgstr "美国小型外岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
msgid "Uruguay"
msgstr "乌拉圭"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
msgid "Uzbekistan"
msgstr "乌兹别克斯坦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
msgid "Vanuatu"
msgstr "努瓦阿图"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
msgid "Venezuela"
msgstr "委内瑞拉"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
msgid "Viet Nam"
msgstr "越南"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
msgid "Virgin Islands, British"
msgstr "英属处女群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
msgid "Virgin Islands, U.S."
msgstr "美属处女群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
msgid "Wallis And Futuna Islands"
msgstr "瓦利斯和富图纳群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
msgid "Western Sahara"
msgstr "西撒哈拉"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
msgid "Yemen"
msgstr "也门"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
msgid "Zambia"
msgstr "赞比亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
msgid "Zimbabwe"
msgstr "津巴布韦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../plugins/exchange-operations/exchange-delegates.c:954
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/save-attachments/save-attachments.c:350
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
msgid "Name"
msgstr "姓名"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
msgid "AOL Instant Messenger"
msgstr "AOL 即时通讯程序"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
#: ../addressbook/gui/widgets/eab-contact-display.c:617
msgid "Jabber"
msgstr "Jabber"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
msgid "Yahoo Messenger"
msgstr "雅虎通"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
msgid "Gadu-Gadu Messenger"
msgstr "Gadu-Gadu 即时通讯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
#: ../addressbook/gui/widgets/eab-contact-display.c:616
msgid "ICQ"
msgstr "ICQ"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
msgid "Service"
msgstr "服务"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
msgid "Location"
msgstr "位置"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
msgid "Username"
msgstr "用户名"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
#: ../addressbook/gui/widgets/eab-contact-display.c:58
msgid "Home"
msgstr "家庭"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
#: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
msgid "Other"
msgstr "其它"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
#: ../addressbook/gui/widgets/eab-contact-display.c:619
msgid "Yahoo"
msgstr "雅虎"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
#: ../addressbook/gui/widgets/eab-contact-display.c:620
msgid "Gadu-Gadu"
msgstr "Gadu-Gadu"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
#: ../addressbook/gui/widgets/eab-contact-display.c:618
msgid "MSN"
msgstr "MSN"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
#: ../addressbook/gui/widgets/eab-contact-display.c:615
msgid "GroupWise"
msgstr "GroupWise"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
msgid "Source Book"
msgstr "来源地址簿"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
msgid "Target Book"
msgstr "目标地址簿"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
msgid "Is New Contact"
msgstr "为新联系人"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
msgid "Writable Fields"
msgstr "可写域"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
msgid "Required Fields"
msgstr "必需域"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
msgid "Changed"
msgstr "已更改"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
#, c-format
msgid "Contact Editor - %s"
msgstr "联系人编辑器 - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
msgid "Please select an image for this contact"
msgstr "请选择此联系人的图像"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
msgid "_No image"
msgstr "无图像(_N)"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2557,67 +2564,67 @@ msgstr ""
"联系人数据无效:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
#, c-format
msgid "'%s' has an invalid format"
msgstr "“%s”的格式无效"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
#, c-format
msgid "%s'%s' has an invalid format"
msgstr "%s“%s”的格式无效"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
#, c-format
msgid "%s'%s' is empty"
msgstr "%s“%s”为空"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
msgid "Invalid contact."
msgstr "无效的联系人。"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
msgid "Contact Quick-Add"
msgstr "快速添加联系人"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
msgid "_Edit Full"
msgstr "编辑全名(_E)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
msgid "_Full name"
msgstr "全名(_F)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
msgid "E_mail"
msgstr "电子邮件(_M)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
msgid "_Select Address Book"
msgstr "选择地址簿(_S)"
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
#, c-format
msgid ""
"Are you sure you want\n"
"to delete contact list (%s)?"
msgstr "您确定要删除联系人列表(%s)吗?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
msgid ""
"Are you sure you want\n"
"to delete these contact lists?"
msgstr "您确定要删除这些联系人列表吗?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
#, c-format
msgid ""
"Are you sure you want\n"
"to delete contact (%s)?"
msgstr "您确定要删除联系人(%s)吗?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
msgid ""
"Are you sure you want\n"
"to delete these contacts?"
@@ -2723,7 +2730,7 @@ msgstr "即时通讯服务(_I):"
#: ../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-calendar.c:243
#: ../plugins/exchange-operations/exchange-contacts.c:234
msgid "_Location:"
msgstr "位置(_L):"
@@ -2733,7 +2740,7 @@ msgid "<b>Members</b>"
msgstr "<b>成员</b>"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
msgid "Contact List Editor"
msgstr "联系人列表编辑器"
@@ -2753,27 +2760,28 @@ msgstr "列表名称(_L):"
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:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
msgid "Contact List Members"
msgstr "联系人列表成员"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+msgid "_Members"
+msgstr "成员(_M)"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
#: ../addressbook/gui/widgets/e-addressbook-model.c:298
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:217
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
msgid "Book"
msgstr "地址簿"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
msgid "Is New List"
msgstr "为新列表"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "成员(_M)"
-
#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
msgid "Changed Contact:"
msgstr "更改了的联系人:"
@@ -2809,40 +2817,40 @@ msgstr ""
"此联系人的姓名或地址已经在本文件夹中存在了。\n"
"您一定要添加吗?"
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "合并联系人"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
msgid "_Merge"
msgstr "合并(_M)"
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "合并联系人"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:267
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
#: ../addressbook/gui/widgets/eab-contact-display.c:592
#: ../addressbook/gui/widgets/eab-contact-display.c:597
#: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:860
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
msgid "Email"
msgstr "电子邮件"
#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
msgid "Any field contains"
msgstr "任何域含有"
#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
msgid "Email begins with"
msgstr "邮件以此开头"
#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "姓名以此开头"
+msgid "Name contains"
+msgstr "姓名含有"
#: ../addressbook/gui/widgets/e-addressbook-model.c:150
msgid "No contacts"
@@ -2855,10 +2863,10 @@ msgid_plural "%d contacts"
msgstr[0] "%d 个联系人"
#: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
msgid "Query"
msgstr "查询"
@@ -2866,123 +2874,119 @@ msgstr "查询"
msgid "Error getting book view"
msgstr "获取名簿视图出错"
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
-#: ../widgets/table/e-table-click-to-add.c:510
-#: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../widgets/text/e-text.c:3551
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
+#: ../widgets/table/e-table-click-to-add.c:509
+#: ../widgets/table/e-table-selection-model.c:302
+#: ../widgets/table/e-table.c:3353
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
msgid "Model"
msgstr "模型"
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
msgid "Error modifying card"
msgstr "修改名片错误"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "姓名以此开头"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
msgid "Source"
msgstr "来源"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../calendar/gui/e-meeting-list-view.c:508
#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
#: ../calendar/gui/e-memo-table.etspec.h:5
msgid "Type"
msgstr "类型"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
msgid "Save as vCard..."
msgstr "另存为 VCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1363
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:922
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/e-calendar-table.c:1574
+#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
#: ../ui/evolution-addressbook.xml.h:56
msgid "_Open"
msgstr "打开(_O)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
msgid "_New Contact..."
msgstr "新建联系人(_N)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
msgid "New Contact _List..."
msgstr "新建联系人列表(_L)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
msgid "_Save as vCard..."
msgstr "另存为 vCard(_S)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
msgid "_Forward Contact"
msgstr "转发联系人(_F)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
msgid "_Forward Contacts"
msgstr "转发联系人(_F)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
msgid "Send _Message to Contact"
msgstr "给联系人发信件(_M)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
msgid "Send _Message to List"
msgstr "给列表发信件(_M)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
msgid "Send _Message to Contacts"
msgstr "给联系人发信件(_M)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
msgid "_Print"
msgstr "打印(_P)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
msgid "Cop_y to Address Book..."
msgstr "复制到地址簿(_Y)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
msgid "Mo_ve to Address Book..."
msgstr "移至地址簿(_V)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
msgid "Cu_t"
msgstr "剪切(_T)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:930
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:1013
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:480
+#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2057 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
#: ../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-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
#: ../ui/evolution-tasks.xml.h:23
msgid "_Copy"
msgstr "复制(_C)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
msgid "P_aste"
msgstr "粘贴(_A)"
#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
-#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
-#: ../calendar/gui/cal-search-bar.c:681
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
+#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
+#: ../calendar/gui/cal-search-bar.c:687
msgid "Any Category"
msgstr "任何类别"
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Other error"
-msgstr "其它错误"
-
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
#: ../addressbook/gui/widgets/eab-contact-display.c:634
msgid "Assistant"
@@ -3014,7 +3018,7 @@ msgstr "车载电话"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:169
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
#: ../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
@@ -3115,9 +3119,9 @@ msgid "Radio"
msgstr "收音机"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../calendar/gui/e-meeting-list-view.c:520
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
msgid "Role"
msgstr "角色"
@@ -3153,38 +3157,38 @@ msgid "Web Site"
msgstr "网站"
#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
-#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
-#: ../widgets/table/e-table-click-to-add.c:524
+#: ../widgets/table/e-table-click-to-add.c:523
#: ../widgets/table/e-table-col.c:99
#: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../widgets/table/e-table-group-container.c:992
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
+#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
msgid "Width"
msgstr "宽度"
#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
-#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
-#: ../widgets/table/e-table-click-to-add.c:531
+#: ../widgets/table/e-table-click-to-add.c:530
#: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../widgets/table/e-table-group-container.c:985
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
msgid "Height"
msgstr "高度"
#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
msgid "Has Focus"
msgstr "有焦点"
@@ -3204,11 +3208,21 @@ msgstr "文字模型"
msgid "Max field name length"
msgstr "最大域名长度"
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
msgid "Column Width"
msgstr "列宽"
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:178
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"正在搜索联系人..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
msgid ""
"\n"
"\n"
@@ -3222,7 +3236,7 @@ msgstr ""
"\n"
"或在此双击以创建新联系人。"
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
msgid ""
"\n"
"\n"
@@ -3236,7 +3250,7 @@ msgstr ""
"\n"
"请在此双击以创建新联系人。"
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
msgid ""
"\n"
"\n"
@@ -3246,7 +3260,7 @@ msgstr ""
"\n"
"搜索联系人。"
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
msgid ""
"\n"
"\n"
@@ -3256,40 +3270,41 @@ msgstr ""
"\n"
"本视图中没有可显示的项。"
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
msgid "Adapter"
msgstr "适配器"
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
msgid "Work Email"
msgstr "工作电子邮件"
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
msgid "Home Email"
msgstr "家庭电子邮件"
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
msgid "Other Email"
msgstr "其它电子邮件"
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
msgid "Selected"
msgstr "已选择"
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
msgid "Has Cursor"
msgstr "有光标"
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
msgid "_Open Link in Browser"
msgstr "在浏览器中打开链接(_O)"
#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2795
msgid "_Copy Link Location"
msgstr "复制链接位置(_C)"
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
msgid "_Send New Message To..."
msgstr "把新信发送到(_S)..."
@@ -3311,7 +3326,7 @@ msgid "map"
msgstr "地图"
#: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
msgid "List Members"
msgstr "列出成员"
@@ -3332,25 +3347,23 @@ msgid "Video Chat"
msgstr "视频聊天"
#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
-#: ../plugins/hula-account-setup/camel-hula-listener.c:378
-#: ../plugins/hula-account-setup/camel-hula-listener.c:407
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/gnome-cal.c:2451
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:576
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
+#: ../plugins/hula-account-setup/camel-hula-listener.c:377
+#: ../plugins/hula-account-setup/camel-hula-listener.c:406
#: ../plugins/publish-calendar/publish-calendar.glade.h:5
msgid "Calendar"
msgstr "日历"
#: ../addressbook/gui/widgets/eab-contact-display.c:637
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:115
msgid "Free/Busy"
msgstr "忙/闲"
@@ -3372,150 +3385,162 @@ msgid "Web Log"
msgstr "Web 日志"
#: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2327
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
msgid "Birthday"
msgstr "生日"
#: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2328
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
msgid "Anniversary"
msgstr "纪念日"
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
msgid "Job Title"
msgstr "职称"
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
msgid "Home page"
msgstr "主页"
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
msgid "Blog"
msgstr "Blog"
#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
msgid "Success"
msgstr "成功"
#. E_BOOK_ERROR_INVALID_ARG
#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
msgid "Backend busy"
msgstr "后台忙"
#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
msgid "Repository offline"
msgstr "仓库脱机"
#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
msgid "Address Book does not exist"
msgstr "地址簿不存在"
#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
msgid "No Self Contact defined"
msgstr "未定义自身联系人"
#. E_BOOK_ERROR_URI_NOT_LOADED
#. E_BOOK_ERROR_URI_ALREADY_LOADED
#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
msgid "Permission denied"
msgstr "没有权限"
#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
msgid "Contact not found"
msgstr "找不到联系人"
#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
msgid "Contact ID already exists"
msgstr "联系人 ID 已经存在"
#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
msgid "Protocol not supported"
msgstr "不支持的协议"
#. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:256
#: ../calendar/gui/e-cal-model-tasks.c:360
#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
msgid "Canceled"
msgstr "已取消"
#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
msgid "Could not cancel"
msgstr "无法取消"
#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
#: ../calendar/gui/comp-editor-factory.c:423
msgid "Authentication Failed"
msgstr "认证失败"
#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
msgid "Authentication Required"
msgstr "必须认证"
#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
msgid "TLS not Available"
msgstr "TLS 不可用"
#. E_BOOK_ERROR_CORBA_EXCEPTION
#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
msgid "No such source"
msgstr "没有来源"
#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
msgid "Not available in offline mode"
msgstr "脱机模式下不可用"
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "其它错误"
+
#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
msgid "Invalid server version"
msgstr "无效的服务器版本"
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "不支持的认证方式"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
msgid ""
-"We were unable to open this addressbook. This either means this book is not "
+"We were unable to open this address book. This either means this book is not "
"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the addressbook once in online mode to download its contents"
+"load the address book once in online mode to download its contents"
msgstr ""
"我们无法打开此地址簿。这可能意味着这本地址簿没有标为脱机使用,或者尚未下载完"
"成以供脱机使用。请在联机模式中装入此地址簿以便下载其内容"
-#: ../addressbook/gui/widgets/eab-gui-util.c:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
#, c-format
msgid ""
-"We were unable to open this addressbook. Please check that the path %s "
+"We were unable to open this address book. Please check that the path %s "
"exists and that you have permission to access it."
msgstr ""
"我们无法打开此地址簿。请检查路径 %s 是否存在以及您是否有足够的权限访问它。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
msgid ""
-"We were unable to open this addressbook. This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
+"We were unable to open this address book. This either means you have "
+"entered an incorrect URI, or the LDAP server is unreachable."
msgstr ""
-"我们无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为LDAP 服务器"
+"我们无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为 LDAP 服务器"
"已经关闭。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:130
msgid ""
"This version of Evolution does not have LDAP support compiled in to it. If "
"you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3524,75 +3549,79 @@ msgstr ""
"本版本的 Evolution 并没有把 LDAP 支持编译进去。如果您希望在 Evolution 中使用 "
"LDAP,就必须安装启用了 LDAP 的 Evolution 包。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
msgid ""
-"We were unable to open this addressbook. This either means you have entered "
-"an incorrect URI, or the server is unreachable."
+"We were unable to open this address book. This either means you have "
+"entered an incorrect URI, or the server is unreachable."
msgstr ""
"我们无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为服务器已经"
"关闭。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
+msgid "Detailed error:"
+msgstr "错误细节:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
+"the directory server preferences for this address book."
msgstr ""
-"匹配此查询的名片数既超过了服务器配置的返回数目,也超过了\n"
+"匹配此查询的名片数超过了服务器配置的返回数目,或者超过了\n"
"Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
"搜索条件,或者在此地址簿的目录服务器参数中将结果限制调高。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook. Please make your search\n"
+"you have configured for this address book. Please make your search\n"
"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
+"preferences for this address book."
msgstr ""
-"执行此查询的时间既超过了服务器限制,也超过了您为此地址簿配置的限制。\n"
+"执行此查询的时间超过了服务器限制,或者超过了您为此地址簿配置的限制。\n"
"请在搜索的时候指定更加严格的搜索条件,或者在此地址簿的目录服务器参数\n"
"中将时间限制调高。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "The backend for this address book was unable to parse this query."
msgstr "此地址簿的后端无法解析此查询。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:181
+msgid "The backend for this address book refused to perform this query."
msgstr "此地址簿的后端拒绝执行此查询。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
msgid "This query did not complete successfully."
msgstr "此查询未成功完成。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
msgid "Error adding list"
msgstr "添加列表出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:682
msgid "Error adding contact"
msgstr "添加联系人出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
msgid "Error modifying list"
msgstr "修改列表出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
msgid "Error modifying contact"
msgstr "修改联系人出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
msgid "Error removing list"
msgstr "删除列表出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:632
msgid "Error removing contact"
msgstr "删除联系人出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
#, c-format
msgid ""
"Opening %d contact will open %d new window as well.\n"
@@ -3604,16 +3633,16 @@ msgstr[0] ""
"打开 %d 个联系人将同时打开 %d 个新窗口。\n"
"您真的想要显示所有联系人吗?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
msgid "_Don't Display"
msgstr "不显示(_D)"
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:320
msgid "Display _All Contacts"
msgstr "显示全部联系人(_A)"
#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:346
#, c-format
msgid ""
"%s already exists\n"
@@ -3622,69 +3651,69 @@ msgstr ""
"%s 已经存在\n"
"您打算覆盖它吗?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
msgid "contact"
msgid_plural "contacts"
msgstr[0] "联系人"
#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
msgid "card.vcf"
msgstr "card.vcf"
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:477
msgid "Select Address Book"
msgstr "选择地址簿"
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
msgid "list"
msgstr "列表"
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
msgid "Move contact to"
msgstr "将联系人移至"
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
msgid "Copy contact to"
msgstr "将联系人复制到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
msgid "Move contacts to"
msgstr "将联系人移至"
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
msgid "Copy contacts to"
msgstr "将联系人复制到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:895
msgid "Multiple vCards"
msgstr "多个 vCard"
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
#, c-format
msgid "vCard for %s"
msgstr "%s 的 vCard"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:914
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
#, c-format
msgid "Contact information"
msgstr "联系人信息"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:942
#, c-format
msgid "Contact information for %s"
msgstr "%s 的联系人信息"
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
msgid "Querying Address Book..."
msgstr "正在查询地址簿..."
@@ -3704,50 +3733,50 @@ msgid "Show Compact vCard"
msgstr "显示紧凑 vCard"
#: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
msgstr "保存在地址簿中"
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
msgid "Card View"
msgstr "名片视图"
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../addressbook/importers/evolution-csv-importer.c:661
+#: ../addressbook/importers/evolution-ldif-importer.c:498
#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
msgid "Importing..."
msgstr "正在导入..."
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:863
msgid "Outlook CSV or Tab (.csv, .tab)"
msgstr "Outlook CSV 或 Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:864
msgid "Outlook CSV and Tab Importer"
msgstr "Outlook CSV 和 Tab 导入器"
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:872
msgid "Mozilla CSV or Tab (.csv, .tab)"
msgstr "Mozilla CSV 或 Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:873
msgid "Mozilla CSV and Tab Importer"
msgstr "Mozilla CSV 和 Tab 导入器"
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:881
msgid "Evolution CSV or Tab (.csv, .tab)"
msgstr "Evolution CSV 或 Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:882
msgid "Evolution CSV and Tab Importer"
msgstr "Evolution CSV 和 Tab 导入器"
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
msgid "LDAP Data Interchange Format (.ldif)"
msgstr "LDAP 数据交换格式(.ldif)"
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
msgid "Evolution LDIF importer"
msgstr "Evolution LDIF 导入器"
@@ -3800,12 +3829,12 @@ msgid "Format"
msgstr "格式"
#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:502
#: ../widgets/table/e-table-field-chooser-dialog.c:81
#: ../widgets/table/e-table-field-chooser-item.c:648
#: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:310
+#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-selection-model.c:309
msgid "Header"
msgstr "页眉"
@@ -3907,8 +3936,8 @@ msgstr "阴影"
#. FIXME: Take care of i18n
#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
-#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
+#: ../plugins/exchange-operations/exchange-calendar.c:232
#: ../plugins/exchange-operations/exchange-contacts.c:217
msgid "Size:"
msgstr "大小:"
@@ -3926,7 +3955,7 @@ msgid "Top:"
msgstr "顶部:"
#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:154
msgid "Type:"
msgstr "类型:"
@@ -3938,35 +3967,35 @@ msgstr "宽度:"
msgid "_Font..."
msgstr "字体(_F)..."
-#: ../addressbook/printing/test-contact-print-style-editor.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
msgid "Contact Print Style Editor Test"
msgstr "联系人打印样式编辑器测试"
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:44
+#: ../addressbook/printing/test-contact-print-style-editor.c:55
+#: ../addressbook/printing/test-print.c:45
msgid "Copyright (C) 2000, Ximian, Inc."
msgstr "版权 (C) 2000, Ximian, Inc."
-#: ../addressbook/printing/test-contact-print-style-editor.c:56
+#: ../addressbook/printing/test-contact-print-style-editor.c:57
msgid "This should test the contact print style editor widget"
msgstr "这应该测试联系人打印样式编辑器部件"
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
msgid "Contact Print Test"
msgstr "联系人打印测试"
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:47
msgid "This should test the contact print code"
msgstr "这应该测试联系人打印代码"
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
msgid "Can not open file"
msgstr "无法打开文件"
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
msgstr "无法获得地址簿列表"
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -3982,7 +4011,7 @@ msgid "OUTPUTFILE"
msgstr "输出文件"
#: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+msgid "List local address book folders"
msgstr "列出本地地址簿文件夹"
#: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4031,290 +4060,301 @@ msgstr "未处理的错误"
#. For Translators: {0} is the name of the calendar source
#: ../calendar/calendar.error.xml.h:2
msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
-msgstr "“{0}”是只读日历源。切换到日历视图,然后选择可接受约会的日历。"
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr ""
-#: ../calendar/calendar.error.xml.h:3
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:4
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr "“{0}”是只读日历,无法修改。请另选一个可接受约会的日历。"
+
+#: ../calendar/calendar.error.xml.h:5
msgid ""
"Adding a meaningful summary to your appointment will give your recipients an "
"idea of what your appointment is about."
msgstr "在您的约会中添加有意义的摘要可以让您的收件人更容易明白您约会的内容。"
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:6
msgid ""
"Adding a meaningful summary to your task will give your recipients an idea "
"of what your task is about."
msgstr "在您的任务中添加有意义的摘要可以让您的收件人更容易明白您任务的内容。"
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
msgid "All information in these memos will be deleted and can not be restored."
msgstr "这些备忘的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
msgid "All information in this memo will be deleted and can not be restored."
msgstr "此备忘的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
msgid ""
"All information on these appointments will be deleted and can not be "
"restored."
msgstr "这些约会的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
msgid "All information on these tasks will be deleted and can not be restored."
msgstr "这些任务的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:11
msgid ""
"All information on this appointment will be deleted and can not be restored."
msgstr "此约会的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
msgid ""
"All information on this meeting will be deleted and can not be restored."
msgstr "此会议的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
msgid "All information on this memo will be deleted and can not be restored."
msgstr "此备忘的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
msgid "All information on this task will be deleted and can not be restored."
msgstr "此任务的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
msgid "Are you sure you want to delete the '{0}' task?"
msgstr "您确定要删除“{0}”任务吗?"
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
msgid "Are you sure you want to delete the appointment titled '{0}'?"
msgstr "您确信您要删除标题为“{0}”的约会吗?"
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
msgid "Are you sure you want to delete the memo '{0}'?"
msgstr "您确定要删除“{0}”备忘吗?"
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
msgid "Are you sure you want to delete these {0} appointments?"
msgstr "您确定要删除这 {0} 个约会吗?"
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
msgid "Are you sure you want to delete these {0} memos?"
msgstr "您确定要删除这 {0} 个备忘吗?"
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
msgid "Are you sure you want to delete these {0} tasks?"
msgstr "您确定要删除这 {0} 个任务吗?"
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
msgid "Are you sure you want to delete this appointment?"
msgstr "您确信您要删除该约会吗?"
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:178
#, c-format
msgid "Are you sure you want to delete this meeting?"
msgstr "您确信您要删除该会议吗?"
-#: ../calendar/calendar.error.xml.h:21
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:184
#, c-format
msgid "Are you sure you want to delete this memo?"
msgstr "您确信您要删除该备忘吗?"
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:181
#, c-format
msgid "Are you sure you want to delete this task?"
msgstr "您确定要删除此任务吗?"
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
msgid "Are you sure you want to save the memo without a summary?"
msgstr "您确定想要保存没有摘要的备忘吗?"
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
msgid "Are you sure you want to send the appointment without a summary?"
msgstr "您确定想要发送没有摘要的约会吗?"
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
msgid "Are you sure you want to send the task without a summary?"
msgstr "您确定想要发送没有摘要的任务吗?"
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
msgid "Cannot create a new event"
msgstr "无法创建新事件"
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "无法保存事件"
+
+#: ../calendar/calendar.error.xml.h:30
msgid "Delete calendar '{0}'?"
msgstr "删除日历“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
msgid "Delete memo list '{0}'?"
msgstr "删除备忘列表“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
msgid "Delete task list '{0}'?"
msgstr "删除任务列表“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
msgid "Do _not Send"
msgstr "不发送(_N)"
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
msgid "Download in progress. Do you want to save the appointment?"
msgstr "下载进行中。您想要保存约会吗?"
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
msgid "Download in progress. Do you want to save the task?"
msgstr "下载进行中。您想要保存任务吗?"
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
msgid "Editor could not be loaded."
msgstr "无法装入编辑器。"
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
msgid ""
"Email invitations will be sent to all participants and allow them to accept "
"this task."
msgstr "将会向全部出席者发送电子邮件邀请,并允许他们接受此任务。"
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
msgid ""
"Email invitations will be sent to all participants and allow them to reply."
msgstr "将会向全部出席者发送电子邮件邀请,并允许他们答复。"
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
msgid "Error loading calendar"
msgstr "装入日历时出错"
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
msgid "Error loading memo list"
msgstr "装入备忘列表出错"
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
msgid "Error loading task list"
msgstr "装入任务列表出错"
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:42
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the meeting is canceled."
msgstr "如果您不发送取消通知,其他出席者也许不知道会议已经取消。"
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:43
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the memo has been deleted."
msgstr "如果您不发送取消通知,其他出席者可能不知道备忘已经删除。"
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:44
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the task has been deleted."
msgstr "如果您不发送取消通知,其他出席者可能不知道任务已经删除。"
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
msgid ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
msgstr "发送更新的信息将允许其他出席者使他们的日历保持最新。"
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
msgid ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
msgstr "发送更新的信息允许其他出席者使他们的任务列表保持最新。"
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
msgid ""
"Some attachments are being downloaded. Saving the appointment would result "
"in the loss of these attachments."
msgstr "附件正在下载中。保存约会将使得约会保存时无法包含后续的附件。"
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
msgid ""
"Some attachments are being downloaded. Saving the task would result in the "
"loss of these attachments."
msgstr "附件正在下载中。保存任务将使得任务保存时无法包含后续的附件。"
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
msgid "Some features may not work properly with your current server."
msgstr "某些特性可能无法在您目前的服务器下工作。"
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
msgid "The Evolution calendar has quit unexpectedly."
msgstr "Evolution 日历异常退出。"
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
msgid "The Evolution memo has quit unexpectedly."
msgstr "Evolution 备忘异常退出。"
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
msgid "The Evolution tasks have quit unexpectedly."
msgstr "Evolution 任务异常退出。"
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
msgid "The calendar is not marked for offline usage."
msgstr "日历未标为脱机使用。"
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
-msgstr "备忘列表未标为脱机使用"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
+msgstr "备忘列表未标为脱机使用。"
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
msgid "The task list is not marked for offline usage."
msgstr "任务列表未标为脱机使用。"
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
msgid "This calendar will be removed permanently."
msgstr "此日历将被永久删除。"
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
msgid "This memo list will be removed permanently."
msgstr "此备忘列表将被永久删除。"
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
msgid "This task list will be removed permanently."
msgstr "此任务列表将被永久删除。"
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
msgid "Would you like to save your changes to this appointment?"
msgstr "您想要保存对约会的更改吗?"
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
msgid "Would you like to save your changes to this memo?"
msgstr "您想要保存对此备忘的更改吗?"
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
msgid "Would you like to save your changes to this task?"
msgstr "您想要保存对此任务的更改吗?"
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
msgid "Would you like to send a cancelation notice for this memo?"
msgstr "您是否想要为此备忘发送取消通知?"
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
msgid "Would you like to send all the participants a cancelation notice?"
msgstr "您是否想要给全部出席者发送取消通知?"
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
msgid "Would you like to send meeting invitations to participants?"
msgstr "您是否想要给出席者发送会议邀请?"
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
msgid "Would you like to send this task to participants?"
msgstr "您是否想要将此任务发送给出席者?"
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
msgid "Would you like to send updated meeting information to participants?"
msgstr "您是否想要给出席者发送更新的会议信息?"
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
msgid "Would you like to send updated task information to participants?"
msgstr "您是否想要给出席者发送更新的任务信息?"
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results, the server should be upgraded to "
@@ -4323,107 +4363,107 @@ msgstr ""
"您正在连接到不支持的 GroupWise 服务器,此时使用 Evolution 可能遇到问题。为了"
"得到最佳效果,服务器应该升级到支持的版本。"
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
msgid "You have changed this appointment, but not yet saved it."
msgstr "您已经更改了此约会,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
msgid "You have changed this task, but not yet saved it."
msgstr "您已经对此任务做出了更改,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
msgid "You have made changes to this memo, but not yet saved them."
msgstr "您已经对此备忘做出了更改,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
msgid "Your calendars will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的日历无法使用。"
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
msgid "Your memos will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的备忘将无法使用。"
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
msgid "Your tasks will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的任务将无法使用。"
-#: ../calendar/calendar.error.xml.h:72
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:30
msgid "_Discard Changes"
msgstr "丢弃更改(_D)"
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
msgid "_Save"
msgstr "保存(_S)"
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
msgid "_Save Changes"
msgstr "保存更改(_S)"
-#: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:78
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
msgid "_Send"
msgstr "发送(_S)"
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
msgid "_Send Notice"
msgstr "发送通知(_S)"
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
msgid "{0}."
msgstr "{0}。"
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
msgid "Split Multi-Day Events:"
msgstr "分割多日事件:"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
msgid "Could not start evolution-data-server"
msgstr "无法启动 evolution-data-server"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
msgid "Could not read pilot's Calendar application block"
msgstr "无法读入 Pilot 日历应用程序块"
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
msgid "Could not read pilot's Memo application block"
msgstr "无法读入 Pilot 的备忘应用程序块"
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
msgid "Could not write pilot's Memo application block"
msgstr "无法写入 Pilot 备忘应用程序块"
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
msgid "Default Priority:"
msgstr "默认优先级:"
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
msgid "Could not read pilot's ToDo application block"
msgstr "无法读入 Pilot ToDo 应用程序块"
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
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:2334
+#: ../plugins/itip-formatter/itip-formatter.c:2358
msgid "Calendar and Tasks"
msgstr "日历和任务"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
msgid "Calendars"
msgstr "日历"
@@ -4464,25 +4504,25 @@ msgid "Memo_s"
msgstr "备忘(_S)"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1151
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:548
+#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
+#: ../calendar/gui/memos-control.c:370
msgid "Memos"
msgstr "备忘"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1441
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
+#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1982
#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/importers/icalendar-importer.c:74
+#: ../calendar/importers/icalendar-importer.c:735
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:588
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
msgid "Tasks"
msgstr "任务"
@@ -4500,23 +4540,24 @@ msgstr "任务(_T)"
msgid "Evolution Calendar alarm notification service"
msgstr "Evolution 日历提醒通知服务"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
msgid "minute"
msgid_plural "minutes"
msgstr[0] "分钟"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:119
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-http/calendar-http.c:280
#: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
msgid "hours"
msgid_plural "hours"
msgstr[0] "小时"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
msgid "Start time"
msgstr "开始时间"
@@ -4527,9 +4568,9 @@ msgstr "约会"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
#: ../plugins/itip-formatter/itip-view.c:1004
msgid "Location:"
msgstr "位置:"
@@ -4539,17 +4580,15 @@ msgid "Snooze _time:"
msgstr "午睡时间(_T):"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1332
#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
#: ../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:18
#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:52
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
msgid "_Edit"
msgstr "编辑(_E)"
@@ -4561,32 +4600,32 @@ msgstr "午睡(_S)"
msgid "location of appointment"
msgstr "约会位置"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
msgid "No summary available."
msgstr "没有可用的摘要。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
msgid "No description available."
msgstr "没有描述。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
msgid "No location information available."
msgstr "没有可用的位置信息。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
#, c-format
msgid "You have %d alarms"
msgstr "您有 %d 个提醒"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
msgid "Warning"
msgstr "警告"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -4598,7 +4637,7 @@ msgstr ""
"发送电子邮件。Evolution 将以\n"
"显示普通提示会话框代替。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4614,35 +4653,35 @@ msgstr ""
"\n"
"您确信您要运行该程序吗?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
msgid "Do not ask me about this program again."
msgstr "不要再次询问此问题。"
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
msgid "Could not initialize Bonobo"
msgstr "无法初始化 Bonobo"
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
msgid ""
"Could not create the alarm notify service factory, maybe it's already "
"running..."
msgstr "无法创建提醒服务车间,可能已经运行了..."
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
msgid "invalid time"
msgstr "无效时间"
#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:116
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d 小时"
#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:122
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -4651,8 +4690,8 @@ msgstr[0] "%d 分钟"
#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:126
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -4880,12 +4919,12 @@ msgid "Show status field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示状态域"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:124
msgid "Show the \"Preview\" pane"
msgstr "显示“预览”面板"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
msgid "Show the \"Preview\" pane."
msgstr "显示“预览”面板。"
@@ -4935,7 +4974,7 @@ msgid "Time the last alarm ran, in time_t."
msgstr "提醒上次运行的时间,以 time_t 格式。"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
msgid "Timezone"
msgstr "时区"
@@ -5062,66 +5101,66 @@ msgstr "工作日开始分钟"
msgid "daylight savings time"
msgstr "夏时制时间"
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:71
msgid "Summary contains"
msgstr "概要含有"
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:72
msgid "Description contains"
msgstr "描述含有"
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:73
msgid "Category is"
msgstr "类别为"
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:74
msgid "Comment contains"
msgstr "注释含有"
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:75
msgid "Location contains"
msgstr "位置含有"
-#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
-#: ../calendar/gui/cal-search-bar.c:685
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
msgid "Unmatched"
msgstr "无匹配"
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:637
msgid "Next 7 Days' Tasks"
msgstr "下一周的任务"
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:641
msgid "Active Tasks"
msgstr "活动任务"
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:645
msgid "Overdue Tasks"
msgstr "延期任务"
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:649
msgid "Completed Tasks"
msgstr "已完成任务"
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:653
msgid "Tasks with Attachments"
msgstr "有附件的任务"
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:699
msgid "Active Appointments"
msgstr "活动约会"
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:703
msgid "Next 7 Days' Appointments"
msgstr "下一周的约会"
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../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:324
+#: ../calendar/gui/calendar-commands.c:317
msgid ""
"This operation will permanently erase all events older than the selected "
"amount of time. If you continue, you will not be able to recover these "
@@ -5129,16 +5168,17 @@ msgid ""
msgstr ""
"该操作将永久删除所有比选中时间量早的事件。如果您继续,您将无法恢复这些事件。"
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
msgid "Purge events older than"
msgstr "销毁较早的事件"
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-http/calendar-http.c:281
#: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:397
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../plugins/google-account-setup/google-source.c:664
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../widgets/misc/e-send-options.glade.h:39
msgid "days"
msgstr "天"
@@ -5147,131 +5187,331 @@ msgstr "天"
#. Create the Webcal source group
#. Create the LDAP source group
#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:512
-#: ../calendar/gui/migration.c:610 ../calendar/gui/migration.c:1123
+#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
#: ../calendar/gui/tasks-component.c:231
msgid "On The Web"
msgstr "网上"
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
msgid "Birthdays & Anniversaries"
msgstr "生日和纪念日"
#. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:323
#: ../plugins/calendar-weather/calendar-weather.c:100
msgid "Weather"
msgstr "天气"
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
msgid "_New Calendar"
msgstr "新建日历(_N)"
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2102
+#: ../mail/em-folder-tree.c:2106
msgid "_Copy..."
msgstr "复制(_C)..."
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2116
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "属性(_P)"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
msgid "Failed upgrading calendars."
msgstr "升级日历失败。"
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
#, c-format
msgid "Unable to open the calendar '%s' for creating events and meetings"
msgstr "无法打开日历“%s”来创建事件和会议"
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
msgid "There is no calendar available for creating events and meetings"
msgstr "没有可创建事件和会议的日历"
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
msgid "Calendar Source Selector"
msgstr "日历源选择器"
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
msgid "New appointment"
msgstr "新建约会"
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
msgid "_Appointment"
msgstr "约会(_A)"
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
msgid "Create a new appointment"
msgstr "创建新约会"
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
msgid "New meeting"
msgstr "新建会议"
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
msgid "M_eeting"
msgstr "会议(_E)"
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
msgid "Create a new meeting request"
msgstr "创建一条新会议请求"
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
msgid "New all day appointment"
msgstr "新建全天约会"
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
msgid "All Day A_ppointment"
msgstr "全天约会(_P)"
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
msgid "Create a new all-day appointment"
msgstr "创建新全天约会"
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
msgid "New calendar"
msgstr "新建日历"
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
msgid "Cale_ndar"
msgstr "日历(_N)"
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
msgid "Create a new calendar"
msgstr "创建新日历"
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
msgid "Day View"
msgstr "日视图"
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
msgid "Work Week View"
msgstr "周工作视图"
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
msgid "Week View"
msgstr "周视图"
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
msgid "Month View"
msgstr "月视图"
#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "任何域"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "附件"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "出席者"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "商务"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "类别"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "分类"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "完成"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:250
+#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "机密"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "描述"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
msgid "Description Contains"
msgstr "描述含有"
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "不存在"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "存在"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "最爱"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "礼物"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "目标"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "假日"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "节日卡"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "热络"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "想法"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "国际"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "关键客户"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "杂项"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "下一周"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "组织者"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "电话"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:335 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "保密"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:326 ../calendar/gui/e-cal-model.c:333
+#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "公开"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:299
+msgid "Recurrence"
+msgstr "再现"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "状态"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "战略"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../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 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "概要"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
msgid "Summary Contains"
msgstr "概要含有"
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "供应商"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "时间和花费"
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "等待"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "含有"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "不含有"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "是"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "不是"
+
#: ../calendar/gui/comp-editor-factory.c:405
msgid "Error while opening the calendar"
msgstr "打开日历时出错"
@@ -5284,11 +5524,11 @@ msgstr "打开日历的方法不支持"
msgid "Permission denied to open the calendar"
msgstr "没有权限打开日历"
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
msgid "Unknown error"
msgstr "未知的错误"
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
msgid "Edit Alarm"
msgstr "编辑提醒"
@@ -5321,17 +5561,17 @@ msgid "Mes_sage:"
msgstr "消息(_S):"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
msgid "Play a sound"
msgstr "播放声音"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
msgid "Pop up an alert"
msgstr "弹出警告"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
msgid "Run a program"
msgstr "运行程序"
@@ -5344,7 +5584,7 @@ msgid "Send To:"
msgstr "发送给:"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
msgid "Send an email"
msgstr "发送电子邮件"
@@ -5399,7 +5639,7 @@ msgstr "分钟"
msgid "start of appointment"
msgstr "约会开始"
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
msgid "Action/Trigger"
msgstr "动作/触发器"
@@ -5410,16 +5650,15 @@ msgstr "添加(_D)"
#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
#: ../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:92
-#: ../composer/e-msg-composer-select-file.c:93
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../composer/e-composer-actions.c:64
msgid "_Suggest automatic display of attachment"
msgstr "建议自动显示附件(_S)"
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
msgid "Attach file(s)"
msgstr "添加附件"
@@ -5487,8 +5726,8 @@ msgid "Display"
msgstr "显示"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
msgid "Friday"
msgstr "星期五"
@@ -5503,8 +5742,8 @@ msgstr ""
"天"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
msgid "Monday"
msgstr "星期一"
@@ -5527,7 +5766,7 @@ msgstr ""
"星期日"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
msgid "Pick a color"
msgstr "选取一种颜色"
@@ -5537,8 +5776,8 @@ msgid "S_un"
msgstr "周日(_U)"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
msgid "Saturday"
msgstr "星期六"
@@ -5555,8 +5794,8 @@ msgid "Show week _numbers in date navigator"
msgstr "在日期浏览器中显示周数(_N)"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
msgid "Sunday"
msgstr "星期日"
@@ -5574,13 +5813,13 @@ msgid "Template:"
msgstr "模板:"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
msgid "Thursday"
msgstr "星期四"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
msgid "Time _zone:"
msgstr "时区(_Z):"
@@ -5589,14 +5828,14 @@ msgid "Time format:"
msgstr "时间格式:"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
msgid "Tuesday"
msgstr "星期二"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
msgid "Wednesday"
msgstr "星期三"
@@ -5674,300 +5913,451 @@ msgstr "周三(_W)"
msgid "before every appointment"
msgstr "在每次约会前"
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:270
msgid "Cop_y calendar contents locally for offline operation"
msgstr "将日历内容复制到本地以进行脱机操作(_Y)"
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:272
msgid "Cop_y task list contents locally for offline operation"
msgstr "将任务列表内容复制到本地以进行脱机操作(_Y)"
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:274
msgid "Cop_y memo list contents locally for offline operation"
msgstr "将备忘列表内容复制到本地以进行脱机操作(_Y)"
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
-msgstr "颜色(_O):"
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+msgid "Colo_r:"
+msgstr "颜色(_R):"
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:379
msgid "Task List"
msgstr "任务列表"
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:390
msgid "Memo List"
msgstr "备忘列表"
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:475
msgid "Calendar Properties"
msgstr "日历属性"
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:475
msgid "New Calendar"
msgstr "新建日历"
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:531
msgid "Task List Properties"
msgstr "任务列表属性"
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:531
+msgid "New Task List"
+msgstr "新建任务列表"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
+msgid "Memo List Properties"
+msgstr "备忘列表属性"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
msgid "New Memo List"
msgstr "新建备忘列表"
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
msgid "This event has been deleted."
msgstr "此事件已经被删除。"
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
msgid "This task has been deleted."
msgstr "此任务已经被删除。"
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
msgid "This memo has been deleted."
msgstr "此备注已经被删除。"
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
#, c-format
msgid "%s You have made changes. Forget those changes and close the editor?"
msgstr "%s 您已经做了修改。放弃这些修改并关闭编辑器吗?"
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
#, c-format
msgid "%s You have made no changes, close the editor?"
msgstr "%s 您还没有进行修改,关闭编辑器吗?"
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
msgid "This event has been changed."
msgstr "此事件已经被更改。"
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
msgid "This task has been changed."
msgstr "此任务已经被更改。"
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
msgid "This memo has been changed."
msgstr "此备注已经被更改。"
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
#, c-format
msgid "%s You have made changes. Forget those changes and update the editor?"
msgstr "%s 您已经做出了修改。放弃这些修改并更新编辑器吗?"
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
#, c-format
msgid "%s You have made no changes, update the editor?"
msgstr "%s 您还没有进行修改,更新编辑器吗?"
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
#, c-format
msgid "Validation error: %s"
msgstr "校验错误:%s"
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
msgid " to "
msgstr " 到 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
msgid " (Completed "
msgstr " (完成 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
msgid "Completed "
msgstr "已完成 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
msgid " (Due "
msgstr " (预定 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
msgid "Due "
msgstr "预定 "
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:232
#, c-format
msgid "Attached message - %s"
msgstr "附加的信件 - %s"
#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3037
+#: ../calendar/gui/dialogs/comp-editor.c:237
+#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1771
+#: ../composer/e-msg-composer.c:1990
#, c-format
msgid "Attached message"
msgid_plural "%d attached messages"
msgstr[0] "%d 封附加的信件"
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
-#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
msgid "_Move"
msgstr "移动(_M)"
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
msgid "Cancel _Drag"
msgstr "取消拖曳(_D)"
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../calendar/gui/dialogs/comp-editor.c:616
+#: ../calendar/gui/dialogs/comp-editor.c:3249 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:91
+#: ../widgets/misc/e-attachment-bar.c:453
msgid "attachment"
msgstr "附件"
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:842
msgid "Could not update object"
msgstr "无法更新对象"
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:930
+msgid "Edit Appointment"
+msgstr "编辑约会"
+
+#: ../calendar/gui/dialogs/comp-editor.c:937
+#, c-format
+msgid "Meeting - %s"
+msgstr "会议 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:939
+#, c-format
+msgid "Appointment - %s"
+msgstr "约会 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "分配的任务 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:947
+#, c-format
+msgid "Task - %s"
+msgstr "任务 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952
+#, c-format
+msgid "Memo - %s"
+msgstr "备忘 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
+msgstr "没有概要"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "单击此处可关闭当前窗口"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "将选中文字复制到剪贴板"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "将选中文字剪切到剪贴板"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "单击此处可查看可用的帮助"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "从剪贴板中粘贴文字"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "单击此处可保存当前窗口"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "选中所有文字"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "分类(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "文件(_F)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "帮助(_H)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "插入(_I)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "选项(_O)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1367 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
+msgid "_View"
+msgstr "查看(_V)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "附件(_A)..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "单击此处可便附加文件"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "类别(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "切换是否显示类别"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "时区(_Z)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "切换是否显示时区"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "公开(_B)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "分类为公开"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "私人(_P)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "分类为私人"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "机密(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "分类为机密"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr "角色域(_O)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr "切换是否显示角色域"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1438
+msgid "_RSVP"
+msgstr "请回复(_R)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1440
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "切换是否显示请回复域"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "状态域(_S)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "切换是否显示状态域"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "类型域(_T)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "切换是否显示出席者类型域"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent _Documents"
+msgstr "最近文档(_D)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "附件"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1880
#, c-format
msgid "<b>%d</b> Attachment"
msgid_plural "<b>%d</b> Attachments"
msgstr[0] "<b>%d</b> 个附件"
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1912
msgid "Hide Attachment _Bar"
msgstr "隐藏附件栏(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
msgid "Show Attachment _Bar"
msgstr "显示附件栏(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3630
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/dialogs/event-page.c:1871
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1045
#: ../plugins/groupwise-features/junk-settings.glade.h:8
#: ../plugins/groupwise-features/properties.glade.h:13
#: ../widgets/table/e-table-config.glade.h:21
msgid "_Remove"
msgstr "删除(_R)"
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3633
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1048
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
msgid "_Add attachment..."
msgstr "添加附件(_A)..."
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2195
msgid "Show Attachments"
msgstr "显示附件"
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:2246
msgid "Press space key to toggle attachment bar"
msgstr "按空格键可切换附件栏"
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-msgid "Edit Appointment"
-msgstr "编辑约会"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-#, c-format
-msgid "Meeting - %s"
-msgstr "会议 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#, c-format
-msgid "Appointment - %s"
-msgstr "约会 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "分配的任务 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Task - %s"
-msgstr "任务 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#, c-format
-msgid "Memo - %s"
-msgstr "备忘 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
-msgstr "没有概要"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2437
+#: ../calendar/gui/dialogs/comp-editor.c:3282
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "如果更新到达的话,对此项目的更改将被丢弃"
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3311
msgid "Unable to use current version!"
msgstr "无法使用当前版本!"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
msgid "Could not open source"
msgstr "无法打开源"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
msgid "Could not open destination"
msgstr "无法打开目的"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
msgid "Destination is read only"
msgstr "目的只读"
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
msgid "_Delete this item from all other recipient's mailboxes?"
msgstr "从全部其它收件人的邮箱中删除此项吗?(_D)"
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
msgid "The event could not be deleted due to a corba error"
msgstr "无法删除事件,原因是 corba 错误"
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
msgid "The task could not be deleted due to a corba error"
msgstr "无法删除任务,原因是 corba 错误"
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:58
msgid "The memo could not be deleted due to a corba error"
msgstr "无法删除备忘,原因是 corba 错误"
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
msgid "The item could not be deleted due to a corba error"
msgstr "无法删除项目,原因是 corba 错误"
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
msgid "The event could not be deleted because permission was denied"
msgstr "无法删除事件,原因是权限被禁止"
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
msgid "The task could not be deleted because permission was denied"
msgstr "无法删除任务,原因是权限被禁止"
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
msgid "The memo could not be deleted because permission was denied"
msgstr "无法删除备忘,原因是权限被禁止"
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
msgid "The item could not be deleted because permission was denied"
msgstr "无法删除项目,原因是权限被禁止"
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
msgid "The event could not be deleted due to an error"
msgstr "由于错误,无法删除事件"
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
msgid "The task could not be deleted due to an error"
msgstr "由于错误,无法删除任务"
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:90
msgid "The memo could not be deleted due to an error"
msgstr "由于错误,无法删除备忘"
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
msgid "The item could not be deleted due to an error"
msgstr "由于错误,无法删除项目"
@@ -5976,7 +6366,7 @@ msgid "Contacts..."
msgstr "联系人..."
#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
msgid "Delegate To:"
msgstr "授权给:"
@@ -5984,132 +6374,178 @@ msgstr "授权给:"
msgid "Enter Delegate"
msgstr "输入代表"
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "_Alarms"
+msgstr "提醒(_A)"
+
+#: ../calendar/gui/dialogs/event-editor.c:198
+msgid "Click here to set or unset alarms for this event"
+msgstr "单击此处以设定或取消此事件的提醒"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "_Recurrence"
+msgstr "再现(_R)"
+
+#: ../calendar/gui/dialogs/event-editor.c:205
+msgid "Make this a recurring event"
+msgstr "将此事件标为重复发生"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "发送选项"
+
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
+msgid "Insert advanced send options"
+msgstr "插入高级发送选项"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "All _Day Event"
+msgstr "全天事件(_D)"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Toggles whether to have All Day Event"
+msgstr "切换是否有全天事件"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Show Time as _Busy"
+msgstr "将时间显示为忙(_B)"
+
+#: ../calendar/gui/dialogs/event-editor.c:230
+msgid "Toggles whether to show time as busy"
+msgstr "切换是否将时间显示为忙"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "_Free/Busy"
+msgstr "忙/闲(_F)"
+
+#: ../calendar/gui/dialogs/event-editor.c:241
+msgid "Query free / busy information for the attendees"
+msgstr "查询出席者的忙闲信息"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
msgid "Appoint_ment"
msgstr "约会(_M)"
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "再现"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
msgid "This event has alarms"
msgstr "此事件有提醒"
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.glade.h:10
#: ../calendar/gui/dialogs/meeting-page.glade.h:5
#: ../calendar/gui/dialogs/memo-page.glade.h:2
msgid "Or_ganizer:"
msgstr "组织者(_G):"
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:840
msgid "_Delegatees"
msgstr "代理人(_D)"
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
msgid "Atte_ndees"
msgstr "出席者(_N)"
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
msgid "Event with no start date"
msgstr "没有开始日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
msgid "Event with no end date"
msgstr "没有结束日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
msgid "Start date is wrong"
msgstr "开始日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
msgid "End date is wrong"
msgstr "结束日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
msgid "Start time is wrong"
msgstr "开始时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
msgid "End time is wrong"
msgstr "结束时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
msgid "The organizer selected no longer has an account."
msgstr "选中的组织者没有帐户了。"
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
msgid "An organizer is required."
msgstr "需要一名组织者。"
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
msgid "At least one attendee is required."
msgstr "需要至少一个出席者。"
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
msgid "_Add "
msgstr "添加(_A)"
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "无法打开日历“%s”。"
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
#, c-format
msgid "You are acting on behalf of %s"
msgstr "您正在以 %s 的身份行动"
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "约会的 %d 天前"
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "约会的 %d 小时前"
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
#, c-format
msgid "%d minute before appointment"
msgid_plural "%d minutes before appointment"
msgstr[0] "约会的 %d 分钟前"
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
msgid "Customize"
msgstr "自定义"
#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
#: ../calendar/gui/dialogs/meeting-page.glade.h:4
#: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
#: ../plugins/calendar-weather/calendar-weather.c:370
#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2011
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../plugins/itip-formatter/itip-formatter.c:2021
+#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-signature-combo-box.c:70
msgid "None"
msgstr "无"
@@ -6134,23 +6570,25 @@ msgid "Custom Alarm:"
msgstr "自定义提醒:"
#: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "描述(_E):"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
msgid "Event Description"
msgstr "事件描述"
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:11
#: ../calendar/gui/dialogs/memo-page.glade.h:4
#: ../calendar/gui/dialogs/task-page.glade.h:6
msgid "Su_mmary:"
msgstr "概要(_M):"
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
msgid "_Alarm"
msgstr "提醒(_A)"
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+msgid "_Description:"
+msgstr "描述(_D):"
+
#: ../calendar/gui/dialogs/event-page.glade.h:17
msgid "_Time:"
msgstr "时间(_T):"
@@ -6181,28 +6619,24 @@ msgstr "更改组织者(_H)"
msgid "Co_ntacts..."
msgstr "联系人(_N)..."
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "组织者"
-
#: ../calendar/gui/dialogs/meeting-page.glade.h:7
#: ../calendar/gui/e-itip-control.glade.h:7
msgid "Organizer:"
msgstr "组织者:"
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
msgid "Memo"
msgstr "备忘"
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
#, c-format
msgid "Unable to open memos in '%s'."
msgstr "无法打开“%s”中的备忘。"
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
msgid "To"
msgstr "收件人"
@@ -6215,63 +6649,59 @@ msgstr "开始日期(_R):"
msgid "T_o:"
msgstr "到(_O):"
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "描述(_D):"
-
#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
#: ../calendar/gui/dialogs/task-page.glade.h:9
msgid "_Group:"
msgstr "组(_G):"
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
#, c-format
msgid "You are modifying a recurring event. What would you like to modify?"
msgstr "您即将修改再现事件。您想要修改何内容?"
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
#, c-format
msgid "You are delegating a recurring event. What would you like to delegate?"
msgstr "您即将代理再现事件。您想要代理何内容?"
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
#, c-format
msgid "You are modifying a recurring task. What would you like to modify?"
msgstr "您即将修改再现任务。您想要修改何内容?"
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
#, c-format
msgid "You are modifying a recurring memo. What would you like to modify?"
msgstr "您即将修改再现备忘。您想要修改何内容?"
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
msgid "This Instance Only"
msgstr "只是本次"
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
msgid "This and Prior Instances"
msgstr "本次和以前各次"
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
msgid "This and Future Instances"
msgstr "本次和以后各次"
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
msgid "All Instances"
msgstr "所有各次"
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "此约会含有 Evolution 无法编辑的再现。"
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
msgid "Recurrence date is invalid"
msgstr "再现日期无效"
#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
msgid "on"
msgstr "在"
@@ -6279,7 +6709,7 @@ msgstr "在"
#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
msgid "first"
msgstr "第一个"
@@ -6288,7 +6718,7 @@ msgstr "第一个"
#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
msgid "second"
msgstr "第二"
@@ -6296,7 +6726,7 @@ msgstr "第二"
#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
msgid "third"
msgstr "第三个"
@@ -6304,7 +6734,7 @@ msgstr "第三个"
#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
msgid "fourth"
msgstr "第四个"
@@ -6312,13 +6742,13 @@ msgstr "第四个"
#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
msgid "last"
msgstr "最后一个"
#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
#. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
msgid "Other Date"
msgstr "其它日期"
@@ -6326,7 +6756,7 @@ msgstr "其它日期"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
msgid "1st to 10th"
msgstr "上旬"
@@ -6334,7 +6764,7 @@ msgstr "上旬"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
msgid "11th to 20th"
msgstr "中旬"
@@ -6342,45 +6772,45 @@ msgstr "中旬"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
msgid "21st to 31st"
msgstr "下旬"
#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
#. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
msgid "day"
msgstr "天"
#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
#. * (dropdown menu options are in [square brackets])."
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
msgid "on the"
msgstr "在"
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
msgid "occurrences"
msgstr "循环"
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
msgid "Add exception"
msgstr "添加例外"
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
msgid "Could not get a selection to modify."
msgstr "无法获得要修改的选中项。"
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
msgid "Modify exception"
msgstr "修改例外"
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
msgid "Could not get a selection to delete."
msgstr "无法获得要删除的选中项。"
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
msgid "Date/Time"
msgstr "日期/时间"
@@ -6431,12 +6861,12 @@ msgstr "周"
msgid "year(s)"
msgstr "年"
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-details-page.c:397
msgid "Completed date is wrong"
msgstr "完成日期有错"
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:482
msgid "Web Page"
msgstr "网页"
@@ -6451,51 +6881,55 @@ msgstr "<span weight=\"bold\">状态</span>"
#. Pass TRUE as is_utc, so it gets converted to the current
#. timezone.
#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-component-preview.c:253
#: ../calendar/gui/e-cal-model-tasks.c:358
#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
msgid "Completed"
msgstr "已完成"
#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1065
msgid "High"
msgstr "高"
#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:250
#: ../calendar/gui/e-cal-model-tasks.c:356
#: ../calendar/gui/e-cal-model-tasks.c:673
#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
msgid "In Progress"
msgstr "进行中"
#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1063
msgid "Low"
msgstr "低"
#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:974 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
msgid "Normal"
msgstr "中"
#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-component-preview.c:260
#: ../calendar/gui/e-cal-model-tasks.c:354
#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
msgid "Not Started"
msgstr "尚未开始"
@@ -6508,7 +6942,7 @@ msgid "Stat_us:"
msgstr "状态(_U):"
#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
msgid "Undefined"
msgstr "未定义"
@@ -6517,7 +6951,7 @@ msgid "_Date completed:"
msgstr "完成日期(_D):"
#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:34
msgid "_Priority:"
msgstr "优先级(_P):"
@@ -6525,25 +6959,37 @@ msgstr "优先级(_P):"
msgid "_Web Page:"
msgstr "网页(_W):"
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "状态细节(_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:115
+msgid "Click to change or view the status details of the task"
+msgstr "单击可更改或查看任务的状态细节"
+
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
+msgid "_Send Options"
+msgstr "发送选项(_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:318
msgid "_Task"
msgstr "任务(_T)"
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:321
msgid "Task Details"
msgstr "任务细节"
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
#: ../calendar/gui/dialogs/task-page.glade.h:4
msgid "Organi_zer:"
msgstr "组织者(_Z):"
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
msgid "Due date is wrong"
msgstr "到期日期错误"
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "无法打开“%s”中的任务。"
@@ -6557,160 +7003,140 @@ msgid "Categor_ies..."
msgstr "类别(_I)..."
#: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "描述(_S):"
+msgid "D_ue date:"
+msgstr "到期日期(_U):"
#: ../calendar/gui/dialogs/task-page.glade.h:7
msgid "Time zone:"
msgstr "时区:"
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "到期日期(_D):"
-
#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d 天"
#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d 周"
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
msgid "Unknown action to be performed"
msgstr "执行未知的动作"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
#, c-format
msgid "%s %s before the start of the appointment"
msgstr "在约会开始之前 %s %s"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:479
#, c-format
msgid "%s %s after the start of the appointment"
msgstr "在约会开始之后 %s %s"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:486
#, c-format
msgid "%s at the start of the appointment"
msgstr "在约会开始时 %s"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:497
#, c-format
msgid "%s %s before the end of the appointment"
msgstr "在约会结束之前 %s %s"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:502
#, c-format
msgid "%s %s after the end of the appointment"
msgstr "在约会结束之后 %s %s"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:509
#, c-format
msgid "%s at the end of the appointment"
msgstr "在约会结束时 %s"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:533
#, c-format
msgid "%s at %s"
msgstr "在 %2$s 时 %1$s"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:545
+#: ../calendar/gui/e-alarm-list.c:541
#, c-format
msgid "%s for an unknown trigger type"
msgstr "%s 为未知触发类型"
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
#, c-format
msgid "Click to open %s"
msgstr "单击以打开 %s"
-#: ../calendar/gui/e-cal-component-memo-preview.c:160
-#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
-#: ../shell/e-shell-folder-title-bar.c:593
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
msgid "Untitled"
msgstr "无标题"
-#: ../calendar/gui/e-cal-component-memo-preview.c:212
-#: ../calendar/gui/e-cal-component-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
msgid "Start Date:"
msgstr "开始日期:"
-#: ../calendar/gui/e-cal-component-memo-preview.c:225
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-itip-control.c:1218
#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
#: ../widgets/misc/e-attachment.glade.h:2
msgid "Description:"
msgstr "描述:"
-#: ../calendar/gui/e-cal-component-memo-preview.c:261
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
msgid "Web Page:"
msgstr "网页:"
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-cal-component-preview.c:210
+#: ../calendar/gui/e-itip-control.c:1162
#: ../calendar/gui/e-itip-control.glade.h:9
msgid "Summary:"
msgstr "概要:"
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
msgid "Due Date:"
msgstr "到期日期:"
#. write status
#. Status
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
#: ../plugins/itip-formatter/itip-view.c:1029
msgid "Status:"
msgstr "状态:"
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
msgid "Priority:"
msgstr "优先级:"
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "公开"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "保密"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "机密"
-
#: ../calendar/gui/e-cal-list-view.etspec.h:2
msgid "End Date"
msgstr "结束日期"
@@ -6720,21 +7146,14 @@ msgstr "结束日期"
msgid "Start Date"
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:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "概要"
-
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:619
msgid "Free"
msgstr "空闲"
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
msgid "Busy"
msgstr "繁忙"
@@ -6748,199 +7167,225 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:746
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
msgid "Yes"
msgstr "是"
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:165
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
msgid "No"
msgstr "否"
#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
-#: ../plugins/itip-formatter/itip-formatter.c:405
-#: ../plugins/itip-formatter/itip-formatter.c:2036
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../calendar/gui/e-cal-model.c:339 ../calendar/gui/e-cal-popup.c:105
+#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
+#: ../plugins/itip-formatter/itip-formatter.c:409
+#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:56
msgid "Unknown"
msgstr "未知"
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:976
msgid "Recurring"
msgstr "重复"
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:978
msgid "Assigned"
msgstr "已分配"
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
msgid "Save As..."
msgstr "另存为..."
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
msgid "Select folder to save selected attachments..."
msgstr "选择保存选中附件的文件夹..."
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
#, c-format
msgid "untitled_image.%s"
msgstr "无标题图像.%s"
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:924
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
msgid "_Save As..."
msgstr "另存为(_S)..."
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
msgid "Set as _Background"
msgstr "设为背景(_B)"
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
msgid "_Save Selected"
msgstr "保存选中(_S)"
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
#, c-format
msgid "Open in %s..."
msgstr "在 %s 中打开..."
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* 没有概要 *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2215
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "组织者:%s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-calendar-view.c:2219
+#, c-format
+msgid "Organizer: %s"
+msgstr "组织者:%s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "开始:"
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "到期:"
+
+#: ../calendar/gui/e-calendar-table.c:589
msgid "0%"
msgstr "0%"
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
msgid "10%"
msgstr "10%"
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
msgid "20%"
msgstr "20%"
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
msgid "30%"
msgstr "30%"
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
msgid "40%"
msgstr "40%"
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
msgid "50%"
msgstr "50%"
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
msgid "60%"
msgstr "60%"
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
msgid "70%"
msgstr "70%"
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
msgid "80%"
msgstr "80%"
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
msgid "90%"
msgstr "90%"
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
msgid "100%"
msgstr "100%"
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
msgid "Deleting selected objects"
msgstr "删除选中的对象"
-#: ../calendar/gui/e-calendar-table.c:952
-#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:643
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
msgid "Updating objects"
msgstr "更新对象"
-#: ../calendar/gui/e-calendar-table.c:1137
-#: ../calendar/gui/e-calendar-view.c:1227 ../calendar/gui/e-memo-table.c:819
-#: ../composer/e-msg-composer.c:1472
+#: ../calendar/gui/e-calendar-table.c:1348
+#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:277
msgid "Save as..."
msgstr "另存为..."
-#: ../calendar/gui/e-calendar-table.c:1360
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
msgid "New _Task"
msgstr "新建任务(_T)"
-#: ../calendar/gui/e-calendar-table.c:1364 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
msgid "Open _Web Page"
msgstr "打开网页(_W)"
-#: ../calendar/gui/e-calendar-table.c:1366
-#: ../calendar/gui/e-calendar-view.c:1663 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
msgid "P_rint..."
msgstr "打印(_R)..."
-#: ../calendar/gui/e-calendar-table.c:1370
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:929
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
#: ../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:1372
-#: ../calendar/gui/e-calendar-view.c:1666
-#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
#: ../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:1376 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
msgid "_Assign Task"
msgstr "分配任务(_A)"
-#: ../calendar/gui/e-calendar-table.c:1377 ../calendar/gui/e-memo-table.c:935
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
#: ../ui/evolution-tasks.xml.h:26
msgid "_Forward as iCalendar"
msgstr "作为 iCalendar 转发(_F)"
-#: ../calendar/gui/e-calendar-table.c:1378
+#: ../calendar/gui/e-calendar-table.c:1589
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1379
+#: ../calendar/gui/e-calendar-table.c:1590
msgid "_Mark Selected Tasks as Complete"
msgstr "把任务标记为完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1591
msgid "_Mark as Incomplete"
msgstr "标记为未完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1592
msgid "_Mark Selected Tasks as Incomplete"
msgstr "把任务标记为未完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1386
+#: ../calendar/gui/e-calendar-table.c:1597
msgid "_Delete Selected Tasks"
msgstr "删除选中任务(_D)"
-#: ../calendar/gui/e-calendar-table.c:1623
+#: ../calendar/gui/e-calendar-table.c:1834
#: ../calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
msgstr "单击以添加任务"
@@ -6963,7 +7408,8 @@ msgid "Due date"
msgstr "到期日期"
#: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
msgid "Priority"
msgstr "优先级"
@@ -6971,127 +7417,108 @@ msgstr "优先级"
msgid "Start date"
msgstr "开始日期"
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "状态"
-
-#: ../calendar/gui/e-calendar-view.c:1346
+#: ../calendar/gui/e-calendar-view.c:1340
msgid "Moving items"
msgstr "移动项目"
-#: ../calendar/gui/e-calendar-view.c:1348
+#: ../calendar/gui/e-calendar-view.c:1342
msgid "Copying items"
msgstr "复制项目"
-#: ../calendar/gui/e-calendar-view.c:1657
+#: ../calendar/gui/e-calendar-view.c:1651
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
-#: ../calendar/gui/e-calendar-view.c:1658
+#: ../calendar/gui/e-calendar-view.c:1652
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
-#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1653
msgid "New _Meeting"
msgstr "新建会议(_M)"
#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1670
+#: ../calendar/gui/e-calendar-view.c:1664
msgid "_Current View"
msgstr "当前视图(_C)"
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1666
msgid "Select T_oday"
msgstr "选择今天(_O)"
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1667
msgid "_Select Date..."
msgstr "选择日期(_S)..."
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1673
msgid "Pri_nt..."
msgstr "打印(_N)..."
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1683
msgid "Cop_y to Calendar..."
msgstr "复制到日历(_Y)..."
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1684
msgid "Mo_ve to Calendar..."
msgstr "移至日历(_V)..."
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1685
msgid "_Delegate Meeting..."
msgstr "代理会议(_D)..."
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1686
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1687
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_F)..."
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1688
msgid "_Reply"
msgstr "回复(_R)"
-#: ../calendar/gui/e-calendar-view.c:1695 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1689 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
#: ../ui/evolution-mail-message.xml.h:82
msgid "Reply to _All"
msgstr "回复所有人(_A)"
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1694
msgid "Make this Occurrence _Movable"
msgstr "将此次发生变为可移动(_M)"
-#: ../calendar/gui/e-calendar-view.c:1701 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
msgid "Delete this _Occurrence"
msgstr "删除此次出现(_O)"
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1696
msgid "Delete _All Occurrences"
msgstr "删除所有出现(_A)"
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2202
-#, 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:2206
-#, c-format
-msgid "Organizer: %s"
-msgstr "组织者:%s"
-
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2222 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
#, c-format
msgid "Location: %s"
msgstr "位置:%s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-calendar-view.c:2269
#, c-format
msgid "Time: %s %s"
msgstr "时间:%s %s"
#. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:116
+#: ../calendar/gui/e-cell-date-edit-text.c:111
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%Y年%m月%d日%A%H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:119
+#: ../calendar/gui/e-cell-date-edit-text.c:114
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%Y-%m-%d %A %p%I:%M:%S"
-#: ../calendar/gui/e-cell-date-edit-text.c:127
+#: ../calendar/gui/e-cell-date-edit-text.c:122
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -7104,7 +7531,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:807
+#: ../calendar/gui/e-day-view-time-item.c:583
#, c-format
msgid "%02i minute divisions"
msgstr "%02i 分钟分割"
@@ -7115,436 +7542,406 @@ 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:1359
-#: ../calendar/gui/e-day-view.c:2141
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1551
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1672
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:766 ../calendar/gui/e-day-view.c:1119
-#: ../calendar/gui/e-week-view.c:507 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
+#: ../calendar/gui/print.c:829
msgid "am"
msgstr "上午"
#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:769 ../calendar/gui/e-day-view.c:1122
-#: ../calendar/gui/e-week-view.c:510 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
msgid "pm"
msgstr "下午"
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
msgid "Yes. (Complex Recurrence)"
msgstr "是(复杂重现)"
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
msgstr[0] "每 %d 天"
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
#: ../calendar/gui/e-itip-control.c:795
#, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
msgstr[0] "每 %d 周"
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
#, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
msgstr[0] "每 %d 周的"
#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
msgid " and "
msgstr " 和 "
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
#, c-format
msgid "The %s day of "
msgstr "第 %s 天属于"
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
#, c-format
msgid "The %s %s of "
msgstr "%s %s 属于"
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
#, c-format
msgid "every month"
msgid_plural "every %d months"
msgstr[0] "每 %d 月"
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
msgstr[0] "每 %d 年"
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
#, c-format
msgid "a total of %d time"
msgid_plural " a total of %d times"
msgstr[0] " 总计 %d 次"
#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:885
msgid ", ending on "
msgstr ",结束于 "
#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
msgid "Starts"
msgstr "开始"
#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
msgid "Ends"
msgstr "结束"
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
msgid "Due"
msgstr "到期"
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
msgid "iCalendar Information"
msgstr "iCalendar 信息"
#. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
msgid "iCalendar Error"
msgstr "iCalendar 错误"
-#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
-#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:344
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:520
+#: ../plugins/itip-formatter/itip-view.c:521
msgid "An unknown person"
msgstr "未知的人"
#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1126
+#: ../calendar/gui/e-itip-control.c:1143
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作。"
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:728
-#: ../plugins/itip-formatter/itip-formatter.c:2024
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/itip-utils.c:664
+#: ../plugins/itip-formatter/itip-formatter.c:2034
msgid "Accepted"
msgstr "接受"
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2027
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
msgid "Tentatively Accepted"
msgstr "暂时接受"
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2030
+#: ../calendar/gui/e-itip-control.c:1199
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
+#: ../plugins/itip-formatter/itip-formatter.c:2040
msgid "Declined"
msgstr "拒绝"
-#: ../calendar/gui/e-itip-control.c:1266
+#: ../calendar/gui/e-itip-control.c:1283
msgid ""
"The meeting has been canceled, however it could not be found in your "
"calendars"
msgstr "会议已经被取消,但无法在您的日历中找到该会议"
-#: ../calendar/gui/e-itip-control.c:1268
+#: ../calendar/gui/e-itip-control.c:1285
msgid ""
"The task has been canceled, however it could not be found in your task lists"
msgstr "任务已经被取消,但无法在您的任务列表中找到该任务"
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1363
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> 发布了会议信息。"
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
msgid "Meeting Information"
msgstr "会议信息"
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1370
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr "<b>%s</b> 请求 %s 参加一个会议。"
-#: ../calendar/gui/e-itip-control.c:1355
+#: ../calendar/gui/e-itip-control.c:1372
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请求您参加一个会议。"
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
msgid "Meeting Proposal"
msgstr "会议建议"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1379
#, c-format
msgid "<b>%s</b> wishes to be added to an existing meeting."
msgstr "<b>%s</b> 希望加入到已有的会议。"
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
msgid "Meeting Update"
msgstr "会议更新"
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1384
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> 希望收到最新的会议信息。"
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
msgid "Meeting Update Request"
msgstr "会议更新请求"
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1392
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> 已回复一个会议请求。"
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
msgid "Meeting Reply"
msgstr "会议答复"
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
#, c-format
msgid "<b>%s</b> has canceled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
msgid "Meeting Cancelation"
msgstr "会议取消"
-#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1528
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> 发送了一个无法理解的信件。"
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
msgid "Bad Meeting Message"
msgstr "错误的会议信件"
-#: ../calendar/gui/e-itip-control.c:1422
+#: ../calendar/gui/e-itip-control.c:1439
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> 发布了任务信息。"
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
msgid "Task Information"
msgstr "任务信息"
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1447
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> 请求 %s 完成一个任务。"
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1449
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请求您完成一个任务。"
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
msgid "Task Proposal"
msgstr "任务建议"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1456
#, c-format
msgid "<b>%s</b> wishes to be added to an existing task."
msgstr "<b>%s<b> 希望加入到已有的任务。"
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
msgid "Task Update"
msgstr "任务更新"
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1461
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> 希望获取最新的任务信息。"
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
msgid "Task Update Request"
msgstr "任务更新请求"
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1469
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> 已经回复了任务分配。"
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
msgid "Task Reply"
msgstr "任务回复"
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
#, c-format
msgid "<b>%s</b> has canceled a task."
msgstr "<b>%s</b> 取消了任务。"
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
msgid "Task Cancelation"
msgstr "任务取消"
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
msgid "Bad Task Message"
msgstr "错误的任务信件"
-#: ../calendar/gui/e-itip-control.c:1496
+#: ../calendar/gui/e-itip-control.c:1513
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> 发布了忙闲信息。"
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
msgid "Free/Busy Information"
msgstr "忙闲信息"
-#: ../calendar/gui/e-itip-control.c:1501
+#: ../calendar/gui/e-itip-control.c:1518
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请求您的忙闲信息。"
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
msgid "Free/Busy Request"
msgstr "忙/闲请求"
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1523
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> 应答了忙闲请求。"
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
msgid "Free/Busy Reply"
msgstr "忙闲应答"
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
msgid "Bad Free/Busy Message"
msgstr "错误的忙闲信件"
-#: ../calendar/gui/e-itip-control.c:1588
+#: ../calendar/gui/e-itip-control.c:1605
msgid "The message does not appear to be properly formed"
msgstr "信件的格式可能不正确"
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
msgid "The message contains only unsupported requests."
msgstr "信件只含有不支持的请求。"
-#: ../calendar/gui/e-itip-control.c:1680
+#: ../calendar/gui/e-itip-control.c:1697
msgid "The attachment does not contain a valid calendar message"
msgstr "附件中没有有效的日历信件"
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日历项目"
-#: ../calendar/gui/e-itip-control.c:1954
+#: ../calendar/gui/e-itip-control.c:1980
msgid "Update complete\n"
msgstr "更新完成\n"
-#: ../calendar/gui/e-itip-control.c:1988
+#: ../calendar/gui/e-itip-control.c:2014
msgid "Object is invalid and cannot be updated\n"
msgstr "对象无效,无法更新\n"
-#: ../calendar/gui/e-itip-control.c:2005
+#: ../calendar/gui/e-itip-control.c:2031
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "此响应并非来自当前出席者。将响应者加为出席者吗?"
-#: ../calendar/gui/e-itip-control.c:2023
+#: ../calendar/gui/e-itip-control.c:2049
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新出席者状态!\n"
-#: ../calendar/gui/e-itip-control.c:2047
+#: ../calendar/gui/e-itip-control.c:2073
msgid "Attendee status updated\n"
msgstr "更新出席者状态\n"
-#: ../calendar/gui/e-itip-control.c:2054
-#: ../plugins/itip-formatter/itip-formatter.c:1242
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新出席者状态"
-#: ../calendar/gui/e-itip-control.c:2085 ../calendar/gui/e-itip-control.c:2142
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
msgid "Item sent!\n"
msgstr "项目已发送!\n"
-#: ../calendar/gui/e-itip-control.c:2091 ../calendar/gui/e-itip-control.c:2150
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
-#: ../calendar/gui/e-itip-control.c:2230
+#: ../calendar/gui/e-itip-control.c:2256
msgid "Choose an action:"
msgstr "选择一项活动:"
-#: ../calendar/gui/e-itip-control.c:2301
+#: ../calendar/gui/e-itip-control.c:2327
msgid "Update"
msgstr "更新"
-#: ../calendar/gui/e-itip-control.c:2329
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:51
msgid "Accept"
msgstr "接受"
-#: ../calendar/gui/e-itip-control.c:2330
+#: ../calendar/gui/e-itip-control.c:2356
msgid "Tentatively accept"
msgstr "暂时接受"
-#: ../calendar/gui/e-itip-control.c:2331
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:53
msgid "Decline"
msgstr "拒绝"
-#: ../calendar/gui/e-itip-control.c:2360
+#: ../calendar/gui/e-itip-control.c:2386
msgid "Send Free/Busy Information"
msgstr "发送忙闲信息"
-#: ../calendar/gui/e-itip-control.c:2388
+#: ../calendar/gui/e-itip-control.c:2414
msgid "Update respondent status"
msgstr "更新应答者状态"
-#: ../calendar/gui/e-itip-control.c:2416
+#: ../calendar/gui/e-itip-control.c:2442
msgid "Send Latest Information"
msgstr "发送最新的信息"
-#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
#: ../ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
@@ -7573,112 +7970,112 @@ msgstr "正在装入日历..."
msgid "Server Message:"
msgstr "服务器消息:"
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
msgid "Chair Persons"
msgstr "主席人员"
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
msgid "Required Participants"
msgstr "必需的出席者"
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
msgid "Optional Participants"
msgstr "可选的出席者"
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
msgid "Resources"
msgstr "资源"
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
msgid "Attendees"
msgstr "出席者"
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
msgid "Individual"
msgstr "个人"
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
msgid "Group"
msgstr "组"
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:967
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:983
msgid "Resource"
msgstr "资源"
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
+#: ../calendar/gui/print.c:984
msgid "Room"
msgstr "房间"
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/print.c:998
msgid "Chair"
msgstr "主席"
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
msgid "Required Participant"
msgstr "必需的出席者"
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:1000
msgid "Optional Participant"
msgstr "可选的出席者"
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/print.c:1001
msgid "Non-Participant"
msgstr "不参加"
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:756
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:753
msgid "Needs Action"
msgstr "需要动作"
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-time-sel.c:397
msgid "Tentative"
msgstr "暂时的"
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/itip-utils.c:737
-#: ../plugins/itip-formatter/itip-formatter.c:2033
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/itip-utils.c:673
+#: ../plugins/itip-formatter/itip-formatter.c:2043
msgid "Delegated"
msgstr "被委任的"
#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:484
+#: ../calendar/gui/e-meeting-list-view.c:491
msgid "Attendee "
msgstr "出席者 "
#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-list-view.c:533
#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "请回复"
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
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:464
-#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2122
msgid "%A, %B %d, %Y"
msgstr "%Y年%m月%d日%A"
@@ -7686,85 +8083,81 @@ 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:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2153
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:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:475
msgid "%m/%d/%Y"
msgstr "%Y-%m-%d"
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
msgid "Out of Office"
msgstr "办公室以外"
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
msgid "No Information"
msgstr "没有信息"
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
msgid "A_ttendees..."
msgstr "出席者(_T)..."
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
msgid "O_ptions"
msgstr "选项(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
msgid "Show _only working hours"
msgstr "只显示工作小时(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
msgid "Show _zoomed out"
msgstr "显示缩放的输出(_Z)"
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
msgid "_Update free/busy"
msgstr "更新忙闲(_U)"
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
msgid "_<<"
msgstr "_<<"
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
msgid "_Autopick"
msgstr "自动获取(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
msgid ">_>"
msgstr ">_>"
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
msgid "_All people and resources"
msgstr "全部人和资源(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
msgid "All _people and one resource"
msgstr "全部人和一个资源(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
msgid "_Required people"
msgstr "必需的人(_R)"
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
msgid "Required people and _one resource"
msgstr "必需的人和一个资源(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
msgid "_Start time:"
msgstr "开始时间(_S):"
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
msgid "_End time:"
msgstr "结束时间(_E):"
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "出席者"
-
#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
msgid "Click here to add an attendee"
msgstr "单击此处添加出席者"
@@ -7789,16 +8182,16 @@ msgstr "语言"
msgid "Member"
msgstr "成员"
-#: ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-memo-table.c:942
msgid "_Delete Selected Memos"
msgstr "删除选中备忘(_D)"
-#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
msgid "Click to add a memo"
msgstr "单击以添加备忘"
-#: ../calendar/gui/e-memos.c:790 ../calendar/gui/e-tasks.c:922
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/gnome-cal.c:2961
#, c-format
msgid ""
"Error on %s:\n"
@@ -7807,85 +8200,80 @@ msgstr ""
"%s 错误:\n"
" %s"
-#: ../calendar/gui/e-memos.c:839
+#: ../calendar/gui/e-memos.c:809
msgid "Loading memos"
msgstr "装入备忘"
-#: ../calendar/gui/e-memos.c:920
+#: ../calendar/gui/e-memos.c:890
#, c-format
msgid "Opening memos at %s"
msgstr "在 %s 打开备忘"
-#: ../calendar/gui/e-memos.c:1093 ../calendar/gui/e-tasks.c:1333
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
msgid "Deleting selected objects..."
msgstr "正在删除选中的对象..."
-#: ../calendar/gui/e-tasks.c:975
+#: ../calendar/gui/e-tasks.c:963
msgid "Loading tasks"
msgstr "装入任务"
-#: ../calendar/gui/e-tasks.c:1065
+#: ../calendar/gui/e-tasks.c:1053
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
-#: ../calendar/gui/e-tasks.c:1310
+#: ../calendar/gui/e-tasks.c:1298
msgid "Completing tasks..."
msgstr "正在完成任务..."
-#: ../calendar/gui/e-tasks.c:1360
+#: ../calendar/gui/e-tasks.c:1348
msgid "Expunging"
msgstr "销毁"
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1653
msgid "%d %B"
msgstr "%-m月%-d日"
-#: ../calendar/gui/gnome-cal.c:828
-msgid "Updating query"
-msgstr "更新查询"
-
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2576
msgid "_Custom View"
msgstr "自定义视图(_C)"
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2577
msgid "_Save Custom View"
msgstr "保存自定义视图(_S)"
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2582
msgid "_Define Views..."
msgstr "定义视图(_D)..."
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2791
#, c-format
msgid "Loading appointments at %s"
msgstr "装入位于 %s 的约会"
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2806
#, c-format
msgid "Loading tasks at %s"
msgstr "装入位于 %s 的任务"
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2815
#, c-format
msgid "Loading memos at %s"
msgstr "装入位于 %s 的备忘"
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2920
#, c-format
msgid "Opening %s"
msgstr "打开 %s"
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3874
msgid "Purging"
msgstr "销毁"
@@ -7945,57 +8333,57 @@ msgstr "九月"
msgid "_Select Today"
msgstr "选择今天(_S)"
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../calendar/gui/itip-utils.c:544
msgid "An organizer must be set."
msgstr "必须设定组织者。"
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
msgid "At least one attendee is necessary"
msgstr "至少需要一个参加者"
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
msgid "Event information"
msgstr "事件信息"
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
msgid "Task information"
msgstr "任务信息"
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
msgid "Memo information"
msgstr "备忘信息"
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
msgid "Free/Busy information"
msgstr "忙闲信息"
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
msgid "Calendar information"
msgstr "日历信息"
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
msgid "Updated"
msgstr "更新"
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
msgid "Refresh"
msgstr "刷新"
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
msgid "Counter-proposal"
msgstr "投票表决"
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "忙闲信息 (%s 到 %s)"
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
msgid "iCalendar information"
msgstr "iCalendar 信息"
-#: ../calendar/gui/itip-utils.c:1008
+#: ../calendar/gui/itip-utils.c:941
msgid "You must be an attendee of the event."
msgstr "您必须是事件的出席者。"
@@ -8032,47 +8420,54 @@ msgstr "没有可创建备忘的日历"
msgid "Memo Source Selector"
msgstr "备忘来源选择器"
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
msgid "New memo"
msgstr "新建备忘"
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
msgid "Mem_o"
msgstr "备忘(_O)"
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
msgid "Create a new memo"
msgstr "创建新备忘"
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
msgid "New shared memo"
msgstr "新建共享备忘"
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
msgid "_Shared memo"
msgstr "共享备忘(_S)"
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
msgid "Create a shared new memo"
msgstr "创建新的共享备忘"
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
msgid "New memo list"
msgstr "新建备忘列表"
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
msgid "Memo li_st"
msgstr "备忘列表(_S)"
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
msgid "Create a new memo list"
msgstr "创建新备忘列表"
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
msgid "Print Memos"
msgstr "打印备忘"
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "下一周"
+
+#: ../calendar/gui/migration.c:157
msgid ""
"The location and hierarchy of the Evolution task folders has changed since "
"Evolution 1.x.\n"
@@ -8083,7 +8478,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../calendar/gui/migration.c:168
+#: ../calendar/gui/migration.c:161
msgid ""
"The location and hierarchy of the Evolution calendar folders has changed "
"since Evolution 1.x.\n"
@@ -8095,27 +8490,27 @@ msgstr ""
"请稍候,Evolution 正在升迁您的文件夹..."
#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:781 ../calendar/gui/migration.c:949
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
#, c-format
msgid "Unable to migrate old settings from evolution/config.xmldb"
msgstr "无法从 evolution/config.xmldb 中升迁旧设置"
#. FIXME: domain/code
-#: ../calendar/gui/migration.c:810
+#: ../calendar/gui/migration.c:804
#, c-format
msgid "Unable to migrate calendar `%s'"
msgstr "无法升迁日历“%s”"
#. FIXME: domain/code
-#: ../calendar/gui/migration.c:978
+#: ../calendar/gui/migration.c:972
#, c-format
msgid "Unable to migrate tasks `%s'"
msgstr "无法升迁任务“%s”"
#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
msgid "Notes"
msgstr "笔记"
@@ -8272,57 +8667,52 @@ msgstr "五"
msgid "Sa"
msgstr "六"
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
msgid "Appointment"
msgstr "约会"
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
msgid "Task"
msgstr "任务"
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
#, c-format
msgid "Summary: %s"
msgstr "概要:%s"
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
msgid "Attendees: "
msgstr "出席者:"
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
#, c-format
msgid "Status: %s"
msgstr "状态:%s"
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
#, c-format
msgid "Priority: %s"
msgstr "优先级:%s"
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
#, c-format
msgid "Percent Complete: %i"
msgstr "完成率:%i"
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
#, c-format
msgid "Categories: %s"
msgstr "类别:%s"
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
msgid "Contacts: "
msgstr "联系人:"
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "即将到来的约会"
-
#: ../calendar/gui/tasks-component.c:455
msgid "_New Task List"
msgstr "新建任务列表(_N)"
@@ -8350,39 +8740,47 @@ msgstr "没有可创建任务的日历"
msgid "Task Source Selector"
msgstr "任务来源选择器"
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
msgid "New task"
msgstr "新建任务"
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1326
+#, fuzzy
+msgctxt "New"
+msgid "_Task"
+msgstr "任务(_T)"
+
+#: ../calendar/gui/tasks-component.c:1327
msgid "Create a new task"
msgstr "创建新任务"
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
msgid "New assigned task"
msgstr "新建分配的任务"
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
msgid "Assigne_d Task"
msgstr "分配的任务(_D)"
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
msgid "Create a new assigned task"
msgstr "创建新分配的任务"
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
msgid "New task list"
msgstr "新建任务列表"
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
msgid "Tas_k list"
msgstr "任务列表(_K)"
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
msgid "Create a new task list"
msgstr "创建新任务列表"
-#: ../calendar/gui/tasks-control.c:455
+#: ../calendar/gui/tasks-control.c:452
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -8393,1700 +8791,1913 @@ msgstr ""
"\n"
"确实删除这些任务吗?"
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
msgid "Do not ask me again."
msgstr "不要再次询问。"
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
msgid "Print Tasks"
msgstr "打印任务"
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% 完成"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "已取消"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "进行中"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "大于"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "小于"
+
+#: ../calendar/importers/icalendar-importer.c:73
msgid "Appointments and Meetings"
msgstr "约会和会议"
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1570
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
msgid "Opening calendar"
msgstr "打开日历"
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
msgid "iCalendar files (.ics)"
msgstr "iCalendar 文件(.ics)"
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
msgid "Evolution iCalendar importer"
msgstr "Evolution iCalendar 导入器"
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
msgid "Reminder!"
msgstr "提醒!!"
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
msgid "vCalendar files (.vcf)"
msgstr "vCalendar 文件(.vcf)"
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
msgid "Evolution vCalendar importer"
msgstr "Evolution vCalendar 导入器"
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
msgid "Calendar Events"
msgstr "日历事件"
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
msgid "Evolution Calendar intelligent importer"
msgstr "Evolution 日历智能导入器"
#.
+#. *
+#. * This program is free software; you can redistribute it and/or
+#. * modify it under the terms of the GNU Lesser General Public
+#. * License as published by the Free Software Foundation; either
+#. * version 2 of the License, or (at your option) version 3.
+#. *
+#. * This program is distributed in the hope that it will be useful,
+#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#. * Lesser General Public License for more details.
+#. *
+#. * You should have received a copy of the GNU Lesser General Public
+#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. *
+#. *
+#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+#. *
+#.
+#.
#. * These are the timezone names from the Olson timezone data.
#. * We only place them here so gettext picks them up for translation.
#. * Don't include in any C files.
#.
-#: ../calendar/zones.h:7
+#: ../calendar/zones.h:26
msgid "Africa/Abidjan"
msgstr "非洲/阿比让"
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
msgid "Africa/Accra"
msgstr "非洲/阿克拉"
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
msgid "Africa/Addis_Ababa"
msgstr "非洲/亚的斯亚贝巴"
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
msgid "Africa/Algiers"
msgstr "非洲/阿尔及尔"
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
msgid "Africa/Asmera"
msgstr "非洲/阿斯马拉"
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
msgid "Africa/Bamako"
msgstr "非洲/巴马科"
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
msgid "Africa/Bangui"
msgstr "非洲/班吉"
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
msgid "Africa/Banjul"
msgstr "非洲/班珠尔"
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
msgid "Africa/Bissau"
msgstr "非洲/比绍"
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
msgid "Africa/Blantyre"
msgstr "非洲/布兰太尔"
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
msgid "Africa/Brazzaville"
msgstr "非洲/布拉柴维尔"
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
msgid "Africa/Bujumbura"
msgstr "非洲/布琼布拉"
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
msgid "Africa/Cairo"
msgstr "非洲/开罗"
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
msgid "Africa/Casablanca"
msgstr "非洲/卡萨布兰卡"
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
msgid "Africa/Ceuta"
msgstr "非洲/休塔"
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
msgid "Africa/Conakry"
msgstr "非洲/科纳克里"
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
msgid "Africa/Dakar"
msgstr "非洲/达喀尔"
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
msgid "Africa/Dar_es_Salaam"
msgstr "非洲/达累斯萨拉姆"
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
msgid "Africa/Djibouti"
msgstr "非洲/吉布提"
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
msgid "Africa/Douala"
msgstr "非洲/杜阿拉"
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
msgid "Africa/El_Aaiun"
msgstr "非洲/El_Aaiun"
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
msgid "Africa/Freetown"
msgstr "非洲/弗里敦"
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
msgid "Africa/Gaborone"
msgstr "非洲/哈博罗内"
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
msgid "Africa/Harare"
msgstr "非洲/哈拉雷"
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
msgid "Africa/Johannesburg"
msgstr "非洲/约翰内斯堡"
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
msgid "Africa/Kampala"
msgstr "非洲/坎帕拉"
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
msgid "Africa/Khartoum"
msgstr "非洲/喀土穆"
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
msgid "Africa/Kigali"
msgstr "非洲/基加利"
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
msgid "Africa/Kinshasa"
msgstr "非洲/金沙萨"
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
msgid "Africa/Lagos"
msgstr "非洲/拉各斯"
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
msgid "Africa/Libreville"
msgstr "非洲/利伯维尔"
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
msgid "Africa/Lome"
msgstr "非洲/洛美"
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
msgid "Africa/Luanda"
msgstr "非洲/罗安达"
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
msgid "Africa/Lubumbashi"
msgstr "非洲/卢本巴希"
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
msgid "Africa/Lusaka"
msgstr "非洲/卢萨卡"
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
msgid "Africa/Malabo"
msgstr "非洲/马拉博"
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
msgid "Africa/Maputo"
msgstr "非洲/马普托"
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
msgid "Africa/Maseru"
msgstr "非洲/马塞卢"
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
msgid "Africa/Mbabane"
msgstr "非洲/姆巴巴纳"
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
msgid "Africa/Mogadishu"
msgstr "非洲/摩加迪沙"
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
msgid "Africa/Monrovia"
msgstr "非洲/蒙罗维亚"
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
msgid "Africa/Nairobi"
msgstr "非洲/内罗毕"
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
msgid "Africa/Ndjamena"
msgstr "非洲/恩贾梅纳"
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
msgid "Africa/Niamey"
msgstr "非洲/尼亚美"
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
msgid "Africa/Nouakchott"
msgstr "非洲/努瓦克肖特"
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
msgid "Africa/Ouagadougou"
msgstr "非洲/瓦加杜古"
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
msgid "Africa/Porto-Novo"
msgstr "非洲/波多诺伏"
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
msgid "Africa/Sao_Tome"
msgstr "非洲/圣多美"
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
msgid "Africa/Timbuktu"
msgstr "非洲/Timbuktu"
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
msgid "Africa/Tripoli"
msgstr "非洲/的黎波里"
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
msgid "Africa/Tunis"
msgstr "非洲/突尼斯"
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
msgid "Africa/Windhoek"
msgstr "非洲/温得和克"
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
msgid "America/Adak"
msgstr "美洲/Adak"
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
msgid "America/Anchorage"
msgstr "美洲/安克雷奇"
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
msgid "America/Anguilla"
msgstr "美洲/安圭拉"
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
msgid "America/Antigua"
msgstr "美洲/安提瓜"
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
msgid "America/Araguaina"
msgstr "美洲/Araguaina"
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
msgid "America/Aruba"
msgstr "美洲/阿鲁巴"
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
msgid "America/Asuncion"
msgstr "美洲/亚松森"
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
msgid "America/Barbados"
msgstr "美洲/巴巴多斯"
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
msgid "America/Belem"
msgstr "美洲/Belem"
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
msgid "America/Belize"
msgstr "美洲/伯利兹"
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
msgid "America/Boa_Vista"
msgstr "美洲/Boa_Vista"
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
msgid "America/Bogota"
msgstr "美洲/波哥大"
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
msgid "America/Boise"
msgstr "美洲/博伊西"
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
msgid "America/Buenos_Aires"
msgstr "美洲/布宜诺斯艾利斯"
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
msgid "America/Cambridge_Bay"
msgstr "美洲/剑桥湾"
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
msgid "America/Cancun"
msgstr "美洲/Cancun"
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
msgid "America/Caracas"
msgstr "美洲/加拉加斯"
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
msgid "America/Catamarca"
msgstr "美洲/Catamarca"
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
msgid "America/Cayenne"
msgstr "美洲/卡宴"
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
msgid "America/Cayman"
msgstr "美洲/开曼"
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
msgid "America/Chicago"
msgstr "美洲/芝加哥"
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
msgid "America/Chihuahua"
msgstr "美洲/奇瓦瓦"
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
msgid "America/Cordoba"
msgstr "美洲/科尔多瓦"
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
msgid "America/Costa_Rica"
msgstr "美洲/哥斯达黎加"
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
msgid "America/Cuiaba"
msgstr "美洲/Cuiaba"
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
msgid "America/Curacao"
msgstr "美洲/Curacao"
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
msgid "America/Danmarkshavn"
msgstr "美洲/Danmarkshavn"
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
msgid "America/Dawson"
msgstr "美洲/道森"
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
msgid "America/Dawson_Creek"
msgstr "美洲/道森克里克"
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
msgid "America/Denver"
msgstr "美洲/丹佛"
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
msgid "America/Detroit"
msgstr "美洲/底特律"
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
msgid "America/Dominica"
msgstr "美洲/多米尼加"
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
msgid "America/Edmonton"
msgstr "美洲/埃德蒙顿(爱民顿)"
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
msgid "America/Eirunepe"
msgstr "美洲/Eirunepe"
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
msgid "America/El_Salvador"
msgstr "美洲/萨尔瓦多"
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
msgid "America/Fortaleza"
msgstr "美国/福塔雷萨"
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
msgid "America/Glace_Bay"
msgstr "美洲/Glace_Bay"
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
msgid "America/Godthab"
msgstr "美洲/戈德霍普"
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
msgid "America/Goose_Bay"
msgstr "美洲/Goose_Bay"
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
msgid "America/Grand_Turk"
msgstr "美洲/Grand_Turk"
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
msgid "America/Grenada"
msgstr "美洲/格林纳达"
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
msgid "America/Guadeloupe"
msgstr "美洲/瓜德罗普岛"
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
msgid "America/Guatemala"
msgstr "美洲/危地马拉"
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
msgid "America/Guayaquil"
msgstr "美洲/瓜亚基尔"
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
msgid "America/Guyana"
msgstr "美洲/圭亚那"
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
msgid "America/Halifax"
msgstr "美洲/哈利法克斯"
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
msgid "America/Havana"
msgstr "美洲/哈瓦那"
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
msgid "America/Hermosillo"
msgstr "美洲/厄木波利斯"
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
msgid "America/Indiana/Indianapolis"
msgstr "美洲/印地安那/印地安纳波利斯"
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
msgid "America/Indiana/Knox"
msgstr "美洲/印地安那/诺克斯"
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
msgid "America/Indiana/Marengo"
msgstr "美洲/印地安那/马伦戈"
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
msgid "America/Indiana/Vevay"
msgstr "美洲/印地安那/Vevay"
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
msgid "America/Indianapolis"
msgstr "美洲/印地安纳波利斯"
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
msgid "America/Inuvik"
msgstr "美洲/Inuvik"
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
msgid "America/Iqaluit"
msgstr "美洲/Iqaluit"
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
msgid "America/Jamaica"
msgstr "美洲/牙买加"
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
msgid "America/Jujuy"
msgstr "美洲/Jujuy"
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
msgid "America/Juneau"
msgstr "美洲/朱诺"
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
msgid "America/Kentucky/Louisville"
msgstr "美洲/肯塔基/路易斯维尔"
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
msgid "America/Kentucky/Monticello"
msgstr "美洲/肯塔基/Monticello"
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
msgid "America/La_Paz"
msgstr "美洲/拉巴斯"
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
msgid "America/Lima"
msgstr "美洲/利马"
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
msgid "America/Los_Angeles"
msgstr "美洲/洛杉矶"
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
msgid "America/Louisville"
msgstr "美洲/路易斯维尔"
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
msgid "America/Maceio"
msgstr "美洲/Maceio"
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
msgid "America/Managua"
msgstr "美洲/马那瓜"
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
msgid "America/Manaus"
msgstr "美洲/马瑙斯"
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
msgid "America/Martinique"
msgstr "美洲/马提尼克岛"
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
msgid "America/Mazatlan"
msgstr "美洲/Mazatlan"
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
msgid "America/Mendoza"
msgstr "美洲/Mendoza"
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
msgid "America/Menominee"
msgstr "美洲/Menominee"
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
msgid "America/Merida"
msgstr "美洲/Merida"
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
msgid "America/Mexico_City"
msgstr "美洲/墨西哥城"
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
msgid "America/Miquelon"
msgstr "美洲/密克隆岛"
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
msgid "America/Monterrey"
msgstr "美洲/蒙特雷"
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
msgid "America/Montevideo"
msgstr "美洲/蒙得维的亚"
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
msgid "America/Montreal"
msgstr "美洲/蒙特利尔"
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
msgid "America/Montserrat"
msgstr "美洲/蒙特塞拉特"
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
msgid "America/Nassau"
msgstr "美洲/拿骚"
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
msgid "America/New_York"
msgstr "美洲/纽约"
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
msgid "America/Nipigon"
msgstr "美洲/Nipigon"
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
msgid "America/Nome"
msgstr "美洲/诺姆"
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
msgid "America/Noronha"
msgstr "美洲/Noronha"
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
msgid "America/North_Dakota/Center"
msgstr "美洲/北达科它/中心"
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
msgid "America/Panama"
msgstr "美洲/巴拿马"
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
msgid "America/Pangnirtung"
msgstr "美洲/Pangnirtung"
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
msgid "America/Paramaribo"
msgstr "美洲/帕拉马里博"
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
msgid "America/Phoenix"
msgstr "美洲/凤凰城"
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
msgid "America/Port-au-Prince"
msgstr "美洲/太子港"
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
msgid "America/Port_of_Spain"
msgstr "美洲/西班牙港"
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
msgid "America/Porto_Velho"
msgstr "美洲/Porto_Velho"
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
msgid "America/Puerto_Rico"
msgstr "美洲/波多黎各"
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
msgid "America/Rainy_River"
msgstr "美洲/Rainy_River"
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
msgid "America/Rankin_Inlet"
msgstr "美洲/Rankin_Inlet"
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
msgid "America/Recife"
msgstr "美洲/累西腓"
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
msgid "America/Regina"
msgstr "美洲/Regina"
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
msgid "America/Rio_Branco"
msgstr "美洲/Rio_Branco"
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
msgid "America/Rosario"
msgstr "美洲/Rosario"
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
msgid "America/Santiago"
msgstr "美洲/圣地亚哥"
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
msgid "America/Santo_Domingo"
msgstr "美洲/圣多明哥"
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
msgid "America/Sao_Paulo"
msgstr "美洲/圣保罗"
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
msgid "America/Scoresbysund"
msgstr "美洲/Scoresbysund"
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
msgid "America/Shiprock"
msgstr "美洲/Shiprock"
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
msgid "America/St_Johns"
msgstr "美洲/圣约翰斯"
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
msgid "America/St_Kitts"
msgstr "美洲/St_Kitts"
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
msgid "America/St_Lucia"
msgstr "美洲/圣露西娅"
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
msgid "America/St_Thomas"
msgstr "美洲/圣托马斯"
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
msgid "America/St_Vincent"
msgstr "美洲/圣文森特"
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
msgid "America/Swift_Current"
msgstr "美洲/Swift_Current"
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
msgid "America/Tegucigalpa"
msgstr "美洲/特古西加尔巴"
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
msgid "America/Thule"
msgstr "美洲/Thule"
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
msgid "America/Thunder_Bay"
msgstr "美洲/Thunder_Bay"
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
msgid "America/Tijuana"
msgstr "美洲/提华纳"
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
msgid "America/Tortola"
msgstr "美洲/托托拉岛"
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
msgid "America/Vancouver"
msgstr "美洲/温哥华"
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
msgid "America/Whitehorse"
msgstr "美洲/怀特霍斯"
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
msgid "America/Winnipeg"
msgstr "美洲/温尼伯"
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
msgid "America/Yakutat"
msgstr "美洲/Yakutat"
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
msgid "America/Yellowknife"
msgstr "美洲/耶洛奈夫"
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
msgid "Antarctica/Casey"
msgstr "南极洲/凯西"
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
msgid "Antarctica/Davis"
msgstr "南极洲/戴维斯"
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
msgid "Antarctica/DumontDUrville"
msgstr "南极洲/DumontDUrville"
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
msgid "Antarctica/Mawson"
msgstr "南极洲/莫森"
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
msgid "Antarctica/McMurdo"
msgstr "南极洲/麦克默多"
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
msgid "Antarctica/Palmer"
msgstr "南极洲/帕默"
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
msgid "Antarctica/South_Pole"
msgstr "南极洲/南极点"
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
msgid "Antarctica/Syowa"
msgstr "南极洲/Syowa"
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
msgid "Antarctica/Vostok"
msgstr "南极洲/东方站"
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
msgid "Arctic/Longyearbyen"
msgstr "北极地区/郎伊尔城"
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
msgid "Asia/Aden"
msgstr "亚洲/亚丁"
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
msgid "Asia/Almaty"
msgstr "亚洲/Almaty"
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
msgid "Asia/Amman"
msgstr "亚洲/安曼"
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
msgid "Asia/Anadyr"
msgstr "亚洲/阿纳德尔"
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
msgid "Asia/Aqtau"
msgstr "亚洲/Aqtau"
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
msgid "Asia/Aqtobe"
msgstr "亚洲/Aqtobe"
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
msgid "Asia/Ashgabat"
msgstr "亚洲/Ashgabat"
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
msgid "Asia/Baghdad"
msgstr "亚洲/巴格达"
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
msgid "Asia/Bahrain"
msgstr "亚洲/巴林岛"
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
msgid "Asia/Baku"
msgstr "亚洲/巴库"
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
msgid "Asia/Bangkok"
msgstr "亚洲/曼谷"
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
msgid "Asia/Beirut"
msgstr "亚洲/贝鲁特"
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
msgid "Asia/Bishkek"
msgstr "亚洲/比什凯克"
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
msgid "Asia/Brunei"
msgstr "亚洲/文莱"
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
msgid "Asia/Calcutta"
msgstr "亚洲/加尔各答"
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
msgid "Asia/Choibalsan"
msgstr "亚洲/Choibalsan"
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
msgid "Asia/Chongqing"
msgstr "亚洲/重庆"
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
msgid "Asia/Colombo"
msgstr "亚洲/科伦坡"
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
msgid "Asia/Damascus"
msgstr "亚洲/大马士革"
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
msgid "Asia/Dhaka"
msgstr "亚洲/达卡"
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
msgid "Asia/Dili"
msgstr "亚洲/帝力"
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
msgid "Asia/Dubai"
msgstr "亚洲/迪拜"
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
msgid "Asia/Dushanbe"
msgstr "亚洲/杜尚别"
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
msgid "Asia/Gaza"
msgstr "亚洲/加沙"
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
msgid "Asia/Harbin"
msgstr "亚洲/哈尔滨"
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
msgid "Asia/Hong_Kong"
msgstr "亚洲/香港"
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
msgid "Asia/Hovd"
msgstr "亚洲/Hovd"
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
msgid "Asia/Irkutsk"
msgstr "亚洲/伊尔库次克"
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
msgid "Asia/Istanbul"
msgstr "亚洲/伊斯坦布尔"
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
msgid "Asia/Jakarta"
msgstr "亚洲/雅加达"
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
msgid "Asia/Jayapura"
msgstr "亚洲/Jayapura"
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
msgid "Asia/Jerusalem"
msgstr "亚洲/耶路撒冷"
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
msgid "Asia/Kabul"
msgstr "亚洲/喀布尔"
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
msgid "Asia/Kamchatka"
msgstr "亚洲/堪察加半岛"
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
msgid "Asia/Karachi"
msgstr "亚洲/卡拉奇"
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
msgid "Asia/Kashgar"
msgstr "亚洲/喀什葛尔"
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
msgid "Asia/Katmandu"
msgstr "亚洲/加德满都"
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
msgid "Asia/Krasnoyarsk"
msgstr "亚洲/克拉斯诺伏斯克"
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
msgid "Asia/Kuala_Lumpur"
msgstr "亚洲/吉隆坡"
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
msgid "Asia/Kuching"
msgstr "亚洲/古晋"
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
msgid "Asia/Kuwait"
msgstr "亚洲/科威特"
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
msgid "Asia/Macao"
msgstr "亚洲/澳门"
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
msgid "Asia/Macau"
msgstr "亚洲/澳门"
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
msgid "Asia/Magadan"
msgstr "亚洲/Magadan"
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
msgid "Asia/Makassar"
msgstr "亚洲/Makassar"
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
msgid "Asia/Manila"
msgstr "亚洲/马尼拉"
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
msgid "Asia/Muscat"
msgstr "亚洲/马斯喀特"
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
msgid "Asia/Nicosia"
msgstr "亚洲/尼科西亚"
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
msgid "Asia/Novosibirsk"
msgstr "亚洲/新西伯利亚"
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
msgid "Asia/Omsk"
msgstr "亚洲/鄂木斯克"
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
msgid "Asia/Oral"
msgstr "亚洲/Oral"
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
msgid "Asia/Phnom_Penh"
msgstr "亚洲/金边"
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
msgid "Asia/Pontianak"
msgstr "亚洲/坤甸"
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
msgid "Asia/Pyongyang"
msgstr "亚洲/平壤"
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
msgid "Asia/Qatar"
msgstr "亚洲/卡塔尔"
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
msgid "Asia/Qyzylorda"
msgstr "亚洲/Qyzylorda"
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
msgid "Asia/Rangoon"
msgstr "亚洲/仰光"
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
msgid "Asia/Riyadh"
msgstr "亚洲/利雅得"
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
msgid "Asia/Saigon"
msgstr "亚洲/西贡"
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
msgid "Asia/Sakhalin"
msgstr "亚洲/库页岛"
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
msgid "Asia/Samarkand"
msgstr "亚洲/撒马尔罕"
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
msgid "Asia/Seoul"
msgstr "亚洲/汉城"
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
msgid "Asia/Shanghai"
msgstr "亚洲/上海"
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
msgid "Asia/Singapore"
msgstr "亚洲/新加坡"
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
msgid "Asia/Taipei"
msgstr "亚洲/台北"
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
msgid "Asia/Tashkent"
msgstr "亚洲/塔什干"
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
msgid "Asia/Tbilisi"
msgstr "亚洲/第比利斯"
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
msgid "Asia/Tehran"
msgstr "亚洲/德黑兰"
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
msgid "Asia/Thimphu"
msgstr "亚洲/廷布"
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
msgid "Asia/Tokyo"
msgstr "亚洲/东京"
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
msgid "Asia/Ujung_Pandang"
msgstr "亚洲/Ujung_Pandang"
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
msgid "Asia/Ulaanbaatar"
msgstr "亚洲/乌兰巴托"
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
msgid "Asia/Urumqi"
msgstr "亚洲/乌鲁木齐"
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
msgid "Asia/Vientiane"
msgstr "亚洲/万象"
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
msgid "Asia/Vladivostok"
msgstr "亚洲/符拉迪沃斯托克"
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
msgid "Asia/Yakutsk"
msgstr "亚洲/雅库茨克"
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
msgid "Asia/Yekaterinburg"
msgstr "亚洲/Yekaterinburg"
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
msgid "Asia/Yerevan"
msgstr "亚洲/耶列万"
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
msgid "Atlantic/Azores"
msgstr "大西洋/亚述尔群岛"
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
msgid "Atlantic/Bermuda"
msgstr "大西洋/百慕大"
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
msgid "Atlantic/Canary"
msgstr "大西洋/卡内里"
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
msgid "Atlantic/Cape_Verde"
msgstr "大西洋/佛得角"
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
msgid "Atlantic/Faeroe"
msgstr "大西洋/法罗"
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
msgid "Atlantic/Jan_Mayen"
msgstr "大西洋/Jan_Mayen"
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
msgid "Atlantic/Madeira"
msgstr "大西洋/马德拉群岛"
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
msgid "Atlantic/Reykjavik"
msgstr "大西洋/雷克雅未克"
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
msgid "Atlantic/South_Georgia"
msgstr "大西洋/南乔治亚"
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
msgid "Atlantic/St_Helena"
msgstr "大西洋/圣海伦娜"
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
msgid "Atlantic/Stanley"
msgstr "大西洋/斯坦利"
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
msgid "Australia/Adelaide"
msgstr "澳大利亚/阿德莱德"
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
msgid "Australia/Brisbane"
msgstr "澳大利亚/布里斯班"
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
msgid "Australia/Broken_Hill"
msgstr "澳大利亚/Broken_Hill"
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
msgid "Australia/Darwin"
msgstr "澳大利亚/达尔文"
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
msgid "Australia/Hobart"
msgstr "澳大利亚/霍巴特"
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
msgid "Australia/Lindeman"
msgstr "澳大利亚/林德曼"
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
msgid "Australia/Lord_Howe"
msgstr "澳大利亚/Lord_Howe"
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
msgid "Australia/Melbourne"
msgstr "澳洲/墨尔本"
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
msgid "Australia/Perth"
msgstr "澳大利亚/珀斯"
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
msgid "Australia/Sydney"
msgstr "澳洲/悉尼"
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
msgid "Europe/Amsterdam"
msgstr "欧洲/阿姆斯特丹"
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
msgid "Europe/Andorra"
msgstr "欧洲/安道尔"
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
msgid "Europe/Athens"
msgstr "欧洲/雅典"
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
msgid "Europe/Belfast"
msgstr "欧洲/贝尔法斯特"
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
msgid "Europe/Belgrade"
msgstr "欧洲/贝尔格莱德"
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
msgid "Europe/Berlin"
msgstr "欧洲/柏林"
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
msgid "Europe/Bratislava"
msgstr "欧洲/布拉迪斯拉发"
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
msgid "Europe/Brussels"
msgstr "欧洲/布鲁塞尔"
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
msgid "Europe/Bucharest"
msgstr "欧洲/布加勒斯特"
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
msgid "Europe/Budapest"
msgstr "欧洲/布达佩斯"
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
msgid "Europe/Chisinau"
msgstr "欧洲/尼科西亚"
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
msgid "Europe/Copenhagen"
msgstr "欧洲/哥本哈根"
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
msgid "Europe/Dublin"
msgstr "欧洲/都柏林"
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
msgid "Europe/Gibraltar"
msgstr "欧洲/直布罗陀"
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
msgid "Europe/Helsinki"
msgstr "欧洲/赫尔辛基"
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
msgid "Europe/Istanbul"
msgstr "欧洲/伊斯坦布尔"
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
msgid "Europe/Kaliningrad"
msgstr "欧洲/加里宁格勒"
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
msgid "Europe/Kiev"
msgstr "欧洲/基辅"
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
msgid "Europe/Lisbon"
msgstr "欧洲/里斯本"
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
msgid "Europe/Ljubljana"
msgstr "欧洲/卢布尔雅纳"
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
msgid "Europe/London"
msgstr "欧洲/伦敦"
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
msgid "Europe/Luxembourg"
msgstr "欧洲/卢森堡"
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
msgid "Europe/Madrid"
msgstr "欧洲/马德里"
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
msgid "Europe/Malta"
msgstr "欧洲/马耳他"
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
msgid "Europe/Minsk"
msgstr "欧洲/明斯克"
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
msgid "Europe/Monaco"
msgstr "欧洲/摩纳哥"
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
msgid "Europe/Moscow"
msgstr "欧洲/莫斯科"
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
msgid "Europe/Nicosia"
msgstr "欧洲/尼科西亚"
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
msgid "Europe/Oslo"
msgstr "欧洲/奥斯路"
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
msgid "Europe/Paris"
msgstr "欧洲/巴黎"
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
msgid "Europe/Prague"
msgstr "欧洲/布拉格"
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
msgid "Europe/Riga"
msgstr "欧洲/里加"
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
msgid "Europe/Rome"
msgstr "欧洲/罗马"
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
msgid "Europe/Samara"
msgstr "欧洲/Samara"
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
msgid "Europe/San_Marino"
msgstr "欧洲/圣马力诺"
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
msgid "Europe/Sarajevo"
msgstr "欧洲/萨拉热窝"
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
msgid "Europe/Simferopol"
msgstr "欧洲/辛菲罗波尔"
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
msgid "Europe/Skopje"
msgstr "欧洲/斯科普里"
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
msgid "Europe/Sofia"
msgstr "欧洲/索非亚"
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
msgid "Europe/Stockholm"
msgstr "欧洲/斯德哥尔摩"
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
msgid "Europe/Tallinn"
msgstr "欧洲/塔林"
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
msgid "Europe/Tirane"
msgstr "欧洲/地拉那"
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
msgid "Europe/Uzhgorod"
msgstr "欧洲/Uzhgorod"
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
msgid "Europe/Vaduz"
msgstr "欧洲/瓦杜兹"
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
msgid "Europe/Vatican"
msgstr "欧洲/梵蒂冈"
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
msgid "Europe/Vienna"
msgstr "欧洲/维也纳"
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
msgid "Europe/Vilnius"
msgstr "欧洲/维尔纽斯"
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
msgid "Europe/Warsaw"
msgstr "欧洲/华沙"
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
msgid "Europe/Zagreb"
msgstr "欧洲/萨格勒布"
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
msgid "Europe/Zaporozhye"
msgstr "欧洲/Zaporozhye"
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
msgid "Europe/Zurich"
msgstr "欧洲/苏黎世"
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
msgid "Indian/Antananarivo"
msgstr "印度洋/Antananarivo"
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
msgid "Indian/Chagos"
msgstr "印度洋/查戈斯群岛"
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
msgid "Indian/Christmas"
msgstr "印度洋/圣诞岛"
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
msgid "Indian/Cocos"
msgstr "印度洋/科科斯"
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
msgid "Indian/Comoro"
msgstr "印度洋/科摩罗"
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
msgid "Indian/Kerguelen"
msgstr "印度洋/Kerguelen"
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
msgid "Indian/Mahe"
msgstr "印度洋/Mahe"
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
msgid "Indian/Maldives"
msgstr "印度洋/马尔代夫"
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
msgid "Indian/Mauritius"
msgstr "印度洋/毛里求斯"
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
msgid "Indian/Mayotte"
msgstr "印度洋/马约特岛"
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
msgid "Indian/Reunion"
msgstr "印度洋/留尼汪"
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
msgid "Pacific/Apia"
msgstr "太平洋/阿皮亚"
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
msgid "Pacific/Auckland"
msgstr "太平洋/奥克兰"
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
msgid "Pacific/Chatham"
msgstr "太平洋/查塔姆群岛"
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
msgid "Pacific/Easter"
msgstr "太平洋/复活节岛"
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
msgid "Pacific/Efate"
msgstr "太平洋/埃法特岛"
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
msgid "Pacific/Enderbury"
msgstr "太平洋/Enderbury"
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
msgid "Pacific/Fakaofo"
msgstr "太平洋/Fakaofo"
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
msgid "Pacific/Fiji"
msgstr "太平洋/斐济"
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
msgid "Pacific/Funafuti"
msgstr "太平洋/富纳富提"
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
msgid "Pacific/Galapagos"
msgstr "太平洋/加拉帕哥斯群岛"
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
msgid "Pacific/Gambier"
msgstr "太平洋/Gambier"
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
msgid "Pacific/Guadalcanal"
msgstr "太平洋/瓜达卡纳尔岛"
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
msgid "Pacific/Guam"
msgstr "太平洋/关岛"
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
msgid "Pacific/Honolulu"
msgstr "太平洋/火奴鲁鲁"
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
msgid "Pacific/Johnston"
msgstr "太平洋/约翰斯顿"
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
msgid "Pacific/Kiritimati"
msgstr "太平洋/Kiritimati"
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
msgid "Pacific/Kosrae"
msgstr "太平洋/Kosrae"
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
msgid "Pacific/Kwajalein"
msgstr "太平洋/夸贾林环礁"
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
msgid "Pacific/Majuro"
msgstr "太平洋/Majuro"
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
msgid "Pacific/Marquesas"
msgstr "太平洋/马克萨斯群岛"
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
msgid "Pacific/Midway"
msgstr "太平洋/中途岛"
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
msgid "Pacific/Nauru"
msgstr "太平洋/瑙鲁"
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
msgid "Pacific/Niue"
msgstr "太平洋/纽埃岛"
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
msgid "Pacific/Norfolk"
msgstr "太平洋/诺福克"
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
msgid "Pacific/Noumea"
msgstr "太平洋/努美阿"
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
msgid "Pacific/Pago_Pago"
msgstr "太平洋/帕果_帕果"
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
msgid "Pacific/Palau"
msgstr "太平洋/帕劳"
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
msgid "Pacific/Pitcairn"
msgstr "太平洋/皮特克恩岛"
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
msgid "Pacific/Ponape"
msgstr "太平洋/Ponape"
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
msgid "Pacific/Port_Moresby"
msgstr "太平洋/莫尔斯比港"
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
msgid "Pacific/Rarotonga"
msgstr "太平洋/拉罗汤加岛"
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
msgid "Pacific/Saipan"
msgstr "太平洋/塞班岛"
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
msgid "Pacific/Tahiti"
msgstr "太平洋/塔希提"
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
msgid "Pacific/Tarawa"
msgstr "太平洋/塔拉瓦岛"
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
msgid "Pacific/Tongatapu"
msgstr "太平洋/Tongatapu"
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
msgid "Pacific/Truk"
msgstr "太平洋/特鲁克"
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
msgid "Pacific/Wake"
msgstr "太平洋/威克岛"
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
msgid "Pacific/Wallis"
msgstr "太平洋/沃利斯"
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
msgid "Pacific/Yap"
msgstr "太平洋/雅浦"
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "单击此处以使用地址簿"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "无法打开自动保存文件"
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "投递目的"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "无法从编辑器获取信件"
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "选择要将信件投递到哪个文件夹。"
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "插入附件"
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "单击此处以选择要投递到的文件夹"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "附件(_T)"
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "签名(_G):"
+#: ../composer/e-composer-actions.c:142
+msgid "Untitled Message"
+msgstr "无标题信件"
+
+#: ../composer/e-composer-actions.c:473
+msgid "Attach a file"
+msgstr "添加附件"
+
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "关闭(_C)"
+
+#: ../composer/e-composer-actions.c:480
+msgid "Close the current file"
+msgstr "关闭当前文件"
+
+#: ../composer/e-composer-actions.c:485 ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "打印(_P)..."
+
+#: ../composer/e-composer-actions.c:492 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "打印预览(_V)"
+
+#: ../composer/e-composer-actions.c:501
+msgid "Save the current file"
+msgstr "保存当前文件"
+
+#: ../composer/e-composer-actions.c:506
+msgid "Save _As..."
+msgstr "另存为(_A)..."
+
+#: ../composer/e-composer-actions.c:508
+msgid "Save the current file with a different name"
+msgstr "用不同的文件名保存当前文件"
+
+#: ../composer/e-composer-actions.c:513
+msgid "Save _Draft"
+msgstr "保存草稿(_D)"
+
+#: ../composer/e-composer-actions.c:515
+msgid "Save as draft"
+msgstr "另存为草稿"
+
+#: ../composer/e-composer-actions.c:520
+msgid "S_end"
+msgstr "发送(_E)"
+
+#: ../composer/e-composer-actions.c:522
+msgid "Send this message"
+msgstr "发送这封信"
+
+#: ../composer/e-composer-actions.c:529
+msgid "Insert Send options"
+msgstr "插入发送选项"
+
+#: ../composer/e-composer-actions.c:534
+msgid "New _Message"
+msgstr "新建信件(_M)"
+
+#: ../composer/e-composer-actions.c:536
+msgid "Open New Message window"
+msgstr "打开新建信件窗口"
+
+#: ../composer/e-composer-actions.c:543
+msgid "Character _Encoding"
+msgstr "字符编码(_E)"
+
+#: ../composer/e-composer-actions.c:550
+msgid "_Security"
+msgstr "安全(_S)"
-#: ../composer/e-msg-composer-hdrs.c:326
+#: ../composer/e-composer-actions.c:560
+msgid "PGP _Encrypt"
+msgstr "PGP 加密(_E)"
+
+#: ../composer/e-composer-actions.c:562
+msgid "Encrypt this message with PGP"
+msgstr "用 PGP 加密该信件"
+
+#: ../composer/e-composer-actions.c:568
+msgid "PGP _Sign"
+msgstr "PGP 签名(_S)"
+
+#: ../composer/e-composer-actions.c:570
+msgid "Sign this message with your PGP key"
+msgstr "用您的 PGP 密钥签名该信件"
+
+#: ../composer/e-composer-actions.c:576
+msgid "_Prioritize Message"
+msgstr "标为优先(_P)"
+
+#: ../composer/e-composer-actions.c:578
+msgid "Set the message priority to high"
+msgstr "将信件设定为高优先级"
+
+#: ../composer/e-composer-actions.c:584
+msgid "Re_quest Read Receipt"
+msgstr "请求阅读收条(_Q)"
+
+#: ../composer/e-composer-actions.c:586
+msgid "Get delivery notification when your message is read"
+msgstr "当您的信件被阅读时得到投递通知"
+
+#: ../composer/e-composer-actions.c:592
+msgid "S/MIME En_crypt"
+msgstr "S/MIME 加密(_C)"
+
+#: ../composer/e-composer-actions.c:594
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "用您的 S/MIME 加密证书加密该信件"
+
+#: ../composer/e-composer-actions.c:600
+msgid "S/MIME Sig_n"
+msgstr "S/MIME 签名(_N)"
+
+#: ../composer/e-composer-actions.c:602
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "用您的 S/MIME 签名认证签名该信件"
+
+#: ../composer/e-composer-actions.c:608
+msgid "_Bcc Field"
+msgstr "暗送域(_B)"
+
+#: ../composer/e-composer-actions.c:610
+msgid "Toggles whether the BCC field is displayed"
+msgstr "是否显示暗中转发域"
+
+#: ../composer/e-composer-actions.c:616
+msgid "_Cc Field"
+msgstr "抄送域(_C)"
+
+#: ../composer/e-composer-actions.c:618
+msgid "Toggles whether the CC field is displayed"
+msgstr "是否显示转发域"
+
+#: ../composer/e-composer-actions.c:624
+msgid "_From Field"
+msgstr "发件人域(_F)"
+
+#: ../composer/e-composer-actions.c:626
+msgid "Toggles whether the From chooser is displayed"
+msgstr "是否显示发件人选择器"
+
+#: ../composer/e-composer-actions.c:632
+msgid "_Post-To Field"
+msgstr "投递到域(_P)"
+
+#: ../composer/e-composer-actions.c:634
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "是否显示投递到域"
+
+#: ../composer/e-composer-actions.c:640
+msgid "_Reply-To Field"
+msgstr "回复域(_R)"
+
+#: ../composer/e-composer-actions.c:642
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "是否显示回复域"
+
+#: ../composer/e-composer-actions.c:648
+msgid "_Subject Field"
+msgstr "主题域(_C)"
+
+#: ../composer/e-composer-actions.c:650
+msgid "Toggles whether the Subject field is displayed"
+msgstr "切换是否显示主题域"
+
+#: ../composer/e-composer-actions.c:656
+msgid "_To Field"
+msgstr "收件人域(_T)"
+
+#: ../composer/e-composer-actions.c:658
+msgid "Toggles whether the To field is displayed"
+msgstr "是否显示寄给域"
+
+#: ../composer/e-composer-header-table.c:66
+msgid "Enter the recipients of the message"
+msgstr "输入信件的收件人"
+
+#: ../composer/e-composer-header-table.c:68
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "输入将接收该信件副本的收件人地址"
+
+#: ../composer/e-composer-header-table.c:71
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
+msgstr "输入将接收该信件副本,但不出现在收件人列表中的收件人地址"
+
+#: ../composer/e-composer-header-table.c:645
msgid "Fr_om:"
msgstr "发件人(_O):"
-#: ../composer/e-msg-composer-hdrs.c:332
+#: ../composer/e-composer-header-table.c:654
msgid "_Reply-To:"
msgstr "回复到(_R):"
-#: ../composer/e-msg-composer-hdrs.c:335
+#: ../composer/e-composer-header-table.c:658
msgid "_To:"
msgstr "收信人(_T):"
-#: ../composer/e-msg-composer-hdrs.c:337
-msgid "Enter the recipients of the message"
-msgstr "输入信件的收件人"
-
-#: ../composer/e-msg-composer-hdrs.c:340
+#: ../composer/e-composer-header-table.c:663
msgid "_Cc:"
msgstr "抄送(_C):"
-#: ../composer/e-msg-composer-hdrs.c:342
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "输入将接收该信件副本的收件人地址"
-
-#: ../composer/e-msg-composer-hdrs.c:346
+#: ../composer/e-composer-header-table.c:668
msgid "_Bcc:"
msgstr "暗送(_B):"
-#: ../composer/e-msg-composer-hdrs.c:348
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message"
-msgstr "输入将接收该信件副本,但不出现在收件人列表中的收件人地址"
-
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:673
msgid "_Post To:"
msgstr "投递到(_P):"
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
msgid "S_ubject:"
msgstr "主题(_U):"
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "附件(_T)"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "签名(_G):"
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "插入附件"
+#: ../composer/e-composer-name-header.c:115
+msgid "Click here for the address book"
+msgstr "单击此处以使用地址簿"
+
+#: ../composer/e-composer-post-header.c:137
+msgid "Posting destination"
+msgstr "投递目的"
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-composer-post-header.c:138
+msgid "Choose folders to post the message to."
+msgstr "选择要将信件投递到哪个文件夹。"
+
+#: ../composer/e-composer-post-header.c:172
+msgid "Click here to select folders to post to"
+msgstr "单击此处以选择要投递到的文件夹"
+
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
+msgid "Show _Attachment Bar"
+msgstr "显示附件栏(_A)"
+
+#: ../composer/e-msg-composer.c:872
msgid ""
"Cannot sign outgoing message: No signing certificate set for this account"
msgstr "无法对寄出的信件签名:未对此账户设置签名证书"
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:879
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
msgstr "无法对寄出的信件加密:未对此账户设置加密证书"
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
+#: ../composer/e-msg-composer.c:1500 ../mail/em-format-html-display.c:1913
+#: ../mail/em-format-html-display.c:2405 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "附件"
+
+#: ../composer/e-msg-composer.c:1556
msgid "Hide _Attachment Bar"
msgstr "隐藏附件栏(_A)"
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3878
-msgid "Show _Attachment Bar"
-msgstr "显示附件栏(_A)"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "未知原因"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "无法打开文件"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "无法从编辑器获取信件"
-
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-msgstr "无标题信件"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "打开文件"
-
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3758
-#: ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
msgid "Compose Message"
msgstr "撰写新信件"
-#: ../composer/e-msg-composer.c:5031
+#: ../composer/e-msg-composer.c:4055
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)</"
"b>"
@@ -10112,8 +10723,7 @@ msgstr "您确定想要丢弃您正在编写的标题为“{0}”的信件吗?
msgid "Because &quot;{0}&quot;, you may need to select different mail options."
msgstr "由于“{0}”,您可能要选择不同的邮件选项。"
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
msgid "Because &quot;{1}&quot;."
msgstr "原因是“{1}”。"
@@ -10220,23 +10830,27 @@ msgstr "您无法将文件“{0}”作为这封信的附件。"
msgid "You need to configure an account before you can compose mail."
msgstr "在您可以撰写邮件之前您需要配置一个帐户。"
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "继续编辑(_C)"
+
+#: ../composer/mail-composer.error.xml.h:31
msgid "_Do not Recover"
msgstr "不恢复(_D)"
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:312
+#: ../composer/mail-composer.error.xml.h:32
msgid "_Recover"
msgstr "恢复(_R)"
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "保存信件(_S)"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "保存草稿(_S)"
#: ../data/evolution.desktop.in.in.h:1
msgid "Evolution Mail and Calendar"
msgstr "Evolution 邮件及日历"
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:672
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
msgid "Groupware Suite"
msgstr "Groupwise 套件"
@@ -10252,47 +10866,70 @@ msgstr "地址卡"
msgid "calendar information"
msgstr "日历信息"
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
msgid "Evolution Error"
msgstr "Evolution 错误"
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
msgid "Evolution Warning"
msgstr "Evolution 警告"
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
msgid "Evolution Information"
msgstr "Evolution 信息"
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
msgid "Evolution Query"
msgstr "Evolution 查询"
#. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
#, c-format
msgid "Internal error, unknown error '%s' requested"
msgstr "内部错误,请求了未知的错误“%s”"
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:156
+msgid "Component"
+msgstr "组件"
+
+#: ../e-util/e-logger.c:157
+msgid "Name of the component being logged"
+msgstr "记录日志的组件名称"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../plugins/plugin-manager/plugin-manager.c:355
+#: ../plugins/publish-calendar/publish-calendar.c:689
+msgid "Enabled"
+msgstr "已启用"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "插件是否已启用"
+
+#: ../e-util/e-print.c:160
msgid "An error occurred while printing"
msgstr "打印时发生了错误"
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:167
msgid "The printing system reported the following details about the error:"
msgstr "打印系统报告了下列错误细节:"
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:173
msgid ""
"The printing system did not report any additional details about the error."
msgstr "打印系统未报告关于错误的任何额外细节。"
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "原因是“{1}”。"
+
#: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
+msgid "Cannot open file \"{0}\"."
msgstr "无法打开文件“{0}”。"
#: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
+msgid "Cannot save file \"{0}\"."
msgstr "无法保存文件“{0}”。"
#: ../e-util/e-system.error.xml.h:4
@@ -10300,7 +10937,7 @@ msgid "Do you wish to overwrite it?"
msgstr "您打算覆盖它吗?"
#: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
+msgid "File exists \"{0}\"."
msgstr "文件已存在“{0}”。"
#: ../e-util/e-system.error.xml.h:6
@@ -10311,49 +10948,64 @@ msgstr "覆盖文件吗?"
msgid "_Overwrite"
msgstr "覆盖(_O)"
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "无法显示 Evolution 的帮助。"
+
+#: ../e-util/e-util-labels.c:37
msgid "I_mportant"
msgstr "重要(_M)"
#. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
msgid "_Work"
msgstr "工作(_W)"
#. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
msgid "_Personal"
msgstr "个人(_P)"
#. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
msgid "_To Do"
msgstr "待办(_T)"
#. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
msgid "_Later"
msgstr "稍候(_L)"
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
msgid "Label _Name:"
msgstr "标签名称(_N):"
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
msgid "Edit Label"
msgstr "编辑标签"
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
msgid "Add Label"
msgstr "添加标签"
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
msgid "Label name cannot be empty."
msgstr "标签名称不能为空。"
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
-msgstr "已存在同名的标签。请重命名您的标签。"
+#: ../e-util/e-util-labels.c:356
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
+msgstr "服务器上已存在同名的标签。请重命名您的标签。"
+
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf 错误:%s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "后续所有的错误都只显示在终端。"
#: ../filter/filter-datespec.c:80
#, c-format
@@ -10457,65 +11109,65 @@ msgstr "%Y-%m-%d"
msgid "Select a time to compare against"
msgstr "选择用于比较的时间"
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
msgid "Choose a file"
msgstr "选择文件"
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
msgid "Test"
msgstr "测试"
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
msgid "R_ule name:"
msgstr "规则名(_U):"
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
msgid "Find items that meet the following criteria"
msgstr "查找符合下列条件的项目"
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
msgid "A_dd Filter Criteria"
msgstr "添加过滤规则(_D)"
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
msgid "If all criteria are met"
msgstr "如果满足所有条件"
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
msgid "If any criteria are met"
msgstr "如果满足任一条件"
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
msgid "_Find items:"
msgstr "查找项目(_F):"
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
msgid "All related"
msgstr "相关的全部"
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
msgid "Replies"
msgstr "回复"
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
msgid "Replies and parents"
msgstr "回复及原始邮件"
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
msgid "No reply or parent"
msgstr "无回复或原始邮件"
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
msgid "I_nclude threads"
msgstr "包含线索(_N)"
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
msgid "Incoming"
msgstr "接收"
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
msgid "Outgoing"
msgstr "寄出"
@@ -10539,7 +11191,7 @@ msgstr "缺少日期。"
msgid "Missing file name."
msgstr "缺少文件名。"
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
msgid "Missing name."
msgstr "缺少名称。"
@@ -10609,7 +11261,7 @@ msgstr "未来"
msgid "months"
msgstr "月"
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
msgid "seconds"
msgstr "秒"
@@ -10621,9 +11273,10 @@ msgstr "当前时间"
msgid "the time you specify"
msgstr "您指定的时间"
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
#: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
msgid "weeks"
msgstr "周"
@@ -10639,7 +11292,7 @@ msgstr "添加规则"
msgid "Edit Rule"
msgstr "编辑规则"
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
msgid "Rule name"
msgstr "规则名"
@@ -10661,57 +11314,69 @@ msgid "Configure your email accounts here"
msgstr "在这里配置您的电子邮件账户"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "在这里配置您的网络连接设置"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
msgid "Evolution Mail"
msgstr "Evolution 邮件"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
msgid "Evolution Mail accounts configuration control"
msgstr "Evolution 邮件账户配置控制"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
msgid "Evolution Mail component"
msgstr "Evolution 邮件组件"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
msgid "Evolution Mail composer"
msgstr "Evolution 邮件撰写器"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
msgid "Evolution Mail composer configuration control"
msgstr "Evolution 邮件撰写控件"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
msgid "Evolution Mail preferences control"
msgstr "Evolution 邮件首选项控件"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:575 ../mail/mail-component.c:576
-#: ../mail/mail-component.c:740
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Network configuration control"
+msgstr "Evolution 网络配置控件"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
+#: ../mail/mail-component.c:767
#: ../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:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
msgid "Mail Accounts"
msgstr "邮件账户"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
msgid "Mail Preferences"
msgstr "邮件首选项"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "网络首选项"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
msgid "_Mail"
msgstr "邮件(_M)"
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
#, c-format
msgid "%s License Agreement"
msgstr "%s 许可协议"
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
#, c-format
msgid ""
"\n"
@@ -10723,115 +11388,109 @@ msgstr ""
"请仔细阅读下方显示的 %s 许可协议\n"
"并选中复选框表明您接受该协议\n"
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
msgid "Select Folder"
msgstr "选择文件夹"
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
msgid "Autogenerated"
msgstr "自动生成的"
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
msgid "Ask for each message"
msgstr "每封信都询问"
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
msgid "Identity"
msgstr "标识"
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
msgid "Receiving Email"
msgstr "接收电子邮件"
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
msgid "Check for _new messages every"
msgstr "自动检查新邮件的间隔(_N)"
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
msgid "minu_tes"
msgstr "分钟(_T)"
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
msgid "Sending Email"
msgstr "发送电子邮件"
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
msgid "Defaults"
msgstr "默认"
#. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
msgid "Security"
msgstr "安全"
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
msgid "Receiving Options"
msgstr "接收选项"
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
msgid "Checking for New Messages"
msgstr "检查新邮件"
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
msgid "Account Editor"
msgstr "账户编辑器"
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
msgid "Evolution Account Assistant"
msgstr "Evolution 账户助手"
#. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
msgid "[Default]"
msgstr "[默认]"
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "已启用"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
msgid "Account name"
msgstr "账户名"
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
msgid "Protocol"
msgstr "协议"
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
msgid "Unnamed"
msgstr "未命名"
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
msgid "Language(s)"
msgstr "语言"
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
msgid "Add signature script"
msgstr "添加签名脚本"
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
msgid "Signature(s)"
msgstr "签名"
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
msgid "-------- Forwarded Message --------"
msgstr "-------- 转发的信件 --------"
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1962
msgid "an unknown sender"
msgstr "未知发件人"
#. Note to translators: this is the attribution string used when quoting messages.
#. * each ${Variable} gets replaced with a value. To see a full list of available
#. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1750
+#: ../mail/em-composer-utils.c:2009
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@ -10839,11 +11498,11 @@ msgstr ""
"在 ${Year}-${Month}-${Day}${AbbrevWeekdayName}的 ${24Hour}:${Minute} "
"${TimeZone},${Sender}写道:"
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2152
msgid "-----Original Message-----"
msgstr "-------- 原始信件 --------"
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
msgid "_Filter Rules"
msgstr "过滤规则(_F)"
@@ -10860,10 +11519,6 @@ msgstr "分配颜色"
msgid "Assign Score"
msgstr "分配计分"
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "附件"
-
#: ../mail/em-filter-i18n.h:6
msgid "BCC"
msgstr "BCC"
@@ -10880,10 +11535,6 @@ msgstr "CC"
msgid "Completed On"
msgstr "完成于"
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "含有"
-
#: ../mail/em-filter-i18n.h:11
msgid "Copy to Folder"
msgstr "复制到文件夹"
@@ -10897,7 +11548,7 @@ msgid "Date sent"
msgstr "发送日期"
#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
#: ../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
@@ -10908,10 +11559,6 @@ msgstr "删除"
msgid "Deleted"
msgstr "已删除"
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "不含有"
-
#: ../mail/em-filter-i18n.h:17
msgid "does not end with"
msgstr "不结尾于"
@@ -10932,10 +11579,6 @@ msgstr "发音不像"
msgid "does not start with"
msgstr "不开始于"
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "不存在"
-
#: ../mail/em-filter-i18n.h:23
msgid "Draft"
msgstr "草稿"
@@ -10944,10 +11587,6 @@ msgstr "草稿"
msgid "ends with"
msgstr "结束于"
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "存在"
-
#: ../mail/em-filter-i18n.h:26
msgid "exists"
msgstr "存在"
@@ -10960,14 +11599,10 @@ msgstr "表达式"
msgid "Follow Up"
msgstr "跟随"
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
msgid "Important"
msgstr "重要"
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "是"
-
#: ../mail/em-filter-i18n.h:31
msgid "is after"
msgstr "之后"
@@ -10980,18 +11615,6 @@ msgstr "之前"
msgid "is Flagged"
msgstr "已标志"
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "大于"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "小于"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "不是"
-
#: ../mail/em-filter-i18n.h:37
msgid "is not Flagged"
msgstr "未标志"
@@ -11004,7 +11627,7 @@ msgstr "未设置"
msgid "is set"
msgstr "已设置"
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
#: ../ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "垃圾"
@@ -11013,7 +11636,7 @@ msgstr "垃圾"
msgid "Junk Test"
msgstr "垃圾测试"
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
msgid "Label"
msgstr "标签"
@@ -11055,7 +11678,7 @@ msgstr "播放声音"
#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
#. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
msgid "Read"
msgstr "已读"
@@ -11127,10 +11750,9 @@ msgstr "开始于"
msgid "Stop Processing"
msgstr "停止处理"
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
#: ../plugins/groupwise-features/properties.glade.h:7
#: ../smime/lib/e-cert.c:1132
msgid "Subject"
@@ -11141,94 +11763,114 @@ msgid "Unset Status"
msgstr "取消状态"
#. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:522
msgid "Then"
msgstr "然后"
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:550
msgid "Add Ac_tion"
msgstr "添加动作(_T)"
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
msgid "C_reate Search Folder From Search..."
msgstr "从头创建搜索文件夹(_R)..."
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
msgid "All Messages"
msgstr "全部信件"
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
msgid "Unread Messages"
msgstr "未读信件"
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
msgid "No Label"
msgstr "无标签"
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
msgid "Read Messages"
msgstr "已读信件"
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
msgid "Recent Messages"
msgstr "最近信件"
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
msgid "Last 5 Days' Messages"
msgstr "前五天的信件"
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
msgid "Messages with Attachments"
msgstr "有附件的信件"
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
msgid "Important Messages"
msgstr "重要信件"
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
msgid "Messages Not Junk"
msgstr "不是垃圾邮件"
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1171
msgid "Account Search"
msgstr "账户搜索"
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1224
msgid "All Account Search"
msgstr "全部账户搜索"
#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:174
msgid "Unread messages:"
msgid_plural "Unread messages:"
msgstr[0] "未读信件数:"
#. 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:163
+#: ../mail/em-folder-properties.c:178
msgid "Total messages:"
msgid_plural "Total messages:"
msgstr[0] "总信件数:"
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "配额使用(%s):"
+
+#: ../mail/em-folder-properties.c:198
+#, c-format
+msgid "Quota usage"
+msgstr "配额使用"
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
+#: ../mail/mail-component.c:585
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "收件箱"
+
+#: ../mail/em-folder-properties.c:389
#: ../plugins/groupwise-features/properties.glade.h:4
msgid "Folder Properties"
msgstr "文件夹属性"
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
msgid "<click here to select a folder>"
msgstr "<单击此处以选择文件夹>"
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
msgid "C_reate"
msgstr "创建(_R)"
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
msgid "Folder _name:"
msgstr "文件夹名称(_N):"
+#. load store to mail component at the end, when everything is loaded
#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
msgid "Search Folders"
msgstr "搜索文件夹"
@@ -11237,27 +11879,19 @@ msgstr "搜索文件夹"
msgid "UNMATCHED"
msgstr "不匹配"
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
msgid "Drafts"
msgstr "草稿"
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
-#: ../mail/mail-component.c:156
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "收件箱"
-
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
msgid "Outbox"
msgstr "发件箱"
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
msgid "Sent"
msgstr "已发箱"
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
msgid "Loading..."
msgstr "正在装入..."
@@ -11276,383 +11910,373 @@ msgstr "正在装入..."
#. * Do not translate the "folder-display|" part. Remove it
#. * from your translation.
#.
-#: ../mail/em-folder-tree.c:372
+#: ../mail/em-folder-tree.c:380
#, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
msgstr "%s (%u)"
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
msgid "Mail Folder Tree"
msgstr "邮件文件夹树"
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
#, c-format
msgid "Moving folder %s"
msgstr "移动文件夹“%s”"
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
#, c-format
msgid "Copying folder %s"
msgstr "复制文件夹 %s"
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
#, c-format
msgid "Moving messages into folder %s"
msgstr "把信件移至文件夹 %s"
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
#, c-format
msgid "Copying messages into folder %s"
msgstr "把信件复制到文件夹 %s"
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
msgid "Cannot drop message(s) into toplevel store"
msgstr "无法将信件放到顶级文件夹存储"
-#: ../mail/em-folder-tree.c:1011 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
msgid "_Copy to Folder"
msgstr "复制到文件夹(_C)"
-#: ../mail/em-folder-tree.c:1012 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
msgid "_Move to Folder"
msgstr "移至文件夹(_M)"
-#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "在“%s”中扫描文件夹"
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "查看(_V)"
-
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2099
msgid "Open in _New Window"
msgstr "在新窗口中打开(_N)"
#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2104
msgid "_New Folder..."
msgstr "新建文件夹(_N)..."
-#: ../mail/em-folder-tree.c:2103
+#: ../mail/em-folder-tree.c:2107
msgid "_Move..."
msgstr "移动(_M)..."
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
msgid "_Rename..."
msgstr "重命名(_R)..."
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2115
msgid "Re_fresh"
msgstr "刷新(_F)"
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2116
msgid "Fl_ush Outbox"
msgstr "清空发件箱(_U)"
-#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
msgid "_Empty Trash"
msgstr "清空回收站(_E)"
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
#, c-format
msgid "Copying `%s' to `%s'"
msgstr "把“%s”复制到 %s"
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
+#: ../mail/importers/evolution-mbox-importer.c:83
msgid "Select folder"
msgstr "选择文件夹"
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
msgid "C_opy"
msgstr "复制(_O)"
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
#, c-format
msgid "Creating folder `%s'"
msgstr "创建文件夹“%s”"
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
msgid "Create folder"
msgstr "创建文件夹"
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
msgid "Specify where to create the folder:"
msgstr "指定在哪里创建文件夹:"
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
msgid "Mail Deletion Failed"
msgstr "邮件删除失败"
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
msgid "You do not have sufficient permissions to delete this mail."
msgstr "您没有足够的权限删除此邮件。"
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:578 ../mail/em-popup.c:589
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../ui/evolution-mail-message.xml.h:109
msgid "_Forward"
msgstr "转发(_F)"
#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
msgid "_Edit as New Message..."
msgstr "作为新信件进行编辑(_E)..."
-#: ../mail/em-folder-view.c:1343
-#: ../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
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "打印(_P)..."
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1341
msgid "U_ndelete"
msgstr "取消删除(_N)"
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1342
msgid "_Move to Folder..."
msgstr "移至文件夹(_M)..."
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1343
msgid "_Copy to Folder..."
msgstr "复制到文件夹(_C)..."
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1346
msgid "Mar_k as Read"
msgstr "标记为已读(_K)"
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1347
msgid "Mark as _Unread"
msgstr "标记为未读(_U)"
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1348
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1349
msgid "Mark as Un_important"
msgstr "标记为不重要(_I)"
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1350
msgid "Mark as _Junk"
msgstr "标记为垃圾(_J)"
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1351
msgid "Mark as _Not Junk"
msgstr "标记为非垃圾(_N)"
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1352
msgid "Mark for Follo_w Up..."
msgstr "标记为跟随(_W)..."
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1354
msgid "_Label"
msgstr "标签(_L)"
#. Note that we don't show this here, since by default a 'None' date
#. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
msgid "_None"
msgstr "无(_N)"
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1358
msgid "_New Label"
msgstr "新建标签(_N)"
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1362
msgid "Fla_g Completed"
msgstr "已完成标志(_G)"
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1363
msgid "Cl_ear Flag"
msgstr "清除标志(_E)"
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1366
msgid "Crea_te Rule From Message"
msgstr "根据信件创建规则(_T)"
#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1368
msgid "Search Folder based on _Subject"
msgstr "基于主题的搜索文件夹(_S)"
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1369
msgid "Search Folder based on Se_nder"
msgstr "基于发件人的搜索文件夹(_N)"
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1370
msgid "Search Folder based on _Recipients"
msgstr "基于收件人的搜索文件夹(_R)"
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1371
msgid "Search Folder based on Mailing _List"
msgstr "基于邮件列表的搜索文件夹(_L)"
#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1376
msgid "Filter based on Sub_ject"
msgstr "基于主题过滤(_J)"
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1377
msgid "Filter based on Sen_der"
msgstr "基于发件人过滤(_D)"
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1378
msgid "Filter based on Re_cipients"
msgstr "基于收件人过滤(_C)"
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1379
msgid "Filter based on _Mailing List"
msgstr "基于邮件列表过滤(_M)"
#. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
+#: ../plugins/google-account-setup/google-source.c:251
+#: ../plugins/google-account-setup/google-source.c:532
+#: ../plugins/google-account-setup/google-source.c:718
msgid "Default"
msgstr "默认"
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2516
msgid "Unable to retrieve message"
msgstr "无法获取信件"
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2535
msgid "Retrieving Message..."
msgstr "正在收取信件..."
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2794
msgid "C_all To..."
msgstr "呼叫到(_A)..."
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2797
msgid "Create _Search Folder"
msgstr "创建搜索文件夹(_S)"
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2798
msgid "_From this Address"
msgstr "自此地址(_F)"
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2799
msgid "_To this Address"
msgstr "到此地址(_T)"
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3296
#, c-format
msgid "Click to mail %s"
msgstr "单击以给 %s 发送邮件"
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3308
#, c-format
msgid "Click to call %s"
msgstr "单击以呼叫 %s"
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3313
msgid "Click to hide/unhide addresses"
msgstr "单击可隐藏/显示地址"
#. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:470
#, c-format
msgid "Matches: %d"
msgstr "匹配:%d"
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:614
msgid "Fin_d:"
msgstr "查找(_D):"
#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:638
msgid "_Previous"
msgstr "上一项(_P)"
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:643
msgid "_Next"
msgstr "下一项(_N)"
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:648
msgid "M_atch case"
msgstr "匹配大小写(_A)"
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
msgid "Unsigned"
msgstr "未签名"
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:947
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
msgstr "此信件未签名。无法保证这封信是可信的。"
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
msgid "Valid signature"
msgstr "有效签名"
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:948
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:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
msgid "Invalid signature"
msgstr "无效签名"
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:949
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
msgstr "无法校验这封信的签名,可能在传送的过程中邮件被篡改了。"
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
msgid "Valid signature, but cannot verify sender"
msgstr "签名有效,但是无法校验发送者"
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:950
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:996 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
msgid "Signature exists, but need public key"
msgstr "签名已存在,但需要公钥"
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:951
msgid ""
"This message is signed with a signature, but there is no corresponding "
"public key."
msgstr "这封信的签名有效,但是没有相应的公钥。"
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
msgid "Unencrypted"
msgstr "未加密"
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:958
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
msgid "Encrypted, weak"
msgstr "弱加密"
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:959
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 "
@@ -11661,21 +12285,21 @@ msgstr ""
"这封信已加密,但使用的是弱加密算法。如果外人想要查看这封信的内容,可能要花一"
"定时间进行暴力破解,这很困难但并不是不可能。"
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
msgid "Encrypted"
msgstr "加密"
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:960
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:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
msgid "Encrypted, strong"
msgstr "强加密"
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:961
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 "
@@ -11684,93 +12308,88 @@ msgstr ""
"这封信已加密,且使用的是强加密算法。如果外人想要查看这封信的内容,可能要花大"
"量时间进行暴力破解,这十分困难。"
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
msgid "_View Certificate"
msgstr "查看证书(_V)"
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1077
msgid "This certificate is not viewable"
msgstr "此证书不可查看"
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1371
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "%Y年%m月%d日%A,%p%l:%M完成"
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1379
msgid "Overdue:"
msgstr "延期:"
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1382
msgid "by %B %d, %Y, %l:%M %p"
msgstr "到 %m月%d日%A,%p%l:%M"
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1460
msgid "_View Inline"
msgstr "嵌入视图(_V)"
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1461
msgid "_Hide"
msgstr "隐藏(_H)"
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1462
msgid "_Fit to Width"
msgstr "适合宽度(_F)"
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1463
msgid "Show _Original Size"
msgstr "显示原始大小(_O)"
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "附件"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1983
msgid "Save attachment as"
msgstr "附件另存为"
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1987
msgid "Select folder to save all attachments"
msgstr "选择保存全部附件的文件夹..."
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2038
msgid "_Save Selected..."
msgstr "保存所选(_S)..."
#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2105
#, c-format
msgid "%d at_tachment"
msgid_plural "%d at_tachments"
msgstr[0] "%d 个附件(_T)"
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
msgid "S_ave"
msgstr "保存(_A)"
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2123
msgid "S_ave All"
msgstr "全部保存(_A)"
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2197
msgid "No Attachment"
msgstr "无附件"
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
msgid "View _Unformatted"
msgstr "无格式查看(_U)"
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2340
msgid "Hide _Unformatted"
msgstr "无格式隐藏(_U)"
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2397
msgid "O_pen With"
msgstr "打开方式(_P)"
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2473
msgid ""
-"Evolution cannot render this email as it is too large to handle. You can "
+"Evolution cannot render this email as it is too large to process. You can "
"view it unformatted or with an external text editor."
msgstr ""
"Evolution 无法渲染此电子邮件,原因是该邮件太大。您可以以无格式方式查看该邮"
@@ -11781,275 +12400,285 @@ msgstr ""
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
#, c-format
msgid "Retrieving `%s'"
msgstr "收取“%s”"
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:925
msgid "Unknown external-body part."
msgstr "未知的 external-body 部分。"
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:933
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:963
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:974
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:976
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:997
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1008
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1236
msgid "Formatting message"
msgstr "格式化信件"
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1410
msgid "Formatting Message..."
msgstr "正在格式化信件..."
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:210
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
msgid "Cc"
msgstr "抄送"
-#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:210
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
msgid "Bcc"
msgstr "密件抄送"
#. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1450
msgid "Mailer"
msgstr "邮件程序"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
+#: ../mail/em-format-html.c:1771
msgid " (%a, %R %Z)"
msgstr " (%A,%R %Z)"
#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1738
+#: ../mail/em-format-html.c:1776
msgid " (%R %Z)"
msgstr " (%R %Z)"
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "日期"
-
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-msgid "Newsgroups"
-msgstr "新闻组"
-
#. To translators: This message suggests to the receipients that the sender of the mail is
#. different from the one listed in From field.
#.
-#: ../mail/em-format-html.c:1866
+#: ../mail/em-format-html.c:1907
#, c-format
msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
msgstr "此消息由 <b>%s</b> 以 <b>%s</b> 的身份发送"
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:308
msgid "From"
msgstr "发件人"
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
msgid "Reply-To"
msgstr "回复至"
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
+#: ../widgets/misc/e-dateedit.c:353
+msgid "Date"
+msgstr "日期"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "新闻组"
+
#: ../mail/em-format.c:1157
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
msgid "Could not parse S/MIME message: Unknown error"
msgstr "无法解析 S/MIME 信件:未知错误"
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
msgid "Could not parse MIME message. Displaying as source."
msgstr "无法解析 MIME 信件。显示源文本。"
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
msgid "Unsupported encryption type for multipart/encrypted"
msgstr "不支持 multipart/encrypted 的加密类型"
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
msgid "Could not parse PGP/MIME message"
msgstr "无法解析 PGP/MIME 信件"
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
msgid "Could not parse PGP/MIME message: Unknown error"
msgstr "无法解析 PGP/MIME 信件:未知错误"
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
msgid "Unsupported signature format"
msgstr "不支持的签名格式"
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
msgid "Error verifying signature"
msgstr "校验签名错误"
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
msgid "Unknown error verifying signature"
msgstr "校验签名发生了未知错误"
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
msgid "Could not parse PGP message"
msgstr "无法分析 PGP 信件"
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
msgid "Could not parse PGP message: Unknown error"
msgstr "无法解析 PGP 信件:未知错误"
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
msgid "Every time"
msgstr "每次"
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
msgid "Once per day"
msgstr "每天一次"
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
msgid "Once per week"
msgstr "每周一次"
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
msgid "Once per month"
msgstr "每月一次"
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
msgid "Add Custom Junk Header"
msgstr "添加自定义垃圾信头"
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
msgid "Header Name:"
msgstr "信头名称:"
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
msgid "Header Value Contains:"
msgstr "信头值含有:"
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
msgid "Contains Value"
msgstr "包含值"
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
msgid "Color"
msgstr "颜色"
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
msgid "Tag"
msgstr "标签"
#. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
#, c-format
msgid "%s plugin is available and the binary is installed."
msgstr "%s 插件可用,二进制文件已经安装。"
#. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
#, c-format
msgid ""
"%s plugin is not available. Please check whether the package is installed."
msgstr "%s 插件不可用。请检查软件包是否已安装。"
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
msgid "No Junk plugin available"
msgstr "没有可用的垃圾邮件插件"
#. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
msgid "To Do"
msgstr "待办"
#. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
msgid "Later"
msgstr "稍候"
-#: ../mail/em-migrate.c:1211
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution 任务文件夹的位置和层次与 Evolution 1.x 不同。\n"
-"\n"
-"请稍候,Evolution 正在升迁您的文件夹..."
-
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
#, c-format
msgid "Unable to create new folder `%s': %s"
msgstr "无法创建新文件夹“%s”:%s"
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
#, c-format
msgid "Unable to copy folder `%s' to `%s': %s"
msgstr "无法将文件夹“%s”复制为“%s”:%s"
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
#, c-format
msgid "Unable to scan for existing mailboxes at `%s': %s"
msgstr "无法扫描位于“%s”的已有邮箱:%s"
-#: ../mail/em-migrate.c:2065
+#: ../mail/em-migrate.c:1868
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution 任务文件夹的位置和层次与 Evolution 1.x 不同。\n"
+"\n"
+"请稍候,Evolution 正在升迁您的文件夹..."
+
+#: ../mail/em-migrate.c:2069
#, c-format
msgid "Unable to open old POP keep-on-server data `%s': %s"
msgstr "无法打开旧的 POP 保留在服务器上的数据“%s”:%s"
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
#, c-format
msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
msgstr "无法创建 POP3 保留在服务器上的数据目录“%s”:%s"
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
#, c-format
msgid "Unable to copy POP3 keep-on-server data `%s': %s"
msgstr "无法复制 POP3 在服务器上保留的数据“%s”:%s"
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
#, c-format
msgid "Failed to create local mail storage `%s': %s"
msgstr "创建本地邮件存储“%s”失败:%s"
-#: ../mail/em-migrate.c:2827
+#: ../mail/em-migrate.c:2898
+#, fuzzy
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution 任务文件夹的位置和层次与 Evolution 1.x 不同。\n"
+"\n"
+"请稍候,Evolution 正在升迁您的文件夹..."
+
+#: ../mail/em-migrate.c:2963
#, c-format
msgid "Unable to create local mail folders at `%s': %s"
msgstr "无法在“%s”创建本地邮件文件夹:%s"
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2982
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
@@ -12057,264 +12686,305 @@ msgstr ""
"无法从先前的 Evolution 安装中读取设置,“evolution/config.xmldb”不存在或者已损"
"坏。"
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
msgid "_Reply to sender"
msgstr "回复发件人(_R)"
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
#: ../ui/evolution-mail-message.xml.h:83
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
msgid "_Add to Address Book"
msgstr "添加到地址簿(_A)"
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
msgid "This store does not support subscriptions, or they are not enabled."
msgstr "此存储不支持订阅,或订阅未启用。"
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
msgid "Subscribed"
msgstr "已订阅"
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
msgid "Folder"
msgstr "文件夹"
#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
msgid "Please select a server."
msgstr "请选择服务器。"
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
msgid "No server has been selected"
msgstr "没有选中服务器"
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
msgid "_Do not show this message again."
msgstr "不再显示此信息(_D)。"
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
msgid "Message Filters"
msgstr "邮件过滤器"
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
msgid "message"
msgstr "信件"
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
msgid "Save Message..."
msgstr "保存信件..."
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
msgid "Add address"
msgstr "添加地址"
#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
#, c-format
msgid "Messages from %s"
msgstr "来自 %s 的信件"
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
msgid "Search _Folders"
msgstr "搜索文件夹(_F)"
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
msgid "Search Folder source"
msgstr "搜索文件夹来源"
#: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "“发送和接收邮件”窗口高度"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "“发送和接收邮件”窗口最大化状态"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Send and Receive Mail\" window width"
+msgstr "“发送和接收邮件”窗口宽度"
+
+#: ../mail/evolution-mail.schemas.in.h:4
msgid "Allows evolution to display text part of limited size"
msgstr "允许 Evolution 显示被限制大小的文本部分"
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
msgid "Always request read receipt"
msgstr "总是请求阅读收条"
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:6
msgid "Amount of time in seconds the error should be shown on the status bar."
msgstr "在状态栏中显示错误的时间秒数。"
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
msgid "Automatic emoticon recognition"
msgstr "自动识别表情图标"
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
msgid "Automatic link recognition"
msgstr "自动识别链接"
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
msgid "Check incoming mail being junk"
msgstr "检查收到的邮件是否是垃圾邮件"
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
msgid "Citation highlight color"
msgstr "引用突出颜色"
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
msgid "Citation highlight color."
msgstr "引用突出颜色。"
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
msgid "Composer Window default height"
msgstr "编写窗口的默认高度"
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
msgid "Composer Window default width"
msgstr "编写窗口的默认宽度"
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
msgid "Composer load/attach directory"
msgstr "撰写器加载/附件目录"
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
msgid "Compress display of addresses in TO/CC/BCC"
msgstr "压缩 TO/CC/BCC 中地址的显示"
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
msgid ""
"Compress display of addresses in TO/CC/BCC to the number specified in "
"address_count."
msgstr "将 TO/CC/BCC 的显示地址数压缩到 address_count 所指定的数量。"
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"控制与远程邮件服务器同步本地更改的频率。间隔必须至少为 30 秒。"
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid "Custom headers to use while checking for junk."
+msgstr "自定义用以检查垃圾邮件的信头。"
+
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr "自定义用以检查垃圾邮件的信头。列表元素的字符串格式为“信头名=值”。"
+
+#: ../mail/evolution-mail.schemas.in.h:20
msgid "Default charset in which to compose messages"
msgstr "编写信件的默认字符集"
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
msgid "Default charset in which to compose messages."
msgstr "编写信件的默认字符集。"
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
msgid "Default charset in which to display messages"
msgstr "显示信件的默认字符集"
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
msgid "Default charset in which to display messages."
msgstr "显示信件的默认字符集。"
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
msgid "Default forward style"
msgstr "默认转发方式"
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
msgid "Default height of the Composer Window."
msgstr "撰写窗口的默认高度。"
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
msgid "Default height of the message window."
msgstr "信件窗口的默认高度。"
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
msgid "Default height of the subscribe dialog."
msgstr "订阅对话框的默认高度。"
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
msgid "Default reply style"
msgstr "默认回复样式"
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
msgid "Default value for thread expand state"
msgstr "话题的默认展开状态"
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
msgid "Default width of the Composer Window."
msgstr "撰写窗口的默认宽度。"
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
msgid "Default width of the message window."
msgstr "信件窗口的默认宽度。"
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:32
msgid "Default width of the subscribe dialog."
msgstr "订阅对话框的默认宽度。"
-#: ../mail/evolution-mail.schemas.in.h:27
-msgid "Determines whether to lookup in addressbook for sender email"
-msgstr "决定是否在地址簿中查找发件人 email"
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr "决定是否仅在本地地址簿中查找地址进行垃圾邮件过滤"
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Determines whether to lookup in address book for sender email"
+msgstr "决定是否在地址簿中查找发件人电子邮件"
+
+#: ../mail/evolution-mail.schemas.in.h:35
msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"Determines whether to lookup the sender email in address book. If found, it "
"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
"autocompletion."
msgstr ""
-"决定是否在地址簿中查找发件人 email。如果找到,则不应是垃圾邮件。这"
-"将在标记为自动补全的地址簿中查找,如果远程地址簿(如 ldap)被标记为"
-"自动补全的话,可能会比较慢。"
+"决定是否在地址簿中查找发件人电子邮件。如果找到,则不应是垃圾邮件。这将在标记为"
+"自动补全的地址簿中查找,如果远程地址簿(如 LDAP)被标记为自动补全的话,可能会比"
+"较慢。"
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
msgid "Determines whether to use custom headers to check for junk"
msgstr "决定是否使用自定义信头检测垃圾邮件"
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
msgid ""
"Determines whether to use custom headers to check for junk. If this option "
"is enabled and the headers are mentioned, it will be improve the junk "
"checking speed."
msgstr ""
-"决定是否使用自定义信头检测垃圾邮件。如果此选项被启用且信头被"
-"设置的话,将提高垃圾邮件检测速度。"
+"决定是否使用自定义信头检测垃圾邮件。如果此选项被启用且信头被设置的话,将提高"
+"垃圾邮件检测速度。"
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:38
msgid ""
"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
"lines in the \"Messages\" column in vertical view."
-msgstr ""
-"决定是否在垂直视图中对“信件”列的“来自”和“主题”行使用相同的字体。"
+msgstr "决定是否在垂直视图中对“信件”列的“来自”和“主题”行使用相同的字体。"
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
msgid "Directory for loading/attaching files to composer."
msgstr "邮件写作器用来加载/附加文件的目录"
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
msgid "Directory for saving mail component files."
msgstr "保存邮件组件文件的目录。"
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgstr "禁用或启用文件夹数中文件夹名的省略显示"
+
+#: ../mail/evolution-mail.schemas.in.h:42
msgid "Draw spelling error indicators on words as you type."
msgstr "在您打字的时候就显示拼写错误标识。"
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:43
msgid "Empty Junk folders on exit"
msgstr "退出时清空垃圾邮件文件夹"
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:44
msgid "Empty Trash folders on exit"
msgstr "退出时清空回收站"
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:45
msgid "Empty all Junk folders when exiting Evolution."
msgstr "退出 Evolution 时清空垃圾邮件。"
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:46
msgid "Empty all Trash folders when exiting Evolution."
msgstr "退出 Evolution 时清空回收站。"
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:47
msgid "Enable caret mode, so that you can see a cursor when reading mail."
msgstr "启用光标模式,这样您在读取邮件时就能看到光标了。"
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:48
msgid "Enable or disable magic space bar"
msgstr "启用或禁用魔术空格键"
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:49
msgid "Enable or disable type ahead search feature"
msgstr "启用或禁用自动前进功能"
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:50
msgid "Enable search folders"
msgstr "启用搜索文件夹"
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
msgid "Enable search folders on startup."
msgstr "启动时启用搜索文件夹。"
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:52
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 "
@@ -12325,46 +12995,45 @@ msgstr ""
"您可以更加轻松地在侧边栏中找到文件夹,只需输入文件夹名称,然后选中范围就会自"
"动跳转到该文件夹。"
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
msgid ""
"Enable this to use Space bar key to scroll in message preview, message list "
"and folders."
-msgstr ""
-"启用以在消息预览、消息列表和文件夹中使用空格键。"
+msgstr "启用以在消息预览、消息列表和文件夹中使用空格键。"
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
msgid "Enable to render message text part of limited size."
msgstr "允许渲染被限制大小的信件文本部分。"
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
msgid "Enable/disable caret mode"
msgstr "启用/禁用光标模式"
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
msgid "Height of the message-list pane"
msgstr "信件列表面板的高度"
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
msgid "Height of the message-list pane."
msgstr "信件列表面板的高度。"
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
msgid "Hides the per-folder preview and removes the selection"
msgstr "隐藏单文件夹预览并移除选择"
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:59
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.h:52
+#: ../mail/evolution-mail.schemas.in.h:60
msgid ""
"If the \"Preview\" pane is on, then show it side-by-side rather than "
"vertically."
msgstr "如果开启了“预览”面板,则以并列方式显示,而不是垂直方式显示。"
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:61
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 "
@@ -12374,17 +13043,38 @@ msgstr ""
"MIME 类型在 GNOME 的 MIME 类型数据库中映射的 bonobo 组件查看器将被用来显示其"
"内容。"
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:64
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:65
msgid "It disables/enables the prompt while marking multiple messages."
msgstr "禁用/启用对多封邮件的标记。"
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:66
msgid ""
"It disables/enables the repeated prompts to ask if offline sync is required "
"before going into offline mode."
msgstr "禁用/启用在进入离线模式前的是否需要离线同步的不停的提示。"
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:67
msgid ""
"It disables/enables the repeated prompts to warn that deleting messages from "
"a search folder permanently deletes the message, not simply removing it from "
@@ -12392,31 +13082,31 @@ msgid ""
msgstr ""
"禁用/启用永久删除(而非简单地从结果中移除)搜索文件夹中的信件时不断弹出的提示。"
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:68
msgid "Last time empty junk was run"
msgstr "上次清空垃圾邮件的时间"
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:69
msgid "Last time empty trash was run"
msgstr "上次清空回收站的时间"
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:70
msgid "Level beyond which the message should be logged."
msgstr "大于此级别的消息会被记录。"
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:71
msgid "List of Labels and their associated colors"
msgstr "标签及其对应颜色的列表"
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:72
msgid "List of accepted licenses"
msgstr "列出接受的许可"
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:73
msgid "List of accounts"
msgstr "账户列表"
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:74
msgid ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12424,11 +13114,15 @@ msgstr ""
"列出了 Evolution 邮件组件已知的账户。此列表包含了相对于 /apps/evolution/mail/"
"accounts 的子目录命名字符串。"
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:75
msgid "List of custom headers and whether they are enabled."
msgstr "自定义头及该头是否启用。"
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:77
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."
@@ -12436,263 +13130,264 @@ msgstr ""
"列出了 Evolution 邮件组件已知的标签。列表中的字符串格式形如“名称:颜色”,其中"
"颜色使用了 HTML 十六进制编码方式。"
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:78
msgid "List of mime types to check for bonobo component viewers"
msgstr "列出要使用 bonobo 组件查看器查看的 MIME 类型"
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:79
msgid "List of protocol names whose license has been accepted."
msgstr "列出接受协议的协议名称。"
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:80
msgid "Load images for HTML messages over http"
msgstr "在 HTML 信件中装入 HTTP 图像"
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:81
+#, fuzzy
msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net. 1 - Load images in messages from contacts. 2 - "
-"Always load images off the net."
+"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
msgstr ""
"在 HTML 信件中装入 http(s) 图像。可供选择的值有:0 - 决不从网上装入图像,1 - "
"如果发送者在地址簿中则装入图像,2 - 总是从网上装入图像。"
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
msgid "Log filter actions"
msgstr "记录过滤动作"
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
msgid "Log filter actions to the specified log file."
msgstr "将过滤动作记录到指定日志文件。"
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
msgid "Logfile to log filter actions"
msgstr "记录过滤动作的日志文件"
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
msgid "Logfile to log filter actions."
msgstr "记录过滤动作的日志文件。"
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:86
msgid "Mark as Seen after specified timeout"
msgstr "在指定超时过后标为已看"
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:87
msgid "Mark as Seen after specified timeout."
msgstr "在指定超时过后标为已看。"
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:88
msgid "Mark citations in the message \"Preview\""
msgstr "在信件“预览”中标出引用"
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:89
msgid "Mark citations in the message \"Preview\"."
msgstr "在信件“预览”中标出引用。"
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:90
msgid "Message Window default height"
msgstr "信件窗口默认高度"
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:91
msgid "Message Window default width"
msgstr "信件窗口默认宽度"
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:92
msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
msgstr "信件显示风格(普通、全部邮件头、源代码)"
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:93
msgid "Minimum days between emptying the junk on exit"
msgstr "退出时清空垃圾信件的最少天数"
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:94
msgid "Minimum days between emptying the trash on exit"
msgstr "退出时清空回收站的最少天数"
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:95
msgid "Minimum time between emptying the junk on exit, in days."
msgstr "退出时清空垃圾信件的最少时间,以天计。"
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:96
msgid "Minimum time between emptying the trash on exit, in days."
msgstr "退出时清空回收站的最少天数。"
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:97
msgid "Number of addresses to display in TO/CC/BCC"
msgstr "要在 TO/CC/BCC 中显示的地址数"
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:98
msgid "Prompt on empty subject"
msgstr "空主题时提示"
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:99
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr "用户视图销毁文件夹时提示。"
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:100
msgid ""
"Prompt the user when he or she tries to send a message without a Subject."
msgstr "用户视图发送没有主题的邮件时提示。"
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:101
msgid "Prompt to check if the user wants to go offline immediately"
msgstr "用户想立即离线时提示检查"
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:102
msgid "Prompt when deleting messages in search folder"
msgstr "删除搜索文件夹中的信件时提示"
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:103
msgid "Prompt when user expunges"
msgstr "用户销毁时提示"
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:104
msgid "Prompt when user only fills Bcc"
msgstr "用户只填入 Bcc 时提示"
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:105
msgid "Prompt when user tries to open 10 or more messages at once"
msgstr "当用户试图一次打开超过十封信时提示"
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:106
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.h:95
+#: ../mail/evolution-mail.schemas.in.h:107
msgid "Prompt when user tries to send a message with no To or Cc recipients."
msgstr "当用户试图发送没有 To 或 Cc 收件人的邮件时提示。"
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:108
msgid "Prompt when user tries to send unwanted HTML"
msgstr "当用户是否发送意外的 HTML 时提示"
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:109
msgid "Prompt while marking multiple messages"
msgstr "标记多封信件时提示"
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:110
msgid "Recognize emoticons in text and replace them with images."
msgstr "识别文本中的表情,并将其替换为图像。"
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:111
msgid "Recognize links in text and replace them."
msgstr "识别文本中的链接并进行替换。"
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:112
msgid "Run junk test on incoming mail."
msgstr "对收到的邮件运行垃圾邮件测试。"
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:113
msgid "Save directory"
msgstr "保存目录"
-#: ../mail/evolution-mail.schemas.in.h:102
-msgid "Search for the sender photo in local addressbooks"
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Search for the sender photo in local address books"
msgstr "在本地地址薄中搜索发件人照片"
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:115
msgid "Send HTML mail by default"
msgstr "默认以 HTML 发送邮件"
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:116
msgid "Send HTML mail by default."
msgstr "默认以 HTML 发送邮件。"
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:117
msgid "Sender email-address column in the message list"
msgstr "在信件列表中显示 email 地址列"
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "服务器同步间隔"
+
+#: ../mail/evolution-mail.schemas.in.h:119
msgid "Show Animations"
msgstr "显示动画"
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
msgid "Show animated images as animations."
msgstr "将动画图像显示为动画。"
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:121
msgid "Show deleted messages (with a strike-through) in the message-list."
msgstr "在信件列表中显示删除了的信件(带有删除线)。"
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:122
msgid "Show deleted messages in the message-list"
msgstr "在信件列表中显示删除了的信件"
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
msgid "Show photo of the sender"
msgstr "显示发件人照片"
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:126
msgid ""
"Show the email-address of the sender in a separate column in the message "
"list."
msgstr "在信件列表的以另外的列显示电子邮件的发送者。"
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:127
msgid "Show the photo of the sender in the message reading pane."
msgstr "在信件阅读面板中显示发件人照片。"
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "Specifies the header to check for junk."
-msgstr "指定用以检查垃圾邮件的信头。"
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
-"指定用以检查垃圾邮件的信头。其 gconf 格式为 信头名=值。"
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:128
msgid "Spell check inline"
msgstr "内嵌拼写检查"
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Spell checking color"
+msgstr "拼写检查颜色"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Spell checking languages"
+msgstr "拼写检查语言"
+
+#: ../mail/evolution-mail.schemas.in.h:131
msgid "Subscribe dialog default height"
msgstr "订阅对话框默认高度"
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
msgid "Subscribe dialog default width"
msgstr "订阅对话框默认宽度"
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
msgid "Terminal font"
msgstr "终端字体"
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
msgid "Text message part limit"
msgstr "文本信件部分限制"
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
msgid "The default plugin for Junk hook"
msgstr "默认的垃圾信件钩子插件"
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
msgid "The last time empty junk was run, in days since the epoch."
msgstr "上次清空垃圾信件的时间,以自新纪元后的天数显示。"
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
msgid "The last time empty trash was run, in days since the epoch."
msgstr "上次清空回收站的时间,以新纪元后的天数显示。"
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
msgid "The terminal font for mail display."
msgstr "邮件显示用的终端字体。"
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
msgid "The variable width font for mail display."
msgstr "用于显示邮件的变宽字体。"
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr ""
-"此选项有三种可能值:0-错误,1-警告,2-调试信息。"
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr "此选项有三种可能值:0-错误,1-警告,2-调试信息。"
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:141
msgid ""
"This decides the max size of the text part that can be formatted under "
"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -12700,7 +13395,7 @@ msgstr ""
"此选项决定了 Evolution 中可格式化的最大文本部分大小。默认为 4MB/4096 KB,单位"
"为 KB。"
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:142
msgid ""
"This is the default junk plugin, even though there are multiple plugins "
"enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -12709,15 +13404,16 @@ msgstr ""
"这是默认的垃圾邮件插件,即使启用了多个插件。如果默认列出的插件被禁用,它不会"
"缺省到其它可用的插件。"
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:143
+#, fuzzy
msgid ""
-"This key is read only once and reset to false after read. This unselects the "
-"mail in the list and removes the preview for that folder."
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
msgstr ""
"此键只被读取一次并在读取后被重设为 false。它取消选中列表中的邮件并移除相应文"
"件夹的预览。"
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:144
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;"
@@ -12727,174 +13423,189 @@ msgstr ""
"此键应包含指定自定义邮件头的 XML 结构列表,以及是否显示这些邮件头。XML 结构的"
"格式为:&lt;启用的邮件头&gt; - 设为 enabled 则在邮件视图中显示该邮件头。"
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local address book only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:146
msgid "This option would help in improving the speed of fetching."
msgstr "此选项能帮助提高获取信件的速度"
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:147
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.h:134
+#: ../mail/evolution-mail.schemas.in.h:148
msgid ""
"This setting specifies whether the threads should be in expanded or "
"collapsed state by default. Evolution requires a restart."
msgstr "此设置指定了默认情况下线索是被展开还是被折叠。需要重启 Evolution。"
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:149
msgid ""
"This setting specifies whether the threads should be sorted based on latest "
"message in each thread, rather than by message's date. Evolution requires a "
"restart."
-msgstr "此设置指定了默认情况下是否将线索按线索中的最新消息而不是"
-"消息日期排序。需要重启 Evolution。"
+msgstr ""
+"此设置指定了默认情况下是否将线索按线索中的最新消息而不是消息日期排序。需要重"
+"启 Evolution。"
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:150
msgid "Thread the message list."
msgstr "按线索编排信件列表。"
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:151
msgid "Thread the message-list"
msgstr "按线索编排信件列表"
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:152
msgid "Thread the message-list based on Subject"
msgstr "基于主题按线索编排信件列表"
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:153
msgid "Timeout for marking message as seen"
msgstr "将信件标为已看的超时时长"
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
msgid "Timeout for marking message as seen."
msgstr "将信件标为已看的超时时长。"
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
msgid "UID string of the default account."
msgstr "默认账户的 UID 字符串。"
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:157
msgid "Use SpamAssassin daemon and client"
msgstr "使用垃圾克星守护程序和客户"
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
msgid "Use SpamAssassin daemon and client (spamc/spamd)."
msgstr "使用 SpamAssassin 守护程序和客户端(spamc/spamd)。"
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
msgid "Use custom fonts"
msgstr "使用自定义字体"
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
msgid "Use custom fonts for displaying mail."
msgstr "使用自定义字体显示邮件。"
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
msgid "Use only local spam tests."
msgstr "只使用本地垃圾邮件测试。"
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
msgid "Use only the local spam tests (no DNS)."
msgstr "之使用本地垃圾邮件测试(无 DNS)。"
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
msgid "Use side-by-side or wide layout"
msgstr "使用并排还是宽屏布局"
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
msgid "Variable width font"
msgstr "变宽字体"
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
msgid "View/Bcc menu item is checked"
msgstr "选中了查看/Bcc 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
msgid "View/Bcc menu item is checked."
msgstr "选中了查看/Bcc 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
msgid "View/Cc menu item is checked"
msgstr "选中了查看/Cc 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
msgid "View/Cc menu item is checked."
msgstr "选中了查看/Cc 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
msgid "View/From menu item is checked"
msgstr "选中了查看/From 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
msgid "View/From menu item is checked."
msgstr "选中了查看/From 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
msgid "View/PostTo menu item is checked"
msgstr "选中了查看/PostTo 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
msgid "View/PostTo menu item is checked."
msgstr "选中了查看/PostTo 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
msgid "View/ReplyTo menu item is checked"
msgstr "选中了查看/ReplyTo 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
msgid "View/ReplyTo menu item is checked."
msgstr "选中了查看/ReplyTo 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:175
msgid "Whether a read receipt request gets added to every message by default."
+msgstr "是否默认对所有信件添加阅读收条请求。"
+
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Whether disable ellipsizing feature of folder names in folder tree."
msgstr ""
-"是否默认对所有信件添加阅读收条请求。"
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:177
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.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
msgid "Whether sort threads based on latest message in that thread"
msgstr "是否以线索中的最新信件来排序线索"
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
msgid "Width of the message-list pane"
msgstr "信件列表面板的高度"
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
msgid "Width of the message-list pane."
msgstr "信件列表面板的高度。"
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
msgid "Importing Elm data"
msgstr "导入 Elm 数据"
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
msgid "Evolution Elm importer"
msgstr "Evolution Elm 导入器"
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
msgid "Import mail from Elm."
msgstr "从 Elm 导入邮件。"
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
msgid "Destination folder:"
msgstr "目的文件夹:"
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
msgid "Select folder to import into"
msgstr "选择要导入到哪个文件夹"
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
msgid "Berkeley Mailbox (mbox)"
msgstr "Berkeley 邮箱(mbox)"
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
msgid "Importer Berkeley Mailbox format folders"
msgstr "导入器 Berkeley 邮箱格式文件夹"
@@ -12902,7 +13613,7 @@ msgstr "导入器 Berkeley 邮箱格式文件夹"
msgid "Importing mailbox"
msgstr "导入邮箱"
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
#, c-format
msgid "Importing `%s'"
msgstr "导入“%s”"
@@ -12912,167 +13623,182 @@ msgstr "导入“%s”"
msgid "Scanning %s"
msgstr "扫描 %s"
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
msgid "Importing Pine data"
msgstr "导入 Pine 数据"
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
msgid "Evolution Pine importer"
msgstr "Evolution Pine 导入器"
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
msgid "Import mail from Pine."
msgstr "从 Pine 导入邮件。"
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:75
#, c-format
msgid "Mail to %s"
msgstr "邮寄给 %s"
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
#, c-format
msgid "Mail from %s"
msgstr "来自 %s 的邮件"
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:262
#, c-format
msgid "Subject is %s"
msgstr "主题是 %s"
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:297
#, c-format
msgid "%s mailing list"
msgstr "%s 邮件列表"
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:368
msgid "Add Filter Rule"
msgstr "添加过滤规则"
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "模板"
+
+#: ../mail/mail-component.c:550
#, c-format
msgid "%d selected, "
msgid_plural "%d selected, "
msgstr[0] "已选中 %d 个,"
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:554
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d 封已删除"
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:561
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d 封垃圾"
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:564
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d 封草稿"
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:566
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d 封已发"
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:568
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d 封未发"
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:574
#, c-format
msgid "%d unread, "
msgid_plural "%d unread, "
msgstr[0] ",%d 封未读,"
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:575
#, c-format
msgid "%d total"
msgid_plural "%d total"
msgstr[0] "总共 %d 封"
-#: ../mail/mail-component.c:896
+#: ../mail/mail-component.c:923
msgid "New Mail Message"
msgstr "新建信件"
-#: ../mail/mail-component.c:897
+#: ../mail/mail-component.c:924
+msgctxt "New"
msgid "_Mail Message"
msgstr "信件(_M)"
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:925
msgid "Compose a new mail message"
msgstr "撰写一封新信"
-#: ../mail/mail-component.c:904
+#: ../mail/mail-component.c:931
msgid "New Mail Folder"
msgstr "新建邮件文件夹"
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:932
+msgctxt "New"
msgid "Mail _Folder"
msgstr "邮件文件夹(_F)"
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:933
msgid "Create a new mail folder"
msgstr "创建新邮件文件夹"
-#: ../mail/mail-component.c:1053
+#: ../mail/mail-component.c:1080
msgid "Failed upgrading Mail settings or folders."
msgstr "升级邮件设置或文件夹失败。"
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1596
msgid "Error"
msgstr "错误"
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1596
msgid "Errors"
msgstr "错误"
-#: ../mail/mail-component.c:1523
+#: ../mail/mail-component.c:1597
msgid "Warnings and Errors"
msgstr "警告和错误"
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1598
msgid "Debug"
msgstr "调试"
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1598
msgid "Error, Warnings and Debug messages"
msgstr "错误,警告和调试信息"
-#: ../mail/mail-component.c:1634
+#: ../mail/mail-component.c:1725
msgid "Debug Logs"
msgstr "调试日志"
-#: ../mail/mail-component.c:1638
+#: ../mail/mail-component.c:1739
msgid "Show _errors in the status bar for"
msgstr "在状态栏显示错误(_E)"
-#: ../mail/mail-component.c:1645
-msgid "seconds."
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1755
+msgid "second(s)."
msgstr "秒。"
-#: ../mail/mail-component.c:1655
+#: ../mail/mail-component.c:1761
msgid "Log Messages:"
msgstr "日志消息:"
-#: ../mail/mail-component.c:1707
+#: ../mail/mail-component.c:1802
msgid "Log Level"
msgstr "日志级别"
-#: ../mail/mail-component.c:1714 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
msgid "Time"
msgstr "时间"
-#: ../mail/mail-component.c:1721 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
#: ../mail/message-list.etspec.h:10
msgid "Messages"
msgstr "信件"
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "关闭此窗口"
+
#: ../mail/mail-config.glade.h:1
msgid " Ch_eck for Supported Types "
msgstr "检查支持的类型(_E)"
@@ -13086,7 +13812,7 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
msgstr "<b>(在此版本的 Evolution 中不支持 SSL)</b>"
#: ../mail/mail-config.glade.h:5
-msgid "<b>Sender Photograph</b>"
+msgid "<b>Sender Photograph</b>"
msgstr "<b>发送者照片</b>"
#: ../mail/mail-config.glade.h:6
@@ -13167,73 +13893,73 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
msgstr "<span weight=\"bold\">打印字体</span>"
#: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">代理服务器状态</span>"
+
+#: ../mail/mail-config.glade.h:28
msgid "<span weight=\"bold\">Required Information</span>"
msgstr "<span weight=\"bold\">请求的信息</span>"
-#: ../mail/mail-config.glade.h:28
+#: ../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:29
+#: ../mail/mail-config.glade.h:30
msgid "<span weight=\"bold\">Security</span>"
msgstr "<span weight=\"bold\">安全</span>"
-#: ../mail/mail-config.glade.h:30
+#: ../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:31
+#: ../mail/mail-config.glade.h:32
msgid "<span weight=\"bold\">Server Configuration</span>"
msgstr "<span weight=\"bold\">服务器配置</span>"
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
msgid "<span weight=\"bold\">_Authentication Type</span>"
msgstr "<span weight=\"bold\">认证类型(_A)</span>"
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
msgid "Account Management"
msgstr "账户管理"
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
msgid "Add Ne_w Signature..."
msgstr "添加新签名(_W)..."
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
msgid "Add _Script"
msgstr "添加脚本(_S)"
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
msgid "Al_ways sign outgoing messages when using this account"
msgstr "当使用该账户时总是发送签名信件(_W)"
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
msgid "Also encrypt to sel_f when sending encrypted messages"
msgstr "当发送加密邮件时也对自身加密(_F)"
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
msgid "Alway_s carbon-copy (cc) to:"
msgstr "总是抄送到(_S):"
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
msgid "Always _blind carbon-copy (bcc) to:"
msgstr "总是暗送到(_B):"
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
msgid "Always _trust keys in my keyring when encrypting"
msgstr "加密时总是信任我的密钥环中的密钥(_T)"
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
msgid "Always encrypt to _myself when sending encrypted messages"
msgstr "当发送加密邮件时总是对自身加密(_M)"
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
msgid "Always request rea_d receipt"
msgstr "请求阅读收条(_D)"
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "附加原始信件"
-
#: ../mail/mail-config.glade.h:46
msgid "Automatically insert _emoticon images"
msgstr "自动插入表情图像(_E)"
@@ -13251,13 +13977,13 @@ msgid "C_haracter set:"
msgstr "字符集(_H):"
#: ../mail/mail-config.glade.h:50
-msgid "C_heck custom headers for junk"
-msgstr "检查自定义信头以判别垃圾邮件(_H)"
-
-#: ../mail/mail-config.glade.h:51
msgid "Ch_eck for Supported Types "
msgstr "检查支持的类型(_E)"
+#: ../mail/mail-config.glade.h:51
+msgid "Check cu_stom headers for junk"
+msgstr "检查自定义信头以判别垃圾邮件(_S)"
+
#: ../mail/mail-config.glade.h:52
msgid "Check incoming _messages for junk"
msgstr "检查收到的邮件是否是垃圾邮件(_M)"
@@ -13318,16 +14044,16 @@ msgid "Digitally sign o_utgoing messages (by default)"
msgstr "对寄出的信件进行数字签名(默认)(_U)"
#: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
-msgstr "如果信件发送者在地址簿中则标记为垃圾邮件(_N)"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "如果文本超出大小限制,则不格式化邮件中的文本内容(_Z)"
#: ../mail/mail-config.glade.h:72
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr "如果文本超出大小限制,则不格式化邮件中的文本内容(_Z)"
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr "如果信件发送者在地址簿中则不标记为垃圾邮件(_K)"
#: ../mail/mail-config.glade.h:73
-msgid "Do not quote original message"
-msgstr "无法引用原始信件"
+msgid "Do not quote"
+msgstr "不引用"
#: ../mail/mail-config.glade.h:74
msgid "Done"
@@ -13390,70 +14116,86 @@ msgid "HTML Messages"
msgstr "HTML 信件"
#: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr "HTTP 代理服务器(_T):"
+
+#: ../mail/mail-config.glade.h:92
msgid "Headers"
msgstr "信头"
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
msgid "Highlight _quotations with"
msgstr "突出显示引用(_Q)"
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
msgid "Inline"
msgstr "嵌入"
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
-msgstr "嵌入原消息(Outlook 风格)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr "嵌入(Outlook 风格)"
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
msgid "KB"
msgstr "KB"
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
msgid "Labels"
msgstr "标签"
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
msgid "Languages Table"
msgstr "语言表"
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
msgid "Mail Configuration"
msgstr "邮件配置"
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
msgid "Mail Headers Table"
msgstr "邮件头表"
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
msgid "Mailbox location"
msgstr "邮件箱位置"
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
msgid "Message Composer"
msgstr "信件撰写器"
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr "不使用代理的情况(_P):"
+
+#: ../mail/mail-config.glade.h:107
msgid ""
"Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr ""
-"注意:标签名中的下划线被用作菜单中的助记符。"
+msgstr "注意:标签名中的下划线被用作菜单中的助记符。"
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:108
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
msgstr "注意:直到您第一次连接的时候,才会询问密码。"
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
+#, fuzzy
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "如果找到匹配的自定义垃圾信头,此选项将被覆盖。"
+
+#: ../mail/mail-config.glade.h:110
msgid "Or_ganization:"
msgstr "组织(_G):"
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG 键标识(_K):"
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:112
+msgid "Pass_word:"
+msgstr "密码(_W):"
+
+#: ../mail/mail-config.glade.h:114
msgid ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
@@ -13461,7 +14203,7 @@ msgstr ""
"请在下面的空白处输入此账户的描述性名称。\n"
"此名称将只在显示时使用。"
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:116
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -13469,7 +14211,7 @@ msgstr ""
"请在下面输入您的发件服务器信息。如果您不太确定的话,请询问您的系统管理员或者"
"互联网服务提供商ISP。"
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:117
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 "
@@ -13478,113 +14220,121 @@ msgstr ""
"请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入,除非您想要在您发"
"出的邮件中包含此信息。"
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:118
msgid "Please select among the following options"
msgstr "请从以下选项中选择"
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+msgid "Port:"
+msgstr "端口:"
+
+#: ../mail/mail-config.glade.h:120
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr "发送只有暗送收件人的信件时提示(_O)"
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "引用原始信件"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
msgid "Quoted"
msgstr "引用"
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
msgid "Re_member password"
msgstr "记住密码(_M)"
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:123
msgid "Re_ply-To:"
msgstr "回复到(_P):"
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
msgid "Remember _password"
msgstr "记住密码(_P)"
-#: ../mail/mail-config.glade.h:122
-msgid "S_earch for sender photograph only in local addressbooks"
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr "SOCKS 主机(_O):"
+
+#: ../mail/mail-config.glade.h:127
+msgid "S_earch for sender photograph only in local address books"
msgstr "仅在本地地址簿中搜索发件人照片(_E)"
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:128
msgid "S_elect..."
msgstr "选择(_E)..."
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:129
msgid "S_end message receipts:"
msgstr "发送信件收条(_E):"
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:130
msgid "S_tandard Font:"
msgstr "标准字体(_T):"
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
msgid "Select HTML fixed width font"
msgstr "选择 HTML 固定宽度字体"
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:133
msgid "Select HTML fixed width font for printing"
msgstr "选择用于打印的 HTML 固定宽度字体"
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:134
msgid "Select HTML variable width font"
msgstr "选择 HTML 变宽度字体"
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
msgid "Select HTML variable width font for printing"
msgstr "选择用于打印的 HTML 变宽度字体"
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
msgid "Sending Mail"
msgstr "发送邮件"
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
msgid "Sent _Messages Folder:"
msgstr "已发送信件文件夹(_M):"
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
msgid "Ser_ver requires authentication"
msgstr "服务器需要认证(_V)"
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
msgid "Server _Type: "
msgstr "服务器类型(_T):"
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
msgid "Sig_ning certificate:"
msgstr "签名证书(_N):"
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
msgid "Signat_ure:"
msgstr "签名(_U):"
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:143
msgid "Signatures"
msgstr "签名"
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:144
msgid "Signatures Table"
msgstr "签名表"
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
msgid "Spell Checking"
msgstr "拼写检查"
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "回复时在底部开始打字(_T)"
+
+#: ../mail/mail-config.glade.h:147
msgid "T_ype: "
msgstr "类型(_Y):"
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:148
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:149
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -13593,13 +14343,7 @@ msgstr ""
"此脚本的输出将用于您的签名。您指定的名称将只会\n"
"用于显示。"
-#: ../mail/mail-config.glade.h:146
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"如果找到匹配的自定义垃圾信头,此选项将被覆盖。"
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:152
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -13607,16 +14351,26 @@ msgstr ""
"输入您想要给此帐户起的名字。\n"
"如:“工作”或“私人”"
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr "用户名(_E):"
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "使用身份验证(_N)"
+
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
+#: ../plugins/google-account-setup/google-source.c:625
+#: ../plugins/google-account-setup/google-contacts-source.c:278
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
msgid "User_name:"
msgstr "用户名(_N):"
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:157
msgid "V_ariable-width:"
msgstr "变宽(_A):"
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -13626,100 +14380,124 @@ msgstr ""
"\n"
"单击“前进”开始。"
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
msgid "_Add Signature"
msgstr "添加签名(_A)"
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
msgid "_Always load images from the Internet"
msgstr "总是从 Internet 上装入图像(_A)"
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr "自动代理服务器配置 URL(_A):"
+
+#: ../mail/mail-config.glade.h:164
msgid "_Default junk plugin:"
msgstr "默认的垃圾邮件插件(_D):"
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "直接连接到 Internet(_D)"
+
+#: ../mail/mail-config.glade.h:166
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
msgid "_Forward style:"
msgstr "转发方式(_F):"
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
msgid "_Keep Signature above the original message on replying"
msgstr "回复时保留原始信件的签名(_K)"
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
msgid "_Load images in messages from contacts"
msgstr "装入来自联系人的邮件中的图像(_L)"
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local address book only"
+msgstr "仅在本地地址簿中查阅(_L)"
+
+#: ../mail/mail-config.glade.h:172
msgid "_Make this my default account"
msgstr "使它成为我的默认账户(_M)"
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr "手动代理服务器配置(_M):"
+
+#: ../mail/mail-config.glade.h:174
msgid "_Mark messages as read after"
msgstr "把信件标记为已读前等(_M)"
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
msgid "_Never load images from the Internet"
msgstr "绝不从 Internet 装入图像(_N)"
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
msgid "_Path:"
msgstr "路径(_P):"
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
msgid "_Prompt when sending messages with an empty subject line"
msgstr "发送空主题行的信件时提示(_P)"
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
msgid "_Reply style:"
msgstr "回复风格(_R):"
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
msgid "_Script:"
msgstr "脚本(_S):"
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr "安全 HTTP 代理(_S):"
+
+#: ../mail/mail-config.glade.h:183
msgid "_Select..."
msgstr "选择(_S)..."
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:186
msgid "_Show image animations"
msgstr "显示图像动画(_S)"
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:187
msgid "_Show the photograph of sender in the message preview"
msgstr "在电子邮件预览中显示发送者的照片(_S)"
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:188
msgid "_Shrink To / Cc / Bcc headers to "
msgstr "只显示 To/Cc/Bcc 头中的前(_S)"
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
msgid "_Use Secure Connection:"
msgstr "使用安全连接(_U):"
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "使用默认值(_U)"
+
+#: ../mail/mail-config.glade.h:191
msgid "_Use the same fonts as other applications"
msgstr "使用与其它应用程序相同的字体(_U)"
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:192
msgid "addresses"
msgstr "个地址"
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:193
msgid "color"
msgstr "颜色"
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
msgid "description"
msgstr "描述"
@@ -13759,43 +14537,43 @@ msgstr "区分大小写(_S)"
msgid "Co_mpleted"
msgstr "已完成(_M)"
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
msgid "F_ind:"
msgstr "查找(_I):"
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
msgid "Find in Message"
msgstr "在信件中查找"
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
msgid "Flag to Follow Up"
msgstr "跟随的标志"
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
msgid "Folder Subscriptions"
msgstr "文件夹订阅"
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
msgid "License Agreement"
msgstr "许可协议"
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
msgid "None Selected"
msgstr "没有选中"
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
msgid "S_erver:"
msgstr "服务器(_E):"
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
msgid "Security Information"
msgstr "安全信息"
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
msgid "Specific folders"
msgstr "指定文件夹"
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
msgid ""
"The messages you have selected for follow up are listed below.\n"
"Please select a follow up action from the \"Flag\" menu."
@@ -13803,23 +14581,23 @@ msgstr ""
"您选中进行跟随的信件已经在下面列出。\n"
"请从“标志”菜单中选择跟随操作。"
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
msgid "_Accept License"
msgstr "接受协议(_A)"
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
msgid "_Due By:"
msgstr "延期人(_D):"
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
msgid "_Flag:"
msgstr "标志(_F):"
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
msgid "_Tick this to accept the license agreement"
msgstr "选中此处以表明您接受许可协议(_T)"
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:845
#, c-format
msgid "Pinging %s"
msgstr "查验 %s"
@@ -13866,97 +14644,102 @@ msgstr "发送第%d封信,共%d封"
msgid "Failed to send %d of %d messages"
msgstr "在第%d封信失败,共%d封"
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
msgid "Canceled."
msgstr "已取消。"
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
msgid "Complete."
msgstr "完成。"
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
msgid "Saving message to folder"
msgstr "把信件保存到文件夹中"
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
#, c-format
msgid "Moving messages to %s"
msgstr "把信件移至 %s"
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
#, c-format
msgid "Copying messages to %s"
msgstr "把信件复制到 %s"
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
msgid "Forwarded messages"
msgstr "转发的信件"
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
#, c-format
msgid "Opening folder %s"
msgstr "打开文件夹 %s"
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
+#, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "正在获取文件加 %s 的配额信息"
+
+#: ../mail/mail-ops.c:1341
#, c-format
msgid "Opening store %s"
msgstr "打开存储 %s"
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1412
#, c-format
msgid "Removing folder %s"
msgstr "删除文件夹 %s"
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1501
#, c-format
msgid "Storing folder '%s'"
msgstr "存储文件夹“%s”"
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1564
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "销毁并存储账户“%s”"
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1565
#, c-format
msgid "Storing account '%s'"
msgstr "存储账户“%s”"
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1619
msgid "Refreshing folder"
msgstr "刷新文件夹"
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
msgid "Expunging folder"
msgstr "销毁文件夹"
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1706
#, c-format
msgid "Emptying trash in '%s'"
msgstr "清空“%s”中的回收站"
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1707
msgid "Local Folders"
msgstr "本地文件夹"
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1788
#, c-format
msgid "Retrieving message %s"
msgstr "收取信件 %s"
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1895
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "收取 %d 封信"
-#: ../mail/mail-ops.c:1906
+#: ../mail/mail-ops.c:1980
#, c-format
msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
msgstr[0] "保存 %d 封信"
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2058
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -13965,11 +14748,11 @@ msgstr ""
"在将信件保存到 %s 时发生错误:\n"
" %s"
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2130
msgid "Saving attachment"
msgstr "保存附件"
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -13978,89 +14761,89 @@ msgstr ""
"无法创建输出文件:%s:\n"
" %s"
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2171
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据:%s"
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2317
#, c-format
msgid "Disconnecting from %s"
msgstr "断开与 %s 的连接"
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2317
#, c-format
msgid "Reconnecting to %s"
msgstr "重新连接到 %s"
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2413
#, c-format
msgid "Preparing account '%s' for offline"
msgstr "正在准备脱机使用账户“%s”"
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2499
msgid "Checking Service"
msgstr "检查服务"
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:181
msgid "Canceling..."
msgstr "正在取消..."
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:383
msgid "Send & Receive Mail"
msgstr "发送和接收邮件"
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:394
msgid "Cancel _All"
msgstr "全部取消(_A)"
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:498
msgid "Updating..."
msgstr "正在更新..."
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
msgid "Waiting..."
msgstr "正在等待..."
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:799
#, c-format
msgid "Checking for new mail"
msgstr "检查新邮件"
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
#, c-format
msgid "Enter Passphrase for %s"
msgstr "输入 %s 的密码"
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
msgid "Enter Passphrase"
msgstr "输入密码"
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:212
+#: ../plugins/exchange-operations/exchange-config-listener.c:708
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
msgid "Enter Password"
msgstr "输入密码"
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
msgid "User canceled operation."
msgstr "用户己取消操作。"
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "编辑签名"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "保存并关闭(_S)"
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "输入该签名的名字。"
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "编辑签名"
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "名称:"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "签名(_S):"
#: ../mail/mail-tools.c:120
#, c-format
@@ -14101,27 +14884,25 @@ msgstr "更新“%s:%s”的搜索文件夹"
msgid "Updating Search Folders for '%s'"
msgstr "更新“%s”的搜索文件夹"
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
msgid "Edit Search Folder"
msgstr "编辑搜索文件夹"
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
msgid "New Search Folder"
msgstr "新建搜索文件夹"
#: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
msgstr "已经存在名为“{0}”的文件夹。请使用不同的名称。"
#: ../mail/mail.error.xml.h:2
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
msgstr "已经存在名为“{1}”的文件夹。请使用不同的名称。"
#: ../mail/mail.error.xml.h:3
msgid ""
-"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"A non-empty folder at \"{1}\" already exists.\n"
"\n"
"You can choose to ignore this folder, overwrite or append its contents, or "
"quit."
@@ -14132,14 +14913,14 @@ msgstr ""
#: ../mail/mail.error.xml.h:6
msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
msgstr "“{1}”请求了阅读收条。将阅读收条发送给{0}吗?"
#: ../mail/mail.error.xml.h:7
msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
msgstr "已经存在名为“{0}”的签名。请使用不同的名称。"
#: ../mail/mail.error.xml.h:8
@@ -14174,8 +14955,8 @@ msgstr "您确定想要永久删除全部文件夹中已删除的全部信件吗
#: ../mail/mail.error.xml.h:14
msgid ""
"Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
-msgstr "您确定想要永久删除文件夹“%s”中已删除的全部信件吗?"
+"folder \"{0}\"?"
+msgstr "您确定想要永久删除文件夹“{0}”中已删除的全部信件吗?"
#: ../mail/mail.error.xml.h:15
msgid "Are you sure you want to send a message in HTML format?"
@@ -14190,11 +14971,11 @@ msgid "Are you sure you want to send a message without a subject?"
msgstr "您确定想要发送没有主题的信件吗?"
#: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
+msgid "Because \"{0}\"."
msgstr "原因是“{0}”。"
#: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
+msgid "Because \"{2}\"."
msgstr "原因是“{2}”。"
#: ../mail/mail.error.xml.h:21
@@ -14202,15 +14983,15 @@ msgid "Blank Signature"
msgstr "空签名"
#: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
+msgid "Cannot add Search Folder \"{0}\"."
msgstr "无法添加搜索文件夹“{0}”。"
#: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
msgstr "无法将文件夹“{0}”复制到“{1}”。"
#: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
+msgid "Cannot create folder \"{0}\"."
msgstr "无法创建文件夹“{0}”。"
#: ../mail/mail.error.xml.h:25
@@ -14218,52 +14999,51 @@ msgid "Cannot create temporary save directory."
msgstr "无法创建临时保存目录。"
#: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
msgstr "无法创建保存目录,原因是“{1}”"
#: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
+msgid "Cannot delete folder \"{0}\"."
msgstr "无法删除文件夹“{0}”。"
#: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
+msgid "Cannot delete system folder \"{0}\"."
msgstr "无法删除系统文件夹“{0}”。"
#: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
msgstr "无法编辑搜索文件夹“{0}”,原因是该文件夹不存在。"
#: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
msgstr "无法将文件夹“{0}”移至“{1}”。"
#: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
+msgid "Cannot open source \"{1}\""
msgstr "无法打开源“{0}”"
#: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
+msgid "Cannot open source \"{2}\"."
msgstr "无法打开源“{2}”。"
#: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
+msgid "Cannot open target \"{2}\"."
msgstr "无法打开目标“{2}”。"
#: ../mail/mail.error.xml.h:34
msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"license."
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
msgstr ""
"无法读取许可文件“{0}”,原因是安装有问题。您将无法使用此提供者,除非您接受其许"
"可协议。"
#: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
msgstr "无法将“{0}”重命名为“{1}”。"
#: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgid "Cannot rename or move system folder \"{0}\"."
msgstr "无法重命名或移动系统文件夹“{0}”。"
#: ../mail/mail.error.xml.h:37
@@ -14271,18 +15051,22 @@ msgid "Cannot save changes to account."
msgstr "无法将更改保存到账户。"
#: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
+msgid "Cannot save to directory \"{0}\"."
msgstr "无法保存到目录“{0}”。"
#: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
+msgid "Cannot save to file \"{0}\"."
msgstr "无法保存到文件“{0}”。"
#: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
+msgid "Cannot set signature script \"{0}\"."
msgstr "无法设定签名脚本“{0}”。"
#: ../mail/mail.error.xml.h:41
+msgid "Check Junk Failed"
+msgstr "检查垃圾信失败"
+
+#: ../mail/mail.error.xml.h:42
msgid ""
"Check to make sure your password is spelled correctly. Remember that many "
"passwords are case sensitive; your caps lock might be on."
@@ -14290,46 +15074,42 @@ msgstr ""
"选中此处以确保您的密码拼写正确。请记住,很多密码都是区分大小写的;您的 Caps "
"Lock 灯可能为开。"
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
msgid "Could not save signature file."
msgstr "无法保存签名文件。"
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "删除“{0}吗?”"
-
#: ../mail/mail.error.xml.h:44
+msgid "Delete \"{0}\"?"
+msgstr "删除“{0}”吗?"
+
+#: ../mail/mail.error.xml.h:45
msgid "Delete account?"
msgstr "删除账户吗?"
-#: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+#: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
msgstr "删除搜索文件夹“{0}”中的信件吗?"
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:47
msgid "Delete messages in Search Folder?"
msgstr "删除搜索文件夹中的信件吗?"
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
msgid "Discard changes?"
msgstr "丢弃更改吗?"
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
msgid "Do not d_elete"
msgstr "不删除(_E)"
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
msgid "Do not delete"
msgstr "不删除"
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
msgid "Do not disable"
msgstr "不禁用"
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "您是否想要也在子文件夹中执行操作?"
-
#: ../mail/mail.error.xml.h:52
msgid ""
"Do you want to locally synchronize the folders that are marked for offline "
@@ -14426,34 +15206,26 @@ msgid "Mark all messages as read"
msgstr "把所有信件标记为已读"
#: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "将此文件夹及其子文件夹中的信件全部标记为已读吗?"
-
-#: ../mail/mail.error.xml.h:75
msgid "Missing folder."
msgstr "缺少文件夹。"
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
msgid "No sources selected."
msgstr "没有选中源。"
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "只对当前文件夹(_C)"
-
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
msgid "Opening too many messages at once may take a long time."
msgstr "一次打开太多封信可能要花一点时间。"
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
msgid "Please check your account settings and try again."
msgstr "请检查您的账户设置,然后再试一次。"
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
msgid "Please enable the account or send using another account."
msgstr "请启用账户或者使用其它账户发送。"
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
msgid ""
"Please enter a valid email address in the To: field. You can search for "
"email addresses by clicking on the To: button next to the entry box."
@@ -14461,7 +15233,7 @@ msgstr ""
"请在 To: 中输入有效的电子邮件地址。您可以单击输入框旁边的 To: 按钮来搜索电子"
"邮件地址。"
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
msgid ""
"Please make sure the following recipients are willing and able to receive "
"HTML email:\n"
@@ -14470,34 +15242,42 @@ msgstr ""
"请确定下列收件人愿意并且能够接收 HTML 邮件:\n"
"{0}"
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
msgid "Please provide an unique name to identify this signature."
msgstr "请提供此签名的唯一标识名称。"
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
msgid "Please wait."
msgstr "请稍候。"
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
msgstr "升迁旧的邮件文件夹“{0}”出现问题。"
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
msgid "Querying server"
msgstr "查询服务器"
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
msgid "Querying server for a list of supported authentication mechanisms."
msgstr "查询服务器所支持的身份验证算法列表。"
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
msgid "Read receipt requested."
msgstr "阅读收条已请求。"
-#: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
msgstr "真的要删除文件夹“{0}”及其全部子文件夹吗?"
+#: ../mail/mail.error.xml.h:90
+msgid "Report Junk Failed"
+msgstr "报告垃圾邮件失败"
+
+#: ../mail/mail.error.xml.h:91
+msgid "Report Not Junk Failed"
+msgstr "报告非垃圾邮件失败"
+
#: ../mail/mail.error.xml.h:92
msgid "Search Folders automatically updated."
msgstr "搜索文件夹已自动更新。"
@@ -14544,13 +15324,13 @@ msgid ""
"The following Search Folder(s):\n"
"{0}\n"
"Used the now removed folder:\n"
-" &quot;{1}&quot;\n"
+" \"{1}\"\n"
"And have been updated."
msgstr ""
"下列搜索文件夹:\n"
"{0}\n"
"使用现已删除的文件夹:\n"
-"“{1}”\n"
+" “{1}”\n"
"已经更新。"
#: ../mail/mail.error.xml.h:106
@@ -14558,13 +15338,13 @@ msgid ""
"The following filter rule(s):\n"
"{0}\n"
"Used the now removed folder:\n"
-" &quot;{1}&quot;\n"
+" \"{1}\"\n"
"And have been updated."
msgstr ""
"下列过滤规则:\n"
"{0}\n"
"使用现已删除的文件夹:\n"
-"“{1}”\n"
+" “{1}”\n"
"已经更新。"
#: ../mail/mail.error.xml.h:111
@@ -14633,8 +15413,8 @@ msgid ""
"message from one of your local or remote folders.\n"
"Do you really want to do this?"
msgstr ""
-"警告:从搜索文件夹中删除信件将会删除实际位于您的本地"
-"或远程文件夹中的相应信件。\n"
+"警告:从搜索文件夹中删除信件将会删除实际位于您的本地或远程文件夹中的相应信"
+"件。\n"
"您真的想要这么做吗?"
#: ../mail/mail.error.xml.h:127
@@ -14667,8 +15447,8 @@ msgstr ""
"或者逐一选择文件夹,或者选中全部本地文件夹和/或全部远程文件夹。"
#: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr "您以“{1}”的身份登录到服务器“{0}”失败。"
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "您以“{0}”的身份登录到服务器“{0}”失败。"
#: ../mail/mail.error.xml.h:135
msgid "_Append"
@@ -14690,22 +15470,22 @@ msgstr "销毁(_E)"
msgid "_Open Messages"
msgstr "打开信件(_O)"
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "在当前文件夹及其子文件夹中(_S)"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
msgid "Unseen"
msgstr "未看"
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
msgid "Seen"
msgstr "已看"
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
msgid "Answered"
msgstr "已答复"
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "已转发"
+
#: ../mail/message-list.c:1056
msgid "Multiple Unseen Messages"
msgstr "多封未看信件"
@@ -14730,37 +15510,48 @@ msgstr "较高"
msgid "Highest"
msgstr "最高"
-#: ../mail/message-list.c:1614 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
msgid "?"
msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
#: ../widgets/table/e-cell-date.c:70
msgid "Today %l:%M %p"
msgstr "今天%p%l:%M"
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
msgid "Yesterday %l:%M %p"
msgstr "昨天%p%l:%M"
-#: ../mail/message-list.c:1642 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
msgid "%a %l:%M %p"
msgstr "%A%p%l:%M"
-#: ../mail/message-list.c:1650 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
msgid "%b %d %l:%M %p"
msgstr "%m月%d日%p%l:%M"
-#: ../mail/message-list.c:1652 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
-#: ../mail/message-list.c:3849
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3916 ../mail/message-list.c:4376
msgid "Generating message list"
msgstr "生成信件列表"
+#: ../mail/message-list.c:4224
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4226
+msgid "There are no messages in this folder."
+msgstr "此文件夹中没有信件。"
+
#: ../mail/message-list.etspec.h:3
msgid "Due By"
msgstr "延期"
@@ -14790,39 +15581,39 @@ msgstr "已发信件"
msgid "Size"
msgstr "大小"
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
msgid "Call"
msgstr "呼叫"
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
msgid "Do Not Forward"
msgstr "不要转发"
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
msgid "Follow-Up"
msgstr "跟随"
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
msgid "For Your Information"
msgstr "给您的信息"
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
msgid "Forward"
msgstr "转发"
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
msgid "No Response Necessary"
msgstr "不必回复"
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
msgid "Reply"
msgstr "回复"
-#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
msgid "Reply to All"
msgstr "全部回复"
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
msgid "Review"
msgstr "回顾"
@@ -14847,6 +15638,10 @@ msgid "Subject contains"
msgstr "主题含有"
#: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "主题或接收者含有"
+
+#: ../mail/searchtypes.xml.h:7
msgid "Subject or Sender contains"
msgstr "主题或发送者含有"
@@ -14859,33 +15654,22 @@ msgid "Provides core functionality for local address books."
msgstr "提供本地地址簿的核心功能。"
#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "启用附件提醒插件"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "启用附件提醒插件。"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
msgid ""
"List of clues for the attachment reminder plugin to look for in a message "
"body"
msgstr "消息主体中的用于附件提醒插件的线索列表"
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
msgid ""
"List of clues for the attachment reminder plugin to look for in a message "
"body."
msgstr "消息主体中的用于附件提醒插件的线索列表。"
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
msgid "Keywords"
msgstr "关键字"
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "提醒缺少的附件(_M)"
-
#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
msgid "Attachment Reminder"
@@ -14907,9 +15691,9 @@ msgstr "Evolution 找到一些关键字表明此信件应当包含附件,但
msgid "Message has no attachments"
msgstr "信件无附件"
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "继续编辑(_C)"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr "编辑信件(_E)"
#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
msgid ""
@@ -14922,27 +15706,27 @@ msgstr ""
msgid "Audio inline plugin"
msgstr "内嵌音频插件"
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:127
msgid "Select name of the Evolution backup file"
msgstr "选择 Evolution 备份文件名称"
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:156
msgid "_Restart Evolution after backup"
msgstr "备份后重新启动 Evolution(_R)"
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:179
msgid "Select name of the Evolution backup file to restore"
msgstr "选择要恢复的 Evolution 备份文件名称"
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:203
msgid "_Restart Evolution after restore"
msgstr "恢复后重新启动 Evolution(_R)"
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:276
msgid "Restore from backup"
msgstr "从备份中恢复"
-#: ../plugins/backup-restore/backup-restore.c:238
+#: ../plugins/backup-restore/backup-restore.c:278
msgid ""
"You can restore Evolution from your backup. It can restore all the Mails, "
"Calendars, Tasks, Memos, Contacts. \n"
@@ -14952,95 +15736,119 @@ msgstr ""
"人。\n"
"它还能恢复您的所有的个人设置和邮件过滤器等。"
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:284
msgid "_Restore Evolution from the backup file"
msgstr "从备份文件中恢复 Evolution(_R)"
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:291
msgid "Please select an Evolution Archive to restore:"
msgstr "选择要恢复的 Evolution 存档:"
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:294
msgid "Choose a file to restore"
msgstr "选择要恢复的文件"
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:66
msgid "Backup Evolution directory"
msgstr "备份 Evolution 目录"
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:68
msgid "Restore Evolution directory"
msgstr "恢复 Evolution 目录"
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:70
msgid "Check Evolution Backup"
msgstr "检查 Evolution 备份"
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:72
msgid "Restart Evolution"
msgstr "重新启动 Evolution"
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:74
msgid "With Graphical User Interface"
msgstr "带图形用户界面"
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
msgid "Shutting down Evolution"
msgstr "关闭 Evolution"
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:132
msgid "Backing Evolution accounts and settings"
msgstr "备份 Evolution 的账户及设置"
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:136
msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
msgstr "备份 Evolution 数据(邮件、联系人、日历、任务、备忘)"
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:147
msgid "Backup complete"
msgstr "备份完成"
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
msgid "Restarting Evolution"
msgstr "重新启动 Evolution"
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:262
msgid "Backup current Evolution data"
msgstr "备份当前 Evolution 数据"
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:267
msgid "Extracting files from backup"
msgstr "从备份中提取文件"
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:274
msgid "Loading Evolution settings"
msgstr "装入 Evolution 的设置"
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:278
msgid "Removing temporary backup files"
msgstr "删除临时备份文件"
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:285
+msgid "Ensuring local sources"
+msgstr "确保本地源"
+
+#: ../plugins/backup-restore/backup.c:455
#, c-format
msgid "Backing up to the folder %s"
msgstr "正在备份到文件夹 %s"
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:460
#, c-format
msgid "Restoring from the folder %s"
msgstr "正在从文件夹 %s 中恢复"
#. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
msgid "Evolution Backup"
msgstr "Evolution 备份"
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
msgid "Evolution Restore"
msgstr "Evolution 恢复"
+#: ../plugins/backup-restore/backup.c:514
+msgid "Backing up Evolution Data"
+msgstr "正在备份 Evolution 数据"
+
+#: ../plugins/backup-restore/backup.c:515
+msgid "Please wait while Evolution is backing up your data."
+msgstr "请稍候,Evolution 正在备份您的数据。"
+
+#: ../plugins/backup-restore/backup.c:517
+msgid "Restoring Evolution Data"
+msgstr "正在恢复 Evolution 数据"
+
+#: ../plugins/backup-restore/backup.c:518
+msgid "Please wait while Evolution is restoring your data."
+msgstr "请稍候,Evolution 正在恢复您的数据。"
+
+#: ../plugins/backup-restore/backup.c:536
+msgid "This may take a while depending on the amount of data in your account."
+msgstr "这可能要花一点时间,取决于您帐户中的数据总量。"
+
#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
msgid "A plugin for backing up and restore Evolution data and settings."
msgstr "备份及恢复 Evolution 数据和设置的插件。"
@@ -15071,14 +15879,22 @@ msgstr ""
"钮。"
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr "权限不够"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
msgid "Invalid Evolution backup file"
msgstr "无效的 Evolution 备份文件"
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
msgid "Please select a valid backup file to restore."
msgstr "请选择要恢复的有效备份文件。"
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "The selected folder is not writable."
+msgstr "选中的文件夹不可写。"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
msgid ""
"This will delete all your current Evolution data and settings and restore "
"them from your backup. Evolution restore can start only when Evolution is "
@@ -15102,44 +15918,41 @@ msgstr "恢复设置(_E)..."
msgid "_Backup Settings..."
msgstr "备份设置(_B)..."
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr "自动联系人"
#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
msgstr "回复邮件时自动在地址簿中创建联系人项(_A)"
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
msgid "Select Address book for Automatic Contacts"
msgstr "选择自动联系人的地址簿"
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
msgid "Instant Messaging Contacts"
msgstr "即时通讯联系人"
#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
msgstr "定时从 Pidgin 好友列表中同步联系人信息和图像"
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
msgid "Select Address book for Pidgin buddy list"
msgstr "选择 Pidgin 好友列表的地址簿"
#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
msgid "Synchronize with _buddy list now"
msgstr "立即同步好友列表(_B)"
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
msgid ""
-"Automatically fills your addressbook with names and email addresses as you "
+"Automatically fills your address book with names and email addresses as you "
"reply to messages. Also fills in IM contact information from your buddy "
"lists."
msgstr ""
@@ -15150,7 +15963,28 @@ msgstr ""
msgid "BBDB"
msgstr "BBDB"
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#, fuzzy, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "打印时发生了错误"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
msgid "Convert message text to _Unicode"
msgstr "将信件文本转换为 _Unicode"
@@ -15170,20 +16004,25 @@ msgid "Bogofilter Options"
msgstr "Bogofilter 选项"
#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "Bogofilter 垃圾选项"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
msgid "Filters junk messages using Bogofilter."
-msgstr "使用 Bogofilter 过滤垃圾信件"
+msgstr "使用 Bogofilter 过滤垃圾信件。"
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
msgid "CalDAV"
msgstr "CalDAV"
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:135
+#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/calendar-http/calendar-http.c:126
msgid "_URL:"
msgstr "_URL:"
-#: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../plugins/caldav/caldav-source.c:271
+#: ../plugins/google-account-setup/google-source.c:618
+#: ../plugins/google-account-setup/google-contacts-source.c:301
msgid "Use _SSL"
msgstr "使用 _SSL"
@@ -15203,17 +16042,18 @@ msgstr "装入日历"
msgid "Provides core functionality for local calendars."
msgstr "提供本地日历的核心功能。"
-#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-http/calendar-http.c:264
#: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:375
-msgid "_Refresh:"
-msgstr "刷新(_R):"
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
+msgid "Re_fresh:"
+msgstr "刷新(_F):"
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
msgid "_Secure connection"
msgstr "安全连接(_S)"
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
msgid "Userna_me:"
msgstr "用户名(_M):"
@@ -15310,14 +16150,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
msgstr "您是否想要将 Evolution 设置为您的默认电子邮件客户端?"
#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:626
+#: ../shell/main.c:585
msgid "Evolution"
msgstr "Evolution"
-#: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "标为默认文件夹(_D)"
+#: ../plugins/default-source/default-source.c:82
+msgid "Mark as _default address book"
+msgstr "标为默认地址簿(_D)"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default calendar"
+msgstr "标为默认日历(_D)"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default task list"
+msgstr "标为默认任务列表(_D)"
+
+#: ../plugins/default-source/default-source.c:105
+msgid "Mark as _default memo list"
+msgstr "标为默认备忘列表(_D)"
#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
msgid "Default Sources"
@@ -15325,10 +16176,54 @@ msgstr "默认源"
#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
msgid ""
-"Provides functionality for marking a calendar or an addressbook as the "
+"Provides functionality for marking a calendar or an address book as the "
"default one."
msgstr "提供了将日历或地址簿标为默认日历或地址簿的功能。"
+#: ../plugins/email-custom-header/email-custom-header.c:558
+msgid "_Custom Header"
+msgstr "自定义信头(_C)"
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+msgid "Key"
+msgstr "键"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "值"
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr "自定义信头"
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Adds custom header to outgoing messages."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "自定义信头"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "自定义信头列表"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+
#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
msgid "Open Other User's Folder"
msgstr "打开其他用户的文件夹"
@@ -15346,32 +16241,32 @@ msgid "_User:"
msgstr "用户(_U):"
#. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
msgid "Secure Password"
msgstr "安全密码"
#. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
msgid ""
"This option will connect to the Exchange server using secure password (NTLM) "
"authentication."
msgstr "此选项将使用安全密码(NTLM)身份验证连接到 Exchange 服务器。"
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
msgid "Plaintext Password"
msgstr "纯文本密码"
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
msgid ""
"This option will connect to the Exchange server using standard plaintext "
"password authentication."
msgstr "此选项将使用标准的纯文本密码身份验证连接到 Exchange 服务器。"
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
msgid "Out Of Office"
msgstr "办公室以外"
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
msgid ""
"The message specified below will be automatically sent to \n"
"each person who sends mail to you while you are out of the office."
@@ -15379,83 +16274,87 @@ msgstr ""
"在您位于办公室外时,如果有人给您发送邮件,则会自动将下面指定的信件\n"
"送回。"
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
msgid "I am out of the office"
msgstr "我正在办公室外"
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
msgid "I am in the office"
msgstr "我正在办公室内"
#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
msgid "Change the password for Exchange account"
msgstr "更改 Exchange 账户的密码"
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
msgid "Change Password"
msgstr "更改密码"
#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
msgid "Manage the delegate settings for Exchange account"
msgstr "管理 Exchange 账户的代理设置"
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
msgid "Delegation Assistant"
msgstr "代理助手"
#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
msgid "Miscelleneous"
msgstr "杂项"
#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
msgid "View the size of all Exchange folders"
msgstr "查看所有 Exchange 文件夹的大小"
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
msgid "Folders Size"
msgstr "文件夹大小"
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
msgid "Exchange Settings"
msgstr "Exchange 设置"
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
msgid "_OWA URL:"
msgstr "_OWA URL:"
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
msgid "A_uthenticate"
msgstr "身份验证(_U)"
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "邮件(_M):"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
msgid "_Authentication Type"
msgstr "身份验证类型(_A)"
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
msgid "Ch_eck for Supported Types"
msgstr "检查支持的类型(_E)"
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
#: ../plugins/exchange-operations/exchange-contacts.c:212
#, c-format
msgid "%s KB"
msgstr "%s KB"
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
#: ../plugins/exchange-operations/exchange-contacts.c:214
#, c-format
msgid "0 KB"
msgstr "0 KB"
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-calendar.c:192
#: ../plugins/exchange-operations/exchange-contacts.c:165
msgid ""
"Evolution is in offline mode. You cannot create or modify folders now.\n"
@@ -15467,13 +16366,13 @@ msgstr ""
#. User entered a wrong existing
#. * password. Prompt him again.
#.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
+#: ../plugins/exchange-operations/exchange-change-password.c:114
msgid ""
"The current password does not match the existing password for your account. "
"Please enter the correct password"
msgstr "当前密码与您账户的已有密码不匹配。请输入正确的密码。"
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:121
msgid "The two passwords do not match. Please re-enter the passwords."
msgstr "两个密码不匹配。请重新输入密码。"
@@ -15493,38 +16392,38 @@ msgstr "新建密码:"
msgid "Your current password has expired. Please change your password now."
msgstr "您目前的密码已经过期。请立即更改您的密码。"
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:660
#, c-format
msgid "Your password will expire in the next %d days"
msgstr "您的密码即将于 %d 后过期"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
msgid "Custom"
msgstr "自定义"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
msgid "Editor (read, create, edit)"
msgstr "编辑(读取、创建、编辑)"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
msgid "Author (read, create)"
msgstr "作者(读取、创建)"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
msgid "Reviewer (read-only)"
msgstr "复查者(只读)"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
msgid "Delegate Permissions"
msgstr "代理权限"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
#, c-format
msgid "Permissions for %s"
msgstr "%s 的权限"
@@ -15532,7 +16431,7 @@ msgstr "%s 的权限"
#. To translators: This is a part of the message to be sent to the delegatee
#. summarizing the permissions assigned to him.
#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
msgid ""
"This message was sent automatically by Evolution to inform you that you have "
"been designated as a delegate. You can now send messages on my behalf."
@@ -15542,66 +16441,66 @@ msgstr ""
#. To translators: Another chunk of the same message.
#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
msgid "You have been given the following permissions on my folders:"
msgstr "你在我的文件夹上拥有下列权限:"
#. To translators: This message is included if the delegatee has been given access
#. to the private items.
#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
msgid "You are also permitted to see my private items."
msgstr "你还可以查看我的私人项目。"
#. To translators: This message is included if the delegatee has not been given access
#. to the private items.
#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
msgid "However you are not permitted to see my private items."
msgstr "但是你不能查看我的私人项目。"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
#, c-format
msgid "You have been designated as a delegate for %s"
msgstr "您现在已经被授权为 %s 的代理人"
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
msgid "Delegate To"
msgstr "授权给"
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:582
#, c-format
msgid "Remove the delegate %s?"
msgstr "删除代理人 %s 吗?"
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:700
msgid "Could not access Active Directory"
msgstr "无法访问 Active Directory"
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:712
msgid "Could not find self in Active Directory"
msgstr "无法在 Active Directory 中找到自己"
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:725
#, c-format
msgid "Could not find delegate %s in Active Directory"
msgstr "无法在 Active Directory 中找到代理人 %s"
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:737
#, c-format
msgid "Could not remove delegate %s"
msgstr "无法删除代理人 %s"
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:797
msgid "Could not update list of delegates."
msgstr "无法更新代理人。"
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:815
#, c-format
msgid "Could not add delegate %s"
msgstr "无法添加代理人 %s"
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:983
msgid "Error reading delegates list."
msgstr "读取代理人列表出错。"
@@ -15647,20 +16546,25 @@ msgstr "总结权限(_S)"
msgid "_Tasks:"
msgstr "任务(_T):"
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
msgid "Permissions..."
msgstr "权限..."
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
msgid "Folder Name"
msgstr "文件夹名称"
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
msgid "Folder Size"
msgstr "文件夹大小"
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+msgid "User"
+msgstr "用户"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
msgid "Subscribe to Other User's Folder"
msgstr "订阅其他用户的文件夹"
@@ -15669,20 +16573,20 @@ msgstr "订阅其他用户的文件夹"
msgid "Exchange Folder Tree"
msgstr "Exchange 文件夹树"
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:235
-#: ../plugins/exchange-operations/exchange-folder.c:245
+#: ../plugins/exchange-operations/exchange-folder.c:67
+#: ../plugins/exchange-operations/exchange-folder.c:236
+#: ../plugins/exchange-operations/exchange-folder.c:246
msgid "Unsubscribe Folder..."
msgstr "退订文件夹..."
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:466
+#: ../plugins/exchange-operations/exchange-folder.c:521
#, c-format
msgid "Really unsubscribe from folder \"%s\"?"
msgstr "真的要退订文件夹“%s”吗?"
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:478
+#: ../plugins/exchange-operations/exchange-folder.c:533
#, c-format
msgid "Unsubscribe from \"%s\""
msgstr "退订“%s”"
@@ -15746,15 +16650,18 @@ msgstr "您的密码即将于 7 天后过期..."
msgid "_Change Password"
msgstr "更改密码(_C)"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
msgid "(Permission denied.)"
msgstr "(权限被禁止。)"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
msgid "Add User:"
msgstr "添加用户:"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-send-options.c:410
+#: ../plugins/groupwise-features/proxy.c:934
+#: ../plugins/groupwise-features/share-folder.c:715
msgid "Add User"
msgstr "添加用户"
@@ -15872,15 +16779,11 @@ msgstr "敏感度(_S):"
msgid "_User"
msgstr "用户(_U)"
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "用户按钮"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
msgid "Select User"
msgstr "选择用户"
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
msgid "Address Book..."
msgstr "地址簿..."
@@ -15894,9 +16797,9 @@ msgstr "订阅其他用户的日历"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
+"A plugin that manages a collection of Exchange account specific operations "
"and features."
-msgstr "包含若干 Exchange 帐户特定操作和特性的插件。"
+msgstr "管理一组 Exchange 帐户特定操作和特性的插件。"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
msgid "Exchange Operations"
@@ -15982,10 +16885,14 @@ msgid "Could not update out-of-office state"
msgstr "无法更新不在办公室状态"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
msgid "Exchange Account is offline."
msgstr "Exchange 账户脱机。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
msgid ""
"Exchange Connector requires access to certain\n"
"functionality on the Exchange Server that appears\n"
@@ -16009,102 +16916,102 @@ msgstr ""
"{0}\n"
" "
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
msgid "Failed to update delegates:"
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 already exists"
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 does not exist"
msgstr "文件夹不存在"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
msgid "Folder offline"
msgstr "文件夹脱机"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
msgid "Generic error"
msgstr "常规错误"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
msgid "Global Catalog Server is not reachable"
msgstr "全局目录服务器无法访问"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
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:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
msgid "Mailbox for {0} is not on this server."
msgstr "{0} 的邮箱不在此服务器上。"
-#: ../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 URL is correct and try again."
msgstr "请确定 URL 正确,然后再试一次。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
msgid "Make sure the server name is spelled correctly and try again."
msgstr "请确定服务器名称拼写正确,然后再试一次。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
msgid "Make sure the username and password are correct and try again."
msgstr "请确定用户名和密码正确,然后再试一次。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
msgid "No Global Catalog server configured for this account."
msgstr "没有为此账户配置全局编目服务器。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
msgid "No mailbox for user {0} on {1}."
msgstr "用户 {0} 在 {1} 上没有邮箱。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
msgid "No such user {0}"
msgstr "没有用户 {0}"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
msgid "Password successfully changed."
msgstr "密码已经成功更改。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
msgstr "请输入一个代理人 ID 或取消选中“以代理人身份发送”选项。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
msgid "Please make sure the Global Catalog Server name is correct."
msgstr "请确定全局目录服务器名称正确。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
msgid "Please restart Evolution for changes to take effect"
msgstr "请重新启动 Evolution 以便使得更改生效"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
msgid "Please select a user."
msgstr "请选择用户。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
msgid "Server rejected password because it is too weak."
msgstr "服务器拒绝了密码,因为该密码的安全级别太低。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
msgid "The Exchange account will be disabled when you quit Evolution"
msgstr "当您退出 Evolution 时,Exchange 账户将被禁用"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
msgid "The Exchange account will be removed when you quit Evolution"
msgstr "当您退出 Evolution 时 Exchange 账户将被删除"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
msgid "The Exchange server is not compatible with Exchange Connector."
msgstr "Exchange 服务器与 Exchange Connector 不兼容。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
msgid ""
"The server is running Exchange 5.5. Exchange Connector \n"
"supports Microsoft Exchange 2000 and 2003 only."
@@ -16112,7 +17019,7 @@ msgstr ""
"服务器正在运行 Exchange 5.5。Exchange Connector 只支持 Microsoft Exchange "
"2000 和 2003。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
msgid ""
"This probably means that your server requires \n"
"you to specify the Windows domain name \n"
@@ -16125,87 +17032,88 @@ msgstr ""
"\n"
"或者,您可能拼错了密码。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
msgid "Try again with a different password."
msgstr "请用不同的密码再试一次。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
msgid "Unable to add user to access control list:"
msgstr "无法将用户添加到访问控制列表中:"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
msgid "Unable to edit delegates."
msgstr "无法编辑代理人。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
msgid "Unknown error looking up {0}"
msgstr "查阅 {0} 时发生未知错误"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/google-account-setup/google-source.c:543
msgid "Unknown error."
msgstr "未知错误。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
msgid "Unknown type"
msgstr "未知类型"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
msgid "Unsupported operation"
msgstr "不支持的操作"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
msgid "You are nearing your quota available for storing mail on this server."
msgstr "您即将用完您在此服务器上的存储邮件的配额。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
msgid ""
"You are permitted to send a message on behalf of only one delegator at a "
"time."
msgstr "您被允许每次只能够以一个(而非多个)代理人的身份发送信件。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
msgid "You cannot make yourself your own delegate"
msgstr "您不能授权给您自己"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
msgid "You have exceeded your quota for storing mail on this server."
msgstr "您已经超过了在此服务器上存储邮件的配额。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
msgid "You may only configure a single Exchange account."
msgstr "您只能配置单个 Exchange 账户。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
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:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
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:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
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:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
msgid "Your password has expired."
msgstr "您的密码已经过期。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
msgid "{0} cannot be added to an access control list"
msgstr "{0} 无法添加到访问控制列表中"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
msgid "{0} is already a delegate"
msgstr "{0} 已被授权"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
msgid "{0} is already in the list"
msgstr "{0} 已经在列表中"
@@ -16217,35 +17125,74 @@ msgstr "订阅其他用户的任务"
msgid "Check folder permissions"
msgstr "更改文件夹权限"
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "默认外部编辑器"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr "默认命令必须用作编辑器。"
+
#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
msgid ""
"A plugin for using an external editor as the composer. You can send only "
"plain-text messages."
-msgstr ""
-"一个使用外部编辑器作为撰写器的插件。您只能发送纯文本信件。"
+msgstr "一个使用外部编辑器作为撰写器的插件。您只能发送纯文本信件。"
#. the path to the shared library
#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
msgid "External Editor"
msgstr "外部编辑器"
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "无法创建临时保存文件"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr "编辑器不可调用"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr "Evolution 无法创建临时文件来保存您的邮件。请稍候再试。"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr "您在插件首选项中设定的外部编辑器无法调用,请尝试设置另外一个编辑器。"
+
#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "在外部编辑器中写作"
+msgid "Compose in _External Editor"
+msgstr "在外部编辑器中写作(_E)"
#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
msgid "Compose messages using an external editor"
msgstr "使用外部编辑器写作信件"
-#: ../plugins/face/face.c:57
+#: ../plugins/external-editor/external-editor.c:112
+msgid "Command to be executed to launch the editor: "
+msgstr "调用编辑器要执行的命令:"
+
+#: ../plugins/external-editor/external-editor.c:113
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+"Emacs 应使用“xemacs”\n"
+"VI 应使用“gvim”"
+
+#: ../plugins/face/face.c:59
msgid "Select a (48*48) png of size < 700bytes"
msgstr "选择一个小于 700B 的 48*48 的 PNG 图像"
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:69
msgid "PNG files"
msgstr "PNG 文件"
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:126
msgid "_Face"
msgstr "头像(_F)"
@@ -16280,20 +17227,52 @@ msgstr "退订文件夹"
msgid "_Unsubscribe"
msgstr "退订(_U)"
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:83
+#: ../plugins/google-account-setup/google-source.c:90
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
msgid "Google"
msgstr "Google"
+#: ../plugins/google-account-setup/google-source.c:439
+msgid "Please enter user name first."
+msgstr "请先输入用户名。"
+
+#: ../plugins/google-account-setup/google-source.c:443
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr "输入用户 %s 的密码以便访问已订阅日历的列表。"
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr "无法从 Google 服务器上读取数据。\n%s"
+
+#: ../plugins/google-account-setup/google-source.c:693
+msgid "Cal_endar:"
+msgstr "日历(_E):"
+
+#: ../plugins/google-account-setup/google-source.c:728
+msgid "Retrieve _list"
+msgstr "获取列表(_L)"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+msgid "<b>Server</b>"
+msgstr "<b>服务器</b>"
+
#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "设置 Google 日历源的插件。"
+msgid "A plugin to setup google calendar and contacts."
+msgstr "设置 Google 日历和联系人的插件。"
#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
msgid "Google sources"
msgstr "Google 源"
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
msgid "Checklist"
msgstr "待办清单"
@@ -16338,16 +17317,16 @@ msgstr "安装共享文件夹"
msgid "Shared Folder Installation"
msgstr "共享文件夹安装"
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
msgid "Junk Settings"
msgstr "垃圾邮件设置"
-#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-mail-settings.c:93
#: ../plugins/groupwise-features/junk-settings.glade.h:3
msgid "Junk Mail Settings"
msgstr "垃圾邮件设置"
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
msgid "Junk Mail Settings..."
msgstr "垃圾邮件设置..."
@@ -16373,10 +17352,21 @@ msgid "_Junk List"
msgstr "垃圾测试(_J)"
#: ../plugins/groupwise-features/mail-retract.c:53
+#, fuzzy
+msgid "Message Retract"
+msgstr "信件状态"
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:77
msgid "Message retracted successfully"
msgstr "邮件成功收回"
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
msgid "Retract Mail"
msgstr "收回邮件"
@@ -16384,12 +17374,6 @@ msgstr "收回邮件"
msgid "Add Send Options to groupwise messages"
msgstr "将发送选项添加到 GroupWise 信件"
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "发送选项"
-
#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
msgid "A plugin for the features in Groupwise accounts."
msgstr "Groupwise 账户特性的插件。"
@@ -16398,7 +17382,80 @@ msgstr "Groupwise 账户特性的插件。"
msgid "Groupwise Features"
msgstr "Groupwise 特性"
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+msgid "Message retract failed"
+msgstr "邮件收回失败"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+#, fuzzy
+msgid "The server did not allow the selected message to be retracted."
+msgstr "将选中邮件转换为新任务"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+msgid "Invalid user"
+msgstr "无效用户"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#, fuzzy
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "无法保存到文件“{0}”。"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+msgid "Specify User"
+msgstr "指定用户"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#, fuzzy
+msgid "You have already given proxy permissions to this user."
+msgstr "你在我的文件夹上拥有下列权限:"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
+#, fuzzy
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "已经存在名为“{0}”的文件夹。请使用不同的名称。"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+msgid "Account Already Exists"
+msgstr "帐户已经存在"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#, fuzzy
+msgid "This is a recurring meeting"
+msgstr "将此事件标为重复发生"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#, fuzzy
+msgid "Would you like to accept it?"
+msgstr "您希望保存更改吗?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#, fuzzy
+msgid "Would you like to decline it?"
+msgstr "您希望保存更改吗?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#, fuzzy
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "无法保存到自动保存文件“{0}”。"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+msgid "You have to specify a user name whom you want to add to the list"
+msgstr ""
+
+#: ../plugins/groupwise-features/process-meeting.c:52
msgid "Accept Tentatively"
msgstr "暂时接受"
@@ -16415,7 +17472,7 @@ msgid "Con_tacts..."
msgstr "联系人(_T)..."
#: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/table/e-table-click-to-add.c:516
msgid "Message"
msgstr "消息"
@@ -16496,9 +17553,9 @@ msgstr "<b>账户名</b>"
msgid "Proxy Login"
msgstr "代理服务器登录"
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
#: ../plugins/groupwise-features/send-options.c:83
#, c-format
msgid "%sEnter password for %s (user %s)"
@@ -16507,40 +17564,44 @@ msgstr "%s输入 %s 的密码(用户 %s)"
#. 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:521
+#: ../plugins/groupwise-features/proxy-login.c:509
msgid "_Proxy Login..."
msgstr "代理服务器登录(_P)..."
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
msgid "The Proxy tab will be available only when the account is online."
msgstr "代理服务器标签仅当账户联机时才可用。"
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
msgid "The Proxy tab will be available only when the account is enabled."
msgstr "代理服务器标签仅当账户启用时才可用。"
-#: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:750
msgid "Users"
msgstr "用户"
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
msgid "Enter the users and set permissions"
msgstr "输入用户及设定权限"
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
msgid "New _Shared Folder..."
msgstr "新建共享文件夹(_S)..."
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
msgid "Sharing"
msgstr "共享"
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "自定义通知"
+
+#: ../plugins/groupwise-features/share-folder.c:755
msgid "Add "
msgstr "添加"
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
msgid "Modify"
msgstr "修改"
@@ -16605,11 +17666,11 @@ msgstr "设置 Hula 日历源的插件。"
msgid "Hula Account Setup"
msgstr "Hula 账户设置"
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
msgid "Custom Headers"
msgstr "自定义信头"
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
msgid "IMAP Headers"
msgstr "IMAP 信头"
@@ -16662,28 +17723,28 @@ msgstr "实现 IMAP 账户特性的插件。"
msgid "IMAP Features"
msgstr "IMAP 特性"
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
msgid "_Import to Calendar"
msgstr "导入到日历(_I)"
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
msgid "_Import to Tasks"
msgstr "导入到任务(_I)"
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
msgid "Import ICS"
msgstr "导入 ICS"
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
msgid "Select Task List"
msgstr "选择任务列表"
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
msgid "Select Calendar"
msgstr "选择日历"
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
msgid "_Import"
msgstr "导入(_I)"
@@ -16719,13 +17780,14 @@ msgid ""
msgstr ""
"Evolution 找不到要同步的 iPod。您可能没有将其连接到系统,或者没有开机。"
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
msgid "iCalendar format (.ics)"
msgstr "iCalendar 格式(.ics)"
#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
msgstr "将选中的任务/备忘/日历/地址簿与 Apple iPod 同步"
#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
@@ -16736,602 +17798,602 @@ msgstr "同步到 iPod"
msgid "iPod Synchronization"
msgstr "iPod 同步"
-#: ../plugins/itip-formatter/itip-formatter.c:439
-#: ../plugins/itip-formatter/itip-formatter.c:564
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
#, c-format
msgid "Failed to load the calendar '%s'"
msgstr "装入日历“%s”失败"
-#: ../plugins/itip-formatter/itip-formatter.c:584
+#: ../plugins/itip-formatter/itip-formatter.c:588
#, c-format
msgid "An appointment in the calendar '%s' conflicts with this meeting"
msgstr "日历“%s”中的一个约会与此会议冲突"
-#: ../plugins/itip-formatter/itip-formatter.c:610
+#: ../plugins/itip-formatter/itip-formatter.c:614
#, c-format
msgid "Found the appointment in the calendar '%s'"
msgstr "在日历“%s”中找到了约会"
-#: ../plugins/itip-formatter/itip-formatter.c:686
+#: ../plugins/itip-formatter/itip-formatter.c:690
msgid "Unable to find any calendars"
msgstr "无法找到任何日历"
-#: ../plugins/itip-formatter/itip-formatter.c:693
+#: ../plugins/itip-formatter/itip-formatter.c:697
msgid "Unable to find this meeting in any calendar"
msgstr "无法在任何日历中找到此会议"
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:701
msgid "Unable to find this task in any task list"
msgstr "无法在任何任务列表中找到此任务"
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:705
msgid "Unable to find this memo in any memo list"
msgstr "无法在任何备忘列表中找到此备忘"
-#: ../plugins/itip-formatter/itip-formatter.c:772
+#: ../plugins/itip-formatter/itip-formatter.c:776
msgid "Searching for an existing version of this appointment"
msgstr "搜索此约会的已有版本"
-#: ../plugins/itip-formatter/itip-formatter.c:935
+#: ../plugins/itip-formatter/itip-formatter.c:945
msgid "Unable to parse item"
msgstr "无法分析项目"
-#: ../plugins/itip-formatter/itip-formatter.c:993
+#: ../plugins/itip-formatter/itip-formatter.c:1003
#, c-format
msgid "Unable to send item to calendar '%s'. %s"
msgstr "无法将项目发送到日历“%s”。%s"
-#: ../plugins/itip-formatter/itip-formatter.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:1015
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "将日历“%s”发送为已接受"
-#: ../plugins/itip-formatter/itip-formatter.c:1009
+#: ../plugins/itip-formatter/itip-formatter.c:1019
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "将日历“%s”发送为待定"
-#: ../plugins/itip-formatter/itip-formatter.c:1014
+#: ../plugins/itip-formatter/itip-formatter.c:1024
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "将日历“%s”发送为已拒绝"
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1029
#, c-format
msgid "Sent to calendar '%s' as canceled"
msgstr "将日历“%s”发送为已取消"
-#: ../plugins/itip-formatter/itip-formatter.c:1113
+#: ../plugins/itip-formatter/itip-formatter.c:1123
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "组织者已经删除了代理人 %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1120
+#: ../plugins/itip-formatter/itip-formatter.c:1130
msgid "Sent a cancelation notice to the delegate"
msgstr "已给代理人发送了取消通知"
-#: ../plugins/itip-formatter/itip-formatter.c:1122
+#: ../plugins/itip-formatter/itip-formatter.c:1132
msgid "Could not send the cancelation notice to the delegate"
msgstr "无法给代理人发送取消通知"
-#: ../plugins/itip-formatter/itip-formatter.c:1207
+#: ../plugins/itip-formatter/itip-formatter.c:1218
msgid "Attendee status could not be updated because the status is invalid"
msgstr "出席者状态无法更新,原因是状态无效"
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1245
#, c-format
msgid "Unable to update attendee. %s"
msgstr "无法更新出席者。%s"
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1249
msgid "Attendee status updated"
msgstr "出席者状态已更新"
-#: ../plugins/itip-formatter/itip-formatter.c:1263
+#: ../plugins/itip-formatter/itip-formatter.c:1275
msgid "Meeting information sent"
msgstr "会议信息已发送"
-#: ../plugins/itip-formatter/itip-formatter.c:1266
+#: ../plugins/itip-formatter/itip-formatter.c:1278
msgid "Task information sent"
msgstr "任务信息已发送"
-#: ../plugins/itip-formatter/itip-formatter.c:1269
+#: ../plugins/itip-formatter/itip-formatter.c:1281
msgid "Memo information sent"
msgstr "备忘信息已发送"
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1290
msgid "Unable to send meeting information, the meeting does not exist"
msgstr "无法发送会议信息,会议不存在"
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1293
msgid "Unable to send task information, the task does not exist"
msgstr "无法发送任务信息,任务不存在"
-#: ../plugins/itip-formatter/itip-formatter.c:1284
+#: ../plugins/itip-formatter/itip-formatter.c:1296
msgid "Unable to send memo information, the memo does not exist"
msgstr "无法发送备忘信息,备忘不存在"
-#: ../plugins/itip-formatter/itip-formatter.c:1359
-#: ../plugins/itip-formatter/itip-formatter.c:1374
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
msgid "The calendar attached is not valid"
msgstr "附加的日历无效"
-#: ../plugins/itip-formatter/itip-formatter.c:1360
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
msgstr "信件声明其包含日历,但日历不是有效的 iCalendar。"
-#: ../plugins/itip-formatter/itip-formatter.c:1410
-#: ../plugins/itip-formatter/itip-formatter.c:1428
-#: ../plugins/itip-formatter/itip-formatter.c:1510
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
msgid "The item in the calendar is not valid"
msgstr "日历项无效"
-#: ../plugins/itip-formatter/itip-formatter.c:1411
-#: ../plugins/itip-formatter/itip-formatter.c:1429
-#: ../plugins/itip-formatter/itip-formatter.c:1511
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
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:1440
+#: ../plugins/itip-formatter/itip-formatter.c:1447
msgid "The calendar attached contains multiple items"
msgstr "附加的日历包含多个项目"
-#: ../plugins/itip-formatter/itip-formatter.c:1441
+#: ../plugins/itip-formatter/itip-formatter.c:1448
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
msgstr "要处理这些全部项目,应该保存文件并导入日历"
-#: ../plugins/itip-formatter/itip-formatter.c:2138
+#: ../plugins/itip-formatter/itip-formatter.c:2148
msgid "This meeting recurs"
msgstr "此会议重现"
-#: ../plugins/itip-formatter/itip-formatter.c:2141
+#: ../plugins/itip-formatter/itip-formatter.c:2151
msgid "This task recurs"
msgstr "此任务重现"
-#: ../plugins/itip-formatter/itip-formatter.c:2144
+#: ../plugins/itip-formatter/itip-formatter.c:2154
msgid "This memo recurs"
msgstr "此备忘重现"
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2383
msgid "_Delete message after acting"
msgstr "操作后删除消息(_D)"
-#: ../plugins/itip-formatter/itip-formatter.c:2369
-#: ../plugins/itip-formatter/itip-formatter.c:2401
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
msgid "Conflict Search"
msgstr "冲突搜索"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2384
+#: ../plugins/itip-formatter/itip-formatter.c:2408
msgid "Select the calendars to search for meeting conflicts"
msgstr "选择要搜索冲突会议的日历"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
msgid "Today"
msgstr "今天"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
msgid "Today %H:%M"
msgstr "今天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
msgid "Today %H:%M:%S"
msgstr "今天 %H:%M:%S"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:207
msgid "Today %l:%M:%S %p"
msgstr "今天%p%l:%M:%S"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:217
msgid "Tomorrow"
msgstr "明天"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
msgid "Tomorrow %H:%M"
msgstr "明天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
msgid "Tomorrow %H:%M:%S"
msgstr "明天 %H:%M:%S"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:231
msgid "Tomorrow %l:%M %p"
msgstr "明天%p%l:%M"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:235
msgid "Tomorrow %l:%M:%S %p"
msgstr "明天%p%l:%M:%S"
#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../plugins/itip-formatter/itip-view.c:254
#, c-format
msgid "%A"
msgstr "%A"
#. strftime format of a weekday and a
#. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:259
msgid "%A %H:%M"
msgstr "%A %H:%M"
#. strftime format of a weekday and a
#. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:266
+#: ../plugins/itip-formatter/itip-view.c:263
msgid "%A %H:%M:%S"
msgstr "%A %H:%M:%S"
#. strftime format of a weekday and a
#. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:268
msgid "%A %l:%M %p"
msgstr "%A%p%l:%M"
#. strftime format of a weekday and a
#. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:275
+#: ../plugins/itip-formatter/itip-view.c:272
msgid "%A %l:%M:%S %p"
msgstr "%A%p%l:%M:%S"
#. strftime format of a weekday and a date
#. without a year.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:281
msgid "%A, %B %e"
msgstr "%-m月%-d日%A"
#. strftime format of a weekday, a date
#. without a year and a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:287
msgid "%A, %B %e %H:%M"
msgstr "%-m月%-d日%A %H:%M"
#. strftime format of a weekday, a date without a year
#. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:291
msgid "%A, %B %e %H:%M:%S"
msgstr "%-m月%-d日%A %H:%M:%S"
#. strftime format of a weekday, a date without a year
#. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:296
msgid "%A, %B %e %l:%M %p"
msgstr "%-m月%-d日%A%p%l:%M"
#. strftime format of a weekday, a date without a year
#. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:300
msgid "%A, %B %e %l:%M:%S %p"
msgstr "%-m月%-d日%A%p%l:%M:%S"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
msgid "%A, %B %e, %Y"
msgstr "%Y年%-m月%-d日%A"
#. strftime format of a weekday, a date and a
#. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
msgid "%A, %B %e, %Y %H:%M"
msgstr "%Y年%-m月%-d日%A %H:%M"
#. strftime format of a weekday, a date and a
#. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
msgid "%A, %B %e, %Y %H:%M:%S"
msgstr "%Y年%-m月%-d日%A %H:%M:%S"
#. strftime format of a weekday, a date and a
#. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:320
msgid "%A, %B %e, %Y %l:%M %p"
msgstr "%Y年%-m月%-d日%A%p%l:%M"
#. strftime format of a weekday, a date and a
#. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:324
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%Y年%-m月%-d日%A%p%l:%M:%S"
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../plugins/itip-formatter/itip-view.c:349
+#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:525
#, c-format
msgid "Please respond on behalf of <b>%s</b>"
msgstr "请以 <b>%s</b> 的身份回应"
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
#, c-format
msgid "Received on behalf of <b>%s</b>"
msgstr "以 <b>%s</b> 的身份接收"
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:356
#, c-format
msgid "<b>%s</b> through %s has published the following meeting information:"
msgstr "<b>%s</b> 通过 %s 发布了会议信息:"
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
#, c-format
msgid "<b>%s</b> has published the following meeting information:"
msgstr "<b>%s</b> 发布了会议信息:"
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
#, c-format
msgid "<b>%s</b> has delegated the following meeting to you:"
msgstr "<b>%s</b> 为您代理了下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:366
#, c-format
msgid "<b>%s</b> through %s requests your presence at the following meeting:"
msgstr "<b>%s</b> 通过 %s 请求您参加下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:368
#, c-format
msgid "<b>%s</b> requests your presence at the following meeting:"
msgstr "<b>%s</b> 请求您参加下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:374
#, c-format
msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
msgstr "<b>%s</b> 通过 %s 希望加入到已有的会议:"
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting:"
msgstr "<b>%s</b> 希望加入到已有的会议:"
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:380
#, c-format
msgid ""
"<b>%s</b> through %s wishes to receive the latest information for the "
"following meeting:"
msgstr "<b>%s</b> 通过 %s 希望接收到下列会议的最新信息:"
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:382
#, c-format
msgid ""
"<b>%s</b> wishes to receive the latest information for the following meeting:"
msgstr "<b>%s</b> 希望接收到下列会议的最新信息:"
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:386
#, c-format
msgid "<b>%s</b> through %s has sent back the following meeting response:"
msgstr "<b>%s</b> 通过 %s 发回了下列会议请求的响应:"
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
#, c-format
msgid "<b>%s</b> has sent back the following meeting response:"
msgstr "<b>%s</b> 发回了下列会议请求的响应:"
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
#, c-format
msgid "<b>%s</b> through %s has canceled the following meeting:"
msgstr "<b>%s</b> 通过 %s 取消了下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
#, c-format
msgid "<b>%s</b> has canceled the following meeting."
msgstr "<b>%s</b> 取消了下列会议。"
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:398
#, c-format
msgid "<b>%s</b> through %s has proposed the following meeting changes."
msgstr "<b>%s</b> 通过 %s 提议了下列会议变更。"
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
#, c-format
msgid "<b>%s</b> has proposed the following meeting changes."
msgstr "<b>%s</b> 提议了下列会议变更。"
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:404
#, c-format
msgid "<b>%s</b> through %s has declined the following meeting changes:"
msgstr "<b>%s</b> 通过 %s 拒绝了下列会议变更:"
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:406
#, c-format
msgid "<b>%s</b> has declined the following meeting changes."
msgstr "<b>%s</b> 拒绝了下列会议变更。"
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:444
#, c-format
msgid "<b>%s</b> through %s has published the following task:"
msgstr "<b>%s</b> 通过 %s 发布了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
#, c-format
msgid "<b>%s</b> has published the following task:"
msgstr "<b>%s</b> 发布了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:451
#, c-format
msgid "<b>%s</b> requests the assignment of %s to the following task:"
msgstr "<b>%s</b> 请求给 %s 分配下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
#, c-format
msgid "<b>%s</b> through %s has assigned you a task:"
msgstr "<b>%s</b> 通过 %s 为您分配了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
#, c-format
msgid "<b>%s</b> has assigned you a task:"
msgstr "<b>%s</b> 为您分配了一个任务:"
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:462
#, c-format
msgid "<b>%s</b> through %s wishes to add to an existing task:"
msgstr "<b>%s</b> 通过 %s 希望加入到已有的任务:"
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
#, c-format
msgid "<b>%s</b> wishes to add to an existing task:"
msgstr "<b>%s<b> 希望加入到已存在的任务:"
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:468
#, c-format
msgid ""
"<b>%s</b> through %s wishes to receive the latest information for the "
"following assigned task:"
msgstr "<b>%s</b> 通过 %s 想要收到所分配的下列任务的最新信息:"
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:470
#, c-format
msgid ""
"<b>%s</b> wishes to receive the latest information for the following "
"assigned task:"
msgstr "<b>%s</b> 想要收到所分配的下列任务的最新信息:"
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
#, c-format
msgid ""
"<b>%s</b> through %s has sent back the following assigned task response:"
msgstr "<b>%s</b> 通过 %s 发回了下列分配任务的回应:"
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:476
#, c-format
msgid "<b>%s</b> has sent back the following assigned task response:"
msgstr "<b>%s</b> 发回了下列分配任务的回应:"
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:480
#, c-format
msgid "<b>%s</b> through %s has canceled the following assigned task:"
msgstr "<b>%s</b> 通过 %s 取消了下列任务分配:"
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
#, c-format
msgid "<b>%s</b> has canceled the following assigned task:"
msgstr "<b>%s</b> 取消分配的下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
#, c-format
msgid ""
"<b>%s</b> through %s has proposed the following task assignment changes:"
msgstr "<b>%s</b> 通过 %s 提议了下列任务分配变更:"
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
#, c-format
msgid "<b>%s</b> has proposed the following task assignment changes:"
msgstr "<b>%s</b> 提议了下列任务分配变更:"
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:492
#, c-format
msgid "<b>%s</b> through %s has declined the following assigned task:"
msgstr "<b>%s</b> 通过 %s 拒绝了下列任务分配:"
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
#, c-format
msgid "<b>%s</b> has declined the following assigned task:"
msgstr "<b>%s</b> 拒绝了分配的下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
#, c-format
msgid "<b>%s</b> through %s has published the following memo:"
msgstr "<b>%s</b> 通过 %s 发布了下列备忘:"
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
#, c-format
msgid "<b>%s</b> has published the following memo:"
msgstr "<b>%s</b> 发布了下列备忘:"
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:539
#, c-format
msgid "<b>%s</b> through %s wishes to add to an existing memo:"
msgstr "<b>%s</b> 通过 %s 希望加入到已有的备忘:"
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
#, c-format
msgid "<b>%s</b> wishes to add to an existing memo:"
msgstr "<b>%s</b> 希望加入到已有的备忘中:"
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:545
#, c-format
msgid "<b>%s</b> through %s has canceled the following shared memo:"
msgstr "<b>%s</b> 通过 %s 取消了下列共享备忘:"
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
#, c-format
msgid "<b>%s</b> has canceled the following shared memo:"
msgstr "<b>%s</b> 取消了下列共享备忘:"
#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
msgid "_Open Calendar"
msgstr "打开日历(_O)"
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:824
+#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:856
msgid "_Decline"
msgstr "拒绝(_D)"
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
msgid "_Accept"
msgstr "接受(_A)"
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
msgid "_Decline all"
msgstr "全部拒绝(_D)"
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
msgid "_Tentative all"
msgstr "全部待定(_T)"
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:857
msgid "_Tentative"
msgstr "待定(_T)"
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
msgid "_Accept all"
msgstr "全部接受(_A)"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
msgid "_Send Information"
msgstr "发送信息(_S)"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
msgid "_Update Attendee Status"
msgstr "更新与会者状态(_U)"
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
msgid "_Update"
msgstr "更新(_U)"
@@ -17432,9 +18494,9 @@ msgstr "新邮件到达时生成 D-Bus 信息。"
#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
msgid ""
-"If true, then beep, otherwise will play sound file when new messages arrive."
-msgstr ""
-"新信件到达时,此值如果为 true,则响铃,否则播放声音文件。"
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr "新信件到达时,此值如果为 true,则响铃,否则播放声音文件。"
#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
msgid "Notify new messages for Inbox only."
@@ -17480,8 +18542,16 @@ msgstr "是否只通知收件箱文件夹中的新信件。"
msgid "Generate a _D-Bus message"
msgstr "生成 _D-Bus 消息"
+#: ../plugins/mail-notification/mail-notification.c:377
+msgid "Evolution's Mail Notification"
+msgstr "Evolution 邮件通知"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+msgid "Mail Notification Properties"
+msgstr "邮件通知属性"
+
#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:457
#, c-format
msgid ""
"You have received %d new message\n"
@@ -17491,54 +18561,54 @@ msgid_plural ""
"in %s."
msgstr[0] "您在 %2$s 中收到了 %1$d 封新邮件。"
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
#, c-format
msgid "You have received %d new message."
msgid_plural "You have received %d new messages."
msgstr[0] "您收到了 %d 封新邮件。"
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
msgid "New email"
msgstr "新电子邮件"
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
msgid "Show icon in _notification area"
msgstr "在通知区显示图标(_N)"
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
msgid "B_link icon in notification area"
msgstr "闪烁通知区图标(_L)"
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
msgid "Popup _message together with the icon"
msgstr "同时弹出图标和消息(_M)"
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
msgid "_Play sound when new messages arrive"
msgstr "新邮件到达时播放声音(_P)"
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
msgid "_Beep"
msgstr "响铃(_B)"
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:734
msgid "Play _sound file"
msgstr "播放声音文件(_S)"
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
msgid "Specify _filename:"
msgstr "指定文件名(_F):"
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
msgid "Select sound file"
msgstr "选择声音文件"
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
msgid "Pl_ay"
msgstr "播放(_A)"
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
msgid "Notify new messages for _Inbox only"
msgstr "只通知收件箱中的新信件(_I)"
@@ -17566,17 +18636,16 @@ msgstr "转换为会议(_V)"
msgid "Mail to meeting"
msgstr "邮寄到会议"
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
#, c-format
msgid "Cannot open calendar. %s"
msgstr "无法打开日历。%s"
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
msgid ""
"Selected source is read only, thus cannot create task there. Select other "
"source, please."
-msgstr ""
-"选中的源是只读的,因此不能在此创建任务。请选择其它的源。"
+msgstr "选中的源是只读的,因此不能在此创建任务。请选择其它的源。"
#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
msgid ""
@@ -17677,7 +18746,7 @@ msgstr "把信件发送到邮件列表吗?"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
msgid ""
"The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
"\n"
"Header: {0}"
msgstr ""
@@ -17757,6 +18826,24 @@ msgstr "订阅列表(_S)"
msgid "_Unsubscribe from List"
msgstr "退订列表(_U)"
+#: ../plugins/mark-all-read/mark-all-read.c:39
+msgid "Also mark messages in subfolders?"
+msgstr "也标记的子文件夹中的信件吗?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:41
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr "您是想要只标记当前文件夹中的信件,还是也包括子文件夹中的信件?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:164
+msgid "Current Folder and _Subfolders"
+msgstr "当前文件夹及其子文件夹中(_S)"
+
+#: ../plugins/mark-all-read/mark-all-read.c:176
+msgid "Current _Folder Only"
+msgstr "只有当前文件夹(_F)"
+
#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
msgid "Mark All Read"
msgstr "全部标为已读"
@@ -17799,7 +18886,7 @@ msgstr "管理插件是启用还是禁用的插件。"
#. Setup the ui
#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:252
msgid "Plugin Manager"
msgstr "插件管理器"
@@ -17811,33 +18898,24 @@ msgstr "启用和禁用插件"
msgid "_Plugins"
msgstr "插件(_P)"
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:58
msgid "Author(s)"
msgstr "作者"
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "描述"
+#: ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "配置"
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:265
msgid "Note: Some changes will not take effect until restart"
msgstr "注意:某些更改直到重新启动后才生效"
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:291
msgid "Overview"
msgstr "概览"
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "配置"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "此插件无配置选项。"
-
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
msgid "Plugin"
msgstr "插件"
@@ -17861,41 +18939,22 @@ msgstr "纯文字模式"
msgid "Prefer plain-text"
msgstr "首选纯文本"
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:191
msgid "Show HTML if present"
msgstr "首选 HTML"
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:192
msgid "Prefer PLAIN"
msgstr "首选纯文本"
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:193
msgid "Only ever show PLAIN"
msgstr "仅显示纯文本"
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:236
msgid "HTML _Mode"
msgstr "HT_ML 模式"
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr "在撰写器中添加打印邮件的选项。"
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "打印信件"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "打印预览(_V)"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "打印该信件"
-
#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
msgid "Evolution Profiler"
msgstr "Evolution 配置器"
@@ -17920,13 +18979,7 @@ msgstr "位置"
msgid "_Publish Calendar Information"
msgstr "发布日历信息(_P)"
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "输入“%s”的密码"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
msgid "Are you sure you want to remove this URL?"
msgstr "您确定您想要删除此 URL 吗?"
@@ -18014,15 +19067,80 @@ msgstr ""
"iCal\n"
"忙/闲"
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+#, fuzzy
+msgid "Hello Python"
+msgstr "家庭电话"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+#, fuzzy
+msgid "Python Loader"
+msgstr "Mono 装入器"
+
#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
msgid "SpamAssassin (built-in)"
msgstr "垃圾克星(内置)"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
-msgid "This will make Spamassasin more reliable, but slower"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, fuzzy, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "垃圾克星插件"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, fuzzy, c-format
+msgid "Failed to create pipe: %s"
+msgstr "创建本地邮件存储“%s”失败:%s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, fuzzy, c-format
+msgid "Error after fork: %s"
+msgstr ""
+"%s 错误:\n"
+" %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, fuzzy, c-format
+msgid "SpamAssassin is not available."
+msgstr "发送选项不可用。"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+#, fuzzy
+msgid "This will make SpamAssassin more reliable, but slower"
msgstr "这将让过滤器更可靠,但稍慢"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
msgid "I_nclude remote tests"
msgstr "包含远程测试(_N)"
@@ -18046,7 +19164,7 @@ msgstr "一次保存全部附件或信件的不同部分的插件。"
#. the path to the shared library
#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:330
+#: ../plugins/save-attachments/save-attachments.c:314
msgid "Save attachments"
msgstr "保存附件"
@@ -18058,16 +19176,15 @@ msgstr "保存附件..."
msgid "Save all attachments"
msgstr "保存全部附件"
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
msgid "Select save base name"
msgstr "选择保存基础名称"
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
msgid "MIME Type"
msgstr "MIME 类型"
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
+#: ../plugins/save-attachments/save-attachments.c:347
msgid "Save"
msgstr "保存"
@@ -18075,79 +19192,79 @@ msgstr "保存"
#. * Translator: the %F %T is the thirth argument for a strftime function.
#. * It lets you define the formatting of the date in the csv-file.
#. *
-#: ../plugins/save-calendar/csv-format.c:167
+#: ../plugins/save-calendar/csv-format.c:162
msgid "%F %T"
msgstr "%F %T"
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
msgid "UID"
msgstr "UID"
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
msgid "Description List"
msgstr "描述列表"
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
msgid "Categories List"
msgstr "类别列表"
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
msgid "Comment List"
msgstr "注释列表"
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
msgid "Created"
msgstr "创建时间"
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
msgid "Contact List"
msgstr "联系人列表"
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
msgid "Start"
msgstr "开始"
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
msgid "End"
msgstr "结束"
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
msgid "percent Done"
msgstr "完成百分比"
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
msgid "URL"
msgstr "URL"
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
msgid "Attendees List"
msgstr "出席者列表"
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
msgid "Modified"
msgstr "修改日期"
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
msgid "Advanced options for the CSV format"
msgstr "CSV 格式的高级选项"
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
msgid "Prepend a header"
msgstr "前置头"
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
msgid "Value delimiter:"
msgstr "值分隔符:"
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
msgid "Record delimiter:"
msgstr "记录分隔符:"
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
msgid "Encapsulate values with:"
msgstr "将值以下列形式封装:"
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
msgid "Comma separated value format (.csv)"
msgstr "逗号分隔的值格式(.csv)"
@@ -18168,15 +19285,15 @@ msgstr "保存到磁盘(_S)"
#. * It lets you define the formatting of the date in the rdf-file.
#. * Also check out http://www.w3.org/2002/12/cal/tzd
#. *
-#: ../plugins/save-calendar/rdf-format.c:154
+#: ../plugins/save-calendar/rdf-format.c:149
msgid "%FT%T"
msgstr "%FT%T"
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
msgid "RDF format (.rdf)"
msgstr "RDF 格式(.rdf)"
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
msgid "Select destination file"
msgstr "选择目的文件"
@@ -18201,22 +19318,22 @@ msgid "Show _only this Task List"
msgstr "只显示此任务列表(_O)"
#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "处理启动向导的插件。"
+msgid "Guides you through your initial account setup."
+msgstr "指引您进行初始帐户的设置。"
#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "启动向导"
+msgid "Setup Assistant"
+msgstr "设置助手"
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
msgid "Evolution Setup Assistant"
msgstr "Evolution 设置助手"
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
msgid "Welcome"
msgstr "欢迎"
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
msgid ""
"Welcome to Evolution. The next few screens will allow Evolution to connect "
"to your email accounts, and to import files from other applications. \n"
@@ -18228,29 +19345,29 @@ msgstr ""
"\n"
"请单击“前进”按钮继续。"
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
msgid "Importing files"
msgstr "导入文件"
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
msgid "Please select the information that you would like to import:"
msgstr "请选择您希望导入的信息:"
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
#, c-format
msgid "From %s:"
msgstr "从 %s:"
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
#, c-format
msgid "Importing data."
msgstr "正在导入数据。"
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
msgid "Please wait"
msgstr "请稍候"
@@ -18267,10 +19384,33 @@ msgid "Thread messages by subject"
msgstr "基于主题按线索编排信件列表"
#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:56
msgid "F_all back to threading messages by subject"
msgstr "默认按照主题对线索中的信件排序(_A)"
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+#, fuzzy
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr "消息主体中的用于附件提醒插件的线索列表。"
+
+#: ../plugins/templates/templates.c:615
+msgid "No title"
+msgstr "无标题"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "另存为模板(_T)"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "另存为模板"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr ""
+
#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
msgid "A simple plugin which uses ytnef to decode tnef attachments."
msgstr "一个使用 ytnef 来解码 tnef 附件的简单插件。"
@@ -18279,6 +19419,28 @@ msgstr "一个使用 ytnef 来解码 tnef 附件的简单插件。"
msgid "TNEF Attachment decoder"
msgstr "TNEF 附件解码器"
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "设置 WebDAV 联系人的插件。"
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "WebDAV 联系人"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr ""
+
#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
msgid "Evolution Shell"
msgstr "Evolution 外壳"
@@ -18296,16 +19458,16 @@ msgid "Evolution Test component"
msgstr "Evolution 测试组件"
#: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "当前打印机设置的字符串描述。"
+msgid "Authenticate proxy server connections"
+msgstr ""
#: ../shell/apps_evolution_shell.schemas.in.h:2
-msgid "Configuration version"
-msgstr "配置版本"
+msgid "Automatic proxy configuration URL"
+msgstr "自动代理服务器配置 URL"
#: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Decides whether the crash detection should be run or not."
-msgstr "决定是否运行崩溃检测。"
+msgid "Configuration version"
+msgstr "配置版本"
#: ../shell/apps_evolution_shell.schemas.in.h:4
msgid "Default sidebar width"
@@ -18324,63 +19486,156 @@ msgid "Default window width"
msgstr "默认窗口宽度"
#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+#, fuzzy
+msgid "HTTP proxy password"
+msgstr "输入密码"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy username"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
msgid "ID or alias of the component to be shown by default at start-up."
msgstr "启动时默认显示的组件 ID 或别名。"
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:14
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
msgid "Last upgraded configuration version"
msgstr "上次升级的配置版本"
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:16
msgid ""
"List of paths for the folders to be synchronized to disk for offline usage"
msgstr "列出脱机使用时要同步到磁盘的文件夹路径"
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Non-proxy hosts"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+#, fuzzy
+msgid "Proxy configuration mode"
+msgstr "配置"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "SOCKS proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Secure HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
msgid "Sidebar is visible"
msgstr "侧边栏可见"
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:26
msgid "Skip development warning dialog"
msgstr "跳过开发警告对话框"
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "Skip recovery warning dialog"
-msgstr "跳过恢复警告对话框"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:571
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
msgid "Start in offline mode"
msgstr "以脱机模式启动"
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:28
msgid "Statusbar is visible"
msgstr "状态栏可见"
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:29
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.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:30
msgid "The default height for the main window, in pixels."
msgstr "主窗口的默认高度,以像素计。"
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:31
msgid "The default width for the main window, in pixels."
msgstr "主窗口的默认宽度,以像素计。"
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:32
msgid "The default width for the sidebar, in pixels."
msgstr "侧边栏的默认宽度,以像素计。"
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:33
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.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+msgid "The machine name to proxy HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:35
+msgid "The machine name to proxy secure HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The machine name to proxy socks through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
msgid ""
"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -18389,52 +19644,65 @@ msgstr ""
"窗口按钮的样式。可以是文字、图标、二者、工具栏。如果设置为工具栏,则工具栏的"
"样式由 GNOME 设置决定。"
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
msgid "Toolbar is visible"
msgstr "工具栏可见"
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+#, fuzzy
+msgid "URL that provides proxy configuration values."
+msgstr "上次升级的配置版本"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "Use HTTP proxy"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
msgid "Whether Evolution will start up in offline mode instead of online mode."
msgstr "是否以脱机模式而非联机模式启动 Evolution。"
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "Whether crash detection should be done or not"
-msgstr "回收站删除是否执行"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:47
msgid "Whether or not the window should be maximized."
msgstr "窗口是否应为最大化。"
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:48
msgid "Whether the sidebar should be visible."
msgstr "侧边栏是否可见。"
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:49
msgid "Whether the status bar should be visible."
msgstr "状态栏是否可见。"
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:50
msgid "Whether the toolbar should be visible."
msgstr "工具栏是否可见。"
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:51
msgid ""
"Whether the warning dialog in development versions of Evolution is skipped."
msgstr "是否跳过 Evoltuion 开发版本的警告。"
-#: ../shell/apps_evolution_shell.schemas.in.h:30
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "是否跳过 Evoltuion 恢复警告对话框。"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:52
msgid "Whether the window buttons should be visible."
msgstr "窗口按钮是否可见。"
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:53
msgid "Window button style"
msgstr "窗口按钮样式"
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:54
msgid "Window buttons are visible"
msgstr "窗口按钮可见"
@@ -18450,27 +19718,22 @@ msgstr "当前连接"
msgid "Click OK to close these connections and go offline"
msgstr "单击确定关闭这些连接,并转入脱机操作"
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
msgid "Choose the type of importer to run:"
msgstr "选择要运行的导入器类型:"
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:134
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"of file it is from the list."
msgstr ""
-"选择您希望导入到 Evolution 的文件,并从列表中选择文件的类型。\n"
-"\n"
-"如果您不清楚,可以选择“自动”,Evolution 将尝试为您确定类型。"
+"选择您希望导入到 Evolution 的文件,并从列表中选择文件的类型。"
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:138
msgid "Choose the destination for this import"
msgstr "选择此导入的目的位置"
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:144
msgid ""
"Evolution checked for settings to import from the following\n"
"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -18481,23 +19744,23 @@ msgstr ""
"iCalendar。并未发现可导入的设置。如果您想要再试一次,请单击\n"
"“上一步”按钮。\n"
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:282
msgid "F_ilename:"
msgstr "文件名(_I):"
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:287
msgid "Select a file"
msgstr "选择一个文件"
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:296
msgid "File _type:"
msgstr "文件类型(_T):"
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:332
msgid "Import data and settings from _older programs"
msgstr "从旧版程序中导入数据和设置(_O)"
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:335
msgid "Import a _single file"
msgstr "导入单个文件(_S)"
@@ -18505,118 +19768,104 @@ msgstr "导入单个文件(_S)"
msgid "Evolution Preferences"
msgstr "Evolution 首选项"
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "没有指定文件夹名称。"
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "文件夹名不能含有回车符。"
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "文件夹名不能含有字符“/”。"
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "文件夹名不能含有字符“#”。"
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "“.”和“..”是保留文件夹名。"
-
#. To translators: This is the window title and %s is the
#. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
#, c-format
msgid "%s - Evolution"
msgstr "%s - Evolution"
-#: ../shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:75
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr "GNOME Pilot 工具好像并未安装到系统中。"
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
#, c-format
msgid "Error executing %s."
msgstr "执行 %s 错误。"
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
msgid "Bug buddy is not installed."
msgstr "未安装 Bug buddy。"
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
msgid "Bug buddy could not be run."
msgstr "无法运行 Bug buddy。"
#. The translator-credits string is for translators to list
#. * per-language credits for translation, displayed in the
#. * about dialog.
-#: ../shell/e-shell-window-commands.c:663
+#: ../shell/e-shell-window-commands.c:729
msgid "translator-credits"
msgstr ""
"开源软件国际化之简体中文组\n"
"http://i18n.linux.net.cn"
-#: ../shell/e-shell-window-commands.c:674
+#: ../shell/e-shell-window-commands.c:740
msgid "Evolution Website"
msgstr "Evolution 网站"
-#: ../shell/e-shell-window-commands.c:692
+#: ../shell/e-shell-window-commands.c:758
msgid "Error opening the FAQ webpage."
msgstr "打开 FAQ 网页时出错。"
-#: ../shell/e-shell-window-commands.c:889
+#: ../shell/e-shell-window-commands.c:955
msgid "_Work Online"
msgstr "联机工作(_W)"
-#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
msgid "_Work Offline"
msgstr "脱机工作(_W)"
-#: ../shell/e-shell-window-commands.c:915
+#: ../shell/e-shell-window-commands.c:981
msgid "Work Offline"
msgstr "脱机工作"
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:381
+#, fuzzy
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
msgstr "Evolution 目前联机。单击该按钮可脱机工作。"
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:388
msgid "Evolution is in the process of going offline."
msgstr "Evolution 正在脱机过程中。"
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:395
+#, fuzzy
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
msgstr "Evolution 目前脱机。单击该按钮可联机工作。"
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:786
#, c-format
msgid "Switch to %s"
msgstr "切换到 %s"
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:641
msgid "Unknown system error."
msgstr "未知的系统错误。"
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
#, c-format
msgid "%ld KB"
msgstr "%ld KB"
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
msgid "OK"
msgstr "确定"
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1300
msgid "Invalid arguments"
msgstr "无效参数"
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1302
msgid "Cannot register on OAF"
msgstr "无法注册到 OAF"
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1304
msgid "Configuration Database not found"
msgstr "找不到配置数据库"
@@ -18626,15 +19875,17 @@ msgstr "找不到配置数据库"
msgid "New"
msgstr "新建"
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
msgid "New Test"
msgstr "新建测试"
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
+#, fuzzy
+msgctxt "New"
msgid "_Test"
msgstr "测试(_T)"
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
msgid "Create a new test item"
msgstr "创建新测试项"
@@ -18676,7 +19927,7 @@ msgstr ""
"本助手将全程指导您将外部文件导入 Evolution。"
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:228
+#: ../shell/main.c:217
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -18708,7 +19959,7 @@ msgstr ""
"\n"
"我们希望您尽情享受我们努力工作的成果,我们也热切盼望着您的意见!\n"
-#: ../shell/main.c:252
+#: ../shell/main.c:241
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -18716,65 +19967,43 @@ msgstr ""
"感谢\n"
"Evolution 团队\n"
-#: ../shell/main.c:259
+#: ../shell/main.c:248
msgid "Do not tell me again"
msgstr "不要再通知我"
-#: ../shell/main.c:309
-msgid "Evolution Crash Detection"
-msgstr "Evolution 崩溃检测"
-
-#: ../shell/main.c:311
-msgid "Ig_nore"
-msgstr "忽略(_N)"
-
-#: ../shell/main.c:326
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run. As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Evolution 似乎在上次运行时异常退出。作为预防措施,所有的预览面板\n"
-"将被隐藏。您可以从查看菜单中恢复预览面板。\n"
-
-#: ../shell/main.c:337
-msgid "_Do not show this message again"
-msgstr "不再显示此信息(_D)"
-
-#: ../shell/main.c:569
+#: ../shell/main.c:469
msgid "Start Evolution activating the specified component"
msgstr "启动 Evolution 并激活指定组件"
-#: ../shell/main.c:573
+#: ../shell/main.c:473
msgid "Start in online mode"
msgstr "以联机模式启动"
-#: ../shell/main.c:576
+#: ../shell/main.c:476
msgid "Forcibly shut down all Evolution components"
msgstr "强制关闭所有 Evolution 组件"
-#: ../shell/main.c:580
+#: ../shell/main.c:480
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "强制从 Evolution 1.4 重新升迁"
-#: ../shell/main.c:583
+#: ../shell/main.c:483
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
-#: ../shell/main.c:585
+#: ../shell/main.c:485
msgid "Disable loading of any plugins."
msgstr "禁止装入任何插件。"
-#: ../shell/main.c:587
+#: ../shell/main.c:487
msgid "Disable preview pane of Mail, Contacts and Tasks."
msgstr "禁用邮件、联系人和任务的预览面板。"
-#: ../shell/main.c:617
+#: ../shell/main.c:572
msgid "- The Evolution PIM and Email Client"
msgstr "- Evolution 个人信息管理和邮件客户"
-#: ../shell/main.c:630
+#: ../shell/main.c:600
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -18909,7 +20138,7 @@ msgstr ""
"\n"
"如果您选择继续,您可能无法访问您的某些旧数据。\n"
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
#, c-format
msgid ""
"Certificate '%s' is a CA certificate.\n"
@@ -18920,14 +20149,14 @@ msgstr ""
"\n"
"编辑信任设置:"
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:151
msgid ""
"Because you trust the certificate authority that issued this certificate, "
"then you trust the authenticity of this certificate unless otherwise "
"indicated here"
msgstr "由于您信任颁发此证书的机构,您就将信任此证书的权威性,除非在此声明"
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../smime/gui/cert-trust-dialog.c:155
msgid ""
"Because you do not trust the certificate authority that issued this "
"certificate, then you do not trust the authenticity of this certificate "
@@ -18982,22 +20211,27 @@ msgstr "电子邮件地址"
msgid "All CA certificate files"
msgstr "全部颁证机构文件"
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:338
#, c-format
msgid "Certificate Viewer: %s"
msgstr "证书查看器:%s"
+#: ../smime/gui/component.c:46
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "输入“%s”的密码"
+
#. we're setting the password initially
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:69
msgid "Enter new password for certificate database"
msgstr "输入证书数据库的新密码"
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
msgid "Enter new password"
msgstr "输入新密码"
#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:117
#, c-format
msgid ""
"Issued to:\n"
@@ -19006,7 +20240,7 @@ msgstr ""
"发行给:\n"
" 主题:%s\n"
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
#, c-format
msgid ""
"Issued by:\n"
@@ -19015,7 +20249,7 @@ msgstr ""
"发行者:\n"
" 主题:%s\n"
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
msgid "Select certificate"
msgstr "选择证书"
@@ -19199,7 +20433,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:679
+#: ../smime/lib/e-cert-db.c:672
msgid "Certificate already exists"
msgstr "证书已经存在"
@@ -19366,15 +20600,15 @@ msgstr "主题唯一 ID"
msgid "Certificate Signature Value"
msgstr "证书签名值"
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
msgid "PKCS12 File Password"
msgstr "PKCS12 文件密码"
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
msgid "Enter password for PKCS12 file:"
msgstr "输入 PKCS12 文件的密码:"
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:343
msgid "Imported Certificate"
msgstr "导入的证书"
@@ -19407,8 +20641,7 @@ 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-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
#: ../ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr "复制"
@@ -19430,11 +20663,10 @@ msgid "Copy to Folder..."
msgstr "复制到文件夹..."
#: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
msgstr "创建新的地址簿文件夹"
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
#: ../ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "剪切"
@@ -19475,8 +20707,7 @@ msgstr "把选中文件夹中的联系人移至其它文件夹"
msgid "Move to Folder..."
msgstr "移至文件夹..."
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
#: ../ui/evolution-tasks.xml.h:11
msgid "Paste"
msgstr "粘贴"
@@ -19513,13 +20744,11 @@ 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:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
msgid "Select All"
msgstr "全选"
#: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
msgid "Select _All"
msgstr "全选(_A)"
@@ -19588,7 +20817,7 @@ msgstr "将联系人移至(_M)..."
msgid "_Move Folder Contacts To"
msgstr "将文件夹联系人移至(_M)"
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
msgid "_New"
msgstr "新建(_N)"
@@ -19649,7 +20878,7 @@ msgid "Month"
msgstr "月"
#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
msgid "Next"
msgstr "下一项"
@@ -19658,7 +20887,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:172
msgid "Previous"
msgstr "上一项"
@@ -19726,232 +20955,6 @@ msgstr "一周工作日"
msgid "_Open Appointment"
msgstr "打开约会(_O)"
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "将选中文字复制到剪贴板"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "将选中文字复制到剪贴板"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "将选中文字剪切到剪贴板"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "将选中文字剪切到剪贴板"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "从剪贴板粘贴"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "从剪贴板中粘贴文字"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "选中所有文字"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "附件"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "单击此处可便附加文件"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "单击此处可关闭当前窗口"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "单击此处可保存当前窗口"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "单击此处可查看可用的帮助"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "关闭"
-
-#: ../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:47
-msgid "_Attachment..."
-msgstr "附件(_A)..."
-
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "关闭(_C)"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:53
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "文件(_F)"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "选项(_O)"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "全天事件"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "全天事件(_D)"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "分类为机密"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "分类为私人"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "分类为公开"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "单击此处以设定或取消此事件的提醒"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "插入高级发送选项"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "将此事件标为重复发生"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "公开(_B)"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "查询出席者的忙闲信息"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "角色域(_O)"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "发送选项(_O)"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "将时间显示为忙(_B)"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "时区(_Z)"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "切换是否显示出席者类型域"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "切换是否显示请回复域"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "切换是否显示角色域"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "切换是否显示状态域"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "切换是否显示时区"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "切换是否显示类别"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "切换是否有全天事件"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "切换是否将时间显示为忙"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "提醒(_A)"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "类别(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "分类(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "机密(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "忙/闲(_F)"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "私人(_P)"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "请回复(_R)"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "再现(_R)"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "状态域(_S)"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "类型域(_T)"
-
#: ../ui/evolution-mail-global.xml.h:2
msgid "Cancel the current mail operation"
msgstr "取消当前邮件操作"
@@ -19981,7 +20984,6 @@ msgid "Empty _Trash"
msgstr "清空回收站(_T)"
#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
msgid "F_older"
msgstr "文件夹(_O)"
@@ -20199,7 +21201,7 @@ msgstr "按线索编排的信件列表"
msgid "_Group By Threads"
msgstr "按线索分组(_G)"
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
#: ../ui/evolution-mail-messagedisplay.xml.h:7
msgid "_Message"
msgstr "信件(_M)"
@@ -20534,129 +21536,125 @@ msgid "Show a blinking cursor in the body of displayed messages"
msgstr "在显示信件的信体中显示闪烁光标"
#: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "以普通样式显示信件"
-
-#: ../ui/evolution-mail-message.xml.h:96
msgid "Show messages with all email headers"
msgstr "显示邮件时显示所有信头"
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
msgid "Show the raw email source of the message"
msgstr "显示信件的原始邮件源代码"
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
msgid "Undelete the selected messages"
msgstr "取消选中信件的删除"
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
msgid "Uni_mportant"
msgstr "不重要(_M)"
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
msgid "Zoom _Out"
msgstr "缩小(_O)"
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
msgid "_Attached"
msgstr "附件(_A)"
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
msgid "_Caret Mode"
msgstr "光标模式(_C)"
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
msgid "_Clear Flag"
msgstr "清除标志(_C)"
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
msgid "_Delete Message"
msgstr "删除信件(_D)"
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
msgid "_Find in Message..."
msgstr "在信件中查找(_F)..."
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
msgid "_Flag Completed"
msgstr "标志为已完成(_F)"
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
msgid "_Go To"
msgstr "转到(_G)"
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
msgid "_Important"
msgstr "重要(_I)"
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
msgid "_Inline"
msgstr "嵌入(_I)"
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
msgid "_Junk"
msgstr "垃圾(_J)"
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
msgid "_Load Images"
msgstr "装入图像(_L)"
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
msgid "_Message Source"
msgstr "信件源代码(_M)"
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
msgid "_Next Message"
msgstr "下一封信(_N)"
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
msgid "_Normal Size"
msgstr "普通大小(_N)"
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
msgid "_Not Junk"
msgstr "非垃圾(_N)"
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
msgid "_Open in New Window"
msgstr "在新窗口中打开(_O)"
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
msgid "_Previous Message"
msgstr "上一封信(_P)"
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
msgid "_Quoted"
msgstr "引用(_Q)"
#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
msgid "_Read"
msgstr "读取(_R)"
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
msgid "_Save Message..."
msgstr "保存信件(_S)..."
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
msgid "_Undelete Message"
msgstr "取消删除信件(_U)"
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
msgid "_Unread"
msgstr "未读(_U)"
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
msgid "_Zoom"
msgstr "缩放(_Z)"
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
msgid "_Zoom In"
msgstr "放大(_Z)"
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "关闭此窗口"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "关闭"
#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
msgid "Main toolbar"
@@ -20694,290 +21692,6 @@ msgstr "查看选中的备忘"
msgid "_Open Memo"
msgstr "打开备忘(_O)"
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "添加附件"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "关闭当前文件"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "删除签名以外的所有内容"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "用 PGP 加密该信件"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "用您的 S/MIME 加密证书加密该信件"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "格式(_M)"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "当您的信件被阅读时得到投递通知"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "插入发送选项"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "打开文件"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "PGP 加密"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "PGP 签名"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "PGP 加密(_E)"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "PGP 签名(_S)"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "请求阅读收条(_E)"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "S/MIME 加密(_C)"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "S/MIME 加密"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "S/MIME 签名(_N)"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "S/MIME 签名"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "发送(_E)"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "另存为"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "保存草稿"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "另存为(_A)..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "保存草稿(_D)"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "另存为草稿"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "保存到文件夹..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "保存当前文件"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "用不同的文件名保存当前文件"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "在指定的文件夹中保存信件"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "发送"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "以 HTML 格式发送邮件"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "发送这封信"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "将信件设定为高优先级"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "用您的 PGP 密钥签名该信件"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "用您的 S/MIME 签名认证签名该信件"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "是否显示暗中转发域"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "是否显示转发域"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "是否显示发件人选择器"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "是否显示投递到域"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "是否显示回复域"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "是否显示寄给域"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "暗送域(_B)"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "抄送域(_C)"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "全部删除(_D)"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "发件人域(_F)"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "打开(_O)..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "投递到域(_P)"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "标为优先(_P)"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "回复域(_R)"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "安全(_S)"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "发送选项(_S)"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "收件人域(_T)"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "关闭(_L)"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "保存并关闭"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "保存并关闭(_C)"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "保存当前文件并关闭窗口"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "把文件夹添加到您的订阅文件夹列表中去"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "刷新列表"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "刷新文件夹列表"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "从您的订阅文件夹列表中删除文件夹"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "订阅"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "退订"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "反转选择(_I)"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "单击可更改/查看任务的状态细节"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "状态细节"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "时区"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "状态细节(_S)"
-
#: ../ui/evolution-tasks.xml.h:3
msgid "Copy selected tasks"
msgstr "复制选中的任务"
@@ -21171,50 +21885,55 @@ msgid "View/Hide the Status Bar"
msgstr "查看/隐藏状态栏"
#: ../ui/evolution.xml.h:39
+#, fuzzy
+msgid "Work _Offline"
+msgstr "脱机工作"
+
+#: ../ui/evolution.xml.h:40
msgid "_About"
msgstr "关于(_A)"
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
msgid "_Close Window"
msgstr "关闭窗口(_C)"
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
msgid "_Forget Passwords"
msgstr "丢弃密码(_F)"
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
msgid "_Frequently Asked Questions"
msgstr "常见问答(FAQ)(_F)"
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
msgid "_Hide Buttons"
msgstr "隐藏按钮(_H)"
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
msgid "_Icons Only"
msgstr "只有图标(_I)"
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
msgid "_Quick Reference"
msgstr "快速首选项(_Q)"
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
msgid "_Quit"
msgstr "退出(_Q)"
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
msgid "_Switcher Appearance"
msgstr "切换器外观(_S)"
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
msgid "_Synchronization Options..."
msgstr "同步选项(_S)..."
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
msgid "_Text Only"
msgstr "只有文字(_T)"
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
msgid "_Window"
msgstr "窗口(_W)"
@@ -21291,11 +22010,11 @@ msgid "With _Status"
msgstr "状态(_S)"
#. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
msgid "UTC"
msgstr "UTC"
@@ -21312,8 +22031,8 @@ msgid "Select a Time Zone"
msgstr "选择一个时区"
#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "时区组合框"
+msgid "Timezone drop-down combination box"
+msgstr ""
#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
msgid ""
@@ -21324,19 +22043,19 @@ msgstr ""
"用鼠标左键放大地图的某个区域并选择时区。\n"
"用鼠标右键缩小。"
-#: ../widgets/menus/gal-define-views-dialog.c:78
-#: ../widgets/menus/gal-define-views-model.c:186
+#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-model.c:185
msgid "Collection"
msgstr "收藏"
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../widgets/menus/gal-define-views-dialog.c:358
#: ../widgets/menus/gal-define-views.glade.h:4
#, no-c-format
msgid "Define Views for %s"
msgstr "定义 %s 的视图"
+#: ../widgets/menus/gal-define-views-dialog.c:366
#: ../widgets/menus/gal-define-views-dialog.c:368
-#: ../widgets/menus/gal-define-views-dialog.c:370
msgid "Define Views"
msgstr "定义视图"
@@ -21346,17 +22065,17 @@ msgid "Define Views for \"%s\""
msgstr "定义“%s”的视图"
#: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
#: ../widgets/table/e-table-scrolled.c:216
#: ../widgets/table/e-table-scrolled.c:217
msgid "Table"
msgstr "表格"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
msgid "Instance"
msgstr "实例"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
msgid "Save Current View"
msgstr "保存当前视图"
@@ -21370,7 +22089,7 @@ msgstr "替换现有视图(_R)"
#. bonobo displays this string so it must be in locale
#: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:354
+#: ../widgets/menus/gal-view-menus.c:368
msgid "Custom View"
msgstr "当前视图"
@@ -21379,40 +22098,40 @@ msgid "Save Custom View"
msgstr "保存自定义视图"
#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:392
msgid "Define Views..."
msgstr "定义视图..."
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
msgid "C_urrent View"
msgstr "当前视图(_U)"
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
#, c-format
msgid "Select View: %s"
msgstr "选择视图:%s"
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:373
msgid "Current view is a customized view"
msgstr "当前视图为自定义视图"
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:378
msgid "Save Custom View..."
msgstr "保存当前视图..."
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
msgid "Save current custom view"
msgstr "保存当前自定义视图"
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
msgid "Create or edit views"
msgstr "创建或编辑视图"
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
msgid "Factory"
msgstr "工厂"
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
msgid "Define New View"
msgstr "定义新视图"
@@ -21428,17 +22147,17 @@ msgstr "视图类型"
msgid "Type of view:"
msgstr "视图类型:"
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
msgid "Attachment Bar"
msgstr "附件栏"
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
#, c-format
msgid "Cannot attach file %s: %s"
msgstr "无法附加文件 %s:%s"
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
#, c-format
msgid "Cannot attach file %s: not a regular file"
msgstr "无法附加文件 %s:不是普通文件"
@@ -21460,33 +22179,32 @@ msgid "Suggest automatic display of attachment"
msgstr "建议自动显示附件"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1726
+#: ../widgets/misc/e-calendar-item.c:1267
msgid "%B %Y"
msgstr "%Y年%B"
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
msgid "Month Calendar"
msgstr "月历"
#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
msgid "Fill color"
msgstr "填充颜色"
#: ../widgets/misc/e-canvas-background.c:460
#: ../widgets/misc/e-canvas-background.c:461
#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
+#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
+#: ../widgets/text/e-text.c:3659
msgid "GDK fill color"
msgstr "GDK 填充颜色"
#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
msgid "Fill stipple"
msgstr "点绘填充"
@@ -21510,30 +22228,30 @@ msgstr "Y1"
msgid "Y2"
msgstr "Y2"
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/table/e-table-group-container.c:999
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
msgid "Minimum width"
msgstr "最小宽度"
-#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
msgid "Minimum Width"
msgstr "最小宽度"
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:204
msgid "Spacing"
msgstr "间距"
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:290
msgid "Now"
msgstr "现在"
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:847
#, c-format
msgid "The time must be in the format: %s"
msgstr "时间必须采用格式:%s"
@@ -21542,257 +22260,264 @@ msgstr "时间必须采用格式:%s"
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "百分比值必需在 0 到 100 之间,含 0 和 100"
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:57
msgid "Arabic"
msgstr "阿拉伯语"
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:58
msgid "Baltic"
msgstr "波罗的语"
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:59
msgid "Central European"
msgstr "中欧"
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:60
msgid "Chinese"
msgstr "中文"
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:61
msgid "Cyrillic"
msgstr "西里尔语"
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:62
msgid "Greek"
msgstr "希腊语"
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:63
msgid "Hebrew"
msgstr "希伯来语"
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:64
msgid "Japanese"
msgstr "日文"
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:65
msgid "Korean"
msgstr "韩语"
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:66
msgid "Thai"
msgstr "泰语"
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:67
msgid "Turkish"
msgstr "土耳其语"
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:68
msgid "Unicode"
msgstr "Unicode"
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:69
msgid "Western European"
msgstr "西欧"
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:70
msgid "Western European, New"
msgstr "西欧,新"
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
msgid "Traditional"
msgstr "繁体"
-#: ../widgets/misc/e-charset-picker.c:100
-#: ../widgets/misc/e-charset-picker.c:101
-#: ../widgets/misc/e-charset-picker.c:102
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
msgid "Simplified"
msgstr "简体"
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:98
msgid "Ukrainian"
msgstr "乌克兰语"
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:101
msgid "Visual"
msgstr "可视"
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:170
#, c-format
msgid "Unknown character set: %s"
msgstr "未知的字符集:%s"
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:215
msgid "Character Encoding"
msgstr "字符编码"
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:230
msgid "Enter the character set to use"
msgstr "输入要使用的字符集"
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:337
msgid "Other..."
msgstr "其它..."
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:599
msgid "Ch_aracter Encoding"
msgstr "字符编码(_A)"
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
msgid "Date and Time"
msgstr "日期和时间"
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
msgid "Text entry to input date"
msgstr "输入日期的文本框"
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
msgid "Click this button to show a calendar"
msgstr "单击此按钮可显示日历"
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:394
+msgid "Drop-down combination box to select time"
msgstr "选择时间的组合框"
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
msgid "No_w"
msgstr "现在(_W)"
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
msgid "_Today"
msgstr "今天(_T)"
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
msgid "Invalid Date Value"
msgstr "无效的日期值"
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
msgid "Invalid Time Value"
msgstr "无效的时间值"
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
msgid "Expanded"
msgstr "已展开"
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
msgid "Whether or not the expander is expanded"
msgstr "是否展开扩展器"
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
msgid "Text of the expander's label"
msgstr "扩展器标签的文本"
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
msgid "Use underline"
msgstr "使用下划线"
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
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:207
+#: ../widgets/misc/e-expander.c:205
msgid "Space to put between the label and the child"
msgstr "标签及其子空间中间的间距"
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
msgid "Label widget"
msgstr "标签部件"
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
msgid "A widget to display in place of the usual expander label"
msgstr "在通常扩展器标签的位置显示的部件"
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
msgid "Expander Size"
msgstr "扩展器大小"
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
msgid "Size of the expander arrow"
msgstr "扩展器箭头的大小"
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
msgid "Indicator Spacing"
msgstr "标识器间距"
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
msgid "Spacing around expander arrow"
msgstr "扩展器箭头旁边的间距"
#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:748
+#: ../widgets/misc/e-filter-bar.c:126 ../widgets/misc/e-filter-bar.c:179
+#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:749
msgid "Advanced Search"
msgstr "高级搜索"
#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
msgid "Save Search"
msgstr "保存搜索"
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
msgid "_Searches"
msgstr "搜索(_S)"
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
msgid "Searches"
msgstr "搜索"
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
msgid "_Save Search..."
msgstr "保存搜索(_S)..."
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
msgid "_Edit Saved Searches..."
msgstr "编辑保存的搜索(_E)..."
-#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
+#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
msgid "_Advanced Search..."
msgstr "高级搜索(_A)..."
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
msgid "All Accounts"
msgstr "全部账户"
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
msgid "Current Account"
msgstr "当前账户"
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
msgid "Current Folder"
msgstr "当前文件夹"
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
msgid "Current Message"
msgstr "当前信件"
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:169
msgid "Choose Image"
msgstr "选择图像"
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:627
msgid "World Map"
msgstr "世界地图"
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:629
+#, fuzzy
msgid ""
"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+"should instead select the timezone from the drop-down combination box below."
msgstr ""
"基于鼠标交互的地图部件,可用来选择时区。键盘用户可以从下方的组合框中选择时"
"区。"
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-online-button.c:109
+msgid "Online"
+msgstr "在线"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr "按钮状态为在线"
+
+#: ../widgets/misc/e-pilot-settings.c:102
msgid "Sync with:"
msgstr "同步对象:"
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
msgid "Sync Private Records:"
msgstr "同步私有记录:"
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
msgid "Sync Categories:"
msgstr "同步类别:"
@@ -21808,74 +22533,74 @@ msgstr "回流模型"
msgid "Column width"
msgstr "列宽"
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
msgid "Search"
msgstr "搜索"
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
msgid "Click here to change the search type"
msgstr "单击此处更改搜索类型"
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:606
msgid "_Search"
msgstr "搜索(_S)"
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:612
msgid "_Find Now"
msgstr "立即查找(_F)"
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
msgid "_Clear"
msgstr "清除(_C)"
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:868
msgid "Item ID"
msgstr "项目 ID"
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
msgid "Text"
msgstr "文字"
#. 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:1013
+#: ../widgets/misc/e-search-bar.c:1006
msgid "Sho_w: "
msgstr "显示(_W):"
#. 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:1030
+#: ../widgets/misc/e-search-bar.c:1023
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:1042
+#: ../widgets/misc/e-search-bar.c:1035
msgid " i_n "
msgstr " 于(_N) "
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
#: ../widgets/table/e-tree-selection-model.c:807
msgid "Cursor Row"
msgstr "光标行"
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
#: ../widgets/table/e-tree-selection-model.c:814
msgid "Cursor Column"
msgstr "光标列"
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
msgid "Sorter"
msgstr "排序"
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
msgid "Selection Mode"
msgstr "选择模式"
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
msgid "Cursor Mode"
msgstr "光标模式"
@@ -21903,10 +22628,6 @@ msgstr "<b>状态跟踪</b>"
msgid "A_uto-delete sent item"
msgstr "自动删除已发项目(_U)"
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "分类"
-
#: ../widgets/misc/e-send-options.glade.h:7
msgid "Creat_e a sent item to track information"
msgstr "创建一个已发送项以跟踪信息(_E)"
@@ -21987,44 +22708,45 @@ msgstr "之后(_A):"
msgid "_All information"
msgstr "全部信息(_A)"
-#: ../widgets/misc/e-send-options.glade.h:31
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
msgid "_Delay message delivery"
msgstr "推迟信件投递(_D)"
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
msgid "_Delivered"
msgstr "已投递(_D)"
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
msgid "_Set expiration date"
msgstr "设置过期时间(_S)"
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
msgid "_Until:"
msgstr "直到(_U):"
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
msgid "_When convenient"
msgstr "方便时(_W)"
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
msgid "_When opened:"
msgstr "打开时(_W):"
#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../widgets/misc/e-task-widget.c:255
#, c-format
msgid "%s (...)"
msgstr "%s (...)"
#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
#. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:303
+#: ../widgets/misc/e-task-widget.c:261
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
msgid "Click here to go to URL"
msgstr "单击此处转到 URL"
@@ -22044,7 +22766,7 @@ msgstr "可用类别(_A):"
msgid "categories"
msgstr "类别"
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
msgid "popup list"
msgstr "弹出列表"
@@ -22064,23 +22786,23 @@ msgstr "聚焦列"
msgid "Unselected Column"
msgstr "未选列"
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
msgid "Strikeout Column"
msgstr "给列加删除线"
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
msgid "Underline Column"
msgstr "给列加下划线"
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
msgid "Bold Column"
msgstr "给列加粗"
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
msgid "Color Column"
msgstr "给列着色"
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
msgid "BG Color Column"
msgstr "给列着背景色"
@@ -22118,7 +22840,7 @@ msgid "A_vailable Fields:"
msgstr "可用域(_V):"
#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
msgid "Ascending"
msgstr "升序"
@@ -22131,7 +22853,7 @@ msgid "Clear _All"
msgstr "全部清除(_A)"
#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
msgid "Descending"
msgstr "降序"
@@ -22194,14 +22916,14 @@ msgstr "排序(_S)..."
#: ../widgets/table/e-table-field-chooser-dialog.c:67
#: ../widgets/table/e-table-field-chooser-item.c:634
#: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1886
+#: ../widgets/table/e-table-header-item.c:1887
msgid "DnD code"
msgstr "拖放代码"
#: ../widgets/table/e-table-field-chooser-dialog.c:74
#: ../widgets/table/e-table-field-chooser-item.c:641
#: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1900
+#: ../widgets/table/e-table-header-item.c:1901
msgid "Full Header"
msgstr "完整标题"
@@ -22219,447 +22941,301 @@ msgid ""
"the location in which you want it to appear."
msgstr "要在您的表格中添加列,请将其拖曳到您想要其出现的位置。"
-#: ../widgets/table/e-table-group-container.c:345
+#: ../widgets/table/e-table-group-container.c:344
#, c-format
msgid "%s : %s (%d item)"
msgid_plural "%s : %s (%d items)"
msgstr[0] "%s:%s (%d 项)"
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:350
#, c-format
msgid "%s (%d item)"
msgid_plural "%s (%d items)"
msgstr[0] "%s (%d 项)"
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:922
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
msgid "Alternating Row Colors"
msgstr "交替行色"
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../widgets/table/e-table-group-container.c:929
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
msgid "Horizontal Draw Grid"
msgstr "水平绘制网格"
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:936
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
msgid "Vertical Draw Grid"
msgstr "垂直绘制网格"
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../widgets/table/e-table-group-container.c:943
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
msgid "Draw focus"
msgstr "绘制焦点"
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:950
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
msgid "Cursor mode"
msgstr "光标模式"
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:957
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
msgid "Selection model"
msgstr "选择模型"
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-table-group-container.c:964
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-tree.c:3339
msgid "Length Threshold"
msgstr "长度阀值"
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../widgets/table/e-table-group-container.c:971
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-tree.c:3371
msgid "Uniform row height"
msgstr "统一行高"
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:978
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
msgid "Frozen"
msgstr "冻结"
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
msgid "Customize Current View"
msgstr "自定义当前视图"
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
msgid "Sort _Ascending"
msgstr "升序排序(_A)"
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
msgid "Sort _Descending"
msgstr "降序排序(_D)"
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
msgid "_Unsort"
msgstr "未排序(_U)"
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
msgid "Group By This _Field"
msgstr "按该域分组(_F)"
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
msgid "Group By _Box"
msgstr "按方框分组(_B)"
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
msgid "Remove This _Column"
msgstr "删除该列(_C)"
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
msgid "Add a C_olumn..."
msgstr "添加一列(_O)..."
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
msgid "A_lignment"
msgstr "对齐(_L)"
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
msgid "B_est Fit"
msgstr "最佳匹配(_E)"
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
msgid "Format Column_s..."
msgstr "格式化列(_S)..."
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
msgid "Custo_mize Current View..."
msgstr "自定义当前视图(_M)..."
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
msgid "_Sort By"
msgstr "排序方式(_S)"
#. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
msgid "_Custom"
msgstr "自定义(_C)"
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
msgid "Font Description"
msgstr "字体描述"
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:173
+#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-sorter.c:172
msgid "Sort Info"
msgstr "排序信息"
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
#: ../widgets/table/e-tree-scrolled.c:225
#: ../widgets/table/e-tree-scrolled.c:226
msgid "Tree"
msgstr "树"
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
msgid "Table header"
msgstr "表头"
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
msgid "Table model"
msgstr "表格模型"
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
msgid "Cursor row"
msgstr "光标行"
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
msgid "Always search"
msgstr "总是搜索"
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
msgid "Use click to add"
msgstr "单击可添加"
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
msgid "ETree table adapter"
msgstr "ETree 表格适配器"
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3384
msgid "Retro Look"
msgstr "火箭外观"
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3385
msgid "Draw lines and +/- expanders."
msgstr "绘制行和 +/- 扩展柄。"
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
msgid "Input Methods"
msgstr "输入法"
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
msgid "Event Processor"
msgstr "事件处理器"
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
msgid "Bold"
msgstr "粗体"
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
msgid "Strikeout"
msgstr "删除线"
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
msgid "Anchor"
msgstr "锚点"
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
msgid "Justification"
msgstr "两端对齐"
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
msgid "Clip Width"
msgstr "裁剪宽度"
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
msgid "Clip Height"
msgstr "裁剪高度"
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
msgid "Clip"
msgstr "裁剪"
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
msgid "Fill clip rectangle"
msgstr "填充裁剪矩形"
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
msgid "X Offset"
msgstr "水平偏移"
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
msgid "Y Offset"
msgstr "垂直偏移"
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
msgid "Text width"
msgstr "文字宽度"
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
msgid "Text height"
msgstr "文字高度"
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
msgid "Use ellipsis"
msgstr "使用椭圆"
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
msgid "Ellipsis"
msgstr "椭圆"
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
msgid "Line wrap"
msgstr "换行"
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
msgid "Break characters"
msgstr "换行字符"
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
msgid "Max lines"
msgstr "最多行数"
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
msgid "Draw borders"
msgstr "绘制边框"
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
msgid "Allow newlines"
msgstr "允许新行"
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
msgid "Draw background"
msgstr "绘制背景"
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
msgid "Draw button"
msgstr "绘制按钮"
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
msgid "Cursor position"
msgstr "光标位置"
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
msgid "IM Context"
msgstr "输入法环境"
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
msgid "Handle Popup"
msgstr "处理弹出"
-
-#~ msgid "_Categories..."
-#~ msgstr "类别(_C)..."
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid "Add an email to the List"
-#~ msgstr "将电子邮件添加到列表"
-
-#~ msgid "Insert email addresses from Address Book"
-#~ msgstr "从地址簿中插入电子邮件地址"
-
-#~ msgid "Members"
-#~ msgstr "成员"
-
-#~ msgid "Remove an email address from the List"
-#~ msgstr "从列表中删除电子邮件地址"
-
-#~ msgid "_Select"
-#~ msgstr "选择(_S)"
-
-#~ msgid "Or_ganiser:"
-#~ msgstr "组织者(_G):"
-
-#~ msgid "Task sort"
-#~ msgstr "任务排序"
-
-#~ msgid "Memo sort"
-#~ msgstr "备忘排序"
-
-#~ msgid "SMTWTFS"
-#~ msgstr "日一二三四五六"
-
-#~ msgid "Post To:"
-#~ msgstr "投递到:"
-
-#~ msgid "The Evolution PIM and Email Client"
-#~ msgstr "Evolution 个人信息管理和邮件客户"
-
-#~ msgid "_Search name:"
-#~ msgstr "搜索名称(_B):"
-
-#~ msgid "Di_sable"
-#~ msgstr "禁用(_S)"
-
-#~ msgid "Automatic smiley recognition"
-#~ msgstr "自动识别表情"
-
-#~ msgid "New Mail Notify sound file"
-#~ msgstr "新建邮件通知声音文件"
-
-#~ msgid "New Mail Notify type"
-#~ msgstr "新建邮件通知类型"
-
-#~ msgid "Specifies the type of New Mail Notification the user wishes to use."
-#~ msgstr "指定用户想要使用的新邮件通知类型。"
-
-#~ msgid "<span weight=\"bold\">Labels and Colors</span>"
-#~ msgstr "<span weight=\"bold\">标签和颜色</span>"
-
-#~ msgid "<span weight=\"bold\">New Mail Notification</span>"
-#~ msgstr "<span weight=\"bold\">新邮件提醒</span>"
-
-#~ msgid "HTML Mail"
-#~ msgstr "HTML 邮件"
-
-#~ msgid "Se_lect..."
-#~ msgstr "选择(_L)..."
-
-#~ msgid "Select Drafts Folder"
-#~ msgstr "选择草稿文件夹"
-
-#~ msgid "Select Sent Folder"
-#~ msgstr "选择已发文件夹"
-
-#~ msgid "_Beep when new mail arrives"
-#~ msgstr "新邮件到达时响铃(_B)"
-
-#~ msgid "_Do not notify me when new mail arrives"
-#~ msgstr "新邮件到达时不要提醒我(_D)"
-
-#~ msgid "Attachment Reminder Preferences"
-#~ msgstr "附件提醒首选项"
-
-#~ msgid "Select a (48*48) png of size < 720bytes"
-#~ msgstr "选择一个小于 720B 的 48*48 的 PNG 图像"
-
-#~ msgid "_Contacts..."
-#~ msgstr "联系人(_C)..."
-
-#~ msgid "Every time a new mail arrives, pop up a libnotify notification."
-#~ msgstr "每当新邮件到达时,弹出一个 libnotify 通知。"
-
-#~ msgid "Make the status icon blink"
-#~ msgstr "闪烁状态图标"
-
-#~ msgid "When the new-mail status icon is visible, make it blink."
-#~ msgstr "当新邮件状态图标可见时,使之闪烁。"
-
-#~ msgid "System error: %s"
-#~ msgstr "系统错误:%s"
-
-#~ msgid "Camel error: %s"
-#~ msgstr "Camel 错误:%s"
-
-#~ msgid "Account cannot send e-mail"
-#~ msgstr "账户无法发送电子邮件"
-
-#~ msgid "No store available"
-#~ msgstr "没有可用的存储"
-
-#~ msgid ""
-#~ "A plugin which implements a CORBA interface for accessing mail data "
-#~ "remotely."
-#~ msgstr "实现远程访问邮件数据的 CORBA 接口的插件。"
-
-#~ msgid "Mail Remote"
-#~ msgstr "远程邮件"
-
-#~ msgid "New Mail Notification"
-#~ msgstr "新邮件通知"
-
-#~ msgid "Configure"
-#~ msgstr "配置"
-
-#~ msgid "Download messages for offline"
-#~ msgstr "下载信件进行脱机处理"
-
-#~ msgid "_Phone List"
-#~ msgstr "电话列表(_P)"
-
-#~ msgid "MTWTFSS"
-#~ msgstr "一二三四五六日"
-
-#~ msgid "<- _Remove"
-#~ msgstr "<- 删除(_R)"
-
-#~ msgid "Sh_ow these fields in order:"
-#~ msgstr "按顺序显示这些域(_O):"
-
-#~ msgid "_Add ->"
-#~ msgstr "添加(_A) ->"
-
-#~ msgid "Emulate label resize"
-#~ msgstr "模拟标签缩放"