aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorFunda Wang <fwang@src.gnome.org>2009-01-29 02:52:21 +0800
committerFunda Wang <fwang@src.gnome.org>2009-01-29 02:52:21 +0800
commit94a4c02753aaff06fa2430e42a0394af550e2412 (patch)
tree8066070d6b7061d38eebfe0f4e81a371d53542b6 /po
parent31bda94d32b772af25f9e2dc725c22f95b4a4cd7 (diff)
downloadgsoc2013-evolution-94a4c02753aaff06fa2430e42a0394af550e2412.tar
gsoc2013-evolution-94a4c02753aaff06fa2430e42a0394af550e2412.tar.gz
gsoc2013-evolution-94a4c02753aaff06fa2430e42a0394af550e2412.tar.bz2
gsoc2013-evolution-94a4c02753aaff06fa2430e42a0394af550e2412.tar.lz
gsoc2013-evolution-94a4c02753aaff06fa2430e42a0394af550e2412.tar.xz
gsoc2013-evolution-94a4c02753aaff06fa2430e42a0394af550e2412.tar.zst
gsoc2013-evolution-94a4c02753aaff06fa2430e42a0394af550e2412.zip
Updated zh_CN translation.
svn path=/trunk/; revision=37155
Diffstat (limited to 'po')
-rw-r--r--po/ChangeLog4
-rw-r--r--po/zh_CN.po7259
2 files changed, 3755 insertions, 3508 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index f11d4a5377..d0e561c37b 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-29 Funda Wang <fundawang@gmail.com>
+
+ * zh_CN.po: Updated zh_CN translation.
+
2009-01-28 Ilkka Tuohela <hile@iki.fi>
* fi.po: Updated Finnish translation.
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8eb52008f5..f9302f252f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,13 +5,14 @@
# Partly comes from Sun_l10n group, 2003
# Funda Wang <fundawang@linux.net.cn>, 2003, 2004, 2005, 2006.
#
-#: ../shell/main.c:589
+#: ../shell/main.c:603
msgid ""
msgstr ""
"Project-Id-Version: Evolution 2.8\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-06 16:13+0000\n"
-"PO-Revision-Date: 2008-03-04 16:29+0800\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=evolution\n"
+"POT-Creation-Date: 2009-01-19 17:15+0000\n"
+"PO-Revision-Date: 2009-01-29 02:49+0800\n"
"Last-Translator: YangZhang <zyangmath@gmail.com>\n"
"Language-Team: Chinese i18n <i18n-zh@googlegroup.com>\n"
"MIME-Version: 1.0\n"
@@ -21,21 +22,21 @@ msgstr ""
#: ../a11y/addressbook/ea-addressbook-view.c:94
#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
+#: ../a11y/addressbook/ea-minicard-view.c:179
msgid "evolution address book"
msgstr "evolution 地址簿"
-#: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:228
msgid "New Contact"
msgstr "新建联系人"
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:236
msgid "New Contact List"
msgstr "新建联系人列表"
-#: ../a11y/addressbook/ea-minicard-view.c:161
+#: ../a11y/addressbook/ea-minicard-view.c:162
#, c-format
msgid "current address book folder %s has %d card"
msgid_plural "current address book folder %s has %d cards"
@@ -131,7 +132,7 @@ msgstr "无事件。"
#: ../a11y/calendar/ea-day-view.c:159
#, c-format
msgid "Work Week View: %s. %s"
-msgstr "周工作视图:%s。%s"
+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
@@ -143,14 +144,14 @@ msgstr "日视图:%s。%s"
#: ../a11y/calendar/ea-day-view.c:196
msgid "calendar view for a work week"
-msgstr "工作周的日历视图"
+msgstr "工作日的日历视图"
#: ../a11y/calendar/ea-day-view.c:198
msgid "calendar view for one or more days"
msgstr "一天或多天的日历视图"
#: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:803
msgid "%A %d %b %Y"
msgstr "%Y年%-m月%-d日%A"
@@ -161,8 +162,8 @@ msgstr "%Y年%-m月%-d日%A"
#. You can change the order but don't change the
#. specifiers or add anything.
#: ../a11y/calendar/ea-gnome-calendar.c: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/calendar-component.c:806
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
#: ../calendar/gui/e-week-view-main-item.c:335
msgid "%a %d %b"
msgstr "%-m月%-d日%A"
@@ -170,9 +171,9 @@ msgstr "%-m月%-d日%A"
#: ../a11y/calendar/ea-gnome-calendar.c:191
#: ../a11y/calendar/ea-gnome-calendar.c:196
#: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:762
-#: ../calendar/gui/calendar-component.c:767
-#: ../calendar/gui/calendar-component.c:769
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:813
+#: ../calendar/gui/calendar-component.c:815
msgid "%a %d %b %Y"
msgstr "%Y年%-m月%-d日%A"
@@ -180,10 +181,10 @@ msgstr "%Y年%-m月%-d日%A"
#: ../a11y/calendar/ea-gnome-calendar.c:221
#: ../a11y/calendar/ea-gnome-calendar.c:227
#: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:788
-#: ../calendar/gui/calendar-component.c:794
-#: ../calendar/gui/calendar-component.c:796
+#: ../calendar/gui/calendar-component.c:827
+#: ../calendar/gui/calendar-component.c:834
+#: ../calendar/gui/calendar-component.c:840
+#: ../calendar/gui/calendar-component.c:842
msgid "%d %b %Y"
msgstr "%Y年%-m月%-d日"
@@ -193,15 +194,15 @@ msgstr "%Y年%-m月%-d日"
#. month name. You can change the order but don't
#. change the specifiers or add anything.
#: ../a11y/calendar/ea-gnome-calendar.c: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/calendar-component.c:832
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
#: ../calendar/gui/e-week-view-main-item.c:349
msgid "%d %b"
msgstr "%B%-d日"
#: ../a11y/calendar/ea-gnome-calendar.c:245
#: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:766
+#: ../calendar/importers/icalendar-importer.c:780
msgid "Gnome Calendar"
msgstr "Gnome 日历"
@@ -248,11 +249,11 @@ msgstr "弹出"
msgid "popup a child"
msgstr "弹出子对象"
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
msgid "edit"
msgstr "编辑"
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
msgid "begin editing this cell"
msgstr "开始编辑此单元格"
@@ -265,19 +266,19 @@ msgstr "切换"
msgid "toggle the cell"
msgstr "切换单元格"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
msgid "expand"
msgstr "展开"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
msgid "expands the row in the ETree containing this cell"
msgstr "在包含此单元格的 ETree 中展开行"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
msgid "collapse"
msgstr "折叠"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
msgid "collapses the row in the ETree containing this cell"
msgstr "在包含此单元格的 ETree 中折叠行"
@@ -407,7 +408,7 @@ msgstr "认证到 IMAP 服务器失败。"
#. Unknown error
#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
msgid "Failed to delete contact"
msgstr "删除联系人失败"
@@ -420,6 +421,7 @@ msgid "LDAP server did not respond with valid schema information."
msgstr "LDAP 服务器无法响应有效的大纲信息。"
#: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:54
msgid "Server Version"
msgstr "服务器版本"
@@ -540,7 +542,7 @@ msgstr "原样使用(_U)"
#. 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
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
msgid "{0}"
msgstr "{0}"
@@ -549,21 +551,22 @@ msgstr "{0}"
msgid "{1}"
msgstr "{1}"
-#: ../addressbook/conduit/address-conduit.c:299
+#: ../addressbook/conduit/address-conduit.c:491
msgid "Default Sync Address:"
msgstr "默认同步地址:"
-#: ../addressbook/conduit/address-conduit.c:1320
-#: ../addressbook/conduit/address-conduit.c:1321
+#: ../addressbook/conduit/address-conduit.c:1521
+#: ../addressbook/conduit/address-conduit.c:1522
msgid "Could not load address book"
msgstr "无法装入地址簿"
-#: ../addressbook/conduit/address-conduit.c:1398
-#: ../addressbook/conduit/address-conduit.c:1401
+#: ../addressbook/conduit/address-conduit.c:1599
+#: ../addressbook/conduit/address-conduit.c:1602
msgid "Could not read pilot's Address application block"
msgstr "无法读入 Pilot 的地址应用程序块"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/autocompletion-config.c:173
msgid "Autocompletion"
msgstr "自动补全"
@@ -581,9 +584,9 @@ msgstr "在此配置自动补全"
#. Create the contacts group
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../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
+#: ../addressbook/gui/component/addressbook-view.c:1213
+#: ../calendar/gui/calendar-component.c:307 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
#: ../plugins/exchange-operations/exchange-folder.c:582
msgid "Contacts"
msgstr "联系人"
@@ -622,15 +625,15 @@ msgstr "在此管理您的 S/MIME 证书"
#. create the local source group
#. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:143
+#: ../addressbook/gui/component/addressbook-migrate.c:500
+#: ../calendar/gui/calendar-component.c:244
#: ../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
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2967
+#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
+#: ../mail/message-list.c:1516
msgid "On This Computer"
msgstr "在此计算机中"
@@ -639,139 +642,138 @@ msgstr "在此计算机中"
#. Create the default Person task list
#. Create the default Person addressbook
#. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../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: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
+#: ../addressbook/gui/component/addressbook-component.c:151
+#: ../addressbook/gui/component/addressbook-migrate.c:508
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../calendar/gui/calendar-component.c:255
+#: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:485
+#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
+#: ../calendar/gui/tasks-component.c:204 ../mail/em-migrate.c:1058
msgid "Personal"
msgstr "个人"
#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:163
-#: ../addressbook/gui/component/addressbook-migrate.c:517
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:518
msgid "On LDAP Servers"
msgstr "在 LDAP 服务器上"
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:229
msgctxt "New"
msgid "_Contact"
msgstr "联系人(_C)"
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:230
msgid "Create a new contact"
msgstr "创建一个新联系人"
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:237
msgctxt "New"
msgid "Contact _List"
msgstr "联系人列表(_L)"
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:238
msgid "Create a new contact list"
msgstr "创建一个新的联系人列表"
-#: ../addressbook/gui/component/addressbook-component.c:245
-#: ../addressbook/gui/component/addressbook-config.c:1207
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1223
msgid "New Address Book"
msgstr "新地址簿"
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:245
msgctxt "New"
msgid "Address _Book"
msgstr "地址簿(_B)"
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:246
msgid "Create a new address book"
msgstr "创建新地址簿"
-#: ../addressbook/gui/component/addressbook-component.c:410
+#: ../addressbook/gui/component/addressbook-component.c:409
msgid "Failed upgrading Address Book settings or folders."
msgstr "升级地址簿设置或文件夹失败。"
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:332
msgid "Base"
msgstr "基础"
-#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../addressbook/gui/component/addressbook-config.c:533
#: ../calendar/gui/dialogs/calendar-setup.c:170
msgid "_Type:"
msgstr "类型(_T):"
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
msgid "Copy _book content locally for offline operation"
msgstr "将地址簿内容复制到本地以进行脱机操作(_B)"
-#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/component/addressbook-config.c:998
#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
+#: ../plugins/itip-formatter/itip-formatter.c:2532
#: ../smime/gui/smime-ui.glade.h:28
msgid "General"
msgstr "常规"
-#: ../addressbook/gui/component/addressbook-config.c:983
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
-#: ../mail/importers/pine-importer.c:385
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
+#: ../mail/importers/pine-importer.c:383
msgid "Address Book"
msgstr "地址簿"
-#: ../addressbook/gui/component/addressbook-config.c:987
+#: ../addressbook/gui/component/addressbook-config.c:1003
msgid "Server Information"
msgstr "服务器信息"
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:1005
msgid "Authentication"
msgstr "身份验证"
-#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/addressbook-config.c:1008
#: ../addressbook/gui/component/ldap-config.glade.h:17
#: ../smime/gui/smime-ui.glade.h:20
msgid "Details"
msgstr "细节"
-#: ../addressbook/gui/component/addressbook-config.c:993
-#: ../mail/em-folder-browser.c:983
+#: ../addressbook/gui/component/addressbook-config.c:1009
+#: ../mail/em-folder-browser.c:985
msgid "Searching"
msgstr "搜索"
-#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../addressbook/gui/component/addressbook-config.c:1011
msgid "Downloading"
msgstr "下载"
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1221
#: ../addressbook/gui/component/ldap-config.glade.h:11
msgid "Address Book Properties"
msgstr "地址簿属性"
-#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../addressbook/gui/component/addressbook-migrate.c:74
#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
msgid "Migrating..."
msgstr "正在升迁..."
-#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../addressbook/gui/component/addressbook-migrate.c:126
#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
#, c-format
msgid "Migrating '%s':"
msgstr "升迁“%s”:"
-#: ../addressbook/gui/component/addressbook-migrate.c:645
+#: ../addressbook/gui/component/addressbook-migrate.c:646
msgid "LDAP Servers"
msgstr "LDAP 服务器"
-#: ../addressbook/gui/component/addressbook-migrate.c:760
+#: ../addressbook/gui/component/addressbook-migrate.c:761
msgid "Autocompletion Settings"
msgstr "自动补全设置"
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -782,7 +784,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -792,7 +794,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -802,7 +804,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -812,53 +814,60 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的 Pilot 同步数据..."
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:501
+#: ../addressbook/gui/component/addressbook-view.c:422
+#: ../mail/em-folder-utils.c:448
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "将“%s”文件夹重命名为:"
-#: ../addressbook/gui/component/addressbook-view.c:428
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:450
msgid "Rename Folder"
msgstr "重命名文件夹"
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:509
+#: ../addressbook/gui/component/addressbook-view.c:430
+#: ../mail/em-folder-utils.c:456
msgid "Folder names cannot contain '/'"
msgstr "文件夹名不能含有字符“/”"
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:949
msgid "_New Address Book"
msgstr "新建地址簿(_N)"
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:950
msgid "Save As vCard..."
msgstr "另存为 vCard..."
-#: ../addressbook/gui/component/addressbook-view.c:946
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:660
+#: ../calendar/gui/memos-component.c:501 ../calendar/gui/tasks-component.c:492
+#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "重命名(_R)..."
+
+#: ../addressbook/gui/component/addressbook-view.c:954
#: ../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:2111 ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
+#: ../calendar/gui/calendar-component.c:663
+#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/memos-component.c:504 ../calendar/gui/tasks-component.c:495
+#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
#: ../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: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
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:668
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
+#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
msgid "_Properties"
msgstr "属性(_P)"
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1223
msgid "Contact Source Selector"
msgstr "联系人源选择器"
@@ -879,8 +888,8 @@ msgstr "输入 %s 的密码(用户 %s)"
#: ../addressbook/gui/component/addressbook.c:222
#: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../plugins/google-account-setup/google-source.c:441
+#: ../plugins/publish-calendar/publish-calendar.c:191
#: ../smime/gui/component.c:49
msgid "Enter password"
msgstr "输入密码"
@@ -904,32 +913,50 @@ msgid ""
msgstr "卡片和列表视图及预览面板之间垂直面板的位置,以像素计。"
#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
msgid "Show preview pane"
msgstr "显示预览面板"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
msgid ""
"The number of characters that must be typed before Evolution will attempt to "
"autocomplete."
msgstr "在 Evolution 试图进行自动补全之前应该输入多少个字符。"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
msgid "URI for the folder last used in the select names dialog"
msgstr "选择名称对话框中上次使用的文件夹 URI"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
msgid "URI for the folder last used in the select names dialog."
msgstr "选择名称对话框中上次使用的文件夹 URI。"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
msgid "Vertical pane position"
msgstr "垂直面板的位置"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
msgid "Whether to show the preview pane."
msgstr "是否显示预览面板。"
+#: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Always _show address of the autocompleted contact"
+msgstr "总是显示自动补全的联系人的地址(_S)"
+
+#: ../addressbook/gui/component/autocompletion-config.c:180
+msgid "Look up in address books"
+msgstr "在地址簿中查阅"
+
#: ../addressbook/gui/component/ldap-config.glade.h:1
msgid "1"
msgstr "1"
@@ -971,7 +998,7 @@ msgid "Add Address Book"
msgstr "添加地址簿"
#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:760
msgid "Always"
msgstr "总是"
@@ -1010,14 +1037,14 @@ msgid "Lo_gin:"
msgstr "登录(_G):"
#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:759
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:288
+#: ../mail/em-account-editor.c:287
msgid "No encryption"
msgstr "不加密"
@@ -1029,7 +1056,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:296
+#: ../mail/em-account-editor.c:295
msgid "SSL encryption"
msgstr "SSL 加密"
@@ -1095,7 +1122,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:292
+#: ../mail/em-account-editor.c:291
msgid "TLS encryption"
msgstr "TLS 加密"
@@ -1121,7 +1148,7 @@ msgstr ""
#: ../addressbook/gui/component/ldap-config.glade.h:41
msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
"\"."
msgstr "这是您的 LDAP 服务器的完整名字。例如,“ldap.mycompany.com”。"
@@ -1134,11 +1161,11 @@ msgstr "这是可下载条目的最大数量。将此数值设定得太大将导
#: ../addressbook/gui/component/ldap-config.glade.h:43
msgid ""
"This is the method Evolution will use to authenticate you. Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
"server."
msgstr ""
"这是 Evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
-"对 ldap 服务器的匿名访问权限。"
+"对 LDAP 服务器的匿名访问权限。"
#: ../addressbook/gui/component/ldap-config.glade.h:44
msgid ""
@@ -1185,7 +1212,7 @@ msgstr "登录方式(_L):"
#: ../addressbook/gui/component/ldap-config.glade.h:53
#: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:178
#: ../plugins/groupwise-features/properties.glade.h:11
#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
msgid "_Name:"
@@ -1200,7 +1227,7 @@ msgid "_Search scope:"
msgstr "搜索范围(_S):"
#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:187
#: ../plugins/publish-calendar/publish-calendar.glade.h:26
msgid "_Server:"
msgstr "服务器(_S):"
@@ -1218,13 +1245,14 @@ msgid "cards"
msgstr "名片"
#: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../plugins/caldav/caldav-source.c:430
#: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:662
-#: ../plugins/google-account-setup/google-contacts-source.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-contacts-source.c:338
msgid "minutes"
msgstr "分钟"
@@ -1265,8 +1293,8 @@ msgid "<b>Work</b>"
msgstr "<b>工作</b>"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
msgid "AIM"
msgstr "AIM"
@@ -1277,16 +1305,16 @@ msgid "Ca_tegories..."
msgstr "类别(_T)..."
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/widgets/e-minicard.c:199
msgid "Contact"
msgstr "联系人"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
msgid "Contact Editor"
msgstr "联系人编辑器"
@@ -1295,11 +1323,12 @@ msgid "Full _Name..."
msgstr "全名(_N)..."
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../composer/e-msg-composer.c:2473
msgid "Image"
msgstr "图像"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
msgid "MSN Messenger"
msgstr "MSN Messenger"
@@ -1312,1251 +1341,1262 @@ msgid "Nic_kname:"
msgstr "昵称(_K):"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+msgid "Novell GroupWise"
+msgstr "Novell GroupWise"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
msgid "Novell Groupwise"
msgstr "Novell Groupwise"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
msgid "Personal Information"
msgstr "个人信息"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
msgid "Telephone"
msgstr "电话"
#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
#: ../mail/em-migrate.c:1057
msgid "Work"
msgstr "工作"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
msgid "_Address:"
msgstr "地址(_A):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
msgid "_Anniversary:"
msgstr "周年(_A):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
msgid "_Assistant:"
msgstr "助手(_A):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
msgid "_Birthday:"
msgstr "生日(_B):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:787
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../calendar/gui/dialogs/event-page.c:792
#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1893
msgid "_Calendar:"
msgstr "日历(_C):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
msgid "_City:"
msgstr "城市(_C):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
msgid "_Company:"
msgstr "公司(_C):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
msgid "_Country:"
msgstr "国家/地区(_C):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
msgid "_Department:"
msgstr "部门(_D):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
msgid "_File under:"
msgstr "存档为(_F):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "_Free/Busy:"
msgstr "忙/闲(_F):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
msgid "_Home Page:"
msgstr "主页(_H):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
msgid "_Manager:"
msgstr "经理(_M):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
msgid "_Notes:"
msgstr "注释(_N):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
msgid "_Office:"
msgstr "办公室(_O):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
msgid "_PO Box:"
msgstr "邮政邮箱(_P):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
msgid "_Profession:"
msgstr "职业(_P):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
msgid "_Spouse:"
msgstr "配偶(_S):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
msgid "_State/Province:"
msgstr "州/省(_S):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
#: ../addressbook/gui/contact-editor/fullname.glade.h:17
msgid "_Title:"
msgstr "头衔(_T):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
msgid "_Video Chat:"
msgstr "视频聊天(_V):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
msgid "_Wants to receive HTML mail"
msgstr "愿意接收 HTML 邮件(_W)"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
msgid "_Web Log:"
msgstr "_Web 日志:"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
msgid "_Where:"
msgstr "何处(_W):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
msgid "_Zip/Postal Code:"
msgstr "邮政编码(_Z):"
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
msgid "Address"
msgstr "地址"
-#: ../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-editor/e-contact-editor-address.c:98
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-label.c:165
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../addressbook/gui/widgets/e-minicard.c:192
#: ../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
+#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
msgid "Editable"
msgstr "可编辑"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
msgid "United States"
msgstr "美国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
msgid "Afghanistan"
msgstr "阿富汗"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
msgid "Albania"
msgstr "阿尔巴尼亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
msgid "Algeria"
msgstr "阿尔及利亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
msgid "American Samoa"
msgstr "美洲萨摩亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
msgid "Andorra"
msgstr "安道尔"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
msgid "Angola"
msgstr "安哥拉"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
msgid "Anguilla"
msgstr "安圭拉"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
msgid "Antarctica"
msgstr "南极洲"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
msgid "Antigua And Barbuda"
msgstr "安提瓜和巴布达"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
msgid "Argentina"
msgstr "阿根廷"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
msgid "Armenia"
msgstr "亚美尼亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
msgid "Aruba"
msgstr "阿鲁巴岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
msgid "Australia"
msgstr "澳大利亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
msgid "Austria"
msgstr "奥地利"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
msgid "Azerbaijan"
msgstr "阿塞拜疆"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
msgid "Bahamas"
msgstr "巴哈马群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
msgid "Bahrain"
msgstr "巴林岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
msgid "Bangladesh"
msgstr "孟加拉国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
msgid "Barbados"
msgstr "巴巴多斯岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
msgid "Belarus"
msgstr "白俄罗斯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
msgid "Belgium"
msgstr "比利时"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
msgid "Belize"
msgstr "伯利兹"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
msgid "Benin"
msgstr "贝宁"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
msgid "Bermuda"
msgstr "百慕大群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
msgid "Bhutan"
msgstr "不丹"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
msgid "Bolivia"
msgstr "玻利维亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
msgid "Bosnia And Herzegowina"
msgstr "波斯尼亚和黑赛哥维纳"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
msgid "Botswana"
msgstr "博茨瓦纳"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
msgid "Bouvet Island"
msgstr "布维岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
msgid "Brazil"
msgstr "巴西"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
msgid "British Indian Ocean Territory"
msgstr "英属印度洋地区"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
msgid "Brunei Darussalam"
msgstr "文莱德鲁萨兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
msgid "Bulgaria"
msgstr "保加利亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
msgid "Burkina Faso"
msgstr "布基纳法索"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
msgid "Burundi"
msgstr "布隆迪"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
msgid "Cambodia"
msgstr "柬埔寨"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
msgid "Cameroon"
msgstr "喀麦隆"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
msgid "Canada"
msgstr "加拿大"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
msgid "Cape Verde"
msgstr "佛得角"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
msgid "Cayman Islands"
msgstr "开曼群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
msgid "Central African Republic"
msgstr "中非共和国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
msgid "Chad"
msgstr "乍得"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
msgid "Chile"
msgstr "智利"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
msgid "China"
msgstr "中国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
msgid "Christmas Island"
msgstr "圣诞岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
msgid "Cocos (Keeling) Islands"
msgstr "科科斯群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
msgid "Colombia"
msgstr "哥伦比亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
msgid "Comoros"
msgstr "科摩罗群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
msgid "Congo"
msgstr "刚果"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
msgid "Congo, The Democratic Republic Of The"
msgstr "刚果人民民主共和国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
msgid "Cook Islands"
msgstr "库克群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
msgid "Costa Rica"
msgstr "哥斯达黎加"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
msgid "Cote d'Ivoire"
msgstr "科特迪瓦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
msgid "Croatia"
msgstr "克罗地亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
msgid "Cuba"
msgstr "古巴"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
msgid "Cyprus"
msgstr "塞浦路斯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
msgid "Czech Republic"
msgstr "捷克共和国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
msgid "Denmark"
msgstr "丹麦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
msgid "Djibouti"
msgstr "吉布提群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
msgid "Dominica"
msgstr "多米尼加"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
msgid "Dominican Republic"
msgstr "多米尼加共和国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
msgid "Ecuador"
msgstr "厄瓜多尔"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
msgid "Egypt"
msgstr "埃及"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
msgid "El Salvador"
msgstr "萨尔瓦多"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
msgid "Equatorial Guinea"
msgstr "赤道几内亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
msgid "Eritrea"
msgstr "厄立特里亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
msgid "Estonia"
msgstr "爱沙尼亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
msgid "Ethiopia"
msgstr "埃塞俄比亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
msgid "Falkland Islands"
msgstr "福克兰群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
msgid "Faroe Islands"
msgstr "法罗群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
msgid "Fiji"
msgstr "斐济"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
msgid "Finland"
msgstr "芬兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
msgid "France"
msgstr "法国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
msgid "French Guiana"
msgstr "法属圭亚那"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
msgid "French Polynesia"
msgstr "法属波利尼西亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
msgid "French Southern Territories"
msgstr "法属南部地区"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
msgid "Gabon"
msgstr "加蓬"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
msgid "Gambia"
msgstr "冈比亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
msgid "Georgia"
msgstr "格鲁吉亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
msgid "Germany"
msgstr "德国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
msgid "Ghana"
msgstr "加纳"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
msgid "Gibraltar"
msgstr "直布罗陀"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
msgid "Greece"
msgstr "希腊"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
msgid "Greenland"
msgstr "格陵兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
msgid "Grenada"
msgstr "格林纳达"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
msgid "Guadeloupe"
msgstr "瓜德罗普岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
msgid "Guam"
msgstr "关岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
msgid "Guatemala"
msgstr "危地马拉"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
msgid "Guernsey"
msgstr "格恩西岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
msgid "Guinea"
msgstr "几内亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
msgid "Guinea-Bissau"
msgstr "几内亚比绍"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
msgid "Guyana"
msgstr "圭亚那"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
msgid "Haiti"
msgstr "海地"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
msgid "Heard And McDonald Islands"
msgstr "赫德和麦克唐纳群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
msgid "Holy See"
msgstr "圣座"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
msgid "Honduras"
msgstr "洪都拉斯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
msgid "Hong Kong"
msgstr "中国香港特别行政区"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
msgid "Hungary"
msgstr "匈牙利"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
msgid "Iceland"
msgstr "冰岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
msgid "India"
msgstr "印度"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
msgid "Indonesia"
msgstr "印度尼西亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
msgid "Iran"
msgstr "伊朗"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
msgid "Iraq"
msgstr "伊拉克"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
msgid "Ireland"
msgstr "爱尔兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
msgid "Isle of Man"
msgstr "Isle of Man"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
msgid "Israel"
msgstr "以色列"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
msgid "Italy"
msgstr "意大利"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
msgid "Jamaica"
msgstr "牙买加"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
msgid "Japan"
msgstr "日本"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
msgid "Jersey"
msgstr "杰尔西"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
msgid "Jordan"
msgstr "约旦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
msgid "Kazakhstan"
msgstr "哈萨克斯坦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
msgid "Kenya"
msgstr "肯尼亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
msgid "Kiribati"
msgstr "基里巴斯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
msgid "Korea, Democratic People's Republic Of"
msgstr "韩国人民民主共和国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
msgid "Korea, Republic Of"
msgstr "韩国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
msgid "Kuwait"
msgstr "科威特"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
msgid "Kyrgyzstan"
msgstr "吉尔吉斯斯坦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
msgid "Laos"
msgstr "老挝"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
msgid "Latvia"
msgstr "拉脱维亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
msgid "Lebanon"
msgstr "黎巴嫩"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
msgid "Lesotho"
msgstr "莱索托"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
msgid "Liberia"
msgstr "利比里亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
msgid "Libya"
msgstr "利比亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
msgid "Liechtenstein"
msgstr "列支敦士登"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
msgid "Lithuania"
msgstr "立陶宛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
msgid "Luxembourg"
msgstr "卢森堡"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
msgid "Macao"
msgstr "中国澳门特别行政区"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
msgid "Macedonia"
msgstr "马其顿"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
msgid "Madagascar"
msgstr "马达加斯加"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
msgid "Malawi"
msgstr "马拉维"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
msgid "Malaysia"
msgstr "马来西亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
msgid "Maldives"
msgstr "马尔代夫"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
msgid "Mali"
msgstr "马里"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
msgid "Malta"
msgstr "马耳他"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
msgid "Marshall Islands"
msgstr "马绍尔群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
msgid "Martinique"
msgstr "马提尼可岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
msgid "Mauritania"
msgstr "毛里塔尼亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
msgid "Mauritius"
msgstr "毛里求斯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
msgid "Mayotte"
msgstr "马约特岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
msgid "Mexico"
msgstr "墨西哥"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
msgid "Micronesia"
msgstr "密克罗尼西亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
msgid "Moldova, Republic Of"
msgstr "摩尔多瓦共和国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
msgid "Monaco"
msgstr "摩纳哥"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
msgid "Mongolia"
msgstr "蒙古"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
msgid "Montserrat"
msgstr "蒙特塞拉特群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
msgid "Morocco"
msgstr "摩洛哥"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
msgid "Mozambique"
msgstr "莫桑比克"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
msgid "Myanmar"
msgstr "缅甸"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
msgid "Namibia"
msgstr "纳米比亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
msgid "Nauru"
msgstr "瑙鲁"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
msgid "Nepal"
msgstr "尼泊尔"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
msgid "Netherlands"
msgstr "荷兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
msgid "Netherlands Antilles"
msgstr "荷属安的列斯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
msgid "New Caledonia"
msgstr "新喀里多尼亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
msgid "New Zealand"
msgstr "新西兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
msgid "Nicaragua"
msgstr "尼加拉瓜"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
msgid "Niger"
msgstr "尼日尔"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
msgid "Nigeria"
msgstr "尼日利亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
msgid "Niue"
msgstr "纽埃岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
msgid "Norfolk Island"
msgstr "诺福克岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
msgid "Northern Mariana Islands"
msgstr "北马里亚那群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
msgid "Norway"
msgstr "挪威"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
msgid "Oman"
msgstr "阿曼"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
msgid "Pakistan"
msgstr "巴基斯坦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
msgid "Palau"
msgstr "帕劳群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
msgid "Palestinian Territory"
msgstr "巴勒斯坦地区"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
msgid "Panama"
msgstr "巴拿马"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
msgid "Papua New Guinea"
msgstr "巴布亚新几内亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
msgid "Paraguay"
msgstr "巴拉圭"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
msgid "Peru"
msgstr "秘鲁"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
msgid "Philippines"
msgstr "菲利宾"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
msgid "Pitcairn"
msgstr "皮特克恩岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
msgid "Poland"
msgstr "波兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
msgid "Portugal"
msgstr "葡萄牙"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
msgid "Puerto Rico"
msgstr "波多黎各"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
msgid "Qatar"
msgstr "卡塔尔"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
msgid "Reunion"
msgstr "留尼汪"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
msgid "Romania"
msgstr "罗马尼亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
msgid "Russian Federation"
msgstr "俄罗斯联邦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
msgid "Rwanda"
msgstr "卢旺达"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
msgid "Saint Kitts And Nevis"
msgstr "圣基德和吉维斯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
msgid "Saint Lucia"
msgstr "圣卢西亚岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
msgid "Saint Vincent And The Grenadines"
msgstr "圣文森特和格林纳达"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
msgid "Samoa"
msgstr "萨摩亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
msgid "San Marino"
msgstr "圣马力诺"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
msgid "Sao Tome And Principe"
msgstr "圣多美和普林西比"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
msgid "Saudi Arabia"
msgstr "沙特阿拉伯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
msgid "Senegal"
msgstr "塞内加尔"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
msgid "Serbia And Montenegro"
msgstr "塞尔维亚和黑山"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
msgid "Seychelles"
msgstr "塞舌尔"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
msgid "Sierra Leone"
msgstr "塞拉利昂"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
msgid "Singapore"
msgstr "新加坡"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
msgid "Slovakia"
msgstr "斯洛伐克"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
msgid "Slovenia"
msgstr "斯洛文尼亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
msgid "Solomon Islands"
msgstr "所罗门群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
msgid "Somalia"
msgstr "索马里"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
msgid "South Africa"
msgstr "南非"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
msgid "South Georgia And The South Sandwich Islands"
msgstr "南乔治亚和南三文治群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
msgid "Spain"
msgstr "西班牙"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
msgid "Sri Lanka"
msgstr "斯里兰卡"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
msgid "St. Helena"
msgstr "圣赫勒拿岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
msgid "St. Pierre And Miquelon"
msgstr "圣皮埃尔和麦克伦群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
msgid "Sudan"
msgstr "苏丹"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
msgid "Suriname"
msgstr "苏里南"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
msgid "Svalbard And Jan Mayen Islands"
msgstr "斯瓦巴和尖棉群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
msgid "Swaziland"
msgstr "斯威士兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
msgid "Sweden"
msgstr "瑞典"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
msgid "Switzerland"
msgstr "瑞士"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
msgid "Syria"
msgstr "叙利亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
msgid "Taiwan"
msgstr "中国台湾"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
msgid "Tajikistan"
msgstr "塔吉克斯坦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
msgid "Tanzania, United Republic Of"
msgstr "坦桑尼亚联邦共和国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
msgid "Thailand"
msgstr "泰国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
msgid "Timor-Leste"
msgstr "东帝汶"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
msgid "Togo"
msgstr "多哥"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
msgid "Tokelau"
msgstr "托克劳群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
msgid "Tonga"
msgstr "汤加"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
msgid "Trinidad And Tobago"
msgstr "特里尼达和多巴哥"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
msgid "Tunisia"
msgstr "突尼斯"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
msgid "Turkey"
msgstr "土耳其"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
msgid "Turkmenistan"
msgstr "土库曼斯坦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
msgid "Turks And Caicos Islands"
msgstr "特克斯和凯科斯群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
msgid "Tuvalu"
msgstr "图瓦卢"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
msgid "Uganda"
msgstr "乌干达"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
msgid "Ukraine"
msgstr "乌克兰"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
msgid "United Arab Emirates"
msgstr "阿拉伯联合酋长国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
msgid "United Kingdom"
msgstr "英国"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
msgid "United States Minor Outlying Islands"
msgstr "美国小型外岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
msgid "Uruguay"
msgstr "乌拉圭"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
msgid "Uzbekistan"
msgstr "乌兹别克斯坦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
msgid "Vanuatu"
msgstr "努瓦阿图"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
msgid "Venezuela"
msgstr "委内瑞拉"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
msgid "Viet Nam"
msgstr "越南"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
msgid "Virgin Islands, British"
msgstr "英属处女群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
msgid "Virgin Islands, U.S."
msgstr "美属处女群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
msgid "Wallis And Futuna Islands"
msgstr "瓦利斯和富图纳群岛"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
msgid "Western Sahara"
msgstr "西撒哈拉"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
msgid "Yemen"
msgstr "也门"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
msgid "Zambia"
msgstr "赞比亚"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
msgid "Zimbabwe"
msgstr "津巴布韦"
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
-#: ../mail/em-mailer-prefs.c:466
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:467
#: ../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
+#: ../plugins/save-attachments/save-attachments.c:351
#: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
#: ../widgets/menus/gal-view-new-dialog.c:63
msgid "Name"
msgstr "姓名"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
msgid "AOL Instant Messenger"
msgstr "AOL 即时通讯程序"
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
msgid "Jabber"
msgstr "Jabber"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
msgid "Yahoo Messenger"
msgstr "雅虎通"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
msgid "Gadu-Gadu Messenger"
msgstr "Gadu-Gadu 即时通讯"
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
msgid "ICQ"
msgstr "ICQ"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:612
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
msgid "Service"
msgstr "服务"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-#: ../calendar/gui/caltypes.xml.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
+#: ../calendar/gui/caltypes.xml.h:12
#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/publish-calendar/publish-calendar.c:694
+#: ../plugins/save-calendar/csv-format.c:376
msgid "Location"
msgstr "位置"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
msgid "Username"
msgstr "用户名"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
#: ../addressbook/gui/widgets/eab-contact-display.c:58
msgid "Home"
msgstr "家庭"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
#: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../calendar/gui/e-calendar-view.c:2259
msgid "Other"
msgstr "其它"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
msgid "Yahoo"
msgstr "雅虎"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:611
msgid "Gadu-Gadu"
msgstr "Gadu-Gadu"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
msgid "MSN"
msgstr "MSN"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
msgid "GroupWise"
msgstr "GroupWise"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
msgid "Source Book"
msgstr "来源地址簿"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
msgid "Target Book"
msgstr "目标地址簿"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
msgid "Is New Contact"
msgstr "为新联系人"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
msgid "Writable Fields"
msgstr "可写域"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
msgid "Required Fields"
msgstr "必需域"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
msgid "Changed"
msgstr "已更改"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
#, c-format
msgid "Contact Editor - %s"
msgstr "联系人编辑器 - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
msgid "Please select an image for this contact"
msgstr "请选择此联系人的图像"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
msgid "_No image"
msgstr "无图像(_N)"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2564,67 +2604,67 @@ msgstr ""
"联系人数据无效:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
#, c-format
msgid "'%s' has an invalid format"
msgstr "“%s”的格式无效"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
#, c-format
msgid "%s'%s' has an invalid format"
msgstr "%s“%s”的格式无效"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
#, c-format
msgid "%s'%s' is empty"
msgstr "%s“%s”为空"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
msgid "Invalid contact."
msgstr "无效的联系人。"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
msgid "Contact Quick-Add"
msgstr "快速添加联系人"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
msgid "_Edit Full"
msgstr "编辑全名(_E)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
msgid "_Full name"
msgstr "全名(_F)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
msgid "E_mail"
msgstr "电子邮件(_M)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
msgid "_Select Address Book"
msgstr "选择地址簿(_S)"
-#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
#, c-format
msgid ""
"Are you sure you want\n"
"to delete contact list (%s)?"
msgstr "您确定要删除联系人列表(%s)吗?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
msgid ""
"Are you sure you want\n"
"to delete these contact lists?"
msgstr "您确定要删除这些联系人列表吗?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
#, c-format
msgid ""
"Are you sure you want\n"
"to delete contact (%s)?"
msgstr "您确定要删除联系人(%s)吗?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:332
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
msgid ""
"Are you sure you want\n"
"to delete these contacts?"
@@ -2729,9 +2769,9 @@ 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:243
-#: ../plugins/exchange-operations/exchange-contacts.c:234
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
msgid "_Location:"
msgstr "位置(_L):"
@@ -2745,6 +2785,9 @@ msgid "Contact List Editor"
msgstr "联系人列表编辑器"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:121
msgid "Select..."
msgstr "选择..."
@@ -2770,9 +2813,9 @@ 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-model.c:311
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-addressbook-view.c:211
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
#: ../addressbook/gui/widgets/e-minicard-view.c:531
msgid "Book"
@@ -2828,23 +2871,23 @@ 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:879
-#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:871
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
msgid "Email"
msgstr "电子邮件"
#: ../addressbook/gui/widgets/addresstypes.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
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
msgid "Any field contains"
msgstr "任何域含有"
#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
msgid "Email begins with"
msgstr "邮件以此开头"
@@ -2852,34 +2895,34 @@ msgstr "邮件以此开头"
msgid "Name contains"
msgstr "姓名含有"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
msgid "No contacts"
msgstr "无联系人"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
#, c-format
msgid "%d contact"
msgid_plural "%d contacts"
msgstr[0] "%d 个联系人"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-model.c:318
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
#: ../addressbook/gui/widgets/e-minicard-view.c:538
msgid "Query"
msgstr "查询"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
msgid "Error getting book view"
msgstr "获取名簿视图出错"
#: ../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
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3553
msgid "Model"
msgstr "模型"
@@ -2887,31 +2930,31 @@ msgstr "模型"
msgid "Error modifying card"
msgstr "修改名片错误"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
msgid "Name begins with"
msgstr "姓名以此开头"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
msgid "Source"
msgstr "来源"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-list-view.c:524
#: ../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:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
msgid "Save as vCard..."
msgstr "另存为 VCard..."
#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:923
#: ../ui/evolution-addressbook.xml.h:56
msgid "_Open"
msgstr "打开(_O)"
@@ -2965,12 +3008,12 @@ msgid "Cu_t"
msgstr "剪切(_T)"
#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1322 ../mail/message-list.c:2104
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
#: ../ui/evolution-tasks.xml.h:23
msgid "_Copy"
@@ -2981,14 +3024,20 @@ msgid "P_aste"
msgstr "粘贴(_A)"
#. All, unmatched, separator
-#: ../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
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1527
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
msgid "Any Category"
msgstr "任何类别"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
+msgid "Unmatched"
+msgstr "无匹配"
+
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
msgid "Assistant"
msgstr "助手"
@@ -3018,7 +3067,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:144
+#: ../calendar/gui/e-cal-component-memo-preview.c:138
#: ../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
@@ -3026,7 +3075,7 @@ msgid "Categories"
msgstr "类别"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
msgid "Company"
msgstr "公司"
@@ -3075,22 +3124,22 @@ msgid "Journal"
msgstr "日记"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
msgid "Manager"
msgstr "经理"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:654
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
msgid "Mobile Phone"
msgstr "移动电话"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
msgid "Nickname"
msgstr "昵称"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:667
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
msgid "Note"
msgstr "注释"
@@ -3119,14 +3168,14 @@ msgid "Radio"
msgstr "收音机"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-list-view.c:536
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
msgid "Role"
msgstr "角色"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
msgid "Spouse"
msgstr "配偶"
@@ -3156,55 +3205,55 @@ msgstr "单位"
msgid "Web Site"
msgstr "网站"
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../addressbook/gui/widgets/e-minicard-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
#: ../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/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
#: ../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-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:654
#: ../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
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
msgid "Width"
msgstr "宽度"
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
#: ../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/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
#: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../widgets/table/e-table-field-chooser-item.c:661
#: ../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
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
+#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
msgid "Height"
msgstr "高度"
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
msgid "Has Focus"
msgstr "有焦点"
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
msgid "Field"
msgstr "域"
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
msgid "Field Name"
msgstr "域名"
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
msgid "Text Model"
msgstr "文字模型"
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
msgid "Max field name length"
msgstr "最大域名长度"
@@ -3274,83 +3323,83 @@ msgstr ""
msgid "Adapter"
msgstr "适配器"
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
msgid "Work Email"
msgstr "工作电子邮件"
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
msgid "Home Email"
msgstr "家庭电子邮件"
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
msgid "Other Email"
msgstr "其它电子邮件"
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
msgid "Selected"
msgstr "已选择"
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
msgid "Has Cursor"
msgstr "有光标"
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
msgid "_Open Link in Browser"
msgstr "在浏览器中打开链接(_O)"
-#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2795
+#: ../addressbook/gui/widgets/eab-contact-display.c:170
+#: ../mail/em-folder-view.c:2752
msgid "_Copy Link Location"
msgstr "复制链接位置(_C)"
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
msgid "_Send New Message To..."
msgstr "把新信发送到(_S)..."
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
msgid "Copy _Email Address"
msgstr "复制电子邮件地址(_E)"
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:287
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
msgid "(map)"
msgstr "(地图)"
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:390
-#: ../addressbook/gui/widgets/eab-contact-display.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:297
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:393
msgid "map"
msgstr "地图"
-#: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:846
+#: ../addressbook/gui/widgets/eab-contact-display.c:478
+#: ../addressbook/gui/widgets/eab-contact-display.c:838
msgid "List Members"
msgstr "列出成员"
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
msgid "Department"
msgstr "部门"
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
msgid "Profession"
msgstr "职业"
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
msgid "Position"
msgstr "位置"
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
msgid "Video Chat"
msgstr "视频聊天"
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../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
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../calendar/gui/calendar-commands.c:90
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:2512
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
#: ../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
@@ -3361,207 +3410,202 @@ msgstr "视频聊天"
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:115
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/event-editor.c:116
msgid "Free/Busy"
msgstr "忙/闲"
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
msgid "Phone"
msgstr "电话"
-#: ../addressbook/gui/widgets/eab-contact-display.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
msgid "Fax"
msgstr "传真"
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
msgid "Home Page"
msgstr "主页"
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
msgid "Web Log"
msgstr "Web 日志"
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../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
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../calendar/gui/e-calendar-view.c:2538
msgid "Birthday"
msgstr "生日"
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../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
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../calendar/gui/e-calendar-view.c:2539
msgid "Anniversary"
msgstr "纪念日"
-#: ../addressbook/gui/widgets/eab-contact-display.c:864
+#: ../addressbook/gui/widgets/eab-contact-display.c:856
msgid "Job Title"
msgstr "职称"
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:892
msgid "Home page"
msgstr "主页"
-#: ../addressbook/gui/widgets/eab-contact-display.c:908
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
msgid "Blog"
msgstr "Blog"
#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
msgid "Success"
msgstr "成功"
#. E_BOOK_ERROR_INVALID_ARG
#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
msgid "Backend busy"
msgstr "后台忙"
#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
msgid "Repository offline"
msgstr "仓库脱机"
#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
msgid "Address Book does not exist"
msgstr "地址簿不存在"
#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
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:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
msgid "Permission denied"
msgstr "没有权限"
#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
msgid "Contact not found"
msgstr "找不到联系人"
#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
msgid "Contact ID already exists"
msgstr "联系人 ID 已经存在"
#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
msgid "Protocol not supported"
msgstr "不支持的协议"
#. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../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:240
-#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model-tasks.c:364
+#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-calendar-table.c:239
+#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2561
msgid "Canceled"
msgstr "已取消"
#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
msgid "Could not cancel"
msgstr "无法取消"
#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:433
msgid "Authentication Failed"
msgstr "认证失败"
#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:427
msgid "Authentication Required"
msgstr "必须认证"
#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
msgid "TLS not Available"
msgstr "TLS 不可用"
#. E_BOOK_ERROR_CORBA_EXCEPTION
#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
msgid "No such source"
msgstr "没有来源"
#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
msgid "Not available in offline mode"
msgstr "脱机模式下不可用"
#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
msgid "Other error"
msgstr "其它错误"
#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
msgid "Invalid server version"
msgstr "无效的服务器版本"
#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
msgid "Unsupported authentication method"
msgstr "不支持的认证方式"
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+#| msgid ""
+#| "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 address book once in online mode to download its contents"
msgid ""
-"We were unable to open this address book. This either means this book is not "
+"This address book cannot be opened. This either means this book is not "
"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book 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:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
#, c-format
msgid ""
-"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:125
-msgid ""
-"We were unable to open this address book. This either means you have "
-"entered an incorrect URI, or the LDAP server is unreachable."
+"This address book cannot be opened. Please check that the path %s exists "
+"and that permissions are set to access it."
msgstr ""
-"我们无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为 LDAP 服务器"
-"已经关闭。"
+"无法打开此地址簿。请检查路径 %s 是否存在以及您是否有足够的权限访问它。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:130
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
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 "
-"Evolution package."
+"This version of Evolution does not have LDAP support compiled in to it. To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
msgstr ""
"本版本的 Evolution 并没有把 LDAP 支持编译进去。如果您希望在 Evolution 中使用 "
"LDAP,就必须安装启用了 LDAP 的 Evolution 包。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
msgid ""
-"We were unable to open this address book. This either means you have "
-"entered an incorrect URI, or the server is unreachable."
+"This address book cannot be opened. This either means that an incorrect URI "
+"was entered, or the server is unreachable."
msgstr ""
-"我们无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为服务器已经"
+"无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为服务器已经"
"关闭。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:143
-msgid "Detailed error:"
-msgstr "错误细节:"
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+msgid "Detailed error message:"
+msgstr "错误细节消息:"
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -3572,56 +3616,56 @@ msgstr ""
"Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
"搜索条件,或者在此地址簿的目录服务器参数中将结果限制调高。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this address book. Please make your search\n"
+"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 address book."
msgstr ""
-"执行此查询的时间超过了服务器限制,或者超过了您为此地址簿配置的限制。\n"
+"执行此查询的时间超过了服务器限制,或者超过了为此地址簿配置的限制。\n"
"请在搜索的时候指定更加严格的搜索条件,或者在此地址簿的目录服务器参数\n"
"中将时间限制调高。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
msgid "The backend for this address book was unable to parse this query."
msgstr "此地址簿的后端无法解析此查询。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:181
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
msgid "The backend for this address book refused to perform this query."
msgstr "此地址簿的后端拒绝执行此查询。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
msgid "This query did not complete successfully."
msgstr "此查询未成功完成。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
msgid "Error adding list"
msgstr "添加列表出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:206
-#: ../addressbook/gui/widgets/eab-gui-util.c:682
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
msgid "Error adding contact"
msgstr "添加联系人出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
msgid "Error modifying list"
msgstr "修改列表出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
msgid "Error modifying contact"
msgstr "修改联系人出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
msgid "Error removing list"
msgstr "删除列表出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
-#: ../addressbook/gui/widgets/eab-gui-util.c:632
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
msgid "Error removing contact"
msgstr "删除联系人出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
#, c-format
msgid ""
"Opening %d contact will open %d new window as well.\n"
@@ -3633,16 +3677,16 @@ msgstr[0] ""
"打开 %d 个联系人将同时打开 %d 个新窗口。\n"
"您真的想要显示所有联系人吗?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
msgid "_Don't Display"
msgstr "不显示(_D)"
-#: ../addressbook/gui/widgets/eab-gui-util.c:320
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
msgid "Display _All Contacts"
msgstr "显示全部联系人(_A)"
#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:346
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
#, c-format
msgid ""
"%s already exists\n"
@@ -3651,64 +3695,64 @@ msgstr ""
"%s 已经存在\n"
"您打算覆盖它吗?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:350
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
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:391
-#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
msgid "contact"
msgid_plural "contacts"
msgstr[0] "联系人"
#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:440
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
msgid "card.vcf"
msgstr "card.vcf"
-#: ../addressbook/gui/widgets/eab-gui-util.c:477
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
msgid "Select Address Book"
msgstr "选择地址簿"
-#: ../addressbook/gui/widgets/eab-gui-util.c:591
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
msgid "list"
msgstr "列表"
-#: ../addressbook/gui/widgets/eab-gui-util.c:743
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
msgid "Move contact to"
msgstr "将联系人移至"
-#: ../addressbook/gui/widgets/eab-gui-util.c:745
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
msgid "Copy contact to"
msgstr "将联系人复制到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
msgid "Move contacts to"
msgstr "将联系人移至"
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
msgid "Copy contacts to"
msgstr "将联系人复制到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:895
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
msgid "Multiple vCards"
msgstr "多个 vCard"
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
#, c-format
msgid "vCard for %s"
msgstr "%s 的 vCard"
-#: ../addressbook/gui/widgets/eab-gui-util.c:914
-#: ../addressbook/gui/widgets/eab-gui-util.c:940
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
#, c-format
msgid "Contact information"
msgstr "联系人信息"
-#: ../addressbook/gui/widgets/eab-gui-util.c:942
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
#, c-format
msgid "Contact information for %s"
msgstr "%s 的联系人信息"
@@ -3717,22 +3761,22 @@ msgstr "%s 的联系人信息"
msgid "Querying Address Book..."
msgstr "正在查询地址簿..."
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
#, c-format
msgid "There is one other contact."
msgid_plural "There are %d other contacts."
msgstr[0] "有另外 %d 个联系人。"
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
msgid "Show Full vCard"
msgstr "显示完整 vCard"
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
msgid "Show Compact vCard"
msgstr "显示紧凑 vCard"
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
msgid "Save in address book"
msgstr "保存在地址簿中"
@@ -3741,10 +3785,10 @@ msgid "Card View"
msgstr "名片视图"
#: ../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:306
-#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:308
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
msgid "Importing..."
msgstr "正在导入..."
@@ -3772,19 +3816,19 @@ msgstr "Evolution CSV 或 Tab (.csv, .tab)"
msgid "Evolution CSV and Tab Importer"
msgstr "Evolution CSV 和 Tab 导入器"
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
msgid "LDAP Data Interchange Format (.ldif)"
msgstr "LDAP 数据交换格式(.ldif)"
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
msgid "Evolution LDIF importer"
msgstr "Evolution LDIF 导入器"
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:549
msgid "vCard (.vcf, .gcrd)"
msgstr "vCard (.vfg, .gcrd)"
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:550
msgid "Evolution vCard Importer"
msgstr "Evolution vCard 导入器"
@@ -3829,11 +3873,11 @@ msgid "Format"
msgstr "格式"
#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:502
+#: ../mail/em-mailer-prefs.c:433 ../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:1908
+#: ../widgets/table/e-table-field-chooser-item.c:647
+#: ../widgets/table/e-table-field-chooser.c:80
+#: ../widgets/table/e-table-header-item.c:1907
#: ../widgets/table/e-table-selection-model.c:309
msgid "Header"
msgstr "页眉"
@@ -3936,9 +3980,9 @@ msgstr "阴影"
#. FIXME: Take care of i18n
#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c:232
-#: ../plugins/exchange-operations/exchange-contacts.c:217
+#: ../plugins/exchange-operations/exchange-account-setup.c:1141
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
msgid "Size:"
msgstr "大小:"
@@ -3967,29 +4011,8 @@ msgstr "宽度:"
msgid "_Font..."
msgstr "字体(_F)..."
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-msgid "Contact Print Style Editor Test"
-msgstr "联系人打印样式编辑器测试"
-
-#: ../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:57
-msgid "This should test the contact print style editor widget"
-msgstr "这应该测试联系人打印样式编辑器部件"
-
-#: ../addressbook/printing/test-print.c:44
-msgid "Contact Print Test"
-msgstr "联系人打印测试"
-
-#: ../addressbook/printing/test-print.c:47
-msgid "This should test the contact print code"
-msgstr "这应该测试联系人打印代码"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
msgid "Can not open file"
msgstr "无法打开文件"
@@ -4002,58 +4025,58 @@ msgstr "无法获得地址簿列表"
msgid "failed to open book"
msgstr "打开地址簿失败"
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
msgid "Specify the output file instead of standard output"
msgstr "指定用来取代标准输出的输出文件"
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
msgid "OUTPUTFILE"
msgstr "输出文件"
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:52
msgid "List local address book folders"
msgstr "列出本地地址簿文件夹"
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
msgid "Show cards as vcard or csv file"
msgstr "将名片显示为 vcard 还是 csv 文件"
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
msgid "[vcard|csv]"
msgstr "[vcard|csv]"
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
msgid "Export in asynchronous mode"
msgstr "以异步模式导出"
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
msgid ""
"The number of cards in one output file in asynchronous mode, default size "
"100."
msgstr "异步模式中一个输出文件中的名片数,默认大小为 100。"
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
msgid "NUMBER"
msgstr "数字"
-#: ../addressbook/tools/evolution-addressbook-export.c:102
+#: ../addressbook/tools/evolution-addressbook-export.c:101
msgid ""
"Command line arguments error, please use --help option to see the usage."
msgstr "命令行参数错误,请使用 --help 选项查看用法。"
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
msgid "Only support csv or vcard format."
msgstr "仅支持 csv 或 vcard 格式。"
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
msgid "In async mode, output must be file."
msgstr "在异步模式中,输出必须是文件。"
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
msgid "In normal mode, there is no need for the size option."
msgstr "在普通模式中,不应该有大小选项。"
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
msgid "Unhandled error"
msgstr "未处理的错误"
@@ -4148,19 +4171,19 @@ msgid "Are you sure you want to delete this appointment?"
msgstr "您确信您要删除该约会吗?"
#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
#, c-format
msgid "Are you sure you want to delete this meeting?"
msgstr "您确信您要删除该会议吗?"
#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
#, c-format
msgid "Are you sure you want to delete this memo?"
msgstr "您确信您要删除该备忘吗?"
#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
#, c-format
msgid "Are you sure you want to delete this task?"
msgstr "您确定要删除此任务吗?"
@@ -4178,183 +4201,216 @@ msgid "Are you sure you want to send the task without a summary?"
msgstr "您确定想要发送没有摘要的任务吗?"
#: ../calendar/calendar.error.xml.h:28
+msgid "Calendar repository is offline."
+msgstr "日历仓库脱机。"
+
+#: ../calendar/calendar.error.xml.h:29
msgid "Cannot create a new event"
msgstr "无法创建新事件"
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
msgid "Cannot save event"
msgstr "无法保存事件"
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
msgid "Delete calendar '{0}'?"
msgstr "删除日历“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
msgid "Delete memo list '{0}'?"
msgstr "删除备忘列表“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
msgid "Delete task list '{0}'?"
msgstr "删除任务列表“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
msgid "Do _not Send"
msgstr "不发送(_N)"
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
msgid "Download in progress. Do you want to save the appointment?"
msgstr "下载进行中。您想要保存约会吗?"
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
msgid "Download in progress. Do you want to save the task?"
msgstr "下载进行中。您想要保存任务吗?"
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
msgid "Editor could not be loaded."
msgstr "无法装入编辑器。"
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
msgid ""
"Email invitations will be sent to all participants and allow them to accept "
"this task."
msgstr "将会向全部出席者发送电子邮件邀请,并允许他们接受此任务。"
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
msgid ""
"Email invitations will be sent to all participants and allow them to reply."
msgstr "将会向全部出席者发送电子邮件邀请,并允许他们答复。"
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
msgid "Error loading calendar"
msgstr "装入日历时出错"
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
msgid "Error loading memo list"
msgstr "装入备忘列表出错"
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
msgid "Error loading task list"
msgstr "装入任务列表出错"
-#: ../calendar/calendar.error.xml.h:42
+#. For Translators: {0} is specify the backend server
+#: ../calendar/calendar.error.xml.h:44
+msgid "Error on '{0}'"
+msgstr "{0} 出错"
+
+#: ../calendar/calendar.error.xml.h:45
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:43
+#: ../calendar/calendar.error.xml.h:46
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:44
+#: ../calendar/calendar.error.xml.h:47
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:45
+#: ../calendar/calendar.error.xml.h:48
+msgid "No response from the server."
+msgstr "服务器无响应。"
+
+#: ../calendar/calendar.error.xml.h:49
+msgid "Save Appointment"
+msgstr "保存约会"
+
+#: ../calendar/calendar.error.xml.h:50
+msgid "Save Memo"
+msgstr "保存备忘"
+
+#: ../calendar/calendar.error.xml.h:51
+msgid "Save Task"
+msgstr "保存任务"
+
+#: ../calendar/calendar.error.xml.h:52
msgid ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
msgstr "发送更新的信息将允许其他出席者使他们的日历保持最新。"
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:53
msgid ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
msgstr "发送更新的信息允许其他出席者使他们的任务列表保持最新。"
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:55
msgid ""
"Some attachments are being downloaded. Saving the appointment would result "
"in the loss of these attachments."
msgstr "附件正在下载中。保存约会将使得约会保存时无法包含后续的附件。"
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:56
msgid ""
"Some attachments are being downloaded. Saving the task would result in the "
"loss of these attachments."
msgstr "附件正在下载中。保存任务将使得任务保存时无法包含后续的附件。"
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:57
msgid "Some features may not work properly with your current server."
msgstr "某些特性可能无法在您目前的服务器下工作。"
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:58
msgid "The Evolution calendar has quit unexpectedly."
msgstr "Evolution 日历异常退出。"
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:59
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "Evolution 日历异常退出。"
+
+#: ../calendar/calendar.error.xml.h:60
msgid "The Evolution memo has quit unexpectedly."
msgstr "Evolution 备忘异常退出。"
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:61
msgid "The Evolution tasks have quit unexpectedly."
msgstr "Evolution 任务异常退出。"
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:62
msgid "The calendar is not marked for offline usage."
msgstr "日历未标为脱机使用。"
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:63
msgid "The memo list is not marked for offline usage."
msgstr "备忘列表未标为脱机使用。"
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:64
msgid "The task list is not marked for offline usage."
msgstr "任务列表未标为脱机使用。"
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:65
msgid "This calendar will be removed permanently."
msgstr "此日历将被永久删除。"
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:66
msgid "This memo list will be removed permanently."
msgstr "此备忘列表将被永久删除。"
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:67
msgid "This task list will be removed permanently."
msgstr "此任务列表将被永久删除。"
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:68
+msgid "Unable to load the calendar"
+msgstr "无法装入日历"
+
+#: ../calendar/calendar.error.xml.h:69
msgid "Would you like to save your changes to this appointment?"
msgstr "您想要保存对约会的更改吗?"
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:70
msgid "Would you like to save your changes to this memo?"
msgstr "您想要保存对此备忘的更改吗?"
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:71
msgid "Would you like to save your changes to this task?"
msgstr "您想要保存对此任务的更改吗?"
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:72
msgid "Would you like to send a cancelation notice for this memo?"
msgstr "您是否想要为此备忘发送取消通知?"
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:73
msgid "Would you like to send all the participants a cancelation notice?"
msgstr "您是否想要给全部出席者发送取消通知?"
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:74
msgid "Would you like to send meeting invitations to participants?"
msgstr "您是否想要给出席者发送会议邀请?"
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:75
msgid "Would you like to send this task to participants?"
msgstr "您是否想要将此任务发送给出席者?"
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:76
msgid "Would you like to send updated meeting information to participants?"
msgstr "您是否想要给出席者发送更新的会议信息?"
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:77
msgid "Would you like to send updated task information to participants?"
msgstr "您是否想要给出席者发送更新的任务信息?"
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:78
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results, the server should be upgraded to "
@@ -4363,107 +4419,107 @@ msgstr ""
"您正在连接到不支持的 GroupWise 服务器,此时使用 Evolution 可能遇到问题。为了"
"得到最佳效果,服务器应该升级到支持的版本。"
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:79
msgid "You have changed this appointment, but not yet saved it."
msgstr "您已经更改了此约会,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:80
msgid "You have changed this task, but not yet saved it."
msgstr "您已经对此任务做出了更改,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:81
msgid "You have made changes to this memo, but not yet saved them."
msgstr "您已经对此备忘做出了更改,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:82
msgid "Your calendars will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的日历无法使用。"
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:83
msgid "Your memos will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的备忘将无法使用。"
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:84
msgid "Your tasks will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的任务将无法使用。"
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:85
#: ../composer/mail-composer.error.xml.h:30
msgid "_Discard Changes"
msgstr "丢弃更改(_D)"
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
msgid "_Save"
msgstr "保存(_S)"
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:87
msgid "_Save Changes"
msgstr "保存更改(_S)"
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:88
#: ../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:79
+#: ../calendar/calendar.error.xml.h:89
msgid "_Send Notice"
msgstr "发送通知(_S)"
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:90
msgid "{0}."
msgstr "{0}。"
-#: ../calendar/conduits/calendar/calendar-conduit.c:256
+#: ../calendar/conduits/calendar/calendar-conduit.c:258
msgid "Split Multi-Day Events:"
msgstr "分割多日事件:"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1521
-#: ../calendar/conduits/calendar/calendar-conduit.c:1522
-#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/calendar/calendar-conduit.c:1523
+#: ../calendar/conduits/calendar/calendar-conduit.c:1524
#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/memo/memo-conduit.c:822
#: ../calendar/conduits/todo/todo-conduit.c:1019
+#: ../calendar/conduits/todo/todo-conduit.c:1020
msgid "Could not start evolution-data-server"
msgstr "无法启动 evolution-data-server"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1629
-#: ../calendar/conduits/calendar/calendar-conduit.c:1632
+#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1634
msgid "Could not read pilot's Calendar application block"
msgstr "无法读入 Pilot 日历应用程序块"
-#: ../calendar/conduits/memo/memo-conduit.c:914
-#: ../calendar/conduits/memo/memo-conduit.c:917
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
msgid "Could not read pilot's Memo application block"
msgstr "无法读入 Pilot 的备忘应用程序块"
-#: ../calendar/conduits/memo/memo-conduit.c:961
-#: ../calendar/conduits/memo/memo-conduit.c:964
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
msgid "Could not write pilot's Memo application block"
msgstr "无法写入 Pilot 备忘应用程序块"
-#: ../calendar/conduits/todo/todo-conduit.c:240
+#: ../calendar/conduits/todo/todo-conduit.c:241
msgid "Default Priority:"
msgstr "默认优先级:"
-#: ../calendar/conduits/todo/todo-conduit.c:1102
-#: ../calendar/conduits/todo/todo-conduit.c:1105
+#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1106
msgid "Could not read pilot's ToDo application block"
msgstr "无法读入 Pilot ToDo 应用程序块"
-#: ../calendar/conduits/todo/todo-conduit.c:1147
-#: ../calendar/conduits/todo/todo-conduit.c:1150
+#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1151
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:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2523
msgid "Calendar and Tasks"
msgstr "日历和任务"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:805
-#: ../calendar/gui/calendar-component.c:1402
+#: ../calendar/gui/calendar-component.c:851
+#: ../calendar/gui/calendar-component.c:1325
msgid "Calendars"
msgstr "日历"
@@ -4504,22 +4560,22 @@ 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: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
+#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
+#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:586
+#: ../calendar/gui/memos-component.c:1016 ../calendar/gui/memos-control.c:350
+#: ../calendar/gui/memos-control.c:366
msgid "Memos"
msgstr "备忘"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../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: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
+#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
+#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
+#: ../calendar/gui/tasks-component.c:577
+#: ../calendar/gui/tasks-component.c:1005 ../calendar/gui/tasks-control.c:482
+#: ../calendar/gui/tasks-control.c:498
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
#: ../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
@@ -4540,24 +4596,25 @@ msgstr "任务(_T)"
msgid "Evolution Calendar alarm notification service"
msgstr "Evolution 日历提醒通知服务"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
msgid "minute"
msgid_plural "minutes"
msgstr[0] "分钟"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:119
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/caldav/caldav-source.c:431
#: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:663
-#: ../plugins/google-account-setup/google-contacts-source.c:329
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:672
+#: ../plugins/google-account-setup/google-contacts-source.c:339
msgid "hours"
msgid_plural "hours"
msgstr[0] "小时"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
msgid "Start time"
msgstr "开始时间"
@@ -4568,10 +4625,10 @@ msgstr "约会"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../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
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1614
+#: ../calendar/gui/e-itip-control.c:1167
+#: ../plugins/itip-formatter/itip-view.c:1018
msgid "Location:"
msgstr "位置:"
@@ -4580,52 +4637,56 @@ msgid "Snooze _time:"
msgstr "午睡时间(_T):"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+msgid "_Dismiss"
+msgstr "错过(_D)"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1382
#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
#: ../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-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
#: ../widgets/menus/gal-define-views.glade.h:5
msgid "_Edit"
msgstr "编辑(_E)"
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
msgid "_Snooze"
msgstr "午睡(_S)"
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
msgid "location of appointment"
msgstr "约会位置"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
msgid "No summary available."
msgstr "没有可用的摘要。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
msgid "No description available."
msgstr "没有描述。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
msgid "No location information available."
msgstr "没有可用的位置信息。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
#, c-format
msgid "You have %d alarms"
msgstr "您有 %d 个提醒"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+#: ../e-util/e-non-intrusive-error-dialog.h:41
msgid "Warning"
msgstr "警告"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -4637,7 +4698,7 @@ msgstr ""
"发送电子邮件。Evolution 将以\n"
"显示普通提示会话框代替。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4653,15 +4714,15 @@ msgstr ""
"\n"
"您确信您要运行该程序吗?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
msgid "Do not ask me about this program again."
msgstr "不要再次询问此问题。"
-#: ../calendar/gui/alarm-notify/notify-main.c:138
+#: ../calendar/gui/alarm-notify/notify-main.c:141
msgid "Could not initialize Bonobo"
msgstr "无法初始化 Bonobo"
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:154
msgid ""
"Could not create the alarm notify service factory, maybe it's already "
"running..."
@@ -4672,7 +4733,7 @@ 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:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
#: ../calendar/gui/misc.c:116
#, c-format
msgid "%d hour"
@@ -4680,7 +4741,7 @@ 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:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
#: ../calendar/gui/misc.c:122
#, c-format
msgid "%d minute"
@@ -4690,7 +4751,7 @@ 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:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
#: ../calendar/gui/misc.c:126
#, c-format
msgid "%d second"
@@ -4702,253 +4763,291 @@ msgid "Alarm programs"
msgstr "提醒程序"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "在状态栏中显示错误的时间秒数。"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
msgid "Ask for confirmation when deleting items"
msgstr "删除项时要求确认"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
msgstr "今天到期任务的背景颜色,以“#rrggbb”格式。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
msgstr "延期任务的背景颜色,以“#rrggbb”格式。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
msgid "Calendars to run alarms for"
msgstr "运行提醒的日历"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
msgid ""
"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
msgstr "在时间栏中绘制 Marcus Bains 线的颜色(默认为空)。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
msgid "Color to draw the Marcus Bains line in the Day View."
msgstr "在日视图中绘制 Marcus Bains 线的颜色。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
msgid "Compress weekends in month view"
msgstr "在月视图中压缩周末"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
msgid "Confirm expunge"
msgstr "确认销毁"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
msgid "Days on which the start and end of work hours should be indicated."
msgstr "标为工作日的日子。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
msgid "Default appointment reminder"
msgstr "默认约会提醒"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
msgid "Default reminder units"
msgstr "默认提醒单位"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
msgid "Default reminder value"
msgstr "默认提醒值"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
msgid "Directory for saving alarm audio files"
msgstr "保存提醒音频文件的目录"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
msgid "Event Gradient"
msgstr "事件渐变"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
msgid "Event Transparency"
msgstr "事件透明度"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
msgid "Free/busy server URLs"
msgstr "忙/闲服务器 URL"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
msgid "Free/busy template URL"
msgstr "忙/闲模板 URL"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
msgid "Gradient of the events in calendar views."
msgstr "日历视图中事件的渐变。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
msgid "Hide completed tasks"
msgstr "隐藏已完成的任务"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
msgid "Hide task units"
msgstr "隐藏任务单位"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
msgid "Hide task value"
msgstr "隐藏任务值"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
msgid "Horizontal pane position"
msgstr "水平面板位置"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
msgstr "工作日结束的小时,以 24 小时格式表示,0 到 23。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
msgstr "工作日开始的小时,以 24 小时格式表示,0 到 23。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
msgid "Intervals shown in Day and Work Week views, in minutes."
msgstr "日视图和工作日视图中显示的间隔,以分钟计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
msgid "Last alarm time"
msgstr "上次提醒时间"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid "Level beyond which the message should be logged."
+msgstr "大于此级别的消息会被记录。"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
msgid "List of server URLs for free/busy publishing."
msgstr "列出发表忙/闲的服务器 URL。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
msgid "Marcus Bains Line"
msgstr "Marcus Bains 线"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
msgid "Marcus Bains Line Color - Day View"
msgstr "Marcus Bains 线颜色 - 日视图"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
msgid "Marcus Bains Line Color - Time bar"
msgstr "Marcus Bains 线颜色 - 日期栏"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Maximum number of recently used timezones to remember."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
msgid "Minute the workday ends on, 0 to 59."
msgstr "工作日结束的分钟,0 到 59。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
msgid "Minute the workday starts on, 0 to 59."
msgstr "工作日开始的分钟,0 到 59。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
msgid "Month view horizontal pane position"
msgstr "月视图水平面板的位置"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
msgid "Month view vertical pane position"
msgstr "月视图中垂直面板的位置"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
msgid "Number of units for determining a default reminder."
msgstr "确定默认提醒的单位数量。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
msgid "Number of units for determining when to hide tasks."
msgstr "决定何时隐藏任务的数字单位。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
msgid "Overdue tasks color"
msgstr "延期任务的颜色"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
msgid ""
"Position of the horizontal pane, between the date navigator calendar and the "
"task list when not in the month view, in pixels."
msgstr "非月视图中日期导航器日历和任务列表之间水平面板的位置,以像素计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
msgid ""
"Position of the horizontal pane, between the view and the date navigator "
"calendar and task list in the month view, in pixels."
msgstr "月视图中视图和日期导航器日历之间水平面板的位置,以像素计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
msgid ""
"Position of the vertical pane, between the calendar lists and the date "
"navigator calendar."
msgstr "日历列表和日期导航器日历之间垂直面板的位置。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
msgid ""
"Position of the vertical pane, between the task list and the task preview "
"pane, in pixels."
msgstr "任务列表和任务预览面板间垂直面板的位置,以像素计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
msgid ""
"Position of the vertical pane, between the view and the date navigator "
"calendar and task list in the month view, in pixels."
msgstr "月视图中视图和日期导航器日历及任务列表之间垂直面板的位置,以像素计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
msgid ""
"Position of the vertical pane, between the view and the date navigator "
"calendar and task list when not in the month view, in pixels."
msgstr "非月视图中视图和日期导航器日历及任务列表之间垂直面板的位置,以像素计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
msgid "Programs that are allowed to be run by alarms."
msgstr "允许提醒运行的程序。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+msgid "Recently used second time zones in a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
msgid "Save directory for alarm audio"
msgstr "保存提醒音频的目录"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
msgid "Show RSVP field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示请回复域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
msgid "Show Role field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示角色域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
msgid "Show appointment end times in week and month views"
msgstr "在周视图和月视图中显示约会结束时间"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
msgid "Show categories field in the event/meeting/task editor"
msgstr "在事件/会议/任务编辑器中显示分类域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
msgid "Show display alarms in notification tray"
msgstr "在通知托盘中显示提醒"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
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:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:126
msgid "Show the \"Preview\" pane"
msgstr "显示“预览”面板"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:127
msgid "Show the \"Preview\" pane."
msgstr "显示“预览”面板。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
msgid "Show timezone field in the event/meeting editor"
msgstr "在事件/会议编辑器中显示时区域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
msgid "Show type field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示类型域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+msgid "Show week number in Day and Work Week View"
+msgstr "在日和工作日视图中显示周数"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
msgid "Show week numbers in date navigator"
msgstr "在日期导航器中显示周数"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
msgid "Tasks due today color"
msgstr "今天到期的任务颜色"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
msgid "Tasks vertical pane position"
msgstr "任务垂直面板位置"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
#, no-c-format
msgid ""
"The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4957,7 +5056,7 @@ msgstr ""
"用作忙/闲数据发布的 URL 模板,%u 将替换为电子邮件的用户部分,而 %d 将替换为域"
"名。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
msgid ""
"The default timezone to use for dates and times in the calendar, as an "
"untranslated Olsen timezone database location like \"America/New York\"."
@@ -4965,202 +5064,211 @@ msgstr ""
"日历中日期和时间所使用的默认时区,以未翻译的时区数据库位置表示,如“Asia/"
"Shanghai”。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+msgid "The second timezone for a Day View"
+msgstr "日视图的第二时区"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr "此选项有三种可能值:0-错误,1-警告,2-调试信息。"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
msgid "Time divisions"
msgstr "时间分割"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
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:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../plugins/startup-wizard/startup-wizard.c:109
msgid "Timezone"
msgstr "时区"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
msgid ""
"Transparency of the events in calendar views, a value between 0 "
"(transparent) and 1 (opaque)."
msgstr "日历视图中事件的透明度,应该介于 0(透明)和 1(不透明)之间。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
msgid "Twenty four hour time format"
msgstr "二十四小时时间格式"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
msgstr "默认提醒的单位,可为“minutes”,“hours”或“days”。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
msgid ""
"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
msgstr "决定是否隐藏任务的单位,可为“minutes”,“hours”或“days”。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
msgid "Week start"
msgstr "一周开始"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
msgstr "一周开始的日子,从星期日(0)到星期六(6)。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
msgid "Whether or not to use the notification tray for display alarms."
msgstr "是否使用通知托盘来显示提醒。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
msgid "Whether to ask for confirmation when deleting an appointment or task."
msgstr "删除约会或任务时是否要求确认。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
msgid "Whether to ask for confirmation when expunging appointments and tasks."
msgstr "销毁约会和任务时是否要求确认。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
msgid ""
"Whether to compress weekends in the month view, which puts Saturday and "
"Sunday in the space of one weekday."
msgstr "在月视图中是否压缩周末;压缩时将把周六和周日用一个单元格显示。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
msgid "Whether to display the end time of events in the week and month views."
msgstr "是否在周视图和月视图中显示事件的结束时间。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
msgid ""
"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
msgstr "是否在日历中绘制 Marcus Bains 线(当前时间线)。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
msgid "Whether to hide completed tasks in the tasks view."
msgstr "是否在任务视图中隐藏已完成的任务。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
msgid "Whether to set a default reminder for appointments."
msgstr "是否为约会设置默认提醒。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
msgid "Whether to show RSVP field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示请回复域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
msgid "Whether to show categories field in the event/meeting editor"
msgstr "是否在事件/会议编辑器中显示分类域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
msgid "Whether to show role field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议中显示角色域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
msgid "Whether to show status field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示状态域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
msgid ""
"Whether to show times in twenty four hour format instead of using am/pm."
msgstr "是以 24 小时格式还是以 12 小时格式显示时间。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
msgid "Whether to show timezone field in the event/meeting editor"
msgstr "是否在事件/会议编辑器中显示时区域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
msgid "Whether to show type field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示类型域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+msgid "Whether to show week number in the Day and Work Week View."
+msgstr "是否在日视图和工作日视图中显示周数。"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
msgid "Whether to show week numbers in the date navigator."
msgstr "是否在日期导航器中显示周数。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
msgid "Whether to use daylight savings time while displaying events."
msgstr "在显示事件时使用是否夏时制时间。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
msgid "Work days"
msgstr "工作日"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
msgid "Workday end hour"
msgstr "工作日结束小时"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
msgid "Workday end minute"
msgstr "工作日结束分钟"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
msgid "Workday start hour"
msgstr "工作日开始小时"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
msgid "Workday start minute"
msgstr "工作日开始分钟"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
msgid "daylight savings time"
msgstr "夏时制时间"
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
msgid "Summary contains"
msgstr "概要含有"
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
msgid "Description contains"
msgstr "描述含有"
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
msgid "Category is"
msgstr "类别为"
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
msgid "Comment contains"
msgstr "注释含有"
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
msgid "Location contains"
msgstr "位置含有"
-#: ../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:637
+#: ../calendar/gui/cal-search-bar.c:640
msgid "Next 7 Days' Tasks"
msgstr "下一周的任务"
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:644
msgid "Active Tasks"
msgstr "活动任务"
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:648
msgid "Overdue Tasks"
msgstr "延期任务"
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:652
msgid "Completed Tasks"
msgstr "已完成任务"
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:656
msgid "Tasks with Attachments"
msgstr "有附件的任务"
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:702
msgid "Active Appointments"
msgstr "活动约会"
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:706
msgid "Next 7 Days' Appointments"
msgstr "下一周的约会"
-#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:90 ../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:317
+#: ../calendar/gui/calendar-commands.c:315
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 "
@@ -5168,16 +5276,17 @@ msgid ""
msgstr ""
"该操作将永久删除所有比选中时间量早的事件。如果您继续,您将无法恢复这些事件。"
-#: ../calendar/gui/calendar-commands.c:323
+#: ../calendar/gui/calendar-commands.c:321
msgid "Purge events older than"
msgstr "销毁较早的事件"
-#: ../calendar/gui/calendar-commands.c:328
+#: ../calendar/gui/calendar-commands.c:326
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/caldav/caldav-source.c:432
#: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:664
-#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:673
+#: ../plugins/google-account-setup/google-contacts-source.c:340
#: ../widgets/misc/e-send-options.glade.h:39
msgid "days"
msgstr "天"
@@ -5186,99 +5295,109 @@ msgstr "天"
#. Create the LDAP source group
#. Create the Webcal source group
#. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
+#: ../calendar/gui/calendar-component.c:281
#: ../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:310 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:318 ../calendar/gui/migration.c:399
msgid "Birthdays & Anniversaries"
msgstr "生日和纪念日"
#. Create the weather group
-#: ../calendar/gui/calendar-component.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:331
+#: ../plugins/calendar-weather/calendar-weather.c:126
msgid "Weather"
msgstr "天气"
-#: ../calendar/gui/calendar-component.c:615
+#: ../calendar/gui/calendar-component.c:658
msgid "_New Calendar"
msgstr "新建日历(_N)"
-#: ../calendar/gui/calendar-component.c:616
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2106
+#: ../calendar/gui/calendar-component.c:659
+#: ../calendar/gui/memos-component.c:500 ../calendar/gui/tasks-component.c:491
+#: ../mail/em-folder-tree.c:2124
msgid "_Copy..."
msgstr "复制(_C)..."
-#: ../calendar/gui/calendar-component.c:949
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/memos-component.c:505 ../calendar/gui/tasks-component.c:496
+msgid "_Make available for offline use"
+msgstr "标为可脱机使用(_M)"
+
+#: ../calendar/gui/calendar-component.c:665
+#: ../calendar/gui/memos-component.c:506 ../calendar/gui/tasks-component.c:497
+msgid "_Do not make available for offline use"
+msgstr "不标为可脱机使用(_D)"
+
+#: ../calendar/gui/calendar-component.c:995
msgid "Failed upgrading calendars."
msgstr "升级日历失败。"
-#: ../calendar/gui/calendar-component.c:1248
+#: ../calendar/gui/calendar-component.c:1176
#, c-format
msgid "Unable to open the calendar '%s' for creating events and meetings"
msgstr "无法打开日历“%s”来创建事件和会议"
-#: ../calendar/gui/calendar-component.c:1264
+#: ../calendar/gui/calendar-component.c:1192
msgid "There is no calendar available for creating events and meetings"
msgstr "没有可创建事件和会议的日历"
-#: ../calendar/gui/calendar-component.c:1377
+#: ../calendar/gui/calendar-component.c:1305
msgid "Calendar Source Selector"
msgstr "日历源选择器"
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1521
msgid "New appointment"
msgstr "新建约会"
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1522
msgctxt "New"
msgid "_Appointment"
msgstr "约会(_A)"
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1523
msgid "Create a new appointment"
msgstr "创建新约会"
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1529
msgid "New meeting"
msgstr "新建会议"
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1530
msgctxt "New"
msgid "M_eeting"
msgstr "会议(_E)"
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1531
msgid "Create a new meeting request"
msgstr "创建一条新会议请求"
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1537
msgid "New all day appointment"
msgstr "新建全天约会"
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1538
msgctxt "New"
msgid "All Day A_ppointment"
msgstr "全天约会(_P)"
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1539
msgid "Create a new all-day appointment"
msgstr "创建新全天约会"
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1545
msgid "New calendar"
msgstr "新建日历"
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1546
msgctxt "New"
msgid "Cale_ndar"
msgstr "日历(_N)"
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1547
msgid "Create a new calendar"
msgstr "创建新日历"
@@ -5288,7 +5407,7 @@ msgstr "日视图"
#: ../calendar/gui/calendar-view-factory.c:116
msgid "Work Week View"
-msgstr "周工作视图"
+msgstr "工作日视图"
#: ../calendar/gui/calendar-view-factory.c:119
msgid "Week View"
@@ -5298,233 +5417,130 @@ msgstr "周视图"
msgid "Month View"
msgstr "月视图"
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
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
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
msgid "Attachments"
msgstr "附件"
-#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:4
#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:6
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
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
msgid "Category"
msgstr "类别"
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
#: ../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
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/memotypes.xml.h:6
msgid "Confidential"
msgstr "机密"
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:10
#: ../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
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
msgid "Description Contains"
msgstr "描述含有"
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../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
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../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/caltypes.xml.h:13
#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
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
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/memotypes.xml.h:12
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
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
+#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
msgid "Public"
msgstr "公开"
-#: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:299
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/dialogs/event-editor.c:304
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/caltypes.xml.h:17
#: ../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
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
+#: ../plugins/save-calendar/csv-format.c:362
msgid "Summary"
msgstr "概要"
-#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
-#: ../calendar/gui/tasktypes.xml.h:41
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
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
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../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
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../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
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../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
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
msgid "is not"
msgstr "不是"
-#: ../calendar/gui/comp-editor-factory.c:405
+#: ../calendar/gui/comp-editor-factory.c:409
msgid "Error while opening the calendar"
msgstr "打开日历时出错"
-#: ../calendar/gui/comp-editor-factory.c:411
+#: ../calendar/gui/comp-editor-factory.c:415
msgid "Method not supported when opening the calendar"
msgstr "打开日历的方法不支持"
-#: ../calendar/gui/comp-editor-factory.c:417
+#: ../calendar/gui/comp-editor-factory.c:421
msgid "Permission denied to open the calendar"
msgstr "没有权限打开日历"
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
msgid "Unknown error"
msgstr "未知的错误"
@@ -5561,17 +5577,17 @@ msgid "Mes_sage:"
msgstr "消息(_S):"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
msgid "Play a sound"
msgstr "播放声音"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
msgid "Pop up an alert"
msgstr "弹出警告"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
msgid "Run a program"
msgstr "运行程序"
@@ -5584,7 +5600,7 @@ msgid "Send To:"
msgstr "发送给:"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
msgid "Send an email"
msgstr "发送电子邮件"
@@ -5648,25 +5664,52 @@ msgid "A_dd"
msgstr "添加(_D)"
#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
#: ../calendar/gui/dialogs/event-page.glade.h:4
msgid "Alarms"
msgstr "提醒"
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
-#: ../composer/e-composer-actions.c:64
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
+#: ../composer/e-composer-actions.c:62
msgid "_Suggest automatic display of attachment"
msgstr "建议自动显示附件(_S)"
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
msgid "Attach file(s)"
msgstr "添加附件"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/event-page.c:2954
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-day-view-time-item.c:788
+#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
+#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../plugins/calendar-weather/calendar-weather.c:333
+#: ../plugins/calendar-weather/calendar-weather.c:387
+#: ../plugins/email-custom-header/email-custom-header.c:370
+#: ../plugins/exchange-operations/exchange-delegates-user.c:195
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:2179
+#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "无"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
msgid "Selected Calendars for Alarms"
msgstr "已选择用于提醒的日历"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "(Shown in a Day View)"
+msgstr "(在日视图中显示)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
msgid ""
"60 minutes\n"
"30 minutes\n"
@@ -5680,58 +5723,58 @@ msgstr ""
"10 分钟\n"
"5 分钟"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
#, no-c-format
msgid ""
"<i>%u and %d will be replaced by user and domain from the email address.</i>"
msgstr "<i>%u 和 %d 将被替换为电子邮件地址中的用户和域名。</i>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
#: ../mail/mail-config.glade.h:10
msgid "<span weight=\"bold\">Alerts</span>"
msgstr "<span weight=\"bold\">警告</span>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
msgstr "<span weight=\"bold\">默认忙/闲服务器</span>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
#: ../mail/mail-config.glade.h:17
#: ../plugins/publish-calendar/publish-calendar.glade.h:1
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">常规</span>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
msgid "<span weight=\"bold\">Task List</span>"
msgstr "<span weight=\"bold\">任务列表</span>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
msgid "<span weight=\"bold\">Time</span>"
msgstr "<span weight=\"bold\">时间</span>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">工作周</span>"
+msgstr "<span weight=\"bold\">工作日</span>"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
msgid "Adjust for daylight sa_ving time"
msgstr "调整夏时制时间(_V)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
msgid "Day _ends:"
msgstr "一天结束(_E):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
msgid "Display"
msgstr "显示"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/e-itip-control.c:733
msgid "Friday"
msgstr "星期五"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
msgid ""
"Minutes\n"
"Hours\n"
@@ -5741,13 +5784,13 @@ msgstr ""
"小时\n"
"天"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:729
msgid "Monday"
msgstr "星期一"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
msgid ""
"Monday\n"
"Tuesday\n"
@@ -5765,242 +5808,258 @@ msgstr ""
"星期六\n"
"星期日"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:113
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../mail/mail-config.glade.h:114
msgid "Pick a color"
msgstr "选取一种颜色"
#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
msgid "S_un"
msgstr "周日(_U)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/e-itip-control.c:734
msgid "Saturday"
msgstr "星期六"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "Se_cond zone:"
+msgstr "第二时区(_C):"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
msgid "Select the calendars for alarm notification"
msgstr "选择用于提醒的日历"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
msgid "Sh_ow a reminder"
msgstr "显示一条提醒(_O)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show a _reminder"
+msgstr "显示一条提醒(_R)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
msgid "Show week _numbers in date navigator"
msgstr "在日期浏览器中显示周数(_N)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "在日视图和工作日视图中显示周数(_U)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/e-itip-control.c:728
msgid "Sunday"
msgstr "星期日"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
msgid "T_asks due today:"
msgstr "今天到期的任务(_A):"
#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
msgid "T_hu"
msgstr "周四(_H)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
msgid "Template:"
msgstr "模板:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/e-itip-control.c:732
msgid "Thursday"
msgstr "星期四"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
#: ../calendar/gui/dialogs/event-page.glade.h:12
msgid "Time _zone:"
msgstr "时区(_Z):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
msgid "Time format:"
msgstr "时间格式:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:730
msgid "Tuesday"
msgstr "星期二"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:731
msgid "Wednesday"
msgstr "星期三"
#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
msgid "Wee_k starts on:"
msgstr "一周开始于(_K):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
msgid "Work days:"
msgstr "工作日:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
msgid "_12 hour (AM/PM)"
msgstr "_12 小时(上/下午)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
msgid "_24 hour"
msgstr "_24 小时"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
msgid "_Ask for confirmation when deleting items"
msgstr "删除项时要求确认(_A)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
msgid "_Compress weekends in month view"
msgstr "不在月视图中显示周末(_C)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
msgid "_Day begins:"
msgstr "一天开始(_D):"
#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
msgid "_Fri"
msgstr "周五(_F)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
msgid "_Hide completed tasks after"
msgstr "随后隐藏已完成的任务(_H)"
#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
msgid "_Mon"
msgstr "周一(_M)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
msgid "_Overdue tasks:"
msgstr "延期任务(_O):"
#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
msgid "_Sat"
msgstr "周六(_S)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
msgid "_Show appointment end times in week and month view"
msgstr "在周视图和月视图中显示约会结束时间(_S)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
msgid "_Time divisions:"
msgstr "时间分割(_T):"
#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
msgid "_Tue"
msgstr "周二(_T)"
#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
msgid "_Wed"
msgstr "周三(_W)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+msgid "before every anniversary/birthday"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
msgid "before every appointment"
msgstr "在每次约会前"
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:271
msgid "Cop_y calendar contents locally for offline operation"
msgstr "将日历内容复制到本地以进行脱机操作(_Y)"
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:273
msgid "Cop_y task list contents locally for offline operation"
msgstr "将任务列表内容复制到本地以进行脱机操作(_Y)"
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:275
msgid "Cop_y memo list contents locally for offline operation"
msgstr "将备忘列表内容复制到本地以进行脱机操作(_Y)"
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:345
msgid "Colo_r:"
msgstr "颜色(_R):"
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:380
msgid "Task List"
msgstr "任务列表"
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:391
msgid "Memo List"
msgstr "备忘列表"
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
msgid "Calendar Properties"
msgstr "日历属性"
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
msgid "New Calendar"
msgstr "新建日历"
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
msgid "Task List Properties"
msgstr "任务列表属性"
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
msgid "New Task List"
msgstr "新建任务列表"
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
msgid "Memo List Properties"
msgstr "备忘列表属性"
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
msgid "New Memo List"
msgstr "新建备忘列表"
-#: ../calendar/gui/dialogs/changed-comp.c:56
+#: ../calendar/gui/dialogs/changed-comp.c:59
msgid "This event has been deleted."
msgstr "此事件已经被删除。"
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:63
msgid "This task has been deleted."
msgstr "此任务已经被删除。"
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:67
msgid "This memo has been deleted."
msgstr "此备注已经被删除。"
-#: ../calendar/gui/dialogs/changed-comp.c:73
+#: ../calendar/gui/dialogs/changed-comp.c:76
#, c-format
msgid "%s You have made changes. Forget those changes and close the editor?"
msgstr "%s 您已经做了修改。放弃这些修改并关闭编辑器吗?"
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:78
#, c-format
msgid "%s You have made no changes, close the editor?"
msgstr "%s 您还没有进行修改,关闭编辑器吗?"
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:83
msgid "This event has been changed."
msgstr "此事件已经被更改。"
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:87
msgid "This task has been changed."
msgstr "此任务已经被更改。"
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:91
msgid "This memo has been changed."
msgstr "此备注已经被更改。"
-#: ../calendar/gui/dialogs/changed-comp.c:97
+#: ../calendar/gui/dialogs/changed-comp.c:100
#, c-format
msgid "%s You have made changes. Forget those changes and update the editor?"
msgstr "%s 您已经做出了修改。放弃这些修改并更新编辑器吗?"
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:102
#, c-format
msgid "%s You have made no changes, update the editor?"
msgstr "%s 您还没有进行修改,更新编辑器吗?"
@@ -6010,354 +6069,359 @@ msgstr "%s 您还没有进行修改,更新编辑器吗?"
msgid "Validation error: %s"
msgstr "校验错误:%s"
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2362
msgid " to "
msgstr " 到 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2366
msgid " (Completed "
msgstr " (完成 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2368
msgid "Completed "
msgstr "已完成 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2373
msgid " (Due "
msgstr " (预定 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2375
msgid "Due "
msgstr "预定 "
-#: ../calendar/gui/dialogs/comp-editor.c:232
+#: ../calendar/gui/dialogs/comp-editor.c:239
#, c-format
msgid "Attached message - %s"
msgstr "附加的信件 - %s"
#. translators, this count will always be >1
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:244
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
+#: ../composer/e-msg-composer.c:1984
#, c-format
msgid "Attached message"
msgid_plural "%d attached messages"
msgstr[0] "%d 封附加的信件"
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2052
#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
+#: ../mail/em-folder-view.c:1183 ../mail/message-list.c:2105
msgid "_Move"
msgstr "移动(_M)"
-#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2054
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2107
msgid "Cancel _Drag"
msgstr "取消拖曳(_D)"
-#: ../calendar/gui/dialogs/comp-editor.c:616
-#: ../calendar/gui/dialogs/comp-editor.c:3249 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:3301 ../mail/em-utils.c:372
#: ../plugins/prefer-plain/prefer-plain.c:91
#: ../widgets/misc/e-attachment-bar.c:453
msgid "attachment"
msgstr "附件"
-#: ../calendar/gui/dialogs/comp-editor.c:842
+#: ../calendar/gui/dialogs/comp-editor.c:849
msgid "Could not update object"
msgstr "无法更新对象"
-#: ../calendar/gui/dialogs/comp-editor.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:938
msgid "Edit Appointment"
msgstr "编辑约会"
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:945
#, c-format
msgid "Meeting - %s"
msgstr "会议 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:947
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:953
#, c-format
msgid "Assigned Task - %s"
msgstr "分配的任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:955
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:960
#, c-format
msgid "Memo - %s"
msgstr "备忘 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:976
msgid "No Summary"
msgstr "没有概要"
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1117
+msgid "Keep original item?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1312
msgid "Click here to close the current window"
msgstr "单击此处可关闭当前窗口"
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1319
msgid "Copy selected text to the clipboard"
msgstr "将选中文字复制到剪贴板"
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1326
msgid "Cut selected text to the clipboard"
msgstr "将选中文字剪切到剪贴板"
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1333
msgid "Click here to view help available"
msgstr "单击此处可查看可用的帮助"
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1340
msgid "Paste text from the clipboard"
msgstr "从剪贴板中粘贴文字"
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1361
msgid "Click here to save the current window"
msgstr "单击此处可保存当前窗口"
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1368
msgid "Select all text"
msgstr "选中所有文字"
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1375
msgid "_Classification"
msgstr "分类(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1389
#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
msgid "_Help"
msgstr "帮助(_H)"
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1403
msgid "_Insert"
msgstr "插入(_I)"
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1410
msgid "_Options"
msgstr "选项(_O)"
-#: ../calendar/gui/dialogs/comp-editor.c:1367 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../composer/e-composer-actions.c:469
msgid "_Attachment..."
msgstr "附件(_A)..."
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1429
msgid "Click here to attach a file"
msgstr "单击此处可便附加文件"
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1437
msgid "_Categories"
msgstr "类别(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1439
msgid "Toggles whether to display categories"
msgstr "切换是否显示类别"
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1445
msgid "Time _Zone"
msgstr "时区(_Z)"
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1447
msgid "Toggles whether the time zone is displayed"
msgstr "切换是否显示时区"
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1456
msgid "Pu_blic"
msgstr "公开(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1458
msgid "Classify as public"
msgstr "分类为公开"
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1463
msgid "_Private"
msgstr "私人(_P)"
-#: ../calendar/gui/dialogs/comp-editor.c:1415
+#: ../calendar/gui/dialogs/comp-editor.c:1465
msgid "Classify as private"
msgstr "分类为私人"
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1470
msgid "_Confidential"
msgstr "机密(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1472
msgid "Classify as confidential"
msgstr "分类为机密"
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1480
msgid "R_ole Field"
msgstr "角色域(_O)"
-#: ../calendar/gui/dialogs/comp-editor.c:1432
+#: ../calendar/gui/dialogs/comp-editor.c:1482
msgid "Toggles whether the Role field is displayed"
msgstr "切换是否显示角色域"
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1488
msgid "_RSVP"
msgstr "请回复(_R)"
-#: ../calendar/gui/dialogs/comp-editor.c:1440
+#: ../calendar/gui/dialogs/comp-editor.c:1490
msgid "Toggles whether the RSVP field is displayed"
msgstr "切换是否显示请回复域"
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1496
msgid "_Status Field"
msgstr "状态域(_S)"
-#: ../calendar/gui/dialogs/comp-editor.c:1448
+#: ../calendar/gui/dialogs/comp-editor.c:1498
msgid "Toggles whether the Status field is displayed"
msgstr "切换是否显示状态域"
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1504
msgid "_Type Field"
msgstr "类型域(_T)"
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1506
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
+#: ../calendar/gui/dialogs/comp-editor.c:1820
+#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
msgid "Recent _Documents"
msgstr "最近文档(_D)"
-#: ../calendar/gui/dialogs/comp-editor.c:1785
-#: ../composer/e-composer-actions.c:699
+#: ../calendar/gui/dialogs/comp-editor.c:1839
+#: ../composer/e-composer-actions.c:696
msgid "Attach"
msgstr "附件"
-#: ../calendar/gui/dialogs/comp-editor.c:1880
+#: ../calendar/gui/dialogs/comp-editor.c:1934
#, c-format
msgid "<b>%d</b> Attachment"
msgid_plural "<b>%d</b> Attachments"
msgstr[0] "<b>%d</b> 个附件"
-#: ../calendar/gui/dialogs/comp-editor.c:1912
+#: ../calendar/gui/dialogs/comp-editor.c:1966
msgid "Hide Attachment _Bar"
msgstr "隐藏附件栏(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:1969
+#: ../calendar/gui/dialogs/comp-editor.c:2272
msgid "Show Attachment _Bar"
msgstr "显示附件栏(_B)"
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:2083
+#: ../calendar/gui/dialogs/event-page.c:1876
+#: ../calendar/gui/dialogs/task-page.c:1198 ../composer/e-msg-composer.c:1039
#: ../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:2037
-#: ../composer/e-msg-composer.c:1048
+#: ../calendar/gui/dialogs/comp-editor.c:2086
+#: ../composer/e-msg-composer.c:1042
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
msgid "_Add attachment..."
msgstr "添加附件(_A)..."
-#: ../calendar/gui/dialogs/comp-editor.c:2245
-#: ../mail/em-format-html-display.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2294
+#: ../mail/em-format-html-display.c:2380
msgid "Show Attachments"
msgstr "显示附件"
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2295
msgid "Press space key to toggle attachment bar"
msgstr "按空格键可切换附件栏"
-#: ../calendar/gui/dialogs/comp-editor.c:2390
-#: ../calendar/gui/dialogs/comp-editor.c:2437
-#: ../calendar/gui/dialogs/comp-editor.c:3282
+#: ../calendar/gui/dialogs/comp-editor.c:2440
+#: ../calendar/gui/dialogs/comp-editor.c:2488
+#: ../calendar/gui/dialogs/comp-editor.c:3334
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "如果更新到达的话,对此项目的更改将被丢弃"
-#: ../calendar/gui/dialogs/comp-editor.c:3311
+#: ../calendar/gui/dialogs/comp-editor.c:3363
msgid "Unable to use current version!"
msgstr "无法使用当前版本!"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
msgid "Could not open source"
msgstr "无法打开源"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
msgid "Could not open destination"
msgstr "无法打开目的"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
msgid "Destination is read only"
msgstr "目的只读"
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
msgid "_Delete this item from all other recipient's mailboxes?"
msgstr "从全部其它收件人的邮箱中删除此项吗?(_D)"
-#: ../calendar/gui/dialogs/delete-error.c:52
+#: ../calendar/gui/dialogs/delete-error.c:55
msgid "The event could not be deleted due to a corba error"
msgstr "无法删除事件,原因是 corba 错误"
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:58
msgid "The task could not be deleted due to a corba error"
msgstr "无法删除任务,原因是 corba 错误"
-#: ../calendar/gui/dialogs/delete-error.c:58
+#: ../calendar/gui/dialogs/delete-error.c:61
msgid "The memo could not be deleted due to a corba error"
msgstr "无法删除备忘,原因是 corba 错误"
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:64
msgid "The item could not be deleted due to a corba error"
msgstr "无法删除项目,原因是 corba 错误"
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:71
msgid "The event could not be deleted because permission was denied"
msgstr "无法删除事件,原因是权限被禁止"
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:74
msgid "The task could not be deleted because permission was denied"
msgstr "无法删除任务,原因是权限被禁止"
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:77
msgid "The memo could not be deleted because permission was denied"
msgstr "无法删除备忘,原因是权限被禁止"
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:80
msgid "The item could not be deleted because permission was denied"
msgstr "无法删除项目,原因是权限被禁止"
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:87
msgid "The event could not be deleted due to an error"
msgstr "由于错误,无法删除事件"
-#: ../calendar/gui/dialogs/delete-error.c:87
+#: ../calendar/gui/dialogs/delete-error.c:90
msgid "The task could not be deleted due to an error"
msgstr "由于错误,无法删除任务"
-#: ../calendar/gui/dialogs/delete-error.c:90
+#: ../calendar/gui/dialogs/delete-error.c:93
msgid "The memo could not be deleted due to an error"
msgstr "由于错误,无法删除备忘"
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:96
msgid "The item could not be deleted due to an error"
msgstr "由于错误,无法删除项目"
@@ -6374,181 +6438,164 @@ msgstr "授权给:"
msgid "Enter Delegate"
msgstr "输入代表"
-#: ../calendar/gui/dialogs/event-editor.c:196
+#: ../calendar/gui/dialogs/event-editor.c:202
msgid "_Alarms"
msgstr "提醒(_A)"
-#: ../calendar/gui/dialogs/event-editor.c:198
+#: ../calendar/gui/dialogs/event-editor.c:204
msgid "Click here to set or unset alarms for this event"
msgstr "单击此处以设定或取消此事件的提醒"
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:209
msgid "_Recurrence"
msgstr "再现(_R)"
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:211
msgid "Make this a recurring event"
msgstr "将此事件标为重复发生"
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:216
#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
#: ../widgets/misc/e-send-options.glade.h:19
msgid "Send Options"
msgstr "发送选项"
-#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/event-editor.c:218
#: ../calendar/gui/dialogs/task-editor.c:125
msgid "Insert advanced send options"
msgstr "插入高级发送选项"
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:226
msgid "All _Day Event"
msgstr "全天事件(_D)"
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:228
msgid "Toggles whether to have All Day Event"
msgstr "切换是否有全天事件"
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:234
msgid "Show Time as _Busy"
msgstr "将时间显示为忙(_B)"
-#: ../calendar/gui/dialogs/event-editor.c:230
+#: ../calendar/gui/dialogs/event-editor.c:236
msgid "Toggles whether to show time as busy"
msgstr "切换是否将时间显示为忙"
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:245
msgid "_Free/Busy"
msgstr "忙/闲(_F)"
-#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/event-editor.c:247
msgid "Query free / busy information for the attendees"
msgstr "查询出席者的忙闲信息"
-#: ../calendar/gui/dialogs/event-editor.c:296
+#: ../calendar/gui/dialogs/event-editor.c:301
msgid "Appoint_ment"
msgstr "约会(_M)"
-#: ../calendar/gui/dialogs/event-page.c:731
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:736
+#: ../calendar/gui/dialogs/event-page.c:2724
msgid "This event has alarms"
msgstr "此事件有提醒"
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:799
#: ../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:840
+#: ../calendar/gui/dialogs/event-page.c:845
msgid "_Delegatees"
msgstr "代理人(_D)"
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:847
msgid "Atte_ndees"
msgstr "出席者(_N)"
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1031
msgid "Event with no start date"
msgstr "没有开始日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1034
msgid "Event with no end date"
msgstr "没有结束日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1203
+#: ../calendar/gui/dialogs/memo-page.c:641
+#: ../calendar/gui/dialogs/task-page.c:813
msgid "Start date is wrong"
msgstr "开始日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1213
msgid "End date is wrong"
msgstr "结束日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1236
msgid "Start time is wrong"
msgstr "开始时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1243
msgid "End time is wrong"
msgstr "结束时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1406
+#: ../calendar/gui/dialogs/memo-page.c:682
+#: ../calendar/gui/dialogs/task-page.c:873
msgid "The organizer selected no longer has an account."
msgstr "选中的组织者没有帐户了。"
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1412
+#: ../calendar/gui/dialogs/memo-page.c:688
+#: ../calendar/gui/dialogs/task-page.c:879
msgid "An organizer is required."
msgstr "需要一名组织者。"
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1437
+#: ../calendar/gui/dialogs/task-page.c:903
msgid "At least one attendee is required."
msgstr "需要至少一个出席者。"
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1877
+#: ../calendar/gui/dialogs/task-page.c:1199
msgid "_Add "
msgstr "添加(_A)"
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2600
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "无法打开日历“%s”。"
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2644
+#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/task-page.c:1803
#, c-format
msgid "You are acting on behalf of %s"
msgstr "您正在以 %s 的身份行动"
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2924
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "约会的 %d 天前"
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2930
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "约会的 %d 小时前"
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2936
#, c-format
msgid "%d minute before appointment"
msgid_plural "%d minutes before appointment"
msgstr[0] "约会的 %d 分钟前"
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2949
msgid "Customize"
msgstr "自定义"
-#. an empty string is the same as 'None'
-#: ../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: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:193
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../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 "无"
-
#: ../calendar/gui/dialogs/event-page.glade.h:1
msgid "1 day before appointment"
msgstr "约会的 1 天前"
@@ -6624,19 +6671,19 @@ msgstr "联系人(_N)..."
msgid "Organizer:"
msgstr "组织者:"
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2482
msgid "Memo"
msgstr "备忘"
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:857
#, c-format
msgid "Unable to open memos in '%s'."
msgstr "无法打开“%s”中的备忘。"
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1012 ../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
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
msgid "To"
msgstr "收件人"
@@ -6650,58 +6697,62 @@ msgid "T_o:"
msgstr "到(_O):"
#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:360
+#: ../calendar/gui/dialogs/task-page.c:365
#: ../calendar/gui/dialogs/task-page.glade.h:9
msgid "_Group:"
msgstr "组(_G):"
-#: ../calendar/gui/dialogs/recur-comp.c:50
+#: ../calendar/gui/dialogs/recur-comp.c:53
#, c-format
msgid "You are modifying a recurring event. What would you like to modify?"
msgstr "您即将修改再现事件。您想要修改何内容?"
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:55
#, c-format
msgid "You are delegating a recurring event. What would you like to delegate?"
msgstr "您即将代理再现事件。您想要代理何内容?"
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:59
#, c-format
msgid "You are modifying a recurring task. What would you like to modify?"
msgstr "您即将修改再现任务。您想要修改何内容?"
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:63
#, c-format
msgid "You are modifying a recurring memo. What would you like to modify?"
msgstr "您即将修改再现备忘。您想要修改何内容?"
-#: ../calendar/gui/dialogs/recur-comp.c:85
+#: ../calendar/gui/dialogs/recur-comp.c:88
msgid "This Instance Only"
msgstr "只是本次"
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:92
msgid "This and Prior Instances"
msgstr "本次和以前各次"
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:98
msgid "This and Future Instances"
msgstr "本次和以后各次"
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:103
msgid "All Instances"
msgstr "所有各次"
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "此约会含有 Evolution 无法编辑的再现。"
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
msgid "Recurrence date is invalid"
msgstr "再现日期无效"
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+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:928
+#: ../calendar/gui/dialogs/recurrence-page.c:961
msgid "on"
msgstr "在"
@@ -6709,7 +6760,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:992
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
msgid "first"
msgstr "第一个"
@@ -6718,7 +6769,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:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
msgid "second"
msgstr "第二"
@@ -6726,7 +6777,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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
msgid "third"
msgstr "第三个"
@@ -6734,7 +6785,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:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
msgid "fourth"
msgstr "第四个"
@@ -6742,13 +6793,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:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
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:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
msgid "Other Date"
msgstr "其它日期"
@@ -6756,7 +6807,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:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
msgid "1st to 10th"
msgstr "上旬"
@@ -6764,7 +6815,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:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
msgid "11th to 20th"
msgstr "中旬"
@@ -6772,45 +6823,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:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
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:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
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:1208
+#: ../calendar/gui/dialogs/recurrence-page.c:1241
msgid "on the"
msgstr "在"
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1417
msgid "occurrences"
msgstr "循环"
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2120
msgid "Add exception"
msgstr "添加例外"
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2161
msgid "Could not get a selection to modify."
msgstr "无法获得要修改的选中项。"
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
msgid "Modify exception"
msgstr "修改例外"
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2211
msgid "Could not get a selection to delete."
msgstr "无法获得要删除的选中项。"
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2335
msgid "Date/Time"
msgstr "日期/时间"
@@ -6861,6 +6912,10 @@ msgstr "周"
msgid "year(s)"
msgstr "年"
+#: ../calendar/gui/dialogs/send-comp.c:116
+msgid "Send my alarms with this event"
+msgstr ""
+
#: ../calendar/gui/dialogs/task-details-page.c:377
#: ../calendar/gui/dialogs/task-details-page.c:397
msgid "Completed date is wrong"
@@ -6881,55 +6936,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:253
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../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
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-model-tasks.c:362
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/print.c:2558 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:366
msgid "Completed"
msgstr "已完成"
#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../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
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
msgid "High"
msgstr "高"
#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../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:236
-#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
+#: ../calendar/gui/e-cal-component-preview.c:244
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-cal-model-tasks.c:754
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2555
msgid "In Progress"
msgstr "进行中"
#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../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
+#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
msgid "Low"
msgstr "低"
#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../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
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:578
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
msgid "Normal"
msgstr "中"
#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../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:234
-#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
-#: ../calendar/gui/tasktypes.xml.h:33
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2552
+#: ../calendar/gui/tasktypes.xml.h:18
msgid "Not Started"
msgstr "尚未开始"
@@ -6942,7 +6997,7 @@ msgid "Stat_us:"
msgstr "状态(_U):"
#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:580 ../calendar/gui/tasktypes.xml.h:24
msgid "Undefined"
msgstr "未定义"
@@ -6968,28 +7023,28 @@ 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
+#: ../composer/e-composer-actions.c:525
msgid "_Send Options"
msgstr "发送选项(_S)"
-#: ../calendar/gui/dialogs/task-editor.c:318
+#: ../calendar/gui/dialogs/task-editor.c:317
msgid "_Task"
msgstr "任务(_T)"
-#: ../calendar/gui/dialogs/task-editor.c:321
+#: ../calendar/gui/dialogs/task-editor.c:320
msgid "Task Details"
msgstr "任务细节"
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:373
#: ../calendar/gui/dialogs/task-page.glade.h:4
msgid "Organi_zer:"
msgstr "组织者(_Z):"
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:786
msgid "Due date is wrong"
msgstr "到期日期错误"
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1760
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "无法打开“%s”中的任务。"
@@ -7011,129 +7066,129 @@ msgid "Time zone:"
msgstr "时区:"
#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:392
+#: ../calendar/gui/e-alarm-list.c:394
#, 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:398
+#: ../calendar/gui/e-alarm-list.c:400
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d 周"
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
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:474
+#: ../calendar/gui/e-alarm-list.c:476
#, 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:479
+#: ../calendar/gui/e-alarm-list.c:481
#, 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:486
+#: ../calendar/gui/e-alarm-list.c:488
#, 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:497
+#: ../calendar/gui/e-alarm-list.c:499
#, 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:502
+#: ../calendar/gui/e-alarm-list.c:504
#, 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:509
+#: ../calendar/gui/e-alarm-list.c:511
#, 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:533
+#: ../calendar/gui/e-alarm-list.c:535
#, 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:541
+#: ../calendar/gui/e-alarm-list.c:543
#, c-format
msgid "%s for an unknown trigger type"
msgstr "%s 为未知触发类型"
-#: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
+#: ../calendar/gui/e-cal-component-memo-preview.c:69
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3268
#, c-format
msgid "Click to open %s"
msgstr "单击以打开 %s"
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
+#: ../calendar/gui/e-cal-component-memo-preview.c:129
+#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
msgid "Untitled"
msgstr "无标题"
-#: ../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
+#: ../calendar/gui/e-cal-component-memo-preview.c:181
+#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-preview.c:222
msgid "Start Date:"
msgstr "开始日期:"
-#: ../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-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1213
#: ../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:224
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-preview.c:309
msgid "Web Page:"
msgstr "网页:"
-#: ../calendar/gui/e-cal-component-preview.c:210
-#: ../calendar/gui/e-itip-control.c:1162
+#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-itip-control.c:1157
#: ../calendar/gui/e-itip-control.glade.h:9
msgid "Summary:"
msgstr "概要:"
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:233
msgid "Due Date:"
msgstr "到期日期:"
#. write status
#. Status
-#: ../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
+#: ../calendar/gui/e-cal-component-preview.c:240
+#: ../calendar/gui/e-itip-control.c:1181
+#: ../plugins/exchange-operations/exchange-account-setup.c:284
+#: ../plugins/itip-formatter/itip-view.c:1043
msgid "Status:"
msgstr "状态:"
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:264
msgid "Priority:"
msgstr "优先级:"
@@ -7147,17 +7202,17 @@ msgid "Start Date"
msgstr "开始日期"
#: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:629
msgid "Free"
msgstr "空闲"
#: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:620
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-calendar-table.c:630
+#: ../calendar/gui/e-meeting-time-sel.c:399
msgid "Busy"
msgstr "繁忙"
-#: ../calendar/gui/e-cal-model-tasks.c:623
+#: ../calendar/gui/e-cal-model-tasks.c:627
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -7167,225 +7222,225 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: ../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
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:745
#: ../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:980
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:164
#: ../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: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
+#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
+#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:447
+#: ../plugins/itip-formatter/itip-formatter.c:2204
#: ../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:976
+#: ../calendar/gui/e-cal-model.c:1008
msgid "Recurring"
msgstr "重复"
-#: ../calendar/gui/e-cal-model.c:978
+#: ../calendar/gui/e-cal-model.c:1010
msgid "Assigned"
msgstr "已分配"
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
msgid "Save As..."
msgstr "另存为..."
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2214
msgid "Select folder to save selected attachments..."
msgstr "选择保存选中附件的文件夹..."
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
#, c-format
msgid "untitled_image.%s"
msgstr "无标题图像.%s"
-#: ../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
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:925
+#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
msgid "_Save As..."
msgstr "另存为(_S)..."
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
-#: ../mail/em-popup.c:573
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
+#: ../mail/em-popup.c:571
msgid "Set as _Background"
msgstr "设为背景(_B)"
-#: ../calendar/gui/e-cal-popup.c:287
+#: ../calendar/gui/e-cal-popup.c:288
msgid "_Save Selected"
msgstr "保存选中(_S)"
-#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
#, c-format
msgid "Open in %s..."
msgstr "在 %s 中打开..."
-#: ../calendar/gui/e-calendar-table.c:338
+#: ../calendar/gui/e-calendar-table.c:337
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
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2399
#, 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
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2403
#, c-format
msgid "Organizer: %s"
msgstr "组织者:%s"
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:407
msgid "Start: "
msgstr "开始:"
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:419
msgid "Due: "
msgstr "到期:"
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:599
msgid "0%"
msgstr "0%"
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:600
msgid "10%"
msgstr "10%"
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:601
msgid "20%"
msgstr "20%"
-#: ../calendar/gui/e-calendar-table.c:592
+#: ../calendar/gui/e-calendar-table.c:602
msgid "30%"
msgstr "30%"
-#: ../calendar/gui/e-calendar-table.c:593
+#: ../calendar/gui/e-calendar-table.c:603
msgid "40%"
msgstr "40%"
-#: ../calendar/gui/e-calendar-table.c:594
+#: ../calendar/gui/e-calendar-table.c:604
msgid "50%"
msgstr "50%"
-#: ../calendar/gui/e-calendar-table.c:595
+#: ../calendar/gui/e-calendar-table.c:605
msgid "60%"
msgstr "60%"
-#: ../calendar/gui/e-calendar-table.c:596
+#: ../calendar/gui/e-calendar-table.c:606
msgid "70%"
msgstr "70%"
-#: ../calendar/gui/e-calendar-table.c:597
+#: ../calendar/gui/e-calendar-table.c:607
msgid "80%"
msgstr "80%"
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:608
msgid "90%"
msgstr "90%"
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:609
msgid "100%"
msgstr "100%"
-#: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:889
+#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
msgid "Deleting selected objects"
msgstr "删除选中的对象"
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1173
+#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:643
msgid "Updating objects"
msgstr "更新对象"
-#: ../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
+#: ../calendar/gui/e-calendar-table.c:1361
+#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:819
+#: ../composer/e-composer-actions.c:275
msgid "Save as..."
msgstr "另存为..."
-#: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-table.c:1585
+#: ../calendar/gui/e-calendar-view.c:1758
msgid "New _Task"
msgstr "新建任务(_T)"
-#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1589 ../calendar/gui/e-memo-table.c:924
msgid "Open _Web Page"
msgstr "打开网页(_W)"
-#: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:926
msgid "P_rint..."
msgstr "打印(_R)..."
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:930
#: ../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: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
+#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-view.c:1764
+#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:932
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
msgid "_Paste"
msgstr "粘贴(_P)"
-#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1601 ../ui/evolution-tasks.xml.h:22
msgid "_Assign Task"
msgstr "分配任务(_A)"
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1602 ../calendar/gui/e-memo-table.c:936
#: ../ui/evolution-tasks.xml.h:26
msgid "_Forward as iCalendar"
msgstr "作为 iCalendar 转发(_F)"
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1603
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1604
msgid "_Mark Selected Tasks as Complete"
msgstr "把任务标记为完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1605
msgid "_Mark as Incomplete"
msgstr "标记为未完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-table.c:1606
msgid "_Mark Selected Tasks as Incomplete"
msgstr "把任务标记为未完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1611
msgid "_Delete Selected Tasks"
msgstr "删除选中任务(_D)"
-#: ../calendar/gui/e-calendar-table.c:1834
+#: ../calendar/gui/e-calendar-table.c:1848
#: ../calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
msgstr "单击以添加任务"
@@ -7408,8 +7463,8 @@ msgid "Due date"
msgstr "到期日期"
#: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:373
msgid "Priority"
msgstr "优先级"
@@ -7417,108 +7472,153 @@ msgstr "优先级"
msgid "Start date"
msgstr "开始日期"
-#: ../calendar/gui/e-calendar-view.c:1340
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X Declined: Y ...
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-calendar-view.c:2307
+#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "状态"
+
+#: ../calendar/gui/e-calendar-view.c:1444
msgid "Moving items"
msgstr "移动项目"
-#: ../calendar/gui/e-calendar-view.c:1342
+#: ../calendar/gui/e-calendar-view.c:1446
msgid "Copying items"
msgstr "复制项目"
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1755
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1756
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-view.c:1757
msgid "New _Meeting"
msgstr "新建会议(_M)"
#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1768
msgid "_Current View"
msgstr "当前视图(_C)"
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1770
msgid "Select T_oday"
msgstr "选择今天(_O)"
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1771
msgid "_Select Date..."
msgstr "选择日期(_S)..."
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1777
msgid "Pri_nt..."
msgstr "打印(_N)..."
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1787
msgid "Cop_y to Calendar..."
msgstr "复制到日历(_Y)..."
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1788
msgid "Mo_ve to Calendar..."
msgstr "移至日历(_V)..."
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1789
msgid "_Delegate Meeting..."
msgstr "代理会议(_D)..."
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1790
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1791
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_F)..."
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1792
msgid "_Reply"
msgstr "回复(_R)"
-#: ../calendar/gui/e-calendar-view.c:1689 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1327
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
#: ../ui/evolution-mail-message.xml.h:82
msgid "Reply to _All"
msgstr "回复所有人(_A)"
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1798
msgid "Make this Occurrence _Movable"
msgstr "将此次发生变为可移动(_M)"
-#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
msgid "Delete this _Occurrence"
msgstr "删除此次出现(_O)"
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1800
msgid "Delete _All Occurrences"
msgstr "删除所有出现(_A)"
+#: ../calendar/gui/e-calendar-view.c:2254
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
+#: ../plugins/itip-formatter/itip-formatter.c:2192
+msgid "Accepted"
+msgstr "接受"
+
+#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../plugins/itip-formatter/itip-formatter.c:2198
+msgid "Declined"
+msgstr "拒绝"
+
+#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-time-sel.c:398
+msgid "Tentative"
+msgstr "暂时的"
+
+#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../plugins/itip-formatter/itip-formatter.c:2201
+msgid "Delegated"
+msgstr "被委任的"
+
+#: ../calendar/gui/e-calendar-view.c:2258
+msgid "Needs action"
+msgstr "需要动作"
+
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2514
#, c-format
msgid "Location: %s"
msgstr "位置:%s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2453
#, 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:111
+#: ../calendar/gui/e-cell-date-edit-text.c:109
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:114
+#: ../calendar/gui/e-cell-date-edit-text.c:112
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:122
+#: ../calendar/gui/e-cell-date-edit-text.c:120
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -7531,418 +7631,418 @@ 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:583
+#: ../calendar/gui/e-day-view-time-item.c:750
#, c-format
msgid "%02i minute divisions"
msgstr "%02i 分钟分割"
+#: ../calendar/gui/e-day-view-time-item.c:771
+msgid "Show the second time zone"
+msgstr "显示第二时区"
+
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
#. strftime format %A = full weekday name, %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-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
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
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:791 ../calendar/gui/e-week-view.c:528
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:828
msgid "am"
msgstr "上午"
#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:830
msgid "pm"
msgstr "下午"
-#: ../calendar/gui/e-itip-control.c:765
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2322
+#, c-format
+msgid "Week %d"
+msgstr "第%d周"
+
+#: ../calendar/gui/e-itip-control.c:760
msgid "Yes. (Complex Recurrence)"
msgstr "是(复杂重现)"
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:777
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
msgstr[0] "每 %d 天"
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:790
#, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
msgstr[0] "每 %d 周"
-#: ../calendar/gui/e-itip-control.c:802
+#: ../calendar/gui/e-itip-control.c:797
#, 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:813
+#: ../calendar/gui/e-itip-control.c:808
msgid " and "
msgstr " 和 "
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:817
#, c-format
msgid "The %s day of "
msgstr "第 %s 天属于"
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:833
#, c-format
msgid "The %s %s of "
msgstr "%s %s 属于"
-#: ../calendar/gui/e-itip-control.c:849
+#: ../calendar/gui/e-itip-control.c:844
#, c-format
msgid "every month"
msgid_plural "every %d months"
msgstr[0] "每 %d 月"
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:856
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
msgstr[0] "每 %d 年"
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:869
#, c-format
msgid "a total of %d time"
-msgid_plural " a total of %d times"
-msgstr[0] " 总计 %d 次"
+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:885
+#: ../calendar/gui/e-itip-control.c:880
msgid ", ending on "
msgstr ",结束于 "
#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:907
+#: ../calendar/gui/e-itip-control.c:902
msgid "Starts"
msgstr "开始"
#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:921
+#: ../calendar/gui/e-itip-control.c:916
msgid "Ends"
msgstr "结束"
-#: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../calendar/gui/e-itip-control.c:956
+#: ../plugins/save-calendar/csv-format.c:371
msgid "Due"
msgstr "到期"
-#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
+#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
msgid "iCalendar Information"
msgstr "iCalendar 信息"
#. Title
-#: ../calendar/gui/e-itip-control.c:1020
+#: ../calendar/gui/e-itip-control.c:1015
msgid "iCalendar Error"
msgstr "iCalendar 错误"
-#: ../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
+#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
+#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
+#: ../plugins/itip-formatter/itip-view.c:523
msgid "An unknown person"
msgstr "未知的人"
#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1143
+#: ../calendar/gui/e-itip-control.c:1138
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作。"
-#: ../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:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1190
+#: ../plugins/itip-formatter/itip-formatter.c:2195
msgid "Tentatively Accepted"
msgstr "暂时接受"
-#: ../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:1283
+#: ../calendar/gui/e-itip-control.c:1278
msgid ""
"The meeting has been canceled, however it could not be found in your "
"calendars"
msgstr "会议已经被取消,但无法在您的日历中找到该会议"
-#: ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1280
msgid ""
"The task has been canceled, however it could not be found in your task lists"
msgstr "任务已经被取消,但无法在您的任务列表中找到该任务"
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1358
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> 发布了会议信息。"
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1359
msgid "Meeting Information"
msgstr "会议信息"
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1365
#, 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:1372
+#: ../calendar/gui/e-itip-control.c:1367
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请求您参加一个会议。"
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1368
msgid "Meeting Proposal"
msgstr "会议建议"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
#, c-format
msgid "<b>%s</b> wishes to be added to an existing meeting."
msgstr "<b>%s</b> 希望加入到已有的会议。"
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
msgid "Meeting Update"
msgstr "会议更新"
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1379
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> 希望收到最新的会议信息。"
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1380
msgid "Meeting Update Request"
msgstr "会议更新请求"
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1387
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> 已回复一个会议请求。"
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1388
msgid "Meeting Reply"
msgstr "会议答复"
-#: ../calendar/gui/e-itip-control.c:1400
+#: ../calendar/gui/e-itip-control.c:1395
#, c-format
msgid "<b>%s</b> has canceled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
-#: ../calendar/gui/e-itip-control.c:1401
+#: ../calendar/gui/e-itip-control.c:1396
msgid "Meeting Cancelation"
msgstr "会议取消"
-#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
-#: ../calendar/gui/e-itip-control.c:1528
+#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1523
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> 发送了一个无法理解的信件。"
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1407
msgid "Bad Meeting Message"
msgstr "错误的会议信件"
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1434
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> 发布了任务信息。"
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1435
msgid "Task Information"
msgstr "任务信息"
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1442
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> 请求 %s 完成一个任务。"
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1444
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请求您完成一个任务。"
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1445
msgid "Task Proposal"
msgstr "任务建议"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
#, c-format
msgid "<b>%s</b> wishes to be added to an existing task."
msgstr "<b>%s<b> 希望加入到已有的任务。"
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
msgid "Task Update"
msgstr "任务更新"
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1456
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> 希望获取最新的任务信息。"
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1457
msgid "Task Update Request"
msgstr "任务更新请求"
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1464
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> 已经回复了任务分配。"
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1465
msgid "Task Reply"
msgstr "任务回复"
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1472
#, c-format
msgid "<b>%s</b> has canceled a task."
msgstr "<b>%s</b> 取消了任务。"
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1473
msgid "Task Cancelation"
msgstr "任务取消"
-#: ../calendar/gui/e-itip-control.c:1489
+#: ../calendar/gui/e-itip-control.c:1484
msgid "Bad Task Message"
msgstr "错误的任务信件"
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> 发布了忙闲信息。"
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
msgid "Free/Busy Information"
msgstr "忙闲信息"
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请求您的忙闲信息。"
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
msgid "Free/Busy Request"
msgstr "忙/闲请求"
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1518
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> 应答了忙闲请求。"
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
msgid "Free/Busy Reply"
msgstr "忙闲应答"
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1524
msgid "Bad Free/Busy Message"
msgstr "错误的忙闲信件"
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1600
msgid "The message does not appear to be properly formed"
msgstr "信件的格式可能不正确"
-#: ../calendar/gui/e-itip-control.c:1664
+#: ../calendar/gui/e-itip-control.c:1659
msgid "The message contains only unsupported requests."
msgstr "信件只含有不支持的请求。"
-#: ../calendar/gui/e-itip-control.c:1697
+#: ../calendar/gui/e-itip-control.c:1692
msgid "The attachment does not contain a valid calendar message"
msgstr "附件中没有有效的日历信件"
-#: ../calendar/gui/e-itip-control.c:1735
+#: ../calendar/gui/e-itip-control.c:1730
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日历项目"
-#: ../calendar/gui/e-itip-control.c:1980
+#: ../calendar/gui/e-itip-control.c:1975
msgid "Update complete\n"
msgstr "更新完成\n"
-#: ../calendar/gui/e-itip-control.c:2014
+#: ../calendar/gui/e-itip-control.c:2009
msgid "Object is invalid and cannot be updated\n"
msgstr "对象无效,无法更新\n"
-#: ../calendar/gui/e-itip-control.c:2031
+#: ../calendar/gui/e-itip-control.c:2026
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "此响应并非来自当前出席者。将响应者加为出席者吗?"
-#: ../calendar/gui/e-itip-control.c:2049
+#: ../calendar/gui/e-itip-control.c:2044
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新出席者状态!\n"
-#: ../calendar/gui/e-itip-control.c:2073
+#: ../calendar/gui/e-itip-control.c:2068
msgid "Attendee status updated\n"
msgstr "更新出席者状态\n"
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../calendar/gui/e-itip-control.c:2075
+#: ../plugins/itip-formatter/itip-formatter.c:1379
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新出席者状态"
-#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
+#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
msgid "Item sent!\n"
msgstr "项目已发送!\n"
-#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
+#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
-#: ../calendar/gui/e-itip-control.c:2256
+#: ../calendar/gui/e-itip-control.c:2251
msgid "Choose an action:"
msgstr "选择一项活动:"
-#: ../calendar/gui/e-itip-control.c:2327
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2280
+#: ../calendar/gui/e-meeting-list-view.c:549
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "请回复"
+
+#: ../calendar/gui/e-itip-control.c:2322
msgid "Update"
msgstr "更新"
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2350
#: ../plugins/groupwise-features/process-meeting.c:51
msgid "Accept"
msgstr "接受"
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2351
msgid "Tentatively accept"
msgstr "暂时接受"
-#: ../calendar/gui/e-itip-control.c:2357
+#: ../calendar/gui/e-itip-control.c:2352
#: ../plugins/groupwise-features/process-meeting.c:53
msgid "Decline"
msgstr "拒绝"
-#: ../calendar/gui/e-itip-control.c:2386
+#: ../calendar/gui/e-itip-control.c:2381
msgid "Send Free/Busy Information"
msgstr "发送忙闲信息"
-#: ../calendar/gui/e-itip-control.c:2414
+#: ../calendar/gui/e-itip-control.c:2409
msgid "Update respondent status"
msgstr "更新应答者状态"
-#: ../calendar/gui/e-itip-control.c:2442
+#: ../calendar/gui/e-itip-control.c:2437
msgid "Send Latest Information"
msgstr "发送最新的信息"
-#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
@@ -7970,112 +8070,93 @@ msgstr "正在装入日历..."
msgid "Server Message:"
msgstr "服务器消息:"
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
msgid "Chair Persons"
msgstr "主席人员"
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
msgid "Required Participants"
msgstr "必需的出席者"
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
msgid "Optional Participants"
msgstr "可选的出席者"
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
msgid "Resources"
msgstr "资源"
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
msgid "Attendees"
msgstr "出席者"
-#: ../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
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
msgid "Individual"
msgstr "个人"
-#: ../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
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
msgid "Group"
msgstr "组"
-#: ../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
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/print.c:982
msgid "Resource"
msgstr "资源"
-#: ../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
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:983
msgid "Room"
msgstr "房间"
-#: ../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
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:997
msgid "Chair"
msgstr "主席"
-#: ../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
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
msgid "Required Participant"
msgstr "必需的出席者"
-#: ../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
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:999
msgid "Optional Participant"
msgstr "可选的出席者"
-#: ../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
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/print.c:1000
msgid "Non-Participant"
msgstr "不参加"
-#: ../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
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:752
msgid "Needs Action"
msgstr "需要动作"
-#: ../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: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:491
+#: ../calendar/gui/e-meeting-list-view.c:505
msgid "Attendee "
msgstr "出席者 "
-#. To translators: RSVP means "please reply"
-#: ../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:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
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:467
-#: ../calendar/gui/e-meeting-time-sel.c:2122
+#: ../calendar/gui/e-meeting-time-sel.c:2124
msgid "%A, %B %d, %Y"
msgstr "%Y年%m月%d日%A"
@@ -8084,7 +8165,7 @@ msgstr "%Y年%m月%d日%A"
#. This is a strftime() format string %a = abbreviated weekday name,
#. %m = month number, %d = month day, %Y = full year.
#: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2153
+#: ../calendar/gui/e-meeting-time-sel.c:2155
msgid "%a %m/%d/%Y"
msgstr "%Y年%m月%d日%A"
@@ -8094,67 +8175,67 @@ msgstr "%Y年%m月%d日%A"
msgid "%m/%d/%Y"
msgstr "%Y-%m-%d"
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:400
msgid "Out of Office"
msgstr "办公室以外"
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:401
msgid "No Information"
msgstr "没有信息"
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:416
msgid "A_ttendees..."
msgstr "出席者(_T)..."
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:437
msgid "O_ptions"
msgstr "选项(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:454
msgid "Show _only working hours"
msgstr "只显示工作小时(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:464
msgid "Show _zoomed out"
msgstr "显示缩放的输出(_Z)"
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:479
msgid "_Update free/busy"
msgstr "更新忙闲(_U)"
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:494
msgid "_<<"
msgstr "_<<"
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:512
msgid "_Autopick"
msgstr "自动获取(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:527
msgid ">_>"
msgstr ">_>"
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:544
msgid "_All people and resources"
msgstr "全部人和资源(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:553
msgid "All _people and one resource"
msgstr "全部人和一个资源(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:562
msgid "_Required people"
msgstr "必需的人(_R)"
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:571
msgid "Required people and _one resource"
msgstr "必需的人和一个资源(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:607
msgid "_Start time:"
msgstr "开始时间(_S):"
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:634
msgid "_End time:"
msgstr "结束时间(_E):"
@@ -8182,16 +8263,15 @@ msgstr "语言"
msgid "Member"
msgstr "成员"
-#: ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-memo-table.c:941
msgid "_Delete Selected Memos"
msgstr "删除选中备忘(_D)"
-#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
msgid "Click to add a memo"
msgstr "单击以添加备忘"
#: ../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"
@@ -8200,16 +8280,16 @@ msgstr ""
"%s 错误:\n"
" %s"
-#: ../calendar/gui/e-memos.c:809
+#: ../calendar/gui/e-memos.c:812
msgid "Loading memos"
msgstr "装入备忘"
-#: ../calendar/gui/e-memos.c:890
+#: ../calendar/gui/e-memos.c:903
#, c-format
msgid "Opening memos at %s"
msgstr "在 %s 打开备忘"
-#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
msgid "Deleting selected objects..."
msgstr "正在删除选中的对象..."
@@ -8217,63 +8297,63 @@ msgstr "正在删除选中的对象..."
msgid "Loading tasks"
msgstr "装入任务"
-#: ../calendar/gui/e-tasks.c:1053
+#: ../calendar/gui/e-tasks.c:1061
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
-#: ../calendar/gui/e-tasks.c:1298
+#: ../calendar/gui/e-tasks.c:1306
msgid "Completing tasks..."
msgstr "正在完成任务..."
-#: ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/e-tasks.c:1356
msgid "Expunging"
msgstr "销毁"
-#: ../calendar/gui/e-timezone-entry.c:129
+#: ../calendar/gui/e-timezone-entry.c:127
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:343 ../calendar/gui/print.c:1653
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
msgid "%d %B"
msgstr "%-m月%-d日"
-#: ../calendar/gui/gnome-cal.c:2576
+#: ../calendar/gui/gnome-cal.c:2637
msgid "_Custom View"
msgstr "自定义视图(_C)"
-#: ../calendar/gui/gnome-cal.c:2577
+#: ../calendar/gui/gnome-cal.c:2638
msgid "_Save Custom View"
msgstr "保存自定义视图(_S)"
-#: ../calendar/gui/gnome-cal.c:2582
+#: ../calendar/gui/gnome-cal.c:2643
msgid "_Define Views..."
msgstr "定义视图(_D)..."
-#: ../calendar/gui/gnome-cal.c:2791
+#: ../calendar/gui/gnome-cal.c:2880
#, c-format
msgid "Loading appointments at %s"
msgstr "装入位于 %s 的约会"
-#: ../calendar/gui/gnome-cal.c:2806
+#: ../calendar/gui/gnome-cal.c:2895
#, c-format
msgid "Loading tasks at %s"
msgstr "装入位于 %s 的任务"
-#: ../calendar/gui/gnome-cal.c:2815
+#: ../calendar/gui/gnome-cal.c:2904
#, c-format
msgid "Loading memos at %s"
msgstr "装入位于 %s 的备忘"
-#: ../calendar/gui/gnome-cal.c:2920
+#: ../calendar/gui/gnome-cal.c:3016
#, c-format
msgid "Opening %s"
msgstr "打开 %s"
-#: ../calendar/gui/gnome-cal.c:3874
+#: ../calendar/gui/gnome-cal.c:3984
msgid "Purging"
msgstr "销毁"
@@ -8342,19 +8422,19 @@ msgstr "必须设定组织者。"
msgid "At least one attendee is necessary"
msgstr "至少需要一个参加者"
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:772
msgid "Event information"
msgstr "事件信息"
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:775
msgid "Task information"
msgstr "任务信息"
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:778
msgid "Memo information"
msgstr "备忘信息"
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:796
msgid "Free/Busy information"
msgstr "忙闲信息"
@@ -8362,111 +8442,166 @@ msgstr "忙闲信息"
msgid "Calendar information"
msgstr "日历信息"
-#: ../calendar/gui/itip-utils.c:683
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:668
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "接受"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:675
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "暂时接受"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email. The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:682 ../calendar/gui/itip-utils.c:730
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "拒绝"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:689
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "被委任的"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email. The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:702
+msgctxt "Meeting"
msgid "Updated"
msgstr "更新"
-#: ../calendar/gui/itip-utils.c:691
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email. The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:709
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "取消"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email. The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:716
+msgctxt "Meeting"
msgid "Refresh"
msgstr "刷新"
-#: ../calendar/gui/itip-utils.c:695
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email. The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:723
+msgctxt "Meeting"
msgid "Counter-proposal"
msgstr "投票表决"
-#: ../calendar/gui/itip-utils.c:762
+#: ../calendar/gui/itip-utils.c:793
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "忙闲信息 (%s 到 %s)"
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:801
msgid "iCalendar information"
msgstr "iCalendar 信息"
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:972
msgid "You must be an attendee of the event."
msgstr "您必须是事件的出席者。"
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:499
msgid "_New Memo List"
msgstr "新建备忘列表(_N)"
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:582
#, c-format
msgid "%d memo"
msgid_plural "%d memos"
msgstr[0] "%d 个备忘"
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:584 ../calendar/gui/tasks-component.c:575
#, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
msgstr[0] ",已选中 %d 个"
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:631
msgid "Failed upgrading memos."
msgstr "升级备忘失败。"
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:873
#, c-format
msgid "Unable to open the memo list '%s' for creating events and meetings"
msgstr "无法打开备忘列表“%s”来创建事件和会议"
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:886
msgid "There is no calendar available for creating memos"
msgstr "没有可创建备忘的日历"
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:996
msgid "Memo Source Selector"
msgstr "备忘来源选择器"
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1175
msgid "New memo"
msgstr "新建备忘"
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1176
msgctxt "New"
msgid "Mem_o"
msgstr "备忘(_O)"
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1177
msgid "Create a new memo"
msgstr "创建新备忘"
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1183
msgid "New shared memo"
msgstr "新建共享备忘"
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1184
msgctxt "New"
msgid "_Shared memo"
msgstr "共享备忘(_S)"
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1185
msgid "Create a shared new memo"
msgstr "创建新的共享备忘"
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1191
msgid "New memo list"
msgstr "新建备忘列表"
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1192
msgctxt "New"
msgid "Memo li_st"
msgstr "备忘列表(_S)"
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1193
msgid "Create a new memo list"
msgstr "创建新备忘列表"
-#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
+#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
msgid "Print Memos"
msgstr "打印备忘"
-#: ../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 "
@@ -8514,273 +8649,267 @@ msgstr "无法升迁任务“%s”"
msgid "Notes"
msgstr "笔记"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
msgid "1st"
msgstr "1日"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
msgid "2nd"
msgstr "2日"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
msgid "3rd"
msgstr "3日"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
msgid "4th"
msgstr "4日"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
msgid "5th"
msgstr "5日"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
msgid "6th"
msgstr "6日"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
msgid "7th"
msgstr "7日"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
msgid "8th"
msgstr "8日"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
msgid "9th"
msgstr "9日"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
msgid "10th"
msgstr "10日"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
msgid "11th"
msgstr "11日"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
msgid "12th"
msgstr "12日"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
msgid "13th"
msgstr "13日"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
msgid "14th"
msgstr "14日"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
msgid "15th"
msgstr "15日"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
msgid "16th"
msgstr "16日"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
msgid "17th"
msgstr "17日"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
msgid "18th"
msgstr "18日"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
msgid "19th"
msgstr "19日"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:517
msgid "20th"
msgstr "20日"
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
msgid "21st"
msgstr "21日"
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
msgid "22nd"
msgstr "22日"
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
msgid "23rd"
msgstr "23日"
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
msgid "24th"
msgstr "24日"
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:518
msgid "25th"
msgstr "25日"
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
msgid "26th"
msgstr "26日"
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
msgid "27th"
msgstr "27日"
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
msgid "28th"
msgstr "28日"
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
msgid "29th"
msgstr "29日"
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:519
msgid "30th"
msgstr "30日"
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:520
msgid "31st"
msgstr "31日"
#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
msgid "Su"
msgstr "日"
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
msgid "Mo"
msgstr "一"
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
msgid "Tu"
msgstr "二"
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:595
msgid "We"
msgstr "三"
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
msgid "Th"
msgstr "四"
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
msgid "Fr"
msgstr "五"
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:596
msgid "Sa"
msgstr "六"
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2478
msgid "Appointment"
msgstr "约会"
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2480
msgid "Task"
msgstr "任务"
-#: ../calendar/gui/print.c:2499
+#: ../calendar/gui/print.c:2505
#, c-format
msgid "Summary: %s"
msgstr "概要:%s"
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2528
msgid "Attendees: "
msgstr "出席者:"
-#: ../calendar/gui/print.c:2562
+#: ../calendar/gui/print.c:2568
#, c-format
msgid "Status: %s"
msgstr "状态:%s"
-#: ../calendar/gui/print.c:2579
+#: ../calendar/gui/print.c:2585
#, c-format
msgid "Priority: %s"
msgstr "优先级:%s"
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2597
#, c-format
msgid "Percent Complete: %i"
msgstr "完成率:%i"
-#: ../calendar/gui/print.c:2603
+#: ../calendar/gui/print.c:2609
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
-#: ../calendar/gui/print.c:2616
+#: ../calendar/gui/print.c:2622
#, c-format
msgid "Categories: %s"
msgstr "类别:%s"
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2633
msgid "Contacts: "
msgstr "联系人:"
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:490
msgid "_New Task List"
msgstr "新建任务列表(_N)"
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:573
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d 个任务"
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:622
msgid "Failed upgrading tasks."
msgstr "升级任务失败。"
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:861
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr "无法打开任务列表“%s”来创建事件和会议"
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:874
msgid "There is no calendar available for creating tasks"
msgstr "没有可创建任务的日历"
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:985
msgid "Task Source Selector"
msgstr "任务来源选择器"
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1239
msgid "New task"
msgstr "新建任务"
-#: ../calendar/gui/tasks-component.c:1326
-#, fuzzy
-msgctxt "New"
-msgid "_Task"
-msgstr "任务(_T)"
-
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1241
msgid "Create a new task"
msgstr "创建新任务"
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1247
msgid "New assigned task"
msgstr "新建分配的任务"
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1248
msgctxt "New"
msgid "Assigne_d Task"
msgstr "分配的任务(_D)"
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1249
msgid "Create a new assigned task"
msgstr "创建新分配的任务"
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1255
msgid "New task list"
msgstr "新建任务列表"
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1256
msgctxt "New"
msgid "Tas_k list"
msgstr "任务列表(_K)"
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1257
msgid "Create a new task list"
msgstr "创建新任务列表"
-#: ../calendar/gui/tasks-control.c:452
+#: ../calendar/gui/tasks-control.c:442
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -8791,11 +8920,11 @@ msgstr ""
"\n"
"确实删除这些任务吗?"
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1123
msgid "Do not ask me again."
msgstr "不要再次询问。"
-#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
+#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
msgid "Print Tasks"
msgstr "打印任务"
@@ -8804,57 +8933,57 @@ msgstr "打印任务"
msgid "% Completed"
msgstr "% 完成"
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:7
msgid "Cancelled"
msgstr "已取消"
-#: ../calendar/gui/tasktypes.xml.h:26
+#: ../calendar/gui/tasktypes.xml.h:15
msgid "In progress"
msgstr "进行中"
-#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
msgid "is greater than"
msgstr "大于"
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
msgid "is less than"
msgstr "小于"
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
msgid "Appointments and Meetings"
msgstr "约会和会议"
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1723
msgid "Opening calendar"
msgstr "打开日历"
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
msgid "iCalendar files (.ics)"
msgstr "iCalendar 文件(.ics)"
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
msgid "Evolution iCalendar importer"
msgstr "Evolution iCalendar 导入器"
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:529
msgid "Reminder!"
msgstr "提醒!!"
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:581
msgid "vCalendar files (.vcf)"
msgstr "vCalendar 文件(.vcf)"
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:582
msgid "Evolution vCalendar importer"
msgstr "Evolution vCalendar 导入器"
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:744
msgid "Calendar Events"
msgstr "日历事件"
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:781
msgid "Evolution Calendar intelligent importer"
msgstr "Evolution 日历智能导入器"
@@ -10407,247 +10536,251 @@ msgstr "太平洋/沃利斯"
msgid "Pacific/Yap"
msgstr "太平洋/雅浦"
-#: ../composer/e-composer-autosave.c:275
+#: ../composer/e-composer-autosave.c:273
msgid "Could not open autosave file"
msgstr "无法打开自动保存文件"
-#: ../composer/e-composer-autosave.c:282
+#: ../composer/e-composer-autosave.c:280
msgid "Unable to retrieve message from editor"
msgstr "无法从编辑器获取信件"
-#: ../composer/e-composer-actions.c:47
+#: ../composer/e-composer-actions.c:45
msgid "Insert Attachment"
msgstr "插入附件"
-#: ../composer/e-composer-actions.c:51
+#: ../composer/e-composer-actions.c:49
msgid "A_ttach"
msgstr "附件(_T)"
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:140
msgid "Untitled Message"
msgstr "无标题信件"
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:471
msgid "Attach a file"
msgstr "添加附件"
-#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
#: ../ui/evolution-mail-messagedisplay.xml.h:4
msgid "_Close"
msgstr "关闭(_C)"
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:478
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
+#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1334
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
#: ../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
+#: ../composer/e-composer-actions.c:490 ../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
+#: ../composer/e-composer-actions.c:499
msgid "Save the current file"
msgstr "保存当前文件"
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:504
msgid "Save _As..."
msgstr "另存为(_A)..."
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:506
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:511
+msgid "Save as _Draft"
+msgstr "另存为草稿(_D)"
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:513
msgid "Save as draft"
msgstr "另存为草稿"
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:518
msgid "S_end"
msgstr "发送(_E)"
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:520
msgid "Send this message"
msgstr "发送这封信"
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:527
msgid "Insert Send options"
msgstr "插入发送选项"
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:532
msgid "New _Message"
msgstr "新建信件(_M)"
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:534
msgid "Open New Message window"
msgstr "打开新建信件窗口"
-#: ../composer/e-composer-actions.c:543
+#: ../composer/e-composer-actions.c:541
msgid "Character _Encoding"
msgstr "字符编码(_E)"
-#: ../composer/e-composer-actions.c:550
+#: ../composer/e-composer-actions.c:548
msgid "_Security"
msgstr "安全(_S)"
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:558
msgid "PGP _Encrypt"
msgstr "PGP 加密(_E)"
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:560
msgid "Encrypt this message with PGP"
msgstr "用 PGP 加密该信件"
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:566
msgid "PGP _Sign"
msgstr "PGP 签名(_S)"
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:568
msgid "Sign this message with your PGP key"
msgstr "用您的 PGP 密钥签名该信件"
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:574
msgid "_Prioritize Message"
msgstr "标为优先(_P)"
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:576
msgid "Set the message priority to high"
msgstr "将信件设定为高优先级"
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:582
msgid "Re_quest Read Receipt"
msgstr "请求阅读收条(_Q)"
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:584
msgid "Get delivery notification when your message is read"
msgstr "当您的信件被阅读时得到投递通知"
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:590
msgid "S/MIME En_crypt"
msgstr "S/MIME 加密(_C)"
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:592
msgid "Encrypt this message with your S/MIME Encryption Certificate"
msgstr "用您的 S/MIME 加密证书加密该信件"
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:598
msgid "S/MIME Sig_n"
msgstr "S/MIME 签名(_N)"
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:600
msgid "Sign this message with your S/MIME Signature Certificate"
msgstr "用您的 S/MIME 签名认证签名该信件"
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:606
msgid "_Bcc Field"
msgstr "暗送域(_B)"
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:608
msgid "Toggles whether the BCC field is displayed"
msgstr "是否显示暗中转发域"
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:614
msgid "_Cc Field"
msgstr "抄送域(_C)"
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:616
msgid "Toggles whether the CC field is displayed"
msgstr "是否显示转发域"
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:622
msgid "_From Field"
msgstr "发件人域(_F)"
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:624
msgid "Toggles whether the From chooser is displayed"
msgstr "是否显示发件人选择器"
-#: ../composer/e-composer-actions.c:632
+#: ../composer/e-composer-actions.c:630
msgid "_Post-To Field"
msgstr "投递到域(_P)"
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:632
msgid "Toggles whether the Post-To field is displayed"
msgstr "是否显示投递到域"
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:638
msgid "_Reply-To Field"
msgstr "回复域(_R)"
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:640
msgid "Toggles whether the Reply-To field is displayed"
msgstr "是否显示回复域"
-#: ../composer/e-composer-actions.c:648
+#: ../composer/e-composer-actions.c:646
msgid "_Subject Field"
msgstr "主题域(_C)"
-#: ../composer/e-composer-actions.c:650
+#: ../composer/e-composer-actions.c:648
msgid "Toggles whether the Subject field is displayed"
msgstr "切换是否显示主题域"
-#: ../composer/e-composer-actions.c:656
+#: ../composer/e-composer-actions.c:654
msgid "_To Field"
msgstr "收件人域(_T)"
-#: ../composer/e-composer-actions.c:658
+#: ../composer/e-composer-actions.c:656
msgid "Toggles whether the To field is displayed"
msgstr "是否显示寄给域"
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-actions.c:699
+msgid "Save Draft"
+msgstr "保存草稿"
+
+#: ../composer/e-composer-header-table.c:64
msgid "Enter the recipients of the message"
msgstr "输入信件的收件人"
-#: ../composer/e-composer-header-table.c:68
+#: ../composer/e-composer-header-table.c:66
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "输入将接收该信件副本的收件人地址"
-#: ../composer/e-composer-header-table.c:71
+#: ../composer/e-composer-header-table.c:69
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
+#: ../composer/e-composer-header-table.c:643
msgid "Fr_om:"
msgstr "发件人(_O):"
-#: ../composer/e-composer-header-table.c:654
+#: ../composer/e-composer-header-table.c:652
msgid "_Reply-To:"
msgstr "回复到(_R):"
-#: ../composer/e-composer-header-table.c:658
+#: ../composer/e-composer-header-table.c:656
msgid "_To:"
msgstr "收信人(_T):"
-#: ../composer/e-composer-header-table.c:663
+#: ../composer/e-composer-header-table.c:661
msgid "_Cc:"
msgstr "抄送(_C):"
-#: ../composer/e-composer-header-table.c:668
+#: ../composer/e-composer-header-table.c:666
msgid "_Bcc:"
msgstr "暗送(_B):"
-#: ../composer/e-composer-header-table.c:673
+#: ../composer/e-composer-header-table.c:671
msgid "_Post To:"
msgstr "投递到(_P):"
-#: ../composer/e-composer-header-table.c:677
+#: ../composer/e-composer-header-table.c:675
msgid "S_ubject:"
msgstr "主题(_U):"
-#: ../composer/e-composer-header-table.c:686
+#: ../composer/e-composer-header-table.c:684
msgid "Si_gnature:"
msgstr "签名(_G):"
@@ -10667,37 +10800,37 @@ msgstr "选择要将信件投递到哪个文件夹。"
msgid "Click here to select folders to post to"
msgstr "单击此处以选择要投递到的文件夹"
-#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1552
msgid "Show _Attachment Bar"
msgstr "显示附件栏(_A)"
-#: ../composer/e-msg-composer.c:872
+#: ../composer/e-msg-composer.c:866
msgid ""
"Cannot sign outgoing message: No signing certificate set for this account"
msgstr "无法对寄出的信件签名:未对此账户设置签名证书"
-#: ../composer/e-msg-composer.c:879
+#: ../composer/e-msg-composer.c:873
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
msgstr "无法对寄出的信件加密:未对此账户设置加密证书"
-#: ../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
+#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1949
+#: ../mail/em-format-html-display.c:2596 ../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
+#: ../composer/e-msg-composer.c:1550
msgid "Hide _Attachment Bar"
msgstr "隐藏附件栏(_A)"
-#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
+#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
msgid "Compose Message"
msgstr "撰写新信件"
-#: ../composer/e-msg-composer.c:4055
+#: ../composer/e-msg-composer.c:4093
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)</"
"b>"
@@ -10780,9 +10913,9 @@ msgstr "在您上次编写新信件时 Evolution 意外退出。恢复邮件将
#: ../composer/mail-composer.error.xml.h:17
msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
"accounts."
-msgstr "发送选项只适用于 Novell Groupwise 和 Microsoft Exchange 账户。"
+msgstr "发送选项只适用于 Novell GroupWise 和 Microsoft Exchange 账户。"
#: ../composer/mail-composer.error.xml.h:18
msgid "Send options not available."
@@ -10850,7 +10983,7 @@ msgstr "保存草稿(_S)"
msgid "Evolution Mail and Calendar"
msgstr "Evolution 邮件及日历"
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
msgid "Groupware Suite"
msgstr "Groupwise 套件"
@@ -10866,40 +10999,97 @@ msgstr "地址卡"
msgid "calendar information"
msgstr "日历信息"
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
msgid "Evolution Error"
msgstr "Evolution 错误"
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
msgid "Evolution Warning"
msgstr "Evolution 警告"
-#: ../e-util/e-error.c:117
+#: ../e-util/e-error.c:118
msgid "Evolution Information"
msgstr "Evolution 信息"
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:120
msgid "Evolution Query"
msgstr "Evolution 查询"
#. setup a dummy error
-#: ../e-util/e-error.c:449
+#: ../e-util/e-error.c:444
#, c-format
msgid "Internal error, unknown error '%s' requested"
msgstr "内部错误,请求了未知的错误“%s”"
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
msgid "Component"
msgstr "组件"
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
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
+#: ../e-util/e-non-intrusive-error-dialog.c:190
+msgid "Debug Logs"
+msgstr "调试日志"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:204
+msgid "Show _errors in the status bar for"
+msgstr "在状态栏显示错误(_E)"
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../e-util/e-non-intrusive-error-dialog.c:222
+msgid "second(s)."
+msgstr "秒。"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:228
+msgid "Log Messages:"
+msgstr "日志消息:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:273
+msgid "Log Level"
+msgstr "日志级别"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:281
+#: ../widgets/misc/e-dateedit.c:389
+msgid "Time"
+msgstr "时间"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2522
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "信件"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "关闭此窗口"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Error"
+msgstr "错误"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Errors"
+msgstr "错误"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Warnings and Errors"
+msgstr "警告和错误"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Debug"
+msgstr "调试"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:42
+msgid "Error, Warnings and Debug messages"
+msgstr "错误,警告和调试信息"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
#: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:689
+#: ../plugins/publish-calendar/publish-calendar.c:690
msgid "Enabled"
msgstr "已启用"
@@ -10948,164 +11138,168 @@ msgstr "覆盖文件吗?"
msgid "_Overwrite"
msgstr "覆盖(_O)"
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:127
+msgid "Could not open the link."
+msgstr "无法打开链接。"
+
+#: ../e-util/e-util.c:174
msgid "Could not display help for Evolution."
msgstr "无法显示 Evolution 的帮助。"
-#: ../e-util/e-util-labels.c:37
+#: ../e-util/e-util-labels.c:39
msgid "I_mportant"
msgstr "重要(_M)"
#. red
-#: ../e-util/e-util-labels.c:38
+#: ../e-util/e-util-labels.c:40
msgid "_Work"
msgstr "工作(_W)"
#. orange
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:41
msgid "_Personal"
msgstr "个人(_P)"
#. green
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:42
msgid "_To Do"
msgstr "待办(_T)"
#. blue
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:43
msgid "_Later"
msgstr "稍候(_L)"
-#: ../e-util/e-util-labels.c:309
+#: ../e-util/e-util-labels.c:315
msgid "Label _Name:"
msgstr "标签名称(_N):"
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
msgid "Edit Label"
msgstr "编辑标签"
-#: ../e-util/e-util-labels.c:332
+#: ../e-util/e-util-labels.c:338
msgid "Add Label"
msgstr "添加标签"
-#: ../e-util/e-util-labels.c:351
+#: ../e-util/e-util-labels.c:357
msgid "Label name cannot be empty."
msgstr "标签名称不能为空。"
-#: ../e-util/e-util-labels.c:356
+#: ../e-util/e-util-labels.c:362
msgid ""
"A label having the same tag already exists on the server. Please rename your "
"label."
msgstr "服务器上已存在同名的标签。请重命名您的标签。"
-#: ../e-util/gconf-bridge.c:1218
+#: ../e-util/gconf-bridge.c:1221
#, c-format
msgid "GConf error: %s"
msgstr "GConf 错误:%s"
-#: ../e-util/gconf-bridge.c:1228
+#: ../e-util/gconf-bridge.c:1231
msgid "All further errors shown only on terminal."
msgstr "后续所有的错误都只显示在终端。"
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
#, c-format
msgid "1 second ago"
msgid_plural "%d seconds ago"
msgstr[0] "%d 秒前"
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
#, c-format
msgid "1 second in the future"
msgid_plural "%d seconds in the future"
msgstr[0] "%d 秒内"
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
#, c-format
msgid "1 minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "%d 分钟前"
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
#, c-format
msgid "1 minute in the future"
msgid_plural "%d minutes in the future"
msgstr[0] "%d 分钟内"
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
#, c-format
msgid "1 hour ago"
msgid_plural "%d hours ago"
msgstr[0] "%d 小时前"
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
#, c-format
msgid "1 hour in the future"
msgid_plural "%d hours in the future"
msgstr[0] "%d 小时内"
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
#, c-format
msgid "1 day ago"
msgid_plural "%d days ago"
msgstr[0] "%d 天前"
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
#, c-format
msgid "1 day in the future"
msgid_plural "%d days in the future"
msgstr[0] "%d 内"
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
#, c-format
msgid "1 week ago"
msgid_plural "%d weeks ago"
msgstr[0] "%d 周前"
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
#, c-format
msgid "1 week in the future"
msgid_plural "%d weeks in the future"
msgstr[0] "%d 周内"
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
#, c-format
msgid "1 month ago"
msgid_plural "%d months ago"
msgstr[0] "%d 个月前"
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
#, c-format
msgid "1 month in the future"
msgid_plural "%d months in the future"
msgstr[0] "%d 个月内"
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
#, c-format
msgid "1 year ago"
msgid_plural "%d years ago"
msgstr[0] "%d 年前"
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
#, c-format
msgid "1 year in the future"
msgid_plural "%d years in the future"
msgstr[0] "%d 年内"
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
msgid "<click here to select a date>"
msgstr "<单击此处以选择日期>"
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
msgid "now"
msgstr "现在"
#. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
msgid "%d-%b-%Y"
msgstr "%Y-%m-%d"
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
msgid "Select a time to compare against"
msgstr "选择用于比较的时间"
@@ -11118,56 +11312,56 @@ msgstr "选择文件"
msgid "Test"
msgstr "测试"
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
msgid "R_ule name:"
msgstr "规则名(_U):"
-#: ../filter/filter-rule.c:880
-msgid "Find items that meet the following criteria"
+#: ../filter/filter-rule.c:881
+msgid "Find items that meet the following conditions"
msgstr "查找符合下列条件的项目"
-#: ../filter/filter-rule.c:914
-msgid "A_dd Filter Criteria"
-msgstr "添加过滤规则(_D)"
+#: ../filter/filter-rule.c:915
+msgid "A_dd Condition"
+msgstr "添加动作(_D)"
-#: ../filter/filter-rule.c:920
-msgid "If all criteria are met"
+#: ../filter/filter-rule.c:921
+msgid "If all conditions are met"
msgstr "如果满足所有条件"
-#: ../filter/filter-rule.c:920
-msgid "If any criteria are met"
+#: ../filter/filter-rule.c:921
+msgid "If any conditions are met"
msgstr "如果满足任一条件"
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
msgid "_Find items:"
msgstr "查找项目(_F):"
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
msgid "All related"
msgstr "相关的全部"
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
msgid "Replies"
msgstr "回复"
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
msgid "Replies and parents"
msgstr "回复及原始邮件"
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
msgid "No reply or parent"
msgstr "无回复或原始邮件"
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
msgid "I_nclude threads"
msgstr "包含线索(_N)"
-#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
msgid "Incoming"
msgstr "接收"
-#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
msgid "Outgoing"
msgstr "寄出"
@@ -11261,7 +11455,7 @@ msgstr "未来"
msgid "months"
msgstr "月"
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
msgid "seconds"
msgstr "秒"
@@ -11273,10 +11467,11 @@ msgstr "当前时间"
msgid "the time you specify"
msgstr "您指定的时间"
-#: ../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:665
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-http/calendar-http.c:282
+#: ../plugins/calendar-weather/calendar-weather.c:527
+#: ../plugins/google-account-setup/google-source.c:674
+#: ../plugins/google-account-setup/google-contacts-source.c:341
msgid "weeks"
msgstr "周"
@@ -11284,15 +11479,15 @@ msgstr "周"
msgid "years"
msgstr "年"
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:382
msgid "Add Rule"
msgstr "添加规则"
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:463
msgid "Edit Rule"
msgstr "编辑规则"
-#: ../filter/rule-editor.c:786
+#: ../filter/rule-editor.c:809
msgid "Rule name"
msgstr "规则名"
@@ -11345,8 +11540,8 @@ msgstr "Evolution 邮件首选项控件"
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/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
#: ../mail/mail-component.c:767
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
@@ -11359,7 +11554,7 @@ msgid "Mail Accounts"
msgstr "邮件账户"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
msgid "Mail Preferences"
msgstr "邮件首选项"
@@ -11371,12 +11566,12 @@ msgstr "网络首选项"
msgid "_Mail"
msgstr "邮件(_M)"
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:386
#, c-format
msgid "%s License Agreement"
msgstr "%s 许可协议"
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:393
#, c-format
msgid ""
"\n"
@@ -11388,64 +11583,64 @@ msgstr ""
"请仔细阅读下方显示的 %s 许可协议\n"
"并选中复选框表明您接受该协议\n"
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
#: ../mail/em-vfolder-rule.c:513
msgid "Select Folder"
msgstr "选择文件夹"
-#: ../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
+#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
msgid "Autogenerated"
msgstr "自动生成的"
-#: ../mail/em-account-editor.c:762
+#: ../mail/em-account-editor.c:761
msgid "Ask for each message"
msgstr "每封信都询问"
-#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
msgid "Identity"
msgstr "标识"
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
msgid "Receiving Email"
msgstr "接收电子邮件"
-#: ../mail/em-account-editor.c:2131
+#: ../mail/em-account-editor.c:2130
msgid "Check for _new messages every"
msgstr "自动检查新邮件的间隔(_N)"
-#: ../mail/em-account-editor.c:2139
+#: ../mail/em-account-editor.c:2138
msgid "minu_tes"
msgstr "分钟(_T)"
-#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
msgid "Sending Email"
msgstr "发送电子邮件"
-#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
msgid "Defaults"
msgstr "默认"
#. Security settings
-#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
+#: ../plugins/exchange-operations/exchange-account-setup.c:332
msgid "Security"
msgstr "安全"
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
msgid "Receiving Options"
msgstr "接收选项"
-#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
msgid "Checking for New Messages"
msgstr "检查新邮件"
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
msgid "Account Editor"
msgstr "账户编辑器"
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
msgid "Evolution Account Assistant"
msgstr "Evolution 账户助手"
@@ -11463,19 +11658,19 @@ msgid "Protocol"
msgstr "协议"
#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
msgid "Unnamed"
msgstr "未命名"
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:970
msgid "Language(s)"
msgstr "语言"
-#: ../mail/em-composer-prefs.c:1041
+#: ../mail/em-composer-prefs.c:1019
msgid "Add signature script"
msgstr "添加签名脚本"
-#: ../mail/em-composer-prefs.c:1083
+#: ../mail/em-composer-prefs.c:1061
msgid "Signature(s)"
msgstr "签名"
@@ -11483,14 +11678,23 @@ msgstr "签名"
msgid "-------- Forwarded Message --------"
msgstr "-------- 转发的信件 --------"
-#: ../mail/em-composer-utils.c:1962
+#: ../mail/em-composer-utils.c:1602
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:1608
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2058
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:2009
+#: ../mail/em-composer-utils.c:2105
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@ -11498,7 +11702,7 @@ msgstr ""
"在 ${Year}-${Month}-${Day}${AbbrevWeekdayName}的 ${24Hour}:${Minute} "
"${TimeZone},${Sender}写道:"
-#: ../mail/em-composer-utils.c:2152
+#: ../mail/em-composer-utils.c:2248
msgid "-----Original Message-----"
msgstr "-------- 原始信件 --------"
@@ -11548,7 +11752,7 @@ msgid "Date sent"
msgstr "发送日期"
#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:767
+#: ../plugins/groupwise-features/share-folder.c:768
#: ../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
@@ -11627,7 +11831,7 @@ msgstr "未设置"
msgid "is set"
msgstr "已设置"
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
#: ../ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "垃圾"
@@ -11636,7 +11840,7 @@ msgstr "垃圾"
msgid "Junk Test"
msgstr "垃圾测试"
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
msgid "Label"
msgstr "标签"
@@ -11676,48 +11880,51 @@ msgstr "管道到程序"
msgid "Play Sound"
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:63
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
msgid "Read"
msgstr "已读"
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
msgid "Recipients"
msgstr "收件人"
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:54
msgid "Regex Match"
msgstr "正则表达式匹配"
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:55
msgid "Replied to"
msgstr "已回复到"
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:56
msgid "returns"
msgstr "返回"
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:57
msgid "returns greater than"
msgstr "返回大于"
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:58
msgid "returns less than"
msgstr "返回小于"
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:59
msgid "Run Program"
msgstr "运行程序"
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
msgid "Score"
msgstr "分数"
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
msgid "Sender"
msgstr "发送者"
+#: ../mail/em-filter-i18n.h:62
+msgid "Sender or Recipients"
+msgstr "发送者或接收者"
+
#: ../mail/em-filter-i18n.h:63
msgid "Set Label"
msgstr "设置标签"
@@ -11752,9 +11959,9 @@ msgstr "停止处理"
#: ../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
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1132
+#: ../smime/lib/e-cert.c:1115
msgid "Subject"
msgstr "主题"
@@ -11771,51 +11978,51 @@ msgstr "然后"
msgid "Add Ac_tion"
msgstr "添加动作(_T)"
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
msgid "C_reate Search Folder From Search..."
msgstr "从头创建搜索文件夹(_R)..."
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:217
msgid "All Messages"
msgstr "全部信件"
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:218
msgid "Unread Messages"
msgstr "未读信件"
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:220
msgid "No Label"
msgstr "无标签"
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:227
msgid "Read Messages"
msgstr "已读信件"
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:228
msgid "Recent Messages"
msgstr "最近信件"
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:229
msgid "Last 5 Days' Messages"
msgstr "前五天的信件"
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:230
msgid "Messages with Attachments"
msgstr "有附件的信件"
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:231
msgid "Important Messages"
msgstr "重要信件"
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:232
msgid "Messages Not Junk"
msgstr "不是垃圾邮件"
-#: ../mail/em-folder-browser.c:1171
+#: ../mail/em-folder-browser.c:1173
msgid "Account Search"
msgstr "账户搜索"
-#: ../mail/em-folder-browser.c:1224
+#: ../mail/em-folder-browser.c:1226
msgid "All Account Search"
msgstr "全部账户搜索"
@@ -11843,15 +12050,15 @@ 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/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
+#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
#: ../plugins/exchange-operations/exchange-folder.c:594
msgid "Inbox"
msgstr "收件箱"
-#: ../mail/em-folder-properties.c:389
+#: ../mail/em-folder-properties.c:390
#: ../plugins/groupwise-features/properties.glade.h:4
msgid "Folder Properties"
msgstr "文件夹属性"
@@ -11868,9 +12075,9 @@ msgstr "创建(_R)"
msgid "Folder _name:"
msgstr "文件夹名称(_N):"
-#. load store to mail component at the end, when everything is loaded
+#. load store to mail component
#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
msgid "Search Folders"
msgstr "搜索文件夹"
@@ -11879,19 +12086,24 @@ msgstr "搜索文件夹"
msgid "UNMATCHED"
msgstr "不匹配"
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
msgid "Drafts"
msgstr "草稿"
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "模板"
+
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
msgid "Outbox"
msgstr "发件箱"
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
msgid "Sent"
msgstr "已发箱"
-#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
+#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
msgid "Loading..."
msgstr "正在装入..."
@@ -11930,12 +12142,12 @@ msgstr "移动文件夹“%s”"
msgid "Copying folder %s"
msgstr "复制文件夹 %s"
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2013
#, c-format
msgid "Moving messages into folder %s"
msgstr "把信件移至文件夹 %s"
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2015
#, c-format
msgid "Copying messages into folder %s"
msgstr "把信件复制到文件夹 %s"
@@ -11952,331 +12164,331 @@ msgstr "复制到文件夹(_C)"
msgid "_Move to Folder"
msgstr "移至文件夹(_M)"
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "在“%s”中扫描文件夹"
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2117
msgid "Open in _New Window"
msgstr "在新窗口中打开(_N)"
#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2104
+#: ../mail/em-folder-tree.c:2122
msgid "_New Folder..."
msgstr "新建文件夹(_N)..."
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2125
msgid "_Move..."
msgstr "移动(_M)..."
-#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "重命名(_R)..."
-
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
msgid "Re_fresh"
msgstr "刷新(_F)"
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2134
msgid "Fl_ush Outbox"
msgstr "清空发件箱(_U)"
-#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
msgid "_Empty Trash"
msgstr "清空回收站(_E)"
+#: ../mail/em-folder-tree.c:2243
+msgid "_Unread Search Folder"
+msgstr "未读搜索文件夹(_U)"
+
#: ../mail/em-folder-utils.c:101
#, c-format
msgid "Copying `%s' to `%s'"
msgstr "把“%s”复制到 %s"
-#: ../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
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1198
+#: ../mail/importers/evolution-mbox-importer.c:82
msgid "Select folder"
msgstr "选择文件夹"
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1198
msgid "C_opy"
msgstr "复制(_O)"
-#: ../mail/em-folder-utils.c:585
+#: ../mail/em-folder-utils.c:532
#: ../plugins/groupwise-features/share-folder-common.c:145
#, c-format
msgid "Creating folder `%s'"
msgstr "创建文件夹“%s”"
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
#: ../plugins/groupwise-features/share-folder-common.c:387
msgid "Create folder"
msgstr "创建文件夹"
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
#: ../plugins/groupwise-features/share-folder-common.c:387
msgid "Specify where to create the folder:"
msgstr "指定在哪里创建文件夹:"
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1087 ../mail/mail.error.xml.h:70
msgid "Mail Deletion Failed"
msgstr "邮件删除失败"
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1088 ../mail/mail.error.xml.h:126
msgid "You do not have sufficient permissions to delete this mail."
msgstr "您没有足够的权限删除此邮件。"
-#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1326 ../ui/evolution-mail-message.xml.h:127
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
-#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../mail/em-folder-view.c:1328 ../mail/em-popup.c:566 ../mail/em-popup.c:577
#: ../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:1335 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1332 ../ui/evolution-mail-message.xml.h:106
msgid "_Edit as New Message..."
msgstr "作为新信件进行编辑(_E)..."
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1338
msgid "U_ndelete"
msgstr "取消删除(_N)"
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1339
msgid "_Move to Folder..."
msgstr "移至文件夹(_M)..."
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1340
msgid "_Copy to Folder..."
msgstr "复制到文件夹(_C)..."
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1343
msgid "Mar_k as Read"
msgstr "标记为已读(_K)"
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1344
msgid "Mark as _Unread"
msgstr "标记为未读(_U)"
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1345
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1346
msgid "Mark as Un_important"
msgstr "标记为不重要(_I)"
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1347
msgid "Mark as _Junk"
msgstr "标记为垃圾(_J)"
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1348
msgid "Mark as _Not Junk"
msgstr "标记为非垃圾(_N)"
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1349
msgid "Mark for Follo_w Up..."
msgstr "标记为跟随(_W)..."
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1351
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:1355 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1352 ../widgets/misc/e-dateedit.c:478
msgid "_None"
msgstr "无(_N)"
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1355
msgid "_New Label"
msgstr "新建标签(_N)"
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1359
msgid "Fla_g Completed"
msgstr "已完成标志(_G)"
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1360
msgid "Cl_ear Flag"
msgstr "清除标志(_E)"
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1363
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:1368
+#: ../mail/em-folder-view.c:1365
msgid "Search Folder based on _Subject"
msgstr "基于主题的搜索文件夹(_S)"
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1366
msgid "Search Folder based on Se_nder"
msgstr "基于发件人的搜索文件夹(_N)"
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1367
msgid "Search Folder based on _Recipients"
msgstr "基于收件人的搜索文件夹(_R)"
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1368
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:1376
+#: ../mail/em-folder-view.c:1373
msgid "Filter based on Sub_ject"
msgstr "基于主题过滤(_J)"
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1374
msgid "Filter based on Sen_der"
msgstr "基于发件人过滤(_D)"
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1375
msgid "Filter based on Re_cipients"
msgstr "基于收件人过滤(_C)"
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1376
msgid "Filter based on _Mailing List"
msgstr "基于邮件列表过滤(_M)"
#. default charset used in mail view
#. 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
+#: ../mail/em-folder-view.c:2252 ../mail/em-folder-view.c:2295
#: ../plugins/google-account-setup/google-source.c:251
-#: ../plugins/google-account-setup/google-source.c:532
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:529
+#: ../plugins/google-account-setup/google-source.c:727
msgid "Default"
msgstr "默认"
-#: ../mail/em-folder-view.c:2516
+#: ../mail/em-folder-view.c:2513
msgid "Unable to retrieve message"
msgstr "无法获取信件"
-#: ../mail/em-folder-view.c:2535
+#: ../mail/em-folder-view.c:2532
msgid "Retrieving Message..."
msgstr "正在收取信件..."
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2751
msgid "C_all To..."
msgstr "呼叫到(_A)..."
-#: ../mail/em-folder-view.c:2797
+#: ../mail/em-folder-view.c:2754
msgid "Create _Search Folder"
msgstr "创建搜索文件夹(_S)"
-#: ../mail/em-folder-view.c:2798
+#: ../mail/em-folder-view.c:2755
msgid "_From this Address"
msgstr "自此地址(_F)"
-#: ../mail/em-folder-view.c:2799
+#: ../mail/em-folder-view.c:2756
msgid "_To this Address"
msgstr "到此地址(_T)"
-#: ../mail/em-folder-view.c:3296
+#: ../mail/em-folder-view.c:3249
#, c-format
msgid "Click to mail %s"
msgstr "单击以给 %s 发送邮件"
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3261
#, c-format
msgid "Click to call %s"
msgstr "单击以呼叫 %s"
-#: ../mail/em-folder-view.c:3313
+#: ../mail/em-folder-view.c:3266
msgid "Click to hide/unhide addresses"
msgstr "单击可隐藏/显示地址"
#. message-search popup match count string
-#: ../mail/em-format-html-display.c:470
+#: ../mail/em-format-html-display.c:474
#, c-format
msgid "Matches: %d"
msgstr "匹配:%d"
-#: ../mail/em-format-html-display.c:614
+#: ../mail/em-format-html-display.c:618
msgid "Fin_d:"
msgstr "查找(_D):"
#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:642
msgid "_Previous"
msgstr "上一项(_P)"
-#: ../mail/em-format-html-display.c:643
+#: ../mail/em-format-html-display.c:647
msgid "_Next"
msgstr "下一项(_N)"
-#: ../mail/em-format-html-display.c:648
+#: ../mail/em-format-html-display.c:652
msgid "M_atch case"
msgstr "匹配大小写(_A)"
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:650
msgid "Unsigned"
msgstr "未签名"
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:951
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
msgstr "此信件未签名。无法保证这封信是可信的。"
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:651
msgid "Valid signature"
msgstr "有效签名"
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:952
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:949 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:652
msgid "Invalid signature"
msgstr "无效签名"
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:953
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
msgstr "无法校验这封信的签名,可能在传送的过程中邮件被篡改了。"
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:653
msgid "Valid signature, but cannot verify sender"
msgstr "签名有效,但是无法校验发送者"
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:954
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:951 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:654
msgid "Signature exists, but need public key"
msgstr "签名已存在,但需要公钥"
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:955
msgid ""
"This message is signed with a signature, but there is no corresponding "
"public key."
msgstr "这封信的签名有效,但是没有相应的公钥。"
-#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:660
msgid "Unencrypted"
msgstr "未加密"
-#: ../mail/em-format-html-display.c:958
+#: ../mail/em-format-html-display.c:962
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
-#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:661
msgid "Encrypted, weak"
msgstr "弱加密"
-#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html-display.c:963
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 "
@@ -12285,21 +12497,21 @@ msgstr ""
"这封信已加密,但使用的是弱加密算法。如果外人想要查看这封信的内容,可能要花一"
"定时间进行暴力破解,这很困难但并不是不可能。"
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:662
msgid "Encrypted"
msgstr "加密"
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:964
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:961 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:663
msgid "Encrypted, strong"
msgstr "强加密"
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:965
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 "
@@ -12308,86 +12520,86 @@ msgstr ""
"这封信已加密,且使用的是强加密算法。如果外人想要查看这封信的内容,可能要花大"
"量时间进行暴力破解,这十分困难。"
-#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
msgid "_View Certificate"
msgstr "查看证书(_V)"
-#: ../mail/em-format-html-display.c:1077
+#: ../mail/em-format-html-display.c:1081
msgid "This certificate is not viewable"
msgstr "此证书不可查看"
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1407
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "%Y年%m月%d日%A,%p%l:%M完成"
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1415
msgid "Overdue:"
msgstr "延期:"
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1418
msgid "by %B %d, %Y, %l:%M %p"
msgstr "到 %m月%d日%A,%p%l:%M"
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1496
msgid "_View Inline"
msgstr "嵌入视图(_V)"
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1497
msgid "_Hide"
msgstr "隐藏(_H)"
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1498
msgid "_Fit to Width"
msgstr "适合宽度(_F)"
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1499
msgid "Show _Original Size"
msgstr "显示原始大小(_O)"
-#: ../mail/em-format-html-display.c:1983
+#: ../mail/em-format-html-display.c:2168
msgid "Save attachment as"
msgstr "附件另存为"
-#: ../mail/em-format-html-display.c:1987
+#: ../mail/em-format-html-display.c:2172
msgid "Select folder to save all attachments"
msgstr "选择保存全部附件的文件夹..."
-#: ../mail/em-format-html-display.c:2038
+#: ../mail/em-format-html-display.c:2223
msgid "_Save Selected..."
msgstr "保存所选(_S)..."
#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2105
+#: ../mail/em-format-html-display.c:2290
#, c-format
msgid "%d at_tachment"
msgid_plural "%d at_tachments"
msgstr[0] "%d 个附件(_T)"
-#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
+#: ../mail/em-format-html-display.c:2297 ../mail/em-format-html-display.c:2386
msgid "S_ave"
msgstr "保存(_A)"
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:2308
msgid "S_ave All"
msgstr "全部保存(_A)"
-#: ../mail/em-format-html-display.c:2197
+#: ../mail/em-format-html-display.c:2382
msgid "No Attachment"
msgstr "无附件"
-#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2529 ../mail/em-format-html-display.c:2568
msgid "View _Unformatted"
msgstr "无格式查看(_U)"
-#: ../mail/em-format-html-display.c:2340
+#: ../mail/em-format-html-display.c:2531
msgid "Hide _Unformatted"
msgstr "无格式隐藏(_U)"
-#: ../mail/em-format-html-display.c:2397
+#: ../mail/em-format-html-display.c:2588
msgid "O_pen With"
msgstr "打开方式(_P)"
-#: ../mail/em-format-html-display.c:2473
+#: ../mail/em-format-html-display.c:2664
msgid ""
"Evolution cannot render this email as it is too large to process. You can "
"view it unformatted or with an external text editor."
@@ -12460,7 +12672,7 @@ msgstr "密件抄送"
#. pseudo-header
#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1450
+#: ../mail/em-mailer-prefs.c:1451
msgid "Mailer"
msgstr "邮件程序"
@@ -12477,14 +12689,14 @@ msgstr " (%R %Z)"
#. 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:1907
+#: ../mail/em-format-html.c:1912
#, 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:210 ../mail/em-format.c:884
#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:308
+#: ../mail/message-tag-followup.c:307
msgid "From"
msgstr "发件人"
@@ -12494,8 +12706,8 @@ 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
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
+#: ../widgets/misc/e-dateedit.c:347
msgid "Date"
msgstr "日期"
@@ -12503,105 +12715,110 @@ msgstr "日期"
msgid "Newsgroups"
msgstr "新闻组"
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "头像"
+
+#: ../mail/em-format.c:1158
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1200
msgid "Could not parse S/MIME message: Unknown error"
msgstr "无法解析 S/MIME 信件:未知错误"
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
msgid "Could not parse MIME message. Displaying as source."
msgstr "无法解析 MIME 信件。显示源文本。"
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1345
msgid "Unsupported encryption type for multipart/encrypted"
msgstr "不支持 multipart/encrypted 的加密类型"
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
msgid "Could not parse PGP/MIME message"
msgstr "无法解析 PGP/MIME 信件"
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
msgid "Could not parse PGP/MIME message: Unknown error"
msgstr "无法解析 PGP/MIME 信件:未知错误"
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1512
msgid "Unsupported signature format"
msgstr "不支持的签名格式"
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
msgid "Error verifying signature"
msgstr "校验签名错误"
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
msgid "Unknown error verifying signature"
msgstr "校验签名发生了未知错误"
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1665
msgid "Could not parse PGP message"
msgstr "无法分析 PGP 信件"
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1665
msgid "Could not parse PGP message: Unknown error"
msgstr "无法解析 PGP 信件:未知错误"
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-mailer-prefs.c:94
msgid "Every time"
msgstr "每次"
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
msgid "Once per day"
msgstr "每天一次"
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
msgid "Once per week"
msgstr "每周一次"
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
msgid "Once per month"
msgstr "每月一次"
-#: ../mail/em-mailer-prefs.c:326
+#: ../mail/em-mailer-prefs.c:327
msgid "Add Custom Junk Header"
msgstr "添加自定义垃圾信头"
-#: ../mail/em-mailer-prefs.c:330
+#: ../mail/em-mailer-prefs.c:331
msgid "Header Name:"
msgstr "信头名称:"
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
msgid "Header Value Contains:"
msgstr "信头值含有:"
-#: ../mail/em-mailer-prefs.c:436
+#: ../mail/em-mailer-prefs.c:437
msgid "Contains Value"
msgstr "包含值"
-#: ../mail/em-mailer-prefs.c:458
+#: ../mail/em-mailer-prefs.c:459
msgid "Color"
msgstr "颜色"
-#: ../mail/em-mailer-prefs.c:461
+#: ../mail/em-mailer-prefs.c:462
msgid "Tag"
msgstr "标签"
#. May be a better text
-#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
+#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
#, c-format
msgid "%s plugin is available and the binary is installed."
msgstr "%s 插件可用,二进制文件已经安装。"
#. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
+#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
#, c-format
msgid ""
"%s plugin is not available. Please check whether the package is installed."
msgstr "%s 插件不可用。请检查软件包是否已安装。"
-#: ../mail/em-mailer-prefs.c:1107
+#: ../mail/em-mailer-prefs.c:1108
msgid "No Junk plugin available"
msgstr "没有可用的垃圾邮件插件"
@@ -12661,24 +12878,23 @@ msgstr "无法复制 POP3 在服务器上保留的数据“%s”:%s"
msgid "Failed to create local mail storage `%s': %s"
msgstr "创建本地邮件存储“%s”失败:%s"
-#: ../mail/em-migrate.c:2898
-#, fuzzy
+#: ../mail/em-migrate.c:2952
msgid ""
-"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"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"
+"自 Evolution 2.4 之后,Evolution 邮箱文件夹的摘要格式现已移至 SQLite。\n"
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../mail/em-migrate.c:2963
+#: ../mail/em-migrate.c:3034
#, c-format
msgid "Unable to create local mail folders at `%s': %s"
msgstr "无法在“%s”创建本地邮件文件夹:%s"
-#: ../mail/em-migrate.c:2982
+#: ../mail/em-migrate.c:3053
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
@@ -12686,65 +12902,65 @@ msgstr ""
"无法从先前的 Evolution 安装中读取设置,“evolution/config.xmldb”不存在或者已损"
"坏。"
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
+#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
msgid "_Reply to sender"
msgstr "回复发件人(_R)"
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
#: ../ui/evolution-mail-message.xml.h:83
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
#. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
+#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
msgid "_Add to Address Book"
msgstr "添加到地址簿(_A)"
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-subscribe-editor.c:600
msgid "This store does not support subscriptions, or they are not enabled."
msgstr "此存储不支持订阅,或订阅未启用。"
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:633
msgid "Subscribed"
msgstr "已订阅"
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:637
msgid "Folder"
msgstr "文件夹"
#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:822
+#: ../mail/em-subscribe-editor.c:839
msgid "Please select a server."
msgstr "请选择服务器。"
-#: ../mail/em-subscribe-editor.c:843
+#: ../mail/em-subscribe-editor.c:860
msgid "No server has been selected"
msgstr "没有选中服务器"
#. Check buttons
-#: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
msgid "_Do not show this message again."
msgstr "不再显示此信息(_D)。"
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:317
msgid "Message Filters"
msgstr "邮件过滤器"
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:370
msgid "message"
msgstr "信件"
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:654
msgid "Save Message..."
msgstr "保存信件..."
-#: ../mail/em-utils.c:703
+#: ../mail/em-utils.c:704
msgid "Add address"
msgstr "添加地址"
#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1224
+#: ../mail/em-utils.c:1225
#, c-format
msgid "Messages from %s"
msgstr "来自 %s 的信件"
@@ -12770,17 +12986,13 @@ 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"
+msgid "Allows Evolution to display text part of limited size"
msgstr "允许 Evolution 显示被限制大小的文本部分"
#: ../mail/evolution-mail.schemas.in.h:5
msgid "Always request read receipt"
msgstr "总是请求阅读收条"
-#: ../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:7
msgid "Automatic emoticon recognition"
msgstr "自动识别表情图标"
@@ -12827,8 +13039,7 @@ msgstr "将 TO/CC/BCC 的显示地址数压缩到 address_count 所指定的数
msgid ""
"Controls how frequently local changes are synchronized with the remote mail "
"server. The interval must be at least 30 seconds."
-msgstr ""
-"控制与远程邮件服务器同步本地更改的频率。间隔必须至少为 30 秒。"
+msgstr "控制与远程邮件服务器同步本地更改的频率。间隔必须至少为 30 秒。"
#: ../mail/evolution-mail.schemas.in.h:18
msgid "Custom headers to use while checking for junk."
@@ -12909,9 +13120,9 @@ msgid ""
"can be slow, if remote address books (like LDAP) are marked for "
"autocompletion."
msgstr ""
-"决定是否在地址簿中查找发件人电子邮件。如果找到,则不应是垃圾邮件。这将在标记为"
-"自动补全的地址簿中查找,如果远程地址簿(如 LDAP)被标记为自动补全的话,可能会比"
-"较慢。"
+"决定是否在地址簿中查找发件人电子邮件。如果找到,则不应是垃圾邮件。这将在标记"
+"为自动补全的地址簿中查找,如果远程地址簿(如 LDAP)被标记为自动补全的话,可能会"
+"比较慢。"
#: ../mail/evolution-mail.schemas.in.h:36
msgid "Determines whether to use custom headers to check for junk"
@@ -12941,8 +13152,8 @@ msgid "Directory for saving mail component files."
msgstr "保存邮件组件文件的目录。"
#: ../mail/evolution-mail.schemas.in.h:41
-msgid "Disable or enable ellipsizing of folder names in folder tree"
-msgstr "禁用或启用文件夹数中文件夹名的省略显示"
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr "禁用或启用侧边栏中文件夹名的省略显示"
#: ../mail/evolution-mail.schemas.in.h:42
msgid "Draw spelling error indicators on words as you type."
@@ -13009,47 +13220,64 @@ msgstr "允许渲染被限制大小的信件文本部分。"
msgid "Enable/disable caret mode"
msgstr "启用/禁用光标模式"
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+msgid "Encode file names in an Outlook/GMail way"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail does, to let "
+"them understand localized file names sent by Evolution, because they do not "
+"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:58
msgid "Height of the message-list pane"
msgstr "信件列表面板的高度"
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:59
msgid "Height of the message-list pane."
msgstr "信件列表面板的高度。"
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
msgid "Hides the per-folder preview and removes the selection"
msgstr "隐藏单文件夹预览并移除选择"
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
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:60
+#: ../mail/evolution-mail.schemas.in.h:62
msgid ""
"If the \"Preview\" pane is on, then show it side-by-side rather than "
"vertically."
msgstr "如果开启了“预览”面板,则以并列方式显示,而不是垂直方式显示。"
-#: ../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 "
-"in GNOME's mime-type database may be used for displaying content."
+#: ../mail/evolution-mail.schemas.in.h:63
+#, fuzzy
+#| 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 in GNOME's mime-type database may be used for displaying "
+#| "content."
+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 "
+"in GNOME's MIME type database may be used for displaying content."
msgstr ""
"如果 Evolution 内没有特定 MIME 类型的内置查看器,那么出现在此列表中的任何 "
"MIME 类型在 GNOME 的 MIME 类型数据库中映射的 bonobo 组件查看器将被用来显示其"
"内容。"
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
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
+#: ../mail/evolution-mail.schemas.in.h:65
msgid ""
"Initial maximize state of the \"Send and Receive Mail\" window. The value "
"updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13058,23 +13286,23 @@ msgid ""
"detail."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
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
+#: ../mail/evolution-mail.schemas.in.h:67
msgid "It disables/enables the prompt while marking multiple messages."
msgstr "禁用/启用对多封邮件的标记。"
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
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:67
+#: ../mail/evolution-mail.schemas.in.h:69
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 "
@@ -13082,31 +13310,31 @@ msgid ""
msgstr ""
"禁用/启用永久删除(而非简单地从结果中移除)搜索文件夹中的信件时不断弹出的提示。"
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
msgid "Last time empty junk was run"
msgstr "上次清空垃圾邮件的时间"
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:71
msgid "Last time empty trash was run"
msgstr "上次清空回收站的时间"
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "Level beyond which the message should be logged."
-msgstr "大于此级别的消息会被记录。"
-
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:73
msgid "List of Labels and their associated colors"
msgstr "标签及其对应颜色的列表"
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "列出要使用 bonobo 组件查看器查看的 MIME 类型"
+
+#: ../mail/evolution-mail.schemas.in.h:75
msgid "List of accepted licenses"
msgstr "列出接受的许可"
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:76
msgid "List of accounts"
msgstr "账户列表"
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:77
msgid ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13114,15 +13342,15 @@ msgstr ""
"列出了 Evolution 邮件组件已知的账户。此列表包含了相对于 /apps/evolution/mail/"
"accounts 的子目录命名字符串。"
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:78
msgid "List of custom headers and whether they are enabled."
msgstr "自定义头及该头是否启用。"
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:79
msgid "List of dictionary language codes used for spell checking."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:80
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."
@@ -13130,272 +13358,271 @@ msgstr ""
"列出了 Evolution 邮件组件已知的标签。列表中的字符串格式形如“名称:颜色”,其中"
"颜色使用了 HTML 十六进制编码方式。"
-#: ../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:79
+#: ../mail/evolution-mail.schemas.in.h:81
msgid "List of protocol names whose license has been accepted."
msgstr "列出接受协议的协议名称。"
-#: ../mail/evolution-mail.schemas.in.h:80
-msgid "Load images for HTML messages over http"
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "Load images for HTML messages over HTTP"
msgstr "在 HTML 信件中装入 HTTP 图像"
-#: ../mail/evolution-mail.schemas.in.h:81
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:83
msgid ""
-"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"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 - "
+"在 HTML 信件中装入 HTTP(S) 图像。可供选择的值有:0 - 绝不从网上装入图像,1 - "
"如果发送者在地址簿中则装入图像,2 - 总是从网上装入图像。"
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:84
msgid "Log filter actions"
msgstr "记录过滤动作"
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:85
msgid "Log filter actions to the specified log file."
msgstr "将过滤动作记录到指定日志文件。"
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:86
msgid "Logfile to log filter actions"
msgstr "记录过滤动作的日志文件"
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:87
msgid "Logfile to log filter actions."
msgstr "记录过滤动作的日志文件。"
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:88
msgid "Mark as Seen after specified timeout"
msgstr "在指定超时过后标为已看"
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:89
msgid "Mark as Seen after specified timeout."
msgstr "在指定超时过后标为已看。"
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:90
msgid "Mark citations in the message \"Preview\""
msgstr "在信件“预览”中标出引用"
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:91
msgid "Mark citations in the message \"Preview\"."
msgstr "在信件“预览”中标出引用。"
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:92
msgid "Message Window default height"
msgstr "信件窗口默认高度"
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:93
msgid "Message Window default width"
msgstr "信件窗口默认宽度"
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:94
msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "信件显示风格(普通、全部邮件头、源代码)"
+msgstr "信件显示风格(“normal”普通、“full headers”全部邮件头、“source”源代码)"
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:95
msgid "Minimum days between emptying the junk on exit"
msgstr "退出时清空垃圾信件的最少天数"
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:96
msgid "Minimum days between emptying the trash on exit"
msgstr "退出时清空回收站的最少天数"
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:97
msgid "Minimum time between emptying the junk on exit, in days."
msgstr "退出时清空垃圾信件的最少时间,以天计。"
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:98
msgid "Minimum time between emptying the trash on exit, in days."
msgstr "退出时清空回收站的最少天数。"
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:99
msgid "Number of addresses to display in TO/CC/BCC"
msgstr "要在 TO/CC/BCC 中显示的地址数"
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:100
msgid "Prompt on empty subject"
msgstr "空主题时提示"
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:101
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr "用户视图销毁文件夹时提示。"
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:102
msgid ""
"Prompt the user when he or she tries to send a message without a Subject."
msgstr "用户视图发送没有主题的邮件时提示。"
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:103
msgid "Prompt to check if the user wants to go offline immediately"
msgstr "用户想立即离线时提示检查"
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:104
msgid "Prompt when deleting messages in search folder"
msgstr "删除搜索文件夹中的信件时提示"
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:105
msgid "Prompt when user expunges"
msgstr "用户销毁时提示"
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:106
msgid "Prompt when user only fills Bcc"
msgstr "用户只填入 Bcc 时提示"
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:107
msgid "Prompt when user tries to open 10 or more messages at once"
msgstr "当用户试图一次打开超过十封信时提示"
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:108
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:107
+#: ../mail/evolution-mail.schemas.in.h:109
msgid "Prompt when user tries to send a message with no To or Cc recipients."
msgstr "当用户试图发送没有 To 或 Cc 收件人的邮件时提示。"
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:110
msgid "Prompt when user tries to send unwanted HTML"
msgstr "当用户是否发送意外的 HTML 时提示"
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:111
msgid "Prompt while marking multiple messages"
msgstr "标记多封信件时提示"
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:112
msgid "Recognize emoticons in text and replace them with images."
msgstr "识别文本中的表情,并将其替换为图像。"
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:113
msgid "Recognize links in text and replace them."
msgstr "识别文本中的链接并进行替换。"
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:114
msgid "Run junk test on incoming mail."
msgstr "对收到的邮件运行垃圾邮件测试。"
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:115
msgid "Save directory"
msgstr "保存目录"
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:116
msgid "Search for the sender photo in local address books"
msgstr "在本地地址薄中搜索发件人照片"
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
msgid "Send HTML mail by default"
msgstr "默认以 HTML 发送邮件"
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
msgid "Send HTML mail by default."
msgstr "默认以 HTML 发送邮件。"
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:119
msgid "Sender email-address column in the message list"
msgstr "在信件列表中显示 email 地址列"
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
msgid "Server synchronization interval"
msgstr "服务器同步间隔"
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
msgid "Show Animations"
msgstr "显示动画"
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
msgid "Show animated images as animations."
msgstr "将动画图像显示为动画。"
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
msgid "Show deleted messages (with a strike-through) in the message-list."
msgstr "在信件列表中显示删除了的信件(带有删除线)。"
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
msgid "Show deleted messages in the message-list"
msgstr "在信件列表中显示删除了的信件"
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
msgid "Show photo of the sender"
msgstr "显示发件人照片"
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
msgid ""
"Show the email-address of the sender in a separate column in the message "
"list."
msgstr "在信件列表的以另外的列显示电子邮件的发送者。"
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
msgid "Show the photo of the sender in the message reading pane."
msgstr "在信件阅读面板中显示发件人照片。"
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
msgid "Spell check inline"
msgstr "内嵌拼写检查"
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
msgid "Spell checking color"
msgstr "拼写检查颜色"
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
msgid "Spell checking languages"
msgstr "拼写检查语言"
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
msgid "Subscribe dialog default height"
msgstr "订阅对话框默认高度"
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
msgid "Subscribe dialog default width"
msgstr "订阅对话框默认宽度"
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
msgid "Terminal font"
msgstr "终端字体"
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
msgid "Text message part limit"
msgstr "文本信件部分限制"
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
msgid "The default plugin for Junk hook"
msgstr "默认的垃圾信件钩子插件"
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
msgid "The last time empty junk was run, in days since the epoch."
msgstr "上次清空垃圾信件的时间,以自新纪元后的天数显示。"
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
msgid "The last time empty trash was run, in days since the epoch."
msgstr "上次清空回收站的时间,以新纪元后的天数显示。"
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
msgid "The terminal font for mail display."
msgstr "邮件显示用的终端字体。"
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
msgid "The variable width font for mail display."
msgstr "用于显示邮件的变宽字体。"
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
msgid ""
"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:141
+#: ../mail/evolution-mail.schemas.in.h:143
+#, fuzzy
+#| 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."
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."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
msgstr ""
"此选项决定了 Evolution 中可格式化的最大文本部分大小。默认为 4MB/4096 KB,单位"
"为 KB。"
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
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 "
@@ -13404,7 +13631,7 @@ msgstr ""
"这是默认的垃圾邮件插件,即使启用了多个插件。如果默认列出的插件被禁用,它不会"
"缺省到其它可用的插件。"
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
#, fuzzy
msgid ""
"This key is read only once and reset to \"false\" after read. This unselects "
@@ -13413,7 +13640,7 @@ msgstr ""
"此键只被读取一次并在读取后被重设为 false。它取消选中列表中的邮件并移除相应文"
"件夹的预览。"
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
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;"
@@ -13423,30 +13650,30 @@ msgstr ""
"此键应包含指定自定义邮件头的 XML 结构列表,以及是否显示这些邮件头。XML 结构的"
"格式为:&lt;启用的邮件头&gt; - 设为 enabled 则在邮件视图中显示该邮件头。"
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
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
+#: ../mail/evolution-mail.schemas.in.h:148
msgid "This option would help in improving the speed of fetching."
msgstr "此选项能帮助提高获取信件的速度"
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
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:148
+#: ../mail/evolution-mail.schemas.in.h:150
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:149
+#: ../mail/evolution-mail.schemas.in.h:151
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 "
@@ -13455,129 +13682,129 @@ msgstr ""
"此设置指定了默认情况下是否将线索按线索中的最新消息而不是消息日期排序。需要重"
"启 Evolution。"
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
msgid "Thread the message list."
msgstr "按线索编排信件列表。"
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
msgid "Thread the message-list"
msgstr "按线索编排信件列表"
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
msgid "Thread the message-list based on Subject"
msgstr "基于主题按线索编排信件列表"
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
msgid "Timeout for marking message as seen"
msgstr "将信件标为已看的超时时长"
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
msgid "Timeout for marking message as seen."
msgstr "将信件标为已看的超时时长。"
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
msgid "UID string of the default account."
msgstr "默认账户的 UID 字符串。"
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:158
msgid "Underline color for misspelled words when using inline spelling."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
msgid "Use SpamAssassin daemon and client"
msgstr "使用垃圾克星守护程序和客户"
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
msgid "Use SpamAssassin daemon and client (spamc/spamd)."
msgstr "使用 SpamAssassin 守护程序和客户端(spamc/spamd)。"
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
msgid "Use custom fonts"
msgstr "使用自定义字体"
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
msgid "Use custom fonts for displaying mail."
msgstr "使用自定义字体显示邮件。"
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
msgid "Use only local spam tests."
msgstr "只使用本地垃圾邮件测试。"
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
msgid "Use only the local spam tests (no DNS)."
msgstr "之使用本地垃圾邮件测试(无 DNS)。"
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
msgid "Use side-by-side or wide layout"
msgstr "使用并排还是宽屏布局"
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
msgid "Variable width font"
msgstr "变宽字体"
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
msgid "View/Bcc menu item is checked"
msgstr "选中了查看/Bcc 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
msgid "View/Bcc menu item is checked."
msgstr "选中了查看/Bcc 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
msgid "View/Cc menu item is checked"
msgstr "选中了查看/Cc 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
msgid "View/Cc menu item is checked."
msgstr "选中了查看/Cc 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
msgid "View/From menu item is checked"
msgstr "选中了查看/From 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
msgid "View/From menu item is checked."
msgstr "选中了查看/From 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
msgid "View/PostTo menu item is checked"
msgstr "选中了查看/PostTo 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
msgid "View/PostTo menu item is checked."
msgstr "选中了查看/PostTo 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
msgid "View/ReplyTo menu item is checked"
msgstr "选中了查看/ReplyTo 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
msgid "View/ReplyTo menu item is checked."
msgstr "选中了查看/ReplyTo 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:177
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:178
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr "禁用或启用侧边栏中文件夹名的省略显示"
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
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:178
+#: ../mail/evolution-mail.schemas.in.h:180
msgid "Whether sort threads based on latest message in that thread"
msgstr "是否以线索中的最新信件来排序线索"
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
msgid "Width of the message-list pane"
msgstr "信件列表面板的高度"
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
msgid "Width of the message-list pane."
msgstr "信件列表面板的高度。"
@@ -13593,78 +13820,72 @@ msgstr "Evolution Elm 导入器"
msgid "Import mail from Elm."
msgstr "从 Elm 导入邮件。"
-#: ../mail/importers/evolution-mbox-importer.c:80
+#: ../mail/importers/evolution-mbox-importer.c:79
msgid "Destination folder:"
msgstr "目的文件夹:"
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
msgid "Select folder to import into"
msgstr "选择要导入到哪个文件夹"
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:219
msgid "Berkeley Mailbox (mbox)"
msgstr "Berkeley 邮箱(mbox)"
-#: ../mail/importers/evolution-mbox-importer.c:221
+#: ../mail/importers/evolution-mbox-importer.c:220
msgid "Importer Berkeley Mailbox format folders"
msgstr "导入器 Berkeley 邮箱格式文件夹"
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
msgid "Importing mailbox"
msgstr "导入邮箱"
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
+#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
#, c-format
msgid "Importing `%s'"
msgstr "导入“%s”"
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
#, c-format
msgid "Scanning %s"
msgstr "扫描 %s"
-#: ../mail/importers/pine-importer.c:227
+#: ../mail/importers/pine-importer.c:225
msgid "Importing Pine data"
msgstr "导入 Pine 数据"
-#: ../mail/importers/pine-importer.c:426
+#: ../mail/importers/pine-importer.c:424
msgid "Evolution Pine importer"
msgstr "Evolution Pine 导入器"
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:425
msgid "Import mail from Pine."
msgstr "从 Pine 导入邮件。"
-#: ../mail/mail-autofilter.c:75
+#: ../mail/mail-autofilter.c:72
#, c-format
msgid "Mail to %s"
msgstr "邮寄给 %s"
-#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
#, c-format
msgid "Mail from %s"
msgstr "来自 %s 的邮件"
-#: ../mail/mail-autofilter.c:262
+#: ../mail/mail-autofilter.c:259
#, c-format
msgid "Subject is %s"
msgstr "主题是 %s"
-#: ../mail/mail-autofilter.c:297
+#: ../mail/mail-autofilter.c:294
#, c-format
msgid "%s mailing list"
msgstr "%s 邮件列表"
-#: ../mail/mail-autofilter.c:368
+#: ../mail/mail-autofilter.c:365
msgid "Add Filter Rule"
msgstr "添加过滤规则"
-#: ../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, "
@@ -13713,92 +13934,36 @@ msgid "%d total"
msgid_plural "%d total"
msgstr[0] "总共 %d 封"
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:927
msgid "New Mail Message"
msgstr "新建信件"
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:928
msgctxt "New"
msgid "_Mail Message"
msgstr "信件(_M)"
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:929
msgid "Compose a new mail message"
msgstr "撰写一封新信"
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:935
msgid "New Mail Folder"
msgstr "新建邮件文件夹"
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:936
msgctxt "New"
msgid "Mail _Folder"
msgstr "邮件文件夹(_F)"
-#: ../mail/mail-component.c:933
+#: ../mail/mail-component.c:937
msgid "Create a new mail folder"
msgstr "创建新邮件文件夹"
-#: ../mail/mail-component.c:1080
+#: ../mail/mail-component.c:1084
msgid "Failed upgrading Mail settings or folders."
msgstr "升级邮件设置或文件夹失败。"
-#: ../mail/mail-component.c:1596
-msgid "Error"
-msgstr "错误"
-
-#: ../mail/mail-component.c:1596
-msgid "Errors"
-msgstr "错误"
-
-#: ../mail/mail-component.c:1597
-msgid "Warnings and Errors"
-msgstr "警告和错误"
-
-#: ../mail/mail-component.c:1598
-msgid "Debug"
-msgstr "调试"
-
-#: ../mail/mail-component.c:1598
-msgid "Error, Warnings and Debug messages"
-msgstr "错误,警告和调试信息"
-
-#: ../mail/mail-component.c:1725
-msgid "Debug Logs"
-msgstr "调试日志"
-
-#: ../mail/mail-component.c:1739
-msgid "Show _errors in the status bar for"
-msgstr "在状态栏显示错误(_E)"
-
-#. 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:1761
-msgid "Log Messages:"
-msgstr "日志消息:"
-
-#: ../mail/mail-component.c:1802
-msgid "Log Level"
-msgstr "日志级别"
-
-#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
-msgid "Time"
-msgstr "时间"
-
-#: ../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)"
@@ -14076,126 +14241,125 @@ msgid "Empty trash folders on e_xit"
msgstr "退出时清空已删除邮件(_X)"
#: ../mail/mail-config.glade.h:79
-msgid "Enable Magic S_pacebar "
+msgid "Enable Magic S_pacebar"
msgstr "启用魔术空格键(_P)"
#: ../mail/mail-config.glade.h:80
msgid "Enable Sea_rch Folders"
msgstr "启用搜索文件夹(_R)"
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
msgid "Encry_ption certificate:"
msgstr "加密证书(_P):"
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
msgid "Encrypt out_going messages (by default)"
msgstr "加密寄出的信件(默认)(_G)"
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
msgid "Fi_xed-width:"
msgstr "等宽(_X):"
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
msgid "Fix_ed width Font:"
msgstr "等宽字体(_E):"
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
msgid "Font Properties"
msgstr "字体属性"
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
msgid "Format messages in _HTML"
msgstr "用 HTML 格式化信件(_H)"
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
msgid "Full Nam_e:"
msgstr "全名(_E):"
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:91
msgid "HTML Messages"
msgstr "HTML 信件"
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
msgid "H_TTP Proxy:"
msgstr "HTTP 代理服务器(_T):"
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
msgid "Headers"
msgstr "信头"
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
msgid "Highlight _quotations with"
msgstr "突出显示引用(_Q)"
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:96
msgid "Inline"
msgstr "嵌入"
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
msgid "Inline (Outlook style)"
msgstr "嵌入(Outlook 风格)"
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
msgid "KB"
msgstr "KB"
-#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
msgid "Labels"
msgstr "标签"
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
msgid "Languages Table"
msgstr "语言表"
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
msgid "Mail Configuration"
msgstr "邮件配置"
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
msgid "Mail Headers Table"
msgstr "邮件头表"
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
msgid "Mailbox location"
msgstr "邮件箱位置"
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
msgid "Message Composer"
msgstr "信件撰写器"
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
msgid "No _Proxy for:"
msgstr "不使用代理的情况(_P):"
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
msgid ""
"Note: Underscore in the label name is used as mnemonic identifier in menu."
msgstr "注意:标签名中的下划线被用作菜单中的助记符。"
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:109
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
msgstr "注意:直到您第一次连接的时候,才会询问密码。"
-#: ../mail/mail-config.glade.h:109
-#, fuzzy
+#: ../mail/mail-config.glade.h:110
msgid "Option is ignored if a match for custom junk headers is found."
msgstr "如果找到匹配的自定义垃圾信头,此选项将被覆盖。"
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
msgid "Or_ganization:"
msgstr "组织(_G):"
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG 键标识(_K):"
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
msgid "Pass_word:"
msgstr "密码(_W):"
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
msgid ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
@@ -14203,7 +14367,7 @@ msgstr ""
"请在下面的空白处输入此账户的描述性名称。\n"
"此名称将只在显示时使用。"
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -14211,7 +14375,7 @@ msgstr ""
"请在下面输入您的发件服务器信息。如果您不太确定的话,请询问您的系统管理员或者"
"互联网服务提供商ISP。"
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
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 "
@@ -14220,121 +14384,129 @@ msgstr ""
"请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入,除非您想要在您发"
"出的邮件中包含此信息。"
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
msgid "Please select among the following options"
msgstr "请从以下选项中选择"
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
msgid "Port:"
msgstr "端口:"
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr "发送只有暗送收件人的信件时提示(_O)"
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
msgid "Quoted"
msgstr "引用"
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
msgid "Re_member password"
msgstr "记住密码(_M)"
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
msgid "Re_ply-To:"
msgstr "回复到(_P):"
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
msgid "Remember _password"
msgstr "记住密码(_P)"
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
msgid "S_OCKS Host:"
msgstr "SOCKS 主机(_O):"
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
msgid "S_earch for sender photograph only in local address books"
msgstr "仅在本地地址簿中搜索发件人照片(_E)"
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
msgid "S_elect..."
msgstr "选择(_E)..."
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
msgid "S_end message receipts:"
msgstr "发送信件收条(_E):"
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
msgid "S_tandard Font:"
msgstr "标准字体(_T):"
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
+msgid "Select Drafts Folder"
+msgstr "选择草稿文件夹"
+
+#: ../mail/mail-config.glade.h:134
msgid "Select HTML fixed width font"
msgstr "选择 HTML 固定宽度字体"
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
msgid "Select HTML fixed width font for printing"
msgstr "选择用于打印的 HTML 固定宽度字体"
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
msgid "Select HTML variable width font"
msgstr "选择 HTML 变宽度字体"
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
msgid "Select HTML variable width font for printing"
msgstr "选择用于打印的 HTML 变宽度字体"
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
+msgid "Select Sent Folder"
+msgstr "选择已发文件夹"
+
+#: ../mail/mail-config.glade.h:140
msgid "Sending Mail"
msgstr "发送邮件"
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:141
msgid "Sent _Messages Folder:"
msgstr "已发送信件文件夹(_M):"
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:142
msgid "Ser_ver requires authentication"
msgstr "服务器需要认证(_V)"
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:143
msgid "Server _Type: "
msgstr "服务器类型(_T):"
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:144
msgid "Sig_ning certificate:"
msgstr "签名证书(_N):"
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:145
msgid "Signat_ure:"
msgstr "签名(_U):"
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:146
msgid "Signatures"
msgstr "签名"
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:147
msgid "Signatures Table"
msgstr "签名表"
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:148
msgid "Spell Checking"
msgstr "拼写检查"
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:149
msgid "Start _typing at the bottom on replying"
msgstr "回复时在底部开始打字(_T)"
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:150
msgid "T_ype: "
msgstr "类型(_Y):"
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:151
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
msgstr "在此列出的语言反映了您所安装的字典。"
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:152
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -14343,7 +14515,7 @@ msgstr ""
"此脚本的输出将用于您的签名。您指定的名称将只会\n"
"用于显示。"
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:155
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -14351,26 +14523,26 @@ msgstr ""
"输入您想要给此帐户起的名字。\n"
"如:“工作”或“私人”"
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:157
msgid "Us_ername:"
msgstr "用户名(_E):"
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:158
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
+#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
+#: ../plugins/google-account-setup/google-source.c:634
+#: ../plugins/google-account-setup/google-contacts-source.c:288
#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
msgid "User_name:"
msgstr "用户名(_N):"
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:160
msgid "V_ariable-width:"
msgstr "变宽(_A):"
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:161
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -14380,124 +14552,124 @@ msgstr ""
"\n"
"单击“前进”开始。"
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:164
msgid "_Add Signature"
msgstr "添加签名(_A)"
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:165
msgid "_Always load images from the Internet"
msgstr "总是从 Internet 上装入图像(_A)"
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:166
msgid "_Automatic proxy configuration URL:"
msgstr "自动代理服务器配置 URL(_A):"
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:167
msgid "_Default junk plugin:"
msgstr "默认的垃圾邮件插件(_D):"
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:168
msgid "_Direct connection to the Internet"
msgstr "直接连接到 Internet(_D)"
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:169
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:171
msgid "_Forward style:"
msgstr "转发方式(_F):"
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:172
msgid "_Keep Signature above the original message on replying"
msgstr "回复时保留原始信件的签名(_K)"
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:173
msgid "_Load images in messages from contacts"
msgstr "装入来自联系人的邮件中的图像(_L)"
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:174
msgid "_Lookup in local address book only"
msgstr "仅在本地地址簿中查阅(_L)"
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:175
msgid "_Make this my default account"
msgstr "使它成为我的默认账户(_M)"
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:176
msgid "_Manual proxy configuration:"
msgstr "手动代理服务器配置(_M):"
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:177
msgid "_Mark messages as read after"
msgstr "把信件标记为已读前等(_M)"
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:179
msgid "_Never load images from the Internet"
msgstr "绝不从 Internet 装入图像(_N)"
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:180
msgid "_Path:"
msgstr "路径(_P):"
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:181
msgid "_Prompt on sending HTML mail to contacts that do not want them"
msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:182
msgid "_Prompt when sending messages with an empty subject line"
msgstr "发送空主题行的信件时提示(_P)"
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:183
msgid "_Reply style:"
msgstr "回复风格(_R):"
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:184
msgid "_Script:"
msgstr "脚本(_S):"
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:185
msgid "_Secure HTTP Proxy:"
msgstr "安全 HTTP 代理(_S):"
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:186
msgid "_Select..."
msgstr "选择(_S)..."
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:189
msgid "_Show image animations"
msgstr "显示图像动画(_S)"
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:190
msgid "_Show the photograph of sender in the message preview"
msgstr "在电子邮件预览中显示发送者的照片(_S)"
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:191
msgid "_Shrink To / Cc / Bcc headers to "
msgstr "只显示 To/Cc/Bcc 头中的前(_S)"
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:192
msgid "_Use Secure Connection:"
msgstr "使用安全连接(_U):"
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:193
msgid "_Use system defaults"
msgstr "使用默认值(_U)"
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:194
msgid "_Use the same fonts as other applications"
msgstr "使用与其它应用程序相同的字体(_U)"
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:195
msgid "addresses"
msgstr "个地址"
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:196
msgid "color"
msgstr "颜色"
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:197
msgid "description"
msgstr "描述"
@@ -14545,7 +14717,7 @@ msgstr "查找(_I):"
msgid "Find in Message"
msgstr "在信件中查找"
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
msgid "Flag to Follow Up"
msgstr "跟随的标志"
@@ -14597,26 +14769,26 @@ msgstr "标志(_F):"
msgid "_Tick this to accept the license agreement"
msgstr "选中此处以表明您接受许可协议(_T)"
-#: ../mail/mail-folder-cache.c:845
+#: ../mail/mail-folder-cache.c:834
#, c-format
msgid "Pinging %s"
msgstr "查验 %s"
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
msgid "Filtering Selected Messages"
msgstr "过滤选中的信件"
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
msgid "Fetching Mail"
msgstr "收取邮件"
#. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "应用寄出过滤器失败:%s"
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -14625,121 +14797,121 @@ msgstr ""
"追加到 %s:%s 失败\n"
"转而追加到本地“已发”文件夹。"
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "追加到本地“已发”文件夹失败:%s"
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:725
msgid "Sending message"
msgstr "发送信件"
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
#, c-format
msgid "Sending message %d of %d"
msgstr "发送第%d封信,共%d封"
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
#, c-format
msgid "Failed to send %d of %d messages"
msgstr "在第%d封信失败,共%d封"
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
msgid "Canceled."
msgstr "已取消。"
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
msgid "Complete."
msgstr "完成。"
-#: ../mail/mail-ops.c:871
+#: ../mail/mail-ops.c:872
msgid "Saving message to folder"
msgstr "把信件保存到文件夹中"
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
#, c-format
msgid "Moving messages to %s"
msgstr "把信件移至 %s"
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
#, c-format
msgid "Copying messages to %s"
msgstr "把信件复制到 %s"
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
msgid "Forwarded messages"
msgstr "转发的信件"
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1208
#, c-format
msgid "Opening folder %s"
msgstr "打开文件夹 %s"
-#: ../mail/mail-ops.c:1272
+#: ../mail/mail-ops.c:1273
#, c-format
msgid "Retrieving quota information for folder %s"
msgstr "正在获取文件加 %s 的配额信息"
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1342
#, c-format
msgid "Opening store %s"
msgstr "打开存储 %s"
-#: ../mail/mail-ops.c:1412
+#: ../mail/mail-ops.c:1413
#, c-format
msgid "Removing folder %s"
msgstr "删除文件夹 %s"
-#: ../mail/mail-ops.c:1501
+#: ../mail/mail-ops.c:1531
#, c-format
msgid "Storing folder '%s'"
msgstr "存储文件夹“%s”"
-#: ../mail/mail-ops.c:1564
+#: ../mail/mail-ops.c:1594
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "销毁并存储账户“%s”"
-#: ../mail/mail-ops.c:1565
+#: ../mail/mail-ops.c:1595
#, c-format
msgid "Storing account '%s'"
msgstr "存储账户“%s”"
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1649
msgid "Refreshing folder"
msgstr "刷新文件夹"
-#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
msgid "Expunging folder"
msgstr "销毁文件夹"
-#: ../mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1736
#, c-format
msgid "Emptying trash in '%s'"
msgstr "清空“%s”中的回收站"
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1737
msgid "Local Folders"
msgstr "本地文件夹"
-#: ../mail/mail-ops.c:1788
+#: ../mail/mail-ops.c:1818
#, c-format
msgid "Retrieving message %s"
msgstr "收取信件 %s"
-#: ../mail/mail-ops.c:1895
+#: ../mail/mail-ops.c:1925
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "收取 %d 封信"
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2010
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messages"
msgstr[0] "保存 %d 封信"
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2088
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -14748,11 +14920,11 @@ msgstr ""
"在将信件保存到 %s 时发生错误:\n"
" %s"
-#: ../mail/mail-ops.c:2130
+#: ../mail/mail-ops.c:2160
msgid "Saving attachment"
msgstr "保存附件"
-#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -14761,27 +14933,27 @@ msgstr ""
"无法创建输出文件:%s:\n"
" %s"
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2201
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据:%s"
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
#, c-format
msgid "Disconnecting from %s"
msgstr "断开与 %s 的连接"
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
#, c-format
msgid "Reconnecting to %s"
msgstr "重新连接到 %s"
-#: ../mail/mail-ops.c:2413
+#: ../mail/mail-ops.c:2443
#, c-format
msgid "Preparing account '%s' for offline"
msgstr "正在准备脱机使用账户“%s”"
-#: ../mail/mail-ops.c:2499
+#: ../mail/mail-ops.c:2529
msgid "Checking Service"
msgstr "检查服务"
@@ -14797,39 +14969,39 @@ msgstr "发送和接收邮件"
msgid "Cancel _All"
msgstr "全部取消(_A)"
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:503
msgid "Updating..."
msgstr "正在更新..."
-#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
+#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
msgid "Waiting..."
msgstr "正在等待..."
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:806
#, c-format
msgid "Checking for new mail"
msgstr "检查新邮件"
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:212
#, c-format
msgid "Enter Passphrase for %s"
msgstr "输入 %s 的密码"
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:214
msgid "Enter Passphrase"
msgstr "输入密码"
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:217
#: ../plugins/exchange-operations/exchange-config-listener.c:708
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:219
msgid "Enter Password"
msgstr "输入密码"
-#: ../mail/mail-session.c:256
+#: ../mail/mail-session.c:261
msgid "User canceled operation."
msgstr "用户己取消操作。"
@@ -14874,21 +15046,21 @@ msgstr "无效的文件夹:“%s”"
msgid "Setting up Search Folder: %s"
msgstr "设置搜索文件夹:%s"
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:240
#, c-format
msgid "Updating Search Folders for '%s:%s'"
msgstr "更新“%s:%s”的搜索文件夹"
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:247
#, c-format
msgid "Updating Search Folders for '%s'"
msgstr "更新“%s”的搜索文件夹"
-#: ../mail/mail-vfolder.c:1066
+#: ../mail/mail-vfolder.c:1086
msgid "Edit Search Folder"
msgstr "编辑搜索文件夹"
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1175
msgid "New Search Folder"
msgstr "新建搜索文件夹"
@@ -15470,85 +15642,85 @@ msgstr "销毁(_E)"
msgid "_Open Messages"
msgstr "打开信件(_O)"
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
msgid "Unseen"
msgstr "未看"
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
msgid "Seen"
msgstr "已看"
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
msgid "Answered"
msgstr "已答复"
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
msgid "Forwarded"
msgstr "已转发"
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
msgid "Multiple Unseen Messages"
msgstr "多封未看信件"
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
msgid "Multiple Messages"
msgstr "多封信"
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
msgid "Lowest"
msgstr "最低"
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
msgid "Lower"
msgstr "较低"
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
msgid "Higher"
msgstr "较高"
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
msgid "Highest"
msgstr "最高"
-#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1655 ../widgets/table/e-cell-date.c:55
msgid "?"
msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:205
#: ../widgets/table/e-cell-date.c:70
msgid "Today %l:%M %p"
msgstr "今天%p%l:%M"
-#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1671 ../widgets/table/e-cell-date.c:80
msgid "Yesterday %l:%M %p"
msgstr "昨天%p%l:%M"
-#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1683 ../widgets/table/e-cell-date.c:92
msgid "%a %l:%M %p"
msgstr "%A%p%l:%M"
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1691 ../widgets/table/e-cell-date.c:100
msgid "%b %d %l:%M %p"
msgstr "%m月%d日%p%l:%M"
-#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:102
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
#. 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
+#: ../mail/message-list.c:3984 ../mail/message-list.c:4449
msgid "Generating message list"
msgstr "生成信件列表"
-#: ../mail/message-list.c:4224
+#: ../mail/message-list.c:4288
msgid ""
"No message satisfies your search criteria. Either clear search with Search-"
">Clear menu item or change it."
msgstr ""
-#: ../mail/message-list.c:4226
+#: ../mail/message-list.c:4290
msgid "There are no messages in this folder."
msgstr "此文件夹中没有信件。"
@@ -15581,39 +15753,43 @@ msgstr "已发信件"
msgid "Size"
msgstr "大小"
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-list.etspec.h:19
+msgid "Subject - Trimmed"
+msgstr "主题 - 被截断"
+
+#: ../mail/message-tag-followup.c:55
msgid "Call"
msgstr "呼叫"
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
msgid "Do Not Forward"
msgstr "不要转发"
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
msgid "Follow-Up"
msgstr "跟随"
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
msgid "For Your Information"
msgstr "给您的信息"
-#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
msgid "Forward"
msgstr "转发"
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
msgid "No Response Necessary"
msgstr "不必回复"
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
msgid "Reply"
msgstr "回复"
-#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
msgid "Reply to All"
msgstr "全部回复"
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
msgid "Review"
msgstr "回顾"
@@ -15665,8 +15841,8 @@ msgid ""
"body."
msgstr "消息主体中的用于附件提醒插件的线索列表。"
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:394
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:390
msgid "Keywords"
msgstr "关键字"
@@ -15696,9 +15872,13 @@ msgid "_Edit Message"
msgstr "编辑信件(_E)"
#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+#, fuzzy
+#| msgid ""
+#| "A formatter plugin which displays audio attachments inline and allows you "
+#| "to play them directly from evolution."
msgid ""
"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"play them directly from Evolution."
msgstr ""
"一个格式化插件,该插件将就地显示音频附件,允许您从 Evolution 中直接播放。"
@@ -15918,35 +16098,35 @@ msgstr "恢复设置(_E)..."
msgid "_Backup Settings..."
msgstr "备份设置(_B)..."
-#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr "自动联系人"
#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:567
+#: ../plugins/bbdb/bbdb.c:639
msgid "_Auto-create address book entries when replying to messages"
msgstr "回复邮件时自动在地址簿中创建联系人项(_A)"
-#: ../plugins/bbdb/bbdb.c:573
+#: ../plugins/bbdb/bbdb.c:645
msgid "Select Address book for Automatic Contacts"
msgstr "选择自动联系人的地址簿"
-#: ../plugins/bbdb/bbdb.c:588
+#: ../plugins/bbdb/bbdb.c:660
msgid "Instant Messaging Contacts"
msgstr "即时通讯联系人"
#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:603
+#: ../plugins/bbdb/bbdb.c:675
msgid "Synchronize contact info and images from Pidgin buddy list"
msgstr "定时从 Pidgin 好友列表中同步联系人信息和图像"
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:681
msgid "Select Address book for Pidgin buddy list"
msgstr "选择 Pidgin 好友列表的地址簿"
#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:620
+#: ../plugins/bbdb/bbdb.c:692
msgid "Synchronize with _buddy list now"
msgstr "立即同步好友列表(_B)"
@@ -15964,27 +16144,27 @@ msgid "BBDB"
msgstr "BBDB"
#. 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
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:155
#, fuzzy, c-format
msgid "Error occurred while spawning %s: %s."
msgstr "打印时发生了错误"
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:179
#, c-format
msgid "Bogofilter child process does not respond, killing..."
msgstr ""
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:181
#, c-format
msgid "Wait for Bogofilter child process interrupted, terminating..."
msgstr ""
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:200
#, c-format
msgid "Pipe to Bogofilter failed, error code: %d."
msgstr ""
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:363
msgid "Convert message text to _Unicode"
msgstr "将信件文本转换为 _Unicode"
@@ -16011,21 +16191,31 @@ msgstr "Bogofilter 垃圾选项"
msgid "Filters junk messages using Bogofilter."
msgstr "使用 Bogofilter 过滤垃圾信件。"
-#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
+#. we found the group, change the name based on the actual language
+#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
msgid "CalDAV"
msgstr "CalDAV"
-#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/caldav/caldav-source.c:348
#: ../plugins/calendar-http/calendar-http.c:126
msgid "_URL:"
msgstr "_URL:"
-#: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:618
-#: ../plugins/google-account-setup/google-contacts-source.c:301
+#: ../plugins/caldav/caldav-source.c:372
+#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/google-account-setup/google-contacts-source.c:311
msgid "Use _SSL"
msgstr "使用 _SSL"
+#. add refresh option
+#: ../plugins/caldav/caldav-source.c:415
+#: ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:509
+#: ../plugins/google-account-setup/google-source.c:651
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+msgid "Re_fresh:"
+msgstr "刷新(_F):"
+
#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
msgid "CalDAV Calendar sources"
msgstr "CalDAV 日历资源"
@@ -16042,13 +16232,6 @@ msgstr "装入日历"
msgid "Provides core functionality for local calendars."
msgstr "提供本地日历的核心功能。"
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../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:332
msgid "_Secure connection"
msgstr "安全连接(_S)"
@@ -16065,48 +16248,63 @@ msgstr "HTTP 日历"
msgid "Provides core functionality for webcal and http calendars."
msgstr "提供 webcal 和 http 日历的核心功能。"
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
-msgid "Weather: Cloudy"
-msgstr "天气:多云"
-
#: ../plugins/calendar-weather/calendar-weather.c:61
msgid "Weather: Fog"
msgstr "天气:雾"
#: ../plugins/calendar-weather/calendar-weather.c:62
-msgid "Weather: Partly Cloudy"
-msgstr "天气:少云"
+msgid "Weather: Cloudy"
+msgstr "天气:多云"
#: ../plugins/calendar-weather/calendar-weather.c:63
-msgid "Weather: Rain"
-msgstr "天气:雨"
+#, fuzzy
+#| msgid "Weather: Cloudy"
+msgid "Weather: Cloudy Night"
+msgstr "天气:多云"
#: ../plugins/calendar-weather/calendar-weather.c:64
+#, fuzzy
+#| msgid "Weather: Rain"
+msgid "Weather: Overcast"
+msgstr "天气:雨"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+#, fuzzy
+#| msgid "Weather: Snow"
+msgid "Weather: Showers"
+msgstr "天气:雪"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
msgid "Weather: Snow"
msgstr "天气:雪"
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
msgid "Weather: Sunny"
msgstr "天气:晴"
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
+#, fuzzy
+#| msgid "Weather Calendars"
+msgid "Weather: Clear Night"
+msgstr "天气月历"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
msgid "Weather: Thunderstorms"
msgstr "天气:暴风雨"
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
msgid "Select a location"
msgstr "选择一个位置"
-#: ../plugins/calendar-weather/calendar-weather.c:652
+#: ../plugins/calendar-weather/calendar-weather.c:615
msgid "_Units:"
msgstr "单位(_U):"
-#: ../plugins/calendar-weather/calendar-weather.c:659
+#: ../plugins/calendar-weather/calendar-weather.c:622
msgid "Metric (Celsius, cm, etc)"
msgstr "公制(摄氏、厘米等等)"
-#: ../plugins/calendar-weather/calendar-weather.c:660
+#: ../plugins/calendar-weather/calendar-weather.c:623
msgid "Imperial (Fahrenheit, inches, etc)"
msgstr "英制(华氏、英寸等等)"
@@ -16150,7 +16348,7 @@ 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:585
+#: ../shell/main.c:599
msgid "Evolution"
msgstr "Evolution"
@@ -16180,16 +16378,16 @@ msgid ""
"default one."
msgstr "提供了将日历或地址簿标为默认日历或地址簿的功能。"
-#: ../plugins/email-custom-header/email-custom-header.c:558
+#: ../plugins/email-custom-header/email-custom-header.c:560
msgid "_Custom Header"
msgstr "自定义信头(_C)"
-#: ../plugins/email-custom-header/email-custom-header.c:879
+#: ../plugins/email-custom-header/email-custom-header.c:881
msgid "Key"
msgstr "键"
-#: ../plugins/email-custom-header/email-custom-header.c:890
-#: ../plugins/templates/templates.c:400
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:396
msgid "Values"
msgstr "值"
@@ -16224,6 +16422,12 @@ msgid ""
"custom header followed by \"=\" and the values separated by \";\""
msgstr ""
+#. Translators: '=' and ';' should not be changed but ASCII
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:4
+msgid ""
+"[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
+msgstr ""
+
#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
msgid "Open Other User's Folder"
msgstr "打开其他用户的文件夹"
@@ -16241,32 +16445,32 @@ msgid "_User:"
msgstr "用户(_U):"
#. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
msgid "Secure Password"
msgstr "安全密码"
#. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
msgid ""
"This option will connect to the Exchange server using secure password (NTLM) "
"authentication."
msgstr "此选项将使用安全密码(NTLM)身份验证连接到 Exchange 服务器。"
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
msgid "Plaintext Password"
msgstr "纯文本密码"
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
msgid ""
"This option will connect to the Exchange server using standard plaintext "
"password authentication."
msgstr "此选项将使用标准的纯文本密码身份验证连接到 Exchange 服务器。"
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:272
msgid "Out Of Office"
msgstr "办公室以外"
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
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."
@@ -16274,88 +16478,92 @@ msgstr ""
"在您位于办公室外时,如果有人给您发送邮件,则会自动将下面指定的信件\n"
"送回。"
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:296
msgid "I am out of the office"
msgstr "我正在办公室外"
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:292
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
msgid "I am in the office"
msgstr "我正在办公室内"
#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
msgid "Change the password for Exchange account"
msgstr "更改 Exchange 账户的密码"
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:345
#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
msgid "Change Password"
msgstr "更改密码"
#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:350
msgid "Manage the delegate settings for Exchange account"
msgstr "管理 Exchange 账户的代理设置"
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:352
msgid "Delegation Assistant"
msgstr "代理助手"
#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:364
msgid "Miscelleneous"
msgstr "杂项"
#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
msgid "View the size of all Exchange folders"
msgstr "查看所有 Exchange 文件夹的大小"
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:376
msgid "Folders Size"
msgstr "文件夹大小"
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:383
#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
msgid "Exchange Settings"
msgstr "Exchange 设置"
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:730
msgid "_OWA URL:"
msgstr "_OWA URL:"
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:756
msgid "A_uthenticate"
msgstr "身份验证(_U)"
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:777
+msgid "S_pecify the mailbox name"
+msgstr "指定邮箱名(_P)"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:790
msgid "_Mailbox:"
msgstr "邮件(_M):"
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:1005
msgid "_Authentication Type"
msgstr "身份验证类型(_A)"
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:1019
msgid "Ch_eck for Supported Types"
msgstr "检查支持的类型(_E)"
-#: ../plugins/exchange-operations/exchange-account-setup.c:1062
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-contacts.c:217
#, c-format
msgid "%s KB"
msgstr "%s KB"
-#: ../plugins/exchange-operations/exchange-account-setup.c:1064
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-contacts.c:219
#, c-format
msgid "0 KB"
msgstr "0 KB"
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
msgid ""
"Evolution is in offline mode. You cannot create or modify folders now.\n"
"Please switch to online mode for such operations."
@@ -16397,32 +16605,32 @@ msgstr "您目前的密码已经过期。请立即更改您的密码。"
msgid "Your password will expire in the next %d days"
msgstr "您的密码即将于 %d 后过期"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-delegates-user.c:154
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
msgid "Custom"
msgstr "自定义"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
msgid "Editor (read, create, edit)"
msgstr "编辑(读取、创建、编辑)"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
msgid "Author (read, create)"
msgstr "作者(读取、创建)"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
msgid "Reviewer (read-only)"
msgstr "复查者(只读)"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
msgid "Delegate Permissions"
msgstr "代理权限"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
#, c-format
msgid "Permissions for %s"
@@ -16431,7 +16639,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:341
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
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."
@@ -16441,25 +16649,25 @@ msgstr ""
#. To translators: Another chunk of the same message.
#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
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:364
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
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:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
msgid "However you are not permitted to see my private items."
msgstr "但是你不能查看我的私人项目。"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
#, c-format
msgid "You have been designated as a delegate for %s"
msgstr "您现在已经被授权为 %s 的代理人"
@@ -16660,8 +16868,8 @@ msgstr "添加用户:"
#: ../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
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
msgid "Add User"
msgstr "添加用户"
@@ -16779,11 +16987,11 @@ msgstr "敏感度(_S):"
msgid "_User"
msgstr "用户(_U)"
-#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
msgid "Select User"
msgstr "选择用户"
-#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
msgid "Address Book..."
msgstr "地址簿..."
@@ -16806,32 +17014,36 @@ msgid "Exchange Operations"
msgstr "Exchange 操作"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
msgid "Cannot change password due to configuration problems."
msgstr "因为配置文件问题无法更改密码。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
msgid "Cannot display folders."
msgstr "无法显示文件夹。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
msgid "Cannot perform the operation."
msgstr "无法执行操作。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
msgid ""
"Changes to options for Exchange account \"{0}\" will only take effect after "
"restarting Evolution."
msgstr "对 Exchange 账户“{0}”配置的更改将在您退出并重新启动 Evolution 后生效。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
msgid "Could not authenticate to server."
msgstr "无法认证到服务器。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
msgid "Could not change password."
msgstr "无法更改密码。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
msgid ""
"Could not configure Exchange account because \n"
"an unknown error occurred. Check the URL, \n"
@@ -16840,59 +17052,59 @@ msgstr ""
"无法配置 Exchange 账户,原因是发生了未知错误。请检查 URL、用户名、密码,然后"
"再试一次。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
msgid "Could not connect to Exchange server."
msgstr "无法连接到 Exchange 服务器。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
msgid "Could not connect to server {0}."
msgstr "无法连接到服务器 {0}。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
msgid "Could not determine folder permissions for delegates."
msgstr "无法确定代理人的文件夹权限。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
msgid "Could not find Exchange Web Storage System."
msgstr "找不到 Exchange Web 存储系统。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
msgid "Could not locate server {0}."
msgstr "无法定位服务器 {0}。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
msgid "Could not make {0} a delegate"
msgstr "无法授权给 {0}"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
msgid "Could not read folder permissions"
msgstr "无法读取文件夹权限"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
msgid "Could not read folder permissions."
msgstr "无法读取文件夹权限。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
msgid "Could not read out-of-office state"
msgstr "无法读取不在办公室状态"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
msgid "Could not update folder permissions."
msgstr "无法更新文件夹权限。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
msgid "Could not update out-of-office state"
msgstr "无法更新不在办公室状态"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
msgid "Evolution requires a restart to load the subscribed user's mailbox"
msgstr ""
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
msgid "Exchange Account is offline."
msgstr "Exchange 账户脱机。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
msgid ""
"Exchange Connector requires access to certain\n"
"functionality on the Exchange Server that appears\n"
@@ -16916,102 +17128,102 @@ msgstr ""
"{0}\n"
" "
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
msgid "Failed to update delegates:"
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 already exists"
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 does not exist"
msgstr "文件夹不存在"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
msgid "Folder offline"
msgstr "文件夹脱机"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1306
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../shell/e-shell.c:1269
msgid "Generic error"
msgstr "常规错误"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
msgid "Global Catalog Server is not reachable"
msgstr "全局目录服务器无法访问"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
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:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
msgid "Mailbox for {0} is not on this server."
msgstr "{0} 的邮箱不在此服务器上。"
-#: ../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 URL is correct and try again."
msgstr "请确定 URL 正确,然后再试一次。"
-#: ../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 server name is spelled correctly 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 "Make sure the username and password are correct and try again."
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 Global Catalog server configured for this account."
msgstr "没有为此账户配置全局编目服务器。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
msgid "No mailbox for user {0} on {1}."
msgstr "用户 {0} 在 {1} 上没有邮箱。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
msgid "No such user {0}"
msgstr "没有用户 {0}"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
msgid "Password successfully changed."
msgstr "密码已经成功更改。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
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:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
msgid "Please make sure the Global Catalog Server name is correct."
msgstr "请确定全局目录服务器名称正确。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
msgid "Please restart Evolution for changes to take effect"
msgstr "请重新启动 Evolution 以便使得更改生效"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
msgid "Please select a user."
msgstr "请选择用户。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
msgid "Server rejected password because it is too weak."
msgstr "服务器拒绝了密码,因为该密码的安全级别太低。"
-#: ../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 disabled 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 account will be removed when you quit Evolution"
msgstr "当您退出 Evolution 时 Exchange 账户将被删除"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
msgid "The Exchange server is not compatible with Exchange Connector."
msgstr "Exchange 服务器与 Exchange Connector 不兼容。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
msgid ""
"The server is running Exchange 5.5. Exchange Connector \n"
"supports Microsoft Exchange 2000 and 2003 only."
@@ -17019,7 +17231,7 @@ msgstr ""
"服务器正在运行 Exchange 5.5。Exchange Connector 只支持 Microsoft Exchange "
"2000 和 2003。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
msgid ""
"This probably means that your server requires \n"
"you to specify the Windows domain name \n"
@@ -17032,88 +17244,88 @@ msgstr ""
"\n"
"或者,您可能拼错了密码。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
msgid "Try again with a different password."
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 add user to access control list:"
msgstr "无法将用户添加到访问控制列表中:"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
msgid "Unable to edit delegates."
msgstr "无法编辑代理人。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
msgid "Unknown error looking up {0}"
msgstr "查阅 {0} 时发生未知错误"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:543
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/google-account-setup/google-source.c:540
msgid "Unknown error."
msgstr "未知错误。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
msgid "Unknown type"
msgstr "未知类型"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
msgid "Unsupported operation"
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 nearing your quota available for storing mail on this server."
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 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:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
msgid "You cannot make yourself your own delegate"
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 have exceeded your quota for storing mail on this server."
msgstr "您已经超过了在此服务器上存储邮件的配额。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
msgid "You may only configure a single Exchange account."
msgstr "您只能配置单个 Exchange 账户。"
-#: ../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. Try to clear up some space by deleting some "
"mail."
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 either send or "
"receive mail now."
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 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:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
msgid "Your password has expired."
msgstr "您的密码已经过期。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
msgid "{0} cannot be added to an access control list"
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 a delegate"
msgstr "{0} 已被授权"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
msgid "{0} is already in the list"
msgstr "{0} 已经在列表中"
@@ -17206,18 +17418,14 @@ msgstr ""
"象。它以 base64 编码并保存在 ~/.evolution/faces 下。这将在以后发出的邮件中使"
"用。"
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "头像"
-
#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
#, c-format
msgid "Unsubscribing from folder \"%s\""
msgstr "无法退订文件夹“%s”"
#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the folder tree context menu."
-msgstr "允许在文件夹树的快捷菜单中退订邮件文件夹。"
+msgid "Allows unsubscribing of mail folders in the side bar context menu."
+msgstr "允许在侧边栏的快捷菜单中退订邮件文件夹。"
#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
msgid "Unsubscribe Folders"
@@ -17229,43 +17437,41 @@ msgstr "退订(_U)"
#: ../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
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-contacts-source.c:58
+#: ../plugins/google-account-setup/google-contacts-source.c:84
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
+#: ../plugins/google-account-setup/google-source.c:440
#, c-format
msgid "Enter password for user %s to access list of subscribed calendars."
msgstr "输入用户 %s 的密码以便访问已订阅日历的列表。"
-#: ../plugins/google-account-setup/google-source.c:543
+#: ../plugins/google-account-setup/google-source.c:540
#, c-format
msgid ""
"Cannot read data from Google server.\n"
"%s"
-msgstr "无法从 Google 服务器上读取数据。\n%s"
+msgstr ""
+"无法从 Google 服务器上读取数据。\n"
+"%s"
-#: ../plugins/google-account-setup/google-source.c:693
+#: ../plugins/google-account-setup/google-source.c:702
msgid "Cal_endar:"
msgstr "日历(_E):"
-#: ../plugins/google-account-setup/google-source.c:728
+#: ../plugins/google-account-setup/google-source.c:737
msgid "Retrieve _list"
msgstr "获取列表(_L)"
-#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/google-account-setup/google-contacts-source.c:278
#: ../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 and contacts."
+msgid "A plugin to setup Google Calendar and Contacts."
msgstr "设置 Google 日历和联系人的插件。"
#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17277,14 +17483,14 @@ msgid "Checklist"
msgstr "待办清单"
#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
-msgstr "设置 Groupwise 日历和联系人源的插件。"
+msgid "A plugin to setup GroupWise calendar and contacts sources."
+msgstr "设置 GroupWise 日历和联系人源的插件。"
#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
-msgstr "Groupwise 账户设置"
+msgid "GroupWise Account Setup"
+msgstr "GroupWise 账户设置"
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:220
#, c-format
msgid ""
"The user '%s' has shared a folder with you\n"
@@ -17309,11 +17515,11 @@ msgstr ""
"单击“前进”可安装共享文件夹\n"
"\n"
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:225
msgid "Install the shared folder"
msgstr "安装共享文件夹"
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:227
msgid "Shared Folder Installation"
msgstr "共享文件夹安装"
@@ -17339,7 +17545,7 @@ msgid "Email:"
msgstr "电子邮件:"
#: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
msgid "_Disable"
msgstr "禁用(_D)"
@@ -17371,15 +17577,21 @@ msgid "Retract Mail"
msgstr "收回邮件"
#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
+#, fuzzy
+#| msgid "Add Send Options to groupwise messages"
+msgid "Add Send Options to GroupWise messages"
msgstr "将发送选项添加到 GroupWise 信件"
#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
+#, fuzzy
+#| msgid "A plugin for the features in Groupwise accounts."
+msgid "A plugin for the features in GroupWise accounts."
msgstr "Groupwise 账户特性的插件。"
#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
+#, fuzzy
+#| msgid "Groupwise Features"
+msgid "GroupWise Features"
msgstr "Groupwise 特性"
#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
@@ -17397,22 +17609,25 @@ msgstr "将选中邮件转换为新任务"
msgid "Invalid user"
msgstr "无效用户"
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#. 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/org-gnome-proxy-errors.xml.h:3
#, 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-proxy-errors.xml.h:4
#: ../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
+#. 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/org-gnome-proxy-errors.xml.h:6
#, fuzzy
msgid "You have already given proxy permissions to this user."
msgstr "你在我的文件夹上拥有下列权限:"
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. 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/org-gnome-proxy-errors.xml.h:8
msgid "You have to specify a valid user name to give proxy rights."
msgstr ""
@@ -17436,23 +17651,25 @@ msgstr ""
msgid "This is a recurring meeting"
msgstr "将此事件标为重复发生"
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
#, fuzzy
msgid "Would you like to accept it?"
msgstr "您希望保存更改吗?"
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
#, fuzzy
msgid "Would you like to decline it?"
msgstr "您希望保存更改吗?"
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
#, fuzzy
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgid "You cannot share this folder with the 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"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+msgid "You have to specify a user name which you want to add to the list"
msgstr ""
#: ../plugins/groupwise-features/process-meeting.c:52
@@ -17541,7 +17758,8 @@ msgstr "写入(_W)"
msgid "permission to read|_Read"
msgstr "读(_R)"
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. 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-listing.glade.h:2
msgid "Proxy"
msgstr "代理服务器"
@@ -17549,14 +17767,15 @@ msgstr "代理服务器"
msgid "<b>Account Name</b>"
msgstr "<b>账户名</b>"
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. 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-dialog.glade.h:3
msgid "Proxy Login"
msgstr "代理服务器登录"
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
#: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:83
+#: ../plugins/groupwise-features/send-options.c:85
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%s输入 %s 的密码(用户 %s)"
@@ -17564,20 +17783,26 @@ 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:509
+#: ../plugins/groupwise-features/proxy-login.c:510
msgid "_Proxy Login..."
msgstr "代理服务器登录(_P)..."
-#: ../plugins/groupwise-features/proxy.c:691
+#. 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.c:692
msgid "The Proxy tab will be available only when the account is online."
msgstr "代理服务器标签仅当账户联机时才可用。"
-#: ../plugins/groupwise-features/proxy.c:696
+#. 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.c:698
msgid "The Proxy tab will be available only when the account is enabled."
msgstr "代理服务器标签仅当账户启用时才可用。"
+#: ../plugins/groupwise-features/send-options.c:214
+msgid "Advanced send options"
+msgstr "高级发送选项"
+
#: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:750
+#: ../plugins/groupwise-features/share-folder.c:751
msgid "Users"
msgstr "用户"
@@ -17593,68 +17818,68 @@ msgstr "新建共享文件夹(_S)..."
msgid "Sharing"
msgstr "共享"
-#: ../plugins/groupwise-features/share-folder.c:533
+#: ../plugins/groupwise-features/share-folder.c:534
msgid "Custom Notification"
msgstr "自定义通知"
-#: ../plugins/groupwise-features/share-folder.c:755
+#: ../plugins/groupwise-features/share-folder.c:756
msgid "Add "
msgstr "添加"
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:762
msgid "Modify"
msgstr "修改"
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:97
msgid "Message Status"
msgstr "信件状态"
#. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:111
msgid "Subject:"
msgstr "主题:"
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:125
msgid "From:"
msgstr "发件人:"
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:140
msgid "Creation date:"
msgstr "创建日期:"
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:179
msgid "Recipient: "
msgstr "收件人:"
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:186
msgid "Delivered: "
msgstr "已投递:"
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:192
msgid "Opened: "
msgstr "已打开:"
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:197
msgid "Accepted: "
msgstr "已接受:"
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:202
msgid "Deleted: "
msgstr "已删除:"
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:207
msgid "Declined: "
msgstr "已拒绝:"
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:212
msgid "Completed: "
msgstr "已完成:"
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:217
msgid "Undelivered: "
msgstr "未投递:"
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:241
msgid "Track Message Status..."
msgstr "跟踪信件状态..."
@@ -17757,11 +17982,11 @@ msgstr "导入到日历"
msgid "Imports ICS attachments to calendar."
msgstr "将 ICS 附件导入到日历。"
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
msgid "Hardware Abstraction Layer not loaded"
msgstr "硬件抽象层(HAL)尚未加载"
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
msgid ""
"The \"hald\" service is required but not currently running. Please enable "
"the service and rerun this program, or contact your system administrator."
@@ -17769,19 +17994,19 @@ msgstr ""
"需要“hald”服务但它目前尚未运行。请启用该服务并重新支持此程序,或联系您的系统"
"管理员。"
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
msgid "Search for an iPod failed"
msgstr "搜索 iPod 失败"
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
msgid ""
"Evolution could not find an iPod to synchronize with. Either the iPod is not "
"connected to the system or it is not powered on."
msgstr ""
"Evolution 找不到要同步的 iPod。您可能没有将其连接到系统,或者没有开机。"
-#: ../plugins/ipod-sync/ical-format.c:118
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
msgid "iCalendar format (.ics)"
msgstr "iCalendar 格式(.ics)"
@@ -17798,642 +18023,652 @@ msgstr "同步到 iPod"
msgid "iPod Synchronization"
msgstr "iPod 同步"
-#: ../plugins/itip-formatter/itip-formatter.c:443
-#: ../plugins/itip-formatter/itip-formatter.c:568
+#: ../plugins/itip-formatter/itip-formatter.c:481
+#: ../plugins/itip-formatter/itip-formatter.c:606
#, c-format
msgid "Failed to load the calendar '%s'"
msgstr "装入日历“%s”失败"
-#: ../plugins/itip-formatter/itip-formatter.c:588
+#: ../plugins/itip-formatter/itip-formatter.c:626
#, c-format
msgid "An appointment in the calendar '%s' conflicts with this meeting"
msgstr "日历“%s”中的一个约会与此会议冲突"
-#: ../plugins/itip-formatter/itip-formatter.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:662
#, c-format
msgid "Found the appointment in the calendar '%s'"
msgstr "在日历“%s”中找到了约会"
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:752
msgid "Unable to find any calendars"
msgstr "无法找到任何日历"
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:759
msgid "Unable to find this meeting in any calendar"
msgstr "无法在任何日历中找到此会议"
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:763
msgid "Unable to find this task in any task list"
msgstr "无法在任何任务列表中找到此任务"
-#: ../plugins/itip-formatter/itip-formatter.c:705
+#: ../plugins/itip-formatter/itip-formatter.c:767
msgid "Unable to find this memo in any memo list"
msgstr "无法在任何备忘列表中找到此备忘"
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:838
msgid "Searching for an existing version of this appointment"
msgstr "搜索此约会的已有版本"
-#: ../plugins/itip-formatter/itip-formatter.c:945
+#: ../plugins/itip-formatter/itip-formatter.c:1020
msgid "Unable to parse item"
msgstr "无法分析项目"
-#: ../plugins/itip-formatter/itip-formatter.c:1003
+#: ../plugins/itip-formatter/itip-formatter.c:1107
#, c-format
msgid "Unable to send item to calendar '%s'. %s"
msgstr "无法将项目发送到日历“%s”。%s"
-#: ../plugins/itip-formatter/itip-formatter.c:1015
+#: ../plugins/itip-formatter/itip-formatter.c:1119
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "将日历“%s”发送为已接受"
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1123
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "将日历“%s”发送为待定"
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1128
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "将日历“%s”发送为已拒绝"
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1133
#, c-format
msgid "Sent to calendar '%s' as canceled"
msgstr "将日历“%s”发送为已取消"
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1227
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "组织者已经删除了代理人 %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1234
msgid "Sent a cancelation notice to the delegate"
msgstr "已给代理人发送了取消通知"
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1236
msgid "Could not send the cancelation notice to the delegate"
msgstr "无法给代理人发送取消通知"
-#: ../plugins/itip-formatter/itip-formatter.c:1218
+#: ../plugins/itip-formatter/itip-formatter.c:1342
msgid "Attendee status could not be updated because the status is invalid"
msgstr "出席者状态无法更新,原因是状态无效"
-#: ../plugins/itip-formatter/itip-formatter.c:1245
+#: ../plugins/itip-formatter/itip-formatter.c:1371
#, c-format
msgid "Unable to update attendee. %s"
msgstr "无法更新出席者。%s"
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1375
msgid "Attendee status updated"
msgstr "出席者状态已更新"
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1401
msgid "Meeting information sent"
msgstr "会议信息已发送"
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1404
msgid "Task information sent"
msgstr "任务信息已发送"
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1407
msgid "Memo information sent"
msgstr "备忘信息已发送"
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1416
msgid "Unable to send meeting information, the meeting does not exist"
msgstr "无法发送会议信息,会议不存在"
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1419
msgid "Unable to send task information, the task does not exist"
msgstr "无法发送任务信息,任务不存在"
-#: ../plugins/itip-formatter/itip-formatter.c:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1422
msgid "Unable to send memo information, the memo does not exist"
msgstr "无法发送备忘信息,备忘不存在"
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1502
msgid "The calendar attached is not valid"
msgstr "附加的日历无效"
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1492
+#: ../plugins/itip-formatter/itip-formatter.c:1503
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
msgstr "信件声明其包含日历,但日历不是有效的 iCalendar。"
-#: ../plugins/itip-formatter/itip-formatter.c:1417
-#: ../plugins/itip-formatter/itip-formatter.c:1435
-#: ../plugins/itip-formatter/itip-formatter.c:1517
+#: ../plugins/itip-formatter/itip-formatter.c:1543
+#: ../plugins/itip-formatter/itip-formatter.c:1571
+#: ../plugins/itip-formatter/itip-formatter.c:1663
msgid "The item in the calendar is not valid"
msgstr "日历项无效"
-#: ../plugins/itip-formatter/itip-formatter.c:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1544
+#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1664
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:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1583
msgid "The calendar attached contains multiple items"
msgstr "附加的日历包含多个项目"
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1584
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
msgstr "要处理这些全部项目,应该保存文件并导入日历"
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2306
msgid "This meeting recurs"
msgstr "此会议重现"
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2309
msgid "This task recurs"
msgstr "此任务重现"
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2312
msgid "This memo recurs"
msgstr "此备忘重现"
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2548
msgid "_Delete message after acting"
msgstr "操作后删除消息(_D)"
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../plugins/itip-formatter/itip-formatter.c:2590
msgid "Conflict Search"
msgstr "冲突搜索"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2573
msgid "Select the calendars to search for meeting conflicts"
msgstr "选择要搜索冲突会议的日历"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:298
+#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:297
msgid "Today"
msgstr "今天"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:196
msgid "Today %H:%M"
msgstr "今天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:200
msgid "Today %H:%M:%S"
msgstr "今天 %H:%M:%S"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:209
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:217
+#: ../plugins/itip-formatter/itip-view.c:219
msgid "Tomorrow"
msgstr "明天"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:224
msgid "Tomorrow %H:%M"
msgstr "明天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:228
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:231
+#: ../plugins/itip-formatter/itip-view.c:233
msgid "Tomorrow %l:%M %p"
msgstr "明天%p%l:%M"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:237
msgid "Tomorrow %l:%M:%S %p"
msgstr "明天%p%l:%M:%S"
#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:256
#, 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:259
+#: ../plugins/itip-formatter/itip-view.c:261
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:263
+#: ../plugins/itip-formatter/itip-view.c:265
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:268
+#: ../plugins/itip-formatter/itip-view.c:270
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:272
+#: ../plugins/itip-formatter/itip-view.c:274
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:281
+#: ../plugins/itip-formatter/itip-view.c:283
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:287
+#: ../plugins/itip-formatter/itip-view.c:289
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:291
+#: ../plugins/itip-formatter/itip-view.c:293
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:296
+#: ../plugins/itip-formatter/itip-view.c:298
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:300
+#: ../plugins/itip-formatter/itip-view.c:302
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:306
+#: ../plugins/itip-formatter/itip-view.c:308
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:311
+#: ../plugins/itip-formatter/itip-view.c:313
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:315
+#: ../plugins/itip-formatter/itip-view.c:317
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:320
+#: ../plugins/itip-formatter/itip-view.c:322
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:324
+#: ../plugins/itip-formatter/itip-view.c:326
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%Y年%-m月%-d日%A%p%l:%M:%S"
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
#, c-format
msgid "Please respond on behalf of <b>%s</b>"
msgstr "请以 <b>%s</b> 的身份回应"
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
#, c-format
msgid "Received on behalf of <b>%s</b>"
msgstr "以 <b>%s</b> 的身份接收"
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:358
#, 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:358
+#: ../plugins/itip-formatter/itip-view.c:360
#, c-format
msgid "<b>%s</b> has published the following meeting information:"
msgstr "<b>%s</b> 发布了会议信息:"
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:365
#, c-format
msgid "<b>%s</b> has delegated the following meeting to you:"
msgstr "<b>%s</b> 为您代理了下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:368
#, 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:368
+#: ../plugins/itip-formatter/itip-view.c:370
#, c-format
msgid "<b>%s</b> requests your presence at the following meeting:"
msgstr "<b>%s</b> 请求您参加下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
#, 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:376
+#: ../plugins/itip-formatter/itip-view.c:378
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting:"
msgstr "<b>%s</b> 希望加入到已有的会议:"
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:382
#, 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:382
+#: ../plugins/itip-formatter/itip-view.c:384
#, 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:386
+#: ../plugins/itip-formatter/itip-view.c:388
#, 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:388
+#: ../plugins/itip-formatter/itip-view.c:390
#, c-format
msgid "<b>%s</b> has sent back the following meeting response:"
msgstr "<b>%s</b> 发回了下列会议请求的响应:"
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
#, c-format
msgid "<b>%s</b> through %s has canceled the following meeting:"
msgstr "<b>%s</b> 通过 %s 取消了下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
#, c-format
msgid "<b>%s</b> has canceled the following meeting."
msgstr "<b>%s</b> 取消了下列会议。"
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
#, 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:400
+#: ../plugins/itip-formatter/itip-view.c:402
#, c-format
msgid "<b>%s</b> has proposed the following meeting changes."
msgstr "<b>%s</b> 提议了下列会议变更。"
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
#, 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:406
+#: ../plugins/itip-formatter/itip-view.c:408
#, c-format
msgid "<b>%s</b> has declined the following meeting changes."
msgstr "<b>%s</b> 拒绝了下列会议变更。"
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:446
#, c-format
msgid "<b>%s</b> through %s has published the following task:"
msgstr "<b>%s</b> 通过 %s 发布了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:448
#, c-format
msgid "<b>%s</b> has published the following task:"
msgstr "<b>%s</b> 发布了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:453
#, 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:454
+#: ../plugins/itip-formatter/itip-view.c:456
#, c-format
msgid "<b>%s</b> through %s has assigned you a task:"
msgstr "<b>%s</b> 通过 %s 为您分配了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:458
#, c-format
msgid "<b>%s</b> has assigned you a task:"
msgstr "<b>%s</b> 为您分配了一个任务:"
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
#, 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:464
+#: ../plugins/itip-formatter/itip-view.c:466
#, c-format
msgid "<b>%s</b> wishes to add to an existing task:"
msgstr "<b>%s<b> 希望加入到已存在的任务:"
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:470
#, 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:470
+#: ../plugins/itip-formatter/itip-view.c:472
#, 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:474
+#: ../plugins/itip-formatter/itip-view.c:476
#, 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:476
+#: ../plugins/itip-formatter/itip-view.c:478
#, c-format
msgid "<b>%s</b> has sent back the following assigned task response:"
msgstr "<b>%s</b> 发回了下列分配任务的回应:"
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
#, 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:482
+#: ../plugins/itip-formatter/itip-view.c:484
#, c-format
msgid "<b>%s</b> has canceled the following assigned task:"
msgstr "<b>%s</b> 取消分配的下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
#, 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:488
+#: ../plugins/itip-formatter/itip-view.c:490
#, c-format
msgid "<b>%s</b> has proposed the following task assignment changes:"
msgstr "<b>%s</b> 提议了下列任务分配变更:"
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
#, 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:494
+#: ../plugins/itip-formatter/itip-view.c:496
#, c-format
msgid "<b>%s</b> has declined the following assigned task:"
msgstr "<b>%s</b> 拒绝了分配的下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:534
#, c-format
msgid "<b>%s</b> through %s has published the following memo:"
msgstr "<b>%s</b> 通过 %s 发布了下列备忘:"
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:536
#, c-format
msgid "<b>%s</b> has published the following memo:"
msgstr "<b>%s</b> 发布了下列备忘:"
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:541
#, 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:541
+#: ../plugins/itip-formatter/itip-view.c:543
#, c-format
msgid "<b>%s</b> wishes to add to an existing memo:"
msgstr "<b>%s</b> 希望加入到已有的备忘中:"
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:547
#, 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:547
+#: ../plugins/itip-formatter/itip-view.c:549
#, 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:818
+#: ../plugins/itip-formatter/itip-view.c:820
msgid "_Open Calendar"
msgstr "打开日历(_O)"
-#: ../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:825
+#: ../plugins/itip-formatter/itip-view.c:826
#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:836
#: ../plugins/itip-formatter/itip-view.c:853
#: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline"
+msgstr "拒绝(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
msgid "_Accept"
msgstr "接受(_A)"
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:830
msgid "_Decline all"
msgstr "全部拒绝(_D)"
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:831
msgid "_Tentative all"
msgstr "全部待定(_T)"
-#: ../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
+#: ../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
msgid "_Tentative"
msgstr "待定(_T)"
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:832
msgid "_Accept all"
msgstr "全部接受(_A)"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:843
msgid "_Send Information"
msgstr "发送信息(_S)"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:847
msgid "_Update Attendee Status"
msgstr "更新与会者状态(_U)"
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
msgid "_Update"
msgstr "更新(_U)"
#. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1026
msgid "Start time:"
msgstr "开始时间:"
#. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1035
msgid "End time:"
msgstr "结束时间:"
#. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1051
+#: ../plugins/itip-formatter/itip-view.c:1101
msgid "Comment:"
msgstr "注释:"
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1087
msgid "Send _reply to sender"
msgstr "回复发件人(_R)"
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1115
msgid "Send _updates to attendees"
msgstr "给出席者发送更新(_U)"
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1124
msgid "_Apply to all instances"
msgstr "应用到全部实例(_A)"
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1133
msgid "Show time as _free"
msgstr "将时间显示为空闲(_F)"
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1136
+msgid "_Preserve my reminder"
+msgstr "保留我的提醒(_P)"
+
+#: ../plugins/itip-formatter/itip-view.c:1141
+#, fuzzy
+#| msgid "Attachment Reminder"
+msgid "_Inherit reminder"
+msgstr "附件提醒"
+
+#: ../plugins/itip-formatter/itip-view.c:1895
msgid "_Tasks :"
msgstr "任务(_T):"
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1897
msgid "Memos :"
msgstr "备忘:"
@@ -18460,7 +18695,7 @@ msgid ""
"This response is not from a current attendee. Add the sender as an attendee?"
msgstr "此响应并非来自当前出席者。将响应者加为出席者吗?"
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
msgid "Proxy _Logout"
msgstr "代理服务器注销(_L)"
@@ -18538,20 +18773,20 @@ msgstr "是否闪烁图标。"
msgid "Whether to notify new messages in Inbox folder only."
msgstr "是否只通知收件箱文件夹中的新信件。"
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:256
msgid "Generate a _D-Bus message"
msgstr "生成 _D-Bus 消息"
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:379
msgid "Evolution's Mail Notification"
msgstr "Evolution 邮件通知"
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:400
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:457
+#: ../plugins/mail-notification/mail-notification.c:479
#, c-format
msgid ""
"You have received %d new message\n"
@@ -18561,54 +18796,54 @@ msgid_plural ""
"in %s."
msgstr[0] "您在 %2$s 中收到了 %1$d 封新邮件。"
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:484
#, 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:479
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:501
+#: ../plugins/mail-notification/mail-notification.c:506
msgid "New email"
msgstr "新电子邮件"
-#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:566
msgid "Show icon in _notification area"
msgstr "在通知区显示图标(_N)"
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:569
msgid "B_link icon in notification area"
msgstr "闪烁通知区图标(_L)"
-#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:571
msgid "Popup _message together with the icon"
msgstr "同时弹出图标和消息(_M)"
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:752
msgid "_Play sound when new messages arrive"
msgstr "新邮件到达时播放声音(_P)"
-#: ../plugins/mail-notification/mail-notification.c:733
+#: ../plugins/mail-notification/mail-notification.c:758
msgid "_Beep"
msgstr "响铃(_B)"
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:759
msgid "Play _sound file"
msgstr "播放声音文件(_S)"
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:770
msgid "Specify _filename:"
msgstr "指定文件名(_F):"
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:771
msgid "Select sound file"
msgstr "选择声音文件"
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:772
msgid "Pl_ay"
msgstr "播放(_A)"
-#: ../plugins/mail-notification/mail-notification.c:804
+#: ../plugins/mail-notification/mail-notification.c:829
msgid "Notify new messages for _Inbox only"
msgstr "只通知收件箱中的新信件(_I)"
@@ -18744,9 +18979,15 @@ msgid "Send e-mail message to mailing list?"
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 process.\n"
+#, fuzzy
+#| msgid ""
+#| "The action could not be performed. This means the header for this action "
+#| "did not contain any action we could process.\n"
+#| "\n"
+#| "Header: {0}"
+msgid ""
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
"\n"
"Header: {0}"
msgstr ""
@@ -18856,22 +19097,6 @@ msgstr "把信件标记为已读(_S)"
msgid "Used for marking all the messages under a folder as read"
msgstr "用于将文件夹内的全部信件全部标为已读"
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "将日历标为脱机"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "将选中日历标为脱机查看。"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make available for offline use"
-msgstr "不标为可脱机使用(_D)"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Make available for offline use"
-msgstr "标为可脱机使用(_M)"
-
#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
msgid "A plugin which implements mono plugins."
msgstr "实现 mono 插件的插件。"
@@ -18939,19 +19164,19 @@ msgstr "纯文字模式"
msgid "Prefer plain-text"
msgstr "首选纯文本"
-#: ../plugins/prefer-plain/prefer-plain.c:191
+#: ../plugins/prefer-plain/prefer-plain.c:189
msgid "Show HTML if present"
msgstr "首选 HTML"
-#: ../plugins/prefer-plain/prefer-plain.c:192
+#: ../plugins/prefer-plain/prefer-plain.c:190
msgid "Prefer PLAIN"
msgstr "首选纯文本"
-#: ../plugins/prefer-plain/prefer-plain.c:193
+#: ../plugins/prefer-plain/prefer-plain.c:191
msgid "Only ever show PLAIN"
msgstr "仅显示纯文本"
-#: ../plugins/prefer-plain/prefer-plain.c:236
+#: ../plugins/prefer-plain/prefer-plain.c:234
msgid "HTML _Mode"
msgstr "HT_ML 模式"
@@ -18963,6 +19188,18 @@ msgstr "Evolution 配置器"
msgid "Writes a log of profiling data events."
msgstr "编写配置数据事件的日志。"
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+msgid "Import Outlook messages from PST file"
+msgstr "从 PST 文件中导入 Outlook 邮件"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook PST import"
+msgstr "Outlook PST 导入"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr "Outlook 个人文件夹(.pst)"
+
#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
msgid "Allows calendars to be published to the web"
msgstr "允许将日历发布到 Web"
@@ -18979,9 +19216,9 @@ msgstr "位置"
msgid "_Publish Calendar Information"
msgstr "发布日历信息(_P)"
-#: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
-msgstr "您确定您想要删除此 URL 吗?"
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "Are you sure you want to remove this location?"
+msgstr "您确定您想要删除此位置吗?"
#: ../plugins/publish-calendar/publish-calendar.glade.h:2
msgid "<span weight=\"bold\">Location</span>"
@@ -19019,7 +19256,7 @@ msgstr "发布频率(_F):"
#: ../plugins/publish-calendar/publish-calendar.glade.h:13
msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
"Public FTP\n"
"FTP (with login)\n"
"Windows share\n"
@@ -19027,7 +19264,7 @@ msgid ""
"Secure WebDAV (HTTPS)\n"
"Custom Location"
msgstr ""
-"SSH\n"
+"安全 FTP (SSH)\n"
"公开 FTP\n"
"FTP (需登录)\n"
"Windows 共享\n"
@@ -19067,6 +19304,14 @@ msgstr ""
"iCal\n"
"忙/闲"
+#: ../plugins/publish-calendar/url-editor-dialog.c:461
+msgid "New Location"
+msgstr "新建位置"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:463
+msgid "Edit Location"
+msgstr "编辑位置"
+
#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
#, fuzzy
msgid "Hello Python"
@@ -19085,62 +19330,60 @@ 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."
+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 装入器"
+msgstr "Python 装入器"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
msgid "SpamAssassin (built-in)"
msgstr "垃圾克星(内置)"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
#, 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
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
#, fuzzy, c-format
msgid "Failed to create pipe: %s"
msgstr "创建本地邮件存储“%s”失败:%s"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
#, fuzzy, c-format
msgid "Error after fork: %s"
msgstr ""
"%s 错误:\n"
" %s"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
#, c-format
msgid "SpamAssassin child process does not respond, killing..."
msgstr ""
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
#, c-format
-msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
msgstr ""
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
#, c-format
msgid "Pipe to SpamAssassin failed, error code: %d"
msgstr ""
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
-#, fuzzy, c-format
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#, c-format
msgid "SpamAssassin is not available."
-msgstr "发送选项不可用。"
+msgstr "垃圾克星不可用。"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
-#, fuzzy
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
msgid "This will make SpamAssassin more reliable, but slower"
-msgstr "这将让过滤器更可靠,但稍慢"
+msgstr "这将让垃圾克星更可靠,但稍慢"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
msgid "I_nclude remote tests"
msgstr "包含远程测试(_N)"
@@ -19151,12 +19394,12 @@ msgid ""
msgstr "使用垃圾克星过滤垃圾邮件。此插件需要安装 Spamassassin。"
#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "垃圾克星插件"
+msgid "SpamAssassin Options"
+msgstr "垃圾克星选项"
#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "垃圾克星选项"
+msgid "SpamAssassin junk plugin"
+msgstr "垃圾克星插件"
#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
msgid "A plugin for saving all attachments or parts of a message at once."
@@ -19164,7 +19407,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:314
+#: ../plugins/save-attachments/save-attachments.c:315
msgid "Save attachments"
msgstr "保存附件"
@@ -19176,15 +19419,15 @@ msgstr "保存附件..."
msgid "Save all attachments"
msgstr "保存全部附件"
-#: ../plugins/save-attachments/save-attachments.c:320
+#: ../plugins/save-attachments/save-attachments.c:321
msgid "Select save base name"
msgstr "选择保存基础名称"
-#: ../plugins/save-attachments/save-attachments.c:339
+#: ../plugins/save-attachments/save-attachments.c:340
msgid "MIME Type"
msgstr "MIME 类型"
-#: ../plugins/save-attachments/save-attachments.c:347
+#: ../plugins/save-attachments/save-attachments.c:348
msgid "Save"
msgstr "保存"
@@ -19192,79 +19435,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:162
+#: ../plugins/save-calendar/csv-format.c:163
msgid "%F %T"
msgstr "%F %T"
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:361
msgid "UID"
msgstr "UID"
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
msgid "Description List"
msgstr "描述列表"
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
msgid "Categories List"
msgstr "类别列表"
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
msgid "Comment List"
msgstr "注释列表"
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:367
msgid "Created"
msgstr "创建时间"
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
msgid "Contact List"
msgstr "联系人列表"
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
msgid "Start"
msgstr "开始"
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
msgid "End"
msgstr "结束"
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:372
msgid "percent Done"
msgstr "完成百分比"
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
msgid "URL"
msgstr "URL"
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
msgid "Attendees List"
msgstr "出席者列表"
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:377
msgid "Modified"
msgstr "修改日期"
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:532
msgid "Advanced options for the CSV format"
msgstr "CSV 格式的高级选项"
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:539
msgid "Prepend a header"
msgstr "前置头"
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
msgid "Value delimiter:"
msgstr "值分隔符:"
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:554
msgid "Record delimiter:"
msgstr "记录分隔符:"
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:560
msgid "Encapsulate values with:"
msgstr "将值以下列形式封装:"
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:582
msgid "Comma separated value format (.csv)"
msgstr "逗号分隔的值格式(.csv)"
@@ -19285,15 +19528,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:149
+#: ../plugins/save-calendar/rdf-format.c:150
msgid "%FT%T"
msgstr "%FT%T"
-#: ../plugins/save-calendar/rdf-format.c:376
+#: ../plugins/save-calendar/rdf-format.c:377
msgid "RDF format (.rdf)"
msgstr "RDF 格式(.rdf)"
-#: ../plugins/save-calendar/save-calendar.c:160
+#: ../plugins/save-calendar/save-calendar.c:161
msgid "Select destination file"
msgstr "选择目的文件"
@@ -19325,15 +19568,15 @@ msgstr "指引您进行初始帐户的设置。"
msgid "Setup Assistant"
msgstr "设置助手"
-#: ../plugins/startup-wizard/startup-wizard.c:83
+#: ../plugins/startup-wizard/startup-wizard.c:85
msgid "Evolution Setup Assistant"
msgstr "Evolution 设置助手"
-#: ../plugins/startup-wizard/startup-wizard.c:86
+#: ../plugins/startup-wizard/startup-wizard.c:88
msgid "Welcome"
msgstr "欢迎"
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:89
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"
@@ -19345,28 +19588,28 @@ msgstr ""
"\n"
"请单击“前进”按钮继续。"
-#: ../plugins/startup-wizard/startup-wizard.c:133
+#: ../plugins/startup-wizard/startup-wizard.c:135
msgid "Importing files"
msgstr "导入文件"
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:137
#: ../shell/e-shell-importer.c:141
msgid "Please select the information that you would like to import:"
msgstr "请选择您希望导入的信息:"
-#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../plugins/startup-wizard/startup-wizard.c:152
#: ../shell/e-shell-importer.c:394
#, c-format
msgid "From %s:"
msgstr "从 %s:"
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:232
#: ../shell/e-shell-importer.c:505
#, c-format
msgid "Importing data."
msgstr "正在导入数据。"
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:234
#: ../shell/e-shell-importer.c:519
msgid "Please wait"
msgstr "请稍候"
@@ -19395,15 +19638,15 @@ msgid ""
"message body."
msgstr "消息主体中的用于附件提醒插件的线索列表。"
-#: ../plugins/templates/templates.c:615
+#: ../plugins/templates/templates.c:603
msgid "No title"
msgstr "无标题"
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:711
msgid "Save as _Template"
msgstr "另存为模板(_T)"
-#: ../plugins/templates/templates.c:745
+#: ../plugins/templates/templates.c:713
msgid "Save as Template"
msgstr "另存为模板"
@@ -19412,8 +19655,8 @@ 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 附件的简单插件。"
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+msgstr "一个使用 yTNEF 来解码 TNEF 附件的简单插件。"
#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
msgid "TNEF Attachment decoder"
@@ -19438,7 +19681,7 @@ msgid "URL:"
msgstr "URL:"
#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
msgstr ""
#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -19573,7 +19816,7 @@ msgstr "侧边栏可见"
msgid "Skip development warning dialog"
msgstr "跳过开发警告对话框"
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
msgid "Start in offline mode"
msgstr "以脱机模式启动"
@@ -19641,8 +19884,8 @@ msgid ""
"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
"by the GNOME toolbar setting."
msgstr ""
-"窗口按钮的样式。可以是文字、图标、二者、工具栏。如果设置为工具栏,则工具栏的"
-"样式由 GNOME 设置决定。"
+"窗口按钮的样式。可以是“text”(文字)、“icon”(图标)、“both”(二者)、"
+"“toolbar”(工具栏)。如果设置为“toolbar”(工具栏),则工具栏的样式由 GNOME 设置决定。"
#: ../shell/apps_evolution_shell.schemas.in.h:41
msgid ""
@@ -19726,8 +19969,7 @@ msgstr "选择要运行的导入器类型:"
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list."
-msgstr ""
-"选择您希望导入到 Evolution 的文件,并从列表中选择文件的类型。"
+msgstr "选择您希望导入到 Evolution 的文件,并从列表中选择文件的类型。"
#: ../shell/e-shell-importer.c:138
msgid "Choose the destination for this import"
@@ -19770,7 +20012,7 @@ msgstr "Evolution 首选项"
#. 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:47 ../shell/e-shell-window.c:332
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
#, c-format
msgid "%s - Evolution"
msgstr "%s - Evolution"
@@ -19795,77 +20037,71 @@ 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:729
+#: ../shell/e-shell-window-commands.c:942
msgid "translator-credits"
msgstr ""
"开源软件国际化之简体中文组\n"
"http://i18n.linux.net.cn"
-#: ../shell/e-shell-window-commands.c:740
+#: ../shell/e-shell-window-commands.c:953
msgid "Evolution Website"
msgstr "Evolution 网站"
-#: ../shell/e-shell-window-commands.c:758
-msgid "Error opening the FAQ webpage."
-msgstr "打开 FAQ 网页时出错。"
-
-#: ../shell/e-shell-window-commands.c:955
+#: ../shell/e-shell-window-commands.c:1170
msgid "_Work Online"
msgstr "联机工作(_W)"
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
msgid "_Work Offline"
msgstr "脱机工作(_W)"
-#: ../shell/e-shell-window-commands.c:981
+#: ../shell/e-shell-window-commands.c:1196
msgid "Work Offline"
msgstr "脱机工作"
-#: ../shell/e-shell-window.c:381
-#, fuzzy
+#: ../shell/e-shell-window.c:377
msgid ""
"Evolution is currently online.\n"
"Click on this button to work offline."
-msgstr "Evolution 目前联机。单击该按钮可脱机工作。"
+msgstr "Evolution 目前联机。\n单击该按钮可脱机工作。"
-#: ../shell/e-shell-window.c:388
+#: ../shell/e-shell-window.c:384
msgid "Evolution is in the process of going offline."
msgstr "Evolution 正在脱机过程中。"
-#: ../shell/e-shell-window.c:395
-#, fuzzy
+#: ../shell/e-shell-window.c:391
msgid ""
"Evolution is currently offline.\n"
"Click on this button to work online."
-msgstr "Evolution 目前脱机。单击该按钮可联机工作。"
+msgstr "Evolution 目前脱机。\n单击该按钮可联机工作。"
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:787
#, c-format
msgid "Switch to %s"
msgstr "切换到 %s"
-#: ../shell/e-shell.c:641
+#: ../shell/e-shell.c:640
msgid "Unknown system error."
msgstr "未知的系统错误。"
-#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
#, c-format
msgid "%ld KB"
msgstr "%ld KB"
-#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
msgid "OK"
msgstr "确定"
-#: ../shell/e-shell.c:1300
+#: ../shell/e-shell.c:1263
msgid "Invalid arguments"
msgstr "无效参数"
-#: ../shell/e-shell.c:1302
+#: ../shell/e-shell.c:1265
msgid "Cannot register on OAF"
msgstr "无法注册到 OAF"
-#: ../shell/e-shell.c:1304
+#: ../shell/e-shell.c:1267
msgid "Configuration Database not found"
msgstr "找不到配置数据库"
@@ -19880,7 +20116,6 @@ msgid "New Test"
msgstr "新建测试"
#: ../shell/test/evolution-test-component.c:106
-#, fuzzy
msgctxt "New"
msgid "_Test"
msgstr "测试(_T)"
@@ -19910,8 +20145,8 @@ msgid "Importer Type"
msgstr "导入器类型"
#: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "选择导入器"
+msgid "Select Information to Import"
+msgstr "选择要导入的信息"
#: ../shell/import.glade.h:7
msgid "Select a File"
@@ -19927,7 +20162,7 @@ msgstr ""
"本助手将全程指导您将外部文件导入 Evolution。"
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:217
+#: ../shell/main.c:221
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -19959,7 +20194,7 @@ msgstr ""
"\n"
"我们希望您尽情享受我们努力工作的成果,我们也热切盼望着您的意见!\n"
-#: ../shell/main.c:241
+#: ../shell/main.c:245
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -19967,43 +20202,43 @@ msgstr ""
"感谢\n"
"Evolution 团队\n"
-#: ../shell/main.c:248
+#: ../shell/main.c:252
msgid "Do not tell me again"
msgstr "不要再通知我"
-#: ../shell/main.c:469
+#: ../shell/main.c:481
msgid "Start Evolution activating the specified component"
msgstr "启动 Evolution 并激活指定组件"
-#: ../shell/main.c:473
+#: ../shell/main.c:485
msgid "Start in online mode"
msgstr "以联机模式启动"
-#: ../shell/main.c:476
+#: ../shell/main.c:488
msgid "Forcibly shut down all Evolution components"
msgstr "强制关闭所有 Evolution 组件"
-#: ../shell/main.c:480
+#: ../shell/main.c:492
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "强制从 Evolution 1.4 重新升迁"
-#: ../shell/main.c:483
+#: ../shell/main.c:495
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
-#: ../shell/main.c:485
+#: ../shell/main.c:497
msgid "Disable loading of any plugins."
msgstr "禁止装入任何插件。"
-#: ../shell/main.c:487
+#: ../shell/main.c:499
msgid "Disable preview pane of Mail, Contacts and Tasks."
msgstr "禁用邮件、联系人和任务的预览面板。"
-#: ../shell/main.c:572
+#: ../shell/main.c:586
msgid "- The Evolution PIM and Email Client"
msgstr "- Evolution 个人信息管理和邮件客户"
-#: ../shell/main.c:600
+#: ../shell/main.c:614
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -20017,32 +20252,36 @@ msgid "Are you sure you want to forget all remembered passwords?"
msgstr "您确定要忘记记住的所有密码吗?"
#: ../shell/shell.error.xml.h:2
+msgid "Cannot start Evolution"
+msgstr "无法启动 Evolution"
+
+#: ../shell/shell.error.xml.h:3
msgid "Continue"
msgstr "继续"
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
msgid "Delete old data from version {0}?"
msgstr "删除版本 {0} 中的旧数据吗?"
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
msgid "Evolution can not start."
msgstr "Evolution 无法启动。"
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
msgid ""
"Forgetting your passwords will clear all remembered passwords. You will be "
"reprompted next time they are needed."
msgstr "忘记您的密码将清除记住的全部密码。下次需要密码的时候,您必须重新输入。"
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
msgid "Insufficient disk space for upgrade."
msgstr "磁盘空间不足以进行升级。"
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
msgid "Really delete old data?"
msgstr "真的要删除旧数据吗?"
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
msgid ""
"The entire contents of the &quot;evolution&quot; directory are about to be "
"permanently removed.\n"
@@ -20061,9 +20300,18 @@ msgstr ""
"\n"
"删除之后,您将无法降级至先前版本的 Evolution,除非您手动从头来过。\n"
-#: ../shell/shell.error.xml.h:15
-msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+#: ../shell/shell.error.xml.h:16
+#, fuzzy
+#| msgid ""
+#| "The previous version of evolution stored its data in a different "
+#| "location.\n"
+#| "\n"
+#| "If you choose to remove this data, the entire contents of the &quot;"
+#| "evolution&quot; directory will be removed permanently. If you choose to "
+#| "keep this data, then you may manually remove the contents of &quot;"
+#| "evolution&quot; at your convenience.\n"
+msgid ""
+"The previous version of Evolution stored its data in a different location.\n"
"\n"
"If you choose to remove this data, the entire contents of the &quot;"
"evolution&quot; directory will be removed permanently. If you choose to keep "
@@ -20075,11 +20323,11 @@ msgstr ""
"如果您选择删除此数据,“evolution”目录中的全部内容都将被永久删除。如果您选择保"
"留此数据,那么您可以在您方便的时候手动删除“evolution”目录。\n"
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
msgid "Upgrade from previous version failed: {0}"
msgstr "从先前版本升级失败:{0}"
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:21
msgid ""
"Upgrading your data and settings will require up to {0} of disk space, but "
"you only have {1} available.\n"
@@ -20091,7 +20339,7 @@ msgstr ""
"\n"
"您需要在继续之前在主目录中腾出更多空间。"
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
msgid ""
"Your system configuration does not match your Evolution configuration.\n"
"\n"
@@ -20101,7 +20349,7 @@ msgstr ""
"\n"
"请单击帮助查看详情"
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
msgid ""
"Your system configuration does not match your Evolution configuration:\n"
"\n"
@@ -20115,19 +20363,19 @@ msgstr ""
"\n"
"请单击帮助查看详情。"
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
msgid "_Forget"
msgstr "忘记(_F)"
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
msgid "_Keep Data"
msgstr "保留数据(_K)"
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
msgid "_Remind Me Later"
msgstr "稍后提醒(_R)"
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
msgid ""
"{1}\n"
"\n"
@@ -20191,7 +20439,7 @@ msgid "Purposes"
msgstr "用途"
#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/lib/e-cert.c:553
msgid "Serial Number"
msgstr "序列号"
@@ -20307,7 +20555,7 @@ msgid ""
"and its policy and procedures (if available)."
msgstr "在信任此 CA 的任何用途之前,您应该先检查该证书及其策略和过程(若可用)。"
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
msgid "Certificate"
msgstr "证书"
@@ -20383,11 +20631,11 @@ msgstr "组织单元(OU)"
msgid "SHA1 Fingerprint"
msgstr "SHA1 指纹"
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
msgid "SSL Client Certificate"
msgstr "SSL 客户证书"
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
msgid "SSL Server Certificate"
msgstr "SSL 服务器证书"
@@ -20433,182 +20681,182 @@ msgid "_Edit CA Trust"
msgstr "编辑 CA 信任(_E)"
#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:672
+#: ../smime/lib/e-cert-db.c:656
msgid "Certificate already exists"
msgstr "证书已经存在"
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
msgid "%d/%m/%Y"
msgstr "%Y-%m-%d"
#. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
msgid "Sign"
msgstr "签名"
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
msgid "Encrypt"
msgstr "加密"
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
msgid "Version"
msgstr "版本"
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
msgid "Version 1"
msgstr "版本 1"
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
msgid "Version 2"
msgstr "版本 2"
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
msgid "Version 3"
msgstr "版本 3"
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
msgid "PKCS #1 MD2 With RSA Encryption"
msgstr "带 RSA 加密的 PKCS #1 MD2"
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
msgid "PKCS #1 MD5 With RSA Encryption"
msgstr "带 RSA 加密的 PKCS #1 MD5"
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
msgid "PKCS #1 SHA-1 With RSA Encryption"
msgstr "带 RSA 加密的 PKCS #1 SHA-1"
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
msgid "PKCS #1 RSA Encryption"
msgstr "PKCS #1 RSA 加密"
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
msgid "Certificate Key Usage"
msgstr "证书密钥用途"
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
msgid "Netscape Certificate Type"
msgstr "Netscape 证书类型"
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
msgid "Certificate Authority Key Identifier"
msgstr "证书颁发密钥身份"
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
#, c-format
msgid "Object Identifier (%s)"
msgstr "对象标识符(%s)"
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
msgid "Algorithm Identifier"
msgstr "算法标识符"
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
msgid "Algorithm Parameters"
msgstr "算法参数"
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
msgid "Subject Public Key Info"
msgstr "主题公钥信息"
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
msgid "Subject Public Key Algorithm"
msgstr "主题公钥算法"
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
msgid "Subject's Public Key"
msgstr "主题公钥"
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
msgid "Error: Unable to process extension"
msgstr "错误:无法处理扩展"
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
msgid "Object Signer"
msgstr "对象签名者"
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
msgid "SSL Certificate Authority"
msgstr "SSL 证书颁发机构"
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
msgid "Email Certificate Authority"
msgstr "电子邮件证书颁发机构"
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
msgid "Signing"
msgstr "签名"
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
msgid "Non-repudiation"
msgstr "不可抵赖"
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
msgid "Key Encipherment"
msgstr "密钥编码器"
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
msgid "Data Encipherment"
msgstr "数据编码器"
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
msgid "Key Agreement"
msgstr "密钥协议"
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
msgid "Certificate Signer"
msgstr "证书签名者"
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
msgid "CRL Signer"
msgstr "CRL 签名者"
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
msgid "Critical"
msgstr "关键"
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
msgid "Not Critical"
msgstr "非关键"
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
msgid "Extensions"
msgstr "扩展"
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1019
#, c-format
msgid "%s = %s"
msgstr "%s = %s"
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
msgid "Certificate Signature Algorithm"
msgstr "证书签名算法"
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
msgid "Issuer"
msgstr "发行者"
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
msgid "Issuer Unique ID"
msgstr "发行者唯一 ID"
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
msgid "Subject Unique ID"
msgstr "主题唯一 ID"
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
msgid "Certificate Signature Value"
msgstr "证书签名值"
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
msgid "PKCS12 File Password"
msgstr "PKCS12 文件密码"
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
msgid "Enter password for PKCS12 file:"
msgstr "输入 PKCS12 文件的密码:"
-#: ../smime/lib/e-pkcs12.c:343
+#: ../smime/lib/e-pkcs12.c:348
msgid "Imported Certificate"
msgstr "导入的证书"
@@ -20647,8 +20895,8 @@ msgid "Copy"
msgstr "复制"
#: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy Selected Contacts to Another Folder..."
-msgstr "把选中的联系人复制到其它文件夹..."
+msgid "Copy selected contacts to another folder"
+msgstr "把选中的联系人复制到其它文件夹"
#: ../ui/evolution-addressbook.xml.h:8
msgid "Copy the contacts of the selected folder into another folder"
@@ -20696,8 +20944,8 @@ msgid "Mo_ve All Contacts To..."
msgstr "将全部联系人移至(_V)..."
#: ../ui/evolution-addressbook.xml.h:20
-msgid "Move Selected Contacts to Another Folder..."
-msgstr "把选中的联系人移至其它文件夹..."
+msgid "Move selected contacts to another folder"
+msgstr "把选中的联系人移至其它文件夹"
#: ../ui/evolution-addressbook.xml.h:21
msgid "Move the contacts of the selected folder into another folder"
@@ -20737,14 +20985,14 @@ msgid "Save as VCard..."
msgstr "另存为 VCard..."
#: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard."
-msgstr "把选中的联系人保存为 VCard。"
+msgid "Save selected contacts as a VCard"
+msgstr "把选中的联系人保存为 VCard"
#: ../ui/evolution-addressbook.xml.h:33
msgid "Save the contacts of the selected folder as VCard"
msgstr "把选中文件夹中的的联系人保存为 VCard"
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2724
msgid "Select All"
msgstr "全选"
@@ -20757,16 +21005,16 @@ msgid "Select all contacts"
msgstr "选中全部联系人"
#: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts."
-msgstr "给选中的联系人发信件。"
+msgid "Send a message to the selected contacts"
+msgstr "给选中的联系人发信件"
#: ../ui/evolution-addressbook.xml.h:38
msgid "Send message to contact"
msgstr "给联系人发信件"
#: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person."
-msgstr "把选中的联系人发送给其他人。"
+msgid "Send selected contacts to another person"
+msgstr "把选中的联系人发送给其他人"
#: ../ui/evolution-addressbook.xml.h:40
msgid "Show contact preview window"
@@ -20788,7 +21036,7 @@ msgstr "停止载入"
msgid "View the current contact"
msgstr "查看当前联系人"
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
#: ../ui/evolution-tasks.xml.h:21
msgid "_Actions"
msgstr "操作(_A)"
@@ -20878,7 +21126,7 @@ msgid "Month"
msgstr "月"
#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:196
+#: ../widgets/misc/e-calendar.c:195
msgid "Next"
msgstr "下一项"
@@ -20887,7 +21135,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:172
+#: ../widgets/misc/e-calendar.c:171
msgid "Previous"
msgstr "上一项"
@@ -20943,15 +21191,23 @@ msgstr "显示工作周"
msgid "View the current appointment"
msgstr "查看当前约会"
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "查看调试控制台以获得日志信息"
+
+#: ../ui/evolution-calendar.xml.h:37
msgid "Week"
msgstr "周"
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:38
msgid "Work Week"
-msgstr "一周工作日"
+msgstr "工作日"
+
+#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "调试日志(_D)"
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:45
msgid "_Open Appointment"
msgstr "打开约会(_O)"
@@ -21020,10 +21276,6 @@ msgstr "显示信件预览窗口"
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "订阅或退订远程服务器上的文件夹"
-#: ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "查看调试控制台以获得日志信息"
-
#: ../ui/evolution-mail-global.xml.h:20
msgid "_Classic View"
msgstr "分类视图(_C)"
@@ -21032,10 +21284,6 @@ msgstr "分类视图(_C)"
msgid "_Copy Folder To..."
msgstr "文件夹复制到(_C)..."
-#: ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "调试日志(_D)"
-
#: ../ui/evolution-mail-global.xml.h:23
msgid "_Download Messages for Offline Usage"
msgstr "下载信件以离线使用(_D)"
@@ -21060,8 +21308,8 @@ msgstr "预览(_P)"
#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
#.
#: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions"
-msgstr "订阅(_S)"
+msgid "_Subscriptions..."
+msgstr "订阅(_S)..."
#: ../ui/evolution-mail-global.xml.h:33
msgid "_Vertical View"
@@ -21141,10 +21389,6 @@ msgstr "从该文件夹永久删除所有已删除的信件"
msgid "Permanently remove this folder"
msgstr "永久删除此文件夹"
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh..."
-msgstr "刷新(_F)..."
-
#: ../ui/evolution-mail-list.xml.h:22
msgid "Refresh the folder"
msgstr "刷新文件夹"
@@ -21885,9 +22129,8 @@ msgid "View/Hide the Status Bar"
msgstr "查看/隐藏状态栏"
#: ../ui/evolution.xml.h:39
-#, fuzzy
msgid "Work _Offline"
-msgstr "脱机工作"
+msgstr "脱机工作(_O)"
#: ../ui/evolution.xml.h:40
msgid "_About"
@@ -21963,7 +22206,7 @@ msgstr "月视图(_M)"
#: ../views/calendar/galview.xml.h:5
msgid "_Work Week View"
-msgstr "周工作视图(_W)"
+msgstr "工作日视图(_W)"
#: ../views/mail/galview.xml.h:1
msgid "As Sent Folder for Wi_de View"
@@ -22065,17 +22308,17 @@ msgid "Define Views for \"%s\""
msgstr "定义“%s”的视图"
#: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1922
+#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-scrolled.c:215
#: ../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:226
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
msgid "Instance"
msgstr "实例"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
msgid "Save Current View"
msgstr "保存当前视图"
@@ -22088,42 +22331,42 @@ msgid "_Replace existing view"
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:368
+#: ../widgets/menus/gal-view-instance.c:581
+#: ../widgets/menus/gal-view-menus.c:367
msgid "Custom View"
msgstr "当前视图"
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:582
msgid "Save Custom View"
msgstr "保存自定义视图"
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:392
+#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-menus.c:391
msgid "Define Views..."
msgstr "定义视图..."
-#: ../widgets/menus/gal-view-menus.c:305
+#: ../widgets/menus/gal-view-menus.c:304
msgid "C_urrent View"
msgstr "当前视图(_U)"
-#: ../widgets/menus/gal-view-menus.c:329
+#: ../widgets/menus/gal-view-menus.c:328
#, c-format
msgid "Select View: %s"
msgstr "选择视图:%s"
-#: ../widgets/menus/gal-view-menus.c:373
+#: ../widgets/menus/gal-view-menus.c:372
msgid "Current view is a customized view"
msgstr "当前视图为自定义视图"
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:377
msgid "Save Custom View..."
msgstr "保存当前视图..."
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:382
msgid "Save current custom view"
msgstr "保存当前自定义视图"
-#: ../widgets/menus/gal-view-menus.c:397
+#: ../widgets/menus/gal-view-menus.c:396
msgid "Create or edit views"
msgstr "创建或编辑视图"
@@ -22147,17 +22390,17 @@ msgstr "视图类型"
msgid "Type of view:"
msgstr "视图类型:"
-#: ../widgets/misc/e-attachment-bar.c:1137
+#: ../widgets/misc/e-attachment-bar.c:1132
msgid "Attachment Bar"
msgstr "附件栏"
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
#, c-format
msgid "Cannot attach file %s: %s"
msgstr "无法附加文件 %s:%s"
-#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
#, c-format
msgid "Cannot attach file %s: not a regular file"
msgstr "无法附加文件 %s:不是普通文件"
@@ -22183,80 +22426,80 @@ msgstr "建议自动显示附件"
msgid "%B %Y"
msgstr "%Y年%B"
-#: ../widgets/misc/e-calendar.c:221
+#: ../widgets/misc/e-calendar.c:220
msgid "Month Calendar"
msgstr "月历"
-#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
-#: ../widgets/text/e-text.c:3644
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645
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:3650
-#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
-#: ../widgets/text/e-text.c:3659
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3651
+#: ../widgets/text/e-text.c:3652 ../widgets/text/e-text.c:3659
+#: ../widgets/text/e-text.c:3660
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:3665
-#: ../widgets/text/e-text.c:3666
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
+#: ../widgets/text/e-text.c:3667
msgid "Fill stipple"
msgstr "点绘填充"
-#: ../widgets/misc/e-canvas-background.c:481
#: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
msgid "X1"
msgstr "X1"
-#: ../widgets/misc/e-canvas-background.c:488
#: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
msgid "X2"
msgstr "X2"
-#: ../widgets/misc/e-canvas-background.c:495
#: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
msgid "Y1"
msgstr "Y1"
-#: ../widgets/misc/e-canvas-background.c:502
#: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
msgid "Y2"
msgstr "Y2"
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
#: ../widgets/table/e-table-group-container.c:999
#: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3074
+#: ../widgets/table/e-table-item.c:3070
msgid "Minimum width"
msgstr "最小宽度"
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
#: ../widgets/table/e-table-group-container.c:1000
#: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/table/e-table-item.c:3071
msgid "Minimum Width"
msgstr "最小宽度"
#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:204
+#: ../widgets/misc/e-expander.c:206
msgid "Spacing"
msgstr "间距"
-#: ../widgets/misc/e-cell-date-edit.c:290
+#: ../widgets/misc/e-cell-date-edit.c:289
msgid "Now"
msgstr "现在"
-#: ../widgets/misc/e-cell-date-edit.c:847
+#: ../widgets/misc/e-cell-date-edit.c:846
#, c-format
msgid "The time must be in the format: %s"
msgstr "时间必须采用格式:%s"
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:77
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "百分比值必需在 0 到 100 之间,含 0 和 100"
@@ -22355,85 +22598,85 @@ msgstr "其它..."
msgid "Ch_aracter Encoding"
msgstr "字符编码(_A)"
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:303
msgid "Date and Time"
msgstr "日期和时间"
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:324
msgid "Text entry to input date"
msgstr "输入日期的文本框"
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:346
msgid "Click this button to show a calendar"
msgstr "单击此按钮可显示日历"
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:388
msgid "Drop-down combination box to select time"
msgstr "选择时间的组合框"
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:464
msgid "No_w"
msgstr "现在(_W)"
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:470
msgid "_Today"
msgstr "今天(_T)"
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1635
msgid "Invalid Date Value"
msgstr "无效的日期值"
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1664
msgid "Invalid Time Value"
msgstr "无效的时间值"
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
msgid "Expanded"
msgstr "已展开"
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
msgid "Whether or not the expander is expanded"
msgstr "是否展开扩展器"
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
msgid "Text of the expander's label"
msgstr "扩展器标签的文本"
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
msgid "Use underline"
msgstr "使用下划线"
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:199
msgid ""
"If set, an underline in the text indicates the next character should be used "
"for the mnemonic accelerator key"
msgstr "如果设置了此选项,将会在表明加速键的字符下面加下划线"
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
msgid "Space to put between the label and the child"
msgstr "标签及其子空间中间的间距"
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
msgid "Label widget"
msgstr "标签部件"
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:217
msgid "A widget to display in place of the usual expander label"
msgstr "在通常扩展器标签的位置显示的部件"
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
msgid "Expander Size"
msgstr "扩展器大小"
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
msgid "Size of the expander arrow"
msgstr "扩展器箭头的大小"
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
msgid "Indicator Spacing"
msgstr "标识器间距"
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
msgid "Spacing around expander arrow"
msgstr "扩展器箭头旁边的间距"
@@ -22493,7 +22736,6 @@ msgid "World Map"
msgstr "世界地图"
#: ../widgets/misc/e-map.c:629
-#, fuzzy
msgid ""
"Mouse-based interactive map widget for selecting timezone. Keyboard users "
"should instead select the timezone from the drop-down combination box below."
@@ -22501,11 +22743,11 @@ msgstr ""
"基于鼠标交互的地图部件,可用来选择时区。键盘用户可以从下方的组合框中选择时"
"区。"
-#: ../widgets/misc/e-online-button.c:109
+#: ../widgets/misc/e-online-button.c:106
msgid "Online"
msgstr "在线"
-#: ../widgets/misc/e-online-button.c:110
+#: ../widgets/misc/e-online-button.c:107
msgid "The button state is online"
msgstr "按钮状态为在线"
@@ -22521,74 +22763,74 @@ msgstr "同步私有记录:"
msgid "Sync Categories:"
msgstr "同步类别:"
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
msgid "Empty message"
msgstr "空信件"
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
msgid "Reflow model"
msgstr "回流模型"
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
msgid "Column width"
msgstr "列宽"
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
msgid "Search"
msgstr "搜索"
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
msgid "Click here to change the search type"
msgstr "单击此处更改搜索类型"
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:603
msgid "_Search"
msgstr "搜索(_S)"
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:609
msgid "_Find Now"
msgstr "立即查找(_F)"
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:610
msgid "_Clear"
msgstr "清除(_C)"
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:865
msgid "Item ID"
msgstr "项目 ID"
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
-#: ../widgets/text/e-text.c:3566
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3567
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:1006
+#: ../widgets/misc/e-search-bar.c:1003
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:1023
+#: ../widgets/misc/e-search-bar.c:1020
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:1035
+#: ../widgets/misc/e-search-bar.c:1032
msgid " i_n "
msgstr " 于(_N) "
#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/table/e-tree-selection-model.c:806
msgid "Cursor Row"
msgstr "光标行"
#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/table/e-tree-selection-model.c:813
msgid "Cursor Column"
msgstr "光标列"
@@ -22734,19 +22976,19 @@ 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:255
+#: ../widgets/misc/e-task-widget.c:252
#, 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:261
+#: ../widgets/misc/e-task-widget.c:258
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
-#: ../widgets/misc/e-url-entry.c:106
+#: ../widgets/misc/e-url-entry.c:105
msgid "Click here to go to URL"
msgstr "单击此处转到 URL"
@@ -22786,23 +23028,23 @@ msgstr "聚焦列"
msgid "Unselected Column"
msgstr "未选列"
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1794
msgid "Strikeout Column"
msgstr "给列加删除线"
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1801
msgid "Underline Column"
msgstr "给列加下划线"
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1808
msgid "Bold Column"
msgstr "给列加粗"
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1815
msgid "Color Column"
msgstr "给列着色"
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1829
msgid "BG Color Column"
msgstr "给列着背景色"
@@ -22840,7 +23082,7 @@ msgid "A_vailable Fields:"
msgstr "可用域(_V):"
#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
msgid "Ascending"
msgstr "升序"
@@ -22853,7 +23095,7 @@ msgid "Clear _All"
msgstr "全部清除(_A)"
#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
msgid "Descending"
msgstr "降序"
@@ -22914,16 +23156,16 @@ msgid "_Sort..."
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:1887
+#: ../widgets/table/e-table-field-chooser-item.c:633
+#: ../widgets/table/e-table-field-chooser.c:66
+#: ../widgets/table/e-table-header-item.c:1886
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:1901
+#: ../widgets/table/e-table-field-chooser-item.c:640
+#: ../widgets/table/e-table-field-chooser.c:73
+#: ../widgets/table/e-table-header-item.c:1900
msgid "Full Header"
msgstr "完整标题"
@@ -22957,7 +23199,7 @@ msgstr[0] "%s (%d 项)"
#: ../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
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
msgid "Alternating Row Colors"
msgstr "交替行色"
@@ -22965,8 +23207,8 @@ msgstr "交替行色"
#: ../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
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
msgid "Horizontal Draw Grid"
msgstr "水平绘制网格"
@@ -22974,8 +23216,8 @@ msgstr "水平绘制网格"
#: ../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
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
msgid "Vertical Draw Grid"
msgstr "垂直绘制网格"
@@ -22983,8 +23225,8 @@ msgstr "垂直绘制网格"
#: ../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
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
+#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
msgid "Draw focus"
msgstr "绘制焦点"
@@ -22992,7 +23234,7 @@ msgstr "绘制焦点"
#: ../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
+#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
msgid "Cursor mode"
msgstr "光标模式"
@@ -23000,7 +23242,7 @@ msgstr "光标模式"
#: ../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
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
msgid "Selection model"
msgstr "选择模型"
@@ -23008,9 +23250,9 @@ msgstr "选择模型"
#: ../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
+#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
+#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-tree.c:3338
msgid "Length Threshold"
msgstr "长度阀值"
@@ -23018,9 +23260,9 @@ msgstr "长度阀值"
#: ../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
+#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
+#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-tree.c:3370
msgid "Uniform row height"
msgstr "统一行高"
@@ -23031,211 +23273,212 @@ msgstr "统一行高"
msgid "Frozen"
msgstr "冻结"
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
msgid "Customize Current View"
msgstr "自定义当前视图"
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
msgid "Sort _Ascending"
msgstr "升序排序(_A)"
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
msgid "Sort _Descending"
msgstr "降序排序(_D)"
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
msgid "_Unsort"
msgstr "未排序(_U)"
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
msgid "Group By This _Field"
msgstr "按该域分组(_F)"
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
msgid "Group By _Box"
msgstr "按方框分组(_B)"
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
msgid "Remove This _Column"
msgstr "删除该列(_C)"
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
msgid "Add a C_olumn..."
msgstr "添加一列(_O)..."
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1482
msgid "A_lignment"
msgstr "对齐(_L)"
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
msgid "B_est Fit"
msgstr "最佳匹配(_E)"
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
msgid "Format Column_s..."
msgstr "格式化列(_S)..."
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
msgid "Custo_mize Current View..."
msgstr "自定义当前视图(_M)..."
-#: ../widgets/table/e-table-header-item.c:1543
+#: ../widgets/table/e-table-header-item.c:1542
msgid "_Sort By"
msgstr "排序方式(_S)"
#. Custom
-#: ../widgets/table/e-table-header-item.c:1561
+#: ../widgets/table/e-table-header-item.c:1560
msgid "_Custom"
msgstr "自定义(_C)"
-#: ../widgets/table/e-table-header-item.c:1894
+#: ../widgets/table/e-table-header-item.c:1893
msgid "Font Description"
msgstr "字体描述"
-#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-header-item.c:1914
#: ../widgets/table/e-table-sorter.c:172
msgid "Sort Info"
msgstr "排序信息"
-#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-table-header-item.c:1928
#: ../widgets/table/e-tree-scrolled.c:225
#: ../widgets/table/e-tree-scrolled.c:226
msgid "Tree"
msgstr "树"
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
msgid "Table header"
msgstr "表头"
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
msgid "Table model"
msgstr "表格模型"
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
msgid "Cursor row"
msgstr "光标行"
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
-#: ../widgets/table/e-tree.c:3378
+#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-tree.c:3377
msgid "Always search"
msgstr "总是搜索"
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3347
msgid "Use click to add"
msgstr "单击可添加"
-#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
msgid "ETree table adapter"
msgstr "ETree 表格适配器"
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3383
msgid "Retro Look"
msgstr "火箭外观"
-#: ../widgets/table/e-tree.c:3385
+#: ../widgets/table/e-tree.c:3384
msgid "Draw lines and +/- expanders."
msgstr "绘制行和 +/- 扩展柄。"
-#: ../widgets/text/e-text.c:2735
+#: ../widgets/text/e-text.c:2736
msgid "Input Methods"
msgstr "输入法"
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
msgid "Event Processor"
msgstr "事件处理器"
-#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
msgid "Bold"
msgstr "粗体"
-#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
msgid "Strikeout"
msgstr "删除线"
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
msgid "Anchor"
msgstr "锚点"
-#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
msgid "Justification"
msgstr "两端对齐"
-#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
msgid "Clip Width"
msgstr "裁剪宽度"
-#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
msgid "Clip Height"
msgstr "裁剪高度"
-#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
msgid "Clip"
msgstr "裁剪"
-#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
+#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
msgid "Fill clip rectangle"
msgstr "填充裁剪矩形"
-#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
+#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
msgid "X Offset"
msgstr "水平偏移"
-#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
+#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
msgid "Y Offset"
msgstr "垂直偏移"
-#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
+#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
msgid "Text width"
msgstr "文字宽度"
-#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
+#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
msgid "Text height"
msgstr "文字高度"
-#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
msgid "Use ellipsis"
msgstr "使用椭圆"
-#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
msgid "Ellipsis"
msgstr "椭圆"
-#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
msgid "Line wrap"
msgstr "换行"
-#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
msgid "Break characters"
msgstr "换行字符"
-#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
msgid "Max lines"
msgstr "最多行数"
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
msgid "Draw borders"
msgstr "绘制边框"
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
msgid "Allow newlines"
msgstr "允许新行"
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
msgid "Draw background"
msgstr "绘制背景"
-#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
msgid "Draw button"
msgstr "绘制按钮"
-#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
+#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
msgid "Cursor position"
msgstr "光标位置"
-#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
+#. Translators: Input Method Context
+#: ../widgets/text/e-text.c:3781 ../widgets/text/e-text.c:3783
msgid "IM Context"
msgstr "输入法环境"
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3789 ../widgets/text/e-text.c:3790
msgid "Handle Popup"
msgstr "处理弹出"